Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx

pages.json

@@ -235,10 +235,10 @@
 				},
 				{
 					"path": "Verification/ems",
-					"style": {
-						"navigationBarTitleText": "核销",
-						"enablePullDownRefresh": false
-						// "navigationStyle": "custom"
+					"style": {
+						"navigationBarTitleText": "核销结果",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
 					}
 				},
 				{

pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -33,7 +33,7 @@
 					商家地址
 				</view>
 				<view class="right">
-					<input type="text" v-model="dto.address" border="none" placeholder="请输入" style="height: 48rpx;" />
+					<input type="text" v-model="dto.areaDetail" border="none" placeholder="请输入" style="height: 48rpx;" />
 				</view>
 
 			</view>
@@ -97,19 +97,17 @@
 
 		methods: {
 			getInfo() {
-				this.$api.get('/merchant/merchantFisherman/home/' + uni.getStorageSync('merchantId'), {
-
-				}).then(res => {
-					if (res.data.code == 0) {
-						this.dto = res.data.data;
-						if (!res.data.data.shopSign) {
-							this.dto.shopSign =
-								'https://i.ringzle.com/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
-						}
-						// this.shopImgs = res.data.data.split(',');
-
-						// console.log(this.shopImgs)
-					}
+				this.$api.get('/api/merchant/food/merchant/' + uni.getStorageSync('merchantId')).then(res => {
+					console.log(res)
+					if (res.data.code == 0) {
+						this.dto = res.data.data;
+						if (!res.data.data.shopSign) {
+							this.dto.shopSign =
+								'https://i.ringzle.com/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
+						}
+						//this.shopImgs = res.data.data.split(',');
+						console.log(this.shopImgs)
+					}
 				})
 			},
 			// 上传头像

pagesHouse/Mine/index.vue

@@ -128,7 +128,6 @@
 					url
 				});
 
-
 			},
 			getInfo() {
 				this.$api.get('/api/merchant/food/merchant/' + uni.getStorageSync('merchantId')).then(res => {
@@ -139,7 +138,7 @@
 							this.dto.shopSign =
 								'https://i.ringzle.com/file/20240225/26feb8cc8f744123a980211ebdfb8d40.png';
 						}
-						this.shopImgs = res.data.data.split(',');
+						//this.shopImgs = res.data.data.split(',');
 						console.log(this.shopImgs)
 					}
 				})

pagesHouse/Verification/ems.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
-	
+	<c-nav-bar title="核销"></c-nav-bar>
 		<image @click="hexiao" src="https://i.ringzle.com/file/20240317/d5f047e986a04bff9cfbfef2c5dab095.png"></image>
 		
 		
@@ -30,19 +30,7 @@
 						uni.navigateTo({
 							url: "/pagesHouse/Verification/detailsewm?list=" + res.result
 						})
-						// this.$api.post('/api/merchant/food/scenic/merchant/order/verifyOrderQrCode?writeOffCode',res.result)
-						// 	.then(res => {
-						// 		if (res.data.code == 0) {
-						// 			uni.navigateTo({
-						// 				url: "/pagesHouse/Verification/detailsewm?list=" + JSON.stringify({
-						// 					...res.result
-						// 				})
-						// 			})
-									
-						// 		} else {
-						// 			this.$showToast(res.data.msg)
-						// 		}
-						// 	})
+					
 					},
 					error: (res) => {
 						console.log('扫描二维码出现错误')