From b810a98b1e35f98cefd9fc2b382a090513caa12c Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Thu, 22 Feb 2024 17:03:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/detail.vue                      | 605 +++++++++++---------
 pages/goods/list.vue                        |   4 +-
 pages/index/index.vue                       |  11 +-
 pages/login/components/mp-weixin-mobile.vue |   9 +-
 pages/login/index.vue                       |   8 +-
 pages/search/index.vue                      |   2 +-
 pages/user/index.vue                        |  21 +-
 static/detail/buy.png                       | Bin 1637 -> 3263 bytes
 static/detail/copy.png                      | Bin 329 -> 520 bytes
 static/detail/home.png                      | Bin 0 -> 4382 bytes
 static/detail/jiangjia.png                  | Bin 0 -> 1882 bytes
 static/detail/miaosha.png                   | Bin 0 -> 2689 bytes
 static/detail/rightIcon.png                 | Bin 160 -> 223 bytes
 static/detail/tip.png                       | Bin 1252 -> 2659 bytes
 static/detail/ys.png                        | Bin 786 -> 1631 bytes
 15 files changed, 370 insertions(+), 290 deletions(-)
 create mode 100644 static/detail/home.png
 create mode 100644 static/detail/jiangjia.png
 create mode 100644 static/detail/miaosha.png

diff --git a/pages/goods/detail.vue b/pages/goods/detail.vue
index ac94e0a..21460c9 100644
--- a/pages/goods/detail.vue
+++ b/pages/goods/detail.vue
@@ -1,26 +1,27 @@
 <template>
 	<view class="detail">
-
 		<u-navbar>
-			<view class="slot-wrap">
-				<input type="text" @click="toSearch()" disabled placeholder="iPhone15" class="searInput" />
+			<view class="slot-wrap">
+				<image style="width: 50rpx; height: 50rpx;" @click="goHome()" :src="$picUrl+'/static/detail/home.png'"></image>
+				<view class="search">
+					<input type="text" @click="toSearch()" disabled placeholder="iPhone15" class="searInput" />
+				</view>
 			</view>
 		</u-navbar>
 
 		<view class="head">
-			<view class="share">
+			<view class="share" @click="shareImg()">
 				<view class="sp"></view>
+				<image :src="$picUrl+'/static/detail/share.png'" class="shareIcon" @click="shareImg"></image>
 				<button open-type="share"></button>
-				<image src="/static/detail/share.png" mode="" class="shareIcon" @click="shareImg"></image>
 			</view>
 			<view class="swiper">
-				<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay"
-					:interval="interval" :duration="duration">
-					<swiper-item v-for="(item,index) in goods.goods_images" :key="index">
-						<image :src="item.preview_url" mode="" class="goodsImg"></image>
+				<swiper class="swiper" :circular="true" autoplay @change="changeSwiper">
+					<swiper-item v-for="(item,index) in goods.goods_images1" :key="index" @click="previewImage(index)">
+						<image :src="item" class="goodsImg"></image>
 					</swiper-item>
-
-				</swiper>
+				</swiper>
+				<view class="dots" v-if="goods.goods_images && goods.goods_images.length> 0">{{(currenIndex+1)+"/"+goods.goods_images.length}}</view>
 			</view>
 		</view>
 
@@ -31,7 +32,7 @@
 						<text>￥</text>{{goods.goods_price_min}}
 					</view>
 					<view class="sellPrice" v-if="goods.goods_price_min_dealer">
-						<text class="sellLeft">分销价</text>￥{{goods.goods_price_min_dealer}}
+						<text class="sellLeft">分销价</text>￥{{goods.goods_price_min_dealer?goods.goods_price_min_dealer:0}}
 					</view>
 				</view>
 				<view class="right">
@@ -39,12 +40,11 @@
 						￥{{goods.line_price_min}}
 					</view>
 					<view class="rightInfo">
-						降价通知
+						<image :src="$picUrl+'/static/detail/jiangjia.png'"></image>
 					</view>
 				</view>
 			</view>
-			<!--  v-if="userInfo.user_type==10" -->
-			<view class="pro">
+			<view class="pro" v-if="isLogin || userInfo.user_type==10">
 				<view class="proMem">
 					<text v-if="userInfo.user_type==10">Plus</text>
 					<text v-if="userInfo.user_type==20">分销</text>
@@ -52,9 +52,9 @@
 				</view>
 				<view class="proInfo">
 					开通<text v-if="userInfo.user_type==10">Plus</text>
-					<text v-if="userInfo.user_type==20">分销</text>会员预计再省
+					<text v-if="userInfo.user_type==20">分销</text>会员预计再省<text style="color: #FF1D1D;">30</text>元
 				</view>
-				<view class="proBtn" @click="goMember">
+				<view class="proBtn" @click="goMember()">
 					立即开通
 				</view>
 			</view>
@@ -63,36 +63,50 @@
 					{{goods.goods_name}}
 				</view>
 				<view class="goodsOpera">
-					<view class="goodsNum" @click="copyNum" v-if="goods.skuList.length>0">
+					<view class="goodsNum" @click="copyNum(goods.skuList[0].goods_sku_id)" v-if="goods.specList && goods.specList.length>0">
 						<text>{{goods.skuList[0].goods_sku_id}}</text>
-						<image src="/static/detail/copy.png" mode=""></image>
+						<image :src="$picUrl+'/static/detail/copy.png'"></image>
+					</view>
+					<view class="goodsNum" @click="copyNum(goods.goods_id)" v-else>
+						<text>{{goods.goods_id}}</text>
+						<image :src="$picUrl+'/static/detail/copy.png'"></image>
 					</view>
 					<view class="operaImg">
-						<image src="/static/detail/tip.png" mode="" class="tips"></image>
-						<image src="/static/detail/ys.png" mode="" class="ys"></image>
+						<image :src="$picUrl+'/static/detail/jiangjia.png'" class="tips"></image>
+						<image :src="$picUrl+'/static/detail/tip.png'" class="tips"></image>
+						<image :src="$picUrl+'/static/detail/ys.png'" class="tips"></image>
 					</view>
 				</view>
-				<view class="rank" @click="goRanking" v-if="goods.paihang>0">
+				<view class="rank" @click="goRanking()" v-if="goods && goods.category">
 					<text>排行榜 {{goods.category.name}}热搜榜第{{goods.paihang}}名</text>
-					<image src="/static/detail/rightIcon.png" mode=""></image>
+					<image :src="$picUrl+'/static/detail/rightIcon.png'"></image>
 				</view>
 			</view>
 		</view>
 		<view class="orderInfo">
 			<!-- -->
-			<view class="chosed" @click="choseSku" v-if="goods.spec_type == 20">
+			<view class="chosed" v-if="goods.spec_type == 20">
 				<view class="title">已选</view>
-				<view class="info" v-for="(item, index) in goods.specList" :key="index">{{ item.spec_name }}</view>
+				<view class="info" v-if="goods.skuList.length>0">
+					<text v-for="(a,idx) in goods.skuList[0].goods_props" :key="idx" style="margin-right: 10rpx;">{{a.group.name}}{{a.value.name}}</text>1件
+				</view>
+			</view>
+			<view class="chosed" v-else>
+				<view class="title">已选</view>
+				<view class="info">1件</view>
 			</view>
 			<view class="chosed">
 				<view class="title">送至</view>
 				<view class="info">
 					<view class="infoLeft">
 						现货
-						<image src="../../static/detail/rightIcon.png" mode=""></image>
-					</view>
-					<view class="address">
-						{{addressInfo.region?addressInfo.region.province +'-'+addressInfo.region.city+'-'+addressInfo.region.region:''}}
+						<image :src="$picUrl+'/static/detail/rightIcon.png'"></image>
+					</view>
+					<view class="box" @click="choseAddress()" >
+						<view class="address">
+							{{addressInfo.region?addressInfo.region.province +'-'+addressInfo.region.city+'-'+addressInfo.region.region:'全国'}}
+						</view>
+						<u-icon name="arrow-right" color="#7C7C7C"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -101,20 +115,33 @@
 					<view class="serveInfo">
 						服务
 					</view>
-					<view class="span">
-
-					</view>
 				</view>
-				<view class="business">
-					<view class="busSour">
-						<text>商家来源：平台认证商户</text>
-					</view>
+				<view class="box" @click="toFuwu()">
+					<view class="business">
+						<view class="busSour">
+							<text>商家来源：平台认证商户</text>
+						</view>
+						<view class="busSour">
+							<text>商家名称：{{cityInfo.shop_name}}</text>
+						</view>
+					</view>
+					<u-icon name="arrow-right" style="float: right;" color="#7C7C7C"></u-icon>
 				</view>
 			</view>
 			<view class="chosed" v-if="serveList.length>0">
 				<view class="title">服务</view>
-				<!-- <image src="/static/detail/buy.png" mode="" class="buy"></image> -->
-				<view class="info" v-for="(item,index) in serveList" :key="index">{{item.name}}</view>
+				<view class="info">
+					<image :src="$picUrl+'/static/detail/buy.png'" class="buy"></image>
+					<text class="li" v-for="(item,index) in serveList" :key="index" style="margin-right: 5rpx;">{{item.name}}</text>
+				</view>
+			</view>
+			<view class="chosed" v-else>
+				<view class="title">服务</view>
+				<view class="info">
+					<image :src="$picUrl+'/static/detail/buy.png'" class="buy"></image>
+					<text class="li" style="margin-right: 5rpx;">正品保障</text>
+					<text class="li" style="margin-right: 5rpx;">全程跟踪</text>
+				</view>
 			</view>
 		</view>
 		<view class="about">
@@ -135,7 +162,7 @@
 						{{item.goods_name}}
 					</view>
 					<view class="price">
-						￥{{item.goods_price_min}}
+						￥<text>{{item.goods_price_min}}</text>
 					</view>
 				</view>
 			</view>
@@ -143,16 +170,24 @@
 		<view class="detail-content" v-html="goods.content"></view>
 		<view class="footer">
 			<view class="fooLeft">
-				<view class="footerCus firstBtn">
+				<view class="footerCus firstBtn" v-if="isLogin == false" @click="addCar()">
 					<view class="cusIcon">
-						<image src="/static/detail/customer.png" mode=""></image>
+						<image src="/static/detail/customer.png"></image>
 					</view>
 					<view class="customer">
 						客服
 					</view>
-					<button open-type="contact"></button>
+				</view>
+				<view class="footerCus firstBtn" v-else>
+					<view class="cusIcon">
+						<image src="/static/detail/customer.png"></image>
+					</view>
+					<view class="customer">
+						客服
+					</view>
+					<button open-type="contact"></button>
 				</view>
-				<view class="footerCus " @click="shoppingCart">
+				<view class="footerCus " @click="shoppingCart()">
 					<view class="cusIcon">
 						<image src="/static/detail/car.png" mode=""></image>
 					</view>
@@ -163,7 +198,7 @@
 			</view>
 
 			<view class="fooRight">
-				<view class="addCar" v-if="!isPre" @click="addCar">
+				<view class="addCar" v-if="!isPre" @click="addCar()">
 					加入购物车
 				</view>
 				<view class="buyNow" v-if="!isPre" @click="buyNow">
@@ -272,6 +307,9 @@
 					取消
 				</view>
 			</view>
+		</view>
+		<view class="toTop" v-if="isTop" @click="openScrollTo()">
+			<image :src="$picUrl+'/static/toTop.png'"></image>
 		</view>
 		<SkuPopup v-if="!isLoading" v-model="showSkuPopup" :skuMode="skuMode" :goods="goods" @addCart="onAddCart" />
 	</view>
@@ -286,7 +324,10 @@
 			SkuPopup
 		},
 		data() {
-			return {
+			return {
+				cityInfo: {},
+				currenIndex: 0,
+				isTop: false,
 				skuMode: 1,
 				goodShow:false,
 				showSkuPopup: false,
@@ -307,57 +348,52 @@
 				addressList: [],
 				addressInfo: {},
 				serveList:[],
-				token:'',
+				isLogin: false,
 			}
 		},
 		onLoad(options) {
 			console.log(options,"oo")
 			this.isPre = options.isPre?options.isPre:null
 			this.goodsId = options.goodsId?options.goodsId:null
-			this.pre_id = options.pre_id?options.pre_id:null;
-			// this.goodsId=options.goodsId;
+			this.pre_id = options.pre_id?options.pre_id:null;
+			this.getSuggestGoods()
+			this.getServeList()
+			this.getGoodsDetail()
+			this.cityInfo = uni.getStorageSync("cityInfo");
 		},
 		onShow() {
 			if(uni.getStorageSync('AccessToken')){
-				this.getAddressList()
-				this.getSuggestGoods()
-				this.getServeList()
+				this.getAddressList()
+				this.isLogin = true;
 				this.userInfo = uni.getStorageSync('userInfo');
-			}else{
+			}else{
+				this.isLogin = false;
 				this.userInfo = {}
 			}
-			this.getGoodsDetail()
+		},
+		onPageScroll(e) {
+		    if (e.scrollTop <= 200 ) { // 当滚动到顶部且向下滑动时为true
+			    this.isTop = false
+		    } else {
+				this.isTop = true
+		    }
 		},
-		methods: {
-			copyText(val){
-				// 获取要复制的文本内容
-				let text = val;
-				 
-				uni.setClipboardData({
-				  data: text,
-				  success(res) {
-				    console.log('成功复制到剪贴板');
-				  },
-				  fail(err) {
-				    console.error('复制失败', err);
-				  }
-				});
-			
-
-			},
-			shareWechat(){
-				uni.share({
-					provider: "weixin",
-					scene: "WXSceneSession",
-					type: 2,
-					imageUrl: this.goods.goods_image,
-					success: function (res) {
-						console.log("success:" + JSON.stringify(res));
-					},
-					fail: function (err) {
-						console.log("fail:" + JSON.stringify(err));
-					}
-				});
+		methods: {
+			//门店图片预览
+			previewImage(i){
+				uni.previewImage({
+					current: this.goods.goods_images1[i],
+					urls: this.goods.goods_images1
+				})
+			},
+			//监听滚动
+			changeSwiper(e){
+				this.currenIndex = e.detail.current
+			},
+			openScrollTo(){
+				uni.pageScrollTo({
+					scrollTop: 0
+				}) 
 			},
 			shareImg(){
 				this.openDialog =true
@@ -379,15 +415,15 @@
 			getServeList(){
 				const that = this
 				let params = {
-					goodsId:that.goodsId
+					goodsId: that.goodsId
 				}
 				return new Promise((resolve, reject) => {
 					GoodsApi.serveList(params).then(res => {
-							if (res.status == 200) {
-								that.serveList = res.data.list
-							}
-						})
-						.catch()
+						if (res.status == 200) {
+							that.serveList = res.data.list
+						}
+					})
+					.catch()
 				})
 			},
 			// 预约成功去列表
@@ -415,15 +451,20 @@
 				const that = this
 				return new Promise((resolve, reject) => {
 					address.list().then(res => {
-							if (res.status == 200) {
-								that.addressList = res.data.list
-								console.log('58555559999',that.addressList)
-								that.getDefaultAddress()
+						if (res.status == 200) {
+							that.addressList = res.data.list
+							if(res.data.list && res.data.list.length > 0){
+								console.log(1111)
+								that.getDefaultAddress()
+							}else{
+								console.log(222)
 							}
-						})
-						.catch()
+						}
+					})
+					.catch()
 				})
-			},
+			},
+			//获取收货地址
 			getDefaultAddress() {
 				console.log('5855555')
 				const that = this
@@ -433,7 +474,6 @@
 								for (var i = 0; i < that.addressList.length; i++) {
 									if (res.data.defaultId == that.addressList[i].address_id) {
 										that.addressInfo = that.addressList[i];
-										
 										console.log(that.addressInfo,'获取地址')
 									}
 								}
@@ -441,6 +481,24 @@
 						})
 						.catch()
 				})
+			},
+			//选择地址
+			choseAddress() {
+				if(!uni.getStorageSync("AccessToken")) {
+					uni.navigateTo({
+						url: "/pages/login/index"
+					})
+					return ;
+				}
+				if(this.addressList && this.addressList.length > 0){
+					uni.navigateTo({
+						url: '/pages/address/index'
+					})
+				}else{
+					uni.navigateTo({
+						url: '/pages/address/create'
+					})
+				}
 			},
 			toSearch() {
 				uni.navigateTo({
@@ -449,6 +507,22 @@
 			},
 			choseSku() {
 				this.showSkuPopup = true
+			},
+			copyNum(msg) {
+				uni.setClipboardData({
+					data: msg,
+					success: function () {
+						uni.getClipboardData({
+							success: function (res) {
+								console.log(res.data);
+								uni.showToast({
+									icon: "none",
+									title: "复制成功"
+								})
+							}
+						});
+					}
+				});
 			},
 			// 获取商品信息
 			getGoodsDetail() {
@@ -456,7 +530,17 @@
 				return new Promise((resolve, reject) => {
 					GoodsApi.detail(this.goodsId)
 						.then(result => {
-							let info = result.data.detail;
+							let info = result.data.detail;
+							info.goods_images1 = []
+							if(info.goods_images && info.goods_images.length > 0){
+								info.goods_images.map(a=>{
+									info.goods_images1.push(a.preview_url)
+								})
+							}
+							if(info.skuList && info.skuList.length > 0){
+								info.skuList = info.skuList.reverse();
+							}
+							
 							info.content = info.content
 							.replace(/style=""/g,'')
 							.replace(/<img src=/g,'<img style="width: 100%; display:block" src=')
@@ -465,7 +549,7 @@
 								this.$set(this.goods,item,info[item])
 								// that.goods[item] = info[item]
 							})
-							console.log(that.goods)
+							
 							that.allPicture = info.goods_images.length
 						})
 						.catch()
@@ -476,8 +560,17 @@
 				const that = this
 				GoodsApi.recommended()
 					.then(result => {
-						console.log(result, '获取推荐商品列表')
-						that.suggestGoodsList = result.data.goodsList
+						console.log(result, '获取推荐商品列表')
+						let arr = result.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)
+							})
+						}
+						that.suggestGoodsList = arr
 					})
 					.catch()
 			},
@@ -485,11 +578,16 @@
 				uni.switchTab({
 					url: '/pages/index/index'
 				})
+			},
+			toDetail(goods_id) {
+				uni.navigateTo({
+					url: '/pages/goods/detail?goodsId=' + goods_id
+				})
 			},
 			goRanking() {
 				// 跳转排行榜
 				uni.navigateTo({
-					url: '/pages/activity/charts'
+					url: '/pages/activity/ranking'
 				})
 			},
 			goMember() {
@@ -502,6 +600,11 @@
 				uni.navigateTo({
 					url: '/pages/member/index'
 				})
+			},
+			toFuwu() {
+				uni.navigateTo({
+					url: "/pages/news/consult/about"
+				})
 			},
 			shoppingCart() {
 				// 购物车
@@ -559,8 +662,26 @@
 <style lang="scss" scoped>
 	.detail {
 		width: 100%;
-		height: 100%;
-		
+		height: 100%;
+		padding-bottom: 150rpx;
+		.toTop{
+			position: fixed;
+			bottom: 230rpx;
+			right: 32rpx;
+			width: 47px;
+			height: 47px;
+			background: #FFFFFF;
+			border-radius: 50%;
+			z-index:999;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			image{
+				width: 25px;
+				height: 25px;
+			}
+			
+		}
 		&-content{
 			padding: 30rpx;
 			font-size: 26rpx;
@@ -572,15 +693,22 @@
 			box-sizing: border-box;
 		}
 	}
-	.slot-wrap {
-		width: 400rpx;
-		margin-left: 60rpx;
-		height: 58rpx;
-		border-radius: 60rpx 60rpx 60rpx 60rpx;
-		background-color: #F3F3F3;
-		display: flex;
-		align-items: center;
-		padding-left: 20rpx;
+	.slot-wrap {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.search{
+			width: 400rpx;
+			height: 58rpx;
+			border-radius: 60rpx;
+			background-color: #F3F3F3;
+			display: flex;
+			align-items: center;
+			padding-left: 20rpx;
+			box-sizing: border-box;
+			margin: 0 20rpx;
+		}
 
 	}
 
@@ -615,130 +743,89 @@
 			}
 		}
 	}
-
+	.head{
+		width: 100%;
+		height: 750rpx;
+		position: relative;
+	}
 	.share {
-		z-index: 22;
-		top: 128rpx;
-		width: 54rpx;
-		height: 54rpx;
-		position: absolute;
-		right: 30rpx;
+		z-index: 10;
+		top: 28rpx;
+		width: 74rpx;
+		height: 74rpx;
+		position: absolute;
+		background-color: rgba(255, 255, 255, 1);
+		border-radius: 50%;
+		text-align: center;
+		right: 28rpx;
 		.sp {
 			width: 54rpx;
 			height: 54rpx;
 			display: none;
 		}
-		button{
-			width: 100%;
-			height: 100%;
-			position: absolute;
-			left: 0;
-			top: 0;
-			z-index: 2;
-			opacity: 0;
-		}
 		.shareIcon {
 			width: 54rpx;
-			height: 54rpx;
-			margin-right: 28rpx;
+			height: 54rpx;
+			margin-top: 10rpx;
 		}
 	}
 
 	.swiper {
-		width: 726rpx;
-		height: 458rpx;
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		width: 100%;
+		height: 750rpx;
 		opacity: 1;
 		left: 0;
 		right: 0;
 		margin: auto;
 
 		.goodsImg {
-			margin-left: 30rpx;
-			// width: 666rpx;
-			// height: 398rpx;
-		}
-
-		.goods {
 			width: 100%;
 			height: 100%;
-			white-space: nowrap;
-
-			.goodsItem {
-				width: 100%;
-				height: 100%;
-
-				display: inline-block;
-				position: relative;
-
-				.goodsImg {
-					margin-left: 30rpx;
-					width: 666rpx;
-					height: 398rpx;
-				}
-
-				.num {
-
-					text-align: center;
-					display: flex;
-					justify-content: space-between;
-
-					.numSp {
-						width: 82rpx;
-						height: 56rpx;
-					}
-
-					.numInfo {
-						width: 82rpx;
-						height: 56rpx;
-						background: #262626;
-						border-radius: 50% 0 0 50%;
-						font-size: 28rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 400;
-						color: #FFFFFF;
-						line-height: 56rpx;
-					}
-				}
-			}
-
+		}
+		.dots{
+			width: 82rpx;
+			line-height: 56rpx;
+			background: rgba(38,38,38,0.85);
+			position: absolute;
+			bottom: 20rpx;
+			right: 0;
+			z-index: 22;
+			font-size: 28rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			text-align: center;
+			border-radius: 56rpx 0 0 56rpx;
 		}
 	}
 
 	.goodsInfo {
 		width: 720rpx;
-		max-height: 484rpx;
 		background: #FFFFFF;
-		border-radius: 6rpx 6rpx 6rpx 6rpx;
-		opacity: 1;
-		margin: 30rpx 0 0 16rpx;
-
+		border-radius: 6rpx;
+		padding-bottom: 30rpx;
+		overflow: hidden;
+		margin: 20rpx auto 16rpx;
 		.goodsPrice {
-			background-image: url('/static/detail/priceback.png');
+			background-image: url('https://www.royaum.com.cn/static/detail/priceback.png');
 			width: 720rpx;
 			height: 136rpx;
-			background-size: 100% 100%;
+			background-size: cover;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 
 			.left {
-				margin: 18rpx 0 0 28rpx;
-
+				margin: 0 0 0 28rpx;
 				.leftPrice {
-					width: 140rpx;
 					height: 64rpx;
 					font-size: 46rpx;
-					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
 					color: #FFFFFF;
 					line-height: 64rpx;
 
 					text {
-						width: 20rpx;
 						height: 64rpx;
 						font-size: 32rpx;
-						font-family: PingFang SC, PingFang SC;
 						font-weight: 400;
 						color: #FFFFFF;
 						line-height: 64rpx;
@@ -749,7 +836,6 @@
 				.sellPrice {
 					height: 34rpx;
 					font-size: 24rpx;
-					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
 					color: #FFFFFF;
 					line-height: 34rpx;
@@ -763,12 +849,10 @@
 
 			.right {
 				margin-right: 50rpx;
-
-				.rightPrice {
-					width: 102rpx;
+				.rightPrice {
+					text-align: center;
 					height: 48rpx;
 					font-size: 34rpx;
-					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
 					color: #FFFFFF;
 					line-height: 48rpx;
@@ -776,19 +860,18 @@
 				}
 
 				.rightInfo {
-					width: 136rpx;
-					height: 44rpx;
-					font-size: 34rpx;
-					font-family: YouSheBiaoTiHei;
-					font-weight: 400;
-					color: #FFFFFF;
-					line-height: 34rpx;
+					width: 125rpx;
+					height: 26rpx;
+					image{
+						width: 100%;
+						height: 100%;
+					}
 				}
 			}
 		}
 
 		.pro {
-			background-image: url('/static/detail/pro.png');
+			background-image: url('https://www.royaum.com.cn/static/detail/pro.png');
 			background-size: 100% 100%;
 			width: 690rpx;
 			height: 82rpx;
@@ -798,12 +881,9 @@
 
 			.proMem {
 				width: 142rpx;
-				height: 40rpx;
 				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;
 				color: #966542;
-				line-height: 33rpx;
 				margin-left: 18rpx;
 				padding-right: 24rpx;
 				border-right: 2rpx solid #EFD4B4;
@@ -811,12 +891,9 @@
 
 			.proInfo {
 				width: 304rpx;
-				height: 34rpx;
 				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;
 				color: #966542;
-				line-height: 34rpx;
 				margin: 0 38rpx 0 26rpx;
 			}
 
@@ -824,12 +901,11 @@
 				width: 126rpx;
 				height: 50rpx;
 				background: #9F744D;
-				border-radius: 82rpx 82rpx 82rpx 82rpx;
+				border-radius: 82rpx;
 				opacity: 1;
 				text-align: center;
 				line-height: 50rpx;
 				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
 				font-weight: 500;
 				color: #FFFFFF;
 			}
@@ -840,72 +916,67 @@
 			.goodsName {
 				width: 672rpx;
 				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
 				font-weight: 400;
 				color: #000000;
 				line-height: 50rpx;
-				margin: 28rpx 0 0 28rpx;
-
+				margin: 28rpx auto 0;
 			}
 
 			.goodsOpera {
 				margin-left: 28rpx;
 				display: flex;
 				justify-content: space-between;
-
+				align-items: center;
 				.goodsNum {
 					text {
 						display: inline-block;
-						width: 168rpx;
-						height: 34rpx;
 						font-size: 24rpx;
-						font-family: PingFang SC, PingFang SC;
 						font-weight: 400;
 						color: #8A8A8A;
-						line-height: 34rpx;
 						margin-right: 4rpx;
 					}
 
 					image {
 						width: 28rpx;
-						height: 28rpx;
-					}
+						height: 28rpx;
+						vertical-align: middle;
+						margin-left: 10rpx;
+					}
+					
 				}
 
-				.operaImg {
+				.operaImg {	
+					margin-right: 34rpx;
 					image {
 						width: 49rpx;
 						height: 49rpx;
 					}
-
+					
 					.tips {
-						margin-right: 6rpx;
+						margin-left: 10rpx;
 					}
 				}
 			}
 
 			.rank {
-				margin: 22rpx 0 18rpx 28rpx;
 				width: 670rpx;
 				height: 58rpx;
 				background: #FFF3EE;
-				border-radius: 8rpx 8rpx 8rpx 8rpx;
-				opacity: 1;
+				border-radius: 8rpx;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
 				padding: 0 28rpx;
-
+				box-sizing: border-box;
+				margin: 16rpx auto 0;
 				text {
 					font-size: 24rpx;
-					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
 					color: #FF1130;
 					line-height: 58rpx;
 				}
-
 				image {
-					width: 14rpx;
+					width: 8rpx;
 					height: 14rpx;
 				}
 			}
@@ -914,55 +985,46 @@
 
 	.orderInfo {
 		width: 720rpx;
-		height: 256rpx;
 		background: #FFFFFF;
-		border-radius: 6rpx 6rpx 6rpx 6rpx;
+		border-radius: 6rpx;
 		opacity: 1;
-		margin: 16rpx 0 0 20rpx;
-		padding: 24rpx 22rpx 12rpx 32rpx;
-
+		margin: 16rpx auto 20rpx;
+		padding: 25rpx 25rpx 10rpx;
+		box-sizing: border-box;
 		.chosed {
-			margin-bottom: 18rpx;
 			display: flex;
-			align-items: center;
-
-			.buy {
-				width: 112rpx;
-				height: 22rpx;
-				margin-right: 10rpx;
-			}
-
+			align-items: flex-start;
+			padding-bottom: 18rpx;
+			overflow: hidden;
 			.title {
-				width: 48rpx;
-				height: 34rpx;
 				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
 				font-weight: 400;
 				color: #C4C4C4;
-				line-height: 34rpx;
 				margin-right: 38rpx;
 			}
 
-			.info {
-				height: 34rpx;
+			.info {
+				flex: 1;
 				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
 				font-weight: 400;
 				color: #3D3D3D;
-				line-height: 34rpx;
 				display: flex;
-				align-items: center;
-
+				align-items: center;
+				.buy {
+					width: 114rpx;
+					height: 23rpx;
+					margin-right: 10rpx;
+					display: block;
+				}
 				.infoLeft {
 					height: 34rpx;
 					font-size: 24rpx;
-					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
 					color: #FE3636;
 					line-height: 34rpx;
 
 					image {
-						width: 14rpx;
+						width: 8rpx;
 						height: 14rpx;
 						margin: 0 10rpx 0 8rpx;
 					}
@@ -990,21 +1052,23 @@
 					line-height: 34rpx;
 					margin-right: 38rpx;
 				}
-
 				.span {
 					width: 48rpx;
 					height: 34rpx;
 				}
 			}
-
+			.box{
+				display: flex;
+				align-items: flex-start;
+				justify-content: space-between;
+				flex: 1;
+			}
 			.business {
 				.busSour {
-					height: 34rpx;
+					height: 40rpx;
 					font-size: 24rpx;
-					font-family: PingFang SC, PingFang SC;
 					font-weight: 400;
 					color: #3D3D3D;
-					line-height: 34rpx;
 				}
 
 				.busName {
@@ -1094,19 +1158,18 @@
 					text-overflow: ellipsis;
 					white-space: normal !important;
 					word-wrap: break-word;
-					-webkit-box-orient: vertical;
-					-webkit-box-align: start;
-					-webkit-box-pack: center;
 				}
 
 				.price {
 					width: 66rpx;
 					height: 44rpx;
-					font-size: 32rpx;
-					font-family: PingFang SC, PingFang SC;
+					font-size: 24rpx;
 					font-weight: 500;
 					color: #ED2B00;
-					line-height: 38rpx;
+					line-height: 38rpx;
+					text{
+						font-size: 32rpx;
+					}
 				}
 			}
 		}
diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index ade8366..784ca91 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -187,6 +187,7 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad(options) {
+			console.log(options)
 			// 记录options
 			this.options = options
 			this.searchText = options.search
@@ -545,9 +546,8 @@
 
 	.shipping {
 		width: 44rpx;
-		height: 24rpx;
 		background: #FFFFFF;
-		border-radius: 4rpx 4rpx 4rpx 4rpx;
+		border-radius: 4rpx;
 		opacity: 1;
 		border: 1rpx solid #F21A1C;
 		font-size: 16rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ee6b1bb..94d09c1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -20,7 +20,7 @@
 			<template v-if="current == 0">
 				<view class="chat" v-if="isLogin == false" @click="toChat()">
 					<u-icon name="chat" color="#000000" size="70"></u-icon>
-					<view class="badge"></view>
+					<!-- <view class="badge"></view> -->
 				</view>
 				<view class="chat" v-else>
 					<u-icon name="chat" color="#000000" size="70"></u-icon>
@@ -902,6 +902,15 @@
 		}
 		.chat{
 			position: relative;
+			button{
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				left: 0;
+				top: 0;
+				z-index: 2;
+				opacity: 0;
+			}
 			.badge{
 				position: absolute;
 				width:40rpx;
diff --git a/pages/login/components/mp-weixin-mobile.vue b/pages/login/components/mp-weixin-mobile.vue
index 8a4b83b..2fd3d0c 100644
--- a/pages/login/components/mp-weixin-mobile.vue
+++ b/pages/login/components/mp-weixin-mobile.vue
@@ -18,8 +18,12 @@
 	} from '@/utils/util'
 	import * as UserApi from '@/api/user'
 	export default {
-
-
+		props: {
+		  // 分享人id
+		  share_user_id: {
+		    type: String
+		  },
+		},
 		data() {
 			return {
 				// 微信小程序登录凭证 (code)
@@ -61,6 +65,7 @@
 							code: app.code,
 							encryptedData: detail.encryptedData,
 							iv: detail.iv,
+							share_user_id: this.share_user_id,
 							isParty: app.isParty,
 							partyData: app.userInfo,
 							refereeId: store.getters.refereeId
diff --git a/pages/login/index.vue b/pages/login/index.vue
index c194642..c1ac729 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -20,7 +20,7 @@
 		</view>
 		<view class="login-fd login-fd-on" @click="login">登录</view>
 		<view class="">
-			<mpWeiXinMobile></mpWeiXinMobile>
+			<mpWeiXinMobile :share_user_id="share_user_id"></mpWeiXinMobile>
 		</view>
 	</view>
 </template>
@@ -50,10 +50,11 @@
 				countdown: 60,
 				countDownFun: null,
 				code: '',
+				share_user_id: ""
 			}
 		},
-		onShow() {
-
+		onLoad(o) {
+			this.share_user_id = o.share_user_id
 		},
 		methods: {
 
@@ -117,6 +118,7 @@
 				store.dispatch('Login', {
 					smsCode: that.semCode,
 					mobile: that.phoneNum,
+					share_user_id: this.share_user_id,
 					isParty: false,
 					partyData: {},
 					refereeId: false
diff --git a/pages/search/index.vue b/pages/search/index.vue
index c151e7f..372b4b4 100644
--- a/pages/search/index.vue
+++ b/pages/search/index.vue
@@ -118,7 +118,7 @@
 				// this.searchList = Array.from(new Set(this.searchList));
 				// uni.setStorageSync('searchList', this.searchList)
 				uni.navigateTo({
-					url: '/pages/goods/list?search=' + item
+					url: '/pages/goods/list?search=' + item.word
 				})
 			},
 			getSearchInfo() {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 8b54118..a7c46b2 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -127,12 +127,12 @@
 			</view>
 			<view class="coupon" v-if="isLogin == false || userInfo.user_type != 40">
 				<view class="walletList">
-					<view class="listItem" @click="goPage('pages/cart/index')">
+					<view class="listItem" @click="goJump('pages/news/park/recordHistory')">
 						<view class="num">
-							{{actionCountsInfo.cart_number?actionCountsInfo.cart_number:0}}
+							{{actionCountsInfo.reservation_number?actionCountsInfo.reservation_number:0}}
 						</view>
 						<view class="info">
-							购物车
+							预约记录
 						</view>
 					</view>
 					<view class="listItem" @click="goJump('pages/news/park/browsingHistory')">
@@ -143,12 +143,12 @@
 							浏览记录
 						</view>
 					</view>
-					<view class="listItem" @click="goJump('pages/news/park/recordHistory')">
+					<view class="listItem" @click="goJump('/pages/news3/setOutRecords')">
 						<view class="num">
-							{{actionCountsInfo.reservation_number?actionCountsInfo.reservation_number:0}}
+							{{actionCountsInfo.take_goods_number?actionCountsInfo.take_goods_number:0}}
 						</view>
 						<view class="info">
-							预约记录
+							{{isLogin==false || userInfo.user_type <= 20?'发货记录':'提货记录'}}
 						</view>
 					</view>
 					<view class="listItem" @click="goJump('pages/news/coupon/list')">
@@ -235,7 +235,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="goodsManage" v-if="isLogin == false || userInfo.user_type == 30">
+			<view class="goodsManage" v-if="userInfo.user_type == 30">
 				<view class="manageTitle">
 					<text lines="1" class="text_5 titleLeft">分销订单</text>
 					<text lines="1" class="text_6 titleRight" @click="goJump('/pages/news3/fenxiao')">查看全部</text>
@@ -441,10 +441,10 @@
 				</view>
 			</view>
 			<!-- 商品推荐 -->
-			<view class="goodsRecommend-title">
-				<image :src="$picUrl+'/static/user/left.png'"></image>为您推荐<image :src="$picUrl+'/static/user/right.png'"></image>
+			<view class="goodsRecommend-title" v-if="isLogin == false || userInfo.user_type != 40">
+				<image :src="$picUrl+'/static/user/left.png'"></image>专属推荐<image :src="$picUrl+'/static/user/right.png'"></image>
 			</view>
-			<view class="goodsRecommend">
+			<view class="goodsRecommend" v-if="isLogin == false || userInfo.user_type != 40">
 				<view class="goodsItem" v-for="(item,index) in suggestGoodsList" @click="goodsDetail(item)" :key="index">
 					<view class="pic">
 						<image :src="item.goods_image" mode=""></image>
@@ -726,6 +726,7 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: flex-end;
+		padding-bottom: 30rpx;
 		.toTop{
 			position: fixed;
 			bottom:30rpx;
diff --git a/static/detail/buy.png b/static/detail/buy.png
index 029b60a93b8b345b6657a0042627ae9650314590..3cd0956aa0baf4dc605787ef4aa51221f3f4e61e 100644
GIT binary patch
literal 3263
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

literal 1637
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

diff --git a/static/detail/copy.png b/static/detail/copy.png
index 887168d91aa22c5816f02bee74ed716ad27b8649..e972d86441c3d1f76c72d50f1ef43d20716f9807 100644
GIT binary patch
literal 520
zcmV+j0{8uiP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px$!bwCyR7gwhmc2?OK@i8QdS}62MC1;iz(5ZZ5d%X710%uQN6<hFdYa|95@+dY
zK`yv`1Rp>yGx9Rm$W258Lo<;(yo2#z=yFFKSwDOB&Rqnpw7dG(RbBP3M(D9&k9klS
zNJRYr5OjFKOCq{#_bCLl)_w(mrGEe>&biN8>&+bM1=eb{@gN8enE4nHk2{QT3IIMP
zNivW}>IE8OriBo@Ef6WC);a;kalDO)^GT9?AfjKH?;8ZhaXiM%Ls|IFxg#OOr>>>c
zTKny$8uO=WI_Flp0?hhMO8J|aPY`h{BQkS?ng4bRI4Gt32>{zlsf9emu2m@!y#rsi
z@!xJrqbQmxm&<zq&;Wp)HZA1>y1EDe!#Cpn=Z=;>l~N)Kq?F%Vz_}vYd;b#7xw_VR
z`N4R43Yc$<qG+;IDrG~sup#1E7>0+B4qzYfIf^l6RtT{H0P{+z)93cyj;H?tT5GAL
zgkPL<Gg|8(uNK%>sZ=hQ`J9>eeGi3*w^ho_qlh??rs+hrT5T4JFxzB|SrtO813;e-
zc&}npX0C@}xZ?AB@Wmja3|0i#es)Sk*L~(Q@1MqZK&R_H2VMabwOcH-2k+nj0000<
KMNUMnLSTZZ&E$Xp

literal 329
zcmV-P0k-~$P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$14%?dR5(wq(yvYgF%SmuZ$8dq5d=pt2nZI-OB|Mj;Lg!*36ijF_X!B$k45ne
zC>%i$6gYxKAi13ZHX*s}t~f3?s>$>>GnrN}V@TWOoL5zK4*+{=jz#3md;ivfDW!8W
zdnftahGw>{s-Gc*;|`25UXi?Z&fT?PjByBHvnYztz?}1%svZLP0I)PQOevkJ>iDPH
zt%!`KhB3yH<fC)$=3k@E3to_X0`SnY)g4tGgb<FJ<xF<0s%oRI>k)v3o_G8*vm8Qr
z>A?2ovMjeq?t1UtWUhfJr4s;)W_JIVBx%2ARb3a6W$*odA6zlB0|0}b@s#AHbMCbR
bXZh#fJ{*}3<O3&T00000NkvXXu0mjf+>nfr

diff --git a/static/detail/home.png b/static/detail/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..b559f331e43317aab9d8225ac75c90ec934306d6
GIT binary patch
literal 4382
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

literal 0
HcmV?d00001

diff --git a/static/detail/jiangjia.png b/static/detail/jiangjia.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b02d0767fde3b4b3ea452563041fcf516c813eb
GIT binary patch
literal 1882
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
UeJ_~?WB>pF07*qoM6N<$f~IYU?f?J)

literal 0
HcmV?d00001

diff --git a/static/detail/miaosha.png b/static/detail/miaosha.png
new file mode 100644
index 0000000000000000000000000000000000000000..594a58dc224e9c260fed48029562a18ede01bc32
GIT binary patch
literal 2689
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

literal 0
HcmV?d00001

diff --git a/static/detail/rightIcon.png b/static/detail/rightIcon.png
index 8120b1fe6c40618101855370f88dd0602b80d06c..e449e8c506608f09aa5bad9a7142d5bc38174921 100644
GIT binary patch
literal 223
zcmeAS@N?(olHy`uVBq!ia0vp^96-#+!3HFS!eXZZDaPU;cPEB*=VV?2IWs+7978mM
zYbPl39dZzGz2A}Ku%%CVg48z#4;~fUd{!nQ4*?FD>l%x?M4h+!&c54N_NM-G`akir
zcbPLP>$M(UO>#3S_h(_RTKtinyHoG9Y4;nRO+VQ^3+6OiCGbf#W}c{-J11DL)A_m6
z&P6A(Cdi6;95MX%A!Uzb>80ay1e(>{_FVdrd?#(iua*t$e+8@Cld9SG+?Bah&zSKg
Vsnpu#n=H_g44$rjF6*2UngH8~Qn&yB

literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^EI`c8!3HGtQ{P+wQjEnx?oJHr&dIz4a-uw49780+
zlmDF0FX(;v|3Awye{p|910eV(exW=iAtmP2hwt?a9uovrx|BGC8aQ4(H8wC1bqM+J
za<-v?@w&7hzwM_8o{BsQR3&kv=RXshxWvD|{>?X;7(Q#LbGfXyUJA5@!PC{xWt~$(
F6984iI1K;*

diff --git a/static/detail/tip.png b/static/detail/tip.png
index 45fce69f4b5a5cba9d2faca84e2c89d28c7cfce2..460554f0b2c77383d08db9fb1178a456ab4393b6 100644
GIT binary patch
literal 2659
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
Rg>(P_002ovPDHLkV1k||@qz#V

literal 1252
zcmV<A1RMK_P)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00001b5ch_0Itp)
z=>Px(o=HSOR7gvumT7EMRTO}~^X9#QZqSy1f<ZP}H9=AE2VerqA|?VY3WAa*AVjEu
zh_Xf?fQpKUAT^*6i^x)9gC$^sD~O^9NTp#fh9Y~1p;MrpH}j6^jC5w&8A$Z}nz`rP
z^PT11d!BF`(Xz56GE#=(FaWd%!o48Ls8%9!2G!pXwvp=DCepq-kt>O(P}L-So(Ujx
z5YlfKNLVMAfQ4M~u9h}!s_NR;gJ@MnNBnjnBAxH-yq?7&EF)VQrk{$|#6Yyd(-VW8
zC`tbTaBE8iLT^dUEWWi+3(<<p9WY#f{7*mx6tufZ`dy)nLXc2{8z=9-V~PCL*z+f#
zXG@WkG-%NZqsv1`$F4}rwn(Flr~>GIE_ixM`}WmgNQLKhgvGZlQ80)-IUD1NEL=lI
zqX8RE9l`l?AI|>W=<#B#_ctT0?u&NwlB8vREa5CtE+8~Y2yueg@4SX2r(sT-Uu)(Z
zFGdgkg3;$`^z>1j9h))d<we{G=SazDEn4XriLyQ+Kplb`@^B9C$9i*3t(ji)V2>Gq
z>-k)Q`O9#Bu?PQ{{#YxwB8@X6?o<YgR(L)`7#$a)it~LD!GhITc||cM&dCy-f=@7W
z=V6Z@g!$1{f=g#%3?7Z~aIc81<E#|*c}jpT@gUBjy#(Kzj<xQ`u=?h8NJ^<SwWp0l
zPanfI;SF4m4<`8CSLn&ZnB!)}901XZavvh8bs<`M6npv$Sey1Dh6}20;(w+)?xMqq
zD{K1+OdNu>YI`)~VofGm4{)Ijd)$*)pYM(wOMf-~tZuls)g&HYoPE0pZp_14vLU+p
z*F}Bh*F%rqzoO-ruygugF5809wlmI=g9K*gV9s1hU_mbCoD~EXOoXP*aj*Rb#0c%w
zGbgcM&ca&zEt1)^ZYJd=AhkWQUmS>Q{A`RzdWQ`CIejq~eoA2SFsQnL(Jvb;H_rBr
zxC;-0y8-I+Vvp{F_2CwzWxLokg<orWvKEn?P&A%P*psrc@_z{T0dS5L6Ie7EbH)+^
z(?;ShD#6)Vi1c_2$!vz!+@VpuG3Tzt==5N`IxZLWd53{ha7!E9z6odZD$M0yB593d
zHia5rurIQviamA!#<&@{9_<^yQKADyRo(cmUW}d_&Vio@y!8s!yX%qG9U@0IcPQ41
z!pQ$A&tmk;!Zm0(NZip>#<9|N;kWBr`4kLU8XZdL2u~Y{`RdykJ^P27>n%spn}mMb
z3vw~;X^ksqDj4DB*Aqj=NJ_?<FyzFE2Hf4`XP{dQ=*k7`sUvVb^&GC@<7-uc)r-;d
zXRu~31D6>e0DDM1-&f>*e`KC`z3p&02O##L)Ekuqrj9^5b;X>rh~U=+I9v0vmKTDV
z5a7kt@Bv9q{<|iE*vVLVwJWN->Vl}QBJja1w5$}pd>;3@U7@3!K)j&6B&|v9t*t-f
zz23H%x)Igxb)D$BzmTRaLiZ%DD7!Fqlq5Gf8?8_9wNm1yviVrhxggCFg&ehBhU$FM
zGV?{mu4^9`a?40nEqqr7BCY|U%tYD%4MA^!lmfqFu!H1`ogxxQ6wE)n7TUHc#zV^h
O0000<MNUMnLSTZsE?i9j

diff --git a/static/detail/ys.png b/static/detail/ys.png
index 2d90aa36c5fe4803643e2834a6702d04e532f0ba..6964c22cef117ae1b9df23fd908a576af324510d 100644
GIT binary patch
literal 1631
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

literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px%%t=H+R7gv`mPcq5VHk#=Z;BX`h(;7e1sj6(Ab83_Q1K$fg0V&PA{fiTi!Flf
z5Rt@-SP((M8VlYef&~;oK@eN;U~C{pl&pzS)a=av$;|A=>}EGRQSd*`|IPb+^OyG>
zp_idQzKkKMD-fLnOaU1hmFp*<36<NpR)Z7`dXrB^a!rK7o~Z*_3|PH20T|FrICf1g
zP!E8%C#n!Vj!1C<;mm2(Z&<QUO3Kc6pU42{*TfEl+CB+q7b`U~uxx+&aTh?pC03%G
z`zP@~s;i`=EYu1C`lD?uN&hJ#C2;}TmH^`;WkXR_%$;jkv*sfrp!yxxnkq$u-$sCr
z)(arZ<BA7$=JgA_eH*ctRb!f)pt%X>z-grafRv10k<uZR5_a#I<`}1?2j9GWj<<O!
zGGQ`K?J1<Vw0n)gk@51k8yhT(cX&_Kc~9}wb)iPIqxA;J+`cSNQ0twnN1r^%FCJaU
zTLIt$$cVlG;)#cVkD?t353qCI=#F;$Glwvb?t$%KmCu9DpXjrP1v>9i^Ya3<^B3Oc
zN|-ned%<ex{Dt3e41N3n_skunWMG_+4gjq!Aj7k({p*)8cN=kQPj*eI?~z<zfm6K`
zYesntfVKpHn;?N(W{lv3$f&W{3)f^mKe87YHWIsXZ5+VOyvNi(cNlF?;B45HA(Y&`
zF1)e!?25vGz?ULx)>qjVO+UUTxoHvhwtDQDvm!fayoi7PDDH_yq^O|T8XRjv+A1!C
zEXi)kJid>2a67pDAlV7Ur8rybu*OX)+&$VLr9)Pv%q~bS^E_7u1RJaGn!$0A(c>aB
zD>Q;^aP8?q0Cl(PDwMN@-i<XcRHcLG{{>FEvoLr}7@4uNA+nt?GON=;lh(@<`hkV}
zwIEAl*tkLUDz3F92$<|8>~+VYq%+GAot^q^85RlX=hSb@EnK;fOE?Ys4YzDJTpKgl
QL;wH)07*qoM6N<$f||x|k^lez