页面修改

src/components/pintuan/pintuanActive.vue

@@ -199,8 +199,8 @@
                     </el-form-item>
                     <el-form-item label="商品服务">
                       <template v-if="addMsg.ServiceList && addMsg.ServiceList.length > 0">
-                        <el-tag style="margin-right:10px;" @close="ServiceCheck(item, index)"
-                          v-for="(item, index) in addMsg.ServiceList" :key="index+'7'" closable>{{ item.Name }}
+                        <el-tag style="margin-right:10px;" v-for="(item, index) in addMsg.ServiceList" :key="index+'7'"
+                          @close="ServiceCheck(item, index)" closable>{{ item.Name }}
                         </el-tag>
                       </template>
                       <el-button @click="serviceDig = true,checkService=[]" v-if="addMsg.IsDefaultService == 2"
@@ -216,11 +216,9 @@
                           <i class="el-tooltip el-icon-info"></i>
                         </el-tooltip>
                       </template>
-                      <template v-if="AreaName && AreaName != ''">
-                        <el-tag style="margin-right:10px;" @close="
-                            (AreaName = ''), (addMsg.FreightId = 0)
-                          " closable>
-                          {{ AreaName }}</el-tag>
+                      <template v-if="addMsg.FreightName && addMsg.FreightName != ''">
+                        <el-tag style="margin-right:10px;" @close="closeTag('FreightName')" :closable="true">
+                          {{addMsg.FreightName}}</el-tag>
                       </template>
                       <el-button @click="chooseyfDig = true" size="mini">选择运费</el-button>
                     </el-form-item>
@@ -232,10 +230,9 @@
                           <i class="el-tooltip el-icon-info"></i>
                         </el-tooltip>
                       </template>
-                      <template v-if="formName && formName != ''">
-                        <el-tag style="margin-right:10px;"
-                          @close="(formName = ''),(checkedForm=''), (addMsg.FormsId = 0)" closable>
-                          {{ formName }}</el-tag>
+                      <template v-if="addMsg.FormsName && addMsg.FormsName != ''">
+                        <el-tag style="margin-right:10px;" @close="closeTag('FormsName')" :closable="true">
+                          {{addMsg.FormsName}}</el-tag>
                       </template>
                       <el-button @click="choosebdDig = true" size="mini">选择表单</el-button>
                     </el-form-item>
@@ -472,7 +469,7 @@
         </el-radio-group>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="chooseyfDig = false">取 消</el-button>
+        <el-button size="small" @click="chooseyfDig=false">取 消</el-button>
         <el-button size="small" @click="chooseyfDig=false" type="primary">确 定</el-button>
       </span>
     </el-dialog>
@@ -480,14 +477,15 @@
     <el-dialog title="选择表单" top="2%" :visible.sync="choosebdDig" width="30%">
       <div>
         <el-radio-group v-model="checkedForm">
-          <el-radio :label="0">
+          <el-radio @change="getCkedForm" style="padding-bottom:10px" class="yfradio" v-for="(item,index) in formsList"
+            :key="index+555" :label="item">
             默认表单
           </el-radio>
         </el-radio-group>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="choosebdDig = false">取 消</el-button>
-        <el-button size="small" @click="getCkedForm" type="primary">确 定</el-button>
+        <el-button size="small" @click="choosebdDig = false" type="primary">确 定</el-button>
       </span>
     </el-dialog>
     <!--区域-->
@@ -577,11 +575,15 @@
         chooseyfDig: false, //运费弹窗
         ruleList: [], //运费数组
         selectYunFei: {}, //选中运费
-        AreaName: '',
 
+        //表单
+        formsList: [{
+          Id: 0,
+          Name: '默认表单'
+        }],
         choosebdDig: false, //选择表单
-        checkedForm: '',
-        formName: '',
+        checkedForm: {},
+
         imgDialog: false,
         //区域
         ChooseAreaList: [],
@@ -620,7 +622,6 @@
           ActivityId: this.addMsg.ActivityId
         }
         this.apipost("/api/GroupBuy/GetGroupbuyActivity", qMsg, res => {
-          console.log("GetGroupbuyActivity", res.data.data);
           if (res.data.resultCode == 1) {
             let Mydata = res.data.data;
             this.addMsg.StartTime = Mydata.StartTimeStr;
@@ -641,7 +642,9 @@
             this.addMsg.IsDefaultService = Mydata.IsDefaultService;
             this.addMsg.ServiceList = Mydata.ServiceList;
             this.addMsg.FreightId = Mydata.FreightId;
+            this.addMsg.FreightName = Mydata.FreightName;
             this.addMsg.FormsId = Mydata.FormsId;
+            this.addMsg.FormsName = Mydata.FormsName;
             this.addMsg.Confine_Count = Mydata.Confine_Count;
             this.addMsg.Confine_Order_Count = Mydata.Confine_Order_Count;
             this.addMsg.Pieces = Mydata.Pieces;
@@ -713,7 +716,6 @@
           this.addMsg.IsCustomSpecification = 1;
         }
         this.apipost("/api/GroupBuy/SetGroupbuyActivity", this.addMsg, res => {
-          console.log("SetGroupbuyActivity", res.data);
           if (res.data.resultCode == 1) {
             this.CommonJump("pintuanList", {});
             this.Success(res.data.message);
@@ -803,20 +805,15 @@
           }
         });
       },
-      //点击radio
+      //运费设置
       YfSelect(val) {
         this.addMsg.FreightId = val.ID;
-        this.AreaName = val.RulesName;
+        this.addMsg.FreightName = val.RulesName;
       },
       //选择默认表单
-      getCkedForm() {
-        if (this.checkedForm === '') {
-          this.addMsg.FormsId = 0;
-        } else {
-          this.addMsg.FormsId = this.checkedForm;
-        }
-        this.formName = '默认表单';
-        this.choosebdDig = false;
+      getCkedForm(val) {
+        this.addMsg.FormsId = val.Id;
+        this.addMsg.FormsName = val.Name;
       },
       //选择图片
       SelectId(msg) {
@@ -854,6 +851,17 @@
         setTimeout(() => {
           this.$refs.child.Receive(this.ChooseAreaList);
         }, 1000);
+      },
+      //关闭标签
+      closeTag(typeName) {
+        if (typeName == 'FreightName') {
+          this.addMsg.FreightId = -1;
+          this.addMsg.FreightName = '';
+        } else if (typeName == 'FormsName') {
+          this.addMsg.FormsId = -1;
+          this.addMsg.FormsName = '';
+        }
+        this.$forceUpdate();
       }
     }
   };

src/components/pintuan/pintuanPlugin/memberPrice.vue

@@ -122,12 +122,8 @@
               rootItem.MemberpriceList.push(memObj)
             })
           });
-          console.log("this.addMsg.GroupList",this.addMsg.GroupList);
           this.$forceUpdate();
-        } else {
-
-
-        }
+        } 
       },
       //获取系统配置的会员列表
       getConfigMemberList() {