diff --git a/bundle_b/pages/local_shop/local_shop_add.vue b/bundle_b/pages/local_shop/local_shop_add.vue
index cfb7143..2dfbedc 100644
--- a/bundle_b/pages/local_shop/local_shop_add.vue
+++ b/bundle_b/pages/local_shop/local_shop_add.vue
@@ -27,10 +27,12 @@
商家折扣比例
商品最高返补比例
+ 商家返补比例
{{currentSubsidy.profit}}
{{currentSubsidy.subsidy}}
+ {{currentSubsidy.store_subsidy}}
选择此条件是商家折扣比例
@@ -85,7 +87,10 @@
商家折扣比例
- 商品最高返补比例
+ 商品最高返补
+
+
+ 商家返补比例
操作
@@ -94,6 +99,7 @@
{{item.profit}}
{{item.subsidy}}
+ {{item.store_subsidy}}
选择
diff --git a/bundle_b/pages/local_shop/local_shop_edit.vue b/bundle_b/pages/local_shop/local_shop_edit.vue
index f3da5ac..f0a3202 100644
--- a/bundle_b/pages/local_shop/local_shop_edit.vue
+++ b/bundle_b/pages/local_shop/local_shop_edit.vue
@@ -30,10 +30,12 @@
商家折扣比例
商品最高返补比例
+ 商家返补比例
{{currentSubsidy.profit}}
{{currentSubsidy.subsidy}}
+ {{currentSubsidy.store_subsidy}}
选择此条件是商家折扣比例
@@ -96,7 +98,10 @@
商家折扣比例
- 商品最高返补比例
+ 商品最高返补
+
+
+ 商家返补比例
操作
@@ -105,6 +110,7 @@
{{item.profit}}
{{item.subsidy}}
+ {{item.store_subsidy}}
选择
diff --git a/bundle_b/pages/subsidy_shop/subsidy_shop.vue b/bundle_b/pages/subsidy_shop/subsidy_shop.vue
index 254b22b..94fda2b 100644
--- a/bundle_b/pages/subsidy_shop/subsidy_shop.vue
+++ b/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({