1

pages.json

@@ -629,6 +629,12 @@
 						"style": {
 							"navigationBarTitleText": "提交订单"
 						}
+					},
+					{
+						"path": "paySuccess",
+						"style": {
+							"navigationBarTitleText": "下单成功"
+						}
 					}
 					
 				]

pages/index/index.vue

@@ -216,16 +216,18 @@
 						<view class="goodsRight">
 							<view class="goodsRtop">
 								<view class="goodsName">{{item.title}}</view>
-								<view class="goodsMs">{{item.title}}</view>
+								<view class="goodsMs">{{item.remarks}}</view>
 							</view>
 							<view class="goodsRb">
 								<view class="goodsCBox">
 									<view class="goodsCLeft">
-										<view style="display: flex;"><view class="goodsTitle">2次更划算</view></view>
+										<view style="display: flex;" v-for="(v,i) in item.packageItems" v-if="v.isDefault==1">
+											<view v-if="v.count>1" class="goodsTitle">{{v.count}}次更划算</view>
+										</view>
 										<view class="goodsPriceBox" v-for="(v,i) in item.packageItems" v-if="v.isDefault==1">
 											<span class="goodsPrice11">￥</span>
-											<span class="goodsPrice22">{{v.money}}</span>
-											<!-- <span class="goodsPrice33">/次¥588</span> -->
+											<span class="goodsPrice22">{{v.crossedPrice}}</span>
+											<span class="goodsPrice33">/次¥{{v.money}}</span>
 										</view>
 									</view>
 									<view class="goodsCRight">
@@ -233,9 +235,9 @@
 									</view>
 								</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>
 						</view>
@@ -536,7 +538,7 @@
 		methods: {
 			goMaintain(item){
 			  uni.navigateTo({
-			  	url:'../subPack/maintainItem?maintainId='+item.id
+			  	url:'../subPack/maintainItem?maintainId='+item.id+'&isRecommend='+item.isRecommend
 			  })	
 			},
 			tabData(){

pages/subPack/maintainItem.vue

@@ -16,8 +16,8 @@
  	<view class="shopCtop">
  		<view class="goodsPrice" >
  			<view class="goodsPrice2">￥</view>
- 			<view class="goodsPrice3">{{itemDefault.money}}</view>
- 			<view class="goodsPrice4" v-if="itemDefault.showCrossedPrice==1">原价：¥{{itemDefault.crossedPrice}}</view>
+ 			<view class="goodsPrice3"  v-if="itemDefault.showCrossedPrice==1">{{itemDefault.crossedPrice}}</view>
+ 			<view class="goodsPrice4">原价：¥{{itemDefault.money}}</view>
  		</view>
  		<view class="shareBox" >
 			<view class="shareTxt">分享</view>
@@ -26,30 +26,34 @@
  	</view>
  	<view class="goodsName">{{detail.title}}</view>
  	<view class="goodsMSBox" >
-		<view class="goodsMs">高级全合成</view>
-		<view class="goodsMs">可选用5W30/5W40/0W20</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>
 	<view class="timeBox">
 		<view class="itemTime">套餐有效期：购买之日起18个月</view>
 		<view class="sell">
-			<span>已售：</span><span style="color: #FFC107;">22081</span>
+			<span>已售：</span><span style="color: #FFC107;">{{itemDefault.count}}</span>
 		</view>
 	</view>
  </view>
  
  
  <view class="buyBOx">
-	 <view class="buyLine">
+	 <view class="buyLine" @click="ckCar">
 		 <view class="buyTitle">已选车型</view>
 		 <view class="buyData">{{carInfo.carModel?carInfo.carModel:''}}
 		   <image class="jtIcon" src="../../static/timg/jthei.png" mode=""></image>
 		 </view>
 	 </view>
+	 <view class="carTis" v-if="!isRecommend">此套餐可能与爱车不适配</view>
 	 <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;">单次购买</view> -->
+				 <view class="goodsGuige" @click="goodsGuige(item)"
+				 :class="{activeGuige:item.id==itemDefault.id}"
+				  v-for="(item,index) in detail.packageItems">{{item.title}}</view>
 			 </view>
 	 </view>
 	 <view class="buyLine">
@@ -76,7 +80,8 @@
  
  <view class="mealBox">
 	 <view class="fwlcTitle">套餐内容</view>
-	 <view class="mealTop">
+	  <rich-text :nodes="itemDefault.content" style="background: #fff;"></rich-text>
+<!-- 	 <view class="mealTop">
 	 	<view class="mealName">套餐名称</view>
 	 	<view class="mealNum">数量</view>
 	 	<view class="mealexpire">有效期</view>
@@ -102,7 +107,7 @@
 			 2.机油套餐包含：机油，机油滤，工时费
 			 3.购买此套餐，共享有2次保养次数。
 		 </view>
-	 </view>
+	 </view> -->
  </view>
  
  <!-- 商品详情 -->
@@ -146,7 +151,8 @@
 				detail:'',
 				itemDefault:'',
 				carInfo:'',
-				
+				userInfo:'',
+				isRecommend:'',
 			}
 		},
 		onLoad(opt) {
@@ -154,16 +160,68 @@
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.maintainId=opt.maintainId
 			this.carInfo=this.$store.state.carInfo;
-			this.getdetail()
+			this.userInfo=this.$store.state.userInfo;
+			this.isRecommend=opt.isRecommend
+			if(this.userInfo){
+				this.getdetail()
+			}else{
+				this.$common.automaticlogin().then(val => {
+					this.userInfo=this.$store.state.userInfo;
+					this.getdetail()
+				})
+			}
+			
 		},
 		onShow() {
+			var car =uni.getStorageSync("byCar")
+			if(car){
+				this.carInfo=car;
+				this.getdetail()
+				this.isRecommend=false
+			}
 			
 		},
 		methods: {
-			submitFn(){
+			ckCar(){
 				uni.navigateTo({
-					url:'maintainSubmit'
+					url:'../user/addCar/cailist?type=5'
 				})
+			},
+			goodsGuige(item){
+				this.itemDefault=item
+			},
+			submitFn(){
+				if(this.itemDefault){
+					this.itemDefault.goodsnum=this.goodsnum
+					this.itemDefault.goodsname=this.detail.title
+					this.itemDefault.itemId=this.detail.id
+					this.itemDefault.mainImgUrl=this.detail.mainImgUrl
+					uni.setStorage({
+						key: 'itemDefault',
+						data: this.itemDefault,
+						 success: function () {
+						    uni.navigateTo({
+						    	url:'maintainSubmit'
+						    })
+						 }
+					}); 
+				}else{
+					uni.showToast({
+						 title: '请选择商品规格',
+						 icon:'none',
+						 duration: 3000
+					});
+					/* uni.showModal({
+						title: '提示',
+						content:"请选择商品规格",
+						success: function(resTKk) {
+							
+						}
+					}); */
+				}
+				
+				
+				
 			},
 			calculation(type){
 				if(type==1){
@@ -328,6 +386,7 @@ color: #666E80;
 	border-radius: 5rpx;
 	font-size: 24rpx;
 	color: #222222;text-align: center;
+	margin-left: 24rpx;
 }
 .activeGuige{
 	width: 146rpx;
@@ -510,4 +569,9 @@ color: #666E80;
 	padding-bottom: constant(safe-area-inset-bottom);
 	padding-bottom: env(safe-area-inset-bottom); 
 }
+.carTis{
+	color: #EC0F0A;font-size: 20rpx;
+	text-align: right;
+	padding-right: 24rpx;
+}
 </style>

pages/subPack/maintainSubmit.vue

@@ -2,13 +2,14 @@
 <view class="box">
  <view class="cont">
 	 <view class="itemBox flex">
-		 <image class="itemIMg" src="../../static/timg/noimg.png" mode=""></image>
+		  <image class="itemIMg" v-if="itemDefault.mainImgUrl" :src="itemDefault.mainImgUrl" mode=""></image>
+		 <image class="itemIMg" v-else src="../../static/timg/noimg.png" mode=""></image>
 		 <view class="itemRight">
-		 	<view class="itemName">【经济车型】全合成机油保养套餐全合成机油</view>
-			<view class="buyType">单次购买</view>
+		 	<view class="itemName">{{itemDefault.goodsname}}</view>
+			<view class="buyType">{{itemDefault.title}}</view>
 			<view class="priceBox">
-				<view class="price">¥365</view>
-				<view class="itemNum">X1</view>
+				<view class="price">¥{{itemDefault.crossedPrice}}</view>
+				<view class="itemNum">X{{itemDefault.goodsnum}}</view>
 			</view>
 			<view class="itemnotes">注：该商品购买后不支持线上退款</view>
 		 </view>
@@ -17,42 +18,16 @@
  
  <view class="mealBox">
  	 <view class="fwlcTitle">套餐内容</view>
- 	 <view class="mealTop">
- 	 	<view class="mealName">套餐名称</view>
- 	 	<view class="mealNum">数量</view>
- 	 	<view class="mealexpire">有效期</view>
- 	 </view>
- 	 <view class="mealTop2">
- 	 	<view class="mealName">【豪华车型】全合成机油保养套餐</view>
- 	 	<view class="mealNum">2</view>
- 	 	<view class="mealexpire">18个月</view>
- 	 </view>
- 	 <view class="mealXj">
- 		 <view class="xjLine">
- 			 <view class="xjyd"></view>
- 			 <view class="xjTxt">20项检查</view>
- 		 </view>
- 		 <view class="xjLine">
- 			 <view class="xjyd"></view>
- 			 <view class="xjTxt">20美日韩车型专用保养套餐适配机油</view>
- 		 </view>
- 	 </view>
- 	 <view class="mealMs">
- 		 <view class="mealMsline">
- 			 1.本套餐不限车辆使用；
- 			 2.机油套餐包含：机油，机油滤，工时费
- 			 3.购买此套餐，共享有2次保养次数。
- 		 </view>
- 	 </view>
+ 	
 	 </view>
 	 <view class="goodsBox">
 	 	 <view class="goodsline flex" style="border-bottom: 1px solid #EEEEEE;">
 	 		 <view class="goodsLeft">商品总价</view>
-	 		 <view class="goodRight">¥2084.00</view>
+	 		 <view class="goodRight">¥{{totalPrice}}</view>
 	 	 </view>
 	 	 <view class="goodsline flex" >
 	 	 		 <view class="goodsLeft"></view>
-	 	 		 <view class="goodRight" style="font-size: 26rpx;font-weight: 500;">合计 <span style="color: #EC0F0A;"> ¥1085.00</span></view>
+	 	 		 <view class="goodRight" style="font-size: 26rpx;font-weight: 500;">合计 <span style="color: #EC0F0A;"> ¥{{totalPrice}}</span></view>
 	 	 </view>
 	 </view>
 	 <view class="goodsBox">
@@ -74,9 +49,9 @@
 	 <view class="bleft">
 		 <span>合计</span>
 		 <span>¥</span>
-		 <span style="font-weight: 500;font-size: 34rpx;color: #EC0F0A;">294</span>
+		 <span style="font-weight: 500;font-size: 34rpx;color: #EC0F0A;">{{totalPrice}}</span>
 	 </view>
-	 <view class="Btn">提交订单</view>
+	 <view class="Btn" @click="submitFn">提交订单</view>
  </view>
  
 </view>
@@ -93,30 +68,129 @@
 				themeColor:'',
 				ext:'',
 				goodsnum:1,
+				itemDefault:'',
+				totalPrice:'',
+				sheetDetail:[],
+				userInfo:'',
+				carInfo:'',
 			}
 		},
 		onLoad(opt) {
 			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.totalPrice.toFixed(2)
+			var obj={
+				itemId:this.itemDefault.itemId,
+				itemName:this.itemDefault.goodsname,
+				itemQty:this.itemDefault.goodsnum,
+				salePrice:this.itemDefault.crossedPrice,
+				totalPrice:this.totalPrice,
+				packageItemID:this.itemDefault.id,
+			}
+			this.sheetDetail.push(obj)
+			this.carInfo=this.$store.state.carInfo;
+			this.userInfo=uni.getStorageSync("wxOpenData");
+			console.log(this.userInfo)
 		},
 		onShow() {
 			
 		},
 		methods: {
 			
-			getAboutMember(){
+			submitFn(){
+				var params={
+					sheetType:7,
+					sheetContent:this.itemDefault.goodsname,
+					customerName:this.userInfo.loginInfo.customerInfo.customerName,
+					mobilePhone:this.userInfo.loginInfo.customerInfo.mobilePhone,
+					plateNumber:this.carInfo.plateNumber,
+					carModel:this.carInfo.carModel,
+					totalMoney:this.totalPrice,
+					sheetDetail:JSON.stringify(this.sheetDetail),
+					groupType:0,
+					comment:'',
+					shareId:'',
+					shopId:this.userInfo.loginInfo.customerInfo.shopID,
+				}
 				uni.showLoading({
 					title: '加载中'
 				})
-				this.$http('miniApp2/sys/getAboutMember', {
-				    unionID:this.unionID
-				}, 'GET').then(res => {
+				
+				this.$http('openMallOrder/submitOrder', params,'POST').then(res => {
 					uni.hideLoading();
-					
+					if(res.code==0){
+						this.orderData=res.data
+						this.unifiedPay(res.data)
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
 				
 				})
 			},
+			unifiedPay(res){
+				this.$http('openMallOrder/unifiedPay', {
+					sheetId:res.id
+				},'POST').then(res => {
+					this.isgo=true;
+					if(res.code==0){
+						
+						this.requestPayment(res.data)
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+				 })
+			},
+			requestPayment(res){
+				var payInfo=res;
+				//console.log(payInfo)
+				//console.log(String(Date.now()))
+				var that=this;
+				uni.requestPayment({
+					provider: 'wxpay',
+					//timeStamp: String(Date.now()),
+					timeStamp: payInfo.timeStamp,
+					nonceStr: payInfo.nonceStr,
+					package:payInfo.package,
+					signType: payInfo.signType,
+					paySign: payInfo.paySign,
+					appid:payInfo.appId,	
+				    success: function (res) {
+				        console.log('success:' + JSON.stringify(res));
+						 uni.showToast({
+							 title: '支付成功',
+							 icon:'none',
+							 duration: 2000
+						 });
+						 uni.navigateTo({
+						 	url:'paySuccess?type=1'
+						 })
+						
+						
+				    },
+				    fail: function (err) {
+					  console.log(err)
+				      uni.showToast({
+						 title: '支付失败',
+						 icon:'none',
+						 duration: 2000
+				      });
+					  uni.navigateTo({
+					  	url:'paySuccess?type=2'
+					  })
+					  }
+					 
+				}); 
+			},
 			
 			
 			

pages/subPack/paySuccess.vue

@@ -0,0 +1,78 @@
+<template>
+<view class="box">
+   <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==2">付款失败</view>
+   <view class="goBack" @click="goBack">返回首页</view>
+ 
+</view>
+</template>
+
+<script>
+	export default {
+		components: {
+			
+		},
+		
+		data() {
+			return {
+				type:'',
+			}
+		},
+		onLoad(opt) {
+			this.type=opt.type
+			if(this.type==2){
+				uni.setNavigationBarTitle({
+				    title: '下单失败' //页面标题为"新标题"
+				});
+			}
+			
+		},
+		onShow() {
+			
+		},
+		methods: {
+			goBack(){
+				uni.switchTab({
+					url:'/pages/index/index'
+				})
+			}
+		
+			
+			
+			
+			
+		}
+	}
+</script>
+
+<style scoped lang="less">
+.box {
+	width: 100vw;
+	min-height: 100vh;
+	background: #F4F4F4;
+}
+.duihao{
+	width: 110rpx;height: 110rpx;
+}
+.imgBox{
+	text-align: center;padding-top: 190rpx;
+}
+.txt{
+		text-align: center;padding-top: 30rpx;
+		font-weight: 500;
+		font-size: 36rpx;
+		color: #222222;
+		line-height: 50rpx;
+}
+.goBack{
+	font-weight: 400;
+	font-size: 26rpx;
+	color: #F03B3B;
+	line-height: 37rpx;
+	text-align: center;
+	padding-top: 30rpx;
+}
+</style>

pages/user/addCar/cailist.vue

@@ -216,7 +216,19 @@
 				})
 			},
 			itemClick(item){
-				if(this.type!=3){
+				if(this.type==5){
+					uni.removeStorageSync('byCar');
+					uni.setStorage({
+						key: 'byCar',
+						data: item,
+						 success: function () {
+						    uni.navigateBack({
+						     	delta: 1
+						    })
+						 }
+					}); 
+				
+				}else if(this.type!=3){
 					this.$store.commit('mutationscarInfo', item)
 					uni.navigateBack({
 					 	delta: 1