Merge branch 'feature/9月迭代' of http://git.gicdev.com/memberTag/memberTag-web into dev

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

@@ -529,14 +529,20 @@
                   <el-radio label="3">年</el-radio>
                 </el-radio-group>
               </div>
-              <div class="m-t-20">
+              <template  v-if="columnKey==='haobanWechatRelatedTime'">
+                <div class="m-t-20" v-if="parent.timeRadio!=='1'">
+                  <label class="inline-block w-98"></label>
+                    <el-checkbox v-model="parent.timeChecked" @change="currentDayChange($event, parent)">
+                      当{{  parent.timeRadio == 2 ? '月' : '年' }}
+                    </el-checkbox>
+                </div>
+              </template>
+              <div class="m-t-20" v-else >
                 <label class="inline-block w-98"></label>
-
                 <el-checkbox v-model="parent.timeChecked" @change="currentDayChange($event, parent)">
-                  当{{ parent.timeRadio == 1 ? '天' : parent.timeRadio == 2 ? '月' : '年' }}
+                   当{{ parent.timeRadio == 1 ? '天' : parent.timeRadio == 2 ? '月' : '年' }}
                 </el-checkbox>
               </div>
-
               <div class="m-t-20">
                 <label class="inline-block w-98"></label>
                 <el-checkbox v-model="parent.timeAfterChecked">
@@ -833,6 +839,7 @@ export default {
 
   props: {
     tagId: String,
+    columnKey: String,
     templateDataList: Object,
     creatorId: String
   },

src/view/memberGroup/edit-tag.vue

@@ -14,7 +14,7 @@
         ><div slot="content"><span style="font-weight:600">固定时段：</span>在所选时间段内首次添加导购企微好友的；<br/><span style="font-weight:600">相对时段：</span>相对于“标签统计时间”（每天凌晨计算统计一次）的前X天/月/年内首次添加导购企微好友的，例：选择相对时段为“最近2天”，那么系统在5号凌晨进行统计时，统计的是在3号、4号首次添加导购企微好友的顾客；系统在6号凌晨统计时，统计的是4号、5号首次添加导购企微好友的顾客。</div><i class="iconfont icon-tishi"></i></el-tooltip></p>
         <!-- 所有标签的配置项 -->
         <div class="tag-config-options">
-          <tag-config-options v-if="isAddFlag" :creatorId="creatorId" :tagId="tagDataAssgin.tagId" ref="tagConfig" :templateDataList="templateObj" @returnTagData="returnTagData"></tag-config-options>
+          <tag-config-options v-if="isAddFlag" :creatorId="creatorId" :tagId="tagDataAssgin.tagId" :columnKey="tagDataAssgin.columnKey" ref="tagConfig" :templateDataList="templateObj" @returnTagData="returnTagData"></tag-config-options>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">