Merge remote-tracking branch 'origin/master'

gasStation-uni/pagesHome/Activity/index.vue

@@ -57,12 +57,19 @@
 				})
 			},
 			getData() {
+				uni.showLoading({
+					title: '加载中'
+				});
 				request({
 					url: 'business/marketingActivity/activeExchange/applet',
 					method: 'get',
 				}).then(res => {
 					console.log(res);
-					this.activityList = res.data
+					if (res.code == 200) {
+						this.activityList = res.data
+						uni.hideLoading();
+					}
+
 				})
 			},
 			getactvity(url) {
@@ -175,4 +182,4 @@
 		position: fixed;
 		top: 0px;
 	}
-</style>
+</style>

gasStation-uni/pagesHome/activeIn/index.vue

@@ -58,12 +58,19 @@
 		},
 		methods: {
 			getData(name) {
+				uni.showLoading({
+					title: '加载中'
+				});
 				if (name == '消费有礼活动') {
 					request({
 						url: '/business/marketingActivity/activeConsumption/appletList',
 						method: 'get',
 					}).then(res => {
-						this.datas = res.data
+						if (res.code == 200) {
+							this.datas = res.data
+							uni.hideLoading();
+						}
+
 					})
 				}
 				if (name == '折扣营销活动') {
@@ -71,7 +78,10 @@
 						url: '/business/marketingActivity/activeDiscount/appletList',
 						method: 'get',
 					}).then(res => {
-						this.datas = res.data
+						if (res.code == 200) {
+							this.datas = res.data
+							uni.hideLoading();
+						}
 					})
 				}
 				if (name == '推荐有礼活动') {
@@ -79,7 +89,10 @@
 						url: '/business/marketingActivity/activeRecommend/applet',
 						method: 'get',
 					}).then(res => {
-						this.datas = res.data
+						if (res.code == 200) {
+							this.datas = res.data
+							uni.hideLoading();
+						}
 					})
 				}
 				if (name == '新人有礼活动') {
@@ -87,7 +100,10 @@
 						url: '/business/marketingActivity/activeNewlyweds/applet',
 						method: 'get',
 					}).then(res => {
-						this.datas = res.data
+						if (res.code == 200) {
+							this.datas = res.data
+							uni.hideLoading();
+						}
 					})
 				}
 				if (name == '满减营销活动') {
@@ -95,7 +111,10 @@
 						url: '/business/marketingActivity/activeFullminus/appletList',
 						method: 'get',
 					}).then(res => {
-						this.datas = res.data
+						if (res.code == 200) {
+							this.datas = res.data
+							uni.hideLoading();
+						}
 					})
 				}
 
@@ -174,4 +193,4 @@
 		font-size: 14px;
 		color: #333333;
 	}
-</style>
+</style>