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

pagesHouse/Mine/PersonalEditing/PersonalEditing.vue

@@ -26,8 +26,7 @@
 					联系电话
 				</view>
 				<view class="right">
-					<input type="text" v-model="dto.phone" border="none" placeholder="请输入手机号"
-						style="height: 48rpx;" />
+					<input type="text" v-model="dto.phone" border="none" placeholder="请输入手机号" style="height: 48rpx;" />
 				</view>
 			</view>
 			<view class="one-mobile">
@@ -84,9 +83,9 @@
 					shopSign: '', // 头像
 					idCode: '', // 证件号
 					id: '',
-					areaDetail:''
+					areaDetail: ''
 				},
-				shopImgs:[],
+				shopImgs: [],
 			}
 		},
 		onLoad() {
@@ -94,18 +93,18 @@
 		},
 
 		methods: {
-			getInfo(){
-				this.$api.get('/merchant/merchantFisherman/home/'+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';
+			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(',');
-						
+						this.shopImgs = res.data.data.split(',');
+
 						console.log(this.shopImgs)
 					}
 				})
@@ -125,7 +124,8 @@
 							},
 							success: res => {
 								let data = JSON.parse(res.data);
-								this.dto.shopSign = data.data.url
+								this.dto.shopSign = data.data.url;
+								this.save();
 							}
 						});
 					},
@@ -135,11 +135,12 @@
 				});
 
 			},
+			save() {
+				this.$api.put('/merchant/merchantFisherman/home', this.dto).then(res => {
 
-
+				})
+			}
 		}
-
-
 	}
 </script>
 
@@ -150,11 +151,13 @@
 		// padding-top: 150rpx;
 
 	}
-	.pics{
+
+	.pics {
 		display: grid;
 		grid-template-columns: repeat(3, 1fr);
-		gap:12rpx
+		gap: 12rpx
 	}
+
 	.from-content {
 		.title {
 			margin: 40rpx 0 36rpx;
@@ -173,6 +176,7 @@
 			.image {
 				display: flex;
 				align-items: center;
+
 				image {
 					width: 124rpx;
 					border-radius: 100rpx;

pagesHouse/Mine/index.vue

@@ -76,9 +76,6 @@
 				</u-row>
 			</view>
 		</view>
-
-
-
 		<Tabbares :tabbarid="2"></Tabbares>
 	</view>
 </template>

pagesHouse/home/index.vue

@@ -34,23 +34,23 @@
 				</view>
 			</view>
 			<view class="numberData">
-				<view>
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=0')">
 					<text>{{info.todayObligationOrders||0}}</text>
 					<text>待付款</text>
 				</view>
-				<view>
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=4')">
 					<text>{{info.todayPendingOrders||0}}</text>
 					<text>待使用</text>
 				</view>
-				<view>
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=3')">
 					<text>{{info.todayOrders||0}}</text>
 					<text>已完成</text>
 				</view>
-				<view>
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=-1')">
 					<text>{{info.todayCancelledOrders||0}}</text>
 					<text>已取消</text>
 				</view>
-				<view>
+				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=-3')">
 					<text>{{info.todayRefundOrders||0}}</text>
 					<text>退款售后</text>
 				</view>