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

src/components/common/choiceArea.vue

@@ -93,13 +93,13 @@
             <div class="pic-list" :style="style" v-if="picList && picList.length > 0">
               <template v-for="(item, Subindex) in picList">
                 <div :style="item" :key="Subindex">
-                  <img :src="item.pic_url" style="width: 100%;visibility: hidden;display: block;">
+                  <img :src="getIconLink(item.pic_url)" style="width: 100%;visibility: hidden;display: block;">
                 </div>
-                <img :src="item.pic_url" :key="Subindex+1" style="width: 100%;visibility: hidden;display: block;">
+                <img :src="getIconLink(item.pic_url)" :key="Subindex+1" style="width: 100%;visibility: hidden;display: block;">
               </template>
             </div>
             <div :style="style" flex="dir:left main:center cross:center" v-else>
-              <img style="width: auto;height: auto;max-width: 100%;max-height: 100%" :src="picUrl">
+              <img style="width: auto;height: auto;max-width: 100%;max-height: 100%" :src="getIconLink(picUrl)">
             </div>
           </div>
         </div>

src/components/pintuan/pintuanActive.vue

@@ -396,7 +396,7 @@
                 :SpecPriceList="TempSpecPriceList"></groupStep>
             </el-tab-pane>
             <el-tab-pane label="分销价设置">
-              <distributePrice :shareGroup_list="TempGroupPriceList"></distributePrice>
+              <distributePrice v-if="TempSpecList&&TempSpecList.length>0" :addMsg="addMsg" :shareGroup_list="TempGroupPriceList"></distributePrice>
             </el-tab-pane>
             <el-tab-pane label="会员价设置">
               <memberPrice :SpecificationPriceList="TempSpecPriceList" :SpecificationList="TempSpecList"></memberPrice>
@@ -527,6 +527,9 @@
           App_share_pic: '', //自定义分享图片
           IsCustomSpecification: 2, // 是否自定义规格  1是  2否
           GroupList:[],//阶梯价格
+          SeparateDistribution:2,//是否开启单独分销   1是  2否
+          SeparateDistributionType:1,//单独分销类型  1普通设置  2详细设置
+          SeparateDistributionMoneyType:1,//分销佣金类型   2固定金额   1百分比
         },
         IsShowSpec: false, //是否显示规格
         TempSpecList: [], //规格列表
@@ -633,6 +636,17 @@
               this.addMsg.GroupList = Mydata.GroupList;
               this.TempGroupPriceList = Mydata.GroupList;
             }
+            this.addMsg.SeparateDistribution=Mydata.SeparateDistribution;
+            this.addMsg.SeparateDistributionType=Mydata.SeparateDistributionType;
+            if(this.addMsg.SeparateDistributionType==0)
+            {
+                this.addMsg.SeparateDistributionType=1;
+            }
+            this.addMsg.SeparateDistributionMoneyType=Mydata.SeparateDistributionMoneyType;
+            if(this.addMsg.SeparateDistributionMoneyType==0)
+            {
+                this.addMsg.SeparateDistributionMoneyType=2
+            }
             this.IsShowSpec = true;
           } else {
             this.Error(res.data.message);