Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/assets/utils/commonUtils.js

@@ -370,6 +370,18 @@ var commonUtils = {
     var myDate = new Date(dateStr);
     //返回年月
     return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1)
+  },
+   //格式化日期
+   getFormatDateTime(dateStr) {
+    var myDate = new Date(dateStr);
+    var n = myDate.getFullYear()
+    var Month = parseInt(myDate.getMonth() + 1)>9?parseInt(myDate.getMonth() + 1):'0'+parseInt(myDate.getMonth() + 1)
+    var d = myDate.getDate()>9?myDate.getDate():'0'+myDate.getDate()
+    var h =  myDate.getHours()>9?myDate.getHours():'0'+myDate.getHours()
+    var m =  myDate.getMinutes()>9?myDate.getMinutes():'0'+myDate.getMinutes()
+    var s =  myDate.getSeconds()>9?myDate.getSeconds():'0'+myDate.getSeconds()
+    //返回年月日 时分秒
+    return n + '-' + Month + '-' + d +' '+ h +':'+m+':'+s
   },
   //判断字符串是否为数字
   isNumber: function (val) {

src/components/activity/CouponList.vue

@@ -323,19 +323,19 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('active.cl_sxriqi')" prop="effectDate">
-              <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.effectDate"
+              <el-date-picker format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.effectDate"
                 @change="getTravelPrciePageList" type="datetime"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('active.cl_yxjzhiri')" prop="expirationDate">
-              <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.expirationDate"
+              <el-date-picker format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.expirationDate"
                 @change="getTravelPrciePageList" type="datetime"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('objFill.v101.activity.huodongks')">
-              <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.activityStartDate"
+              <el-date-picker format="yyyy-MM-dd HH:mm:ss" class="w217" v-model="addMsg.activityStartDate"
                 type="datetime"></el-date-picker>
             </el-form-item>
           </el-col>
@@ -1081,6 +1081,11 @@
         this.currentPage = 1;
       },
       submitForm(addMsg) {
+        if(this.addMsg.effectDate) this.addMsg.effectDate = this.$commonUtils.getFormatDateTime(this.addMsg.effectDate)
+        if(this.addMsg.expirationDate) this.addMsg.expirationDate = this.$commonUtils.getFormatDateTime(this.addMsg.expirationDate)
+        if(this.addMsg.activityStartDate) this.addMsg.activityStartDate = this.$commonUtils.getFormatDateTime(this.addMsg.activityStartDate)
+        if(this.addMsg.activityEndDate) this.addMsg.activityEndDate = this.$commonUtils.getFormatDateTime(this.addMsg.activityEndDate)
+        
         //提交创建、修改表单
         this.$refs[addMsg].validate(valid => {
           if (valid) {

src/plug/index.js

@@ -122,7 +122,9 @@ export default {
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
-        domainUrl = "http://192.168.5.214";
+        domainUrl = "http://192.168.5.39:8083";
+        domainUrl = "http://192.168.5.56";
+        // domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";
@@ -130,7 +132,8 @@ export default {
         //商城API
         mallUrl = "http://192.168.5.214:8200";
         lxymallUrl = "http://192.168.20.13:8088";
-        crmUrl = "http://192.168.5.46:5003"
+        // crmUrl = "http://192.168.5.46:5003"
+        crmUrl = "http://192.168.5.56:8032"
         erpSiteUrl = "http://localhost:8080/#/";
         if (locationName.indexOf('testerp.oytour') !== -1) {
           domainUrl = "http://testapi.oytour.com";