全部提现设置

src/components/UserMan/baseSet.vue

@@ -130,6 +130,10 @@
                 <el-checkbox v-for="item in WithdrawWayList" :label="item.Id" :key="item.Id" v-if="item.Id !=6">{{item.Name}}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
+            <el-form-item label="全部提现">
+              <el-switch v-model="addMsg.IsWithdrawAll" active-color="#409EFF" :active-value="1" :inactive-value="2">
+              </el-switch>
+            </el-form-item>
             <el-form-item class="commonLabel" label="最少提现额度" prop="MinimumWithdrawalLimit">
               <el-input v-model="addMsg.MinimumWithdrawalLimit" style="width:293px;" type="number" min="1" size="small"
                 placeholder="请输入" class="input-with-select">

src/components/UserMan/distributionOrder.vue

@@ -142,7 +142,9 @@
                                             title=""
                                             width="200"
                                             trigger="hover"
-                                            :content="'商品小计 '+ item.Income">
+                                            >
+                                            <div>商品小计：{{item.Income}}</div>
+                                            <div v-if="item.CouponMoney>0">优惠金额：{{item.CouponMoney}}</div>
                                             <img slot="reference" src="../../assets/img/userman/price.png" alt="">
                                         </el-popover>
                                     </div>

src/components/UserMan/tinyMerchant/tinyMerchantSet.vue

@@ -10,7 +10,7 @@
             <span>微店设置</span>
           </div>
           <div>
-             
+
             <el-form-item label="是否开开启">
               <el-radio v-model="addMsg.IsOpen" :label="2">开启</el-radio>
               <el-radio v-model="addMsg.IsOpen" :label="1"  @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.CustomMinFixedPrice = 0,addMsg.CustomMaxFixedPrice = 0">不开启</el-radio>
@@ -50,7 +50,7 @@
               <el-radio v-model="addMsg.PriceType" :label="1" @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.CustomMinFixedPrice = 0,addMsg.CustomMaxFixedPrice = 0">区间价格百分比</el-radio>
               <el-radio v-model="addMsg.PriceType" :label="2"  @change="addMsg.CustomMinPriceRate = 0 ,addMsg.CustomMaxPriceRate = 0,addMsg.CustomMinFixedPrice = 0,addMsg.CustomMaxFixedPrice = 0">固定价格</el-radio>
             </el-form-item> -->
-            <el-form-item 
+            <el-form-item
               class="commonLabel" label="区间价格">
               <el-input style="width:200px;" type="number" min="0" size="small" placeholder="请输入"
                 v-model="addMsg.CustomMinPriceRate" class="input-with-select">
@@ -68,7 +68,7 @@
             </el-form-item>
             <el-form-item  class="commonLabel"
               label="固定价格">
-             
+
               <el-input style="width:200px;" type="number" min="0" size="small" placeholder="请输入"
                 v-model="addMsg.CustomMinFixedPrice" class="input-with-select">
                 <el-button slot="append">
@@ -83,8 +83,8 @@
                 </el-button>
               </el-input>
             </el-form-item>
-           
-            
+
+
 
           </div>
         </el-card>
@@ -96,7 +96,7 @@
             </el-tooltip>
           </div>
           <div>
-        
+
           </div>
         </el-card> -->
         <el-card class="box-card" style="margin-top:10px">
@@ -112,6 +112,10 @@
                    <el-checkbox v-for="item in WithdrawWayList" :label="item.Id" :key="item.Id" >{{item.Name}}</el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
+            <el-form-item label="全部提现">
+              <el-switch v-model="addMsg.IsAllCommission" active-color="#409EFF" :active-value="1" :inactive-value="2">
+              </el-switch>
+            </el-form-item>
             <el-form-item class="commonLabel" label="最少提现额度" prop="MinWithdrawal">
               <el-input v-model="addMsg.MinWithdrawal" style="width:293px;" type="number" min="1" size="small"
                 placeholder="请输入" class="input-with-select">
@@ -156,7 +160,7 @@
               <el-input style="width:293px" type="textarea" :rows="2" placeholder="用户须知" v-model="addMsg.UserNotice">
               </el-input>
             </el-form-item>
-    
+
           </div>
         </el-card>
       </el-form>
@@ -166,7 +170,7 @@
       <el-button size="small" type="primary" @click="Save('addMsg')">保存</el-button>
     </div>
 
-  
+
   </div>
 </template>
 <script>
@@ -205,7 +209,7 @@
             message: '请选择佣金类型',
             trigger: 'change'
           }],
-       
+
           WithdrawWay: [{
             type: 'array',
             required: true,
@@ -228,9 +232,9 @@
             trigger: 'blur'
           }],
         },
-   
+
         getGradeByTypeList:[],
-        
+
 
       };
     },
@@ -296,8 +300,8 @@
 
         })
       },
-     
-     
+
+
       getData() {
         this.loading = true;
         this.apipost("/api/MallBase/GetMicroShopBasicsInfo", {}, res => {
@@ -315,10 +319,10 @@
           }
         })
       },
-     
-  
-   
-    
+
+
+
+
 
 
     },