1

pages/index/index.vue

@@ -199,15 +199,20 @@
 			<!-- 商品区 -->
 			<view class="goodsBox">
 				<view class="goodsTabBox">
-					<view class="goodsTab " :class="{goodsACt:tabIndex==index}" v-for="(item,index) in appletHomeSetting.sortSettingList">
+					<!-- <view class="goodsTab " :class="{goodsACt:tabIndex==index}" v-for="(item,index) in appletHomeSetting.sortSettingList">
 						<view @click="tabFn(index,item.type)" v-if="item.type==2">热销商品</view>
 						<view @click="tabFn(index,item.type)" v-if="item.type==1">热门活动</view>
 						<view @click="tabFn(index,item.type)" v-if="item.type==3&&homeCardList.isShowMaintain==1">{{homeCardList.maintainTitle}}</view>
+						<image v-if="tabIndex==index" class="activeGoodsIcon" src="../../static/img2/activeGoods.png" mode=""></image>
+					</view> -->
+					<view class="goodsTab " :class="{goodsACt:tabIndex==index}" v-for="(item,index) in navigationList">
+						<view @click="tabFn(index,item.showType,item.id)">{{item.title}}</view>
+		
 						<image v-if="tabIndex==index" class="activeGoodsIcon" src="../../static/img2/activeGoods.png" mode=""></image>
 					</view>
 					
 				</view>
-				<view class="goodsLIneBox" v-if="tabType==3">
+				<view class="goodsLIneBox" v-if="tabType==1">
 					<view class="goodsLine" @click="goMaintain(item)" v-for="(item,index) in byList">
 						<view class="goodsLeft">
 							<image class="goodsIcon" v-if="item.mainImgUrl" :src="item.mainImgUrl" mode=""></image>
@@ -215,8 +220,12 @@
 						</view>
 						<view class="goodsRight">
 							<view class="goodsRtop">
-								<view class="goodsName">{{item.title}}</view>
-								<view class="goodsMs">{{item.remarks}}</view>
+								<view style="display: flex;">
+									<view class="isRecommend" v-if="item.isRecommend==1">适配</view>
+									<view class="goodsName">{{item.title}}</view>
+								</view>
+								
+								<view class="goodsMs">{{item.showContent}}</view>
 							</view>
 							<view class="goodsRb">
 								<view class="goodsCBox">
@@ -226,7 +235,7 @@
 										</view>
 										<view class="goodsPriceBox" v-for="(v,i) in item.packageItems" v-if="v.isDefault==1">
 											<span class="goodsPrice11">￥</span>
-											<span class="goodsPrice22">{{v.crossedPrice}}</span>
+											<span class="goodsPrice22">{{v.price}}</span>
 											<span class="goodsPrice33">/次¥{{v.money}}</span>
 										</view>
 									</view>
@@ -235,9 +244,9 @@
 									</view>
 								</view>
 								<view class="goodsKbox">
-									<view class="goosK1" v-if="item.showOilType">{{item.showOilType}}</view>
-									<view class="goosK2" v-if="item.showOilLevel">{{item.showOilLevel}}</view>
-									<view class="goosK2" v-if="item.showFit">{{item.showFit}}</view> 
+								    <view class="goosK1" v-if="item.showOilType">{{item.showOilType}}</view>
+									<view class="goosK2" v-if="item.showOilLevel">机油等级|{{item.showOilLevel}}</view>
+									<view class="goosK2" v-if="item.showFit">适配粘度|{{item.showFit}}</view> 
 								</view>
 							</view>
 						</view>
@@ -248,7 +257,7 @@
 			<!-- 热门商品 -->
 			<view v-if="OpenMGoods&&tabType==2">
 				<view class="" v-if="OpenMGoods.goodsList&&OpenMGoods.goodsList.length>0">
-					<view class="Hot" v-if="OpenMGoods.showType==1">
+					<view class="Hot" ><!-- v-if="OpenMGoods.showType==1" -->
 						<!-- <view class="hotTop">
 							<view class="hotLeft">
 								<view class="hotSx" :style="{background:'#'+themeColor}"></view>
@@ -259,8 +268,8 @@
 								<img src="../../static/timg/icon_arrow_right.png" alt="" class="hotMoreJt">
 							</view>
 						</view> -->
-						<view v-if="OpenMGoods.showLayout==1">
-							<view class="hotGoodsLine" v-for="(item,index) in OpenMGoods.goodsList" @click="goGoods(item)" v-if="index<OpenMGoods.showCount">
+						<view v-if="OpenMGoods.showForm==1">
+							<view class="hotGoodsLine" v-for="(item,index) in OpenMGoods.goodsList" @click="goGoods(item)">
 								<view>
 									<image :src="item.url" mode="" class="hotGoodsLineImg"></image>
 								</view>
@@ -285,8 +294,8 @@
 						
 						
 						<!-- 俩列的 -->
-						<div class="goodsTwo" v-if="OpenMGoods.showLayout==2">
-							<div class="goodsTwoLine" v-for="(item,index) in OpenMGoods.goodsList" @click="goGoods(item)" v-if="index<OpenMGoods.showCount">
+						<div class="goodsTwo" v-if="OpenMGoods.showForm==2">
+							<div class="goodsTwoLine" v-for="(item,index) in OpenMGoods.goodsList" @click="goGoods(item)">
 								<div class="goodsTwoImg">
 									<image :src="item.url" mode="" class="hotGoodsLineImg"></image>
 								</div>
@@ -311,7 +320,7 @@
 			</view>
 			
 			<!-- 热门活动 -->
-			<view v-if="openMActivity&&openMActivity.openCollectingList&&tabType==1">
+			<view v-if="openMActivity&&openMActivity.openCollectingList&&tabType==3">
 				<view class="Hot" v-if="openMActivity.openCollectingList.length>0">
 					<!-- <view class="hotTop">
 						<view class="hotLeft">
@@ -323,7 +332,7 @@
 							<img src="../../static/timg/icon_arrow_right.png" alt="" class="hotMoreJt">
 						</view>
 					</view> -->
-					<view class="hotLine" @click="goJk(item)" v-for="(item,index) in openMActivity.openCollectingList" v-if="index<openMActivity.showCount"> 
+					<view class="hotLine" @click="goJk(item)" v-for="(item,index) in openMActivity.openCollectingList" > 
 						<view class="hotLineTop">
 							<image class="hotLineTopImg" :src="item.img" mode=""></image>
 						    <view class="hotlineTimebox">
@@ -437,10 +446,11 @@
 				appletHomeSetting:'',
 				activityModulesShow:false,
 				tabIndex:0,
-				OpenMGoods:'',
-				openMActivity:'',
+				OpenMGoods:[],
+				openMActivity:[],
 				tabType:'',
 				byList:'',
+				navigationList:[],
 			}
 		},
 		onLoad(opt) {
@@ -537,34 +547,66 @@
 		},
 		methods: {
 			goMaintain(item){
+			  uni.removeStorageSync('byCar');
 			  uni.navigateTo({
 			  	url:'../subPack/maintainItem?maintainId='+item.id+'&isRecommend='+item.isRecommend
 			  })	
 			},
-			tabData(){
-				this.$http('openHome/queryOpenMGoods', {
-				 unionId:this.unionId
-				 },'GET').then(res => {
-					 this.OpenMGoods=res.data
-					
-				 })
-				 this.$http('openHome/queryOpenMActivity', {
-				  unionId:this.unionId
-				  },'GET').then(res => {
-				 	 this.openMActivity=res.data
-				  })
+			tabData(showType,id){
+				console.log("showType==="+showType)
+				if(showType==3){
+					uni.showLoading({
+						title: '加载中'
+					})
+					this.$http('openHome/queryOpenMActivity', {
+					 unionId:this.unionId,id:id
+					 },'GET').then(res => {
+						 uni.hideLoading();
+						 this.openMActivity=res.data
+					 })
+				}
+				if(showType==2){
+					uni.showLoading({
+						title: '加载中'
+					})
+					this.$http('openHome/queryOpenMGoods', {
+					 unionId:this.unionId,id:id
+					 },'GET').then(res => {
+						 uni.hideLoading();
+						 this.OpenMGoods=res.data
+						
+					 })
+				}
+				if(showType==1){
+					this.getHomeList(id)
+				}
+				
+				
 				 
 			},
-			getHomeList(){
-				this.$http('openMaintain/home-list', {
-				    carId:this.carInfo.id
-				 },'GET').then(res => {
+			getHomeList(id){
+				if(this.carInfo){
+					var params={
+						  carId:this.carInfo.id,
+						  id:id
+					}
+				}else{
+					var params={
+						  id:id
+					}
+				}
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('openMaintain/home-list',params,'GET').then(res => {
+					 uni.hideLoading();
 					 this.byList=res.data
 				 })
 			},
-			tabFn(index,tpye){
+			tabFn(index,type,id){
 			  this.tabIndex=index	
-			  this.tabType=tpye
+			  this.tabType=type
+			  this.tabData(type,id)
 			},
 			activityModulesHide(){
 				this.activityModulesShow=false
@@ -878,12 +920,10 @@
 						/* uni.navigateTo({
 							url:'shopList'
 						}) */
-						/* uni.switchTab({
+						 uni.switchTab({
 							url:'shopList'
-						}) */
-						uni.navigateTo({
-							url:'../subPack/maintain'
-						})
+						}) 
+						
 					}else if(item.bizType==8){ //我的会员卡
 						uni.navigateTo({
 							url:'vipCard'
@@ -949,6 +989,11 @@
 							 uni.navigateTo({
 							 	url:'../user/addCar/cailist'
 							 }) 
+					}else if(item.bizType==20){
+						
+						  uni.navigateTo({
+						 	url:'../subPack/maintain?maintainProjectID='+item.maintainProjectID
+						 }) 
 					}
 					
 					
@@ -1075,7 +1120,7 @@
 						this.$store.commit('mutationsuserInfo', that.wxOpenData.loginInfo.openUser)
 						this.userInfo=that.wxOpenData.loginInfo.openUser
 						that.queryManagerInfo()
-						that.tabData()
+						//that.tabData()
 						uni.setStorage({
 							key: 'userInfo',
 							data: that.wxOpenData.loginInfo.openUser,
@@ -1262,7 +1307,7 @@
 								this.carInfo=''
 							}
 							 this.$store.commit('mutationscarInfo', this.carInfo)
-							 this.getHomeList()
+							 //this.getHomeList()
 							 this.jsTime()
 				  		}
 				  	 				
@@ -1359,11 +1404,21 @@
 					    uni.hideLoading();
 				 		this.homeCardList=res.data;
 						this.appletHomeSetting=res.data.appletHomeSetting;
+						this.navigationList=res.data.navigationList
 						var appletHomeSetting=this.appletHomeSetting
-						this.tabType=appletHomeSetting.sortSettingList[0].type
+						//this.tabType=appletHomeSetting.sortSettingList[0].type
+						
 						if(this.homeCardList.activityModules.length>0){
 							this.activityModulesShow=true
 						}
+						//console.log("this.navigationList")
+						//console.log(this.navigationList)
+		
+						if(this.navigationList.length>0){
+						   this.tabType=this.navigationList[0].showType
+						   
+							this.tabData(this.navigationList[0].showType,this.navigationList[0].id)
+						}
 						
 						uni.setStorage({
 							key: 'openMCar',
@@ -2119,4 +2174,14 @@ color: #EC0F0A;margin-right: 10rpx;
 		line-height: 40rpx;
 		font-size: 28rpx;
 	}
+	.isRecommend{
+		    font-size: 20rpx;
+		    background: #EC0F0A;
+		    height: 30rpx;
+		    padding: 0 6rpx;
+		    border-radius: 6rpx;
+		    color: #fff;
+		    margin-top: 5rpx;
+		    margin-right: 10rpx;
+	}
 </style>

pages/index/paint.vue

@@ -207,7 +207,7 @@
 					})
 
 				}
-
+                this.sumMoney=this.sumMoney-item.money
 
 				this.selectItemList.splice(index, 1);
 			},

pages/shop/confirm.vue

@@ -136,15 +136,15 @@
 		},
 		methods: {
 			submit(){
-				if(!this.carInfo){
+				if(!this.carInfo.plateNumber){
 					uni.showToast({
-						title: '请选择车辆',
+						title: '请选择车牌号',
 						icon: 'none',
 						duration: 3000
 					});
 					return false;
 				}
-				if(!this.carInfo.plateNumber){
+				if(!this.carInfo){
 					uni.showToast({
 						title: '请选择车辆',
 						icon: 'none',
@@ -152,6 +152,7 @@
 					});
 					return false;
 				}
+				
 				var jsonArray = [];
 				var obj={
 					itemId:this.goodsInfo.id,

pages/subPack/maintain.vue

@@ -48,7 +48,7 @@
 		 </view>
 		 <view class="znBox">
 			 <view class="znCont">
-				 <view class="znCar">智能推荐-大众 捷达</view>
+				 <view class="znCar">智能推荐-{{carInfo.brand?carInfo.brand:''}}&nbsp;{{carInfo.series?carInfo.series:''}}</view>
 				 <view>
 					 <image class="hxIcon" src="../../static/img2/hx.png" mode=""></image>
 				 </view>
@@ -58,43 +58,37 @@
 		 </view>
 		 <!-- 套餐-->
 		 <view class="lineBox">
-			 <view class="line" @click="goItem">
+			 <view class="line" 
+			  @click="goItem(item)" v-for="(item,index) in list">
 				 <view class="lineTop">
-					 <image class="lineImg" src="../../static/timg/noimg.png" mode=""></image>
+					 <image class="lineImg" v-if="item.mainImgUrl" :src="item.mainImgUrl" mode=""></image>
+					  <image class="lineImg" v-else src="../../static/timg/noimg.png" mode=""></image>
 					 <view class="lineNameBox">
-						 <view class="goodsName">全合成机油保养2次</view>
-						 <view class="goodsMs">含:发动机机油、机油滤芯、雾化杀菌等</view>
+						 <view class="goodsName">{{item.title}}</view>
+						 <view class="goodsMs">{{item.remarks}}</view>
 						 <view class="goodsKbox">
-						 	<view class="goosK1">增效全合成</view>
-						 	<view class="goosK2">粘度级别</view>
-						 	<!-- <view class="goosK2">0W-20/5W-40/5W-30</view> -->
+						 	<view class="goosK1" v-if="item.showOilType">{{item.showOilType}}</view>
+						 	<view class="goosK2" v-if="item.showOilLevel">{{item.showOilLevel}}</view>
+						 	<view class="goosK2" v-if="item.showFit">{{item.showFit}}</view> 
 						 </view>
 						 <view class="bfb">有91.4%的车主选择本商品</view>
 					 </view>
 				 </view>
 				 <view class="tcBox">
-					 <view class="tcLine">
-						 <view class="tcTitle">
-							 <view class="tcName">单次购买</view>
-							 
-						 </view>
-						 <view class="tcprice">
-							 <span class="tcSpan1">¥</span>
-							 <span class="tcSpan2">294</span>
-							 <span class="tcSpan3">/次</span>
-						 </view>
-					 </view>
-					 <view class="tcLine">
+					
+					 <view class="tcLine" :class="{lineActive:v.select}"
+					 @click.stop="selectItem(v,item)" v-for="(v,i) in item.packageItems">
 						 <view class="tcTitle">
-							 <view class="tcName">保养超值卡</view>
-							 <view class="tcNameTs">2次更划算</view>
+							 <view class="tcName">{{v.title}}</view>
+							 <view class="tcNameTs" v-if="v.count>1">{{v.count}}次更划算</view>
 						 </view>
 						 <view class="tcprice">
 							 <span class="tcSpan1">¥</span>
-							 <span class="tcSpan2">294</span>
+							 <span class="tcSpan2">{{v.price}}</span>
 							 <span class="tcSpan3">/次</span>
-							 <span class="tcSpan3" style="padding-left: 10rpx;">2次</span>
-							 <span class="tcSpan1">¥588</span>
+							 <span class="tcSpan3">¥{{v.money}}</span>
+							<!-- <span class="tcSpan3" style="padding-left: 10rpx;">2次</span>
+							 <span class="tcSpan1">¥588</span> -->
 						 </view>
 					 </view>
 				 </view>
@@ -114,7 +108,7 @@
 		</view>
 	</view>
 	<view class="bottomView">
-		<view class="bLeft">
+		<view class="bLeft" @click="qingdan">
 			<view class="bLeftImgBox">
 				<image class="qingdanIcon" src="../../static/img2/qingdan.png" mode=""></image>
 				<view class="qdTxt">清单</view>
@@ -123,7 +117,7 @@
 			<view>
 				<view class="bottomprice">
 					<span class="bSpan1">￥</span>
-					<span class="bSpan2">298</span>
+					<span class="bSpan2">{{totalPrice}}</span>
 				</view>
 				<view class="byh">
 					<span class="bspan3">已优惠</span>
@@ -131,7 +125,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="bottomBtn">立即购买</view>
+		<view class="bottomBtn"  @click="goSubmit">立即购买</view>
 	</view>
  </view>
  <!-- 提交订单弹框-->
@@ -140,11 +134,11 @@
 		 <view class="tkTop">
 			 <image class="tkImg" src="../../static/timg/noimg.png" mode=""></image>
 			 <view class="tkNameBox">
-				 <view class="tkName">【豪华车型】全合成机油保养套餐</view>
+				 <view class="tkName">{{itemDefault.goodsname}}</view>
 				 <view class="goodsPrice">
 				 	<view class="goodsPrice2">￥</view>
-				 	<view class="goodsPrice3">294</view>
-				 	<view class="goodsPrice4" >原价：¥1998</view>
+				 	<view class="goodsPrice3">{{itemDefault.money}}</view>
+				 	<view class="goodsPrice4" >原价：¥{{itemDefault.crossedPrice}}</view>
 				 </view>
 				 
 			 </view>
@@ -153,8 +147,8 @@
 		 <view class="buyLine">
 		 		 <view class="buyTitle">商品规格</view>
 		 		 <view class="buyData">
-		 				 <view class="goodsGuige activeGuige" style="margin-right: 24rpx;">单次购买</view>
-		 				 <view class="goodsGuige">保养套餐卡</view>
+		 				 <view class="goodsGuige activeGuige" style="margin-right: 24rpx;">{{itemDefault.title}}</view>
+		 				<!-- <view class="goodsGuige">保养套餐卡</view> -->
 		 			 </view>
 		 </view>
 		 <view class="buyLine">
@@ -196,6 +190,11 @@
 				goodsnum:1,
 				tkShow:false,
 				carInfo:'',
+				list:[],
+				totalPrice:0,
+				itemDefault:'',
+				lineItem:'',
+				maintainProjectID:'',
 			}
 		},
 		onLoad(opt) {
@@ -207,24 +206,75 @@
 			})
 			this.carInfo=this.$store.state.carInfo;
 			console.log(this.carInfo)
-			this.getRecommend()
+			this.maintainProjectID=opt.maintainProjectID
+			if(this.carInfo){
+				this.getRecommend()
+			}else{
+				uni.showToast({
+					 title: '请先添加车辆',
+					 icon:'none',
+					 duration: 3000
+				});
+			}
+			
+			
 		},
 		onShow() {
-			
+			var car =uni.getStorageSync("byCar")
+			if(car){
+				this.carInfo=car;
+				this.getRecommend()
+			}
 		},
 		methods: {
+			qingdan(){
+				this.tkShow=true;
+			},
+			selectItem(v,item){
+				this.list.forEach(item=>{
+					item.packageItems.forEach(v=>{
+						v.select=false
+					})
+				})
+			  v.select=true
+			  this.totalPrice=v.money
+			  this.itemDefault=v
+			  this.lineItem=item
+			},
 			goCkcar(){
-				
+				uni.navigateTo({
+					url:'../user/addCar/cailist?type=5'
+				})
 			},
-			goItem(){
+			goItem(item){
+			  uni.removeStorageSync('byCar');
 			  uni.navigateTo({
-			  	url:'maintainItem'
+			  	url:'maintainItem?maintainId='+item.id+'&isRecommend='+item.isRecommend
 			  })	
 			},
 			goSubmit(){
-				uni.navigateTo({
-					url:'maintainSubmit'
-				})
+				if(this.itemDefault){
+					this.itemDefault.goodsnum=this.goodsnum
+					this.itemDefault.goodsname=this.lineItem.title
+					this.itemDefault.itemId=this.lineItem.id
+					this.itemDefault.mainImgUrl=this.lineItem.mainImgUrl
+					uni.setStorage({
+						key: 'itemDefault',
+						data: this.itemDefault,
+						 success: function () {
+						    uni.navigateTo({
+						    	url:'maintainSubmit'
+						    })
+						 }
+					}); 
+				}else{
+					uni.showToast({
+						 title: '请选择商品规格',
+						 icon:'none',
+						 duration: 3000
+					});
+				}
+				
 			},
 			getRecommend(){
 				uni.showLoading({
@@ -232,10 +282,16 @@
 				})
 				this.$http('open-apply/get-recommend', {
 				    carId:this.carInfo.id,
-					bizId:'F4BCDD75-F72B-48D6-8455-631297AA939D'
+					bizId:this.maintainProjectID
 				}, 'GET').then(res => {
 					uni.hideLoading();
-					
+					res.data.data.forEach(item=>{
+						item.packageItems.forEach(v=>{
+							v.select=false
+						})
+					})
+					this.list=res.data.data
+					//this.list=this.list.concat(this.list)
 				
 				})
 			},
@@ -303,7 +359,7 @@
 	display: flex;
 }
 .ibCarBox{
-	display: flex;
+	display: flex;padding-left: 10rpx;
 }
 .glInput{
 	width: 160rpx;line-height: 42rpx;height: 42rpx;
@@ -372,7 +428,7 @@
 }
 .line{
 	background: #FFFFFF;padding: 24rpx;
-	border-radius: 16rpx;
+	border-radius: 16rpx;margin-bottom: 20rpx;
 }
 .lineImg{
 	width: 162rpx;
@@ -703,4 +759,7 @@ color: #666E80;
 	display: flex;justify-content: center;align-items: center;
 	position: absolute;left: 0;bottom: 0;
 }
+.lineActive{
+	border: 1px solid #FE0200;
+}
 </style>

pages/subPack/maintainItem.vue

@@ -16,8 +16,8 @@
  	<view class="shopCtop">
  		<view class="goodsPrice" >
  			<view class="goodsPrice2">￥</view>
- 			<view class="goodsPrice3"  v-if="itemDefault.showCrossedPrice==1">{{itemDefault.crossedPrice}}</view>
- 			<view class="goodsPrice4">原价：¥{{itemDefault.money}}</view>
+ 			<view class="goodsPrice3" >{{itemDefault.money}}</view>
+ 			<view class="goodsPrice4"  v-if="itemDefault.showCrossedPrice==1">原价：¥{{itemDefault.crossedPrice}}</view>
  		</view>
  		<view class="shareBox" >
 			<view class="shareTxt">分享</view>
@@ -26,14 +26,15 @@
  	</view>
  	<view class="goodsName">{{detail.title}}</view>
  	<view class="goodsMSBox" >
-		<view class="goodsMs" v-if="detail.showOilType">{{detail.showOilType}}</view>
-		<view class="goodsMs" v-if="detail.showOilLevel">{{detail.showOilLevel}}</view>
-		<view class="goodsMs" v-if="detail.showFit">{{detail.showFit}}</view>
+		<!-- <view class="goodsMs" v-if="detail.showOilType">机油类型|{{detail.showOilType}}</view>
+		<view class="goodsMs" v-if="detail.showOilLevel">机油等级|{{detail.showOilLevel}}</view>
+		<view class="goodsMs" v-if="detail.showFit">适配粘度|{{detail.showFit}}</view> -->
+		<view class="goodsMs" v-if="detail.content">{{detail.content}}</view>
 	</view>
 	<view class="timeBox">
-		<view class="itemTime">套餐有效期：购买之日起18个月</view>
-		<view class="sell">
-			<span>已售：</span><span style="color: #FFC107;">{{itemDefault.count}}</span>
+		<view class="itemTime" v-if="detail.validityType==1">套餐有效期：{{detail.validityTime}}</view>
+		<view class="sell" v-if="itemDefault.showSalesCount==1">
+			<span>已售：</span><span style="color: #FFC107;">{{itemDefault.dummyCount}}</span>
 		</view>
 	</view>
  </view>
@@ -46,10 +47,10 @@
 		   <image class="jtIcon" src="../../static/timg/jthei.png" mode=""></image>
 		 </view>
 	 </view>
-	 <view class="carTis" v-if="!isRecommend">此套餐可能与爱车不适配</view>
+	 <view class="carTis" v-if="isRecommend!='true'">此套餐可能与爱车不适配</view>
 	 <view class="buyLine">
 	 		 <view class="buyTitle">商品规格</view>
-	 		 <view class="buyData">
+	 		 <view class="buyData guigeBox">
 				<!-- <view class="goodsGuige activeGuige" style="margin-right: 24rpx;">单次购买</view> -->
 				 <view class="goodsGuige" @click="goodsGuige(item)"
 				 :class="{activeGuige:item.id==itemDefault.id}"
@@ -74,7 +75,8 @@
 	 </view>
 	 <view class="buyLine">
 	 		 <view class="buyTitle">可用门店</view>
-	 		 <view class="buyData">全部门店</view>
+	 		 <view class="buyData" v-if="itemDefault.packTimeShopName=='全部'">全部门店</view>
+			  <view class="buyData" v-else>{{itemDefault.packTimeShopName.split(',').length}}个门店可用</view>
 	 </view>
  </view>
  
@@ -124,7 +126,7 @@
  		<image class="kefuIcon" src="../../static/img2/kefu.png" mode=""></image>
  		<view style="text-align: center;font-size: 20rpx;color: #110B01;">客服</view>
  	</view>
- 		 <view class="Btn" @click="submitFn">提交订单</view>
+ 		 <view class="Btn" @click="submitFn">立即购买</view>
  	</view>
  
  
@@ -162,6 +164,7 @@
 			this.carInfo=this.$store.state.carInfo;
 			this.userInfo=this.$store.state.userInfo;
 			this.isRecommend=opt.isRecommend
+			//console.log("this.isRecommend=="+this.isRecommend)
 			if(this.userInfo){
 				this.getdetail()
 			}else{
@@ -395,6 +398,7 @@ color: #666E80;
 	border-radius: 5rpx;
 	font-size: 24rpx;
 	color: #FF0035;text-align: center;
+	background: #ffffff;
 }
 .numJsbox{
 	display: flex;
@@ -574,4 +578,8 @@ color: #666E80;
 	text-align: right;
 	padding-right: 24rpx;
 }
+.guigeBox{
+	flex-wrap: wrap;justify-content: flex-end;
+	width: 500rpx;
+}
 </style>

pages/subPack/maintainSubmit.vue

@@ -8,7 +8,7 @@
 		 	<view class="itemName">{{itemDefault.goodsname}}</view>
 			<view class="buyType">{{itemDefault.title}}</view>
 			<view class="priceBox">
-				<view class="price">¥{{itemDefault.crossedPrice}}</view>
+				<view class="price">¥{{itemDefault.money}}</view>
 				<view class="itemNum">X{{itemDefault.goodsnum}}</view>
 			</view>
 			<view class="itemnotes">注：该商品购买后不支持线上退款</view>
@@ -79,13 +79,13 @@
 			this.ext = this.$common.getExtStoreId();
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.itemDefault=uni.getStorageSync("itemDefault");
-			this.totalPrice=this.itemDefault.goodsnum*this.itemDefault.crossedPrice
+			this.totalPrice=this.itemDefault.goodsnum*this.itemDefault.money
 			this.totalPrice=this.totalPrice.toFixed(2)
 			var obj={
 				itemId:this.itemDefault.itemId,
 				itemName:this.itemDefault.goodsname,
 				itemQty:this.itemDefault.goodsnum,
-				salePrice:this.itemDefault.crossedPrice,
+				salePrice:this.itemDefault.money,
 				totalPrice:this.totalPrice,
 				packageItemID:this.itemDefault.id,
 			}

pages/subPack/paySuccess.vue

@@ -3,7 +3,7 @@
    <view class="imgBox">
 	   <image class="duihao" src="../../static/img/icon_selectY.png" mode=""></image>
    </view>
-   <view class="txt" v-if="type==1">付款成功</view>
+   <view class="txt" v-if="type==1">下单成功</view>
    <view class="txt" v-if="type==2">付款失败</view>
    <view class="goBack" @click="goBack">返回首页</view>
  

pages/user/user.vue

@@ -281,7 +281,7 @@
 			<view class="klineCont">
 				<view class="klineTitle">更多推荐</view>
 				<view class="kline">
-					<view class="klineRow" @click="gonavigateTo('../user/expertServices')">
+					<view class="klineRow" v-if="showSetting.isShowService==1" @click="gonavigateTo('../user/expertServices')">
 						<image class="klineIcon" src="../../static/img2/icon_fwzj.png" mode=""></image>
 					    <view class="KlineTxt2">服务顾问</view>
 					</view>

utils/request.js

@@ -9,7 +9,7 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.1.14:20187/'
+//const baseUrl='http://192.168.1.9:20187/'
 //const baseUrl='http://api.dms.66km.com.cn/'
 //const baseUrl='http://192.168.0.10:20187/' 
 //const baseUrl='https://store-api.qdbtl.cn/'