Merge branch 'master' of http://47.98.226.240:3000/twt/wxThird

* 'master' of http://47.98.226.240:3000/twt/wxThird:
  1111
  bug修改

components/timeSelect/timeSelect.vue

@@ -132,10 +132,10 @@ export default {
 	  .cancle-text {
 	    position: absolute;
 	    right: 5%;
-	    top: 28rpx;
+	    line-height: 90rpx;
 	    font-size: 28rpx;
-	    line-height: 100%;
 		color: #999999;
+		top: 0;
 	  }
 	}
 	.time-select-popup-body{
@@ -209,7 +209,7 @@ export default {
 	        background-color: rgb(255, 255, 255);
 	        height: 80rpx;
 	        border: 1px solid #FF0000;
-	        color:#FF0000;
+	        color:#FF0000 !important;
 	        position: relative;
 	        &:before{
 	          position: absolute;
@@ -229,9 +229,17 @@ export default {
 	}
 	.time1{
 		font-size: 24rpx;
+		
 	}
 	.time2{
 		font-size: 24rpx;
+		
+	}
+	.timeSelect--select .time1{
+		color: #FF0000;
+	}
+	.timeSelect--select .time2{
+		color: #FF0000;
 	}
 	.time-select-popup-body-button{
 	  position: fixed;

pages/index/confirmYuyue.vue

@@ -17,7 +17,7 @@
 			  </view>
 			  <view class="kklineRight">
 				  <span>{{carInfo.plateNumber?carInfo.plateNumber:'请选择'}}</span>
-				  <img src="../../static/timg/icon_arrow_right.png" alt="" class="rightJt">
+				  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 			  </view>
 		  </view>
 		  <view class="kkline lineborderNo">
@@ -26,7 +26,7 @@
 			  </view>
 			  <view class="kklineRight" @click="cktime">
 				  <span>{{billDate?billDate:'请选择'}}</span>
-				  <img src="../../static/timg/icon_arrow_right.png" alt="" class="rightJt">
+				  <img src="../../static/img/big_rightArrow.png" alt="" class="rightJt">
 			  </view>
 		  </view>
 		</view>
@@ -124,9 +124,13 @@
 									   })
 							        } else if (res.cancel) {
 							           // console.log('用户点击取消');
-									   uni.reLaunch({
-										   url:'../user/bespeakDetail?id='+id
+									   // uni.reLaunch({
+										  //  url:'../user/bespeakDetail?id='+id
+									   // })
+									   uni.redirectTo({
+									   		url:'../user/bespeakDetail?id='+id
 									   })
+									   
 							        }
 							    }
 							});
@@ -202,9 +206,9 @@
 	width: 200rpx;
 }
 .rightJt{
-	width: 12rpx;
-	height: 20rpx;
-	margin-top: 6rpx;
+	width: 30rpx;
+	height: 30rpx;
+	margin-top: 4rpx;
 }
 .lineborderNo{
 	border-bottom: none;

pages/index/index.vue

@@ -58,10 +58,11 @@
 		</view>
 		
 		<!-- 服务顾问 -->
-		<view class="adviser" v-if="homeCardList.openMUsers.showType==1" @click="goMUsers">
+		 <view class="adviser" v-if="managerInfo" @click="goMUsers">
 			<view class="adviserLeft">
-				<img src="../../static/timg/pic_def_ava@2x.png" alt="" class="advisertx">
-				<view class="adviserNema">{{homeCardList.openMUsers.operatorName}}</view>
+				<img v-if="managerInfo.avatar" :src="managerInfo.avatar" alt="" class="advisertx">
+				<img v-else src="../../static/timg/pic_def_ava@2x.png" alt="" class="advisertx">
+				<view class="adviserNema">{{managerInfo.name}}</view>
 				<view class="adviserms">服务顾问</view>
 			</view>
 			<img src="../../static/timg/icon_arrow_right.png" alt="" class="adviserJt">
@@ -140,38 +141,40 @@
 			</view>
 		</view>
 		<!-- 热门商品 -->
-		
-		<view class="Hot">
-			<view class="hotTop">
-				<view class="hotLeft">
-					<view class="hotSx"></view>
-					<view class="hottitle">热门商品</view>
-				</view>
-				<view class="hotRight">
-					<view class="hotMore">更多</view>
-					<img src="../../static/timg/icon_arrow_right.png" alt="" class="hotMoreJt">
-				</view>
-			</view>
-			
-			<view class="hotGoodsLine" v-for="(item,index) in 5">
-				<view>
-					<image src="../../static/timg/nocar.png" mode="" class="hotGoodsLineImg"></image>
+		<view class="" v-if="homeCardList">
+			<view class="Hot" v-if="homeCardList.openMGoods.showType==1">
+				<view class="hotTop">
+					<view class="hotLeft">
+						<view class="hotSx"></view>
+						<view class="hottitle">热门商品</view>
+					</view>
+					<view class="hotRight">
+						<view class="hotMore">更多</view>
+						<img src="../../static/timg/icon_arrow_right.png" alt="" class="hotMoreJt">
+					</view>
 				</view>
-				<view class="hotGoodsLineRIght">
-					<view class="goodsName">德国马牌 Continental 全新升级6代 TechContct德国马牌 Continental 全新升级6代 TechContct</view>
-				    <view class="Sold">已售 999</view>
-					<view class="goodsPrice">
-						<view class="goodsPrice1">店庆价</view>
-						<view class="goodsPrice2">￥</view>
-						<view class="goodsPrice3">999</view>
-						<view class="goodsPrice3">￥893</view>
+				
+				<view class="hotGoodsLine" v-for="(item,index) in homeCardList.openMGoods.goodsList" @click="goGoods(item)">
+					<view>
+						<image :src="item.url" mode="" class="hotGoodsLineImg"></image>
+					</view>
+					<view class="hotGoodsLineRIght">
+						<view class="goodsName">{{item.name}}</view>
+					    <view class="Sold">已售 {{item.saleQty}}</view>
+						<view class="goodsPrice">
+							<view class="goodsPrice1">{{item.saleLabel}}</view>
+							<view class="goodsPrice2">￥</view>
+							<view class="goodsPrice3">{{item.salePrice}}</view>
+							<view class="goodsPrice4" v-if="item.scribingPrice">￥{{item.scribingPrice}}</view>
+						</view>
 					</view>
 				</view>
+				
 			</view>
-			
 		</view>
 		
 		
+		
 		<view style="height: 60rpx;"></view>
 		<!-- 手机号授权 -->
 		<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
@@ -205,6 +208,7 @@
 				authorizShow:false,
 				miniAppName:'',
 				iStatusBarHeight:'',
+				managerInfo:'',
 			}
 		},
 		onLoad() {
@@ -231,6 +235,7 @@
 				//this.wxOpenData = uni.getStorageSync("wxOpenData");
 				this.getCarList();
 				this.queryHomeCardList()
+				this.queryManagerInfo()
 			}else{
 				this.uniLogin()
 			}
@@ -271,6 +276,15 @@
 					
 				}
 			},
+			goGoods(item){
+				if(!this.userInfo){
+					this.authorizShow=true;
+				}else{
+					uni.navigateTo({
+						url:'../shop/goodsDetail?id='+item.id
+					})
+				}
+			},
 			goRoter(item){
 				console.log(item)
 				if(!this.userInfo){
@@ -292,25 +306,14 @@
 						})
 					}else if(item.bizType==4){ //在线预约
 						uni.navigateTo({
-							url:'onlineBooking'
+							url:'onlineBooking?naShopId='+item.naShopId
 						})
 					}else if(item.bizType==5){ //导航
-						uni.openLocation({
-							latitude:'36.671541' ,
-							longitude:'117.138777',
-							name: '',
-							address: '',
-							success: function() {
-								console.log('success');
-							},
-							fail(err) {
-								console.log(err)
-							}
-						});
+						
+						this.getShopinfo(5,item.reShopId)
 					}else if(item.bizType==6){ //联系本店
-						uni.makePhoneCall({
-							phoneNumber: 10086
-						});
+					    this.getShopinfo(6,item.orShopId)
+						
 					}else if(item.bizType==7){ //7门店列表
 						uni.navigateTo({
 							url:'shopList'
@@ -344,9 +347,17 @@
 							url:'../user/checkReport'
 						})
 					}else if(item.bizType==14){ //指定商品分类
-						uni.navigateTo({
-							url:'../shop/shop'
-						})
+					uni.setStorage({
+							key: 'shopcategoryID',
+							data: item.bizId,
+							 success: function () {
+								getApp().globalData.shopcategoryID=item.bizId;
+								uni.switchTab({
+									url:'../shop/shop?shopcategoryID='+ item.bizId
+								})
+							 }
+						});
+						
 					}else if(item.bizType==15){ //商品详情
 						uni.navigateTo({
 							url:'../shop/goodsDetail?id=CD2D70DC-706C-4441-9864-33BD19457CAE'
@@ -422,6 +433,7 @@
 					if(this.wxOpenData.loginInfo){
 						this.$store.commit('mutationsuserInfo', that.wxOpenData.loginInfo.openUser)
 						this.userInfo=that.wxOpenData.loginInfo.openUser
+						that.queryManagerInfo()
 						uni.setStorage({
 							key: 'userInfo',
 							data: that.wxOpenData.loginInfo.openUser,
@@ -455,6 +467,7 @@
 							 success: function () {
 							     that.getCarList()
 							     that.queryHomeCardList()
+								 that.queryManagerInfo()
 							 }
 						}); 
 					}
@@ -474,6 +487,15 @@
 				 	 				
 				  })
 			 },
+			 queryManagerInfo(){
+				 console.log("11")
+				 this.$http('openHome/queryManagerInfo', {
+				   
+				  },'GET').then(res => {
+				 	this.managerInfo=res.data
+				 	 				
+				  })
+			 },
 			 queryHomeCardList(){
 				 //console.log(this.wxOpenData)
 				 this.$http('openHome/queryHomeCardList', {
@@ -482,6 +504,39 @@
 					    uni.hideLoading();
 				 		this.homeCardList=res.data
 				  })
+			 },
+			 getShopinfo(num,shopId){
+				 var that=this;
+				 uni.showLoading({
+				 	title: '加载中'
+				 })
+				 if(!shopId){
+					 shopId=''
+				 }
+				 this.$http('openmy/getShopinfo', {
+				   shopId:shopId
+				  },'GET').then(res => {
+				 	  uni.hideLoading();
+					  var res=res.data
+				 	  if(num==5){
+						  uni.openLocation({
+						  	latitude:Number(res.lat),
+						   	longitude:Number(res.lng),
+						   	name: res.shopName,
+						   	address: res.address,
+						  	success: function() {
+						   		console.log('success');
+						   	},
+						   	fail(err) {
+						   		console.log(err)
+						   	}
+						   });
+					  }else{
+						   uni.makePhoneCall({
+						    	phoneNumber: res.contactorPhone
+						   });
+					  }
+				  })
 			 }
 			 
 		}
@@ -906,21 +961,27 @@
 		font-size: 24rpx;
 		font-weight: 400;
 		color: #FF0000;
+			padding-top: 5rpx;
 	}
 	.goodsPrice2{
 		font-size: 22rpx;
 		font-weight: 400;
 		color: #FF0000;
+		padding-top: 10rpx;
 	}
 	.goodsPrice3{
 		font-size: 32rpx;
-		font-weight: 400;
+		font-weight: 500;
 		color: #FF0000;
 	}
-	.goodsPrice3{
+	
+	.goodsPrice4{
 		font-size: 24rpx;
 		font-weight: 400;
 		color: #999999;
+		padding-top: 8rpx;
+		padding-left: 5rpx;
+			text-decoration:line-through;
 	}
 	.Sold{
 		font-weight: 400;

pages/index/onlineBooking.vue

@@ -3,7 +3,7 @@
 		<view class="top">
 			<view class="shopTop">
 				<swiper class="swiper" circular  :autoplay="false" :interval="interval"
-								:duration="duration">
+								:duration="duration" v-if="shopInfo.imgs">
 					<swiper-item v-for="(item,index) in shopInfo.imgs.split(',')">
 						<view class="swiper-item">
 							<img mode="aspectFit" :src="item" alt="">
@@ -19,7 +19,7 @@
 			    <view class="newshopDtime">
 			      营业时间： <span>{{shopInfo.startTime}} - {{shopInfo.endTime}}</span>
 			    </view>
-			    <view class="newshopDbqbox" >
+			    <view class="newshopDbqbox" v-if="shopInfo.brands">
 			      <view class="newshopDbqline" v-for="(item,index) in shopInfo.brands.split(',')">{{item}}</view>
 			    </view>
 			  </view>
@@ -31,7 +31,7 @@
 			        <span class="shopDdistance" v-else-if="Number(shopInfo.distance)">距离{{shopInfo.distance*1000}}m</span>
 			        <span class="shopDdistance" v-else>距离--km</span> -->
 			      </view>
-			      <view class="newshopDadressName">{{shopInfo.address}}</view>
+			      <view class="newshopDadressName">{{shopInfo.address?shopInfo.address:'--'}}</view>
 			    </view>
 			    <view class="newshopDaright">
 			      <view class="newshopDrline" @click="goLocation()">
@@ -68,6 +68,10 @@
 					 <view class="yuyue-price"> <span class="qianhaospan">￥</span> {{item.Price||'--'}} </view>
 				</view>
 			</view>
+			<view  class="nodataBox" v-if="rightData.length==0">
+				<image src="http://dmsphoto.66km.com.cn/thFiles/3C95A4C5-73F8-4B34-902B-703B8A0825C9.png" mode="widthFix" class="nodataImg"></image>
+				<view class="noTxt">暂无数据</view>
+			</view>
 			
 			
 		</view>
@@ -128,10 +132,16 @@
 					lat: '',
 				},
 				shopInfo:'',
+				naShopId:'',
 			}
 		},
-		onLoad() {
+		onLoad(opt) {
 			this.userInfo = uni.getStorageSync("userInfo");
+			this.naShopId=opt.naShopId;
+			if(this.naShopId == null ||this.naShopId == 'null' ){
+				this.naShopId=''
+			}
+			console.log(this.naShopId)
 			var that = this;
 			uni.getLocation({
 				type: 'gcj02',
@@ -161,10 +171,11 @@
 					title: '加载中'
 				})
 				var that=this;
+				
 				this.$http('openreservation/getInfo', {
 					lat: this.location.lat ? this.location.lat : '',
 					lng: this.location.lng ? this.location.lng : '',
-					
+					shopId:this.naShopId,
 				}, 'GET').then(res => {
 					this.shopInfo = res.data.shopInfo;
 					uni.setStorage({
@@ -283,6 +294,18 @@
 </script>
 
 <style scoped lang="less">
+.nodataBox{
+	text-align: center;
+}
+.nodataImg{
+	  width: 400rpx;
+	  padding-top: 100rpx;
+}
+.noTxt{
+	font-size: 32rpx;
+	color: #999999;
+	padding-top: 50rpx;
+}
 .box{
 	background: #F4F5F7;
 	min-height: 100vh;
@@ -407,7 +430,7 @@
 	
 }
 .yuyueRight{
-	width: 572rpx;
+	width: 596rpx;
 	background: #FFFFFF;
 
 	
@@ -424,8 +447,9 @@
 }
 .yuyueRightTitle{
 	color: #999999;font-size: 26rpx;
-	padding: 30rpx 0;background: #F9F9F9;
-		padding-left: 24rpx;
+	background: #F9F9F9;
+	padding-left: 24rpx;
+	line-height: 62rpx;
 }
 .yrTop{
 	display: flex;
@@ -526,7 +550,7 @@
 }
 .yydetailCont{
 	width: 100vw;
-	height: 50vh;
+	height: calc(50vh + 2rpx) ;
 	overflow-y: scroll;
 	background: #F0F0F0;
 	position: absolute;

pages/shop/ckshopList.vue

@@ -202,7 +202,7 @@
 
 	.brandsBg {
 		display: flex;
-        height: 40rpx;
+        height: 38rpx;
 		flex-wrap: wrap;
 		align-items: center;
 		overflow: hidden;

pages/shop/goodsDetail.vue

@@ -13,7 +13,7 @@
 	<view class="shopCont">
 		<view class="shopCtop">
 			<view class="goodsPrice">
-				<view class="goodsPrice1">店庆价</view>
+				<view class="goodsPrice1">{{info.saleLabel}}</view>
 				<view class="goodsPrice2">￥</view>
 				<view class="goodsPrice3">{{info.salePrice?info.salePrice:info.scribingPrice}}</view>
 				<view class="goodsPrice4" v-if="info.scribingPrice">￥{{info.scribingPrice}}</view>
@@ -31,7 +31,7 @@
 		</view>
 		<view class="modeline">
 			<view class="modelineLeft">限购数量</view>
-			<view class="modeLineRight">{{info.oneQty}}</view>
+			<view class="modeLineRight" v-if="info.oneQty">{{info.oneQty}}</view>
 		</view>
 		<view class="modeline">
 			<view class="modelineLeft">售后服务</view>
@@ -53,7 +53,7 @@
 		<view class="fwTxt">
 			<view class="fwTxtline">选择商品</view>
 			<view class="fwTxtline">选择门店</view>
-			<view class="fwTxtline">在线开卡</view>
+			<view class="fwTxtline">在线支付</view>
 			<view class="fwTxtline">到店服务</view>
 		</view>
 	</view>
@@ -84,9 +84,10 @@
 		</view>
 	</view>
 	<!-- 商品详情 -->
-	<view class="goodsDetail">
+	<view class="goodsDetail" v-if="info.details">
 		<view class="goodsDetailTitle">商品详情</view>
-		<view v-html="info.details" style="background: #fff;"></view>
+		<!-- <view v-html="info.details" style="background: #fff;"></view> -->
+		 <rich-text :nodes="info.details" style="font-size: 0px;background: #fff;"></rich-text>
 	</view>
 	<view style="height: 120rpx;"></view>
 	
@@ -117,7 +118,7 @@
 						<view class="goodsName2">{{info.name}}</view>
 					    <view class="Sold">已售 {{info.saleQty}}</view>
 						<view class="goodsPrice">
-							<view class="goodsPrice11">店庆价</view>
+							<view class="goodsPrice11">{{info.saleLabel}}</view>
 							<view class="goodsPrice22">￥</view>
 							<view class="goodsPrice33">{{info.salePrice?info.salePrice:info.scribingPrice}}</view>
 							<view class="goodsPrice44" v-if="info.scribingPrice">￥{{info.scribingPrice}}</view>
@@ -129,7 +130,7 @@
 				<view class="bugNUm">
 					<view class="bugNUmLeft">
 						<view class="buySl">数量</view>
-						<view class="buyXg">限购{{info.oneQty}}件</view>
+						<view class="buyXg" v-if="info.oneQty">限购{{info.oneQty}}件</view>
 					</view>
 					<view class="numJsbox">
 						<view class="numJj" @click="calculation(1)">-</view>
@@ -193,9 +194,19 @@
 			},
 			openGoodsDetailById(){
 				this.$http('openMall/openGoodsDetailById', {
-				  id:this.id
+				  id:this.id,
+				  GoodsID:this.id,
 				 },'GET').then(res => {
-						this.info=res.data			
+						this.info=res.data;
+						if(this.info.details){
+							this.info.details = this.info.details.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
+						}
+						var item={
+							shopId:this.info.shopId,
+							shopName:this.info.shopName
+						}
+						this.shopInfo=item
+					    this.$store.commit('mutationsckshopInfo', item)
 				 })
 			},
 			goINdex(){
@@ -339,7 +350,7 @@ color: #F4F5F7;
 }
 .buyNumBox{
 	padding: 30rpx;
-    
+    padding-top: 10rpx;
 }
 .buyContCh{
 	position: absolute;
@@ -400,7 +411,7 @@ color: #F4F5F7;
 	}
 	.goodsPrice33{
 		font-size: 32rpx;
-		font-weight: 400;
+		font-weight: 500;
 		color: #FF0000;
 	}
 	.goodsPrice44{
@@ -409,6 +420,7 @@ color: #F4F5F7;
 		color: #999999;
 		padding-top: 8rpx;
 		padding-left: 5rpx;
+			text-decoration:line-through;
 	}
 	
 	
@@ -454,8 +466,14 @@ color: #F4F5F7;
 }
 .goodsDetail{
 	margin-top: 20rpx;
+	padding-bottom: 30rpx;
+}
+.goodsDetail img{
+	width: 750rpx;
+}
+.goodsDetail image{
+	width: 750rpx;
 }
-
 .mealBox{
 	background: #FFFFFF;
 	padding: 20rpx 24rpx;
@@ -513,7 +531,7 @@ color: #F4F5F7;
   margin-top: 20rpx;
 }
 .fwlcxian{
-	padding:30rpx 42rpx 20rpx 42rpx ;
+	padding:30rpx 42rpx 10rpx 42rpx ;
 	display: flex;
 }
 .fwlcyuan{
@@ -577,7 +595,6 @@ color: #F4F5F7;
 	font-size:28rpx;
 	font-weight: 400;
 	color: #FF0000;
-	
 	padding-right: 10rpx;
 }
 .goodsPrice3{
@@ -595,7 +612,7 @@ color: #F4F5F7;
 		font-weight: 400;
 		color: #999999;
 		font-size: 24rpx;
-		padding-top: 10rpx;
+		padding-top: 16rpx;
 }
 .goodsName{
 	font-size: 30rpx;
@@ -603,6 +620,8 @@ color: #F4F5F7;
 	font-weight: 500;
 	color: #333333;
 	padding: 20rpx 24rpx;
+	padding-top: 0;
+	padding-bottom: 16rpx;
 }
 .goodsMd{
 	font-weight: 400;

pages/shop/shop.vue

@@ -4,6 +4,7 @@
 		<view class="sstop">
 			<image src="../../static/timg/icon_search@2x.png" mode="" class="sstopimg"></image>
 			<input type="text" v-model="name" placeholder="请输入商品名称" class="sstopInput" @confirm="ssList">
+			<image src="../../static/img/icon_close.png" mode="" @click="empty" v-if="inputChShow" class="inputCh"></image>
 		</view>
 		<scroll-view scroll-x="true" class="scroll-Y" >
 			<view class="classificationBox">
@@ -17,27 +18,27 @@
 			<view class="paixuLine" @click="defaultpx" :class="{pxActive:defaultpxActive}">
 				默认排序
 			</view>
-			<view class="paixuLine">
+			<view class="paixuLine" @click="xlPx(1)">
 				<view :class="{pxActive:salessort}">销量</view>
 				<view class="paixuLineTbBox">
-					<view class="paixuLineTbtop" @click="xlPx(1)">
+					<view class="paixuLineTbtop" >
 						<image  v-if="salessorts" src="../../static/timg/icon_arrow_up_pre@2x.png" mode="" class="paixuLineTbtopIcon paixuLineTbtopIcons"></image>
 						<image  v-else src="../../static/timg/icon_arrow_up_def@2x.png" mode="" class="paixuLineTbtopIcon paixuLineTbtopIcons"></image>
 					</view>
-					<view class="paixuLineTbtop" @click="xlPx(2)">
+					<view class="paixuLineTbtop">
 						<image v-if="salessortx" src="../../static/timg/icon_arrow_pre@2x.png" mode="" class="paixuLineTbtopIcon paixuLineTbtopIconx"></image>
 						<image v-else src="../../static/timg/icon_arrow_def@2x.png" mode="" class="paixuLineTbtopIcon paixuLineTbtopIconx"></image>
 					</view>
 				</view>
 			</view>
-			<view class="paixuLine">
+			<view class="paixuLine" @click="jgpx(1)">
 				<view :class="{pxActive:pricesort}">价格</view>
 				<view class="paixuLineTbBox">
-					<view class="paixuLineTbtop" @click="jgpx(1)">
+					<view class="paixuLineTbtop" >
 						<image v-if="pricesorts" src="../../static/timg/icon_arrow_up_pre@2x.png" mode="" class="paixuLineTbtopIcon paixuLineTbtopIcons"></image>
 						<image v-else src="../../static/timg/icon_arrow_up_def@2x.png" mode="" class="paixuLineTbtopIcon paixuLineTbtopIcons"></image>
 					</view>
-					<view class="paixuLineTbtop" @click="jgpx(2)">
+					<view class="paixuLineTbtop">
 						<image v-if="pricesortx" src="../../static/timg/icon_arrow_pre@2x.png" mode="" class="paixuLineTbtopIcon paixuLineTbtopIconx"></image>
 						<image v-else src="../../static/timg/icon_arrow_def@2x.png" mode="" class="paixuLineTbtopIcon paixuLineTbtopIconx"></image>
 					</view>
@@ -55,10 +56,10 @@
 	   					<view class="goodsName">{{item.name}}</view>
 	   				    <view class="Sold">已售 {{item.saleQty}}</view>
 	   					<view class="goodsPrice">
-	   						<view class="goodsPrice1">店庆价</view>
+	   						<view class="goodsPrice1">{{item.saleLabel}}</view>
 	   						<view class="goodsPrice2">￥</view>
 	   						<view class="goodsPrice3">{{item.salePrice?item.salePrice:item.scribingPrice}}</view>
-	   						<view class="goodsPrice4" v-if="item.salePrice">￥{{item.scribingPrice}}</view>
+	   						<view class="goodsPrice4" v-if="item.salePrice&&item.scribingPrice">￥{{item.scribingPrice}}</view>
 	   					</view>
 	   				</view>
 	   			</view>
@@ -112,10 +113,26 @@
 				authorizShow:false,
 				code:'',
 				wxOpenData:'',
+				shopcategoryID:'',
+				inputChShow:false,
 			}
 		},
-		onLoad() {	 
+		  watch:{
+				name(val){
+					console.log(val)
+					if(val){
+						this.inputChShow=true
+					}
+				},
+				
+		},
+		onLoad(opt) {	
+			console.log(getApp().globalData.shopcategoryID)
 			//this.userInfo = uni.getStorageSync("userInfo");
+			this.shopcategoryID=getApp().globalData.shopcategoryID;
+			if(this.shopcategoryID){
+				this.categoryID=this.shopcategoryID
+			}
 			this.userInfo=this.$store.state.userInfo;
 			this.wxOpenData=this.$store.state.wxOpenData
 			this.getcategoryList();
@@ -130,9 +147,32 @@
 			     console.log(err)
 				}
 			}); */
+			
+		},
+		onShow() {
+			var shopcategoryID  = uni.getStorageSync("shopcategoryID")
+			if(shopcategoryID){
+				uni.removeStorageSync('shopcategoryID');
+				if(this.categoryList){
+					this.categoryList.forEach((item,index)=>{
+						//console.log(item.id)
+						if(item.id==shopcategoryID){
+						  this.topIndex=index	
+						}
+					})
+					this.categoryID=shopcategoryID;
+					this.list=[];
+					this.page=1;
+					this.getlistOpenGoodsPage()
+				}
+			}
 		},
-		
 		methods: {
+			empty(){
+				console.log("情况")
+				this.name='';
+				this.inputChShow=false;
+			},
 			decryptPhoneNumber: function(e) {
 			  console.log(e);
 			  this.code=e.detail.code
@@ -167,6 +207,9 @@
 				this.pricesort=false;
 				this.pricesorts=false;
 				this.pricesortx=false;
+				if(this.salessorts){
+					num=2
+				}
 				if(num==1){
 					this.salessorts=true;
 					this.salessortx=false;
@@ -188,6 +231,9 @@
 				this.salessort=false;
 				this.salessorts=false;
 				this.salessortx=false;
+				if(this.pricesorts){
+					type=2
+				}
 				if(type==1){
 					this.pricesorts=true;
 					this.pricesortx=false;
@@ -254,7 +300,16 @@
 							id:'',
 							name:'全部'
 						}
-						this.categoryList.unshift(obj)
+						this.categoryList.unshift(obj);
+						if(this.shopcategoryID){
+							//console.log(this.shopcategoryID)
+							this.categoryList.forEach((item,index)=>{
+								//console.log(item.id)
+								if(item.id==this.shopcategoryID){
+								  this.topIndex=index	
+								}
+							})
+						}
 				 })
 			},
 			
@@ -265,8 +320,8 @@
 				   limit:this.limit,
 				   name:this.name,
 				   categoryID:this.categoryID,
-				   order:this.order,
-				   orderBy:this.orderBy,
+				   orderBy:this.order,
+				   order:this.orderBy,
 				 },'GET').then(res => {
 					 uni.hideLoading();
 						var data=res.data.Items;
@@ -284,6 +339,14 @@
 </script>
 
 <style scoped lang="less">
+.inputCh{
+width:40rpx;
+height: 40rpx;
+position: absolute;
+right: 40rpx;
+top: 40rpx;
+z-index: 11;
+}
 .pxActive{
 	color: #FF0000 !important;
 }
@@ -294,10 +357,10 @@
 	padding-left: 10rpx;
 }
 .paixuLineTbtopIconx{
-	padding-bottom:20rpx;
+	padding-bottom:24rpx;
 }
 .paixuLineTbtopIcons{
-	padding-top: 6rpx;
+	padding-top: 8rpx;
 }
 .paixuLineTbBox{
 	display: flex;
@@ -365,7 +428,7 @@
 	}
 	.hotGoodsLine{
 		margin-top: 20rpx;
-		padding: 20rpx;
+		padding:0rpx 20rpx;
 		background: #FFFFFF;
 		border-radius: 16rpx;
 		display: flex;
@@ -407,11 +470,11 @@
 		font-size: 22rpx;
 		font-weight: 400;
 		color: #FF0000;
-		padding-top: 8rpx;
+		padding-top: 10rpx;
 	}
 	.goodsPrice3{
 		font-size: 32rpx;
-		font-weight: 400;
+		font-weight: 500;
 		color: #FF0000;
 	}
 	.goodsPrice4{
@@ -419,6 +482,7 @@
 		font-weight: 400;
 		color: #999999;
 		padding-top: 8rpx;
+		text-decoration:line-through;
 	}
 	.Sold{
 		font-weight: 400;