Merge remote-tracking branch 'link-wechat-web-pc/dev'

env.js

@@ -24,9 +24,9 @@ const envs = {
     _ISCDN: true, // 是否开启cdn加速
   },
   prod: {
-    DOMAIN: 'https://scrm-gw.chinacoal-ins.com',
+    DOMAIN: 'https://scrm-gw.baoxianzhanggui.com',
     BASE_URL: './', // 路由基础路径
-    BASE_API: 'https://scrm-gw.chinacoal-ins.com',
+    // BASE_API: 'https://scrm-gw.chinacoal-ins.com',
     SYSTEM_API: '',
     VIEW_URL: 'https://scrm-gw.chinacoal-ins.com/file-view/onlinePreview?url=',
     CAROFFER: 'https://kscd.echinacoal.com/#/dashboard',
@@ -34,8 +34,8 @@ const envs = {
     _ISCDN: true, // 是否开启cdn加速
   },
   development: {
-    DOMAIN: 'http://192.168.0.106:6180',//董鑫
-    // DOMAIN: 'https://scrm-gw.baoxianzhanggui.com',//屈晨
+    // DOMAIN: 'http://192.168.0.106:6180',//董鑫
+    DOMAIN: 'https://scrm-gw.baoxianzhanggui.com',//屈晨
     BASE_URL: './', // 路由基础路径
     BASE_API: 'https://scrm-gw.chinacoal-ins.com',
     // BASE_API: 'http://10.1.37.249:6180',

src/views/customerOperations/sop/list.vue

@@ -142,7 +142,7 @@ export default {
         executeType: "",//触发类型
         behaviorId: "",//类型编码
         timeType: 1,//时间类型
-        relativeTime: "",// 时间间隔
+        relativeTime: 0,// 时间间隔
         absoluteTime: "",//日期
         tagGroupId: "",//标签组id
         tagIdlist: [],//标签id数组
@@ -372,7 +372,7 @@ export default {
     },
     // 操作用户
     userOperation() {
-      this.form.relativeTime = this.form.relativeTime ? this.convertTimeToSeconds(this.relativeTime) : '';
+      this.form.relativeTime = !this.form.relativeTime ? this.convertTimeToSeconds(this.relativeTime) : '';
       let list = [];
       this.form.domains.map(val => {
         list.push(val.absoluteTime)