本地生活添加商家返补比例

bundle_b/pages/local_shop/local_shop_add.vue

@@ -27,10 +27,12 @@
 						<u-tr>
 							<u-th>商家折扣比例</u-th>
 							<u-th>商品最高返补比例</u-th>
+							<u-th>商家返补比例</u-th>
 						</u-tr>
 						<u-tr>
 							<u-td>{{currentSubsidy.profit}}</u-td>
 							<u-td>{{currentSubsidy.subsidy}}</u-td>
+							<u-td>{{currentSubsidy.store_subsidy}}</u-td>
 						</u-tr>
 					</u-table>
 					<view class="bold">选择此条件是商家折扣比例</view>
@@ -85,7 +87,10 @@
 							<view class="block">商家折扣比例</view>
 						</u-th>
 						<u-th>
-							<view class="block">商品最高返补比例</view>
+							<view class="block">商品最高返补</view>
+						</u-th>
+						<u-th>
+							<view class="block">商家返补比例</view>
 						</u-th>
 						<u-th>
 							<view class="block">操作</view>
@@ -94,6 +99,7 @@
 					<u-tr v-for="(item, index) in subsidy" :key="index">
 						<u-td>{{item.profit}}</u-td>
 						<u-td>{{item.subsidy}}</u-td>
+						<u-td>{{item.store_subsidy}}</u-td>
 						<u-td>
 							<u-button type="error" size="mini" @click="selSubsidy(index)">选择</u-button>
 						</u-td>

bundle_b/pages/local_shop/local_shop_edit.vue

@@ -30,10 +30,12 @@
 						<u-tr>
 							<u-th>商家折扣比例</u-th>
 							<u-th>商品最高返补比例</u-th>
+							<u-th>商家返补比例</u-th>
 						</u-tr>
 						<u-tr>
 							<u-td>{{currentSubsidy.profit}}</u-td>
 							<u-td>{{currentSubsidy.subsidy}}</u-td>
+							<u-td>{{currentSubsidy.store_subsidy}}</u-td>
 						</u-tr>
 					</u-table>
 					<view class="bold">选择此条件是商家折扣比例</view>
@@ -96,7 +98,10 @@
 							<view class="block">商家折扣比例</view>
 						</u-th>
 						<u-th>
-							<view class="block">商品最高返补比例</view>
+							<view class="block">商品最高返补</view>
+						</u-th>
+						<u-th>
+							<view class="block">商家返补比例</view>
 						</u-th>
 						<u-th>
 							<view class="block">操作</view>
@@ -105,6 +110,7 @@
 					<u-tr v-for="(item, index) in subsidy" :key="index">
 						<u-td>{{item.profit}}</u-td>
 						<u-td>{{item.subsidy}}</u-td>
+						<u-td>{{item.store_subsidy}}</u-td>
 						<u-td>
 							<u-button type="error" size="mini" @click="selSubsidy(index)">选择</u-button>
 						</u-td>

bundle_b/pages/subsidy_shop/subsidy_shop.vue

@@ -163,6 +163,7 @@
 				payMoney: '',
 				isWithdrawl: false,
 				withdrawlBillionId: 0,
+				withdrawlMoney: 0,
 				userId: 0
 			};
 		},
@@ -172,7 +173,7 @@
 			}
 			
 			this.changeShow(0);
-			this.getBillionsWithdrawConfigFun();
+			// this.getBillionsWithdrawConfigFun();
 			uni.$on('refreshBillionsWithdrawConfigFun', this.getBillionsWithdrawConfigFun)
 			uni.$on('setSubsidyWithdrawl', this.setSubsidyWithdrawl)
 		},
@@ -180,6 +181,10 @@
 			uni.$off('refreshBillionsWithdrawConfigFun')
 			uni.$off('setSubsidyWithdrawl')
 		},
+		onShow() {
+			this.getBillionsWithdrawConfigFun();
+			this.isWithdrawl = false
+		},
 		methods: {
 			reloadMoney() {
 				uni.showLoading({