Merge branch 'wuyue'

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

@@ -517,8 +517,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              :default-time="['000000', '235959']">
+              value-format="yyyy-MM-dd HH:mm:ss">
             </el-date-picker>
           </div>
           <!-- 相对时段 -->
@@ -587,7 +586,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               format="yyyy-MM-dd"
-              :default-time="['000000', '235959']"
               value-format="yyyyMMdd">
             </el-date-picker>
           </div>

src/request/api.js

@@ -155,3 +155,13 @@ export const memberTagGroupList = params =>
     method: 'get',
     params
   });
+
+export const getIsAllowAdd = params =>
+  request({
+    url: '/member-tag-group/over-count',
+    method: 'get',
+    params: {
+      requestProject: 'gic-member-tag-web',
+      ...params
+    }
+  });

src/view/memberGroup/memberGroupEdit.vue

@@ -87,7 +87,7 @@
             >
               <div class="label-title">
                 更新频率
-                <span class="form-tip-text">(更新时间预计选择日期的凌晨0点至6点)</span>
+                <span class="form-tip-text">(更新时间预计选择日期的0点至9点)</span>
               </div>
               <el-select
                 class="w-200"
@@ -117,7 +117,11 @@
               </el-select>
             </el-form-item>
             <el-form-item label :class="{'m-l-60': ruleForm.selectedTags.length > 1}">
+              <el-tooltip class="item" effect="dark" content="您商户的非实时分组数量已达到上限" placement="top-start" v-if="isAllowAdd && ruleForm.isActive == 0">
+                <el-button type="primary" style="color: #c0c4cc;cursor: not-allowed;background-image: none;background-color: #F5F7FA;border-color: #DCDFE6;">{{$route.query.memberTagGroupId ? '保存': '创建会员分组'}}</el-button>
+              </el-tooltip>
               <el-button
+                v-else
                 type="primary"
                 @click.stop="confirmSavePost"
               >{{$route.query.memberTagGroupId ? '保存': '创建会员分组'}}</el-button>
@@ -194,7 +198,7 @@ import tagsGroupList from './tags-group-list.vue';
 import showMsg from '@/common/js/showmsg';
 import { postRequest } from '@/api/api';
 import { getMemberTagCount } from '@/request/memberGroup.js';
-import { getMemberTagList, memberGroupList } from '@/request/api.js';
+import { getMemberTagList, memberGroupList, getIsAllowAdd } from '@/request/api.js';
 
 export default {
   name: 'memberGroupEdit',
@@ -348,7 +352,9 @@ export default {
       // 分页相关
       pageNum: 1,
       pageSize: 20,
-      total: 0
+      total: 0,
+
+      isAllowAdd: false,
     };
   },
   computed: {
@@ -657,6 +663,11 @@ export default {
         .catch(err => {
           console.log(err);
         });
+    },
+    getIsAllowAdd() {
+      getIsAllowAdd({ tagGroupId: this.$route.query.memberTagGroupId || undefined }).then(res => {
+        res.errorCode === 1 && !res.result && (this.isAllowAdd = res.result);
+      })
     }
   },
   mounted() {
@@ -680,6 +691,7 @@ export default {
     this.getTagsList();
     this.getTagsGroupList();
     this.getMemberGroupList();
+    this.getIsAllowAdd();
   },
   components: {
     navCrumb,

src/view/platformTag/member-tag.vue

@@ -104,7 +104,7 @@
               <span class="textarea-txt">{{ tagConfig.textarea.length }}/200</span>
             </div>
             <div class="form-item" v-show="tagConfig.isRealTime == 0" :class="{ 'margin-60': marginSixty }">
-              <label for="">更新频率<span class="desc-labeltxt">（更新时间预计选择日期的凌晨0点至6点）</span></label>
+              <label for="">更新频率<span class="desc-labeltxt">（更新时间预计选择日期的0点至9点）</span></label>
               <el-select class="w-200" v-model="tagConfig.updateType" placeholder="请选择">
                 <el-option v-for="(item, index) in rateData" :key="item.label" :label="item.label" :value="index + 1"></el-option>
               </el-select>