Merge branch 'feature/6/31' into dev

src/components/relatePop.vue

@@ -153,10 +153,14 @@ export default {
         this.tableDate = this.tableDate.splice(0);
         if (this.echoRuleId) this.tableRadio = this.echoRuleId;
         this.tableDate.forEach(async item => {
-          if (item.memberType == 3 && !item.showBack) {
-            const res = await this.echoData(item.filterJson);
-            item.showBack = res.data.result;
-          } else if (item.memberType == 4 && !item.showBack) {
+          if (item.memberType == 3) {
+            if (item.filterJson) {
+              const res = await this.echoData(item.filterJson);
+              item.showBack = res.data.result;
+            } else {
+              item.showBack = '所有人群';
+            }
+          } else if (item.memberType == 4) {
             const { storeMode, storeWidgetId } = JSON.parse(item.filterJson);
             const res = await this.echoData2(storeWidgetId, storeMode);
             const { data: { result: { result } } } = res;

src/components/ruleDetail.vue

@@ -258,13 +258,12 @@ export default {
       } else if (this.ruleForm.memberType == 3) {
         if (this.hasEditGicPeople) {
           this.$refs.peopleFilter.confirmSet().then(async () => {
-            // const res = await this.echoData(this.ruleForm.filterJson);
-            // this.ruleForm.showBack = res.data.result;
             this.submitRequest();
           });
         } else {
-          // const res = await this.echoData(this.ruleForm.filterJson);
-          // this.ruleForm.showBack = res.data.result;
+          this.ruleForm.filterJson = '';
+          this.ruleForm.searchJson = '';
+          this.ruleForm.searchId = '';
           this.submitRequest();
         }
       } else if (this.ruleForm.memberType == 4) {