From 6d51fc93c5ea5e8a68eb8030c85a63bd7a83db71 Mon Sep 17 00:00:00 2001
From: syt <854400391@qq.com>
Date: Mon, 30 Sep 2024 13:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/face/face.vue               |  28 +++++++++++++++++++---------
 pages/index/index.vue             |  20 ++++++++++++++++----
 pages/mendainlist/mendainlist.vue |  19 +++++++++++++++----
 pages/order/order.vue             |   4 ++--
 pages/user/index.vue              |   8 ++++++--
 static/zaixian.png                | Bin 0 -> 3549 bytes
 6 files changed, 58 insertions(+), 21 deletions(-)
 create mode 100644 static/zaixian.png

diff --git a/pages/face/face.vue b/pages/face/face.vue
index 5314cc7..17a88f0 100644
--- a/pages/face/face.vue
+++ b/pages/face/face.vue
@@ -45,11 +45,13 @@
 				path: "",
 				yrenlianlist:[],
 				jqrllist:[],
-				userxixin:{}
+				userxixin:{},
+				type: ""
 			}
 		},
-		onLoad() {
+		onLoad(o) {
 			this.top = uni.getSystemInfoSync().statusBarHeight
+			this.type = o.type
 			this.memberInfo()
 		},
 		methods: {
@@ -74,7 +76,7 @@
 			qudbtn(){
 				// this.$refs.popup.close('center')
 				// var tjlist=[...this.yrenlianlist,...this.jqrllist]
-				
+					const that = this;
 					uni.uploadFile({
 								url: that.ymurl+'/api/uploadFile',
 								filePath: that.path,
@@ -98,9 +100,13 @@
 												});
 												
 												setTimeout(function(){
-													uni.switchTab({
-														url:'/pages/user/index'
-													})
+													if(that.type == 'order'){
+														uni.navigateBack({delta:1})
+													}else{
+														uni.switchTab({
+															url:'/pages/user/index'
+														})
+													}
 												},2000)
 											}
 										})
@@ -146,9 +152,13 @@
 											});
 											
 											setTimeout(function(){
-												uni.switchTab({
-													url:'/pages/user/index'
-												})
+												if(that.type == 'order'){
+													uni.navigateBack({delta:1})
+												}else{
+													uni.switchTab({
+														url:'/pages/user/index'
+													})
+												}
 											},2000)
 										}
 									})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 92d9c10..bac5a0b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -22,7 +22,9 @@
 				<view class="mddz" v-for="(item,index) in tuijianlist" :key="index">
 					<view class="mddz1">
 						<image class="mddz1img" style="border-radius: 10rpx;" :src="item.image.url" mode=""></image>
-						<view class="mddz1wz">{{item.name}}</view>
+						<view class="mddz1wz">{{item.name}}
+							<image src="@/static/zaixian.png"></image><text class="num">{{item.one_line_num}}人</text>
+						</view>
 					</view>
 					<view class="mddz2">
 						<view style='width:570rpx' @click="handleNavigation(item)">
@@ -105,7 +107,7 @@
 				console.log(res)
 			})
 		},
-		onReady() {
+		onShow() {
 			this.viplist=[]
 			this.cardList(1)
 			// this.storeList(1)
@@ -270,7 +272,7 @@
 		}
 	}
 </script>
-<style scoped>
+<style lang="scss" scoped>
 	.yqbtn {
 		width: 550rpx;
 		height: 90rpx;
@@ -487,8 +489,18 @@
 		font-weight: bold;
 		font-size: 30rpx;
 		color: #222222;
-		margin-left: 21rpx;
+		margin-left: 15rpx;
 		margin-top: 12rpx;
+		image{
+			width: 28rpx;
+			height: 28rpx;
+			vertical-align: middle;
+		}
+		.num{
+			font-size: 22rpx;
+			color: rgb(11, 229, 0);
+			font-weight: normal;
+		}
 	}
 
 	.mddz {
diff --git a/pages/mendainlist/mendainlist.vue b/pages/mendainlist/mendainlist.vue
index 3701d94..b654d03 100644
--- a/pages/mendainlist/mendainlist.vue
+++ b/pages/mendainlist/mendainlist.vue
@@ -13,7 +13,9 @@
 				<view class="mddz" v-for="(item,index) in mendainlist" :key="index">
 					<view class="mddz1" @click="xzmd(item)">
 						<image class="mddz1img" :src="item.image.url" mode=""></image>
-						<view class="mddz1wz">{{item.name}}</view>
+						<view class="mddz1wz">{{item.name}}
+						<image src="@/static/zaixian.png"></image><text class="num">{{item.one_line_num}}人</text>
+						</view>
 					</view>
 					<view class="mddz2">
 						<view class="mdleft" @click.stop="handleNavigation(item)">
@@ -108,7 +110,7 @@
 	}
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 	.mdleft{
 		width: 620rpx;
 	}
@@ -196,10 +198,19 @@
 		font-weight: bold;
 		font-size: 30rpx;
 		color: #222222;
-		margin-left: 21rpx;
+		margin-left: 15rpx;
 		margin-top: 12rpx;
+		image{
+			width: 28rpx;
+			height: 28rpx;
+			vertical-align: middle;
+		}
+		.num{
+			font-size: 22rpx;
+			color: rgb(11, 229, 0);
+			font-weight: normal;
+		}
 	}
-
 	.mddz {
 		width: 680rpx;
 		/* height: 152rpx; */
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 2e46182..74a2110 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -89,7 +89,6 @@
 			that.vipxinxi = vipxinxi
 			that.mandianxinxi = tuijianlist
 			that.top = uni.getSystemInfoSync().statusBarHeight
-			this.memberInfo();
 		},
 		onShow() {
 			var xzmd = uni.getStorageSync('xzmd')
@@ -98,6 +97,7 @@
 				this.mandianxinxi = JSON.parse(xzmd)
 				this.mandianxinxi.id=this.mandianxinxi.store_id
 			}
+			this.memberInfo();
 			console.log('this.mandianxinxi',this.mandianxinxi);
 		},
 		methods: {
@@ -140,7 +140,7 @@
 							success(res) {
 								if(res.confirm){
 									uni.navigateTo({
-										url: "/pages/face/face"
+										url: "/pages/face/face?type=order"
 									})
 								}
 							}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 66b4b7b..f979fcf 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -11,7 +11,7 @@
 			<view class="mendian" @click="gengx">
 				<image class="img" :src="userxixin.avatar?userxixin.avatar:avatar" mode=""></image>
 				<view class="xinxi" v-if="userxixin.mobile">
-					<view class="">{{userxixin.nickname?userxixin.nickname:'微信用户'}}</view>
+					<view class="">{{userxixin.nickname?userxixin.nickname:'微信用户'}}<text v-if="userxixin.attendance_num>=1">出勤次数：{{userxixin.attendance_num}}次</text></view>
 					<view class="">{{userxixin.mobile?userxixin.mobile:'暂无手机号'}}</view>
 				</view>
 				<view class="xinxi" v-else>
@@ -240,7 +240,11 @@
 		margin-left: 26rpx;
 		width: 365rpx;
 	}
-
+	.xinxi text{
+		font-size: 26rpx;
+		color: #F8A617;
+		margin-left: 20rpx;
+	}
 	.renlbtn {
 		width: 200rpx;
 		height: 80rpx;
diff --git a/static/zaixian.png b/static/zaixian.png
new file mode 100644
index 0000000000000000000000000000000000000000..9916fa4651c6be6a028d60d631130a1d424bc93d
GIT binary patch
literal 3549
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
Xr$H~hC5!km00000NkvXXu0mjfs;ifs

literal 0
HcmV?d00001