增加固定时间之后时间标签

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

@@ -666,6 +666,38 @@
         <vue-gic-goods-selector ref="selector" @changelist="changelist"></vue-gic-goods-selector>
         <!-- <vue-gic-selector ref="selector" @changelist="changelist"></vue-gic-selector> -->
       </div>
+
+      <!-- 标签值 / 固定时间 / 之后时间 tag024 -->
+      <template v-if="parent.templateCode == 'tag024'">
+        <div class="m-b-20" :key="'tag24' + pindex">
+          <div>
+            <el-radio v-model="parent.radio" label="1">固定时段</el-radio>
+            <el-radio v-model="parent.radio" label="2">之后时段</el-radio>
+          </div>
+          <!-- 固定时段 -->
+          <div class="m-t-18 w-500 h-80 fixed-date-picker border-box bg-f3f6f9">
+            <label class="inline-block middle label-unit m-r-8" v-if="parent.radio == 1">时间范围</label
+            ><el-date-picker
+              v-model="parent.dateRangeValue"
+              v-if="parent.radio == 1"
+              type="daterange"
+              :editable="false"
+              range-separator="至"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              format="yyyy-MM-dd"
+              value-format="yyyyMMdd"
+              :picker-options="tag024Options"
+              ><!-- :picker-options="pickerOptions"  -->
+            </el-date-picker>
+            <div v-if="parent.radio == 2">
+              <label class="inline-block middle label-unit m-r-8">之后</label
+              ><el-input v-model="parent.afterday" placeholder="请输入" class="w-90 m-r-8" @blur="value => toEditInput(value, 'afterday', parent)"></el-input
+              ><label class="inline-block middle label-unit">天</label>
+            </div>
+          </div>
+        </div>
+      </template>
     </div>
   </div>
 </template>
@@ -678,7 +710,7 @@ import VueGicCard from '@/components/card/card';
 import { getTagType, findWidget, findOndJson } from '@/request/tagConfig';
 
 // 两个数字区间 numRange [0, 1]
-const templateCode = ['tag001', 'tag002', 'tag003', 'tag004', 'tag005', 'tag006', 'tag007', 'tag008', 'tag009', 'tag010', 'tag011', 'tag012', 'tag013', 'tag014', 'tag015', 'tag016', 'tag017', 'tag018'];
+const templateCode = ['tag001', 'tag002', 'tag003', 'tag004', 'tag005', 'tag006', 'tag007', 'tag008', 'tag009', 'tag010', 'tag011', 'tag012', 'tag013', 'tag014', 'tag015', 'tag016', 'tag017', 'tag018', 'tag024'];
 
 /**
  * checkeditems 多选框
@@ -925,6 +957,16 @@ export default {
       com023: {
 
       },
+      tag024: {
+        radio: '1',
+        dateRangeValue: [],
+        afterday: ''
+      },
+      tag024Options: {
+        disabledDate(time) {
+          return time.getTime() < new Date(new Date().toLocaleDateString()).getTime();
+        }
+      },
       cardListData: []
     };
   },

src/components/tagDetail/mixin/index.js

@@ -914,6 +914,26 @@ export default {
             });
             that.postTemplateData.selectedVal.push(that.postTemplateData.selectedVal.join(','));
           }
+          if (ele.templateCode === 'tag024') {
+            if (ele.radio == 1 && !ele.dateRangeValue.length) {
+              returnFlag = false;
+            }
+            if (ele.radio == 2 && !ele.afterday) {
+              returnFlag = false;
+            }
+
+            if (ele.radio == 1) {
+              tagValue.time[0].type = 'between';
+              tagValue.time[0].value = ele.dateRangeValue.join(',');
+              that.postTemplateData.selectedVal.push(`时间范围为${ele.dateRangeValue[0]} 至 ${ele.dateRangeValue[1]}`);
+            }
+            // tagValue.val[0].data.compute = ele.postCompute;
+            if (ele.radio == 2) {
+              tagValue.time[0].type = 'afterday';
+              tagValue.time[0].value = String(ele.afterday);
+              that.postTemplateData.selectedVal.push(`时间范围为之后 ${ele.afterday} 天`);
+            }
+          }
         }
       }
 

src/view/memberGroup/memberGroupList.vue

@@ -211,6 +211,11 @@
                 {{ (scope.row.memberCount || 0) | formatNum }} 人
               </template>
             </el-table-column>
+            <el-table-column prop="appStatus" label="好办展示" >
+              <template slot-scope="scope">
+                <el-switch :active-value="1" :inactive-value="0" v-model="scope.row.appStatus" active-color="#1890ff" @change="switchAppStatus(scope.row.appStatus, scope.row)"> </el-switch>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" width="150px">
               <template slot-scope="scope">
                 <router-link