解决冲突

pages/home/index.vue

@@ -67,24 +67,24 @@
 					title: '加载中...'
 				});
 				request({
-						url: '/homepage/getBanners',
-						method: 'post',
-						data: {
-							"storeId": '1000',
-							"showPosition": 0, //门店0
-						}
-					}).then(res => {
-						this.list = res.data.data
-						this.bannersList = this.list.map(t => t.imgPath)
-					}).catch(err => {
-						console.log(err)
-					})
-					.finally(() => {
-						setTimeout(() => {
-							uni.hideLoading();
-							this.loading = false;
-						}, 1000)
-					})
+					url: '/homepage/getBanners',
+					method: 'post',
+				data: {
+					"storeId": '1000',
+					"showPosition": 0, //门店0
+					}
+				}).then(res => {
+					this.list = res.data.data
+					this.bannersList = this.list.map(t => t.imgPath)
+				}).catch(err => {
+					console.log(err)
+				})
+				.finally(() => {
+					setTimeout(() => {
+						uni.hideLoading();
+						this.loading = false;
+					}, 1000)
+				})
 			},
 			//消息文字跑马灯
 			getTiceList() {
@@ -98,18 +98,18 @@
 							"storeId": "1000",
 							"contentType": "1" //门店1
 						}
-					}).then(res => {
-						this.list = res.data.data
-						this.noticebarList = this.list.map(t => t.msgContent)
-					}).catch(err => {
-						console.log(err)
-					})
-					.finally(() => {
-						setTimeout(() => {
-							uni.hideLoading();
-							this.loading = false;
-						}, 1000)
-					})
+				}).then(res => {
+					this.list = res.data.data
+					this.noticebarList = this.list.map(t => t.msgContent)
+				}).catch(err => {
+					console.log(err)
+				})
+				.finally(() => {
+					setTimeout(() => {
+						uni.hideLoading();
+						this.loading = false;
+					}, 1000)
+				})
 			},
 			scancodeIn() {
 				this.$u.route({