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

---
 components/buy-notice/buy-notice.vue | 252 ++++++------
 components/priv-pop/priv-pop.vue     |   1 -
 pages/mall/index.vue                 | 113 +++---
 pages/sangdai/sangdai.vue            |  80 ++--
 pages/shouye/detail.vue              | 162 +++++---
 pages/shouye/detail_wuxian.vue       | 568 +++++++++++++++------------
 pages/shouye/huanxiang.vue           |  10 +-
 pages/shouye/index.vue               |  12 +-
 pages/user/coupon.vue                |   3 +-
 9 files changed, 675 insertions(+), 526 deletions(-)

diff --git a/components/buy-notice/buy-notice.vue b/components/buy-notice/buy-notice.vue
index adff602..162cc89 100644
--- a/components/buy-notice/buy-notice.vue
+++ b/components/buy-notice/buy-notice.vue
@@ -4,151 +4,165 @@
  * @Description: content
 -->
 <template>
-  <uni-popup ref="_buy_notice" type="center">
-    <view
-      class="_buy_notice">
-      <view class="_buy_notice_hd center">平台消费规则</view>
+	<uni-popup ref="_buy_notice" type="center"  :is-mask-click="false">
+		<view class="_buy_notice">
 
-      <scroll-view class="_buy_notice_bd" scroll-y>
-        <view v-html="ruleData.content"></view>
-      </scroll-view>
+			<view class=""
+				style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; padding-top: 42rpx; padding-bottom: 42rpx; align-items: center;">
+				<view style="width: 24rpx; height: 24rpx; margin-left: 32rpx;"></view>
+				<view class="">平台消费规则</view>
+				<image :src="$img('/static/img/close2.png')" @click="close"
+					style="width: 24rpx; height: 24rpx; margin-right: 32rpx;" lazy-load></image>
+			</view>
 
-      <view @click="isAgree = !isAgree" class="_buy_notice_agree">
-        <view class="check icon">
-          <image
-            v-if="isAgree"
-            :src="$img1('common/check_act.png')"
-            lazy-load
-          ></image>
+			<scroll-view class="_buy_notice_bd" scroll-y>
+				<view v-html="ruleData.content"></view>
+			</scroll-view>
 
-          <image v-else :src="$img1('common/check.png')" lazy-load></image>
-        </view>
 
-        不再弹出消费规则
-      </view>
+		</view>
 
-      <view class="_buy_notice_ft">
-        <view class="_buy_notice_ft_btn" @click="close">退出</view>
+		<view class="center" style="width: 100%; margin-top: 28rpx;">
+			<view class="center"
+				style="background-color: #D8FD24; width: 434rpx; height: 76rpx; border-radius: 16rpx; font-size: 24rpx;"
+				@click="confirm">
+				<text>同意规则并继续支付</text>
+			</view>
+		</view>
 
-        <view class="_buy_notice_ft_btn confirm" @click="confirm">
-          <text>同意规则并继续支付</text>
-        </view>
-      </view>
-    </view>
-  </uni-popup>
+
+		<view class="center" style="width: 100%; margin-top: 28rpx;">
+			<view @click="isAgree = !isAgree" class=""
+				style=" height: 25rpx; display: flex; flex-direction: row; align-items: center;">
+				<view class="" style="padding-top: 5rpx;">
+					<image style="width: 30rpx; height: 30rpx;" v-if="isAgree" :src="$img1('common/check_act.png')"
+						lazy-load></image>
+
+					<image style="width: 30rpx; height: 30rpx;" v-else :src="$img1('common/check.png')" lazy-load>
+					</image>
+				</view>
+
+				<text style=" color: #D3D3D3; font-size: 20rpx; margin-left: 12rpx;">不再弹出消费规则</text>
+			</view>
+
+		</view>
+
+
+	</uni-popup>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      isAgree: false,
-      ruleData: ''
-    }
-  },
+	export default {
+		data() {
+			return {
+				isAgree: false,
+				ruleData: ''
+			}
+		},
 
-  methods: {
-    confirm() {
-      this.close()
-      if (this.isAgree) {
-        uni.setStorageSync('_agree_buy_notice', true)
-      }
-      this.$emit('confirm')
-    },
+		methods: {
+			confirm() {
+				this.close()
+				if (this.isAgree) {
+					uni.setStorageSync('_agree_buy_notice', true)
+				}
+				this.$emit('confirm')
+			},
 
-    close() {
-      this.$refs._buy_notice.close()
-    },
+			close() {
+				this.$refs._buy_notice.close()
+			},
 
-    open(opt) {
-      this.ruleData = opt
+			open(opt) {
+				this.ruleData = opt
 
-      this.$refs._buy_notice.open()
-    },
+				this.$refs._buy_notice.open()
+			},
 
-    async getRule(id, title = '') {
-      let res = await this.$c.getRule(id, true)
+			async getRule(id, title = '') {
+				let res = await this.$c.getRule(id, true)
 
-      this.open({
-        title: title,
-        content: res.data
-      })
-    }
-  }
-}
+				this.open({
+					title: title,
+					content: res.data
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss">
-._buy_notice {
-  width: 650rpx;
-  background: #313133;
-  border-radius: 30rpx;
+	._buy_notice {
+		width: 650rpx;
+		background: #FFFFFF;
+		border-radius: 30rpx;
 
-  ._buy_notice_hd {
-    height: 140rpx;
-	font-size: 50rpx;
-	font-family: YouSheBiaoTiHei;
-	color: #FFFFFF;
-  }
+		._buy_notice_hd {
+			height: 140rpx;
+			font-size: 50rpx;
+			font-family: YouSheBiaoTiHei;
+			color: #FFFFFF;
+		}
 
-  ._buy_notice_bd {
-    height: 400rpx;
-    width: 570rpx;
-    margin: 0 auto;
+		._buy_notice_bd {
+			height: 828rpx;
+			width: 570rpx;
+			margin: 0 auto;
+			padding-bottom: 60rpx;
 
-    font-size: 30rpx;
-    font-family: Source Han Sans CN;
-    font-weight: 400;
-    color: #ffffff;
-  }
+			font-size: 30rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #D3D3D3;
+		}
 
-  ._buy_notice_agree {
-    margin-top: 30rpx;
-    padding: 0 40rpx;
-    display: flex;
+		._buy_notice_agree {
+			margin-top: 30rpx;
+			padding: 0 40rpx;
+			display: flex;
 
-    .check {
-      width: 32rpx;
-      height: 32rpx;
-      margin-right: 10rpx;
-    }
+			.check {
+				width: 32rpx;
+				height: 32rpx;
+				margin-right: 10rpx;
+			}
 
-    font-size: 26rpx;
-    font-family: Source Han Sans CN;
-    font-weight: 400;
-    color: #d0d1ff;
-    line-height: 32rpx;
-  }
+			font-size: 26rpx;
+			font-family: Source Han Sans CN;
+			font-weight: 400;
+			color: #d0d1ff;
+			line-height: 32rpx;
+		}
 
-  ._buy_notice_ft {
-    height: 90rpx;
-    display: flex;
-    border-top: 1rpx solid #333;
-    margin-top: 30rpx;
+		._buy_notice_ft {
+			height: 90rpx;
+			display: flex;
+			border-top: 1rpx solid #333;
+			margin-top: 30rpx;
 
-    ._buy_notice_ft_btn {
-      flex: 1;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+			._buy_notice_ft_btn {
+				flex: 1;
+				display: flex;
+				justify-content: center;
+				align-items: center;
 
-      font-size: 28rpx;
-      font-family: Source Han Sans CN;
-      font-weight: 400;
-      color: #dddddd;
-    }
+				font-size: 28rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #dddddd;
+			}
 
-    .confirm {
-      border-left: 1rpx solid #333;
+			.confirm {
+				border-left: 1rpx solid #333;
 
-      text {
-        color: transparent;
-        background: #F6C0FF;
-        background-clip: text;
-      }
-    }
-  }
-}
-.common_bg {
-}
-</style>
+				text {
+					color: transparent;
+					background: #F6C0FF;
+					background-clip: text;
+				}
+			}
+		}
+	}
+
+	.common_bg {}
+</style>
\ No newline at end of file
diff --git a/components/priv-pop/priv-pop.vue b/components/priv-pop/priv-pop.vue
index 1f32cf8..71206bd 100644
--- a/components/priv-pop/priv-pop.vue
+++ b/components/priv-pop/priv-pop.vue
@@ -118,7 +118,6 @@ export default {
         z-index: 1;
         border: 0;
         filter: grayscale(0);
-
         color: #000;
       }
     }
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index 026f53e..1f0bf0f 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<view style="padding-bottom: 300rpx;">
+	<view style="padding-bottom: 300rpx; background-color: white;">
 		<view class="" style="display: flex; flex-direction: column;">
 			<view style="position: relative;">
 				<view class="title" :style="{marginTop: statusBarHeight + 'rpx' }">
@@ -23,14 +23,17 @@
 
 			<view class="grid-container">
 				<view v-for="(item,index) in datas" :key="index" class="grid-item" @click="order_money(item)">
-					<image src="https://bajiapi.onelight.vip/static/web/static/common/20240711134549.png"
-						style="height: 430rpx; position: absolute;" mode="heightFix"></image>
 
-					<image :src="item.imgurl"
-						style=" width: 326.39rpx; height: 326.39rpx; position: absolute; left: 2rpx;" mode=""></image>
+					<view class=""
+						style="background-color: #D8D8D8;  height: 324rpx; border-radius: 16rpx  16rpx  0rpx  0rpx;">
+						<image :src="item.imgurl"
+							style=" width: 326.39rpx; height: 324rpx; position: absolute; left: 2rpx; " mode="">
+						</image>
+					</view>
 
-					<view class="goods-name">
-						<text style="color: #FFF8F8FA; font-size: 27rpx;">{{item.title}}</text>
+
+					<view class="goods-name hang1" style="width: 100%;">
+						<text style="color: #333333; font-size: 27rpx;">{{item.title}}</text>
 					</view>
 
 					<view class="price-box">
@@ -39,10 +42,10 @@
 						</view>
 					</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>
 
@@ -52,7 +55,9 @@
 		<uni-popup ref="pop" type="bottom">
 			<view v-if="orderData" class="buy-pop relative">
 				<view class="buy-pop-hd">
-					<text class="ziti">确认订单</text>
+					<view style="width: 24rpx;">
+					</view>
+					<text class="">确认订单</text>
 					<view class="close icon" @click="close('pop')">
 						<image :src="$img('/static/img/close2.png')" lazy-load></image>
 					</view>
@@ -65,14 +70,14 @@
 							</image>
 						</view>
 						<view class="info-r">
-							<view class="hang1" style="width: 100%;	color: white;">
+							<view class="hang1" style="width: 100%;	color: #333333; font-size: 24rpx;">
 								{{ orderData.goods.title }}
 							</view>
 							<view class="type">类型:明信片</view>
 
 							<view class="price-num">
-								<view class="price">
-									¥<text>{{ orderData.goods.price }}</text>
+								<view class="price" style="font-size: 16rpx;">
+									¥<text style="font-size: 28rpx;">{{ orderData.goods.price }}</text>
 								</view>
 								<view class="num">×{{ orderData.goods.prize_num }}</view>
 							</view>
@@ -80,10 +85,9 @@
 					</view>
 
 				</view>
-				<view class="pay-title ziti">选择支付方式</view>
-				<view class="br20 mt20" style="background: #5B5B5D;">
+				<view class="br20 mt20" style="background: #FFFFFF;">
 					<view class="pay-type" @click="changePay(0)">
-						<view class="" style="width: 100%;	color: white;">
+						<view class="" style="width: 100%;	color: #333333;">
 							微信支付
 						</view>
 						<view class="icon">
@@ -94,8 +98,8 @@
 					</view>
 					<view class="pay-type" @click="changePay(1)">
 
-						<view class="" style="width: 100%;	color: white;">
-							吧唧币 
+						<view class="" style="width: 100%;	color: #333333;">
+							吧唧币
 							{{ orderData.goods.price*100 }} (剩余:{{ orderData.use_integral }})
 						</view>
 
@@ -440,7 +444,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		color: white;
+		color: black;
 		z-index: 100;
 	}
 
@@ -453,14 +457,16 @@
 	}
 
 	.grid-item {
-		height: 430rpx;
+		height: 487rpx;
 		position: relative;
+		background-color: #F8F8F8;
+		border-radius: 0rpx 0rpx 16rpx 16rpx;
 	}
 
 	.goods-name {
 		position: absolute;
 		left: 25rpx;
-		bottom: 60rpx;
+		bottom: 90rpx;
 	}
 
 	.price-box {
@@ -473,12 +479,8 @@
 
 		.price {
 			font-weight: 500;
-			font-size: 24rpx;
-			color: #F8D300;
-
-			text {
-				font-size: 36rpx;
-			}
+			font-size: 16rpx;
+			color: #333333;
 		}
 	}
 
@@ -490,15 +492,15 @@
 		right: 20rpx;
 
 		.num {
-			font-size: 24rpx;
+			font-size: 16rpx;
 			font-family: Source Han Sans CN;
 			font-weight: 400;
-			color: #cccccc;
+			color: #6C6C6C;
 		}
 
 		.box {
-			width: 26rpx;
-			height: 26rpx;
+			width: 18rpx;
+			height: 16rpx;
 			margin-left: 6rpx;
 		}
 
@@ -508,9 +510,10 @@
 	.buy-pop {
 		padding: 0 30rpx;
 		box-sizing: border-box;
-		background: #1C1B20;
+		background: #F7F7F7;
 		padding-bottom: 200rpx;
 		z-index: 999;
+		border-radius: 16rpx 16rpx 0rpx 0rpx;
 
 		&::after {
 			content: '';
@@ -519,11 +522,10 @@
 			left: 0;
 			width: 750rpx;
 			height: 62rpx;
-			background: url($imgurl+'common/ding.png') no-repeat 0 0 / 100% 100%;
 		}
 
 		.buy-pop-hd {
-			padding: 20rpx 0;
+			padding: 40rpx 0;
 			padding-left: 10rpx;
 			display: flex;
 			justify-content: space-between;
@@ -532,19 +534,19 @@
 			>text {
 				font-size: 32rpx;
 				font-weight: 500;
-				color: #ffffff;
+				color: #333333;
 			}
 
 			.close {
-				width: 60rpx;
-				height: 60rpx;
+				width: 24rpx;
+				height: 24rpx;
 			}
 		}
 
 		.buy-card {
 			border-radius: 20rpx;
 			padding: 30rpx 30rpx 30rpx 30rpx;
-			background: #5B5B5D;
+			background: #FFFFFF;
 
 			.buy-info {
 				display: flex;
@@ -565,36 +567,35 @@
 
 					.title {
 						font-size: 32rpx;
-						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #ffffff;
+						color: #333333;
 					}
 
-					.hang1 {}
 
 					.type {
-						font-size: 28rpx;
-						font-family: Source Han Sans CN;
+						font-size: 20rpx;
 						font-weight: 400;
-						color: #dddddd;
+						color: #999999;
 					}
 
 					.price-num {
 						display: flex;
 						justify-content: space-between;
 						align-items: center;
+						font-size: 16rpx;
 
 						.price {
 							ffont-weight: 500;
 							font-size: 35rpx;
-							color: #F6C0FF;
+							color: #333333;
+							font-size: 28rpx;
 						}
 
 						.num {
-							font-size: 28rpx;
+							font-size: 20rpx;
 							font-family: Source Han Sans CN;
 							font-weight: 400;
-							color: #ffffff;
+							color: #999999;
 						}
 					}
 				}
@@ -689,10 +690,10 @@
 			display: flex;
 			margin-top: 30rpx;
 
-			font-size: 24rpx;
+			font-size: 20rpx;
 			font-family: Source Han Sans CN;
 			font-weight: 400;
-			color: #ffffff;
+			color: #999999;
 			line-height: 32rpx;
 
 			.icon {
@@ -703,40 +704,38 @@
 		}
 
 		.rule {
+			height: 82rpx;
 			padding: 20rpx;
-			background: #5B5B5D;
+			background: #F9F8E1;
 			border-radius: 20rpx;
 			box-sizing: border-box;
 			margin: 20rpx 0 0;
 
 			.rule-inner {
 				max-height: 160rpx;
-
 				font-size: 20rpx;
-				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
+				color: #999999;
 			}
 		}
 
 		.pay-btn {
 			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;
 			}
 
 			>text:nth-child(2) {
 				font-size: 36rpx;
-				margin-top: 26rpx;
 			}
 		}
 	}
diff --git a/pages/sangdai/sangdai.vue b/pages/sangdai/sangdai.vue
index fefecab..023e31c 100644
--- a/pages/sangdai/sangdai.vue
+++ b/pages/sangdai/sangdai.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<uni-nav-bar title="我的盒柜" color="#fff" backgroundColor="transparent" :fixed="true" :statusBar="true"
+		<uni-nav-bar title="我的盒柜" color="#000000" backgroundColor="transparent" :fixed="true" :statusBar="true"
 			:border="false" @clickLeft="$c.back"></uni-nav-bar>
 
 		<view class="tab">
@@ -13,10 +13,10 @@
 			:up="upOption">
 			<template v-if="tabList[tabCur].id == 1">
 				<view class="search">
-					<view class="input-box br10">
-						<input v-model="keyword" placeholder-style="color:#CCCCCC;" placeholder="请输入关键字" />
+					<view class="input-box">
+						<input v-model="keyword" placeholder-style="color:#8A8A8A;" placeholder="请输入关键字" />
 						<view class="icon" @click="tabChange(tabCur)">
-							<uni-icons type="search" color="#ff873a"></uni-icons>
+							<uni-icons type="search" color="#8A8A8A"></uni-icons>
 						</view>
 					</view>
 					<view class="rule column align-center" @click="$refs.rulePop.getRule(10, '发货规则')">
@@ -30,16 +30,43 @@
 					</view>
 				</view>
 				<view class="num-all">
-					<view class="num">
-						共
-						<text>{{ nowNum }}</text>
-						个赏品
+					<view class="flex row">
+						<view class="num">
+							共
+							<text>{{ nowNum }}</text>
+							个赏品
+						</view>
+						<view class="all" style="margin-left: 30rpx;">
+							已选
+							<text>{{ nowChooseNum }}</text>
+							个
+						</view>
 					</view>
-					<view class="all">
-						已选
-						<text>{{ nowChooseNum }}</text>
-						个
+
+					<view class="flex row" v-if="tabList[tabCur].id == 1">
+
+						<view class="flex center" @click="tabChange(tabCur)"
+							style="width: 88rpx; height: 40rpx; background-color: #F5F5F5; border-radius: 8rpx;">
+							<text style="color: #333333; font-size: 20rpx;">刷新</text>
+						</view>
+
+						<view class="" @click="chooseAll">
+							<view v-if="isAll" class="flex center"
+								style="width: 88rpx; height: 40rpx; background-color: #E6F791; border-radius: 8rpx; margin-left: 32rpx;">
+								<text style="color: #333333; font-size: 20rpx;">全选</text>
+							</view>
+							<view v-else class="flex center"
+								style="width: 88rpx; height: 40rpx; background-color: #F5F5F5; border-radius: 8rpx; margin-left: 32rpx;">
+								<text style="color: #333333; font-size: 20rpx;">全选</text>
+							</view>
+						</view>
+
+
+
 					</view>
+
+
+
 				</view>
 
 				<view class="list">
@@ -86,7 +113,9 @@
 							<view class="pic">
 								<image :src="a.goodslist_imgurl" lazy-load></image>
 								<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>
+								<view class="num"
+									style="left:auto;right:0;border-radius:0rpx 0rpx 0rpx 15rpx;background: #FF4D1E;"
+									v-if="a.fh_status==1">已发货</view>
 							</view>
 
 							<view class="title hang1">
@@ -102,7 +131,7 @@
 			</view>
 		</mescroll-body>
 
-		<view class="right-fixed" v-if="tabList[tabCur].id == 1">
+		<!-- <view class="right-fixed" v-if="tabList[tabCur].id == 1">
 			<view class="fbtn" @click="tabChange(tabCur)">
 				<image :src="$img1('shangdai/shuaxin.png')"></image>
 			</view>
@@ -111,7 +140,7 @@
 				<image v-if="isAll" :src="$img1('shangdai/unallcheck.png')"></image>
 				<image v-else :src="$img1('shangdai/allcheck.png')"></image>
 			</view>
-		</view>
+		</view> -->
 
 		<view v-if="tabList[tabCur].id == 1" class="bt-fixed">
 			<template v-if="subTab[subTabCur].id != 4">
@@ -903,6 +932,7 @@
 <style lang="scss">
 	.content {
 		box-sizing: border-box;
+		background-color: #FFFFFF;
 		padding-bottom: calc(var(--window-bottom) + 240rpx);
 
 		image {
@@ -927,12 +957,11 @@
 				height: 68rpx;
 				position: relative;
 				margin-right: 25rpx;
-				font-family: YouSheBiaoTiHei;
 
 				&.act {
 					font-weight: 400;
 					font-size: 36rpx;
-					color: #ff873a;
+					color: #333333;
 
 					&::after {
 						content: '';
@@ -942,7 +971,7 @@
 						transform: translateX(-50%);
 						width: 48rpx;
 						height: 4rpx;
-						background: #ff873a;
+						background: #333333;
 					}
 				}
 
@@ -964,18 +993,16 @@
 			.input-box {
 				width: 615rpx;
 				height: 70rpx;
-				background: #3E291C;
-				border: 1px solid #ff873a;
+				background: #F3F3F3;
 				box-sizing: border-box;
 				padding: 0 30rpx;
 				display: flex;
 				align-items: center;
+				border-radius: 32rpx;
 
 				input {
 					flex: 1;
-
 					font-size: 26rpx;
-					font-family: Source Han Sans CN;
 					font-weight: 400;
 					color: #fff;
 				}
@@ -1004,13 +1031,12 @@
 				font-weight: 400;
 
 				&.act {
-					color: #FFFFFF;
-					text-shadow: #121212 1rpx 0 0, #121212 0 1rpx 0, #121212 -1rpx 0 0, #121212 0 -1rpx 0;
+					color: #333333;
 					background: url($imgurl+'index/checkTab.png') no-repeat 0 0 / 100% 100%;
 				}
 
 				&.unact {
-					color: #D6D6D6;
+					color: #333333;
 					background: url($imgurl+'index/uncheckTab.png') no-repeat 0 0 / 100% 100%;
 				}
 			}
@@ -1029,10 +1055,10 @@
 			font-size: 28rpx;
 			font-family: Source Han Sans CN;
 			font-weight: 400;
-			color: #FFFFFF;
+			color: #8A8A8A;
 
 			text {
-				color: #ff873a;
+				color: #333333;
 			}
 		}
 
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index 825b484..2042d91 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -282,7 +282,8 @@
 					<view class="" style="width: 60rpx;"></view>
 					<text class="" style="font-size: 28rpx;">确认订单</text>
 					<view class="close icon" @click="close('buyPop')">
-						<image :src="$img('/static/img/close2.png')" style="width: 24rpx; height: 24rpx;" lazy-load></image>
+						<image :src="$img('/static/img/close2.png')" style="width: 24rpx; height: 24rpx;" lazy-load>
+						</image>
 					</view>
 				</view>
 
@@ -339,51 +340,53 @@
 						</view>
 					</view>
 
-					<view class="line"></view>
+					<!-- <view class="line"></view> -->
 
-					<template v-if="pageData.goods.type != 5">
-						<view class="card-row" @click="toCoupon">
-							<view class="title">优惠券</view>
 
-							<view class="row-r">
-								{{
-								  couponData && orderData.coupon_price > 0
-									? `-${couponData.price}`
-									: '未选择'
-								}}
-
-								<view class="icon">
-									<image :src="$img1('common/right1.png')" lazy-load></image>
-								</view>
-							</view>
-						</view>
-
-						<!-- <view class="card-row" @click="$c.to({ url: '/pages/user/vip' })">
-							<view class="title">
-								{{
-								  orderData.zhe
-									? `会员折扣 (${orderData.zhe}折)`
-									: '暂无会员抵扣'
-								}}
-							</view>
-
-							<view class="row-r">
-								详情
-
-								<view class="icon">
-									<image :src="$img1('common/right1.png')" lazy-load></image>
-								</view>
-							</view>
-						</view> -->
-					</template>
 				</view>
 
-				<view v-if="!(pageData.goods.type == 6 && !getBtnXianShi(0))" class="pay-title ziti">请选择抵扣方式</view>
+				<template v-if="pageData.goods.type != 5">
+					<view class="card-row" @click="toCoupon">
+						<view class="title">优惠券</view>
+
+						<view class="row-r">
+							{{
+							  couponData && orderData.coupon_price > 0
+								? `-${couponData.price}`
+								: '未选择'
+							}}
+
+							<view class="icon">
+								<image :src="$img1('common/right1.png')" lazy-load></image>
+							</view>
+						</view>
+					</view>
+
+					<!-- <view class="card-row" @click="$c.to({ url: '/pages/user/vip' })">
+						<view class="title">
+							{{
+							  orderData.zhe
+								? `会员折扣 (${orderData.zhe}折)`
+								: '暂无会员抵扣'
+							}}
+						</view>
+				
+						<view class="row-r">
+							详情
+				
+							<view class="icon">
+								<image :src="$img1('common/right1.png')" lazy-load></image>
+							</view>
+						</view>
+					</view> -->
+				</template>
+
+				<!-- <view v-if="!(pageData.goods.type == 6 && !getBtnXianShi(0))" class="pay-title ziti">请选择抵扣方式</view> -->
 
 				<view v-if="pageData.goods.type == 5" class="pay-type">
-					<view class="icon">
+					<!-- <view class="icon">
 						<image :src="$img('/static/img/pay_type3.png')" lazy-load></image>
-					</view>
+					</view> -->
 					<view class="title">
 						使用积分抵扣
 						{{ orderData.use_score }} (剩余:{{ orderData.score }})
@@ -401,9 +404,9 @@
 
 				<template v-else>
 					<view class="pay-type" @click="changePay('useIntegral')">
-						<view class="icon">
+						<!-- <view class="icon">
 							<image :src="$img('/static/img/pay_type1.png')" lazy-load></image>
-						</view>
+						</view> -->
 
 						<view class="title">
 							使用吧唧币抵扣¥ {{ orderData.use_integral_money }} (剩余:{{ orderData.integral }}个)
@@ -417,9 +420,9 @@
 					</view>
 
 					<view class="pay-type" @click="changePay('useMoney')">
-						<view class="icon">
+						<!-- <view class="icon">
 							<image :src="$img('/static/img/pay_type2.png')" lazy-load></image>
-						</view>
+						</view> -->
 
 						<view class="title">
 							使用星钻抵扣¥
@@ -1683,10 +1686,47 @@
 				}
 			}
 
+			.card-row {
+				padding: 16rpx 0;
+				display: flex;
+				height: 82rpx;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 24rpx;
+				border-radius: 16rpx;
+				background-color: #fff;
+
+				.title {
+					font-size: 20rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					margin-left: 24rpx;
+					color: #333333;
+				}
+
+				.row-r {
+					display: flex;
+					align-items: center;
+
+					font-size: 24rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #999999;
+
+					.icon {
+						width: 10rpx;
+						height: 17rpx;
+						color: #999999;
+						margin-left: 10rpx;
+						margin-right: 24rpx;
+					}
+				}
+			}
+
 			.buy-card {
 				border-radius: 20rpx;
 				padding: 30rpx 30rpx 10rpx;
-				background: #5B5B5D;
+				background: #FFFFFF;
 
 				.buy-info {
 					display: flex;
@@ -1706,8 +1746,8 @@
 						padding: 10rpx 0 10rpx 30rpx;
 
 						.title {
-							font-size: 32rpx;
-							font-family: Source Han Sans CN;
+							font-size: 24rpx;
+							// font-family: Source Han Sans CN;
 							font-weight: 400;
 							color: #333333;
 						}
@@ -1715,8 +1755,8 @@
 						.hang1 {}
 
 						.type {
-							font-size: 28rpx;
-							font-family: Source Han Sans CN;
+							font-size: 20rpx;
+							// font-family: Source Han Sans CN;
 							font-weight: 400;
 							color: #999999;
 						}
@@ -1728,11 +1768,11 @@
 
 							.price {
 								font-weight: 500;
-								font-size: 32rpx;
+								font-size: 16rpx;
 								color: #333333;
 
 								text {
-									font-size: 36rpx;
+									font-size: 28rpx;
 								}
 							}
 
@@ -1740,7 +1780,7 @@
 								font-size: 28rpx;
 								font-family: Source Han Sans CN;
 								font-weight: 400;
-								color: #ffffff;
+								color: #999999;
 							}
 						}
 					}
@@ -1795,7 +1835,7 @@
 				margin-top: 20rpx;
 				display: flex;
 				align-items: center;
-				background: #313133;
+				background: #FFFFFF;
 
 				.icon {
 					width: 32rpx;
@@ -1807,7 +1847,7 @@
 					padding: 0 20rpx;
 					font-size: 28rpx;
 					font-weight: 400;
-					color: #ffffff;
+					color: #333333;
 				}
 			}
 
@@ -1816,7 +1856,7 @@
 				margin-top: 30rpx;
 				font-size: 24rpx;
 				font-weight: 400;
-				color: #ffffff;
+				color: #999999;
 				line-height: 32rpx;
 
 				.icon {
@@ -1832,35 +1872,35 @@
 				box-sizing: border-box;
 				margin: 20rpx 0 0;
 				height: 160rpx;
-				background: #313133;
+				background: #F9F8E1;
 				border-radius: 20rpx;
 
 				.rule-inner {
 					max-height: 120rpx;
 					font-size: 20rpx;
 					font-weight: 400;
-					color: #dddddd;
+					color: #333333;
 				}
 			}
 
 			.pay-btn {
 				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;
+				margin-bottom: 90rpx;
+				align-items: center;
 				justify-content: center;
 				font-weight: 500;
-				color: #7825DE;
+				color: #CDEF27;
 
 				>text:nth-child(1) {
 					font-size: 28rpx;
-					margin-top: 32rpx;
 				}
 
 				>text:nth-child(2) {
 					font-size: 36rpx;
-					margin-top: 26rpx;
 				}
 			}
 		}
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index 11e9cc3..0f98593 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -6,8 +6,10 @@
 <template>
 	<view class="content minHeight100">
 		<view class="navLeft align-center" :style="{top:$sys().statusBarHeight+'px'}" @tap="$c.back(1)">
-			<uni-icons type="left" color="#FFFFFF"></uni-icons>
-			<view class="">{{$c.detailPageTitle((pageData && pageData.goods) || '')}}</view>
+			<uni-icons type="left" color="#000000"></uni-icons>
+			<view class="" style="color: #000000; margin-left: 240rpx;">
+				{{$c.detailPageTitle((pageData && pageData.goods) || '')}}
+			</view>
 		</view>
 		<view class="header relative" v-if="pageData&&pageData.goods"
 			:style="{background: 'url('+pageData.goods.imgurl_detail+') no-repeat 0 0 / 100% 100%'}">
@@ -35,32 +37,44 @@
 					<template>/抽</template>
 				</text>
 			</view>
-			<view class="header-canyu column align-center">
+			<view class="header-canyu row align-center">
 				<view class="header-canyu-imgs flex">
 					<image v-for="(item, i) in pageData.goods.join_user.slice(0, 3)" :key="i" :style="{'z-index': i }"
 						:src="item" mode="aspectFill"></image>
 				</view>
 				<view class="header-canyu-num mt10">{{ pageData.goods.join_count }}次参与</view>
 			</view>
-			<view class="header-footer relative">
-				<view class="header-footer-one">
-					<image @click="$refs.rulePop.getRule(pageData.danye_id, '购买说明')" :src="$img1('common/gzsm.png')">
-					</image>
-				</view>
-				<view class="header-footer-two" @tap="tabChange(1)">
-					<image v-if="tabCur==1" :src="$img1('common/spyl1.png')"></image>
-					<image v-if="tabCur==2" :src="$img1('common/spyl2.png')"></image>
-				</view>
-				<view class="header-footer-three" @tap="tabChange(2)">
-					<image v-if="tabCur==1" :src="$img1('common/zsjl2.png')"></image>
-					<image v-if="tabCur==2" :src="$img1('common/zsjl1.png')"></image>
-				</view>
-				<view class="header-footer-four" @tap="toggleCollect">
-					<image v-if="pageData.goods.collection_is==0" :src="$img1('common/sc1.png')"></image>
-					<image v-if="pageData.goods.collection_is==1" :src="$img1('common/sc2.png')"></image>
-				</view>
+
+
+			<view class="header-shoucang justify-center" style=" flex-direction: column; margin-right: 48rpx;"
+				@tap="toggleCollect">
+				<image :src="pageData.goods.collection_is?$img1('index/sc1.png'):$img1('index/sc2.png')"></image>
+				<text>收藏</text>
+			</view>
+
+		</view>
+
+		<view class=""
+			style="display: flex; flex-direction: row; margin-left: 108rpx; margin-top: 26rpx; margin-bottom: 20rpx;">
+			<view class="" style="width: 160rpx; height: 92rpx;">
+				<image style="width: 160rpx; height: 92rpx;" @click="$refs.rulePop.getRule(pageData.danye_id, '购买说明')"
+					:src="$img1('common/gzsm.png')">
+				</image>
+			</view>
+			<view class="" style="margin-left: 26rpx;" @tap="tabChange(1)">
+				<image style="width: 160rpx; height: 92rpx;" v-if="tabCur==1" :src="$img1('common/spyl1.png')">
+				</image>
+				<image style="width: 160rpx; height: 92rpx;" v-if="tabCur==2" :src="$img1('common/spyl2.png')">
+				</image>
+			</view>
+			<view class="" style="margin-left: 26rpx;" @tap="tabChange(2)">
+				<image style="width: 160rpx; height: 92rpx;" v-if="tabCur==1" :src="$img1('common/zsjl22.png')">
+				</image>
+				<image style="width: 160rpx; height: 92rpx;" v-if="tabCur==2" :src="$img1('common/zsjl12.png')">
+				</image>
 			</view>
 		</view>
+
 		<view class="lingzhu center" v-if="bossCardData && bossCardData.king_user">
 			<view class="lingzhu-img relative ml30">
 				<image :src="bossCardData.king_user.headimg" mode="aspectFill"></image>
@@ -77,8 +91,8 @@
 					发
 				</view>
 			</view>
-			<view class="lingzhu-lingzhu flex ml40 mr30" @click="open('bossPop')">
-				<image class="img100" :src="$img1('index/lingzhu.png')"></image>
+			<view class="flex ml40 mr30" @click="open('bossPop')">
+				<text style="font-size: 20rpx; color: #999999;">查看更多 ></text>
 			</view>
 		</view>
 
@@ -98,12 +112,15 @@
 			</view>
 		</view>
 
+
+		<!-- 商品预览 -->
 		<view v-if="tabCur == 1 && pageData" class="list">
+
 			<view class="list-item common_bg mb30" v-for="(item, i) in pageData.goodslist" :key="i">
 				<view class="list-title common_bg align-center">
 					<view class="align-center">
-						<image :src="item.shang_imgurl"></image>
-						<text class="ml20">{{ item.pro }}</text>
+						<image style="width: 56rpx; height: 56rpx;" :src="item.shang_imgurl"></image>
+						<text class="ml20" style="color: #999999;">{{ item.pro }}</text>
 					</view>
 				</view>
 				<!-- <scroll-view scroll-x></scroll-view> -->
@@ -124,12 +141,14 @@
 			</view>
 		</view>
 
+
+		<!-- 中赏记录 -->
 		<template v-if="tabCur == 2">
+
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="getLog" :down="downOption"
 				:up="upOption">
-				<scroll-view class="sub-tab mt30" scroll-x>
-					<view class="sub-tab-item common_bg" v-for="(item, i) in subTab" :key="i" :style="{
-						backgroundImage: `url(${$img(subTabCur == i? '/static/img/tab2_act.png': '/static/img/tab2.png')})` }"
+				<scroll-view class="sub-tab" scroll-x>
+					<view class="sub-tab-item common_bg" v-for="(item, i) in subTab" :key="i"
 						:class="{ act: subTabCur == i }" @click="subTabChange(i)">
 						{{ item.shang_title }}
 					</view>
@@ -259,37 +278,45 @@
 				<view class="boss-pop-title">
 					<text>领主接力</text>
 				</view>
-				<view class="boss-pop-guize align-center" @click="open('playPop')">
-					<text class="ml20">领主规则</text>
-				</view>
+
+
 				<view @click="close('bossPop')" class="close flex">
 					<image class="img100" :src="$img1('index/close.png')"></image>
 				</view>
+
+
 				<view class="boss-avatar relative">
 					<image :src="bossCardData.king_user.headimg"></image>
 					<image :src="$img1('index/king.png')"></image>
-				</view>
-				<view class="boss-name hang1">
-					{{ bossCardData.king_user.nickname }}
-				</view>
-				<view class="boss-box common_bg">
-					<view class="box-title align-end">
-						<text>挑战领主</text>
-						<text class="ml10">获得吧唧币奖励</text>
+
+					<view class="boss-name hang1">
+						{{ bossCardData.king_user.nickname }}
 					</view>
 
-					<view class="get-money align-center">
-						<text class="get-money-one">玩家每挑战一发,领主可获得吧唧币</text>
-						<!-- <image class="get-money-two" :src="$img('/static/img/pay_type2.png')" mode="widthFix"></image> -->
-						<text class="get-money-three">×{{ bossCardData.goods.lingzhu_fan }}</text>
+					<view class="boss-pop-guize align-center" @click="open('playPop')">
+						<image :src="$img1('common/ic_rule.png')" mode=""></image>
 					</view>
 				</view>
 
+
+
+				<view class="flex row center" style="font-size: 20rpx; color: #999999; margin-top: 24rpx;">
+
+					<text>挑战领主获得吧唧币奖励</text>
+
+					<text class="get-money-one">玩家每挑战一发,领主可获得</text>
+					<!-- <image class="get-money-two" :src="$img('/static/img/pay_type2.png')" mode="widthFix"></image> -->
+					<text class="get-money-three">{{ bossCardData.goods.lingzhu_fan }}币</text>
+
+				</view>
+
 				<view class="boss-tab">
 					<view class="boss-tab-item" v-for="(item, i) in bossTab" :key="i" :class="{
 					  act: bossTabCur == i
 					}" @click="bossTabChange(i)">
-						{{ item.title }}
+
+						<text>{{ item.title }}</text>
+
 					</view>
 				</view>
 
@@ -305,18 +332,19 @@
 							</view>
 
 							<view v-if="bossTab[bossTabCur].id == 2" class="boss-log">
-								<view class="avatar flex">
-									<image class="img100" :src="item.headimg"></image>
+								<view class="flex center">
+									<view class="avatar flex" style="width: 52rpx; height: 52rpx;">
+										<image class="img100" :src="item.headimg"></image>
+									</view>
+									<view class="name hang1">{{ item.nickname }}</view>
 								</view>
 
-								<view class="name hang1">{{ item.nickname }}</view>
 
 								<view class="place">
-									占领
-									<text>领主</text>
+									<text>占领领主{{ item.time }}</text>
 								</view>
 
-								<view class="time">{{ item.time }}</view>
+								<!-- <view class="time"></view> -->
 							</view>
 						</template>
 					</view>
@@ -328,7 +356,7 @@
 			<view v-if="bossCardData" class="play-pop common_bg">
 				<view class="close align-center justify-between">
 					<view class="close-icon"></view>
-					<view class="close-title ziti">领主玩法</view>
+					<view class="close-title">玩法规则</view>
 					<view class="close-icon flex" @click="close('playPop')">
 						<image class="img100" :src="$img1('index/close.png')"></image>
 					</view>
@@ -345,11 +373,8 @@
 					</swiper-item>
 				</swiper>
 
-				<view class="line"></view>
-				<view class="pd30 br20" style="background: #3B3941;">
-					<view class="rule-title">
-						玩法规则
-					</view>
+				<!-- <view class="line"></view> -->
+				<view class="pd30 br20" style="background: #D8D8D8;">
 					<scroll-view class="rule-text" scroll-y>
 						<view v-html="playRuleData"></view>
 					</scroll-view>
@@ -384,7 +409,9 @@
 		<uni-popup ref="buyPop" type="bottom">
 			<view v-if="orderData" class="buy-pop relative">
 				<view class="buy-pop-hd align-center justify-between">
-					<view class="ziti">确认订单</view>
+					<view style="width: 24rpx; height: 24rpx;">
+					</view>
+					<view style="font-size: 28rpx; color: #333333;">确认订单</view>
 					<view class="close icon" @click="close('buyPop')">
 						<image :src="$img('/static/img/close2.png')" lazy-load></image>
 					</view>
@@ -393,7 +420,8 @@
 				<view class="buy-card">
 					<view class="buy-info">
 						<view class="pic flex">
-							<image class="img100" :src="orderData.goods.imgurl_detail" lazy-load></image>
+							<image class="img100" style="border-radius: 10rpx;" :src="orderData.goods.imgurl_detail"
+								lazy-load></image>
 						</view>
 						<view class="info-r">
 							<view class="title hang1">
@@ -432,23 +460,8 @@
 							</view>
 						</view>
 					</view>
-					<view class="line"></view>
-					<view class="yhfs mb20 mt20">选择优惠方式</view>
-					<view class="card-row" @click="toCoupon">
-						<view class="title align-center">
-							<text class="ml20">优惠券</text>
-						</view>
-						<view class="row-r">
-							{{
-								couponData && orderData.coupon_price > 0
-								  ? `-${couponData.price}`
-								  : '未选择'
-							  }}
-							<view class="icon">
-								<image :src="$img1('common/right1.png')" lazy-load></image>
-							</view>
-						</view>
-					</view>
+
+
 
 					<!-- <view class="card-row" @click="$c.to({ url: '/pages/user/vip' })">
 						<view class="title align-center">
@@ -462,7 +475,26 @@
 						</view>
 					</view> -->
 				</view>
-				<view class="pay-title ziti">选择支付方式</view>
+
+
+				<view class="card-row" @click="toCoupon">
+					<view class="title align-center">
+						<text class="ml20">优惠券</text>
+					</view>
+					<view class="row-r">
+						{{
+							couponData && orderData.coupon_price > 0
+							  ? `-${couponData.price}`
+							  : '未选择'
+						  }}
+						<view class="icon">
+							<image :src="$img1('common/right1.png')" lazy-load></image>
+						</view>
+					</view>
+				</view>
+
+
+				<!-- <view class="pay-title ziti">选择支付方式</view> -->
 				<view class="pay-type" @click="changePay('useIntegral')">
 					<view class="title">
 						吧唧币
@@ -825,7 +857,7 @@
 
 				this.buyNum = num
 
-				 this.req({
+				this.req({
 					url,
 					data: {
 						goods_id: this.pageData.goods.id,
@@ -1062,8 +1094,8 @@
 		width: 686rpx;
 		height: 158rpx;
 		margin: 28rpx auto;
-		border: 1rpx solid #9E907D;
-		background: #4A4440;
+		// border: 1rpx solid #9E907D;
+		background: #F8F8F8;
 
 		&-img {
 			width: 122rpx;
@@ -1094,29 +1126,29 @@
 			>view:nth-child(1) {
 				font-weight: normal;
 				font-size: 28rpx;
-				color: #FFFFFF;
+				color: #333333;
 			}
 
 			>view:nth-child(2) {
 				margin-top: 6rpx;
 				font-weight: normal;
 				font-size: 24rpx;
-				color: #DDDDDD;
+				color: #999999;
 
 				>text {
-					color: #FFFFFF;
+					color: #333333;
 				}
 			}
 		}
 
 		&-lingzhu {
-			width: 88rpx;
 			height: 46rpx;
 		}
 	}
 
 	.content {
 		padding: 0 0 300rpx;
+		background-color: #FFFFFF;
 
 		.boss-card {
 			margin: 0 auto -20rpx;
@@ -1213,6 +1245,7 @@
 		.header {
 			width: 750rpx;
 			height: 722rpx;
+			background-color: #D8D8D8;
 
 			&-wuzhe {
 				width: 160rpx;
@@ -1225,13 +1258,39 @@
 			&-goodsTitel {
 				position: absolute;
 				font-weight: 400;
-				font-size: 28rpx;
+				font-size: 24rpx;
 				color: #FFFFFF;
 				left: 50%;
 				transform: translateX(-50%);
-				bottom: 510rpx;
+				bottom: 24rpx;
 				z-index: 2;
-				text-shadow: #000 1px 0 0, #000 0 1px 0, #000 -1px 0 0, #000 0 -1px 0;
+			}
+
+			&-shoucang {
+				width: 65rpx;
+				height: 95rpx;
+				position: absolute;
+				right: 0;
+				top: 232rpx;
+				box-sizing: border-box;
+				// background: url($imgurl+'/common/shoucang.png') no-repeat 0 0 / 100% 100%;
+
+				>image {
+					width: 64rpx;
+					height: 64rpx;
+					// margin-top: 22rpx;
+				}
+
+				>text {
+					width: 100%;
+					text-align: center;
+					font-weight: 400;
+					font-size: 20rpx;
+					color: #FFFFFF;
+					margin-top: 4rpx;
+					// line-height: 66rpx;
+					text-shadow: #000 1px 0 0, #000 0 1px 0, #000 -1px 0 0, #000 0 -1px 0;
+				}
 			}
 
 			&-suoxiang {
@@ -1273,36 +1332,35 @@
 			&-title {
 				position: absolute;
 				padding: 0 20rpx;
-				width: 260rpx;
-				height: 66rpx;
+				width: 280rpx;
+				height: 44rpx;
 				left: 50%;
 				transform: translateX(-50%);
-				bottom: 120rpx;
+				bottom: 78rpx;
 
 				>text:nth-child(2n+1) {
 					font-weight: 400;
-					font-size: 24rpx;
+					font-size: 16rpx;
 					color: #000000;
 				}
 
 				>text:nth-child(2) {
 					font-weight: 700;
-					font-size: 32rpx;
+					font-size: 24rpx;
 					color: #000000;
 				}
 			}
 
 			&-canyu {
 				position: absolute;
-				right: 20rpx;
-				bottom: 150rpx;
+				left: 304rpx;
+				bottom: 142rpx;
 
 				&-imgs {
 					>image {
 						margin-left: -12rpx;
 						width: 32rpx;
 						height: 32rpx;
-						border: 2rpx solid #894DD3;
 						border-radius: 50rpx;
 					}
 				}
@@ -1310,8 +1368,9 @@
 				&-num {
 					font-weight: 400;
 					font-size: 20rpx;
-					color: #000000;
-					text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0;
+					margin-left: 8rpx;
+					color: #FFFFFF;
+					// text-shadow: #fff 1px 0 0, #fff 0 1px 0, #fff -1px 0 0, #fff 0 -1px 0;
 				}
 			}
 
@@ -1536,15 +1595,18 @@
 					.goods-item {
 						display: inline-flex;
 						width: 220rpx;
+						background-color: #F8F8F8;
+						border-radius: 16rpx;
 						// height: 255rpx;
 
 						.pic {
 							width: 220rpx;
 							height: 220rpx;
 							border-radius: 12rpx;
-							border: 2rpx solid #FFFFFF;
 							position: relative;
 							margin: 0 auto;
+							background-color: #D8D8D8;
+							border-radius: 16rpx 16rpx 0rpx 0rpx;
 
 							.yu-tag {
 								position: absolute;
@@ -1565,17 +1627,17 @@
 							text-align: left;
 							width: 200rpx;
 							margin: 20rpx auto 0;
-							font-size: 24rpx;
+							font-size: 20rpx;
 							font-weight: 400;
-							color: #ffffff;
+							color: #333333;
 						}
 
 						.price {
 							width: 200rpx;
-							margin: 12rpx auto 0;
+							margin: 12rpx auto 24rpx;
 							font-weight: 400;
 							font-size: 20rpx;
-							color: #FFFFFF;
+							color: #333333;
 						}
 					}
 				}
@@ -1591,23 +1653,22 @@
 				align-items: center;
 				justify-content: center;
 				min-width: 88rpx;
-				height: 40rpx;
+				height: 44rpx;
 				margin-left: 30rpx;
-				font-family: YouSheBiaoTiHei;
+				// font-family: YouSheBiaoTiHei;
 				font-weight: 400;
-				font-size: 28rpx;
-				color: #FFFFFF;
-				background: #3B3941;
+				font-size: 20rpx;
+				color: #333333;
+				background: #F5F5F5;
 				border-radius: 8rpx;
 				border: 2rpx solid rgba(#FFFFFF, 0.7);
 
 				&.act {
-					background: #B07AF3;
-					border: 2rpx solid #FFFFFF;
-					font-family: YouSheBiaoTiHei;
+					background: #E6F791;
+					// font-family: YouSheBiaoTiHei;
 					font-weight: 400;
-					font-size: 28rpx;
-					color: #FFFFFF;
+					font-size: 20rpx;
+					color: #333333;
 				}
 
 				&:last-child {
@@ -1625,7 +1686,7 @@
 				padding: 0 20rpx;
 				display: flex;
 				align-items: center;
-				background: #3B3941;
+				background: #F8F8F8;
 				margin-top: 24rpx;
 
 				.avatar {
@@ -1645,7 +1706,7 @@
 						font-size: 28rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #ffffff;
+						color: #333333;
 					}
 
 					.hang1 {}
@@ -1657,7 +1718,7 @@
 						font-size: 24rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #dddddd;
+						color: #999999;
 					}
 				}
 
@@ -1681,7 +1742,7 @@
 							line-height: 40rpx;
 							background: #B07AF3;
 							border-radius: 8rpx;
-							border: 2rpx solid #FFFFFF;
+							// border: 2rpx solid #FFFFFF;
 							font-weight: 400;
 							font-size: 24rpx;
 							color: #FFFFFF;
@@ -1694,7 +1755,7 @@
 						margin-left: 10rpx;
 						font-weight: 400;
 						font-size: 24rpx;
-						color: #FFFFFF;
+						color: #333333;
 						text-align: right;
 					}
 
@@ -1702,7 +1763,7 @@
 						font-size: 24rpx;
 						font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #ffffff;
+						color: #333333;
 					}
 				}
 			}
@@ -1734,9 +1795,9 @@
 			display: flex;
 			flex-flow: row wrap;
 			justify-content: center;
-			padding-bottom: 40rpx;
-			background: #141317;
-			padding-top: 40rpx;
+			padding-bottom: 50rpx;
+			background: #FFFFFF;
+			padding-top: 20rpx;
 
 			.lt-btn {
 				width: 690rpx;
@@ -1754,8 +1815,8 @@
 			}
 
 			.btn {
-				width: 152rpx;
-				height: 110rpx;
+				width: 120rpx;
+				height: 68rpx;
 				position: relative;
 
 				>view {
@@ -1921,7 +1982,8 @@
 			box-sizing: border-box;
 			padding: 0 46rpx 40rpx;
 			position: relative;
-			background: #1C1B20;
+			background: #F7F7F7;
+			border-radius: 16rpx 16rpx 0rpx 0rpx;
 
 			&::after {
 				content: '';
@@ -1930,22 +1992,22 @@
 				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%;
 			}
 
 			.boss-pop-title {
 				padding: 40rpx 0;
 				text-align: center;
-				font-family: YouSheBiaoTiHei;
+				// font-family: YouSheBiaoTiHei;
 				font-weight: 400;
 				font-size: 44rpx;
-				color: #FFFFFF;
+				color: #333333;
 			}
 
 			.boss-pop-guize {
 				position: absolute;
-				top: 200rpx;
-				right: 10rpx;
+				top: 24rpx;
+				right: 24rpx;
 				color: #FFFFFF;
 				font-size: 28rpx;
 
@@ -1959,32 +2021,34 @@
 				position: absolute;
 				width: 30rpx;
 				height: 30rpx;
-				top: 30rpx;
+				top: 50rpx;
 				right: 36rpx;
 			}
 
 			.boss-avatar {
 				margin: 20rpx auto 0;
-				width: 220rpx;
-				height: 192rpx;
+				width: 686rpx;
+				height: 264rpx;
+				background-color: #FFFFFF;
 
 				>image:nth-child(1) {
 					position: absolute;
 					left: 50%;
 					transform: translateX(-50%);
-					bottom: 8rpx;
-					width: 135rpx;
-					height: 137rpx;
+					bottom: 112rpx;
+					width: 98rpx;
+					height: 98rpx;
 					border-radius: 50%;
 					z-index: 1;
 				}
 
 				>image:nth-child(2) {
 					position: absolute;
-					width: 220rpx;
-					height: 192rpx;
-					top: 0;
-					left: 0;
+					left: 50%;
+					transform: translateX(-50%);
+					width: 181rpx;
+					height: 153rpx;
+					bottom: 100rpx;
 					z-index: 2;
 				}
 			}
@@ -1993,11 +2057,14 @@
 				margin: 30rpx auto 0;
 				width: 200rpx;
 				text-align: center;
-
 				font-size: 28rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
+				color: #333333;
+				left: 50%;
+				transform: translateX(-50%);
+				position: absolute;
+				bottom: 32rpx;
 			}
 
 			.hang1 {}
@@ -2011,16 +2078,16 @@
 				padding: 30rpx;
 
 				.box-title {
-					color: #FFFFFF;
+					color: #999999;
 
 					>text:nth-child(1) {
-						color: #B07AF3;
-						font-size: 32rpx;
+						color: #999999;
+						font-size: 20rpx;
 						font-weight: bold;
 					}
 
 					>text:nth-child(2) {
-						font-size: 28rpx;
+						font-size: 20rpx;
 						font-weight: 400;
 					}
 				}
@@ -2035,7 +2102,7 @@
 					&-one {
 						font-weight: 400;
 						font-size: 26rpx;
-						color: #FFFFFF;
+						color: #999999;
 					}
 
 					// &-two {
@@ -2047,7 +2114,7 @@
 					&-three {
 						font-weight: 400;
 						font-size: 26rpx;
-						color: #FFFFFF;
+						color: #999999;
 					}
 				}
 			}
@@ -2062,29 +2129,23 @@
 
 				.boss-tab-item {
 					width: 33%;
-					font-size: 28rpx;
+					height: 60rpx;
+					font-size: 20rpx;
 					font-weight: 400;
-					color: #FFFFFF;
-					position: relative;
+					color: #8A8A8A;
+					display: flex;
+					justify-content: space-around;
+					align-items: center;
 					text-align: center;
+					background-color: #FFFFFF;
+					border-radius: 8rpx;
 
 					&.act {
 						font-weight: 500;
-						font-size: 40rpx;
-						color: #B07AF3;
-
-						&::before {
-							content: '';
-							display: block;
-							position: absolute;
-							left: 50%;
-							bottom: -10rpx;
-							transform: translateX(-50%);
-							width: 30rpx;
-							height: 4rpx;
-							background: #B07AF3;
-							border-radius: 3rpx;
-						}
+						font-size: 20rpx;
+						color: #333333;
+						background-color: #E6F791;
+						border-radius: 8rpx;
 					}
 				}
 			}
@@ -2103,10 +2164,9 @@
 						width: 30%;
 
 						.avatar {
-							width: 68rpx;
-							height: 68rpx;
+							width: 52rpx;
+							height: 52rpx;
 							background: #9d9d9d;
-							border: 1px solid #cccccc;
 							border-radius: 50%;
 							box-sizing: border-box;
 							overflow: hidden;
@@ -2117,10 +2177,10 @@
 							box-sizing: border-box;
 							padding-left: 10rpx;
 
-							font-size: 24rpx;
+							font-size: 20rpx;
 							font-family: Source Han Sans CN;
 							font-weight: 400;
-							color: #ffffff;
+							color: #999999;
 						}
 
 						.hang1 {}
@@ -2130,14 +2190,16 @@
 						width: 100%;
 						box-sizing: border-box;
 						display: flex;
+						flex-direction: row;
 						align-items: center;
+						justify-content: space-between;
 						padding: 10rpx;
 
 						.avatar {
 							width: 60rpx;
 							height: 60rpx;
 							background: #9d9d9d;
-							border: 1px solid #cccccc;
+							// border: 1px solid #cccccc;
 							border-radius: 50%;
 							overflow: hidden;
 						}
@@ -2145,11 +2207,10 @@
 						.name {
 							width: 100rpx;
 							margin-left: 20rpx;
-
-							font-size: 24rpx;
-							font-family: Source Han Sans CN;
+							font-size: 20rpx;
+							// font-family: Source Han Sans CN;
 							font-weight: 400;
-							color: #ffffff;
+							color: #999999;
 						}
 
 						.hang1 {}
@@ -2157,14 +2218,14 @@
 						.place {
 							margin-left: 30rpx;
 
-							font-size: 24rpx;
+							font-size: 20rpx;
 							font-family: Source Han Sans CN;
 							font-weight: 400;
-							color: #ffffff;
+							color: #999999;
 
 							text {
 								padding-left: 4rpx;
-								color: #B07AF3;
+								color: #999999;
 							}
 						}
 
@@ -2175,7 +2236,7 @@
 							font-size: 24rpx;
 							font-family: Source Han Sans CN;
 							font-weight: 400;
-							color: #ffffff;
+							color: #999999;
 						}
 					}
 
@@ -2229,9 +2290,9 @@
 			box-sizing: border-box;
 			padding: 0 46rpx 40rpx;
 			position: relative;
-			background: #1C1B20;
+			background: #FFFFFF;
 			border-radius: 30rpx;
-			border: 1px solid #7776AD;
+			// border: 1px solid #7776AD;
 
 			.play-pop-hd {
 				position: relative;
@@ -2246,8 +2307,8 @@
 
 				.close-title {
 					font-weight: 500;
-					font-size: 40rpx;
-					color: #FFFFFF;
+					font-size: 28rpx;
+					color: #333333;
 				}
 
 				.close-icon {
@@ -2299,13 +2360,13 @@
 
 					.play-name {
 						width: 310rpx;
-						margin: 10rpx auto 0;
+						margin: 16rpx auto 0;
 						text-align: center;
 
-						font-size: 26rpx;
-						font-family: Source Han Sans CN;
+						font-size: 20rpx;
+						// font-family: Source Han Sans CN;
 						font-weight: 400;
-						color: #dddddd;
+						color: #333333;
 					}
 				}
 			}
@@ -2322,7 +2383,7 @@
 			.rule-title {
 				width: 118rpx;
 				margin-left: 10rpx;
-				font-family: YouSheBiaoTiHei;
+				// font-family: YouSheBiaoTiHei;
 				font-weight: 400;
 				font-size: 32rpx;
 				color: #FFFFFF;
@@ -2334,7 +2395,7 @@
 				margin: 20rpx auto 0;
 				font-size: 24rpx;
 				font-weight: 400;
-				color: #ffffff;
+				color: #8A8A8A;
 			}
 		}
 
@@ -2419,8 +2480,9 @@
 		.buy-pop {
 			padding: 0 30rpx;
 			box-sizing: border-box;
-			background: #1C1B20;
+			background: #F7F7F7;
 			padding-bottom: 30rpx;
+			border-radius: 16rpx 16rpx 0rpx 0rpx;
 
 			&::after {
 				content: '';
@@ -2429,11 +2491,11 @@
 				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%;
 			}
 
 			.buy-pop-hd {
-				padding: 20rpx 0;
+				padding: 40rpx 0;
 				padding-left: 10rpx;
 				display: flex;
 				justify-content: space-between;
@@ -2443,15 +2505,15 @@
 				color: #ffffff;
 
 				.close {
-					width: 60rpx;
-					height: 60rpx;
+					width: 24rpx;
+					height: 24rpx;
 				}
 			}
 
 			.buy-card {
 				border-radius: 20rpx;
-				padding: 30rpx 30rpx 10rpx;
-				background: #5B5B5D;
+				padding: 30rpx;
+				background: #FFFFFF;
 
 				.buy-info {
 					display: flex;
@@ -2471,19 +2533,19 @@
 						padding: 10rpx 0 10rpx 30rpx;
 
 						.title {
-							font-size: 32rpx;
+							font-size: 24rpx;
 							font-family: Source Han Sans CN;
 							font-weight: 400;
-							color: #ffffff;
+							color: #333333;
 						}
 
 						.hang1 {}
 
 						.type {
-							font-size: 28rpx;
+							font-size: 20rpx;
 							font-family: Source Han Sans CN;
 							font-weight: 400;
-							color: #dddddd;
+							color: #999999;
 						}
 
 						.price-num {
@@ -2492,21 +2554,21 @@
 							align-items: center;
 
 							.price {
-								font-size: 28rpx;
+								font-size: 16rpx;
 								font-family: Source Han Sans CN;
 								font-weight: 400;
-								color: #F6C0FF;
+								color: #333333;
 
 								text {
-									font-size: 34rpx;
+									font-size: 28rpx;
 								}
 							}
 
 							.num {
-								font-size: 28rpx;
+								font-size: 20rpx;
 								font-family: Source Han Sans CN;
 								font-weight: 400;
-								color: #ffffff;
+								color: #999999;
 							}
 						}
 					}
@@ -2524,40 +2586,6 @@
 					color: #FFFFFF;
 				}
 
-				.card-row {
-					padding: 16rpx 0;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-
-					.title {
-						>image {
-							width: 32rpx;
-							height: 32rpx;
-						}
-
-						>text {
-							font-weight: 400;
-							font-size: 24rpx;
-							color: #FFFFFF;
-						}
-					}
-
-					.row-r {
-						display: flex;
-						align-items: center;
-
-						font-size: 24rpx;
-						font-family: Source Han Sans CN;
-						font-weight: 400;
-						color: #FFFFFF;
-
-						.icon {
-							width: 32rpx;
-							height: 32rpx;
-						}
-					}
-				}
 
 				.card-row {
 					.title {}
@@ -2568,6 +2596,47 @@
 				}
 			}
 
+			.card-row {
+				padding: 16rpx 0;
+				display: flex;
+				height: 82rpx;
+				justify-content: space-between;
+				align-items: center;
+				border-radius: 16rpx;
+				margin-top: 24rpx;
+				background-color: #FFFFFF;
+
+				.title {
+					>image {
+						width: 32rpx;
+						height: 32rpx;
+					}
+
+					>text {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #333333;
+					}
+				}
+
+				.row-r {
+					display: flex;
+					align-items: center;
+
+					font-size: 20rpx;
+					font-family: Source Han Sans CN;
+					font-weight: 400;
+					color: #999999;
+
+					.icon {
+						width: 10rpx;
+						margin-right: 24rpx;
+						margin-left: 10rpx;
+						height: 17rpx;
+					}
+				}
+			}
+
 			.pay-title {
 				margin-top: 30rpx;
 				font-size: 28rpx;
@@ -2577,7 +2646,7 @@
 
 			.pay-type {
 				padding: 30rpx;
-				background: #5B5B5D;
+				background: #FFFFFF;
 				border-radius: 20rpx;
 				margin-top: 20rpx;
 				display: flex;
@@ -2595,7 +2664,7 @@
 					font-size: 28rpx;
 					font-family: Source Han Sans CN;
 					font-weight: 400;
-					color: #ffffff;
+					color: #333333;
 				}
 			}
 
@@ -2606,7 +2675,7 @@
 				font-size: 24rpx;
 				font-family: Source Han Sans CN;
 				font-weight: 400;
-				color: #ffffff;
+				color: #999999;
 				line-height: 32rpx;
 
 				.icon {
@@ -2616,13 +2685,13 @@
 				}
 
 				text {
-					color: #ffffff;
+					color: #999999;
 				}
 			}
 
 			.rule {
 				padding: 20rpx;
-				background: #5B5B5D;
+				background: #F9F8E1;
 				border-radius: 20rpx;
 				box-sizing: border-box;
 				margin: 20rpx 0 0;
@@ -2633,28 +2702,27 @@
 					font-size: 20rpx;
 					font-family: Source Han Sans CN;
 					font-weight: 400;
-					color: #dddddd;
+					color: #333333;
 				}
 			}
 
 			.pay-btn {
 				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;
 				}
 
 				>text:nth-child(2) {
-					font-size: 36rpx;
-					margin-top: 26rpx;
+					font-size: 24rpx;
 				}
 			}
 		}
diff --git a/pages/shouye/huanxiang.vue b/pages/shouye/huanxiang.vue
index 1f01be8..c728872 100644
--- a/pages/shouye/huanxiang.vue
+++ b/pages/shouye/huanxiang.vue
@@ -41,7 +41,7 @@
 				<view class="box column align-center">
 					<image :src="$img1('common/box.png')"></image>
 					<text class="mt10">
-						剩余{{ v.surplus_all_stock }}张
+						{{ v.surplus_all_stock }}
 					</text>
 				</view>
 				<view class="type-list">
@@ -222,8 +222,8 @@
 				align-items: center;
 
 				image {
-					width: 112rpx;
-					height: 68rpx;
+					width: 96rpx;
+					height: 96rpx;
 				}
 			}
 
@@ -261,8 +261,8 @@
 				margin-left: 20rpx;
 
 				>image {
-					width: 114rpx;
-					height: 98rpx;
+					width: 102rpx;
+					height: 66rpx;
 				}
 
 				>text {
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 6ea1c92..d2f10d2 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -72,7 +72,8 @@
 
 			<view class="qbt_con">
 				<view v-for="(item, index) in listdata" :key="index" class="qbt_con_item" @click="todetails(item)">
-					<view class="list_1 center" style="background-color: #D8D8D8; border-radius: 16rpx 16rpx 0rpx 0rpx;">
+					<view class="list_1 center"
+						style="background-color: #D8D8D8; border-radius: 16rpx 16rpx 0rpx 0rpx;">
 						<image :src="item.imgurl" mode="aspectFill"></image>
 					</view>
 					<view class="list_2">
@@ -161,7 +162,7 @@
 		</view> -->
 
 		<!-- 邀请好友 -->
-	<!-- 	<view class="group-fixed2" @tap="$c.to({url:'/pages/user/tui-guang'})">
+		<!-- 	<view class="group-fixed2" @tap="$c.to({url:'/pages/user/tui-guang'})">
 			<image :src="$img1('image/yaoqing.png')"></image>
 		</view> -->
 
@@ -934,11 +935,12 @@
 		// background: url($imgurl+'common/goodsBg.png') no-repeat 0 0 / 100% 100%;
 
 		.image1 {
-			width: 80rpx;
+			width: 38rpx;
+			height: 30rpx;
 			position: absolute;
 			z-index: 10;
-			top: -1rpx;
-			left: 10rpx;
+			top: 10rpx;
+			right: 10rpx;
 		}
 
 		.image3 {
diff --git a/pages/user/coupon.vue b/pages/user/coupon.vue
index 07712d3..3d2f80d 100644
--- a/pages/user/coupon.vue
+++ b/pages/user/coupon.vue
@@ -182,8 +182,9 @@
 				position: relative;
 				padding: 16rpx 18rpx;
 				font-size: 20rpx;
-				font-family: Source Han Sans CN;
+				// font-family: Source Han Sans CN;
 				font-weight: 400;
+				border-radius: 8rpx;
 				color: #cccccc;
 
 				// .arrow {