1

pages/home/index.vue

@@ -193,10 +193,10 @@
 				let t = this.shList.find(d => d.merchantName == this.name);
 				console.log('000', t);
 				if (t) {
+					uni.setStorageSync('merchantType',t.merchantType);
 					if (t.merchantType == 2) { //酒店民宿
 						uni.setStorageSync('homestayId', t.merchantId);
 						uni.setStorageSync('merchantId', '');
-						uni.setStorageSync('merchantType',item.merchantType);
 						this.getDetails();
 						this.page = 1;
 						this.finished = false;
@@ -207,7 +207,6 @@
 						this.list = [];
 						uni.setStorageSync('homestayId', '');
 						uni.setStorageSync('merchantId', t.merchantId);
-						uni.setStorageSync('merchantType',item.merchantType);
 						uni.navigateTo({
 							url: '/pagesHouse/home/index?merchantType='+t.merchantType
 						})

pages/login/select.vue

@@ -51,18 +51,16 @@
 				})
 			},
 			toHome(item) { //1711268640588517378   1721450548101648385
+			uni.setStorageSync('merchantType',item.merchantType);
 				if (item.merchantType == 2) {//民宿
 					uni.setStorageSync('homestayId', item.merchantId);
 					uni.setStorageSync('merchantId','');
-					uni.setStorageSync('merchantType',item.merchantType);
-					uni.reLaunch({
 						url: '/pages/home/index'
 					})
 				} else {//渔家乐和餐饮
 					uni.setStorageSync('homestayId', '');
 					uni.setStorageSync('merchantId', item.merchantId);
 					uni.setStorageSync('merchantName', item.merchantName);
-					uni.setStorageSync('merchantType',item.merchantType);
 					uni.reLaunch({
 						url: '/pagesHouse/home/index'
 					})

pagesHouse/home/index.vue

@@ -144,13 +144,11 @@
 				})
 			},
 			confirm(e) {
-				console.log(e);
 				this.name = e.value[0];
 				this.shShow = false;
-
 				let t = this.shList.find(d => d.merchantName == this.name);
-				console.log('000', t);
 				if (t) {
+					uni.setStorageSync('merchantType',t.merchantType);
 					if (t.merchantType != 2) { //酒店民宿
 						uni.setStorageSync('homestayId', '');
 						uni.setStorageSync('merchantId', t.merchantId);