From 436ace27f01a5bc94abe153488755a8836b1d6ec Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sat, 9 Mar 2024 21:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                               |    2 +-
 pages/activity/charts.vue                |    4 +-
 pages/activity/newGoods.vue              |   40 +-
 pages/activity/newPeople.vue             |  107 ++-
 pages/activity/presaleRule.vue           |   10 +-
 pages/activity/ranking.vue               |    7 +-
 pages/index/index.vue                    |  137 ++-
 pages/member/index.vue                   |    8 +-
 pages/memberInfo/index.vue               |   51 +-
 pages/news/goods/components/category.vue |    6 +-
 pages/news/recycling/confirm.vue         | 1105 ++++++++++++----------
 pages/news/recycling/detail.vue          | 1081 +++++++++++----------
 pages/news/recycling/index.vue           |    2 +-
 pages/news/user/vip.vue                  |  535 ++++++-----
 pages/news3/components/category.vue      |   35 +-
 pages/news3/vipPrice.vue                 |   24 +-
 pages/search/index.vue                   |  151 +--
 pages/serve/index.vue                    |    5 +-
 pages/user/index.vue                     |    4 +-
 19 files changed, 1835 insertions(+), 1479 deletions(-)

diff --git a/pages.json b/pages.json
index 89ad462..db2cb7e 100644
--- a/pages.json
+++ b/pages.json
@@ -662,7 +662,7 @@
 				{
 					"path": "recycling/index",
 					"style": {
-						"navigationBarTitleText": "上门回收",
+						"navigationBarTitleText": "旧物回收",
 						"navigationStyle": "custom",
 						"enablePullDownRefresh": false
 					}
diff --git a/pages/activity/charts.vue b/pages/activity/charts.vue
index eec8a6f..58de211 100644
--- a/pages/activity/charts.vue
+++ b/pages/activity/charts.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="newGoods">
 		<view>
-			<u-navbar title="排行榜" back-icon-color="#fff" :border-bottom="false" title-color="#fff"
+			<u-navbar title="" back-icon-color="#fff" :border-bottom="false" title-color="#fff"
 				:background="background"></u-navbar>
 		</view>
 		<view class="main">
@@ -16,7 +16,7 @@
 					根据商品销量等级排序|每日更新
 				</view>
 			</view>
-			<view class="rule" @click="openPage(1)">入会规则</view>
+			<view class="rule" @click="openPage(1)">入选规则</view>
 			<view class="all" @click="openPage(2)">全部榜单</view>
 			<view class="hb">
 				<view class="goodsList" v-for="(item,index) in jingList.slice(0,sliceIndex)" :key="index"
diff --git a/pages/activity/newGoods.vue b/pages/activity/newGoods.vue
index e018469..1ab5f71 100644
--- a/pages/activity/newGoods.vue
+++ b/pages/activity/newGoods.vue
@@ -9,7 +9,7 @@
 		<view class="goodsList">
 			<view class="goodsItem" v-for="(item,index) in list" :key="index" @click="goDetails(item.goods_id)">
 				<view class="hotSell">
-					现货热卖
+					抢先体验
 				</view>
 				<view class="item">
 					<view class="goodsInfo">
@@ -36,10 +36,15 @@
 						</view>
 					</view>
 				</view>
-
-
+			</view>
+			<view class="lookBtn" @click="backtop">
+				再挑挑看
+			</view>
+			<view class="lookJie">
+				本活动最终解释权为xxxxxx公司所有
 			</view>
 		</view>
+
 	</view>
 </template>
 
@@ -104,12 +109,37 @@
 					})
 					.finally(() => app.isLoading = false)
 			},
+			backtop() {
+				uni.pageScrollTo({
+					scrollTop: 0
+				});
+			}
+
 		}
 
 	}
 </script>
 
 <style lang="scss" scoped>
+	.lookBtn {
+		width: 180rpx;
+		line-height: 75rpx;
+		height: 75rpx;
+		background-color: #FFDCC3;
+		text-align: center;
+		font-size: 32rpx;
+		border-radius: 40rpx;
+		margin: 30rpx auto;
+		color: #242424;
+	}
+
+	.lookJie {
+		text-align: center;
+		color: #fff;
+		font-size: 28rpx;
+		margin: 20rpx 0 50rpx 0;
+	}
+
 	.newGoods {
 		width: 100%;
 		position: relative;
@@ -129,8 +159,8 @@
 		height: 548rpx;
 		background-image: url('https://www.royaum.com.cn/static/newGoods/top.png');
 		background-size: 100% auto;
-		padding-left: 30rpx;
-		padding-top: 44rpx;
+		// padding-left: 30rpx;
+		// padding-top: 44rpx;
 
 		.topLine {
 			display: flex;
diff --git a/pages/activity/newPeople.vue b/pages/activity/newPeople.vue
index c341cc8..11b2e0e 100644
--- a/pages/activity/newPeople.vue
+++ b/pages/activity/newPeople.vue
@@ -1,9 +1,12 @@
 <template>
 	<view class="newpeople">
 		<view class="newpeople-navbar">
-			<u-navbar title="" back-icon-color="#fff" :border-bottom="false" :background="background"></u-navbar>
+			<u-navbar title="新人首单礼" title-color="#fff" back-icon-color="#fff" :border-bottom="false"
+				:background="background"></u-navbar>
+		</view>
+		<view class="newpeople-hd">
+			<view class="rule" @click="openRule()">规则</view>
 		</view>
-		<view class="newpeople-hd"></view>
 		<view class="newpeople-gift">
 			<view class="a">
 				<image :src="$picUrl+'/static/news/newPeople-bg1.png'"></image>
@@ -25,18 +28,33 @@
 					:is-scroll="true" font-size="30" v-model="current" @change="onChosed"></u-tabs>
 			</view>
 			<view scroll-x class="b">
-				<view class="item" v-for="(item,index) in goodList" :key="i" @click="goDetail(item.goods_id)">
-					<image :src="item.goods_image"></image>
-					<view class="title">
-						<text>自营</text>{{item.goods_name}}
+				<view class="">
+					<view class="item" v-for="(item, index) in LeftList" :key="index" @click="goDetail(item.goods_id)">
+						<image :src="item.goods_image"></image>
+						<view class="title">
+							<text>自营</text>{{item.goods_name}}
+						</view>
+						<view class="price">
+							<view class="n">￥<text
+									style="margin-right: 6rpx;">{{item.goods_price_min?Number(item.goods_price_min):''}}</text>新人价
+							</view>
+							<view class="o">￥{{item.line_price_min?Number(item.line_price_min):''}}</view>
+						</view>
 					</view>
-					<view class="price">
-						<view class="n">￥<text>{{item.goods_price_min?Number(item.goods_price_min):''}}</text>到手价</view>
-						<view class="o">￥{{item.line_price_min?Number(item.line_price_min):''}}</view>
+				</view>
+				<view class="">
+					<view class="item" v-for="(item, index) in RightList" :key="index" @click="goDetail(item.goods_id)">
+						<image :src="item.goods_image"></image>
+						<view class="title">
+							<text>自营</text>{{item.goods_name}}
+						</view>
+						<view class="price">
+							<view class="n">￥<text
+									style="margin-right: 6rpx;">{{item.goods_price_min?Number(item.goods_price_min):''}}</text>新人价
+							</view>
+							<view class="o">￥{{item.line_price_min?Number(item.line_price_min):''}}</view>
+						</view>
 					</view>
-					<!-- <view class="desc">
-						{{item.goods_sales}}+条评论 {{item.remaizhishu}}%好评率
-					</view> -->
 				</view>
 			</view>
 		</view>
@@ -59,6 +77,8 @@
 
 				},
 				goodList: [],
+				LeftList: [],
+				RightList: [],
 				menuList: [],
 				couList: []
 			}
@@ -101,17 +121,23 @@
 			// 根据分类查数据
 			getListgoodData(categoryId) {
 				let app = this;
+				this.LeftList = [];
+				this.RightList = []
 				let pamars = {
-					store_id: 10001,
 					categoryId: categoryId,
 				}
 				Api.chartsGoodsList(pamars)
 					.then(result => {
 						if (result.data.data.length > 0) {
-							result.data.data.map(a => {
-								a.goods_price_min = Number(a.goods_price_min);
-								a.line_price_min = Number(a.line_price_min)
-							})
+							for (let i = 0; i < result.data.data.length; i++) {
+								result.data.data[i].goods_price_min = Number(result.data.data[i].goods_price_min);
+								result.data.data[i].line_price_min = Number(result.data.data[i].line_price_min)
+								if (i % 2 === 0) {
+									this.LeftList.push(result.data.data[i])
+								} else {
+									this.RightList.push(result.data.data[i])
+								}
+							}
 							app.goodList = result.data.data;
 						}
 					})
@@ -152,6 +178,11 @@
 					url: '/pages/goods/detail?goodsId=' + goods_id
 				})
 			},
+			openRule() {
+				uni.navigateTo({
+					url: '/pages/activity/presaleRule?type=4'
+				})
+			},
 		}
 	}
 </script>
@@ -164,6 +195,22 @@
 
 		&-hd {
 			height: 200rpx;
+
+			.rule {
+				right: 0;
+				top: 74rpx;
+				z-index: 999;
+				width: 100rpx;
+				height: 60rpx;
+				background-color: rgba(0, 0, 0, 0.3);
+				font-size: 24rpx;
+				font-weight: 400;
+				color: #FFFFFF;
+				line-height: 60rpx;
+				text-align: center;
+				position: absolute;
+				border-radius: 50rpx 0 0 50rpx;
+			}
 		}
 
 		&-gift {
@@ -186,11 +233,14 @@
 			.b {
 				padding: 20rpx;
 				overflow: hidden;
+
 				white-space: nowrap;
+				display: flex;
+				justify-content: space-between;
 
 				.item {
 					width: 210rpx;
-					height: 266rpx;
+					height: 240rpx;
 					position: relative;
 					margin-left: 30rpx;
 					display: inline-block;
@@ -256,7 +306,7 @@
 		}
 
 		&-bd {
-			padding: 0 20rpx;
+			padding: 0 22rpx;
 			overflow: hidden;
 
 			.a {
@@ -266,19 +316,20 @@
 
 			.b {
 				overflow: hidden;
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
 
 				.item {
-					width: 340rpx;
-					height: 436rpx;
+					width: 346rpx;
 					background: #FFFFFF;
 					border-radius: 8rpx;
 					opacity: 1;
 					border: 1px solid #ECECEC;
-					padding: 10rpx 15rpx;
+					padding: 10rpx 15rpx 25rpx 15rpx;
 					box-sizing: border-box;
-					float: left;
-					margin-left: 30rpx;
-					margin-bottom: 30rpx;
+
+					margin-bottom: 20rpx;
 
 					&:nth-child(2n+1) {
 						margin-left: 0;
@@ -298,9 +349,9 @@
 						font-family: PingFang SC, PingFang SC;
 						font-weight: 400;
 						color: #1E1E1E;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						overflow: hidden;
+						// text-overflow: ellipsis;
+						// white-space: nowrap;
+						// overflow: hidden;
 
 						text {
 							background-color: #F34A40;
diff --git a/pages/activity/presaleRule.vue b/pages/activity/presaleRule.vue
index 83c5981..16b7cbd 100644
--- a/pages/activity/presaleRule.vue
+++ b/pages/activity/presaleRule.vue
@@ -15,6 +15,9 @@
 		},
 		onLoad(op) {
 			let title = ''
+			if (op.type == 4) {
+				title = '新人首单规则'
+			}
 			if (op.type == 5) {
 				title = '预售规则'
 			}
@@ -36,6 +39,9 @@
 			getCarouselList(type) {
 				const app = this;
 				let rule=''
+				if (app.type == 4) {
+					rule = 'presale_rule'
+				}
 				if (app.type == 5) {
 					rule = 'presale_rule'
 				}
@@ -43,13 +49,13 @@
 					rule = 'rank_rule'
 				}
 				if (app.type == 7) {
-					rule = 'coupon_rule'
+					rule = 'rank_rule'
 				}
 				Api.getAgreement({
 						type: rule
 					})
 					.then(result => {
-						let content = result.data.detail.content;
+						let content = result.data.detail.content || '';
 						if (content) {
 							content = content.replace(/style=""/g, '').replace(/<img src=/g,
 								'<img style="width: 100%; display:block" src=')
diff --git a/pages/activity/ranking.vue b/pages/activity/ranking.vue
index 95ce870..9d97b39 100644
--- a/pages/activity/ranking.vue
+++ b/pages/activity/ranking.vue
@@ -8,10 +8,10 @@
 		</view>
 		<!-- <image :src="$picUrl+'/static/rank/rangkImg.png'"  mode="" class="bgImg"></image> -->
 		<view class="headTitle">
-			全站热销好物
+			全站好物热榜
 		</view>
 		<view class="ranking">
-			- 实时排名 -
+			- 跟榜买错不了 -
 		</view>
 		<view class="menuList">
 			<scroll-view scroll-x="true" class="list">
@@ -376,6 +376,7 @@
 					position: absolute;
 					left: 36rpx;
 					top: -8rpx;
+					z-index: 999;
 				}
 
 				.goodsInfo1 {
@@ -409,7 +410,7 @@
 							border-radius: 70rpx;
 							opacity: 1;
 							margin-top: 26rpx;
-
+                           padding: 0 8rpx;
 							.hotTitle1 {
 								margin-right: 8rpx;
 								width: 68rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b56d0e4..1fdf4b2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -79,6 +79,10 @@
 							<!-- <text></text> -->
 						</view>
 						<view class="couponInfo">
+							<view class="couponNew">
+								<text>新人首单礼</text>
+								<!-- <text>查看更多</text> -->
+							</view>
 							<view class="left">
 								<text class="flag">¥</text>
 								<text class="num">{{couList.reduce_price}}</text>
@@ -229,32 +233,55 @@
 					</view>
 				</view>
 				<view class="goodsRecommend">
-					<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="goDetails(item)"
-						:key="index">
-						<view class="pic">
-							<image :src="item.goods_image" mode=""></image>
-						</view>
-						<view class="goodsInfo">
-							<view class="title">
-								<text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text>
-								<text class="name">{{item.goods_name}}</text>
+					<view class="">
+						<view class="goodsItem" v-for="(item,index) in LeftList" @click="goDetails(item)"
+							:key="index">
+							<view class="pic">
+								<image :src="item.goods_image" mode=""></image>
 							</view>
-							<view class="isExpress">
-								<text>包邮</text>
+							<view class="goodsInfo">
+								<view class="title">
+									<text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text>
+									<text class="name">{{item.goods_name}}</text>
+								</view>
+								<view class="isExpress">
+									<text>包邮</text>
+								</view>
+								<view class="price">
+									<text style="font-size: 20rpx;">￥</text>
+									<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_min}}</text>
+									<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
+									<text
+										style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
+								</view>
 							</view>
-							<view class="price">
-								<text style="font-size: 20rpx;">￥</text>
-								<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_min}}</text>
-								<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
-								<text
-									style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
+						</view>
+					</view>
+					<view class="">
+						<view class="goodsItem" v-for="(item,index) in RightList" @click="goDetails(item)"
+							:key="index">
+							<view class="pic">
+								<image :src="item.goods_image" mode=""></image>
+							</view>
+							<view class="goodsInfo">
+								<view class="title">
+									<text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text>
+									<text class="name">{{item.goods_name}}</text>
+								</view>
+								<view class="isExpress">
+									<text>包邮</text>
+								</view>
+								<view class="price">
+									<text style="font-size: 20rpx;">￥</text>
+									<text style="font-weight: bold;font-size: 36rpx;">{{item.goods_price_min}}</text>
+									<text style="font-size: 20rpx;margin-left:10rpx;">到手价</text>
+									<text
+										style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
+								</view>
 							</view>
-							<!-- <view class="comment">
-								<text>{{item.goods_sales}}条评论</text>
-								<text style="margin-left:20rpx;">{{item.remaizhishu}}%好评率</text>
-							</view> -->
 						</view>
 					</view>
+				
 				</view>
 			</view>
 		</view>
@@ -509,7 +536,7 @@
 					},
 					{
 						image: `${this.$picUrl}/static/index/g5.png?n=` + new Date().getTime(),
-						text: "上门回收",
+						text: "旧物回收",
 						path: '/pages/news/recycling/index',
 						type: 2
 					},
@@ -520,6 +547,8 @@
 				seckillList: [],
 				xinpinList: [],
 				goodsRecommend: [],
+				LeftList: [],
+				RightList: [],
 				isToggle: false,
 				//第二
 				count: 4,
@@ -637,7 +666,7 @@
 				}).then(res => {
 					if (res.status == 200) {
 						this.tabList = res.data.list;
-						this.catagoryList = res.data.list[0].children
+						this.catagoryList = res.data.list[0].children||[]
 						if (this.current == 0) {
 							this.getRankingList(this.tabList[0].category_id)
 							// this.getNewGoods(this.tabList[0].category_id)
@@ -672,7 +701,7 @@
 			},
 			changeGoodsType(index) {
 				this.tabCurrent = index;
-				this.catagoryList = this.tabList[index].children;
+				this.catagoryList = this.tabList[index].children||[];
 				this.getRankingList(this.tabList[index].category_id)
 				// this.getNewGoods(this.tabList[index].category_id)
 				this.getNewGoods()
@@ -728,16 +757,23 @@
 
 			},
 			getSuggest() {
+				this.LeftList=[];
+				this.RightList=[]
 				// 获取推荐商品
 				Api.recommended().then(res => {
 					let arr = res.data.goodsList
 					if (arr && arr.length > 0) {
-						arr.map(a => {
-							a.goods_price_min = Number(a.goods_price_min)
-							a.goods_price_max = Number(a.goods_price_max)
-							a.line_price_min = Number(a.line_price_min)
-							a.line_price_max = Number(a.line_price_max)
-						})
+						for (let i = 0; i < arr.length; i++) {
+							arr[i].goods_price_min = Number(arr[i].goods_price_min);
+							arr[i].goods_price_max = Number(arr[i].goods_price_max)
+							arr[i].line_price_min = Number(arr[i].line_price_min);
+							arr[i].line_price_max = Number(arr[i].line_price_max)
+							if (i % 2 === 0) {
+								this.LeftList.push(arr[i])
+							} else {
+								this.RightList.push(arr[i])
+							}
+						}
 					}
 					this.goodsRecommend = arr
 				})
@@ -810,9 +846,9 @@
 				// 		url: '/pages/goods/detail?goodsId=' + this.bannerList[index].redirect_url
 				// 	})
 				// } else {
-					uni.navigateTo({
-						url: '/pages/activity/newsshop?activeid=' + this.bannerList[index].redirect_url + '&type=1'
-					})
+				uni.navigateTo({
+					url: '/pages/activity/newsshop?activeid=' + this.bannerList[index].redirect_url + '&type=1'
+				})
 				// }
 			},
 			goDetails(item) {
@@ -1158,6 +1194,34 @@
 			.firstContent {
 				position: relative;
 
+				.couponNew {
+					position: absolute;
+					top: -12rpx;
+					width: 520rpx;
+					left: 25rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					text:nth-child(1){
+						font-family: YouSheBiaoTiYuan, YouSheBiaoTiYuan;
+						font-weight: 700;
+						font-size: 40rpx;
+						color: #FFFFFF;
+						text-align: left;
+						font-style: normal;
+						text-transform: none;
+					}
+					text:nth-child(2){
+						font-family: PingFang SC, PingFang SC;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #FFFFFF;
+						text-align: left;
+						font-style: normal;
+						text-transform: none;
+					}
+				}
+
 				.firstBg {
 					width: 698rpx;
 					height: 230rpx;
@@ -1617,7 +1681,6 @@
 
 			.goodsRecommend {
 				display: flex;
-				align-items: center;
 				justify-content: space-between;
 				flex-wrap: wrap;
 				margin-top: 20rpx;
@@ -1666,9 +1729,9 @@
 								font-weight: 400;
 								color: #1E1E1E;
 								flex: 1;
-								overflow: hidden;
-								white-space: nowrap;
-								text-overflow: ellipsis;
+								// overflow: hidden;
+								// white-space: nowrap;
+								// text-overflow: ellipsis;
 
 							}
 						}
diff --git a/pages/member/index.vue b/pages/member/index.vue
index 36a1df8..6963749 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="member">
 		<view>
-			<u-navbar title="会员中心" :border-bottom="false" title-color="#333" :background="background"></u-navbar>
+			<u-navbar title="开通续费管理" :border-bottom="false" title-color="#333" :background="background"></u-navbar>
 		</view>
-		<view class="khy">
+	<!-- 	<view class="khy">
 			开通<text v-if="type=='fx'">分销</text>会员，人均立省￥<text>2389</text>
-		</view>
+		</view> -->
 		<view class="tips">
 			<image src="/static/default-logo.png" mode="" class="headIcon"></image>
 			<view class="meInfo">
@@ -18,7 +18,7 @@
 					</view>
 				</view>
 				<view class="time">
-					有效期至{{userInfo.effective_time}}
+					会员有效期至{{userInfo.effective_time}}
 				</view>
 			</view>
 			<view class="buyInfo" @click="goBuyInfo">
diff --git a/pages/memberInfo/index.vue b/pages/memberInfo/index.vue
index b0a0418..7384084 100644
--- a/pages/memberInfo/index.vue
+++ b/pages/memberInfo/index.vue
@@ -1,8 +1,7 @@
 <template>
 	<view class="member">
 		<view>
-			<u-navbar title="会员中心" :border-bottom="false" title-color="#333"
-				:background="background"></u-navbar>
+			<u-navbar title="会员中心" :border-bottom="false" title-color="#333" :background="background"></u-navbar>
 		</view>
 		<view class="tips">
 			<image src="/static/default-logo.png" mode="" class="headIcon"></image>
@@ -22,13 +21,13 @@
 		</view>
 		<view class="main">
 			<view class="mTitle">
-				月卡订单记录
+				会员卡订单记录
 			</view>
 			<view class="card" v-for="(item,index) in list" :key="index">
 				<view class="tp">
 					<view class="info">
 						<text v-if="item.is_valid">生效中</text>
-						<text v-if="!item.is_valid">已过期</text>	
+						<text v-if="!item.is_valid">已过期</text>
 					</view>
 				</view>
 				<view class="detail">
@@ -42,8 +41,12 @@
 					</view>
 				</view>
 			</view>
+			<view class="cardTips" v-if="list.length > 0" >
+				已展示近12个月省钱会员卡订单
+			</view>
+			<u-empty text="您还没有会员卡订单记录哦" v-if="list.length == 0" mode="list" style="margin-top: 50rpx;"></u-empty>
 		</view>
-		
+
 	</view>
 </template>
 
@@ -54,28 +57,28 @@
 		data() {
 			let img = 'https://www.royaum.com.cn/static/member/top.png'
 			return {
-				userInfo:{},
-				payTypeChose:true,
+				userInfo: {},
+				payTypeChose: true,
 				isChose: 0,
 				isVip: false,
 				background: {
 					background: 'url(' + img + ') center top no-repeat',
 					backgroundSize: '100% auto',
 				},
-				list:[],
+				list: [],
 			}
 		},
-		onLoad(options){
+		onLoad(options) {
 			this.userInfo = JSON.parse(options.userInfo)
 		},
-		onShow(){
+		onShow() {
 			this.getListInfo()
 		},
-		methods:{
-			getListInfo(){
+		methods: {
+			getListInfo() {
 				const that = this
 				that.list = []
-				if(that.userInfo.user_type==30){
+				if (that.userInfo.user_type == 30) {
 					member.dealerOpenCardLog()
 						.then(res => {
 							if (res.status == 200) {
@@ -83,7 +86,7 @@
 							}
 						})
 						.finally(() => that.isLoading = false)
-				}else if(that.userInfo.user_type==20){
+				} else if (that.userInfo.user_type == 20) {
 					member.userOpenCardLog()
 						.then(res => {
 							if (res.status == 200) {
@@ -92,7 +95,7 @@
 						})
 						.finally(() => that.isLoading = false)
 				}
-				
+
 			},
 		},
 	}
@@ -106,6 +109,13 @@
 		position: relative;
 	}
 
+	.cardTips {
+		color: rgb(192, 196, 204);
+		font-size: 14px;
+		margin: 15px 0px 0px;
+		text-align: center;
+	}
+
 	.tips {
 		width: 698rpx;
 		height: 234rpx;
@@ -166,7 +176,8 @@
 
 			}
 		}
-		.buyInfo{
+
+		.buyInfo {
 			// width: 112rpx;
 			height: 40rpx;
 			font-size: 28rpx;
@@ -178,7 +189,7 @@
 		}
 	}
 
-	
+
 
 	.main {
 		width: 750rpx;
@@ -192,7 +203,7 @@
 	}
 
 	.mTitle {
-		width: 192rpx;
+		// width: 192rpx;
 		height: 44rpx;
 		font-size: 32rpx;
 		font-family: PingFang SC, PingFang SC;
@@ -287,6 +298,4 @@
 		text-align: center;
 		margin-top: 46rpx;
 	}
-
-	
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/news/goods/components/category.vue b/pages/news/goods/components/category.vue
index 5ca5b5b..d3714f2 100644
--- a/pages/news/goods/components/category.vue
+++ b/pages/news/goods/components/category.vue
@@ -6,7 +6,7 @@
 				<view class="filterTitle">
 					请选择分类
 				</view>
-				<view class="shopItem">
+				<scroll-view scroll-y="true" class="shopItem" >
 					<view class="" v-for="(item, index) in tabList" :key="index">
 						<view class="shopText Text" :class="{'active1':activeIndex.indexOf(item.category_id) > -1}"
 							@click="getShop(item,item.category_id)">
@@ -26,7 +26,7 @@
 							</view>
 						</view>
 					</view>
-				</view>
+				</scroll-view>
 				<view class="btnGroup">
 					<view class="reset" @click="reset">
 						重置
@@ -58,6 +58,7 @@
 			reset() {
 				this.activeIndex.splice(0)
 			},
+			
 			getShop(item, category_id) {
 				let arrIndex = this.activeIndex.indexOf(category_id)
 				if (arrIndex > -1) {
@@ -142,7 +143,6 @@
 		.shopItem {
 			margin-top: 40rpx;
 			max-height: 750rpx;
-			overflow-y: auto;
 
 			.shopText {
 				margin-right: 12rpx;
diff --git a/pages/news/recycling/confirm.vue b/pages/news/recycling/confirm.vue
index 1369eb5..5c54e07 100644
--- a/pages/news/recycling/confirm.vue
+++ b/pages/news/recycling/confirm.vue
@@ -1,101 +1,100 @@
-<template>
-	<view class="recycling">
-		<view class="recycling-hd">
-			<image :src="$picUrl+'/static/news/recyling-banner-01.png'"></image>
-		</view>
-		<view class="recycling-bd">
-			<view class="tab">
-				<view class="a" v-if="type == 2">
-					<view class="item" @click="tabItem(1)"></view>
-					<view class="item" @click="tabItem(2)"></view>
-					<view class="item" @click="tabItem(3)"></view>
-				</view>
-				<view class="b" v-if="type == 2">
-					<image v-if="tabIndex == 1" :src="$picUrl+'/static/news/icon-recyling-tab-01.png'"></image>
-					<image v-if="tabIndex == 2" :src="$picUrl+'/static/news/icon-recyling-tab-02.png'"></image>
-					<image v-if="tabIndex == 3" :src="$picUrl+'/static/news/icon-recyling-tab-03.png'"></image>
+<template>
+	<view class="recycling">
+		<view class="recycling-hd">
+			<image :src="$picUrl+'/static/news/recyling-banner-01.png'"></image>
+		</view>
+		<view class="recycling-bd">
+			<view class="tab">
+				<view class="a" v-if="type == 2">
+					<view class="item" @click="tabItem(1)"></view>
+					<view class="item" @click="tabItem(2)"></view>
+					<view class="item" @click="tabItem(3)"></view>
+				</view>
+				<view class="b" v-if="type == 2">
+					<image v-if="tabIndex == 1" :src="$picUrl+'/static/news/icon-recyling-tab-01.png'"></image>
+					<image v-if="tabIndex == 2" :src="$picUrl+'/static/news/icon-recyling-tab-02.png'"></image>
+					<image v-if="tabIndex == 3" :src="$picUrl+'/static/news/icon-recyling-tab-03.png'"></image>
 				</view>
 				<view class="b" v-else>
 					<image :src="$picUrl+'/static/news/icon-recyling-tab-04.png'"></image>
-				</view>
-			</view>
-			<view class="goods">
-				<!-- <view class="a">
-					<image src="@/static/news/icon-mall.jpg"></image>京送家电武隆路店
-				</view> -->
-				<view class="b">
-					<!-- <view class="l">
-						<image class="pic" src="@/static/home/phone.jpg"></image>
-						<view class="info">
-							<view class="tel">13770577307</view>
-							<view class="address">杭州市萧山区宏达路234号 国际中心</view>
-							<view class="time">营业时间：10:00-18:00</view>
-						</view>
-						<view class="do">
-							<view class="tel">
-								<image src="@/static/news/tel.png"></image>电话
-							</view>
-							<view class="tel">
-								<image src="@/static/news/address.png"></image>导航
-							</view>
-						</view>
-					</view> -->
-					<view class="r">
-						<image class="pic" :src="info.server_image"></image>
-						<view class="info">
-							<view class="tel">{{info.server_name}}</view>
-							<view class="price">¥<text>{{info.line_price}}</text></view>
-						</view>
-						<view class="num">
-							x1
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="form">
-				<view class="item">
-					<view class="a">服务时间</view>
-					<view class="b" @click="openPage(1)">
-						<view class="select" :class="server_time?'select-on':''">{{server_time?server_time:'请选择预约到店时间'}}</view>
-						<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
-					</view>
+				</view>
+			</view>
+			<view class="goods">
+				<!-- <view class="a">
+					<image src="@/static/news/icon-mall.jpg"></image>京送家电武隆路店
+				</view> -->
+				<view class="b">
+					<!-- <view class="l">
+						<image class="pic" src="@/static/home/phone.jpg"></image>
+						<view class="info">
+							<view class="tel">13770577307</view>
+							<view class="address">杭州市萧山区宏达路234号 国际中心</view>
+							<view class="time">营业时间：10:00-18:00</view>
+						</view>
+						<view class="do">
+							<view class="tel">
+								<image src="@/static/news/tel.png"></image>电话
+							</view>
+							<view class="tel">
+								<image src="@/static/news/address.png"></image>导航
+							</view>
+						</view>
+					</view> -->
+					<view class="r">
+						<image class="pic" :src="info.server_image"></image>
+						<view class="info">
+							<view class="tel">{{info.server_name}}</view>
+							<view class="price">¥<text>{{info.line_price}}</text></view>
+						</view>
+						<view class="num">
+							x1
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="form">
+				<view class="item">
+					<view class="a">服务时间</view>
+					<view class="b" @click="openPage(1)">
+						<view class="select" :class="server_time?'select-on':''">{{server_time?server_time:'请选择预约到店时间'}}
+						</view>
+						<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
+					</view>
 				</view>
 				<view class="item">
 					<view class="a">优惠券</view>
 					<view class="b" @click="openPage(2)">
 						<view class="select" :class="couponIndex >= 0?'select-on':''">
-						{{couponIndex >= 0? couponList[couponIndex].name:(couponList.length > 0?(couponIndex == -9998?'不使用优惠券':'请选择优惠券'):'暂无优惠券')}}
+							{{couponIndex >= 0? couponList[couponIndex].name:(couponList.length > 0?(couponIndex == -9998?'不使用优惠券':'请选择优惠券'):'暂无优惠券')}}
 						</view>
 						<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
 					</view>
-				</view>
-				<view class="item">
-					<view class="a">联系人</view>
-					<view class="b">
-						<input class="box1" v-model="username" type="text" placeholder="联系人姓名" />
-						<!-- <view class="radio">
-							<u-radio-group v-model="radioValue" active-color="red">
-								<u-radio name="先生">先生</u-radio>
-								<u-radio name="女士">女士</u-radio>
-							</u-radio-group>
-						</view> -->
-					</view>
-				</view>
-				<view class="item">
-					<view class="a">联系电话</view>
-					<view class="b">
-						<input class="box" v-model="mobile" type="number" placeholder="联系人手机号码" />
-					</view>
+				</view>
+				<view class="item">
+					<view class="a">联系人</view>
+					<view class="b">
+						<input class="box1" v-model="username" type="text" placeholder="联系人姓名" />
+						<!-- <view class="radio">
+							<u-radio-group v-model="radioValue" active-color="red">
+								<u-radio name="先生">先生</u-radio>
+								<u-radio name="女士">女士</u-radio>
+							</u-radio-group>
+						</view> -->
+					</view>
+				</view>
+				<view class="item">
+					<view class="a">联系电话</view>
+					<view class="b">
+						<input class="box" v-model="mobile" type="number" placeholder="联系人手机号码" />
+					</view>
 				</view>
 				<view class="item" v-if="type == 1">
 					<view class="a">所在城市</view>
-					<view class="b">
-						<picker @change="changeRegion" mode="region">
-							<view class="select" :class="region.length>0?'select-on':''">
-							{{
-								region.length > 0?region[0]+region[1]+region[2]:'请选择所在人城市'
-							}}</view>
-						</picker>
+					<view class="b" @click="addrshow=true">
+						<input type="text" disabled style="font-size: 28rpx;" placeholder="请选择地址"
+							v-model="region">
+						<u-icon name="arrow-right" color="#8B8B8B" size="30"></u-icon>
+						<u-picker @confirm="changeRegion" v-model="addrshow" mode="region"></u-picker>
 					</view>
 				</view>
 				<view class="item" v-if="type == 1">
@@ -103,24 +102,25 @@
 					<view class="b">
 						<input class="box" v-model="address" type="text" placeholder="例：12幢1单元102室" />
 					</view>
-				</view>
-				<view class="remark" style="margin-top: 20rpx;">
-					<view class="name">备注 ：</view>
-					<view class="xu">
-						<view class="li" @click="openPage(5,'可提前来')">可提前来</view>
-						<view class="li" @click="openPage(5,'来之前打电话')">来之前打电话</view>
-						<view class="li" @click="openPage(5,'请尽快联系我')">请尽快联系我</view>
-					</view>
-					<view class="content">
-						<u-input v-model="remake" height="260" type="textarea" placeholder="请输入您的留言，最多可留言100字" :border="true" />
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="recycling-fd">
-			<view class="a" v-if="type==2">免支付预购</view>
-			<view class="c" v-else style="color: #FE483B;font-size: 30rpx;">￥{{pay_price}}元</view>
-			<view class="b" @click="openPage(3)">提交订单</view>
+				</view>
+				<view class="remark" style="margin-top: 20rpx;">
+					<view class="name">备注 ：</view>
+					<view class="xu">
+						<view class="li" @click="openPage(5,'可提前来')">可提前来</view>
+						<view class="li" @click="openPage(5,'来之前打电话')">来之前打电话</view>
+						<view class="li" @click="openPage(5,'请尽快联系我')">请尽快联系我</view>
+					</view>
+					<view class="content">
+						<u-input v-model="remake" height="260" type="textarea" placeholder="请输入您的留言，最多可留言100字"
+							:border="true" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="recycling-fd">
+			<view class="a" v-if="type==2">免支付预购</view>
+			<view class="c" v-else style="color: #FE483B;font-size: 30rpx;">￥{{pay_price}}元</view>
+			<view class="b" @click="openPage(3)">提交订单</view>
 		</view>
 		<!-- 选择优惠券 -->
 		<u-popup v-model="isShow" mode="bottom" border-radius="12" mask-close-able="false" closeable>
@@ -128,28 +128,33 @@
 				<view class="recycling-classify-hd">优惠券列表</view>
 				<view class="recycling-classify-bd">
 					<scroll-view scroll-y class="m">
-						<view class="item" @click="tabMItem(-1,'-9998')"><view :class="couponIndex == -9998?'item-on':''">不使用</view></view>
-						<view class="item" v-for="(a,i) in couponList" :key="i" @click="tabMItem(a,i)"><view :class="couponIndex == i?'item-on':''">{{a.name}}</view></view>
+						<view class="item" @click="tabMItem(-1,'-9998')">
+							<view :class="couponIndex == -9998?'item-on':''">不使用</view>
+						</view>
+						<view class="item" v-for="(a,i) in couponList" :key="i" @click="tabMItem(a,i)">
+							<view :class="couponIndex == i?'item-on':''">{{a.name}}</view>
+						</view>
 					</scroll-view>
 				</view>
-			</view>	
+			</view>
 		</u-popup>
 		<!-- 时间选择器 -->
-		<u-picker mode="time" :params="params" v-model="show" confirm-color="#FE483B" :show-time-tag="false" @confirm="confirm"></u-picker>
-	</view>
-</template>
+		<u-picker mode="time" :params="params" v-model="show" confirm-color="#FE483B" :show-time-tag="false"
+			@confirm="confirm"></u-picker>
+	</view>
+</template>
 <script>
-    import * as newFunApi from '@/api/newFun'
-	export default{
-		data(){
+	import * as newFunApi from '@/api/newFun'
+	export default {
+		data() {
 			return {
-				params: {
-					year: true,
-					month: true,
-					day: true,
-					hour: true,
-					minute: true,
-					second: true
+				params: {
+					year: true,
+					month: true,
+					day: true,
+					hour: true,
+					minute: true,
+					second: true
 				},
 				userInfo: {},
 				orderInfo: {},
@@ -157,18 +162,17 @@
 				pay_price: 0,
 				show2: true,
 				isShow: false,
-				show: false,
+				show: false,
+				addrshow: false,
 				info: {},
 				type: 1,
-				isClick: true,
+				isClick: true,
 				radioValue: "男士",
-				couponIndex: -9999,
-				tabIndex: 1,
-				fileList: [
-					{
-						url: 'http://pics.sc.chinaz.com/files/pic/pic9/201912/hpic1886.jpg',
-					}
-				],
+				couponIndex: -9999,
+				tabIndex: 1,
+				fileList: [{
+					url: 'http://pics.sc.chinaz.com/files/pic/pic9/201912/hpic1886.jpg',
+				}],
 				tabMIndex: 0,
 				address: "",
 				coupon_id: "",
@@ -179,529 +183,594 @@
 				region: [],
 				couponList: [],
 				server_id: "",
-				order_id: ""
-			}
+				order_id: ""
+			}
 		},
 		onLoad(o) {
 			this.type = o.type;
 			this.server_id = o.id;
-			if(this.type == 1 && o.id){
+			if (this.type == 1 && o.id) {
 				this.getServerCheckOrder()
 			}
-		},
+		},
 		methods: {
-			tabMItem(a,i) {
+			tabMItem(a, i) {
 				this.couponIndex = i
-				this.coupon_id = (a?a.coupon_id:"")
+				this.coupon_id = (a ? a.coupon_id : "")
 				this.isShow = false;
 				this.getServerCheckOrder(1)
 			},
 			//获取优惠券列表
 			async getServerCheckOrder(type) {
-				const { status, data } = await newFunApi.serverCheckOrder({
+				const {
+					status,
+					data
+				} = await newFunApi.serverCheckOrder({
 					server_id: this.server_id,
 					coupon_id: this.coupon_id
 				})
-				if(status == 200){
+				if (status == 200) {
 					this.info = data.info
-					this.couponList= data.coupon_list;
-					this.coupon_id= data.coupon_id
-					this.coupon_money= data.coupon_money
-					this.pay_price= data.pay_price
+					this.couponList = data.coupon_list;
+					this.coupon_id = data.coupon_id
+					this.coupon_money = data.coupon_money
+					this.pay_price = data.pay_price
 					console.log(this.couponIndex)
 				}
 			},
-			confirm(e){
-				this.server_time = e.year+"-"+e.month+'-'+e.day+" "+e.hour+"-"+e.minute+'-'+e.second
+			confirm(e) {
+				this.server_time = e.year + "-" + e.month + '-' + e.day + " " + e.hour + "-" + e.minute + '-' + e.second
+			},
+			tabItem(i) {
+				this.tabIndex = i
 			},
 			changeRegion(e) {
-				console.log(e)
-				this.region = e.detail.value
-			},
-			tabItem(i) {
-				this.tabIndex = i
+				this.addrshow = false
+				this.region = e.province.name + e.city.name + e.area.name;
 			},
-			openPage(i,a){
-				if(i == 1){
+			openPage(i, a) {
+				if (i == 1) {
 					this.show = true
-				}else if(i == 2) {
+				} else if (i == 2) {
 					this.isShow = true
-				}else if(i == 3) {
-					if(!this.server_time){
+				} else if (i == 3) {
+					if (!this.server_time) {
 						uni.showToast({
 							icon: "none",
 							title: "服务时间不能为空"
 						})
-						return ;
+						return;
 					}
-					if(!this.username){
+					if (!this.username) {
 						uni.showToast({
 							icon: "none",
 							title: "联系人不能为空"
 						})
-						return ;
+						return;
 					}
-					if(!this.mobile){
+					if (!this.mobile) {
 						uni.showToast({
 							icon: "none",
 							title: "联系号码不能为空"
 						})
-						return ;
+						return;
 					}
-					 if (!/^1[2|3|4|5|6|7|8|9]\d{9}$/.test(this.mobile)) {
+					if (!/^1[2|3|4|5|6|7|8|9]\d{9}$/.test(this.mobile)) {
 						uni.showToast({
 							icon: "none",
 							title: "联系号码格式不正确"
 						})
-						return ;
+						return;
 					}
-					if(this.region.length == 0){
+					if (this.region.length == 0) {
 						uni.showToast({
 							icon: "none",
 							title: "请选择所在城市"
 						})
-						return ;
+						return;
 					}
-					if(!this.address){
+					if (!this.address) {
 						uni.showToast({
 							icon: "none",
 							title: "详细地址不能为空"
 						})
-						return ;
+						return;
 					}
-					if(this.isClick == false){
+					if (this.isClick == false) {
 						return;
 					}
 					this.isClick = false;
 					this.toServerCreateOrder();
-				}else if(i == 5){
+				} else if (i == 5) {
 					this.remake = a
-				}else {
-					
+				} else {
+
 				}
 			},
-			
+
 			//创建订单
 			async toServerCreateOrder() {
-				let {status, data, message } = await newFunApi.serverCreateOrder({
+				let {
+					status,
+					data,
+					message
+				} = await newFunApi.serverCreateOrder({
 					server_id: this.server_id,
 					client: 'MP-WEIXIN',
-					server_address: this.region[0]+this.region[1]+this.region[2]+this.address,
+					server_address: this.region[0] + this.region[1] + this.region[2] + this.address,
 					server_time: this.server_time,
 					coupon_id: this.coupon_id,
 					remake: this.remake,
 					username: this.username,
 					mobile: this.mobile,
 				})
-				if(status == 200){
+				if (status == 200) {
 					this.isClick = true
 					this.order_id = data.order_id
 					uni.redirectTo({
-						url: "/pages/news/recycling/pay?type=fuwu&order_id="+data.order_id
+						url: "/pages/news/recycling/pay?type=fuwu&order_id=" + data.order_id
 					})
-				}else{
+				} else {
 					this.isClick = true
 					uni.showToast({
 						icon: "none",
 						title: message
 					})
-					setTimeout(()=>{
+					setTimeout(() => {
 						uni.redirectTo({
 							url: "/pages/news/recycling/orderList"
 						})
-					},2000)
+					}, 2000)
 				}
 			},
-			
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.recycling{
-		min-height: 100vh;
-		background-color: #FFFFFF;
-		padding-bottom: 130rpx;
+
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.recycling {
+		min-height: 100vh;
+		background-color: #FFFFFF;
+		padding-bottom: 130rpx;
 		overflow: hidden;
-		&-classify{
-				width: 100%;
-				overflow: hidden;
-				&-hd{
-					padding: 30rpx 60rpx;
-					position: relative;
-					font-size: 32rpx;
+
+		&-classify {
+			width: 100%;
+			overflow: hidden;
+
+			&-hd {
+				padding: 30rpx 60rpx;
+				position: relative;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #303030;
+				text-align: center;
+
+				.a {
+					display: flex;
+					align-items: center;
+					font-size: 28rpx;
 					font-weight: 500;
-					color: #303030;
+					color: #FF624F;
+					position: absolute;
+					top: 30rpx;
+					left: 40rpx;
+					z-index: 2;
+				}
+			}
+
+			&-bd {
+				overflow: hidden;
+				display: flex;
+				align-items: flex-start;
+
+				.l {
+					width: 210rpx;
+					height: 560rpx;
+					background-color: #F7F8FA;
+
+					.item {
+						text-overflow: ellipsis;
+						overflow: hidden;
+						height: 70rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #303030;
+						white-space: nowrap;
+						line-height: 70rpx;
+						padding-left: 30rpx;
+						box-sizing: border-box;
+						text-align: left;
+
+						&-on {
+							background-color: #fff;
+							font-weight: 500;
+						}
+					}
+				}
+
+				.m {
+					width: 100%;
 					text-align: center;
-					.a{
-						display: flex;
-						align-items: center;
+					max-height: 560rpx;
+
+					.item {
+						text-overflow: ellipsis;
+						overflow: hidden;
+						height: 70rpx;
 						font-size: 28rpx;
-						font-weight: 500;
-						color: #FF624F;
-						position: absolute;
-						top: 30rpx;
-						left: 40rpx;
-						z-index: 2;
+						font-weight: 400;
+						color: #303030;
+						white-space: nowrap;
+						line-height: 70rpx;
+						padding-left: 80rpx;
+						box-sizing: border-box;
+						text-align: left;
+
+						&-on {
+							color: #FF624F;
+						}
 					}
 				}
-				&-bd{
-					overflow: hidden;
-					display: flex;
-					align-items: flex-start;
-					.l{
-						width: 210rpx;
-						height: 560rpx;
-						background-color: #F7F8FA;
-						.item{
-							text-overflow: ellipsis;
-							overflow: hidden;
-							height: 70rpx;
-							font-size: 28rpx;
-							font-weight: 400;
-							color: #303030;
-							white-space: nowrap;
-							line-height: 70rpx;
-							padding-left: 30rpx;
-							box-sizing: border-box;
-							text-align: left;
-							&-on{
-								background-color: #fff;
-								font-weight: 500;
-							}
+
+				.r {
+					width: 540rpx;
+					height: 560rpx;
+
+					.item {
+						text-overflow: ellipsis;
+						overflow: hidden;
+						height: 70rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #303030;
+						white-space: nowrap;
+						line-height: 70rpx;
+						padding-left: 80rpx;
+						box-sizing: border-box;
+
+						&-on {
+							color: #FF624F;
 						}
 					}
-					.m{
+				}
+			}
+		}
+
+		.slot-btn {
+			width: 80px;
+			height: 80px;
+			background: #FFFFFF;
+			border-radius: 10rpx;
+			border: 1px solid #C0C0C0;
+			text-align: center;
+			font-size: 24rpx;
+			font-weight: 500;
+			color: #D1D1D1;
+
+			image {
+				width: 50rpx;
+				height: 50rpx;
+				margin-top: 20rpx;
+			}
+		}
+
+		&-hd {
+			width: 686rpx;
+			height: 152rpx;
+			border-radius: 8rpx;
+			overflow: hidden;
+			margin: 0 auto;
+			margin-top: 30rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		&-bd {
+			width: 690rpx;
+			min-height: 280rpx;
+			overflow: hidden;
+			margin: 0 auto;
+			margin-top: 30rpx;
+			position: relative;
+
+			.tab {
+				width: 690rpx;
+				height: 280rpx;
+
+				.b {
+					width: 100%;
+					height: 100%;
+					display: block;
+
+					image {
 						width: 100%;
-						text-align: center;
-						max-height: 560rpx;
-						.item{
-							text-overflow: ellipsis;
-							overflow: hidden;
-							height: 70rpx;
-							font-size: 28rpx;
+						height: 100%;
+						display: block;
+					}
+				}
+
+				.a {
+					width: 100%;
+					height: 98rpx;
+					position: absolute;
+					left: 0;
+					top: 0;
+					z-index: 2;
+					display: flex;
+					align-items: center;
+
+					.item {
+						flex: 1;
+						height: 100%;
+					}
+				}
+			}
+
+			.goods {
+				padding: 30rpx 35rpx;
+				overflow: hidden;
+				border-left: 1px solid #F1F1F1;
+				border-right: 1px solid #F1F1F1;
+
+				.a {
+					display: flex;
+					align-items: center;
+
+					image {
+						width: 50rpx;
+						height: 50rpx;
+						margin-right: 10rpx;
+					}
+
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #000000;
+				}
+
+				.b {
+					padding: 20rpx 0;
+					overflow: hidden;
+
+					.l {
+						display: flex;
+						align-items: center;
+						overflow: hidden;
+
+						.pic {
+							width: 182rpx;
+							height: 146rpx;
+							border-radius: 6rpx;
+							margin-right: 10rpx;
+						}
+
+						.info {
+							width: 305rpx;
+							margin-right: 20rpx;
+
+							.title {
+								font-size: 24rpx;
+								font-weight: 400;
+								color: #5C5C5C;
+							}
+
+							.address {
+								font-size: 24rpx;
+								font-weight: 400;
+								color: #5C5C5C;
+								height: 80rpx;
+								line-height: 40rpx;
+								overflow: hidden;
+							}
+
+							.time {
+								font-size: 24rpx;
+								font-weight: 400;
+								color: #5C5C5C;
+							}
+						}
+
+						.do {
+							flex: 1;
+							text-align: center;
+							font-size: 20rpx;
 							font-weight: 400;
-							color: #303030;
-							white-space: nowrap;
-							line-height: 70rpx;
-							padding-left: 80rpx;
-							box-sizing: border-box;
-							text-align: left;
-							&-on{
-								color: #FF624F;
+							color: #989898;
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+
+							image {
+								width: 30rpx;
+								height: 30rpx;
+								display: block;
+								margin: 0 auto;
+								margin-bottom: 20rpx;
 							}
 						}
 					}
-					.r{
-						width: 540rpx;
-						height: 560rpx;
-						.item{
-							text-overflow: ellipsis;
-							overflow: hidden;
-							height: 70rpx;
-							font-size: 28rpx;
-							font-weight: 400;
-							color: #303030;
-							white-space: nowrap;
-							line-height: 70rpx;
-							padding-left: 80rpx;
-							box-sizing: border-box;
-							&-on{
-								color: #FF624F;
+
+					.r {
+						display: flex;
+						align-items: flex-start;
+						overflow: hidden;
+						margin-top: 30rpx;
+
+						.pic {
+							width: 182rpx;
+							height: 146rpx;
+							border-radius: 6rpx;
+							margin-right: 10rpx;
+						}
+
+						.info {
+							width: 305rpx;
+							margin-right: 20rpx;
+
+							.title {
+								font-size: 28rpx;
+								font-weight: 400;
+								color: #212121;
+							}
+
+							.price {
+								font-size: 32rpx;
+								font-weight: 500;
+								color: #FF584D;
+								margin-top: 20rpx;
 							}
 						}
+
+						.num {
+							flex: 1;
+							text-align: center;
+							font-size: 30rpx;
+							font-weight: 400;
+							color: #989898;
+							text-align: right;
+						}
 					}
 				}
 			}
-		
-		.slot-btn{
-			width: 80px;
-			height: 80px;
-			background: #FFFFFF;
-			border-radius: 10rpx;
-			border: 1px solid #C0C0C0;
-			text-align: center;
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #D1D1D1;
-			image{
-				width: 50rpx;
-				height: 50rpx;
-				margin-top: 20rpx;
-			}
-		}
-		&-hd{
-			width: 686rpx;
-			height: 152rpx;
-			border-radius: 8rpx;
-			overflow: hidden;
-			margin: 0 auto;
-			margin-top: 30rpx;
-			image{
-				width: 100%;
-				height: 100%;
-			}
-		}
-		&-bd{
-			width: 690rpx;
-			min-height: 280rpx;
-			overflow: hidden;
-			margin: 0 auto;
-			margin-top: 30rpx;
-			position: relative;
-			.tab{
-				width: 690rpx;
-				height: 280rpx;
-				.b{
-					width: 100%;
-					height: 100%;
-						display: block;
-					image{
-						width: 100%;
-						height: 100%;
-						display: block;
-					}
-				}
-				.a{
-					width: 100%;
-					height: 98rpx;
-					position: absolute;
-					left: 0;
-					top: 0;
-					z-index: 2;
-					display: flex;
-					align-items: center;
-					.item{
-						flex: 1;
-						height: 100%;
-					}
-				}
-			}
-			.goods{
-				padding: 30rpx 35rpx;
-				overflow: hidden;
-				border-left: 1px solid #F1F1F1;
-				border-right: 1px solid #F1F1F1;
-				.a{
-					display: flex;
-					align-items: center;
-					image{
-						width: 50rpx;
-						height: 50rpx;
-						margin-right: 10rpx;
-					}
-					font-size: 28rpx;
-					font-weight: 500;
-					color: #000000;
-				}
-				.b{
-					padding: 20rpx 0;
-					overflow: hidden;
-					.l{
-						display: flex;
-						align-items: center;
-						overflow: hidden;
-						.pic{
-							width: 182rpx;
-							height: 146rpx;
-							border-radius: 6rpx;
-							margin-right: 10rpx;
-						}
-						.info{
-							width: 305rpx;
-							margin-right: 20rpx;
-							.title{
-								font-size: 24rpx;
-								font-weight: 400;
-								color: #5C5C5C;
-							}
-							.address{
-								font-size: 24rpx;
-								font-weight: 400;
-								color: #5C5C5C;
-								height: 80rpx;
-								line-height: 40rpx;
-								overflow: hidden;
-							}
-							.time{
-								font-size: 24rpx;
-								font-weight: 400;
-								color: #5C5C5C;
-							}
-						}
-						.do{
-							flex: 1;
-							text-align: center;
-							font-size: 20rpx;
-							font-weight: 400;
-							color: #989898;
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-							image{
-								width: 30rpx;
-								height: 30rpx;
-								display: block;
-								margin: 0 auto;
-								margin-bottom: 20rpx;
-							}
-						}
-					}
-					.r{
-						display: flex;
-						align-items: flex-start;
-						overflow: hidden;
-						margin-top: 30rpx;
-						.pic{
-							width: 182rpx;
-							height: 146rpx;
-							border-radius: 6rpx;
-							margin-right: 10rpx;
-						}
-						.info{
-							width: 305rpx;
-							margin-right: 20rpx;
-							.title{
-								font-size: 28rpx;
-								font-weight: 400;
-								color: #212121;
-							}
-							.price{
-								font-size: 32rpx;
-								font-weight: 500;
-								color: #FF584D;
-								margin-top: 20rpx;
-							}
-						}
-						.num{
-							flex: 1;
-							text-align: center;
-							font-size: 30rpx;
-							font-weight: 400;
-							color: #989898;
-							text-align: right;
-						}
-					}
-				}
-			}
-			.form {
-				padding: 0 40rpx;
-				overflow: hidden;
-				border-left: 1px solid #F1F1F1;
-				border-right: 1px solid #F1F1F1;
+
+			.form {
+				padding: 0 40rpx;
+				overflow: hidden;
+				border-left: 1px solid #F1F1F1;
+				border-right: 1px solid #F1F1F1;
 				border-bottom: 1px solid #F1F1F1;
-				.remark{
-					.name{
+
+				.remark {
+					.name {
 						font-size: 28rpx;
 						font-weight: 400;
 						color: #313131;
 					}
-					.xu{
+
+					.xu {
 						display: flex;
 						flex-wrap: wrap;
 						overflow: hidden;
-						.li{
+
+						.li {
 							line-height: 52rpx;
 							background: #FFFFFF;
 							border-radius: 6rpx;
 							border: 1px solid #EDEDED;
 							padding: 0 20rpx;
 							margin-right: 20rpx;
-							text-align: center;
-							font-size: 24rpx;
-							font-weight: 400;
+							text-align: center;
+							font-size: 24rpx;
+							font-weight: 400;
 							color: #949494;
 							margin-top: 20rpx;
 						}
 					}
-					.content{
+
+					.content {
 						padding: 20rpx 0 50rpx;
 						font-size: 28rpx;
 						color: #212121;
 					}
 				}
-				.photo{
+
+				.photo {
 					padding: 20rpx 0;
 					overflow: hidden;
-				}
-				.item{
-					padding: 20rpx 0;
-					border-bottom: 1px solid #F4F4F4;
-					display: flex;
-					align-items: center;
-					.a{
-						width: 160rpx;
-						font-size: 28rpx;
-						font-weight: 400;
-						color: #313131;
-						line-height: 45rpx;
-					}
-					.b{
-						flex: 1;
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						.select{
-							flex: 1;
-							font-size: 28rpx;
-							font-weight: 400;
-							line-height: 45rpx;
-							color: #949494;
-							&-on{
-								color: #212121;
-							}
-						}
-						.box{
-							flex: 1;
-							font-size: 28rpx;
-							color: #212121;
-							line-height: 45rpx;
+				}
+
+				.item {
+					padding: 20rpx 0;
+					border-bottom: 1px solid #F4F4F4;
+					display: flex;
+					align-items: center;
+
+					.a {
+						width: 160rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #313131;
+						line-height: 45rpx;
+					}
+
+					.b {
+						flex: 1;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+
+						.select {
+							flex: 1;
+							font-size: 28rpx;
+							font-weight: 400;
+							line-height: 45rpx;
+							color: #949494;
+
+							&-on {
+								color: #212121;
+							}
+						}
+
+						.box {
+							flex: 1;
+							font-size: 28rpx;
+							color: #212121;
+							line-height: 45rpx;
 						}
-						.box1{
+
+						.box1 {
 							width: 160rpx;
 							font-size: 28rpx;
 							color: #212121;
 							line-height: 45rpx;
-						}
-						.radio{
-							display: flex;
-							align-items: center;
-							justify-content: flex-end;
-							flex: 1;
-							border-left: 1px solid #E6E6E6;
-						}
+						}
+
+						.radio {
+							display: flex;
+							align-items: center;
+							justify-content: flex-end;
+							flex: 1;
+							border-left: 1px solid #E6E6E6;
+						}
 					}
-				}
-			}
-		}
-		&-fd{
-			width: 100%;
-			height: 120rpx;
-			background-color: #FFFFFF;
-			padding: 25rpx 25rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			box-sizing: border-box;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			z-index: 99;
-			.a{
-				font-size: 28rpx;
-				font-weight: 400;
-				color: #727272;
-			}
-			.b{
-				width: 502rpx;
-				height: 88rpx;
-				line-height: 88rpx;
-				background: #FE483B;
-				border-radius: 88rpx; 
-				text-align: center;
-				font-size: 28rpx;
-				font-weight: 600;
-				color: #FFFFFF;
-			}
-		}
-	}
-</style>
\ No newline at end of file
+				}
+			}
+		}
+
+		&-fd {
+			width: 100%;
+			height: 120rpx;
+			background-color: #FFFFFF;
+			padding: 25rpx 25rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			z-index: 99;
+
+			.a {
+				font-size: 28rpx;
+				font-weight: 400;
+				color: #727272;
+			}
+
+			.b {
+				width: 502rpx;
+				height: 88rpx;
+				line-height: 88rpx;
+				background: #FE483B;
+				border-radius: 88rpx;
+				text-align: center;
+				font-size: 28rpx;
+				font-weight: 600;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>
diff --git a/pages/news/recycling/detail.vue b/pages/news/recycling/detail.vue
index b920f2a..14e8c11 100644
--- a/pages/news/recycling/detail.vue
+++ b/pages/news/recycling/detail.vue
@@ -1,530 +1,627 @@
-<template>
-	<view class="recycling">
-		<view class="recycling-swiper">
-			<!-- <u-swiper :list="list" mode="number" height="750" indicator-pos="bottomRight"></u-swiper> -->
-			<image v-if="type==1" :src="info.server_image" mode="widthFix" style="width: 100%; max-height: 750rpx;"></image>
-			<image v-else :src="info.recovery_image" mode="widthFix" style="width: 100%; max-height: 750rpx;"></image>
-		</view>
-		<view class="recycling-hd">
-			<view class="a">
-				<view class="price" v-if="type== 1">￥<text>{{info.server_price}}</text></view>
-				<view class="price" v-else>免支付预约</view>
-				<view class="exchange">已售{{info.sold}}</view>
-			</view>
-			<view class="b" v-if="type== 1">{{info.server_name}}</view>
-			<view class="c" v-if="type== 1">{{info.server_category}}</view>
-			<view class="b" v-if="type== 2">{{info.recovery_name}}</view>
-			<view class="c" v-if="type== 2">{{info.recovery_category}}</view>
-			<view class="d">
-				<view class="l">
-					<image :src="$picUrl+'/static/news/icon-recycling-05.png'"></image>24小时客服
-				</view>
-				<view class="l">
-					<image :src="$picUrl+'/static/news/icon-recycling-05.png'"></image>未服务全额退
-				</view>
-				<view class="l">
-					<image :src="$picUrl+'/static/news/icon-recycling-05.png'"></image>未额外收费
-				</view>
-				<view class="l">
-					<image :src="$picUrl+'/static/news/icon-recycling-05.png'"></image>全程保障
-				</view>
-			</view>
-		</view>
-		<view class="recycling-select">
-			<view class="item">
-				<view class="a">已选</view>
-				<view class="b" v-if="type == 1">上门服务</view>
-				<view class="b" v-else @click="openPage(2)">{{selector[tabIndex]}}<u-icon name="arrow-right"></u-icon></view>
-			</view>
-			<view class="item" v-if="type == 2">
-				<view class="a">门店</view>
+<template>
+	<view class="recycling">
+		<view class="recycling-swiper">
+			<!-- <u-swiper :list="list" mode="number" height="750" indicator-pos="bottomRight"></u-swiper> -->
+			<image v-if="type==1" :src="info.server_image" mode="widthFix" style="width: 100%; max-height: 750rpx;">
+			</image>
+			<image v-else :src="info.recovery_image" mode="widthFix" style="width: 100%; max-height: 750rpx;"></image>
+		</view>
+		<view class="recycling-hd">
+			<view class="a">
+				<view class="price" v-if="type== 1">￥<text>{{info.server_price}}</text></view>
+				<view class="b" v-if="type== 2">{{info.recovery_name}}</view>
+				<view class="exchange">已售{{info.sold}}</view>
+			</view>
+			<view class="b" v-if="type== 1">{{info.server_name}}</view>
+			<view class="c" v-if="type== 1">{{info.server_category}}</view>
+			<!-- <view class="c" v-if="type== 2">{{info.recovery_category}}</view> -->
+			<view class="d">
+				<view class="l">
+					<image :src="$picUrl+'/static/news/icon-recycling-05.png'"></image>24小时客服
+				</view>
+				<view class="l">
+					<image :src="$picUrl+'/static/news/icon-recycling-05.png'"></image>未服务全额退
+				</view>
+				<view class="l">
+					<image :src="$picUrl+'/static/news/icon-recycling-05.png'"></image>未额外收费
+				</view>
+				<view class="l">
+					<image :src="$picUrl+'/static/news/icon-recycling-05.png'"></image>全程保障
+				</view>
+			</view>
+		</view>
+		<view class="recycling-select">
+			<view class="item">
+				<view class="a">已选</view>
+				<view class="b" v-if="type == 1">上门服务</view>
+				<view class="b" v-else @click="openPage(2)">{{selector[tabIndex]}}
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+			<view class="item" v-if="type == 2">
+				<view class="a">门店</view>
 				<view class="b" @click="openPage(4)">
-					{{storeIndex>=0?storeList[storeIndex].shop_name:'请选择门店'}}<u-icon name="arrow-right"></u-icon>
-				</view>
-			</view>
-			<view class="item">
-				<view class="a">服务</view>
-				<view class="b">优质服务全程跟踪</view>
-			</view>
-		</view>
-		<view class="recycling-chat" hidden>
-			<view class="a">
-				<view class="l">用户评价<text>（30）</text></view>
-				<view class="r">查看更多 <u-icon name="arrow-right"></u-icon></view>
-			</view>
-			<view class="b">
-				<view class="item">全部12</view>
-				<view class="item">沟通愉快4</view>
-			</view>
-			<view class="c">
-				<view class="item" v-for="i in 5" :key="i">
-					<view class="name">
-						<image :src="$picUrl+'/static/news/avater.png'"></image>Shark特
-					</view>
-					<view class="desc">非常棒，讲解细致，下次还来！</view>
-				</view>
-			</view>
-		</view>
-		<view class="recycling-bd">
-			<view class="title">产品详情</view>
-			<view class="conten" style="margin-top: 20rpx;" v-html="info.content"></view>
-		</view>
-		<view class="recycling-fd">
-			<view class="a" v-if="isToken">
-				<image :src="$picUrl+'/static/news/icon-recycling-06.png'"></image>客服
-				<button open-type="contact"></button>
+					{{storeIndex>=0?storeList[storeIndex].shop_name:'请选择门店'}}
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+			<view class="item">
+				<view class="a">服务</view>
+				<view class="b" @click="getCarouselList()">
+					<text v-html="serviceContent"></text>
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+		</view>
+		<view class="recycling-chat" hidden>
+			<view class="a">
+				<view class="l">用户评价<text>（30）</text></view>
+				<view class="r">查看更多 <u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+			<view class="b">
+				<view class="item">全部12</view>
+				<view class="item">沟通愉快4</view>
+			</view>
+			<view class="c">
+				<view class="item" v-for="i in 5" :key="i">
+					<view class="name">
+						<image :src="$picUrl+'/static/news/avater.png'"></image>Shark特
+					</view>
+					<view class="desc">非常棒，讲解细致，下次还来！</view>
+				</view>
+			</view>
+		</view>
+		<view class="recycling-bd">
+			<view class="title">产品详情</view>
+			<view class="conten" style="margin-top: 20rpx;" v-html="info.content"></view>
+		</view>
+		<view class="recycling-fd">
+			<view class="a" v-if="isToken">
+				<image :src="$picUrl+'/static/news/icon-recycling-06.png'"></image>客服
+				<button open-type="contact"></button>
 			</view>
 			<view class="a" v-else @click="openPage(6)">
 				<image :src="$picUrl+'/static/news/icon-recycling-06.png'"></image>客服
 			</view>
-			<!-- 10普通用户20会员30分销商40店主 -->
-			<template v-if="isToken == false || userInfo.user_type <= 20">
+			<!-- 10普通用户20会员30分销商40店主 -->
+			<!-- <template v-if="isToken == false || userInfo.user_type <= 20"> -->
+			<template v-if="isToken == false || userInfo.user_type <= 100">
 				<view class="c" v-if="type== 1" @click="openPage(3)">立即预约</view>
 				<view class="c" v-else @click="openPage(5)">立即预约</view>
 			</template>
-			<template v-else>
+			<!-- <template v-else>
 				<view class="c">只对普通用户与会员用户预约</view>
-			</template>
-		</view>
-        <u-picker v-model="isShow" mode="selector" :range="selector" @confirm="confirm"></u-picker>
+			</template> -->
+		</view>
+		<u-picker v-model="isShow" mode="selector" :range="selector" @confirm="confirm"></u-picker>
 		<!-- 选择门店 -->
 		<u-popup v-model="isShow1" mode="bottom" border-radius="12" mask-close-able="false" closeable>
 			<view class="recycling-classify">
 				<view class="recycling-classify-hd">门店列表</view>
 				<view class="recycling-classify-bd">
 					<scroll-view scroll-y class="m">
-						<view class="item" v-for="(a,i) in storeList" :key="i" @click="tabMItem(a,i)"><view :class="storeIndex == i?'item-on':''">{{a.shop_name}}</view></view>
+						<view class="item" v-for="(a,i) in storeList" :key="i" @click="tabMItem(a,i)">
+							<view :class="storeIndex == i?'item-on':''">{{a.shop_name}}</view>
+						</view>
 					</scroll-view>
 				</view>
-			</view>	
-		</u-popup>
-	</view>
-</template>
+			</view>
+		</u-popup>
+	</view>
+</template>
 <script>
-	import * as newFunApi from '@/api/newFun'
-	export default{
-		data(){
-			return {
-				addressInfo: {},
-				tabIndex: 0,
-				isShow: false,
-				selector: ["门店回收","上门回收","邮寄回收"],
-				type: 1,
+	import * as newFunApi from '@/api/newFun'
+	import * as Api from '@/api/help'
+	export default {
+		data() {
+			return {
+				addressInfo: {},
+				tabIndex: 0,
+				isShow: false,
+				selector: ["门店回收", "上门回收", "邮寄回收"],
+				type: 1,
 				info: {},
 				storeInfo: {},
 				isShow1: false,
-				storeList:[],
+				storeList: [],
 				storeIndex: -1,
 				isToken: false,
-				userInfo: {}
-			}
-		},
-		onLoad(o) {
-			let info = uni.getStorageSync("getInfo");
-			if(info.content){
-				info.content.replace(/style=""/g,'').replace(/<img src=/g,'<img style="width: 100%; display:block" src=');
-			}
-			this.info = info;
-			this.type = o.type
-			uni.setNavigationBarTitle({
-				title: o.type == 1?"服务详情": '上门回收'
+				userInfo: {},
+				serviceContent: '优质服务全程跟踪'
+			}
+		},
+		onLoad(o) {
+			let info = uni.getStorageSync("getInfo");
+			if (info.content) {
+				info.content.replace(/style=""/g, '').replace(/<img src=/g,
+					'<img style="width: 100%; display:block" src=');
+			}
+			this.info = info;
+			this.type = o.type
+			uni.setNavigationBarTitle({
+				title: o.type == 1 ? "服务详情" : '旧物回收'
 			})
-			
+
 		},
 		onShow() {
-			if(uni.getStorageSync("AccessToken")){
+			if (uni.getStorageSync("AccessToken")) {
 				this.getList()
 				this.userInfo = uni.getStorageSync("userInfo");
 				this.isToken = true;
-			}else{
+			} else {
 				this.userInfo = {}
 				this.isToken = false;
 			}
-			
-		},
-		methods: {
-			//获取门店列表
-			async getList() {
-				const { status, data } = await newFunApi.storeList({
+
+		},
+		methods: {
+			// 获取预售规则
+			getCarouselList(type) {
+				const app = this;
+				Api.getAgreement({
+						type: 'presale_rule'
+					})
+					.then(result => {
+						let content = result.data.detail.content || '';
+						if (content) {
+							content = content.replace(/style=""/g, '').replace(/<img src=/g,
+								'<img style="width: 100%; display:block" src=')
+						}
+						this.serviceContent = this.setText(content)
+					})
+					.finally(() => app.isLoading = false)
+			},
+			setText(val) {
+				if (val != null && val != "") {
+					var re1 = new RegExp("<.+?>|&.+?;", "g"); //匹配html标签的正则表达式，"g"是搜索匹配多个符合的内容
+					var msg = val.replace(re1, ""); //执行替换成空字符
+					msg = msg.replace(/\s/g, ""); //去掉所有的空格（中文空格、英文空格都会被替换）
+					msg = msg.replace(/[\r\n]/g, ""); //去掉所有的换行符
+					return msg.substr(0, 100); //获文本文字内容的前100个字符
+				} else return ''
+			},
+			//获取门店列表
+			async getList() {
+				const {
+					status,
+					data
+				} = await newFunApi.storeList({
 					platform: 'H5'
-				})
-				if(status == 200){
-					this.storeList = data.list
-				}
-			},
-			openPage(index) {
-				if(index == 2){
-					this.isShow = true;
-				}else if(index == 3){
-					if(!uni.getStorageSync("AccessToken")){
-						uni.navigateTo({
-							url: "/pages/login/index"
-						})
-						return ;
-					}
-					uni.navigateTo({
-						url: "/pages/news/recycling/confirm?tabIndex="+this.tabIndex+"&id="+this.info.server_id+"&type="+this.type
-					})
-				}else if(index == 5){
-					if(!uni.getStorageSync("AccessToken")){
-						uni.navigateTo({
-							url: "/pages/login/index"
-						})
-						return ;
+				})
+				if (status == 200) {
+					this.storeList = data.list
+				}
+			},
+			openPage(index) {
+				if (index == 2) {
+					this.isShow = true;
+				} else if (index == 3) {
+					if (!uni.getStorageSync("AccessToken")) {
+						uni.navigateTo({
+							url: "/pages/login/index"
+						})
+						return;
 					}
-					if(this.storeInfo && this.storeInfo.shop_id){
-						uni.setStorageSync("storeHsInfo",this.storeInfo)
+					uni.navigateTo({
+						url: "/pages/news/recycling/confirm?tabIndex=" + this.tabIndex + "&id=" + this.info
+							.server_id + "&type=" + this.type
+					})
+				} else if (index == 5) {
+					if (!uni.getStorageSync("AccessToken")) {
 						uni.navigateTo({
-							url: "/pages/news/recycling/confirm1?tabIndex="+this.tabIndex+"&id="+this.info.recovery_id+"&type="+this.type
+							url: "/pages/login/index"
 						})
-					}else{
+						return;
+					}
+					if (this.storeInfo && this.storeInfo.shop_id) {
+						uni.setStorageSync("storeHsInfo", this.storeInfo)
+						uni.navigateTo({
+							url: "/pages/news/recycling/confirm1?tabIndex=" + this.tabIndex + "&id=" + this.info
+								.recovery_id + "&type=" + this.type
+						})
+					} else {
 						uni.showToast({
 							title: '请选择门店',
 							icon: "none",
 						})
-					}
-					
-				}else if(index == 4){
-					if(!uni.getStorageSync("AccessToken")){
+					}
+
+				} else if (index == 4) {
+					if (!uni.getStorageSync("AccessToken")) {
 						uni.navigateTo({
 							url: "/pages/login/index"
 						})
-						return ;
-					}
-					this.isShow1 = true
-				}else if(index == 6){
+						return;
+					}
+					this.isShow1 = true
+				} else if (index == 6) {
 					uni.navigateTo({
 						url: "/pages/login/index"
-					})
-				}
+					})
+				}
 			},
-			tabMItem(a,i){
+			tabMItem(a, i) {
 				this.storeInfo = a;
 				this.storeIndex = i;
 				this.isShow1 = false
-			},
-			confirm(e){
-				this.tabIndex = e[0]
-			},
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.recycling{
-		padding-bottom: 130rpx;
+			},
+			confirm(e) {
+				this.tabIndex = e[0]
+			},
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.conten {
 		overflow: hidden;
-		&-classify{
-				width: 100%;
-				overflow: hidden;
-				&-hd{
-					padding: 30rpx 60rpx;
-					position: relative;
-					font-size: 32rpx;
+
+		::v-deep img {
+			width: 100% !important;
+		}
+	}
+
+	.recycling {
+		padding-bottom: 130rpx;
+		overflow: hidden;
+
+		&-classify {
+			width: 100%;
+			overflow: hidden;
+
+			&-hd {
+				padding: 30rpx 60rpx;
+				position: relative;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #303030;
+				text-align: center;
+
+				.a {
+					display: flex;
+					align-items: center;
+					font-size: 28rpx;
 					font-weight: 500;
-					color: #303030;
+					color: #FF624F;
+					position: absolute;
+					top: 30rpx;
+					left: 40rpx;
+					z-index: 2;
+				}
+			}
+
+			&-bd {
+				overflow: hidden;
+				display: flex;
+				align-items: flex-start;
+
+				.l {
+					width: 210rpx;
+					height: 560rpx;
+					background-color: #F7F8FA;
+
+					.item {
+						text-overflow: ellipsis;
+						overflow: hidden;
+						height: 70rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #303030;
+						white-space: nowrap;
+						line-height: 70rpx;
+						padding-left: 30rpx;
+						box-sizing: border-box;
+						text-align: left;
+
+						&-on {
+							background-color: #fff;
+							font-weight: 500;
+						}
+					}
+				}
+
+				.m {
+					width: 100%;
 					text-align: center;
-					.a{
-						display: flex;
-						align-items: center;
+					max-height: 560rpx;
+
+					.item {
+						text-overflow: ellipsis;
+						overflow: hidden;
+						height: 70rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #303030;
+						white-space: nowrap;
+						line-height: 70rpx;
+						padding-left: 80rpx;
+						box-sizing: border-box;
+						text-align: left;
+
+						&-on {
+							color: #FF624F;
+						}
+					}
+				}
+
+				.r {
+					width: 540rpx;
+					height: 560rpx;
+
+					.item {
+						text-overflow: ellipsis;
+						overflow: hidden;
+						height: 70rpx;
 						font-size: 28rpx;
+						font-weight: 400;
+						color: #303030;
+						white-space: nowrap;
+						line-height: 70rpx;
+						padding-left: 80rpx;
+						box-sizing: border-box;
+
+						&-on {
+							color: #FF624F;
+						}
+					}
+				}
+			}
+		}
+
+
+		&-hd {
+			width: 720rpx;
+			min-height: 80rpx;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+			margin: 0 auto;
+			margin-top: 20rpx;
+			padding: 25rpx;
+			box-sizing: border-box;
+
+			.a {
+				display: flex;
+				align-items: baseline;
+				justify-content: space-between;
+
+				.price {
+					font-size: 32rpx;
+					font-weight: 500;
+					color: #ED2B00;
+
+					text {
+						margin-left: 10rpx;
+						font-size: 48rpx;
+					}
+				}
+
+				.exchange {
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #989898;
+				}
+			}
+
+			.b {
+				font-size: 28rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+				line-height: 43rpx;
+			}
+
+			.c {
+				font-size: 28rpx;
+				color: #989898;
+				line-height: 43rpx;
+			}
+
+			.d {
+				display: flex;
+				align-items: center;
+				font-size: 20rpx;
+				font-weight: 400;
+				color: #CDA55E;
+				margin-top: 10rpx;
+
+				.l {
+					display: flex;
+					align-items: center;
+					margin-right: 20rpx;
+				}
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+				}
+			}
+		}
+
+		&-select {
+			width: 720rpx;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+			margin: 0 auto;
+			margin-top: 20rpx;
+			padding: 15rpx 25rpx;
+			box-sizing: border-box;
+
+			.item {
+				padding: 12rpx 0;
+				display: flex;
+				align-items: center;
+				overflow: hidden;
+
+				.a {
+					width: 100rpx;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #C4C4C4;
+				}
+
+				.b {
+					flex: 1;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #3D3D3D;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+				}
+			}
+		}
+
+		&-chat {
+			width: 720rpx;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+			margin: 0 auto;
+			margin-top: 20rpx;
+			padding: 15rpx 25rpx;
+			box-sizing: border-box;
+
+			.a {
+				display: flex;
+				align-items: baseline;
+				justify-content: space-between;
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #000000;
+				padding-top: 10rpx;
+
+				.l {
+					text {
+
+						font-size: 28psx;
+						font-family: PingFang SC, PingFang SC;
 						font-weight: 500;
-						color: #FF624F;
-						position: absolute;
-						top: 30rpx;
-						left: 40rpx;
-						z-index: 2;
+						color: #909090;
 					}
 				}
-				&-bd{
-					overflow: hidden;
+
+				.r {
+					flex: 1;
 					display: flex;
-					align-items: flex-start;
-					.l{
-						width: 210rpx;
-						height: 560rpx;
-						background-color: #F7F8FA;
-						.item{
-							text-overflow: ellipsis;
-							overflow: hidden;
-							height: 70rpx;
-							font-size: 28rpx;
-							font-weight: 400;
-							color: #303030;
-							white-space: nowrap;
-							line-height: 70rpx;
-							padding-left: 30rpx;
-							box-sizing: border-box;
-							text-align: left;
-							&-on{
-								background-color: #fff;
-								font-weight: 500;
-							}
-						}
+					align-items: center;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #909090;
+				}
+			}
+
+			.b {
+				overflow: hidden;
+				width: 100%;
+				display: flex;
+				flex-wrap: wrap;
+				padding: 10rpx 0;
+
+				.item {
+					line-height: 50rpx;
+					background: #FFE7E7;
+					border-radius: 8rpx;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #515151;
+					padding: 0 20rpx;
+					margin-right: 20rpx;
+					margin-top: 20rpx;
+				}
+			}
+
+			.c {
+				.item {
+					padding: 20rpx 0;
+					border-top: 1px solid #f3f3f3;
+
+					&:first-child {
+						border-top: 1px solid #FFFFFF;
 					}
-					.m{
-						width: 100%;
-						text-align: center;
-						max-height: 560rpx;
-						.item{
-							text-overflow: ellipsis;
-							overflow: hidden;
-							height: 70rpx;
-							font-size: 28rpx;
-							font-weight: 400;
-							color: #303030;
-							white-space: nowrap;
-							line-height: 70rpx;
-							padding-left: 80rpx;
-							box-sizing: border-box;
-							text-align: left;
-							&-on{
-								color: #FF624F;
-							}
+
+					overflow: hidden;
+
+					.name {
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #515151;
+						display: flex;
+						align-items: center;
+
+						image {
+							width: 75rpx;
+							height: 75rpx;
+							border-radius: 50%;
+							margin-right: 20rpx;
 						}
 					}
-					.r{
-						width: 540rpx;
-						height: 560rpx;
-						.item{
-							text-overflow: ellipsis;
-							overflow: hidden;
-							height: 70rpx;
-							font-size: 28rpx;
-							font-weight: 400;
-							color: #303030;
-							white-space: nowrap;
-							line-height: 70rpx;
-							padding-left: 80rpx;
-							box-sizing: border-box;
-							&-on{
-								color: #FF624F;
-							}
-						}
+
+					.desc {
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #515151;
+						line-height: 45rpx;
+						margin-top: 20rpx;
 					}
 				}
+
 			}
-		
-		
-		&-hd{
-			width: 720rpx;
-			min-height: 222rpx;
-			background: #FFFFFF;
-			border-radius: 8rpx;
-			margin: 0 auto;
-			margin-top: 20rpx;
-			padding: 25rpx;
-			box-sizing: border-box;
-			.a{
-				display: flex;
-				align-items: baseline;
-				justify-content: space-between;
-				.price{
-					font-size: 32rpx;
-					font-weight: 500;
-					color: #ED2B00;
-					text{
-						margin-left: 10rpx;
-						font-size: 48rpx;
-					}
-				}
-				.exchange{
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #989898;
-				}
-			}
-			.b{
-				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #000000;
-				line-height: 43rpx;
-			}
-			.c{
-				font-size: 28rpx;
-				color: #989898;
-				line-height: 43rpx;
-			}
-			.d{
-				display: flex;
-				align-items: center;
-				font-size: 20rpx;
-				font-weight: 400;
-				color: #CDA55E;
-				margin-top: 10rpx;
-				.l{
-					display: flex;
-					align-items: center;
-					margin-right: 20rpx;
-				}
-				image{
-					width: 40rpx;
-					height: 40rpx;
-				}
-			}
-		}
-		&-select{
-			width: 720rpx;
-			background: #FFFFFF;
-			border-radius: 8rpx;
-			margin: 0 auto;
-			margin-top: 20rpx;
-			padding: 15rpx 25rpx;
-			box-sizing: border-box;
-			.item{
-				padding: 12rpx 0;
-				display: flex;
-				align-items: center;
-				overflow: hidden;
-				.a{
-					width: 100rpx;
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #C4C4C4;
-				}
-				.b{
-					flex: 1;
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #3D3D3D;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-				}
-			}
-		}
-		&-chat{
-			width: 720rpx;
-			background: #FFFFFF;
-			border-radius: 8rpx;
-			margin: 0 auto;
-			margin-top: 20rpx;
-			padding: 15rpx 25rpx;
-			box-sizing: border-box;
-			.a{
-				display: flex;
-				align-items: baseline;
-				justify-content: space-between;
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #000000;
-				padding-top: 10rpx;
-				.l{
-					text{
-						
-						font-size: 28psx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 500;
-						color: #909090;
-					}
-				}
-				.r{
-					flex: 1;
-					display: flex;
-					align-items: center;
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #909090;
-				}
-			}
-			.b{
-				overflow: hidden;
-				width: 100%;
-				display: flex;
-				flex-wrap: wrap;
-				padding: 10rpx 0;
-				.item{
-					line-height: 50rpx;
-					background: #FFE7E7;
-					border-radius: 8rpx;
-					font-size: 28rpx;
-					font-weight: 400;
-					color: #515151;
-					padding: 0 20rpx;
-					margin-right: 20rpx;
-					margin-top: 20rpx;
-				}				
-			}
-			.c{
-				.item{
-					padding: 20rpx 0;
-					border-top: 1px solid #f3f3f3;
-					&:first-child{
-						border-top: 1px solid #FFFFFF;
-					}
-					overflow: hidden;
-					.name{
-						font-size: 28rpx;
-						font-weight: 400;
-						color: #515151;
-						display: flex;
-						align-items: center;
-						image{
-							width: 75rpx;
-							height: 75rpx;
-							border-radius: 50%;
-							margin-right: 20rpx;
-						}
-					}
-					.desc{
-						font-size: 28rpx;
-						font-weight: 400;
-						color: #515151;
-						line-height: 45rpx;
-						margin-top: 20rpx;
-					}
-				}
-				
-			}
-		}
-		&-bd{
-			width: 720rpx;
-			background: #FFFFFF;
-			border-radius: 8rpx;
-			margin: 0 auto;
-			margin-top: 20rpx;
-			padding: 25rpx 25rpx;
-			box-sizing: border-box;
-			.a{
-				font-size: 32rpx;
-				font-weight: 500;
-				color: #000000;
-			}
-			.b{
-				width: 100%;
-				padding: 20rpx 0;
-				image{
-					width: 100%;
-				}
-			}
-		}
-		&-fd{
-			width: 100%;
-			height: 120rpx;
-			background-color: #FFFFFF;
-			padding: 25rpx 20rpx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			box-sizing: border-box;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			z-index: 99;
-			.a{
-				width: 100rpx;
-				text-align: center;
-				font-size: 20rpx;
-				font-weight: 400;
+		}
+
+		&-bd {
+			width: 720rpx;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+			margin: 0 auto;
+			margin-top: 20rpx;
+			padding: 25rpx 25rpx;
+			box-sizing: border-box;
+
+			.a {
+				font-size: 32rpx;
+				font-weight: 500;
+				color: #000000;
+			}
+
+			.b {
+				width: 100%;
+				padding: 20rpx 0;
+
+				image {
+					width: 100%;
+				}
+			}
+		}
+
+		&-fd {
+			width: 100%;
+			height: 120rpx;
+			background-color: #FFFFFF;
+			padding: 25rpx 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			box-sizing: border-box;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			z-index: 99;
+
+			.a {
+				width: 100rpx;
+				text-align: center;
+				font-size: 20rpx;
+				font-weight: 400;
 				color: #3D3D3D;
-				position: relative;
-				image{
-					width: 40rpx;
-					height: 40rpx;
-					display: block;
-					margin: 0 auto;
+				position: relative;
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					display: block;
+					margin: 0 auto;
 				}
-				button{
+
+				button {
 					width: 100%;
 					height: 100%;
 					position: absolute;
@@ -532,32 +629,34 @@
 					top: 0;
 					z-index: 2;
 					opacity: 0;
-				}
-			}
-			.b{
-				width: 200rpx;
-				height: 78rpx;
-				line-height: 78rpx;
-				background: #FF9E2B;
-				border-radius: 78rpx; 
-				text-align: center;
-				font-size: 24rpx;
-				font-weight: 600;
-				color: #FFFFFF;
-				margin-left: 20rpx;
-			}
-			.c{
-				width: 500rpx;
-				height: 78rpx;
-				line-height: 78rpx;
-				background: linear-gradient(102deg, #FE5E06 0%, #F3221A 100%);
-				border-radius: 78rpx; 
-				text-align: center;
-				font-size: 24rpx;
-				font-weight: 600;
-				color: #FFFFFF;
-				margin-left: 20rpx;
-			}
-		}
-	}
-</style>
\ No newline at end of file
+				}
+			}
+
+			.b {
+				width: 200rpx;
+				height: 78rpx;
+				line-height: 78rpx;
+				background: #FF9E2B;
+				border-radius: 78rpx;
+				text-align: center;
+				font-size: 24rpx;
+				font-weight: 600;
+				color: #FFFFFF;
+				margin-left: 20rpx;
+			}
+
+			.c {
+				width: 500rpx;
+				height: 78rpx;
+				line-height: 78rpx;
+				background: linear-gradient(102deg, #FE5E06 0%, #F3221A 100%);
+				border-radius: 78rpx;
+				text-align: center;
+				font-size: 24rpx;
+				font-weight: 600;
+				color: #FFFFFF;
+				margin-left: 20rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/news/recycling/index.vue b/pages/news/recycling/index.vue
index 5ad41a2..4b5a6c8 100644
--- a/pages/news/recycling/index.vue
+++ b/pages/news/recycling/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="recycling">
 		<view class="recycling-navbar">
-			<u-navbar title="上门回收" :border-bottom="false" :background="isScroll?background:background1"></u-navbar>
+			<u-navbar title="旧物回收" :border-bottom="false" :background="isScroll?background:background1"></u-navbar>
 		</view>
 		<view class="recycling-hd"></view>
 		<view class="recycling-notice">
diff --git a/pages/news/user/vip.vue b/pages/news/user/vip.vue
index f9e4718..1e31ab9 100644
--- a/pages/news/user/vip.vue
+++ b/pages/news/user/vip.vue
@@ -1,11 +1,26 @@
-<template>
+<template>
 	<view class="user">
 		<view class="search">
-		 <!-- <view class="box">
+			<!-- <view class="box">
 			  <image src="/static/news/icon-search.png"></image>
 			  <input type="search" placeholder="商品名称/编码" />
 		  </view> -->
-		  <u-search placeholder="输入用户昵称/姓名/手机号" @search="searchhandle" shape="round" :show-action="false" height="60" bg-color="#ffffff" v-model="keyword"></u-search>
+			<u-search style='margin: 0 30rpx;' placeholder="输入用户昵称/姓名/手机号" @search="searchhandle" shape="round"
+				:show-action="false" height="60" bg-color="#fafafa" v-model="keyword"></u-search>
+			<view class="store-sort">
+				<view class="sort-item" :class="{ active: sortType === 'all' }" @click="handleSortType('city')">
+					<text>全部</text>
+				</view>
+				<view class="sort-item" :class="{ active: sortType === 'no' }" @click="handleSortType('all')">
+					<text>无身份</text>
+				</view>
+				<view class="sort-item" :class="{ active: sortType === 'tourist' }" @click="handleSortType('sales')">
+					<text>游客</text>
+				</view>
+				<view class="sort-item" :class="{ active: sortType === 'vip' }" @click="handleSortType('sales')">
+					<text>会员</text>
+				</view>
+			</view>
 		</view>
 		<view class="user-bd">
 			<view class="li" v-for="i in list" :key="i.user_id" @click="goVipDetails(i)">
@@ -17,163 +32,103 @@
 						<view class="m">
 							<view class="n">{{i.nick_name}}</view>
 							<view class="btn">{{i.user_type_text}}</view>
-							
+
 						</view>
 						<view class="n">
 							<view>
 								<text>{{i.mobile}}</text>
-								<image @click.stop="copyText(i.mobile)" :src="$picUrl+'/static/news/icon-copy.png'" style="margin-top:-4rpx;"></image>
+								<image @click.stop="copyText(i.mobile)" :src="$picUrl+'/static/news/icon-copy.png'"
+									style="margin:-4rpx 0 0 15rpx;"></image>
 							</view>
 							<image :src="$picUrl+'/static/news/tel.png'" @click.stop="makeCall(i.mobile)"></image>
-						</view>
-					</view>
-				<!-- 	<view class="m">
-						<view class="n">{{nick_name}}</view>
-						<view class="n">真实姓名：张三</view>
-						<view class="n">{{mobile}}<image :src="$picUrl+'/static/news/icon-copy.png'"></image></view>
+						</view>
 					</view>
-					<view class="r">
-						<view class="btn">会员</view>
-						<image :src="$picUrl+'/static/news/tel.png'"></image>
-					</view> -->
 				</view>
 				<view class="b">
 					<view class="l">余额(元）<text>¥{{i.balance?i.balance:0.00}}</text></view>
-					<view class="l">积分(分）<text>{{i.points?i.points:0}}</text></view>
+					<view class="l" style="margin-left: 100rpx;">积分(分）<text>{{i.points?i.points:0}}</text></view>
 				</view>
 			</view>
-		<!-- 	<view class="li" v-for="i in 2" :key="i">
-				<view class="a">
-					<view class="l">
-						<image :src="$picUrl+'/static/news/avater.png'"></image>
-					</view>
-					<view class="m">
-						<view class="n">昵称</view>
-						<view class="n">真实姓名：张三</view>
-						<view class="n">18089800909<image :src="$picUrl+'/static/news/avater.png'"></image></view>
-					</view>
-					<view class="r">
-						<view class="btn btn-on">游客</view>
-						<image :src="$picUrl+'/static/news/tel.png'"></image>
-					</view>
-				</view>
-				<view class="b">
-					<view class="l">余额(元）<text>¥0.00</text></view>
-					<view class="l">积分(分）<text>0.00</text></view>
-				</view>
-			</view> -->
-		</view>
-	</view>
-</template>
-
+		</view>
+	</view>
+</template>
+
 <script>
-	import * as Vip from '@/api/user/vip'
-	export default {
-		data() {
+	import * as Vip from '@/api/user/vip'
+	export default {
+		data() {
 			return {
-				keyword:'',
-				page:1,
-				total:0,
-				list:[],
-				title:'会员管理'
-			};
+				keyword: '',
+				page: 1,
+				total: 0,
+				list: [],
+				title: '会员管理',
+				sortType: 'all', // 排序类型
+			};
 		},
 		methods: {
-			searchhandle(){
-				this.list=[]
+			// 切换排序方式
+			handleSortType(newSortType) {
+				const app = this
+				app.sortType = newSortType
+				// 刷新列表数据
+				this.list = []
+				this.page = 1;
+				app.getList()
+			},
+			searchhandle() {
+				this.list = []
 				this.page = 1;
 				this.getList()
-				
+
 			},
-			async getList(){
-				let res = await Vip.getVipList({page:this.page,search:this.keyword,user_type:this.title=='会员管理'?"10,20":'30'})
-				console.log(res,"===")
+			async getList() {
+				let res = await Vip.getVipList({
+					page: this.page,
+					search: this.keyword,
+					user_type: this.title == '会员管理' ? "10,20" : '30'
+				})
+				console.log(res, "===")
 				this.list.push(...res.data.list.data);
 				this.total = res.data.list.total;
 			},
 			copyText(text) {
-			  uni.setClipboardData({
-				data: text,
-				success: () => {
-				  uni.showToast({
-					title: '复制成功',
-					icon: 'success',
-					duration: 2000
-				  });
-				},
-				fail: () => {
-				  uni.showToast({
-					title: '复制失败',
-					icon: 'none'
-				  });
-				}
-			  });
+				uni.setClipboardData({
+					data: text,
+					success: () => {
+						uni.showToast({
+							title: '复制成功',
+							icon: 'success',
+							duration: 2000
+						});
+					},
+					fail: () => {
+						uni.showToast({
+							title: '复制失败',
+							icon: 'none'
+						});
+					}
+				});
 			},
 			makeCall(phoneNumber) {
 				uni.makePhoneCall({
-				  phoneNumber: phoneNumber, // 电话号码
-					success: (res) => {
-					},
+					phoneNumber: phoneNumber, // 电话号码
+					success: (res) => {},
 					// 失败回调
-					fail: (res) => {
-				  	}
+					fail: (res) => {}
 				});
-				// uni.getSetting({
-				// 	 success(res) {
-				// 	   if (!res.authSetting['scope.makePhoneCall']) {
-				// 		 // 没有权限，需要请求用户授权
-				// 		 uni.authorize({
-				// 		   scope: 'scope.makePhoneCall',
-				// 		   success() {
-				// 			 // 用户已授权，可以拨打电话
-				// 			 uni.makePhoneCall({
-				// 			   phoneNumber: phoneNumber // 电话号码
-				// 			 });
-				// 		   },
-				// 		   fail() {
-				// 			 // 用户拒绝授权，可以引导用户开启
-				// 			 uni.showModal({
-				// 			   title: '提示',
-				// 			   content: '需要电话权限',
-				// 			   success: function(modalRes) {
-				// 				   console.log(modalRes)
-				// 				 if (modalRes.confirm) {
-				// 				   uni.openSetting({
-				// 						 success: (res) => {
-				// 							 console.log(res)
-				// 						   if (res.authSetting['scope.makePhoneCall']) {
-				// 							 uni.makePhoneCall({
-				// 							   phoneNumber: phoneNumber // 电话号码
-				// 							 });
-				// 						   }
-				// 						 }
-
-				// 				   });
-				// 				 }
-				// 			   }
-				// 			 });
-				// 		   }
-				// 		 });
-				// 	   } else {
-				// 		 // 已经有权限，直接拨打电话
-				// 		 uni.makePhoneCall({
-				// 		   phoneNumber: phoneNumber // 电话号码
-				// 		 });
-				// 	   }
-				// 	 }
-				// });
 			},
-			goVipDetails(item){
+			goVipDetails(item) {
 				let details = JSON.stringify(item)
 				uni.navigateTo({
-					url:"/pages/news/user/index?item="+details+"&title="+this.title
+					url: "/pages/news/user/index?item=" + details + "&title=" + this.title
 				})
 			}
 		},
 		onLoad(option) {
 			this.title = option.title
 			uni.setNavigationBarTitle({
-			  title: this.title
+				title: this.title
 			});
 			this.list = []
 			this.getList()
@@ -183,168 +138,212 @@
 				this.page++;
 				this.getList()
 			}
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-.user{
-	padding: 0 0 130rpx;
-	overflow: hidden;
-	.search{
-		width: 750rpx;
-		padding: 34rpx 34rpx 0 34rpx;
-		box-sizing: border-box;
-		// .box{
-		// 	padding: 15rpx 25rpx;
-		// 	box-sizing: border-box;
-		// 	display: flex;
-		// 	align-items: center;
-		// 	background: #F3F3F3;
-		// 	border-radius: 60rpx;
-		// 	image{
-		// 		width: 28rpx;
-		// 		height: 28rpx;
-		// 		margin-right: 22rpx;
-		// 	}
-		// 	input{
-		// 		flex: 1;
-		// 		font-size: 28rpx;
-		// 		line-height: 30rpx;
-		// 	}
-		// }
+		},
 	}
-	&-bd{
-		padding: 0 34rpx;
+</script>
+
+<style lang="scss" scoped>
+	.user {
+		padding: 0 0 130rpx;
 		overflow: hidden;
-		.li{
-			padding:0  12rpx;
+
+		.search {
+			width: 750rpx;
+			box-sizing: border-box;
 			background-color: #FFFFFF;
-			overflow: hidden;
-			border-radius: 8rpx;
-			margin-top: 18rpx;
-			// &:first-child{
-			// 	margin-top: 0;
-			// }
-			.a{
+
+			// 排序组件
+			.store-sort {
+				position: sticky;
+				top: var(--window-top);
 				display: flex;
-				// align-items: flex-start;
-				align-items: center;
-				justify-content: space-between;
-				padding: 15rpx 0 30rpx;
-				border-bottom: 1px solid #F2F2F2;
-				.l{
-					width: 114rpx;
-					height: 114rpx;
-					margin-right: 25rpx;
-					image{
-						width: 100%;
-						height: 100%;
-						border-radius: 50%;
+				padding: 20rpx 0;
+				font-size: 28rpx;
+				background: #fff;
+				color: #000;
+				z-index: 99;
+
+				.sort-item {
+					flex-basis: 25%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					height: 50rpx;
+
+					&.active {
+						color: #F34A40;
 					}
 				}
-				.r{
-					flex: 1;
-					// width: 98rpx;
-					// overflow: hidden;
-					.m{
-						// flex: 1;
-						// max-width: 400rpx;
-						// margin-right: 20rpx;
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						
-						.btn{
-							// width: 98rpx;
-							padding:0 10rpx;
-							height: 56rpx;
-							line-height: 56rpx;
-							background: #FFFFFF;
-							border-radius: 3px 3px 3px 3px;
-							border: 1px solid #FFA928;
-							text-align: center;
-						
-							font-family: PingFang SC, PingFang SC;
-							font-weight: 400;
-							font-size: 28rpx;
-							color: #FFA928;
-						
-							&-on{
-								border-color:#FFA928;
-								color: #FFA928;
-							}
+
+				.sort-item-price .price-arrow {
+					margin-left: 20rpx;
+					font-size: 24rpx;
+					color: #000;
+
+					.icon {
+						&.active {
+							color: #F34A40;
+						}
+
+						&.up {
+							margin-bottom: -16rpx;
+						}
+
+						&.down {
+							margin-top: -16rpx;
 						}
 					}
-					.n{
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						margin-top:20rpx;
-						text{
-							font-size: 28rpx;
-							color: #454545;
+
+				}
+
+			}
+		}
+
+		&-bd {
+			padding: 0 28rpx;
+			overflow: hidden;
+
+			.li {
+				padding: 0 28rpx;
+				background-color: #FFFFFF;
+				overflow: hidden;
+				border-radius: 8rpx;
+				margin-top: 18rpx;
+
+				// &:first-child{
+				// 	margin-top: 0;
+				// }
+				.a {
+					display: flex;
+					// align-items: flex-start;
+					align-items: center;
+					justify-content: space-between;
+					padding: 15rpx 0 30rpx;
+					border-bottom: 1px solid #F2F2F2;
+
+					.l {
+						width: 114rpx;
+						height: 114rpx;
+						margin-right: 25rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+							border-radius: 50%;
 						}
-						image{
-							width: 30rpx;
-							height: 30rpx;
-							margin-left: 10rpx;
-							vertical-align: middle;
+					}
+
+					.r {
+						flex: 1;
+
+						// width: 98rpx;
+						// overflow: hidden;
+						.m {
+							// flex: 1;
+							// max-width: 400rpx;
+							// margin-right: 20rpx;
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+
+							.btn {
+								// width: 98rpx;
+								padding: 0 10rpx;
+								height: 56rpx;
+								line-height: 56rpx;
+								background: #FFFFFF;
+								border-radius: 3px 3px 3px 3px;
+								border: 1px solid #FFA928;
+								text-align: center;
+
+								font-family: PingFang SC, PingFang SC;
+								font-weight: 400;
+								font-size: 28rpx;
+								color: #FFA928;
+
+								&-on {
+									border-color: #FFA928;
+									color: #FFA928;
+								}
+							}
 						}
+
+						.n {
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+							margin-top: 20rpx;
+
+							text {
+								font-size: 28rpx;
+								color: #454545;
+							}
+
+							image {
+								width: 40rpx;
+								height: 40rpx;
+								margin-left: 10rpx;
+								vertical-align: middle;
+							}
+						}
+
+
+						// image{
+						// 	display: block;
+						// 	width: 30rpx;
+						// 	height: 30rpx;
+						// 	float: right;
+						// 	margin-top: 20rpx;
+						// 	margin-right: 20rpx;
+						// }
 					}
-					
-					
-					// image{
-					// 	display: block;
-					// 	width: 30rpx;
-					// 	height: 30rpx;
-					// 	float: right;
-					// 	margin-top: 20rpx;
+
+					// .m{
+					// 	flex: 1;
+					// 	max-width: 400rpx;
 					// 	margin-right: 20rpx;
+					// 	.n{
+					// 		font-size: 28rpx;
+					// 		font-weight: 400;
+					// 		color: #545454;
+					// 		height: 50rpx;
+					// 		image{
+					// 			width: 30rpx;
+					// 			height: 30rpx;
+					// 			margin-left: 10rpx;
+					// 			vertical-align: middle;
+					// 			margin-top: -1px;
+					// 		}
+					// 	}
 					// }
+
 				}
-				// .m{
-				// 	flex: 1;
-				// 	max-width: 400rpx;
-				// 	margin-right: 20rpx;
-				// 	.n{
-				// 		font-size: 28rpx;
-				// 		font-weight: 400;
-				// 		color: #545454;
-				// 		height: 50rpx;
-				// 		image{
-				// 			width: 30rpx;
-				// 			height: 30rpx;
-				// 			margin-left: 10rpx;
-				// 			vertical-align: middle;
-				// 			margin-top: -1px;
-				// 		}
-				// 	}
-				// }
-				
-			}
-			.b{
-				padding-top: 20rpx;
-				padding-bottom: 20rpx;
-				overflow: hidden;
-				display: flex;
-				align-items: center;
-				.l{
-					flex: 1;
-					text-align: center;
-					font-size: 28rpx;
-					font-weight: 400;
-					color: #B1B1B1;
-					text{
-						font-size: 28rpx;
-						font-weight: 400;
-						color: #454545;
-						display: block;
-						margin-top: 12rpx;
+
+				.b {
+					padding-top: 20rpx;
+					padding-bottom: 20rpx;
+					overflow: hidden;
+					display: flex;
+					align-items: center;
+
+					.l {
+						flex: 1;
+						// text-align: center;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #B1B1B1;
+						margin-left: 140rpx;
+
+						text {
+							font-size: 28rpx;
+							font-weight: 400;
+							color: #454545;
+							display: block;
+							margin-top: 12rpx;
+						}
 					}
 				}
 			}
 		}
 	}
-}
 </style>
diff --git a/pages/news3/components/category.vue b/pages/news3/components/category.vue
index 5ca5b5b..78d9677 100644
--- a/pages/news3/components/category.vue
+++ b/pages/news3/components/category.vue
@@ -6,27 +6,27 @@
 				<view class="filterTitle">
 					请选择分类
 				</view>
-				<view class="shopItem">
-					<view class="" v-for="(item, index) in tabList" :key="index">
-						<view class="shopText Text" :class="{'active1':activeIndex.indexOf(item.category_id) > -1}"
-							@click="getShop(item,item.category_id)">
-							<text style="color: #333;font-weight: 700;">{{ item.name }}</text>
-							<image v-if="activeIndex.indexOf(item.category_id) > -1"
-								:src="$picUrl + '/static/news1/selected.png'" mode="widthFix">
-							</image>
-						</view>
-						<view class="shopItem2">
-							<view class="shopText" :class="{'active2':activeIndex.indexOf(item.category_id) > -1}"
-								@click="getShop(item,item.category_id)" v-for="(item, index) in item.children"
-								:key="index">
-								<text>{{ item.name }}</text>
+				<scroll-view scroll-y="true" class="shopItem" >
+						<view class="" v-for="(item, index) in tabList" :key="index">
+							<view class="shopText Text" :class="{'active1':activeIndex.indexOf(item.category_id) > -1}"
+								@click="getShop(item,item.category_id)">
+								<text style="color: #333;font-weight: 700;">{{ item.name }}</text>
 								<image v-if="activeIndex.indexOf(item.category_id) > -1"
 									:src="$picUrl + '/static/news1/selected.png'" mode="widthFix">
 								</image>
 							</view>
+							<view class="shopItem2">
+								<view class="shopText" :class="{'active2':activeIndex.indexOf(item.category_id) > -1}"
+									@click="getShop(item,item.category_id)" v-for="(item, index) in item.children"
+									:key="index">
+									<text>{{ item.name }}</text>
+									<image v-if="activeIndex.indexOf(item.category_id) > -1"
+										:src="$picUrl + '/static/news1/selected.png'" mode="widthFix">
+									</image>
+								</view>
+							</view>
 						</view>
-					</view>
-				</view>
+				</scroll-view>
 				<view class="btnGroup">
 					<view class="reset" @click="reset">
 						重置
@@ -80,7 +80,7 @@
 		background-color: #FF6257 !important;
 		border-color: #FF6257;
 	}
-	
+
 	.afterSales {
 		padding: 32upx;
 
@@ -142,7 +142,6 @@
 		.shopItem {
 			margin-top: 40rpx;
 			max-height: 750rpx;
-			overflow-y: auto;
 
 			.shopText {
 				margin-right: 12rpx;
diff --git a/pages/news3/vipPrice.vue b/pages/news3/vipPrice.vue
index 9df89f2..96a62ba 100644
--- a/pages/news3/vipPrice.vue
+++ b/pages/news3/vipPrice.vue
@@ -62,15 +62,17 @@
 			<view class="price_rat" v-if="type==0">
 				<view class="price_set">
 					<view class="price_txt">
-						<text>最低利润率：</text><input type="text" @input="onSetRate" :min="5" style="border: none;height: 60rpx;border-bottom: 1rpx solid #E6E6E6;padding-left: 10rpx;"
-							placeholder="请输入最低利润率" v-model="min_profit" /><text style="position: absolute;right: 10rpx;">%</text>
+						<text>最低利润：</text><input type="text" @input="onSetRate" :min="5"
+							style="border: none;height: 60rpx;border-bottom: 1rpx solid #E6E6E6;padding-left: 10rpx;"
+							placeholder="请输入最低利润" v-model="min_profit" /><text
+							style="position: absolute;right: 10rpx;">元</text>
 					</view>
 					<view class="price_bnt" @click="onSubmitProfit" :style="{'opacity': min_profit?1:0.6 }">
 						确认
 					</view>
 				</view>
 				<view class="ruleText" v-if="type==0">
-					备注：利润低于_____元的商品不展示在商城里。
+					说明：低于最低利润的商品不展示在商城里。
 				</view>
 			</view>
 		</view>
@@ -149,7 +151,7 @@
 					return this.$toast('最低利率不能低于等于0%')
 				}
 				this.min_profit = rate
-				
+
 			},
 			// 获取详情
 			async getInfor() {
@@ -275,11 +277,17 @@
 						list: list,
 						type: this.type
 					});
+					console.log(status)
 					if (status == 200) {
 						uni.showToast({
-							title: "保存成功"
+							title: "保存成功",
+							duration: 2000,
+							icon: 'none'
+
 						})
-						this.getCategory()
+						setTimeout(() => {
+							this.getCategory()
+						}, 2000);
 					}
 				}
 			},
@@ -305,7 +313,7 @@
 			// 计算利润率
 			onRate(e, index_1, index_2) {
 				let rate = Number(e.detail.value)
-				if (0 >rate) {
+				if (0 > rate) {
 					this.list[this.index_1].price_list[this.index_2].add_price_rate = ''
 					return this.$toast('最低利率不能低于等于0%')
 				}
@@ -461,7 +469,7 @@
 			height: 70rpx !important;
 			line-height: 70rpx !important;
 			margin-left: 20rpx;
-			
+
 		}
 
 		::v-deep uni-input {
diff --git a/pages/search/index.vue b/pages/search/index.vue
index 372b4b4..e1d9ac2 100644
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="container">
 		<view class="search">
-			<image  :src="$picUrl+'/static/home/search.png'"  mode="" class="searchIcon"></image>
-			<input v-model="searchValue" class="input" focus="true" placeholder="请输入您搜索的商品" type="text" />
+			<image :src="$picUrl+'/static/home/search.png'" mode="" class="searchIcon"></image>
+			<input v-model="searchValue" class="input" focus="true" placeholder="iPhone15" type="text" />
 			<view class="searchBtn" @click="getSearchInfo">
 				搜索
 			</view>
@@ -10,19 +10,21 @@
 		<view class="find">
 			<view class="findTitle">
 				<text>搜索发现</text>
-				<image src="/static/search/openEye.png" mode="widthFix" class="findIcon" v-if="showEye" @click="showEye=!showEye">
+				<image src="/static/search/openEye.png" mode="widthFix" class="findIcon" v-if="showEye"
+					@click="showEye=!showEye">
 				</image>
-				<image src="/static/search/closeEye.png" mode="widthFix" class="findIcon" v-if="!showEye" @click="showEye=!showEye">
+				<image src="/static/search/closeEye.png" mode="widthFix" class="findIcon" v-if="!showEye"
+					@click="showEye=!showEye">
 				</image>
 			</view>
-			<view class="others" @click="getHot">
+			<!-- 	<view class="others" @click="getHot">
 				换一批
-			</view>
+			</view> -->
 		</view>
 		<view class="hotSearch" v-if="showEye">
-			<view v-for="(item,index) in searchFindList" :key="index" class="hotItem" @click="searchGoods(item)">
+			<view v-for="(item,index) in searchList" :key="index" class="hotItem" @click="searchGoods(item)">
 				<image src="/static/user/hot.png" mode="" class="hotImg" v-if="index==0"></image>
-				<text>{{item.word}}</text>
+				<text>{{item}}</text>
 			</view>
 		</view>
 		<view class="hotSuggest">
@@ -32,7 +34,8 @@
 						<image src="/static/search/hotImg.png" mode="widthFix"></image>
 						<view class="headTitle">{{item.name}}</view>
 					</view>
-					<view class="itemMain" v-for="(s,k) in item.goods_list.slice(0,5)" :key="k">
+					<view class="itemMain" v-for="(s,k) in item.goods_list.slice(0,5)" :key="k"
+						@click="handleTargetGoods(s.goods_id)">
 						<view class="num1 numCommon" v-if="k==0">
 							<text>{{k+1}}</text>
 						</view>
@@ -45,9 +48,9 @@
 						<view class="num4 numCommon" v-if="k>2">
 							<text>{{k+1}}</text>
 						</view>
-						<view class="picContent" v-if="k<3"> 
+						<view class="picContent" v-if="k<3">
 							<!-- <image :src="$picUrl+'/static/index/goods.png'"  mode="aspectFit" class="goodsImg"></image> -->
-							<image :src="s.goods_image"  mode="aspectFit" class="goodsImg"></image>
+							<image :src="s.goods_image" mode="aspectFit" class="goodsImg"></image>
 						</view>
 						<view class="goodsInfo">
 							<view class="goodName">
@@ -70,21 +73,22 @@
 		data() {
 			return {
 				showEye: true,
-				searchValue: 'iPhone15',
+				searchValue: '',
 				searchData: [],
 				searchList: [],
-				searchFindList:[],
-				page:1,
-				goodsList:[],
+				searchFindList: [],
+				page: 1,
+				goodsList: [],
 			}
 		},
 
 		onShow() {
-			// if(uni.getStorageSync('searchList')){
-			// 	this.searchList = uni.getStorageSync('searchList')
-			// 	this.searchList = Array.from(new Set(this.searchList));
-			// }
-			
+			if (uni.getStorageSync('searchList')) {
+				this.searchList = uni.getStorageSync('searchList')
+				this.searchList = Array.from(new Set(this.searchList));
+				this.searchList=this.searchList.length>0?this.searchList.slice(0,6):[]
+			}
+
 		},
 		onLoad() {
 			this.getHot()
@@ -92,49 +96,58 @@
 		},
 
 		methods: {
-			changePage(){
-				GoodsApi.searchFind({page:this.page}).then(res => {
-					if(res.data.length==0){
-						this.page=1;
-					}else{
+			// 跳转到秒杀商品详情
+			handleTargetGoods(sharpGoodsId) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?goodsId=' + sharpGoodsId
+				})
+			},
+			changePage() {
+				GoodsApi.searchFind({
+					page: this.page
+				}).then(res => {
+					if (res.data.length == 0) {
+						this.page = 1;
+					} else {
 						this.page++
 					}
 					this.getHot()
 				})
 			},
-			getHot(){
-				GoodsApi.searchFind({page:this.page}).then(res => {
-					if(res.data.length==0){
-						this.page=1;
-					}else{
+			getHot() {
+				GoodsApi.searchFind({
+					page: this.page
+				}).then(res => {
+					if (res.data.length == 0) {
+						this.page = 1;
+						this.$toast('暂无其他搜索发现')
+					} else {
 						this.page++;
 						this.searchFindList = res.data;
 					}
-					
+
 				})
 			},
-			searchGoods(item){
-				// this.searchList.push(this.searchValue)
-				// this.searchList = Array.from(new Set(this.searchList));
-				// uni.setStorageSync('searchList', this.searchList)
+			searchGoods(item) {
 				uni.navigateTo({
-					url: '/pages/goods/list?search=' + item.word
+					url: '/pages/goods/list?search=' + item
 				})
 			},
 			getSearchInfo() {
 				// 搜索
+				this.searchList.push(this.searchValue)
+				this.searchList = Array.from(new Set(this.searchList));
+				uni.setStorageSync('searchList', this.searchList)
 				uni.navigateTo({
 					url: '/pages/goods/list?search=' + this.searchValue
 				})
 			},
-			chartsGoodsJingHandle(){
+			chartsGoodsJingHandle() {
 				GoodsApi.chartsGoodsJingApi().then(res => {
-					
-					console.log(res,"8899")
 					this.goodsList = res.data;
-					
+
 				})
-				
+
 			}
 		}
 	}
@@ -157,7 +170,7 @@
 		// margin: 10rpx 0 0 20rpx;
 		display: flex;
 		align-items: center;
-		margin:0 40rpx;
+		margin: 0 40rpx;
 
 		.searchIcon {
 			width: 28rpx;
@@ -191,9 +204,11 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin:0 40rpx;
+		margin: 0 40rpx;
 		margin-top: 44rpx;
+
 		.findTitle {
+
 			// width: 200rpx;
 			// height: 44rpx;
 			// font-size: 32rpx;
@@ -202,7 +217,7 @@
 			// color: #000000;
 			// line-height: 44rpx;
 			// margin-left: 40rpx;
-			&>text{
+			&>text {
 				font-size: 32rpx;
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;
@@ -215,14 +230,14 @@
 				border-radius: 0rpx 0rpx 0rpx 0rpx;
 				opacity: 1;
 				margin-left: 22rpx;
-				margin-top:3rpx;
+				margin-top: 3rpx;
 				position: relative;
-				top:4rpx;
+				top: 4rpx;
 			}
 		}
 
 		.others {
-			
+
 			font-size: 24rpx;
 			font-family: PingFang SC, PingFang SC;
 			font-weight: 400;
@@ -235,18 +250,18 @@
 		display: flex;
 		align-items: center;
 		flex-wrap: wrap;
-		margin:0 40rpx;
+		margin: 0 40rpx;
 		margin-top: 20rpx;
-		justify-content: space-between;
-		
+		// justify-content: space-between;
+
 		.hotItem {
-			padding:10rpx 30rpx;
+			padding: 10rpx 30rpx;
 			background: #FFFFFF;
 			border-radius: 34px 34px 34px 34px;
 			opacity: 1;
 			display: flex;
 			align-items: center;
-			margin-left:12rpx;
+			margin-left: 12rpx;
 			// margin:0 20rpx;
 			margin-bottom: 24rpx;
 			// height: 64rpx;
@@ -274,9 +289,10 @@
 	.hotSuggest {
 		width: 100%;
 		// margin-left: 32rpx;
-		margin-top:12rpx;
-		margin-left:40rpx;
+		margin-top: 12rpx;
+		margin-left: 40rpx;
 		padding-right: 40rpx;
+
 		.hotList {
 			width: 100%;
 			white-space: nowrap;
@@ -291,25 +307,26 @@
 				background-size: 100% 100%;
 				border-radius: 8rpx 8rpx 8rpx 8rpx;
 				opacity: 1;
-				padding:18rpx 20rpx 48rpx 20rpx;
+				padding: 18rpx 20rpx 48rpx 20rpx;
 				// border: 2rpx solid #FFFFFF;
 
 				.itemHeade {
 					display: flex;
 					align-items: center;
-					margin-bottom:46rpx;
+					margin-bottom: 46rpx;
+
 					image {
 						width: 48rpx;
 						height: auto;
 					}
-					
+
 					.headTitle {
-					
+
 						font-size: 28rpx;
 						font-family: PingFang SC, PingFang SC;
 						font-weight: 600;
 						color: #F3202A;
-						margin-left:14rpx;
+						margin-left: 14rpx;
 					}
 				}
 
@@ -333,9 +350,10 @@
 						align-items: center;
 						justify-content: center;
 						flex-shrink: 0;
-						text{
+
+						text {
 							position: relative;
-							left:-1rpx;
+							left: -1rpx;
 						}
 					}
 
@@ -354,26 +372,29 @@
 					.num4 {
 						background-image: url('/static/search/common.png');
 					}
-					.picContent{
+
+					.picContent {
 						width: 100rpx;
 						height: 90rpx;
 						border-radius: 8rpx 8rpx 8rpx 8rpx;
 						overflow: hidden;
 						margin-left: 10rpx;
 						flex-shrink: 0;
+
 						.goodsImg {
 							width: 100%;
-							height:100%;
+							height: 100%;
 							// opacity: 1;
 							// 
 						}
 					}
 
-					
+
 
 					.goodsInfo {
 						margin-left: 18rpx;
 						width: calc(100% - 160rpx);
+
 						.goodName {
 							// width: 138rpx;
 							// height: 34rpx;
@@ -406,4 +427,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/serve/index.vue b/pages/serve/index.vue
index 055a590..85685d5 100644
--- a/pages/serve/index.vue
+++ b/pages/serve/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="serve">
 		<view class="heade">
-			<image :src="$picUrl+'/static/serve/serveBack.png'"  mode="" class="headImage"></image>
+			<image :src="$picUrl+'/static/serve/serveBack.png?t='+timestamp"  mode="" class="headImage"></image>
 			<view class="group">
 				<image :src="$picUrl+'/static/serve/right.png'"  class="tip tipImg"></image>
 				<text lines="1" class="groupText">不满意重做</text>
@@ -65,7 +65,8 @@
 		data (){
 			return{
 				list: [],
-				userInfo: {}
+				userInfo: {},
+				timestamp: new Date().getTime(),
 			}
 		},
 		mounted() {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 92e73e5..a475ed7 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -17,7 +17,7 @@
 						<text lines="1" class="text-group_1">{{userInfo.nick_name}}</text>
 						<image :src="$picUrl+'/static/user/weChat.png'" class="thumbnail_1"></image>
 					</button>
-					<view class="text-wrapper_1" v-if="isLogin" @click="wechatLogin">
+					<view class="text-wrapper_1" :style="{'width': userInfo.user_type==20?'130rpx':'100rpx' }"  v-if="isLogin" @click="wechatLogin">
 						<text lines="1" class="text_1" v-if="userInfo.user_type==40">店长</text>
 						<text lines="1" class="text_1" v-else-if="userInfo.user_type==30">分销</text>
 						<text lines="1" class="text_1" v-else-if="userInfo.user_type==20">Plus会员</text>
@@ -27,7 +27,7 @@
 				<view style="display: flex; flex: 1; justify-content: flex-end;">
 					<view class="group_2">
 						<image :src="$picUrl+'/static/home/news.png'" class="thumbnail"></image>
-						<text lines="1" class="text_2">客服</text>
+						<text lines="1" class="text_2">消息</text>
 						<button open-type="contact" v-if="isLogin"></button>
 					</view>
 					<!-- /  -->