Merge branch 'wuyue' into dev

src/view/memberGroup/memberGroupEdit.vue

@@ -117,8 +117,8 @@
               </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">
-                <el-button type="primary" style="color: #c0c4cc;cursor: not-allowed;background-image: none;background-color: #F5F7FA;border-color: #DCDFE6;">创建会员分组</el-button>
+              <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
@@ -682,7 +682,6 @@ export default {
       this.ruleForm.memberTagGroupId = memberTagGroupId;
       this.getGroupData();
     } else {
-      this.getIsAllowAdd();
       let date = new Date(new Date().getTime() + 365 * 24 * 3600 * 1000);
       let Y = date.getFullYear() + '-';
       let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
@@ -692,6 +691,7 @@ export default {
     this.getTagsList();
     this.getTagsGroupList();
     this.getMemberGroupList();
+    this.getIsAllowAdd();
   },
   components: {
     navCrumb,