From 76df918a8a12a337aa7d312da699426e19ce8fa5 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 11 Oct 2025 13:49:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue       |  50 ++--
 pages/user/user.vue         | 452 ++++++++++++++++++------------------
 static/js/CommonFunction.js |   3 +
 3 files changed, 259 insertions(+), 246 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 549692a..7f4c59f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,20 +1,21 @@
 <template>
-    <view style="padding-top: 88rpx;">
+    <view style="padding: 113rpx 58rpx 0;">
         <view class="login-tip">时味苏州 申请获得</view>
         <view class="login-tip2">以下权限</view>
         <view class="login-tip-box">
             <text>获得你的公开信息（昵称、头像、地区及性别）</text>
         </view>
+		<view class="article-box">
+		    <radio-group @change="toggleAgreement">
+		        <radio value="1" :checked="isAgreed" style="transform:scale(0.7)"></radio>
+		    </radio-group>
+		    <view>同意<text @click="gotoInfo(9)">《用户服务协议》、</text><text @click="gotoInfo(12)">《隐私政策》</text></view>
+		</view>
         <view class="btn-box">
             <button bindtap="cancel" type="default" @click="redirectIndex">取消</button>
             <button type="primary" @click="getUserInfo">同意</button>
         </view>
-        <view class="flex-center article-box">
-            <radio-group @change="toggleAgreement">
-                <radio value="1" :checked="isAgreed" style="transform:scale(0.7)"></radio>
-            </radio-group>
-            <view>同意<text @click="gotoInfo(9)">《用户服务协议》、</text><text @click="gotoInfo(12)">《隐私政策》</text></view>
-        </view>
+        
         <uni-popup ref="popup" type="bottom" background-color="#fff">
             <button type="default" open-type="getPhoneNumber" @getphonenumber="handlePhoneNumber" style="width: 100%;height: 12vh;line-height: 12vh;">点击授权手机号</button>
         </uni-popup>
@@ -158,25 +159,25 @@ export default {
 
 <style>
 .login-tip {
-    font-size: 28rpx;
-    margin: 0 60rpx;
-    margin-top: 40rpx;
+	font-weight: 400;
+	font-size: 29rpx;
+	color: #020202;
 }
 
 .login-tip2 {
-    font-size: 44rpx;
-    margin: 0rpx 60rpx;
     margin-top: 20rpx;
     font-weight: 400;
+	font-size: 48rpx;
+	color: #000000;
 }
 
 .login-tip-box {
     display: flex;
     align-items: flex-start;
-    margin: 0 60rpx;
-    font-size: 28rpx;
+    font-weight: 400;
+    font-size: 29rpx;
+    color: #000000;
     margin-top: 40rpx;
-    line-height: 40rpx;
 }
 
 .login-tip-box .icon-gou1 {
@@ -190,22 +191,21 @@ export default {
     display: flex;
     position: absolute;
     bottom: 100rpx;
-    left: 0;
-    right: 0;
+    left: 22rpx;
+    right: 22rpx;
 }
 
 .btn-box button {
-    width: 400rpx;
+    width: 347rpx;
 }
 
 .article-box {
-    position: absolute;
-    left: 0;
-    right: 0;
-    justify-content: center;
-    font-size: 24rpx;
-    color: #1aad19;
-    bottom: 40rpx;
+    font-weight: 400;
+    font-size: 27rpx;
+    color: #00B200;
+	margin-top: 30rpx;
+	display: flex;
+	align-items: center;
 }
 
 .article-box .iconfont {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 5935a87..49ae704 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,84 +1,86 @@
 <template>
 	<view class="bg bg-padding">
-		<view class="topBox flex-between" @click="gotoProfile">
-			<image src="https://static.ticket.sz-trip.com/shiweisuzhou/images/user/topIcon.png" class="topIcon"></image>
-			
-			<view class="flex-center" style="position: relative;">
-				<view class="avatar-box">
+		<image class="top-image" src="https://static.ticket.sz-trip.com/uploads/20251011/50e0ae7f09f23c278cab8472b6e99c07.png"></image>
+		
+		<view class="main-content">
+			<view class="topBox" >
+				<view class="avatar-box" @click="gotoProfile">
 					<image :src="showImg(userInfo.avatar)" mode="aspectFill" class="headImg" v-if="userInfo.avatar"></image>
 					<image src="https://static.ticket.sz-trip.com/yandu/images/user/grxx.png" mode="aspectFill"
 						class="headImg" v-else></image>
+					<view class="username w-full" style="display: flex;align-items: center;" v-if="userInfo.nickname">
+						<view class="text-overflow" style="max-width: 300rpx;padding-right: 12rpx;">{{userInfo.nickname}}</view>
+						<image class="flex-shrink-0" style="width: 24rpx;height: 24rpx;" src="https://static.ticket.sz-trip.com/uploads/20251011/5b8d4b5d6e0aefe9deddbc4ca8799264.png"></image>
+					</view>
+					<view class="username" v-else>请登录/注册 ></view>
 				</view>
-				<view class="username" v-if="userInfo.nickname">{{userInfo.nickname}}</view>
-				<view class="username" v-else>请登录/注册 ></view>
-			</view>
-			<view class="top-right" v-if="userInfo.nickname">
-				个人信息 <image src="https://static.ticket.sz-trip.com/tongli/images/user/rightIcon1.png" mode=""></image>
-			</view>
-		</view>
-
-		<view class="orderBox">
-			<navigator :url="'/subPackages/order/trades'" class="moreBox flex-between">
-				我的订单
-				<span class="flex-between">
-					全部订单
-					<image src="https://static.ticket.sz-trip.com/tongli/images/user/rightIcon1.png" mode=""></image>
-				</span>
-			</navigator>
-
-			<view class="flex-around" style="margin-top: 20rpx;flex-wrap: wrap;justify-content: flex-start;">
-				<view class="orderItem" v-for="(item,index) in orderList" :key="index" @click="goTrades(item)">
-					<img :src="item.src" alt="">
-					<view>{{item.title}}</view>
+					
+				<view class="flex-column-center">
+					<view class="title">优惠券</view>
+					<view class="num">7</view>
+				</view>
+				<view style="height: 35rpx;width: 2rpx;background:#E3E3E3;"></view>
+				<view class="flex-column-center">
+					<view class="title">积分</view>
+					<view class="num">0</view>
 				</view>
+				
 			</view>
-			<!-- 待付款轮播 -->
-			<!-- <swiper class="my-swipe" :autoplay="3000" indicator-color="white" v-if="dfkList && dfkList.length>0" circular>
-				<swiper-item v-for="(item,index) in dfkList" :key="item.id">
-					<div class="dfkBox" @click="goToOrderDetail(item)">
-						<image :src="showImg(item.order_child[0].specifications_image)" mode="aspectFill"></image>
-						<div class="contentBox">
-							<div style="width:300rpx;">
-								<div style="font-size: 27rpx;margin-bottom: 10rpx;">等待付款 </div>
-								<div style="display: flex;color: #8A8A8A;font-size: 27rpx;">剩余时间：<uni-countdown class="countdown" @timeup="timeup(index)" :show-day="false" :hour="differTimeList[index].slice(0,2)" :minute="differTimeList[index].slice(3,5)" :second="differTimeList[index].slice(6,8)"/></div>
+			
+			<view class="orderBox">
+				<navigator :url="'/subPackages/order/trades'" class="moreBox flex-between">
+					我的订单
+					<span class="flex-between">
+						全部订单
+						<image src="https://static.ticket.sz-trip.com/uploads/20251011/b0d85d510903fdd7f18c29b4ba375bf6.png" mode=""></image>
+					</span>
+				</navigator>
+			
+				<view style="margin-top: 30rpx;display: flex;flex-wrap: wrap;">
+					<view class="orderItem" v-for="(item,index) in orderList" :key="index" @click="goTrades(item)">
+						<img :src="item.src" alt="">
+						<view>{{item.title}}</view>
+					</view>
+				</view>
+				<!-- 待付款轮播 -->
+				<!-- <swiper class="my-swipe" :autoplay="3000" indicator-color="white" v-if="dfkList && dfkList.length>0" circular>
+					<swiper-item v-for="(item,index) in dfkList" :key="item.id">
+						<div class="dfkBox" @click="goToOrderDetail(item)">
+							<image :src="showImg(item.order_child[0].specifications_image)" mode="aspectFill"></image>
+							<div class="contentBox">
+								<div style="width:300rpx;">
+									<div style="font-size: 27rpx;margin-bottom: 10rpx;">等待付款 </div>
+									<div style="display: flex;color: #8A8A8A;font-size: 27rpx;">剩余时间：<uni-countdown class="countdown" @timeup="timeup(index)" :show-day="false" :hour="differTimeList[index].slice(0,2)" :minute="differTimeList[index].slice(3,5)" :second="differTimeList[index].slice(6,8)"/></div>
+								</div>
+								<div class="orderBtn" @click.stop="setOrderId(item.order_id)">去支付</div>
 							</div>
-							<div class="orderBtn" @click.stop="setOrderId(item.order_id)">去支付</div>
 						</div>
-					</div>
-				</swiper-item>
-			</swiper> -->
-		</view>
-
-		<view class="cygj">
-			<view v-for="(item,index) in cyList" :key="index"
-				@click="gotoUrl(item,index)" v-if="item.isShow">
-				<!-- <button id="contact" class="cyItem flex-between" open-type="contact" bindcontact="handleContact" session-from="sessionFrom" v-if="index == 2">
-					<view class="flex-center">
-						<img src="https://static.ticket.sz-trip.com/shiweisuzhou/images/user/lxkf.png" class="headIcon">
-						联系我们
-					</view>
-					<img src="https://static.ticket.sz-trip.com/dongtai/images/user/rightIcon-gray.png" class="rightIcon">
-				</button> -->
-				<view class="cyItem flex-between">
-					<view class="flex-center">
+					</swiper-item>
+				</swiper> -->
+			</view>
+			
+			
+			<view class="cygj">
+				<view class="moreBox">我的服务</view>
+				
+				<view  style="display:flex;align-items:center;flex-wrap:wrap">
+					<view :class="['cyItem',item.customClass]" v-for="(item,index) in cyList.filter(x=>x.isShow)" :key="index"
+					@click="gotoUrl(item,index)">
 						<img :src="item.src" class="headIcon">
-						{{item.title}}
+						<view>{{item.title}}</view>
 					</view>
-					<img src="https://static.ticket.sz-trip.com/yandu/images/user/rightIcon-gray.png" class="rightIcon">
 				</view>
 			</view>
+			
 		</view>
 		
-		<!-- 旅游咨询弹框 -->
+		
+
+
+		
+		<!-- 图片 -->
 		<uni-popup ref="popup" type="center">
-			<view class="consult-popup">
-				即将拨打客服电话
-				<view class="consult-subtitle">服务时间：周一至周五<br>8:30-11:30，14:30-18:00</view>
-				<view class="consult-btns">
-					<view @click="$refs.popup.close()">取消</view>
-					<view @click="clickPhone('0515-69186109')">确定</view>
-				</view>
-			</view>
+			<image class="consult-popup" :src="showImg" :show-menu-by-longpress="true"></image>
 		</uni-popup>
 		
 		<uni-popup ref="kfpopup" type="bottom" :safe-area="false">
@@ -138,76 +140,100 @@
 				nowDateTime: '', //当前时间秒数
 				userInfo: {},
 				orderList: [{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/dfki.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/785234bf4df1fac233ee020627cdc262.png',
 						title: '待付款',
 						status: 'WAIT_PAYMENT'
 					},
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/dfh.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/806d65eb846e60a98352ba09d8660ce7.png',
 						title: '待发货',
 						status: 'WAIT_POST'
 					},
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/dcx.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/f3ea0d6a80ae0e10be1b974ad10955fb.png',
 						title: '待使用/出行',
 						status: 'WAIT_USE'
 					},
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/dsh.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/4c0812afada05c7005c213a9f012955e.png',
 						title: '待收货',
 						status: 'WAIT_DELIVERY'
 					},
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/tksh.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/7a0bc28efe4ef85d3c2ed98277afcd00.png',
 						title: '退款/售后',
 						status: 'NEED_REFUND'
 					},
 				],
 				cyList: [
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/yhq.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/aa4ad71297f5b96b0f14696143a38ea1.png',
 						title: '优惠券',
 						path: '/subPackages/user/coupon',
 						isShow: true
 					},
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/cxr.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/19fff40782bc7d9a9c78ed5c394dc030.png',
 						title: '出行人',
 						path: '/subPackages/user/travelerList?showType=0',
 						isShow: true
 					},
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/lxkf.png',
-						title: '联系我们',
-						path: '',
-						isShow: true
-					},
-					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/shdz.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/c9c81700bc66a8d4dc26757aa6737dfa.png',
 						title: '收货地址',
 						path: '/subPackages/user/travelerList?showType=1',
 						isShow: true
 					},
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/shhx.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/c7e34c9011fc80966520b2c06a4faaf5.png',
 						title: '商户核销',
 						path: '',
 						isShow: true,
 						webUrl: "https://supplier-h5.sutenong.com",
 					},
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/yhxy.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/5d884b6d3abf2d38fdffa928795184a7.png',
+						title: '积分商城',
+						path: '',
+						isShow: true,
+					},
+					{
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/8020e99149c493a838c2b136560509ec.png',
+						title: '联系客服',
+						path: '',
+						isShow: true,
+						isKeFU: true,
+					},
+					{
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/bcd540021d5ee3bc4051b9116299c9df.png',
+						title: '公众号',
+						path: '',
+						isShow: true,
+						GZHImg: "https://static.ticket.sz-trip.com/uploads/20251011/40183cb1d655217642c34da3baea4e28.jpg"
+					},
+					{
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/a1c19ffa332ff9a5de9fcc983874baea.png',
+						title: '进群抽奖',
+						path: '',
+						isShow: true,
+						customClass: "prize",
+					},
+					
+					
+					{
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/c6c29ace07206eec5418fb51068fa4ca.png',
 						title: '用户协议',
 						path: '/subPackages/user/privacyInfo?id=9',
 						isShow: true
 					},
 					{
-						src: 'https://static.ticket.sz-trip.com/shiweisuzhou/images/user/yszc.png',
+						src: 'https://static.ticket.sz-trip.com/uploads/20251011/b22eac8abd4639fa166195f91c78c6e6.png',
 						title: '隐私管理',
 						path: '/subPackages/user/privacyInfo?id=12',
 						isShow: true
 					}
 				],
+				showImg: "",
 			}
 		},
 		onShow() {
@@ -340,19 +366,30 @@
 			//   this.$refs.popup.open('center')
 			// },
 			gotoUrl(item, index) {
-				if (index == 2) {
-					this.$refs.kfpopup.open()
-					return;
+				if (item.path) {
+					uni.navigateTo({
+						url: item.path
+					})
+					return
 				}
-				if (index == 4) {
+				if (item.webUrl) {
 					uni.navigateTo({
 						url:'/subPackages/webPage/webPage?url='+item.webUrl
 					})
 					return
 				}
-				uni.navigateTo({
-					url: item.path
-				})
+				if (item.isKeFU) {
+					this.$refs.kfpopup.open()
+					return;
+				}
+				if (item.GZHImg) {
+					this.showImg = item.GZHImg;
+					this.$refs.popup.open()
+					return
+				}
+				
+				this.qidai()
+				
 			},
 			qidai() {
 				uni.showToast({
@@ -401,44 +438,75 @@
 	.bg {
 		min-height: 100vh;
 		overflow-x: hidden;
-		background-color: rgba(237, 245, 220, 1);
+	}
+	.top-image{
+		width: 100%;
+		height: 453.43rpx;
+		display: block;
+	}
+	.main-content{
+		width: 750rpx;
+		background: linear-gradient( 180deg, #FFFFFF 0%, #F1F2F4 100%);
+		border-radius: 43rpx 43rpx 0rpx 0rpx;
+		position: relative;
+		margin-top: -50rpx;
+		padding: 38rpx 27rpx;
 	}
 
 	.topBox {
-		width: 750rpx;
-		height: 538rpx;
+		width: 100%;
 		box-sizing: border-box;
 		display: flex;
-		background-image: url('https://static.ticket.sz-trip.com/shiweisuzhou/images/user/topBg.png');
-		background-size: 100% 100%;
-		padding: 0rpx 40rpx 65rpx 28rpx;
+		align-items: center;
 		position: relative;
-		
-		.topIcon {
-			width: 734.67rpx;
-			height: 538rpx;
-			position: absolute;
-			top: 0;
-			right: 0;
-		}
-
+		overflow: visible;
 		.avatar-box {
-			width: 120rpx;
-			height: 120rpx;
-			border-radius: 50%;
-			overflow: hidden;
-			background: #FFFFFF;
+			height: 80rpx;
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			width: 100rpx;
+			flex: 1;
+			margin-left: 28rpx;
+			padding-top: 30rpx;
+			.headImg{
+				width: 133rpx;
+				height: 133rpx;
+				border: 4rpx solid #FFFFFF;
+				border-radius: 50%;
+				flex-shrink: 0;
+				position: absolute;
+				left: 0;
+				top: -115rpx;
+			}
 		}
-
-		.headImg {
-			width: 100%;
-			height: 100%;
+		.flex-column-center{
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: space-between;
+			height: 80rpx;
+			flex-shrink: 0;
+			min-width: 150rpx;
+			.title{
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #535355;
+			}
+			.num{
+				font-family: DIN Condensed, DIN Condensed;
+				font-weight: bold;
+				font-size: 37rpx;
+				color: #6A8C29;
+			}
 		}
+		
+
 
 		.username {
-			margin-left: 20rpx;
-			font-size: 40rpx;
-			color: #000000;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #1C1C1C;
 		}
 		
 		.top-right {
@@ -456,48 +524,46 @@
 
 	.orderBox {
 		width: 697rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 0rpx 23rpx 0rpx rgba(80, 80, 80, 0.12);
 		border-radius: 13rpx;
-		margin: -185rpx auto 0;
-		padding-bottom: 30.6rpx;
+		margin: 30rpx auto 0;
+		background: #F9FFF4;
+		border-radius: 21rpx 21rpx 21rpx 21rpx;
+		border: 1rpx solid #DAF7A2;
 		position: relative;
+		padding: 26rpx 0;
 
 		.moreBox {
-			height: 84rpx;
+			padding:0 29rpx;
 			margin: auto;
-			font-size: 31rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #000000;
-			padding: 0 13rpx 0 26rpx;
-
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #1C1C1C;
+			align-items: baseline;
 			span {
-				font-weight: 500;
-				font-size: 25rpx;
-				color: #100E0E;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #8D8D8D;
 				box-sizing: border-box;
 
 				image {
-					width: 11.33rpx;
+					width: 20rpx;
 					height: 20rpx;
-					margin-left: 18rpx;
+					margin-left: 8rpx;
 				}
 			}
 		}
 
 		.orderItem {
+			font-weight: 400;
 			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #111111;
+			color: #535355;
 			width: 20%;
 			text-align: center;
 
 			img {
-				width: 62rpx;
-				height: 62rpx;
-				margin-bottom: 20rpx;
+				width: 48rpx;
+				height: 48rpx;
+				margin-bottom: 12rpx;
 			}
 		}
 		.orderItem:nth-child(n+6) {
@@ -505,70 +571,44 @@
 		}
 	}
 
-	.lxwm {
-		width: 696rpx;
-		height: 447rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 4rpx 12rpx 0px rgba(150, 149, 149, 0.3);
-		border-radius: 20rpx;
-		margin: auto;
-		padding: 27rpx 19rpx 0 19rpx;
-		font-size: 31rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #000000;
-
-		.midBox {
-			padding: 26rpx 43rpx 21rpx 44rpx;
-			box-sizing: border-box;
-
-			img {
-				width: 265rpx;
-				height: 252rpx;
-				border-radius: 15rpx;
-			}
-		}
-
-		.botBox {
-			padding: 0 30rpx 0 51rpx;
-			font-size: 27rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #000000;
-		}
-	}
-
 	.cygj {
 		width: 697rpx;
 		background: #FFFFFF;
-		border-radius: 20rpx;
-		margin: 30rpx auto 0;
-		padding: 0 27rpx;
-		font-size: 28rpx;
-		font-family: PingFang SC;
+		border-radius: 21rpx 21rpx 21rpx 21rpx;
+		margin: 20rpx auto 0;
+		padding: 27rpx 0;
 		font-weight: 500;
-		color: #000000;
+		font-size: 32rpx;
+		color: #1C1C1C;
+		
+		.moreBox{
+			padding:0 29rpx;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #1C1C1C;
+			margin-bottom: 28rpx;
+		}
 
 		.cyItem {
-			height: 106rpx;
+			width:25%;
 			display: flex;
 			align-items: center;
-			border-bottom: 1rpx solid #D8D8D8;
+			flex-direction:column;
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #535355;
+			margin-bottom:28rpx;
 
 			.headIcon {
-				width: 42rpx;
-				height: 42rpx;
-				margin-right: 15rpx;
+				width: 48rpx;
+				height: 48rpx;
+				margin-bottom:10rpx;
 			}
 
-			.rightIcon {
-				width: 20rpx;
-				height: 20rpx;
-			}
 		}
-
-		.cyItem:last-child {
-			border: none;
+		
+		.prize.cyItem{
+			color: #F47736;
 		}
 	}
 
@@ -682,39 +722,9 @@
 	}
 	
 	.consult-popup {
-		width: 487rpx;
-		height: 367rpx;
-		background: #F0F0F0;
-		border-radius: 20rpx;
-		padding: 65rpx 0 23rpx;
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #000000;
-		text-align: center;
-		
-		.consult-subtitle {
-			font-weight: 500;
-			font-size: 27rpx;
-			color: #333333;
-			margin-top: 43rpx;
-		}
-		
-		.consult-btns {
-			display: flex;
-			margin-top: 75rpx;
-			
-			view {
-				width: 50%;
-				font-weight: bold;
-				font-size: 32rpx;
-				color: #71B580;
-				line-height: 54rpx;
-			}
-			view:first-child {
-				border-right: 1rpx solid #D8D8D8;
-				color: #000000;
-			}
-		}
+		width: 480rpx;
+		height: 480rpx;
+		border-radius: 25rpx;
 	}
 	
 /* 弹窗内容容器 */
diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index a1446d5..32d9456 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -14,6 +14,9 @@ Vue.prototype.formateRichText = str => {
 	str = str.replace(reg, 'div');
 	reg = new RegExp("↵", "g");
 	str = str.replace(reg, '<br />');
+	
+	str = `<div style="font-size:0">` + str + `</div>`
+	
 	return str;
 }
 

From 0d6b1dac36f44335c3ff0882bec287f440f8767c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 14 Oct 2025 09:44:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          |   6 +
 pages/user/user.vue                 | 320 +++++++++++++++++++++++++---
 subPackages/activity/prizeInQun.vue |  41 ++++
 3 files changed, 340 insertions(+), 27 deletions(-)
 create mode 100644 subPackages/activity/prizeInQun.vue

diff --git a/pages.json b/pages.json
index 324b96f..125fc31 100644
--- a/pages.json
+++ b/pages.json
@@ -368,6 +368,12 @@
 					"navigationBarTitleText" : "绿色有机标准认证"
 				}
 			},
+			{
+				"path": "activity/prizeInQun",
+				"style": {
+					"navigationBarTitleText" : "进群抽奖"
+				}
+			},
 			{
 				"path": "user/comment",
 				"style": {
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 49ae704..4f639b0 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -1,6 +1,9 @@
 <template>
 	<view class="bg bg-padding">
-		<image class="top-image" src="https://static.ticket.sz-trip.com/uploads/20251011/50e0ae7f09f23c278cab8472b6e99c07.png"></image>
+		<view class="top-image">
+			<view>Hi，欢迎来时味苏州</view>
+			<view style="font-weight: 400;font-size: 27rpx;color: rgba(255,255,255,0.64);margin-top: 10rpx;">不时不食 鲜逢其时</view>
+		</view>
 		
 		<view class="main-content">
 			<view class="topBox" >
@@ -17,12 +20,12 @@
 					
 				<view class="flex-column-center">
 					<view class="title">优惠券</view>
-					<view class="num">7</view>
+					<view class="num">{{couponNum}}</view>
 				</view>
 				<view style="height: 35rpx;width: 2rpx;background:#E3E3E3;"></view>
 				<view class="flex-column-center">
 					<view class="title">积分</view>
-					<view class="num">0</view>
+					<view class="num">{{userInfo.score||0}}</view>
 				</view>
 				
 			</view>
@@ -40,6 +43,8 @@
 					<view class="orderItem" v-for="(item,index) in orderList" :key="index" @click="goTrades(item)">
 						<img :src="item.src" alt="">
 						<view>{{item.title}}</view>
+						
+						<view class="count" v-if="item.needCount">{{item.count}}</view>
 					</view>
 				</view>
 				<!-- 待付款轮播 -->
@@ -59,10 +64,8 @@
 				</swiper> -->
 			</view>
 			
-			
 			<view class="cygj">
 				<view class="moreBox">我的服务</view>
-				
 				<view  style="display:flex;align-items:center;flex-wrap:wrap">
 					<view :class="['cyItem',item.customClass]" v-for="(item,index) in cyList.filter(x=>x.isShow)" :key="index"
 					@click="gotoUrl(item,index)">
@@ -72,15 +75,33 @@
 				</view>
 			</view>
 			
+			
+			<view class="recommend-box" >
+				<view class="type-container flex-center">
+					<view :class="['type-item',typeIndex==0?'active':'']" @click="changeTypeIndex(0)">为您推荐</view>
+					<!-- <view :class="['type-item',typeIndex==1?'active':'']" @click="changeTypeIndex(1)">我的常买</view> -->
+				</view>
+				<view class="new-hot-box hot-box" v-if="hotList.length>0">
+					<image class="hot-adv" v-if="hotAdv" :src="hotAdv.head_img" mode="aspectFill" @click.stop="gotoBannerDetail(hotAdv)"></image>
+					<view v-for="(item,index) in hotList" :key="index" class="hot-item" @click="gotoDetailByType(item)">
+						<image :src="item.headimg" mode="aspectFill"></image>
+						<view class="hot-content">
+							<view class="title text-overflowRows">{{item.title}}</view>
+							<view class="flex-between">
+								<view class="price">{{item.price / 100}}</view>
+								<view class="btn-buy">
+									<image src="https://static.ticket.sz-trip.com/uploads/20251011/c8e4e3c91033663610e0c1e0e4823daa.png"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
 		</view>
 		
-		
-
-
-		
 		<!-- 图片 -->
 		<uni-popup ref="popup" type="center">
-			<image class="consult-popup" :src="showImg" :show-menu-by-longpress="true"></image>
+			<image class="consult-popup" :src="popshowImg" :show-menu-by-longpress="true"></image>
 		</uni-popup>
 		
 		<uni-popup ref="kfpopup" type="bottom" :safe-area="false">
@@ -135,6 +156,7 @@
 		},
 		data() {
 			return {
+				couponNum: 0,
 				dfkList: [],
 				differTimeList: [],
 				nowDateTime: '', //当前时间秒数
@@ -147,7 +169,9 @@
 					{
 						src: 'https://static.ticket.sz-trip.com/uploads/20251011/806d65eb846e60a98352ba09d8660ce7.png',
 						title: '待发货',
-						status: 'WAIT_POST'
+						status: 'WAIT_POST',
+						count: 0,
+						needCount: true
 					},
 					{
 						src: 'https://static.ticket.sz-trip.com/uploads/20251011/f3ea0d6a80ae0e10be1b974ad10955fb.png',
@@ -214,12 +238,10 @@
 					{
 						src: 'https://static.ticket.sz-trip.com/uploads/20251011/a1c19ffa332ff9a5de9fcc983874baea.png',
 						title: '进群抽奖',
-						path: '',
+						path: '/subPackages/activity/prizeInQun',
 						isShow: true,
 						customClass: "prize",
 					},
-					
-					
 					{
 						src: 'https://static.ticket.sz-trip.com/uploads/20251011/c6c29ace07206eec5418fb51068fa4ca.png',
 						title: '用户协议',
@@ -233,20 +255,32 @@
 						isShow: true
 					}
 				],
-				showImg: "",
+				popshowImg: "",
+				
+				hotList: [],
+				hotAdv: null,
+				finished: false,
+				typeIndex: 0,
 			}
 		},
+		onReady () {
+			this.getHotList()
+		},
 		onShow() {
 			// 根据token获取个人信息
-			// this.Post({
-			// 	token: ''
-			// },'/api/uservice/user/getMyInfo').then(res => {
-			// 	this.$store.commit('changeUserInfo', res.data);
-			// })
-			
-			this.userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
-			console.log(this.userInfo)
-			uni.setStorageSync('isFlag', true)
+			this.Post({noShowLoading: true}, "/api/uservice/user/getMyInfo").then(res => {
+				if (res.data) {
+					let info = res.data;
+					info.token = JSON.parse(uni.getStorageSync('userInfo')).token || this.$store.state.user.userInfo.token
+					this.$store.commit('changeUserInfo', info)
+					this.userInfo = info
+					uni.setStorageSync('isFlag', true)
+					
+					this.getCouponNum()
+					this.getDFH()
+				}
+				console.log(this.userInfo)
+			})
 			// this.dfkList = []
 			// this.nowDateTime = parseInt(new Date().getTime() / 1000)
 			// this.Post({}, "/api/user/userInfo").then((res) => {
@@ -330,6 +364,21 @@
 					}
 				})
 			},
+			// 代发货数量
+			getDFH() {
+				let params = {
+					offset: 0,
+					limit: 1,
+					state: 'WAIT_POST',
+					noShowLoading: true,
+				}
+				this.Post(params, '/api/order/list').then(res => {
+					if (res) {
+						this.orderList[1].count = res.data.total || 0
+					}
+				})
+			},
+			
 			goToOrderDetail(item) {
 				uni.navigateTo({
 					url: '/subPackages/order/detail?id=' + item.order_id
@@ -383,7 +432,7 @@
 					return;
 				}
 				if (item.GZHImg) {
-					this.showImg = item.GZHImg;
+					this.popshowImg = item.GZHImg;
 					this.$refs.popup.open()
 					return
 				}
@@ -422,7 +471,87 @@
 				// 	}
 				// });
 			},
-		}
+			
+			getCouponNum () {
+				this.Post({
+					status: 1,
+					offset: 0,
+					limit: 100,
+					noShowLoading: true,
+				}, "/api/coupon/get_user_list").then((res) => {
+					if (res) {
+						this.couponNum = res.data.length
+					}
+				});
+			},
+			
+			changeTypeIndex (typeIndex) {
+				if (typeIndex != this.typeIndex) {
+					this.typeIndex = typeIndex
+					this.hotList = []
+					this.hotAdv = null
+					this.finished = false
+					// todo
+				}
+			},
+			
+			
+			getHotList() {
+				this.Post({
+					// tag_id: 648,
+					offset: this.hotList.length,
+					limit: 5,
+					order: "sales_number"
+				},'/api/product/get_product_by_type').then(res => {
+					this.hotList = [...this.hotList, ...res.data.list]
+					if(res.data.list.length < 5) this.finished = true
+				})
+				// 广告
+				if (!this.hotAdv) {
+					this.Post({
+					    type_id: 5,
+					    position: 6,
+					},"/api/adv/getAdv").then(res => {
+					    if (res) {
+							if (Array.isArray(res.data) && res.data.length>0)
+					        this.hotAdv = res.data[0]
+					    }
+					});
+				}
+			},
+			// 广告跳转
+			gotoBannerDetail(item) {
+				// 1产品详情 2功能模块 3外部链接 4外部小程序
+				switch (item.jump_type){
+					case 1:
+						this.gotoDetailByType(item.product_model)
+						break;
+					case 2:
+						this.gotoPath(item.front_model.inside)
+						break;
+					case 3:
+						this.gotoWebUrl(item.tdata.url)
+						break;
+					case 4: 
+						// #ifdef MP-WEIXIN
+						uni.navigateToMiniProgram({
+							shortLink: item.tdata.url
+						})
+						// #endif
+						break;
+					default:
+						break;
+				}
+			},
+			
+			
+		},
+		
+		onReachBottom() {
+			setTimeout(() => {
+				if(!this.finished) this.getHotList()
+			},1000)
+		},
 	}
 </script>
 
@@ -442,7 +571,14 @@
 	.top-image{
 		width: 100%;
 		height: 453.43rpx;
-		display: block;
+		background-image: url("https://static.ticket.sz-trip.com/uploads/20251011/a1f6b25761ddebba529d822db1d54497.png");
+		background-size: 100% 100%;
+		padding-top: 215rpx;
+		padding-right: 26rpx;
+		font-weight: 500;
+		font-size: 43rpx;
+		color: #FFFFFF;
+		text-align: right;
 	}
 	.main-content{
 		width: 750rpx;
@@ -559,12 +695,28 @@
 			color: #535355;
 			width: 20%;
 			text-align: center;
+			position: relative;
 
 			img {
 				width: 48rpx;
 				height: 48rpx;
 				margin-bottom: 12rpx;
 			}
+			.count{
+				width: 24rpx;
+				height: 24rpx;
+				background: #EA2A2A;
+				border-radius: 50%;
+				position: absolute;
+				top: -6rpx;
+				right: 40rpx;
+				font-weight: bold;
+				font-size: 21rpx;
+				color: #FFFFFF;
+				text-align: center;
+				line-height: 24rpx;
+				
+			}
 		}
 		.orderItem:nth-child(n+6) {
 			margin-top: 28rpx;
@@ -812,6 +964,120 @@
   text-align: left;
 }
 
+.recommend-box{
+	width: 100%;
+	padding: 30rpx 0 0;
+	.rmtj-img{
+		width: 222rpx;
+		height: 31.33rpx;
+		display: block;
+		margin: 0 auto;
+	}
+	.hot-box {
+		margin-top: 20rpx;
+		display: flex;
+		justify-content: space-between;
+		&.new-hot-box{
+			flex-wrap: wrap;
+			.hot-adv{
+				width: 340rpx;
+				height: 490rpx;
+				border-radius: 20rpx;
+				overflow: hidden;
+				margin-bottom: 16rpx;
+			}
+		}
+		
+		.hot-item {
+			width: 334rpx;
+			height: 497rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			overflow: hidden;
+			margin-bottom: 26rpx;
+			
+			image {
+				width: 334.67rpx;
+				height: 342rpx;
+			}
+			
+			.hot-content {
+				height: 155rpx;
+				padding: 6rpx 12rpx 20rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				.title {
+					font-weight: 500;
+					font-size: 29rpx;
+					color: #000000;
+				}
+				
+				.price {
+					font-weight: 500;
+					font-size: 33rpx;
+					color: #FA0005;
+					&::before{
+						content: "￥";
+						color: 24rpx;
+					}
+				}
+				
+			}
+		
+			.btn-buy{
+				width: 53rpx;
+				height: 53rpx;
+				background: #97AF65;
+				border-radius: 50%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				image{
+					width: 32rpx;
+					height: 32rpx;
+				}
+			}
+		}
+	}
+}
 
 
+.type-container{
+	width: 100%;
+	height: 60rpx;
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #888888;
+	.type-item{
+		position: relative;
+		margin: 0 auto;
+		background-image: url("https://static.ticket.sz-trip.com/uploads/20251014/8023de50445d70ca73d64eb618e21af9.png");
+		background-size: 100% 100%;
+		width: 239.33rpx;
+		height: 52rpx;
+		font-weight: 500;
+		font-size: 29rpx;
+		color: #212A0D;
+		text-align: center;
+		line-height: 52rpx;
+	}
+	// .type-item.active{
+	// 	font-weight: 500;
+	// 	font-size: 30rpx;
+	// 	color: #739826;
+	// }
+	// .type-item.active::after{
+	// 	content: '1';
+	// 	width: 20rpx;
+	// 	height: 5.33rpx;
+	// 	border-radius: 6rpx;
+	// 	background: linear-gradient(to right, #719723, #97AF65);
+	// 	position: absolute;
+	// 	bottom: -10rpx;
+	// 	left: calc(50% - 10rpx);
+	// 	display: block;
+	// 	font-size: 0;
+	// }
+}
 </style>
\ No newline at end of file
diff --git a/subPackages/activity/prizeInQun.vue b/subPackages/activity/prizeInQun.vue
new file mode 100644
index 0000000..5cbe091
--- /dev/null
+++ b/subPackages/activity/prizeInQun.vue
@@ -0,0 +1,41 @@
+<template>
+	<view class="bg">
+		<image v-if="headImg" :src="showImg(headImg)" class="topImg" mode="widthFix"
+		:show-menu-by-longpress="true"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				headImg: null,
+			}
+		},
+		onLoad(option) {
+			this.getHeadImg(2400)
+		},
+		methods: {
+			getHeadImg (id) {
+				this.Post({id},'/api/multimedia/detail').then(res => {
+					this.headImg = res.data.head_img
+					uni.setNavigationBarTitle({
+						title:res.data.title
+					})
+				});	
+			},
+		},
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		width: 750rpx;
+		min-height: 100vh;
+	}
+	
+	.topImg {
+		width: 100%;
+	}
+</style>
\ No newline at end of file

From d60d333944114d680707522e9be3d7f1972fae12 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Tue, 14 Oct 2025 09:46:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=93=E9=A2=98=E9=A1=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackages/activity/agriculturalProd.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subPackages/activity/agriculturalProd.vue b/subPackages/activity/agriculturalProd.vue
index ed07fb1..dc12f3f 100644
--- a/subPackages/activity/agriculturalProd.vue
+++ b/subPackages/activity/agriculturalProd.vue
@@ -13,10 +13,10 @@
 				</view>
 			</view>
 			
-			<image class="adv-image" mode="aspectFill" @click="gotoPath('/subPackages/activity/agriculturalProdNH')"
+			<!-- <image class="adv-image" mode="aspectFill" @click="gotoPath('/subPackages/activity/agriculturalProdNH')"
 			src="https://static.ticket.sz-trip.com/uploads/20250902/fbb790d1c51d067d30cef50b34f06286.png"></image>
-			
-			<image class="title-image" style="margin-bottom: 30rpx;" src="https://static.ticket.sz-trip.com/uploads/20250821/e45546af63bafab92ac2e8783d7b079c.png"></image>
+			 -->
+			<image class="title-image" style="margin:57rpx auto 30rpx;" src="https://static.ticket.sz-trip.com/uploads/20250821/e45546af63bafab92ac2e8783d7b079c.png"></image>
 			
 			<view class="row-product" v-for="(item,index) in list.slice(0,viewNum)" 
 			:key="index" @click="gotoDetailByType(item)">