From bb92dcde6b21c5b4e16a5837ff5f99cad4ea1b40 Mon Sep 17 00:00:00 2001
From: 18631081161 <2088094923@qq.com>
Date: Sat, 15 Mar 2025 17:21:18 +0800
Subject: [PATCH] =?UTF-8?q?UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 custom-tab-bar/index.js   |   2 +-
 pages/infinite/index.vue  |  39 ++--
 pages/sangdai/sangdai.vue | 379 ++++++++++++++++++--------------------
 pages/user/index.vue      | 146 ++++++++-------
 pages/user/order.vue      |  36 ++--
 5 files changed, 296 insertions(+), 306 deletions(-)

diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index e4b6255..1cb2498 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -29,7 +29,7 @@ Component({
 				"pagePath": "/pages/infinite/index",
 				"iconPath": "/static/tabbar/m2.png",
 				"selectedIconPath": "/static/tabbar/s2.png",
-				"text": "积分赏"
+				"text": "积分"
 			},
 			{
 				"index": 4,
diff --git a/pages/infinite/index.vue b/pages/infinite/index.vue
index 2696b28..cdb61aa 100644
--- a/pages/infinite/index.vue
+++ b/pages/infinite/index.vue
@@ -1,3 +1,5 @@
+<!-- 积分 -->
+
 <template>
 	<view class="content">
 		<!-- <view class="page-hd common_bg relative" :style="{
@@ -9,31 +11,31 @@
 			<view class="list-item" v-for="(item, i) in datas" :key="i" @click="items(item)">
 				<view class="pic center">
 					<image class="pic-img" :src="item.imgurl" lazy-load></image>
-					<view class="pic-type" :style="{background:'url('+ $img1('common/label1.png')+')'}">
+					<!-- <view class="pic-type" :style="{background:'url('+ $img1('common/label1.png')+')'}">
 						<text>积分赏</text>
-					</view>
+					</view> -->
 					<image :src="$img1('common/new1.png')" class="pic-new" mode="widthFix" v-if="item.new_is==1">
 					</image>
 				</view>
-				<view class="title hang1">
+				<view class="title hang2">
 					{{ item.title }}
 				</view>
-				<view class="hot-num">
+				<!-- <view class="hot-num">
 					<template v-if="item.join_count">
 						{{ item.join_count }}次参与
 					</template>
 					<template v-else>快去参与吧</template>
-				</view>
+				</view> -->
 				<view class="price-box">
 					<view class="price">
 						<text>{{ item.price }}</text>
 						积分
 					</view>
 					<view class="num-box">
+						<view class="num ml10">{{ item.sale_stock }}/{{ item.stock }}</view>
 						<view class="box icon">
 							<image :src="$img1('index/box.png')" lazy-load></image>
 						</view>
-						<view class="num ml10">{{ item.sale_stock }}/{{ item.stock }}</view>
 					</view>
 				</view>
 			</view>
@@ -315,7 +317,7 @@
 		/* padding-top: 1rpx; */
 		padding-bottom: 100px;
 		box-sizing: border-box;
-		background: #000000;
+		background: #FFFFFF;
 	}
 
 	.item_image {
@@ -348,14 +350,18 @@
 
 		.list-item {
 			width: 330rpx;
-			height: 505rpx;
-			background: url($imgurl+'common/goodsBg.png') no-repeat 0 0 / 100% 100%;
+			height: 487rpx;
+			background-color: #F8F8F8;
+			border-radius: 16rpx;
+			// background: url($imgurl+'common/goodsBg.png') no-repeat 0 0 / 100% 100%;
 			margin-top: 30rpx;
 
 			.pic {
 				width: 100%;
 				height: 332rpx;
+				background-color: #E4E4E4;
 				position: relative;
+				border-radius: 16rpx  16rpx  0rpx  0rpx;
 
 				.pic-img {
 					// width: 290rpx;
@@ -394,7 +400,7 @@
 				font-size: 28rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
+				color: #333333;
 			}
 
 			.hang1 {}
@@ -409,7 +415,7 @@
 			}
 
 			.price-box {
-				padding: 10rpx 20rpx;
+				padding: 32rpx 20rpx 10rpx;
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
@@ -417,7 +423,7 @@
 				.price {
 					font-weight: 500;
 					font-size: 24rpx;
-					color: #F8D300;
+					color: #333333;
 
 					text {
 						font-size: 36rpx;
@@ -429,15 +435,14 @@
 					align-items: center;
 
 					.num {
-						font-size: 24rpx;
-						font-family: Source Han Sans CN;
+						font-size: 16rpx;
 						font-weight: 400;
-						color: #cccccc;
+						color: #6C6C6C;
 					}
 
 					.box {
-						width: 26rpx;
-						height: 26rpx;
+						width: 18.22rpx;
+						height: 16rpx;
 						margin-left: 6rpx;
 					}
 
diff --git a/pages/sangdai/sangdai.vue b/pages/sangdai/sangdai.vue
index 023e31c..f1a1b70 100644
--- a/pages/sangdai/sangdai.vue
+++ b/pages/sangdai/sangdai.vue
@@ -75,7 +75,7 @@
 							<view class="pic">
 								<image :src="a.goodslist_imgurl" lazy-load></image>
 								<view class="type center">{{ a.shang_title }}</view>
-								<view class="num">×{{ a.prize_num }}</view>
+								<view class="num">{{ a.prize_num }}</view>
 								<view class="yu-tag ziti" v-if="subTab[subTabCur].id == 2">预售</view>
 							</view>
 							<view class="name hang1">{{ a.goodslist_title }}</view>
@@ -112,7 +112,7 @@
 						<view class="order-goods" v-for="(a, b) in item.order_list" :key="b">
 							<view class="pic">
 								<image :src="a.goodslist_imgurl" lazy-load></image>
-								<view class="num center">×{{ a.prize_num }}</view>
+								<view class="num center">{{ a.prize_num }}</view>
 								<view class="num"
 									style="left:auto;right:0;border-radius:0rpx 0rpx 0rpx 15rpx;background: #FF4D1E;"
 									v-if="a.fh_status==1">已发货</view>
@@ -154,19 +154,16 @@
 		<uni-popup ref="changePop" type="bottom">
 			<view class="change-pop relative">
 				<view class="change-pop-hd">
-					<text class="ziti">兑换确认</text>
+					<text class="">兑换确认</text>
 					<view class="close icon" @click="close('changePop')">
 						<image :src="$img('/static/img/close2.png')" lazy-load></image>
 					</view>
 				</view>
 				<view class="change-pop-bd">
 					<view class="bd-top">
-						<view>已选赏品</view>
-
-						<view>
-							共
-							<text>{{ nowChooseNum }}</text>
-							件
+						<view>已选
+							<text style="color: #333333;">{{ nowChooseNum }}</text>
+							件赏品
 						</view>
 					</view>
 
@@ -175,7 +172,7 @@
 							<view class="pic">
 								<image :src="item.goodslist_imgurl" lazy-load></image>
 								<!-- <view class="type">{{ item.shang_title }}</view> -->
-								<view class="num center">×{{ item.chooseNum }}</view>
+								<view class="num center">{{ item.chooseNum }}</view>
 							</view>
 							<view class="title hang1">
 								{{ item.goodslist_title }}
@@ -190,17 +187,17 @@
 						<text>￥{{ totalChangeMoney }}</text>
 					</view> -->
 				</view>
-				<view class="align-center justify-between mt30">
-					<view class="" style="color: #FFFFFF;">
-						共<text style="color: #D3AFFF;">{{nowChooseNum}}</text>
-						件物品，合计兑换<text style="color: #D3AFFF;">吧唧币</text>
-						<text style="color: #D3AFFF; font-size: 30rpx;">{{totalChangeMoney}}</text>
-					</view>
-					<view class="change-pop-ft" @click="$c.noDouble(submitChange)">
-						<text>确认兑换</text>
+				<view class="align-center justify-center mt30"
+					style="background-color: #FFFFFF; height: 82rpx; border-radius: 16rpx;">
+					<view class="" style="color: #333333;">
+						共<text style="color: #333333;">{{nowChooseNum}}</text>
+						件物品，合计兑换<text style="color: #333333;"></text>
+						<text style="color: #333333; font-size: 30rpx;">{{totalChangeMoney}}</text>
 					</view>
 				</view>
-
+				<view class="change-pop-ft" @click="$c.noDouble(submitChange)">
+					<text>确认兑换</text>
+				</view>
 			</view>
 		</uni-popup>
 
@@ -216,12 +213,9 @@
 
 				<view class="send-pop-card">
 					<view class="card-top">
-						<view>已选赏品</view>
-
-						<view>
-							共
-							<text>{{ nowChooseNum }}</text>
-							件
+						<view>已选
+							<text style="color: #333333;">{{ nowChooseNum }}</text>
+							件赏品
 						</view>
 					</view>
 
@@ -230,7 +224,7 @@
 							<view class="pic">
 								<image :src="item.goodslist_imgurl" lazy-load></image>
 								<!-- <view class="type">{{ item.shang_title }}</view> -->
-								<view class="num center">×{{ item.chooseNum }}</view>
+								<view class="num center">{{ item.chooseNum }}</view>
 							</view>
 
 							<view class="title hang1">
@@ -239,7 +233,7 @@
 						</view>
 					</scroll-view>
 				</view>
-				<view class="br20 mt20" style="background: #3B3941;padding: 0 20rpx;">
+				<view class="br20 mt20" style="background: #FFFFFF;padding: 0 20rpx;">
 					<view class="address" @click="chooseAdd">
 						<view v-if="!addData" class="add-choose">请选择收货地址</view>
 
@@ -303,24 +297,23 @@
 			</view>
 		</uni-popup>
 
+		<!-- 上锁弹窗 -->
 		<uni-popup ref="model" type="center">
-			<view class="model">
-				<view class="model-hd ziti">提示</view>
-
+			<view class="model flex center">
 				<view class="model-bd">{{ lockMsg }}</view>
-
-				<view class="model-ft">
-					<view class="model-btn" @click="close('model')">取消</view>
-
-					<view class="model-btn act" @click="$c.noDouble(submitLock)">
-						确定
-					</view>
+			</view>
+			<view class="model-ft row">
+				<view class="model-btn" @click="close('model')">取消</view>
+			
+				<view class="model-btn act" @click="$c.noDouble(submitLock)">
+					确定
 				</view>
 			</view>
 		</uni-popup>
+
 		<uni-popup ref="resPop" type="center" mask-background-color="rgba(0,0,0,0.8)">
 			<view class="res-pop column center">
-				<view class="res-pop-hd"></view>
+				<!-- <view class="res-pop-hd"></view> -->
 				<view class="res-list center">
 					<view class="res-item center column">
 						<view class="pic center">
@@ -328,12 +321,12 @@
 						</view>
 						<view class="item-info">
 							<view class="title center hang1">
-								成功获得{{zhanshiMoney}}吧唧币
+								恭喜您成功兑换，获得{{zhanshiMoney}}
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="res-pop-ft justify-center" @click="$refs.resPop.close()">
+				<view class="res-pop-ft center justify-center" @click="$refs.resPop.close()">
 					<text>确定</text>
 				</view>
 			</view>
@@ -1015,8 +1008,8 @@
 			}
 
 			.rule {
-				width: 55rpx;
-				height: 61rpx;
+				width: 40rpx;
+				height: 68rpx;
 			}
 		}
 
@@ -1072,13 +1065,14 @@
 			.list-item {
 				width: 100%;
 				box-sizing: border-box;
-				background: #070707;
+				background: #F8F8F8;
 				padding-bottom: 20rpx;
-				background: url($imgurl+'shangdai/kuang.png') no-repeat 0 0 / 100% 100%;
+				border-radius: 16rpx;
+				// background: url($imgurl+'shangdai/kuang.png') no-repeat 0 0 / 100% 100%;
 
 				.pic {
-					width: 190rpx;
-					height: 190rpx;
+					width: 202rpx;
+					height: 202rpx;
 					padding-top: 10rpx;
 					margin: 0 auto;
 					position: relative;
@@ -1086,26 +1080,27 @@
 					.type {
 						position: absolute;
 						z-index: 1;
-						left: -4rpx;
-						top: 0;
-						min-width: 70rpx;
+						left: 10rpx;
+						top: 12rpx;
+						min-width: 68rpx;
 						height: 32rpx;
 						padding: 0 10rpx;
-						background: #792CC7;
+						background: #9A8EF6;
 						font-weight: 400;
 						font-size: 22rpx;
 						color: #FFFFFF;
-						border-radius: 0 0 20rpx 0;
+						border-radius: 18rpx;
 					}
 
 					.num {
 						position: absolute;
 						z-index: 1;
 						left: 50%;
-						bottom: 0;
+						bottom: 12rpx;
 						transform: translateX(-50%);
-						width: 100%;
-						height: 32rpx;
+						width: 50rpx;
+						height: 38rpx;
+						border-radius: 18rpx;
 						display: flex;
 						justify-content: center;
 						align-items: center;
@@ -1113,7 +1108,7 @@
 						font-size: 24rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #ffffff;
+						color: #333333;
 					}
 
 					.yu-tag {
@@ -1132,11 +1127,10 @@
 				}
 
 				.name {
-					padding: 10rpx 10rpx 0;
-					font-size: 24rpx;
-					font-family: Source Han Sans CN;
+					padding: 20rpx 10rpx 0;
+					font-size: 20rpx;
 					font-weight: 400;
-					color: #ffffff;
+					color: #333333;
 				}
 
 				.price {
@@ -1150,10 +1144,12 @@
 				}
 
 				.num-box {
-					margin: 10rpx 0;
+					margin: 24rpx 20rpx 10rpx;
 					display: flex;
 					justify-content: center;
 					align-items: center;
+					background-color: #DFDFDF;
+					border-radius: 20rpx;
 
 					.icon {
 						width: 32rpx;
@@ -1167,7 +1163,7 @@
 						font-size: 24rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #FFFFFF;
+						color: #8A8A8A;
 					}
 				}
 			}
@@ -1178,7 +1174,7 @@
 
 			.order-item {
 				padding: 0 30rpx 30rpx;
-				background: #3B3941;
+				background: #F7F7F7;
 				border-radius: 20rpx;
 				margin-top: 30rpx;
 
@@ -1189,17 +1185,17 @@
 					padding: 30rpx 0;
 
 					.time {
-						font-size: 28rpx;
+						font-size: 20rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #ffffff;
+						color: #8A8A8A;
 					}
 
 					.status {
-						font-size: 28rpx;
+						font-size: 20rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #ffffff;
+						color: #333333;
 					}
 				}
 
@@ -1226,26 +1222,27 @@
 							.num {
 								position: absolute;
 								z-index: 1;
-								left: 0;
-								top: 0;
-								min-width: 60rpx;
+								left: 50%;
+								bottom: 10rpx;
+								width: 50rpx;
+								transform: translateX(-50%);
 								box-sizing: border-box;
 								padding: 0 10rpx;
 								background: rgba(0, 0, 0, 0.5);
 								font-size: 24rpx;
 								font-weight: 400;
 								color: #ffffff;
-								border-radius: 20rpx 0 20rpx 0;
+								border-radius: 20rpx;
 							}
 						}
 
 						.title {
-							padding: 10rpx 10rpx 0;
+							padding: 16rpx 10rpx 0;
 
-							font-size: 24rpx;
+							font-size: 20rpx;
 							font-family: Source Han Sans CN;
 							font-weight: 400;
-							color: #dddddd;
+							color: #333333;
 						}
 					}
 				}
@@ -1313,7 +1310,7 @@
 			// #endif
 			width: 750rpx;
 			box-sizing: border-box;
-			padding: 0 30rpx 20rpx;
+			padding: 0 30rpx 100rpx;
 			display: flex;
 			justify-content: space-around;
 			align-items: center;
@@ -1321,22 +1318,22 @@
 			.btn {
 				width: 201rpx;
 				height: 66rpx;
-				font-family: YouSheBiaoTiHei;
+				// font-family: YouSheBiaoTiHei;
 				font-weight: 400;
-				font-size: 38rpx;
-				color: #FFFFFF;
-				text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
+				font-size: 30rpx;
+				color: #333333;
+				// text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
 				background: url($imgurl+'shangdai/btn1.png') no-repeat 0 0 / 100% 100%;
 			}
 
 			.btn2 {
 				width: 201rpx;
 				height: 66rpx;
-				font-family: YouSheBiaoTiHei;
+				// font-family: YouSheBiaoTiHei;
 				font-weight: 400;
-				font-size: 38rpx;
-				color: #FFFFFF;
-				text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
+				font-size: 30rpx;
+				color: #333333;
+				// text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
 				background: url($imgurl+'shangdai/btn2.png') no-repeat 0 0 / 100% 100%;
 			}
 
@@ -1349,53 +1346,45 @@
 		.change-pop {
 			padding: 0 30rpx 100px;
 			box-sizing: border-box;
-			background: #1C1B20;
+			background: #F7F7F7;
 			position: relative;
+			border-radius: 16rpx 16rpx 0rpx 0rpx;
 
-			&::after {
-				content: '';
-				position: absolute;
-				top: -62rpx;
-				left: 0;
-				width: 750rpx;
-				height: 62rpx;
-				background: url($imgurl+'common/ding.png') no-repeat 0 0 / 100% 100%;
-			}
 
 			.change-pop-hd {
 				padding: 30rpx 0;
 				position: relative;
 				text-align: center;
 
-				font-size: 32rpx;
-				font-family: Source Han Sans CN;
+				font-size: 28rpx;
+				// font-family: Source Han Sans CN;
 				font-weight: 500;
-				color: #ffffff;
+				color: #333333;
 
 				.close {
 					position: absolute;
 					right: 0;
 					top: 50%;
 					transform: translateY(-50%);
-					width: 60rpx;
-					height: 60rpx;
+					width: 24rpx;
+					height: 24rpx;
 				}
 			}
 
 			.change-pop-bd {
 				padding: 0 30rpx 30rpx;
-				background: #3B3941;
+				background: #FFFFFF;
 				border-radius: 20rpx;
 
 				.bd-top {
 					display: flex;
-					justify-content: space-between;
+					justify-content: center;
 					padding: 30rpx 0;
 
 					font-size: 28rpx;
 					font-family: Source Han Sans CN;
 					font-weight: 400;
-					color: #ffffff;
+					color: #8A8A8A;
 
 					text {
 						color: #ffffff;
@@ -1439,7 +1428,6 @@
 										#ff7feb 100%);
 
 								font-size: 20rpx;
-								font-family: Source Han Sans CN;
 								font-weight: 400;
 								color: #222222;
 							}
@@ -1447,18 +1435,20 @@
 							.num {
 								position: absolute;
 								z-index: 1;
-								left: 0;
-								bottom: 0;
+								left: 50%;
+								transform: translateX(-50%);
+								bottom: 10rpx;
 								height: 32rpx;
-								width: 100%;
+								width: 50rpx;
 								box-sizing: border-box;
-								padding: 0 10rpx;
-								background: rgba(0, 0, 0, 0.6);
+								border-radius: 18rpx;
+								padding: 10rpx 10rpx;
+								background: rgba(255, 255, 255, 0.50);
 
-								font-size: 24rpx;
+								font-size: 20rpx;
 								font-family: Source Han Sans CN;
 								font-weight: 400;
-								color: #ffffff;
+								color: #333333;
 							}
 						}
 
@@ -1468,7 +1458,7 @@
 							font-size: 24rpx;
 							font-family: Source Han Sans CN;
 							font-weight: 400;
-							color: #dddddd;
+							color: #333333;
 						}
 
 						.price {
@@ -1499,25 +1489,24 @@
 			}
 
 			.change-pop-ft {
-				width: 286rpx;
-				height: 116rpx;
+				height: 84rpx;
 				background: url($imgurl+'common/payBtn.png') no-repeat 0 0 / 100% 100%;
 				display: flex;
+				align-items: center;
+				margin-top: 40rpx;
 				justify-content: center;
+				font-size: 24rpx;
 				font-weight: 500;
-				color: #7825DE;
-
-				>text {
-					margin-top: 32rpx;
-				}
+				color: #CDEF27;
 			}
 		}
 
 		.send-pop {
 			padding: 0 30rpx 100px;
 			box-sizing: border-box;
-			background: #1C1B20;
+			background: #F7F7F7;
 			position: relative;
+			border-radius: 16rpx 16rpx 0rpx 0rpx;
 
 			&::after {
 				content: '';
@@ -1526,41 +1515,41 @@
 				left: 0;
 				width: 750rpx;
 				height: 62rpx;
-				background: url($imgurl+'common/ding.png') no-repeat 0 0 / 100% 100%;
+				// background: url($imgurl+'common/ding.png') no-repeat 0 0 / 100% 100%;
 			}
 
 			.send-pop-hd {
-				padding: 30rpx 0;
+				padding: 40rpx 0;
 				position: relative;
 				text-align: center;
-				font-size: 32rpx;
-				font-family: Source Han Sans CN;
+				font-size: 28rpx;
+				// font-family: Source Han Sans CN;
 				font-weight: 500;
-				color: #ffffff;
+				color: #333333;
 
 				.close {
 					position: absolute;
 					right: 0;
 					top: 50%;
 					transform: translateY(-50%);
-					width: 60rpx;
-					height: 60rpx;
+					width: 24rpx;
+					height: 24rpx;
 				}
 			}
 
 			.send-pop-card {
 				padding: 0 30rpx 30rpx;
-				background: #3B3941;
+				background: #FFFFFF;
 				border-radius: 20rpx;
 
 				.card-top {
 					display: flex;
-					justify-content: space-between;
+					justify-content: center;
 					padding: 30rpx 0;
 					font-size: 28rpx;
 					font-family: Source Han Sans CN;
 					font-weight: 400;
-					color: #ffffff;
+					color: #8A8A8A;
 
 					>text {
 						margin: 0 4rpx;
@@ -1611,25 +1600,26 @@
 							.num {
 								position: absolute;
 								z-index: 1;
-								left: 0;
-								top: 0;
+								left: 50%;
+								bottom: 12rpx;
+								transform: translateX(-50%);
 								height: 32rpx;
 								min-width: 60rpx;
 								box-sizing: border-box;
 								padding: 0 10rpx;
-								background: rgba(0, 0, 0, 0.5);
+								background: rgba(255, 255, 255, 0.50);
 								font-size: 24rpx;
 								font-weight: 400;
-								border-radius: 20rpx 0 20rpx 0;
-								color: #ffffff;
+								border-radius: 20rpx;
+								color: #000;
 							}
 						}
 
 						.title {
-							padding: 10rpx 10rpx 0;
-							font-size: 24rpx;
+							padding: 16rpx 10rpx 0;
+							font-size: 20rpx;
 							font-weight: 400;
-							color: #dddddd;
+							color: #333333;
 						}
 					}
 				}
@@ -1656,7 +1646,7 @@
 				.add-choose {
 					font-size: 32rpx;
 					font-weight: 400;
-					color: #FFFFFF;
+					color: #333333;
 				}
 
 				.add-info {
@@ -1691,8 +1681,8 @@
 					top: 50%;
 					transform: translateY(-50%);
 
-					width: 32rpx;
-					height: 32rpx;
+					width: 10rpx;
+					height: 17rpx;
 				}
 			}
 
@@ -1705,10 +1695,10 @@
 				font-size: 28rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
+				color: #676767;
 
 				text {
-					color: #FFFFFF;
+					color: #676767;
 				}
 			}
 
@@ -1745,7 +1735,7 @@
 				margin-top: 30rpx;
 				font-size: 24rpx;
 				font-weight: 400;
-				color: #ffffff;
+				color: #999999;
 				line-height: 32rpx;
 
 				.icon {
@@ -1761,74 +1751,60 @@
 
 			.send-pop-ft {
 				margin: 30rpx auto 0;
-				width: 406rpx;
-				height: 116rpx;
+				width: 686rpx;
+				height: 84rpx;
 				background: url($imgurl+'common/payBtn.png') no-repeat 0 0 / 100% 100%;
 				display: flex;
+				align-items: center;
 				justify-content: center;
 				font-weight: 500;
-				color: #7825DE;
+				color: #CDEF27;
 
 				>text:nth-child(1) {
-					font-size: 28rpx;
-					margin-top: 32rpx;
+					font-size: 24rpx;
 				}
 			}
 		}
 
 		.model {
-			width: 650rpx;
-			background: #3B3941;
+			width: 480rpx;
+			height: 160rpx;
+			background: #FFFFFF;
 			border-radius: 30rpx;
-			border: 2rpx solid #D3AFFF;
 			box-sizing: border-box;
-			padding: 0 50rpx;
-
-			.model-hd {
-				padding: 40rpx 0;
-				text-align: center;
-
-				font-size: 36rpx;
-				font-family: Source Han Sans CN;
-				font-weight: 500;
-				color: #ffffff;
-			}
 
 			.model-bd {
 				text-align: center;
 				padding: 10rpx 0;
-
-				font-size: 32rpx;
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #333333;
+			}
+		}
+		.model-ft {
+			width: 100%;
+			padding: 50rpx 0;
+			display: flex;
+			justify-content: space-between;
+		
+			.model-btn {
+				width: 220rpx;
+				height: 72rpx;
+				border-radius: 16rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				background-color: #F5F5F5;
+		
+				font-size: 24rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
-			}
-
-			.model-ft {
-				padding: 50rpx 0;
-				display: flex;
-				justify-content: space-between;
-
-				.model-btn {
-					width: 230rpx;
-					height: 80rpx;
-					border: 2rpx solid #D3AFFF;
-					border-radius: 40rpx;
-					box-sizing: border-box;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-
-					font-size: 32rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #D3AFFF;
-
-					&.act {
-						border: 2rpx solid #FFFFFF;
-						background: #894DD3;
-						color: #FFFFFF;
-					}
+				color: #A5A5A5;
+		
+				&.act {
+					background: #D8FD24;
+					color: #333333;
 				}
 			}
 		}
@@ -1838,7 +1814,7 @@
 		width: 100%;
 		height: 100vh;
 		position: relative;
-		background: url($imgurl+'common/yb.png') no-repeat 0 0 / 100% 100%;
+		// background: url($imgurl+'common/yb.png') no-repeat 0 0 / 100% 100%;
 
 		.res-pop-hd {
 			width: 380rpx;
@@ -1847,17 +1823,18 @@
 		}
 
 		.res-list {
-			width: 750rpx;
-			height: 500rpx;
+			width: 480rpx;
+			height: 240rpx;
 			padding: 0 30rpx 30rpx;
-			background: #1F1927;
+			background: #FFFFFF;
+			border-radius: 16rpx;
 
 			.res-item {
 				width: 100%;
 
 				.pic {
-					width: 152rpx;
-					height: 124rpx;
+					width: 120rpx;
+					height: 120rpx;
 					position: relative;
 				}
 
@@ -1870,22 +1847,22 @@
 						margin-top: 10rpx;
 						font-weight: 400;
 						font-size: 32rpx;
-						color: #FFFFFF;
+						color: #333333;
 					}
 				}
 			}
 		}
 
 		.res-pop-ft {
-			width: 244rpx;
-			height: 116rpx;
+			width: 220rpx;
+			height: 72rpx;
 			margin: 112rpx auto 0;
 			box-sizing: border-box;
 			background: url($imgurl+'common/jixuchou.png') no-repeat 0 0 / 100% 100%;
 
 			>text {
-				color: #7825DE;
-				margin-top: 28rpx;
+				color: #333333;
+				margin-top: #333333;
 			}
 		}
 	}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 033869e..93d9bc7 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="mine">
-		<uni-nav-bar left-text="我的" color="#fff" backgroundColor="transparent" :border="false" :statusBar="true"
+		<uni-nav-bar left-text=" " color="#fff" backgroundColor="transparent" :border="false" :statusBar="true"
 			:fixed="false"></uni-nav-bar>
 
 		<view class="user-card">
@@ -17,7 +17,7 @@
 					<view v-else class="nick">未登录</view>
 
 					<view v-if="userinfo" class="user-day">
-						吧唧一番赏已经陪你走过了{{ userinfo.day }}天
+						已经陪你走过了{{ userinfo.day }}天
 					</view>
 				</view>
 			</view>
@@ -30,13 +30,18 @@
 						<template v-if="userinfo.quan_yi_level.cha == -1">已满级</template>
 					</text>
 					<view class="mt10 relative">
-						<text class="lv-box-num">{{userinfo.quan_yi_level.jindu+'%'}}</text>
+						<!-- <text class="lv-box-num">{{userinfo.quan_yi_level.jindu+'%'}}</text> -->
 						<cmd-progress :percent="userinfo.quan_yi_level.jindu" :show-info="false" stroke-color="#4BCAFF"
 							:strokeWidth="12"></cmd-progress>
 					</view>
 				</view>
-				<text class="lv-box-detail" @click="$c.to({ url: '/package/mine/equity' })">查看详情</text>
+				<text class="lv-box-detail" @click="$c.to({ url: '/package/mine/equity' })">点击查看详情</text>
+				<image style="width: 206rpx; height: 206rpx; position: absolute; top: -40rpx; right: 8rpx;"
+					:src="$img1('my/ou.png')"></image>
 			</view>
+
+
+
 			<!-- <view class="rbtn flex" @click="$c.to({ url: '/pages/user/vip' })">
 				<image class="img100" :src="$img1('my/huiyuan.png')"></image>
 			</view> -->
@@ -55,52 +60,52 @@
 		<view class="money-card">
 			<view class="other-num">
 				<view class="other-item" @click="$c.to({ url: '/pages/user/bi_jl' })">
+					<view class="num" style="color: #333333;">{{ userinfo.integral || 0 }}</view>
 					<view class="title">吧唧币</view>
-					<view class="num" style="color: #ff873a;">{{ userinfo.integral || 0 }}</view>
 				</view>
 
 				<view class="other-item" @click="$c.to({ url: '/pages/user/jf_jl' })">
+					<view class="num" style="color: #333333;">{{ userinfo.score || 0 }}</view>
 					<view class="title">积分</view>
-					<view class="num" style="color: #479EE3;">{{ userinfo.score || 0 }}</view>
 				</view>
 
 				<view class="other-item" @click="$c.to({ url: '/pages/user/my_coupon' })">
-					<view class="title">欧气券</view>
 					<view class="num">{{ userinfo.coupon || 0 }}</view>
+					<view class="title">欧气券</view>
 				</view>
 			</view>
-			<view class="moneyTitle mt30">我的星钻</view>
-			<view class="money mt20 align-center justify-between br20">
-				<view class="align-center">
-					<image :src="$img1('my/yue.png')"></image>
-					<text>￥</text>
-					<text>{{ userinfo.money || '0.00' }}</text>
+
+			<view class="money align-center justify-between br20">
+				<view class="align-center" style="margin-left: 32rpx;">
+					<text style="color: #333333; font-size: 28rpx;">星钻</text>
 				</view>
 				<view class="money-detail" @click="$c.to({ url: '/pages/user/yetx' })">
-					<text>查看明细</text>
-					<uni-icons type="right" color="#FFFFFF"></uni-icons>
+					<text>{{ userinfo.money || '0.00' }}</text>
+					<uni-icons type="right" color="#666666"></uni-icons>
 				</view>
 			</view>
 		</view>
 
 		<view v-if="taskList.length > 0" class="task">
 			<view class="task-title">主要任务</view>
+			<view
+				style="width: 622rpx; height: 2rpx; background-color: #F3F3F3; margin-left: 32rpx; margin-top: 34rpx;">
+			</view>
 			<view class="task-list">
 				<view class="task-item" v-for="(item, i) in taskList" :key="i">
 					<view class="task-l">
-						<view class="title">{{ item.title }}</view>
+						<view class="title">{{ item.title }} ({{ item.ywc_count }}/{{ item.number }})</view>
 
 						<view class="num">欧气值+{{ item.z_number }}</view>
 
-						<view class="progress">
+					<!-- 	<view class="progress">
 							<view class="progress-inner">
 								<cmd-progress :percent="item.percentage" :show-info="false"
 									stroke-color="linear-gradient(90deg, #7836FF 0%, #A465F2 100%)"
 									:strokeWidth="8"></cmd-progress>
 							</view>
-
-							{{ item.ywc_count }}/{{ item.number }}
-						</view>
+						</view> -->
+						
 					</view>
 
 					<view class="task-r">
@@ -121,6 +126,8 @@
 			</view>
 
 		</view>
+
+
 		<view class="qita mt30">
 			<view class="qita-title">其他服务</view>
 			<view class="menu-card">
@@ -1342,7 +1349,8 @@
 		padding-bottom: 100px;
 		min-height: 100vh;
 		box-sizing: border-box;
-		background: #1C1B20 url($imgurl+'my/myBg.png') no-repeat 0 0 / 750rpx 500rpx;
+
+		// background: #1C1B20 url($imgurl+'my/myBg.png') no-repeat 0 0 / 750rpx 500rpx;
 
 		.user-card {
 			position: relative;
@@ -1357,7 +1365,7 @@
 					height: 100rpx;
 					border-radius: 50%;
 					overflow: hidden;
-					background: #000;
+					background: #D8D8D8;
 
 					image {
 						width: 100%;
@@ -1376,7 +1384,7 @@
 						font-size: 32rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #ffffff;
+						color: #333333;
 					}
 
 					.user-day {
@@ -1385,36 +1393,46 @@
 						font-size: 24rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #cccccc;
+						color: #8A8A8A;
 					}
 				}
 			}
 
 			.lv-box {
-				height: 100rpx;
+				height: 216rpx;
 				margin-top: 80rpx;
 				box-sizing: border-box;
+				position: relative;
+				// background-color: #FFFFFF;
 				background: url($imgurl+'my/userVip.png') no-repeat 0 0 / 100% 100%;
 				padding-left: 136rpx;
 
 				&-dengji {
+					position: absolute;
+					left: 32rpx;
+					top: 16rpx;
 					font-weight: 500;
-					font-size: 40rpx;
-					color: #FFFFFF;
+					font-size: 48rpx;
+					color: #333333;
 					width: 100rpx;
-					text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
+					// text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
 				}
 
 				&-ouqi {
+
+					position: absolute;
+					bottom: 24rpx;
+					left: 32rpx;
+
 					>text {
 						font-weight: 400;
-						font-size: 24rpx;
-						color: #FFFFFF;
+						font-size: 16rpx;
+						color: #4C4C4C;
 					}
 
 					>view {
-						width: 280rpx;
-						// height: 24rpx;
+						width: 618rpx;
+						height: 6rpx;
 						border-radius: 12rpx;
 						border: 1px solid #111111;
 
@@ -1433,12 +1451,14 @@
 				}
 
 				&-detail {
-					width: 140rpx;
 					text-align: center;
+					position: absolute;
+					left: 32rpx;
+					top: 82rpx;
 					font-weight: 400;
-					font-size: 24rpx;
-					color: #FFFFFF;
-					text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
+					font-size: 20rpx;
+					color: #4C4C4C;
+					// text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
 				}
 			}
 
@@ -1462,12 +1482,14 @@
 
 		.money-card {
 			width: 690rpx;
-			margin: 0 auto 0;
+			margin: 40rpx auto 0;
 
 			.other-num {
 				display: flex;
 				justify-content: space-around;
-				padding: 40rpx 0 0;
+				padding: 36rpx 0;
+				background-color: #FFFFFF;
+				border-radius: 16rpx;
 
 				.other-item {
 					display: flex;
@@ -1476,23 +1498,18 @@
 					justify-content: center;
 					width: 200rpx;
 					height: 110rpx;
-					background: #1C1B20;
-					border: 4rpx solid #5B5B5D;
-					border-radius: 20rpx;
 
 					.title {
-						font-size: 24rpx;
-						font-family: Source Han Sans CN;
+						font-size: 20rpx;
 						font-weight: 400;
-						color: #ffffff;
+						color: #4C4C4C;
+						margin-top: 12rpx;
 					}
 
 					.num {
-						margin-top: 10rpx;
 						font-size: 40rpx;
-						font-family: Source Han Sans CN;
 						font-weight: 500;
-						color: #ffffff;
+						color: #333333;
 					}
 				}
 			}
@@ -1508,30 +1525,17 @@
 				align-items: flex-end;
 				padding: 0 10rpx;
 				font-size: 60rpx;
-				font-family: Source Han Sans CN;
 				font-weight: 500;
+				margin-top: 40rpx;
 				color: #FFFFFF;
 				height: 120rpx;
-				background: #313133;
-				border: 6rpx solid #5B5B5D;
+				background: #FFFFFF;
 
 				>view:nth-child(1) {
 					>image {
 						width: 100rpx;
 						height: 80rpx;
 					}
-
-					>text:nth-of-type(1) {
-						font-weight: 400;
-						font-size: 40rpx;
-						color: #F8D300;
-					}
-
-					>text:nth-of-type(2) {
-						font-weight: 500;
-						font-size: 48rpx;
-						color: #F8D300;
-					}
 				}
 
 				.money-detail {
@@ -1540,7 +1544,7 @@
 					padding-left: 16rpx;
 					font-size: 24rpx;
 					font-weight: 400;
-					color: #FFFFFF;
+					color: #333333;
 				}
 			}
 		}
@@ -1550,21 +1554,23 @@
 			width: 690rpx;
 			box-sizing: border-box;
 			padding: 0 0 20rpx;
+			border: 4rpx solid #5B5B5D;
+			background-color: #FFFFFF;
+			border-radius: 16rpx;
 
 			.task-title {
 				position: relative;
 				z-index: 1;
+				margin-left: 32rpx;
+				margin-top: 34rpx;
 				margin-bottom: 30rpx;
-				font-size: 32rpx;
-				font-family: Source Han Sans CN;
+				font-size: 28rpx;
 				font-weight: 400;
-				color: #ffffff
+				color: task
 			}
 
 			.task-list {
-				background: #313133;
 				border-radius: 20rpx;
-				border: 4rpx solid #5B5B5D;
 				padding: 30rpx;
 			}
 
@@ -1579,7 +1585,7 @@
 						font-size: 32rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #ffffff;
+						color: #333333;
 					}
 
 					.num {
@@ -1588,7 +1594,7 @@
 						font-size: 26rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #cccccc;
+						color: #8A8A8A;
 					}
 
 					.progress {
diff --git a/pages/user/order.vue b/pages/user/order.vue
index 6b57220..d41bb3c 100644
--- a/pages/user/order.vue
+++ b/pages/user/order.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<uni-nav-bar left-icon="left" title="订单详情" color="#fff" backgroundColor="transparent" :fixed="true"
+		<uni-nav-bar left-icon="left" title="订单详情" color="#000000" backgroundColor="transparent" :fixed="true"
 			:statusBar="true" :border="false" @clickLeft="back"></uni-nav-bar>
 
 		<!-- 地址 -->
@@ -12,11 +12,11 @@
 					<text style="font-size: 28rpx; font-weight: 600">
 						{{ list.name }}
 					</text>
-					<text style="color: #fff; margin-left: 10rpx">
+					<text style="color: #333333; margin-left: 10rpx">
 						{{ list.mobile }}
 					</text>
 				</view>
-				<view style="margin-top: 20rpx">{{ list.address }}</view>
+				<view style="margin-top: 20rpx; color: #676767;">{{ list.address }}</view>
 			</view>
 		</view>
 		<!-- 赏品 -->
@@ -34,7 +34,7 @@
 					<view class="pic">
 						<image :src="item.goodslist_imgurl" lazy-load></image>
 						<!-- <view class="type">{{ item.shang_title }}</view> -->
-						<view class="num center">×{{ item.prize_num }}</view>
+						<view class="num center">{{ item.prize_num }}</view>
 						<view class="num"
 							style="left:auto;right:0;border-radius:0rpx 0rpx 0rpx 15rpx;background: #FF4D1E;"
 							v-if="item.fh_status==1">已发货</view>
@@ -165,10 +165,10 @@
 		padding: 20rpx 30rpx;
 		box-sizing: border-box;
 		font-size: 28rpx;
-		background: #3B3941;
+		background: #FFFFFF;
 		border-radius: 20rpx;
 		font-size: 24rpx;
-		color: #ffffff;
+		color: #676767;
 
 		>view {
 			padding: 20rpx 0;
@@ -205,8 +205,8 @@
 		display: flex;
 		align-items: center;
 		font-size: 24rpx;
-		color: #ffffff;
-		background: #3B3941;
+		color: #333333;
+		background: #FFFFFF;
 		border-radius: 20rpx;
 	}
 
@@ -247,7 +247,7 @@
 		margin: 24rpx auto 0;
 		padding: 20rpx 2rpx 20rpx;
 		box-sizing: border-box;
-		background: #3B3941;
+		background: #FFFFFF;
 		border-radius: 20rpx;
 
 		.order-hd {
@@ -260,14 +260,14 @@
 				font-size: 28rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
+				color: #8A8A8A;
 			}
 
 			.status {
 				font-size: 28rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
+				color: #333333;
 			}
 		}
 
@@ -301,8 +301,9 @@
 					.num {
 						position: absolute;
 						z-index: 1;
-						left: 0;
-						top: 0;
+						left: 50%;
+						bottom: 10rpx;
+						transform: translateX(-50%);
 						min-width: 60rpx;
 						box-sizing: border-box;
 						padding: 0 10rpx;
@@ -310,17 +311,17 @@
 						font-size: 24rpx;
 						font-weight: 400;
 						color: #ffffff;
-						border-radius: 20rpx 0 20rpx 0;
+						border-radius: 20rpx;
 					}
 				}
 
 				.title {
-					padding: 10rpx 10rpx 0;
+					padding: 16rpx 10rpx 0;
 
-					font-size: 24rpx;
+					font-size: 20rpx;
 					font-family: Source Han Sans CN;
 					font-weight: 400;
-					color: #dddddd;
+					color: #333333;
 				}
 			}
 		}
@@ -331,5 +332,6 @@
 		min-height: 100vh;
 		padding-top: 1rpx;
 		box-sizing: border-box;
+		background-color: #F7F7F7;
 	}
 </style>
\ No newline at end of file