Merge branch 'wjw_monthly'

pages/monthly/monthly.vue

@@ -158,6 +158,7 @@
 				month_apply_id: '',
 				ruleList: [],
 				min_discount: 1,
+				store_min_discount: 1, // 暂存最小折扣，重置时使用
 				current: 1,
 				loadingType: 'more',
 				requestFlag: true,
@@ -175,7 +176,7 @@
 			}
 		},
 		onLoad() {
-			this.getData(1);
+			this.getData();
 			// #ifdef H5
 			//默认请求微信分享
 			if (this.$wechat && this.$wechat.isWechat()) {
@@ -201,6 +202,7 @@
 							this.ruleList = res.data.data.ruleList;
 							this.minumum = res.data.data.ruleList[0].child;
 							this.min_discount = res.data.data.min_discount;
+							this.store_min_discount = res.data.data.min_discount;
 							this.brand_list = res.data.data.brand_list;
 							this.category_list = res.data.data.category_list;
 							this.month_rule_list = res.data.data.month_rule_list;
@@ -259,6 +261,8 @@
 				this.contract_period = '';
 				this.plan_index = 0;
 				this.min_index = '';
+				this.min_discount = this.store_min_discount;
+				this.minumum = this.ruleList[0]['child'];
 			},
 			search(type) {
 				// type 1是搜索，current,goodsList,requestFlag,brand,cate_id_1,contract_period重置