update: 分组调整

src/components/Trash.vue

@@ -3,9 +3,10 @@
     <el-popover placement="top-start" trigger="hover" content="一键清除废弃标签值">
       <div slot="reference" class="trash" @click="dialogVisible = true">
         <!-- $store.state.delTrashNum 该值在活动标签和手工标签列表删除里也有更新 -->
-        <el-badge :value="$store.state.delTrashNum > 99 ? '99+' : $store.state.delTrashNum" class="badge">
+        <el-badge v-if="$store.state.delTrashNum != 0" :value="$store.state.delTrashNum > 99 ? '99+' : $store.state.delTrashNum" class="badge">
           <i class="iconfont icon-delete trashIcon"></i>
         </el-badge>
+        <i v-else class="iconfont icon-delete trashIcon" />
       </div>
     </el-popover>
     <el-dialog title="删除标签" :visible.sync="dialogVisible" width="600px" @open="dialogOpen" @closed="dialogClosed">

src/view/memberGroup/memberGroupEdit.vue

@@ -332,8 +332,7 @@ export default {
       },
       realTimeOptions: {
         disabledDate: date => {
-          const oneDay = 24 * 60 * 60 * 1000
-          return date.getTime() < +new Date() || date.getTime() > +new Date() + oneDay
+          return date.getTime() < +new Date()
         }
       },
       // 会员分组分类

src/view/memberGroup/memberGroupList.vue

@@ -161,7 +161,7 @@
               :current-page="currentPage"
               :page-sizes="[10, 20, 30, 40]"
               :page-size="pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
+              layout="total, prev, pager, next, jumper"
               :total="total">
             </dm-pagination>
           </div>
@@ -368,7 +368,7 @@
               :current-page="currentPage"
               :page-sizes="[10, 20, 30, 40]"
               :page-size="pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
+              layout="total, prev, pager, next, jumper"
               :total="total">
             </dm-pagination>
           </div>
@@ -458,7 +458,7 @@
               :current-page="currentPage"
               :page-sizes="[10, 20, 30, 40]"
               :page-size="pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
+              layout="total, prev, pager, next, jumper"
               :total="total"
             >
             </dm-pagination>

src/view/platformTag/member-tag.vue

@@ -83,9 +83,10 @@
             <!-- 我的标签 -->
             <div class="my-pop-tagbox" @click="expendsGroupList" :limit-code="$buttonCode.memberTagCreateGroup" v-if="$getButtonLimit($buttonCode.memberTagCreateGroup)">
               <p class="txt">
-                <el-badge :value="groupListNumber">
+                <el-badge v-if="groupListNumber != 0" :value="groupListNumber">
                   <i class="iconfont icon-biaoqian" style="margin-bottom:2px"></i>
                 </el-badge>
+                <i v-else class="iconfont icon-biaoqian" style="margin-bottom:2px" />
                 <span>已选标签</span>
               </p>
             </div>
@@ -147,7 +148,7 @@
             </el-radio-group>
           </div>
           <div :class="['form-item', 'm-t-10']" v-if="tagConfig.fixedType">
-            <label for="">固化生效时间</label>
+            <label for="">固化生效时间{{ tagConfig.isRealTime }}</label>
             <el-date-picker
               :clearable="false"
               :picker-options="tagConfig.isRealTime ? realTimeOptions : fixedTimeOptions"
@@ -287,8 +288,7 @@ export default {
       },
       realTimeOptions: {
         disabledDate: date => {
-          const oneDay = 24 * 60 * 60 * 1000
-          return date.getTime() < +new Date() || date.getTime() > +new Date() + oneDay
+          return date.getTime() < +new Date()
         }
       },
       // 面包屑参数
@@ -720,7 +720,7 @@ export default {
       localStorage.setItem('middleHandtag', JSON.stringify(list));
     },
     getMemberGroupList() {
-      memberGroupList({ requestProject: 'gic-member-tag-web' })
+      memberGroupList({ requestProject: 'gic-member-tag-web', type: 0 })
         .then(res => {
           let { errorCode, message, result } = res;
           if (errorCode !== 1) {