Merge branch 'feature/6/31' into test

src/components/ruleDetail.vue

@@ -51,13 +51,20 @@
       </div>
     </el-form-item>
     <el-form-item v-show="ruleForm.memberType === 4">
-      <vue-gic-store-new
+      <!-- <vue-gic-store-new
         :isAdd="isAdd || !uuid"
         :uuid.sync="uuid"
         ref="storeGroup"
         :creatorId="ruleForm.creatorId"
         @store-change="storeChange"
-      />
+      /> -->
+       <dm-store-selector
+          :creatorId="ruleForm.creatorId"
+           ref="storeGroup"
+           @store-change="storeChange"
+           v-if="canShowStoreSelector"
+          :uuid="uuid">
+        </dm-store-selector>
     </el-form-item>
     <vue-gic-people
       v-show="ruleForm.memberType === 3&&$store.state.product.ruleMemberFilterClose==0"
@@ -157,6 +164,9 @@ export default {
         return !(this.memberType == 3 || this.memberType == 2) && this.memberTypeTotal >= 20;
       }
     },
+    canShowStoreSelector () {
+      return this.uuid || this.isAdd || this.memberType == 3 || this.memberType == 2;
+    },
   },
   mounted () {
     if (!this.isAdd) {
@@ -185,27 +195,28 @@ export default {
       this.loading = true;
       request.get('/api-integral-mall/get-rule', { params: { integralMallProRuleId } }).then(res => {
         if (res.data.result) {
-          this.ruleForm = res.data.result;
-          this.memberType = this.ruleForm.memberType;
-          if (this.ruleForm.memberType == 3) { // 人群筛选器回显
-            this.hasSearchData = this.ruleForm.filterJson;
-            this.useId = this.ruleForm.searchId;
+          const data = res.data.result;
+          this.memberType = data.memberType;
+          if (data.memberType == 3) { // 人群筛选器回显
+            this.hasSearchData = data.filterJson;
+            this.useId = data.searchId;
             if (this.isCopy) {
               const form = new FormData();
               form.append('requestProject', 'integral-mall');
-              form.append('id', this.ruleForm.searchId);
+              form.append('id', data.searchId);
               request.post('/api-plug/get-screening-detail', form).then(res => {
-                this.ruleForm.searchJson = res.data.result && res.data.result.detail;
+                data.searchJson = res.data.result && res.data.result.detail;
               });
             }
-          } else if (this.ruleForm.memberType == 4) { // 门店筛选器回显
-            this.uuid = JSON.parse(this.ruleForm.filterJson).storeWidgetId;
-          } else if (this.ruleForm.memberType == 2) {
-            this.selectedGroupIds = this.ruleForm.filterJson;
+          } else if (data.memberType == 4) { // 门店筛选器回显
+            this.uuid = JSON.parse(data.filterJson).storeWidgetId;
+          } else if (data.memberType == 2) {
+            this.selectedGroupIds = data.filterJson;
           }
           if (this.isCopy) {
-            this.ruleForm.creatorId = localStorage.getItem('useId');
+            data.creatorId = localStorage.getItem('useId');
           }
+          this.ruleForm = data;
         }
       }).finally(() => {
         this.loading = false;

src/views/goods/gift/detail.vue

@@ -285,6 +285,7 @@
                   :value="item.gradeId"
                 />
               </el-select>
+              <span  style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;">注意，该字段的配置也会影响到可见配置，请谨慎</span>
             </el-form-item>
             <el-form-item prop="ladder" v-if="specialOrder">
               <el-checkbox-group v-model="giftForm.ladder" @change="changeladder" style="display:inline-block">