update: update

src/components/tag/tag-config-options.vue

@@ -851,7 +851,7 @@
                   <template slot-scope="{row}">{{row.createTime|formatDate}}</template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="text" class="m-l-16">查看上传记录</el-button>
+              <el-button slot="reference" type="text" class="m-l-16" v-if="!parent.channel">查看上传记录</el-button>
             </el-popover>
           </div>
         </div>
@@ -893,6 +893,7 @@ import qs from 'qs';
 import tagDetails from '@/components/tagDetail/mixin/index';
 import VueGicCard from '@/components/card/card';
 import { aliasNames } from '@/config'
+import timeFormat from '@/common/js/timeFormat';
 import { getTagType, findWidget, findOndJson } from '@/request/tagConfig';
 import moment from 'moment'
 
@@ -1785,11 +1786,8 @@ export default {
             for (let i = 0; i < this.templateData.length; i++) {
               if (this.templateData[i].templateCode === 'tag008') {
                 // 这里有多个value
-                console.log(this.templateData[i].addSelectTags);
                 value = tagValue.val[0].data.value.split(' ');
                 selectVal = tagParams.selectedVal[1].split(',');
-                console.log(tagValue.val[0].data.value);
-                console.log(selectVal);
                 selectVal.forEach((el, inx) => {
                   let item = this.templateData[i].addSelectTags.find(val => val.value === el);
                   if (!item) {
@@ -1963,8 +1961,19 @@ export default {
 
               }
             }
-            // this.confirmSelector();
-            // this.select.expends = false;
+            break;
+          case 'tag026':
+            for (let i = 0; i < tagParams.template.length; i++) {
+              if (tagParams.template[i].templateCode == 'tag026') {
+                this.templateData[i].channel=tagValue.val[0].data.key==='consentPrivacyProtocolTime'?0:1;
+                if (this.templateData[i].channel) {
+                  this.templateData[i].event=tagValue.val[0].data.key==='wemobVisitConsentProtocolTime'?0:1;
+                }else{
+                  this.templateData[i].isAgree=tagValue.val[0].data.compute==='!'?0:1;
+                }
+                this.templateData[i].date=timeFormat.timeToDateTime(tagValue.val[0].data.value)||null
+              }
+            }
             break;
 
           case 'com022':

src/components/tagDetail/mixin/index.js

@@ -1139,7 +1139,7 @@ export default {
       if (Array.isArray(tagParams.selectedVal) && tagParams.selectedVal.length) {
         tagParams.selectedVal = tagParams.selectedVal.map(el => el.replace(/(null|undefined)/g, ''));
       }
-      // console.log(this.postTemplateData.conditionList);
+        // console.log(this.postTemplateData.conditionList);
       await this.addToTemp(tagValue, tagParams);
       return true;
     },
@@ -1863,7 +1863,6 @@ export default {
       let selectVal = null;
       let checkedCount = null;
 
-
       // compute 是计算属性的区间值 value是选中的值
       for(let i = 0; i < this.templateDataList.templateCode.length; i++) {
         switch (this.templateDataList.templateCode[i]) {
@@ -2055,7 +2054,6 @@ export default {
               }
             }
             break;
-
           // 之后的天数
           case 'tag006':
             for (let i = 0; i < this.templateData.length; i++) {

src/view/memberGroup/memberGroupEdit.vue

@@ -225,7 +225,8 @@ import { getMemberTagCount } from '@/request/memberGroup.js';
 import { getMemberTagList, memberGroupList, getIsAllowAdd, groupCount } from '@/request/api.js';
 import { parseTime } from '@/utils'
 
-const fixBeginTime = +new Date() + (1000 * 60 * 60 * 24);
+let fixBeginTime = +new Date() + (1000 * 60 * 60 * 24);
+let fixEndTime = +new Date() + (1000 * 3600 * 24 * 91);
 
 export default {
   name: 'memberGroupEdit',
@@ -288,7 +289,7 @@ export default {
         effectiveStatus: 1,
         fixedType: 0, // 是否固化人群
         fixedTime: parseTime(fixBeginTime, '{y}-{m}-{d}'), // 期初固化时间
-        fixedEndTime: parseTime(fixBeginTime + 2 * 365 * 24 * 3600 * 1000, '{y}-{m}-{d}'), // 期末固化时间
+        fixedEndTime: parseTime(fixEndTime, '{y}-{m}-{d}'), // 期末固化时间
       },
       refreshList: {},
 
@@ -301,8 +302,8 @@ export default {
       pickerOptions: {
         disabledDate(time) {
           let curDate = new Date().getTime();
-          let oneYear = 2 * 365 * 24 * 3600 * 1000;
-          let y = curDate + oneYear;
+          let twoYears = 2 * 365 * 24 * 3600 * 1000;
+          let y = curDate + twoYears;
           return time.getTime() < Date.now() - 8.64e7 || time.getTime() > y;
         }
       },
@@ -310,7 +311,7 @@ export default {
         disabledDate(date) {
           let beginDate = parseTime(fixBeginTime, '{y}-{m}-{d}');
           beginDate = `${beginDate} 00:00:00`
-          return new Date(date) < new Date(beginDate);
+          return new Date(date) < new Date(beginDate)||new Date(date) > new Date(fixEndTime);
         }
       },
       // 会员分组分类
@@ -424,19 +425,29 @@ export default {
    * 1=实时 0=非实时
    */
   watch: {
-    'ruleForm.selectedTags': {
+    ruleForm: {
       deep: true,
-      handler() {
+      handler: function(n,o){
         let flag =
           this.ruleForm.selectedTags.length === 0 ||
           this.ruleForm.selectedTags.some(tagsGroup => {
             return tagsGroup.length === 0 || tagsGroup.some(tag => parseInt(tag.isActive) === 0);
           });
         this.ruleForm.isActive = flag ? 0 : 1;
+        fixEndTime=+new Date(n.effectiveDateTmp) + (1000 * 60 * 60 * 24)
+        this.ruleForm.fixedEndTime=parseTime(fixEndTime)
       }
     }
   },
   methods: {
+    // 设置默认的分组有效期
+    defaultDate() {
+      let date = new Date(new Date().getTime() + 90 * 24 * 3600 * 1000);
+      let Y = date.getFullYear() + '-';
+      let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
+      let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
+      this.ruleForm=Object.assign({},this.ruleForm,{effectiveDateTmp: Y + M + D + '23:59:59'})
+    },
     _groupCount() {
       groupCount().then(res => {
         if (res.errorCode == 1) {
@@ -742,6 +753,7 @@ export default {
       let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
       this.ruleForm.effectiveDateTmp = Y + M + D + '23:59:59';
     }
+    this.defaultDate();
     this.getTagsList();
     this.getTagsGroupList();
     this.getMemberGroupList();