Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/pintuan/pintuanSet.vue

@@ -216,13 +216,15 @@
                 <el-switch v-model="msg.Is_Territorial_Limitation" active-color="#409EFF" :active-value="1"
                   :inactive-value="0">
                 </el-switch>
-                <span class="red">注：必须在“<el-button type="text" @click="openNewUrl('regionBuy')">系统管理=>区域允许购买</el-button>”中开启，才能使用</span>
+                <span class="red">注：必须在“<el-button type="text" @click="openNewUrl('regionBuy')">系统管理=>区域允许购买</el-button>
+                  ”中开启，才能使用</span>
               </el-form-item>
               <el-form-item label="支付方式" size="mini">
                 <el-tooltip class="item" effect="dark" content="默认支持线上支付；若三个都不勾选，则视为勾选线上支付" placement="top">
                   <i class="topelzk elzk el-tooltip el-icon-info"></i>
                 </el-tooltip>
-                <el-checkbox-group v-model="msg.Payment_TypeList" :min="1" style="display:inline-block;margin-left:10px;">
+                <el-checkbox-group v-model="msg.Payment_TypeList" :min="1"
+                  style="display:inline-block;margin-left:10px;">
                   <el-checkbox label="online_pay">线上支付</el-checkbox>
                   <el-checkbox label="huodao">货到付款</el-checkbox>
                   <el-checkbox label="balance">余额支付</el-checkbox>
@@ -293,7 +295,7 @@
             </div>
           </div>
           <div>
-            <div class="app-banner-list" v-for="(item,index) in msg.imgList" :key="index">
+            <div class="app-banner-list" v-for="(item,index) in msg.BannerList" :key="index">
               <div class="el-card app-banner-list-item">
                 <div style="padding:0">
                   <div style="position: relative;">
@@ -446,10 +448,9 @@
           RuleText: '', //活动规则
           Is_Advertisement: 1, //拼团广告状态
           Goods_Poster: "",
-
           Style: 0, //魔方样式
-          MagicDataList: [],
-          imgList: []
+          MagicDataList: [], //广告列表
+          BannerList: [], //轮播图
         },
         //样式选择枚举
         styleList: [{
@@ -551,8 +552,10 @@
       },
       //保存拼团配置
       saveGroupBuyConfig() {
-        let content = this.$refs.ue.getUEContent();
-        this.msg.RuleText = content;
+        if (this.checkIndex == 1) {
+          let content = this.$refs.ue.getUEContent();
+          this.msg.RuleText = content;
+        }
         this.apipost("/api/GroupBuy/SetGroupBuyConfig", this.msg, res => {
           if (res.data.resultCode == 1) {
             this.getGroupBuyConfig();
@@ -567,22 +570,28 @@
         this.apipost("/api/GroupBuy/GetGroupBuyConfigModule", {}, res => {
           if (res.data.resultCode == 1) {
             var dataObj = res.data.data;
-            console.log("dataObj", dataObj);
             if (dataObj) {
-                this.msg.GroupByConfigId=dataObj.GroupByConfigId;
-                this.msg.Is_Share=dataObj.Is_Share;
-                this.msg.Is_Territorial_Limitation=dataObj.Is_Territorial_Limitation;
-                this.msg.Payment_TypeList=dataObj.Payment_TypeList;
-                this.msg.Send_TypeList=dataObj.Send_TypeList;
-                this.msg.Is_Coupon=dataObj.Is_Coupon;
-                this.msg.SVIP_Status=dataObj.SVIP_Status;
-                this.msg.Is_Member_Price=dataObj.Is_Member_Price;
-                this.msg.Is_Integral=dataObj.Is_Integral;
-                this.msg.Is_Advertisement=dataObj.Is_Advertisement;
-                this.msg.Goods_Poster=dataObj.Goods_Poster;
-                if (dataObj.RuleText && dataObj.RuleText != "") {
-                    this.msg.RuleText=dataObj.RuleText;
-                }
+              this.msg.GroupByConfigId = dataObj.GroupByConfigId;
+              this.msg.Is_Share = dataObj.Is_Share;
+              this.msg.Is_Territorial_Limitation = dataObj.Is_Territorial_Limitation;
+              this.msg.Payment_TypeList = dataObj.Payment_TypeList;
+              this.msg.Send_TypeList = dataObj.Send_TypeList;
+              this.msg.Is_Coupon = dataObj.Is_Coupon;
+              this.msg.SVIP_Status = dataObj.SVIP_Status;
+              this.msg.Is_Member_Price = dataObj.Is_Member_Price;
+              this.msg.Is_Integral = dataObj.Is_Integral;
+              this.msg.Is_Advertisement = dataObj.Is_Advertisement;
+              this.msg.Goods_Poster = dataObj.Goods_Poster;
+              if (dataObj.RuleText && dataObj.RuleText != "") {
+                this.msg.RuleText = dataObj.RuleText;
+              }
+              this.msg.Style = dataObj.Style;
+              if (dataObj.BannerList) {
+                this.msg.BannerList = dataObj.BannerList;
+              }
+              if (dataObj.MagicDataList) {
+                this.msg.MagicDataList = dataObj.MagicDataList;
+              }
             }
           } else {
             this.Info(res.data.message);
@@ -634,11 +643,11 @@
         this.commonTitle = '添加轮播图';
         var obj = JSON.parse(JSON.stringify(this.addMsg))
         if (!this.isEditLunbo) {
-          this.msg.imgList.push(obj);
+          this.msg.BannerList.push(obj);
         } else {
-          this.msg.imgList[this.commonImgIndex].NavName = obj.NavName;
-          this.msg.imgList[this.commonImgIndex].NavLink = obj.NavLink;
-          this.msg.imgList[this.commonImgIndex].NavImg = obj.NavImg;
+          this.msg.BannerList[this.commonImgIndex].NavName = obj.NavName;
+          this.msg.BannerList[this.commonImgIndex].NavLink = obj.NavLink;
+          this.msg.BannerList[this.commonImgIndex].NavImg = obj.NavImg;
         }
         this.isShowLunbo = false;
       },
@@ -654,7 +663,7 @@
       },
       //删除
       RemmoveRole(index) {
-        this.msg.imgList.splice(index, 1);
+        this.msg.BannerList.splice(index, 1);
       },
       //新窗口打开链接
       openNewUrl(path) {