1

pages.json

@@ -615,7 +615,7 @@
 					{
 						"path": "maintain",
 						"style": {
-							"navigationBarTitleText": "保养"
+							"navigationBarTitleText": "做保养"
 						}
 					},
 					{

pages/index/index.vue

@@ -2200,4 +2200,48 @@ color: #EC0F0A;margin-right: 10rpx; border-radius: 6rpx;
 		width: 70rpx;height: 70rpx;top: 0;left: 0;
 		position: absolute;
 	}
+	.goodsTwo{
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+	}
+	.goodsTwoLine{
+		background: #FFFFFF;width: 341rpx;
+		margin-top: 20rpx;
+		padding-bottom: 20rpx;
+		border-radius: 16rpx;
+		overflow: hidden;
+	}
+	.goodsTwoImg .hotGoodsLineImg{
+		margin: 0 auto;
+		width: 100%;
+		height: 340rpx;
+		border-radius: 0;
+		border: none;
+	}
+	.goodsTwoLine .Sold{
+		padding-left: 20rpx;
+	}
+	.goodsTwoLine .goodsPrice{
+		padding-left: 20rpx;
+	}
+	
+	.goodsTwoImg{
+		padding-bottom: 30rpx;
+	} 
+	.goodsTwoName{
+		font-weight: 400;
+		color: #333333;
+		font-size: 26rpx;
+		line-height: 38rpx;
+		padding: 0 20rpx;
+		text-overflow: -o-ellipsis-lastline;
+		overflow: hidden;				
+		text-overflow: ellipsis;		
+		display: -webkit-box;		
+		-webkit-line-clamp: 2;	
+		line-clamp: 2;					
+		-webkit-box-orient: vertical;
+		
+	}
 </style>

pages/subPack/maintain.vue

@@ -12,7 +12,8 @@
 		 </view>
 		 <view class="ibRight">
 			 <image src="../../static/img2/gl.png" mode="" class="glIcon"></image>
-			 <input type="text" placeholder="暂无填写" class="glInput"/>
+			 <view class="glInput" v-if="milage">{{milage}}km</view>
+			 <input type="text" v-else placeholder="暂无填写" class="glInput"/>
 			 <image src="../../static/img2/xia.png" mode="" class="xiaIcon"></image>
 		 </view>
 	 </view>
@@ -41,9 +42,9 @@
 		 <view class="spTop">
 		 		 <view class="spTitle">适配推荐</view>
 		 		 <view class="spMs">
-		 			 <span>保养记录</span>
+		 			 <span @click="historySpend">保养记录</span>
 		 			 <span style="padding: 0 10rpx;">  | </span>
-		 			 <span>保养手册</span>
+		 			 <span @click="information">保养手册</span>
 		 		 </view>
 		 </view>
 		 <view class="znBox">
@@ -65,13 +66,13 @@
 					  <image class="lineImg" v-else src="../../static/timg/noimg.png" mode=""></image>
 					 <view class="lineNameBox">
 						 <view class="goodsName">{{item.title}}</view>
-						 <view class="goodsMs">{{item.remarks}}</view>
+						 <view class="goodsMs">{{item.showContent}}</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>
-						 <view class="bfb">有91.4%的车主选择本商品</view>
+						<!-- <view class="bfb">有91.4%的车主选择本商品</view> -->
 					 </view>
 				 </view>
 				 <view class="tcBox">
@@ -80,7 +81,7 @@
 					 @click.stop="selectItem(v,item)" v-for="(v,i) in item.packageItems">
 						 <view class="tcTitle">
 							 <view class="tcName">{{v.title}}</view>
-							 <view class="tcNameTs" v-if="v.count>1">{{v.count}}次更划算</view>
+							 <view class="tcNameTs" v-if="v.count>1&&v.isDefault==1">{{v.count}}次更划算</view>
 						 </view>
 						 <view class="tcprice">
 							 <span class="tcSpan1">¥</span>
@@ -99,7 +100,7 @@
  </view>
  
  <view class="bottom">
- 	<view class="kaBox">
+ <!-- 	<view class="kaBox">
 		<view class="ka">
 			<view class="kaLeft">
 				<image class="vipIcon" src="../../static/img2/vip.png" mode=""></image>
@@ -107,7 +108,7 @@
 			</view>
 			<view class="kaRight">去开卡></view>
 		</view>
-	</view>
+	</view> -->
 	<view class="bottomView">
 		<view class="bLeft" @click="qingdan">
 			<view class="bLeftImgBox">
@@ -120,10 +121,10 @@
 					<span class="bSpan1">￥</span>
 					<span class="bSpan2">{{totalPrice}}</span>
 				</view>
-				<view class="byh">
+				<!-- <view class="byh">
 					<span class="bspan3">已优惠</span>
 					<span class="bspan4"> ¥0</span>
-				</view>
+				</view> -->
 			</view>
 		</view>
 		<view class="bottomBtn commonBtn"  @click="goSubmit">立即购买</view>
@@ -141,7 +142,7 @@
 				 <view class="goodsPrice">
 				 	<view class="goodsPrice2">￥</view>
 				 	<view class="goodsPrice3">{{itemDefault.money}}</view>
-				 	<view class="goodsPrice4" >原价：¥{{itemDefault.crossedPrice}}</view>
+				 	<!-- <view class="goodsPrice4" >原价：¥{{itemDefault.crossedPrice}}</view> -->
 				 </view>
 				 
 			 </view>
@@ -198,7 +199,13 @@
 				itemDefault:'',
 				lineItem:'',
 				maintainProjectID:'',
-				qdNum:'',
+				qdNum:1,
+				milage:'',
+				multiArray: [
+					['亚洲', '欧洲'],
+					['中国', '日本'],
+					['公里']
+				],
 			}
 		},
 		onLoad(opt) {
@@ -209,7 +216,7 @@
 				backgroundColor: '#' + this.themeColor
 			})
 			this.carInfo=this.$store.state.carInfo;
-			console.log(this.carInfo)
+			this.milage=this.carInfo.milage
 			this.maintainProjectID=opt.maintainProjectID
 			if(this.carInfo){
 				this.getRecommend()
@@ -227,10 +234,22 @@
 			var car =uni.getStorageSync("byCar")
 			if(car){
 				this.carInfo=car;
+				this.milage=this.carInfo.milage
 				this.getRecommend()
 			}
 		},
 		methods: {
+			information(){
+				console.log('车辆信息--',this.carInfo);
+				uni.navigateTo({
+					url:'../index/handbook?mileage='+this.carInfo.milage+'&liyangId='+this.carInfo.nLevelID
+				})
+			},
+			historySpend(){
+				uni.navigateTo({
+					url:'../user/historySpend'
+				})
+			},
 			qingdan(){
 				this.tkShow=true;
 			},
@@ -298,11 +317,21 @@
 				}, 'GET').then(res => {
 					uni.hideLoading();
 					res.data.data.forEach(item=>{
+						
 						item.packageItems.forEach(v=>{
 							v.select=false
 						})
 					})
 					this.list=res.data.data
+					this.lineItem=this.list[0]
+					this.lineItem.packageItems.forEach(d=>{
+						if(d.isDefault==1){
+							d.select=true
+							this.itemDefault=d
+							this.totalPrice=d.money
+						}
+					})
+					
 					//this.list=this.list.concat(this.list)
 				
 				})

pages/subPack/maintainItem.vue

@@ -84,7 +84,9 @@
 	 <view class="buyLine">
 	 		 <view class="buyTitle">可用门店</view>
 	 		 <view class="buyData" v-if="itemDefault.packTimeShopName=='全部'">全部门店</view>
-			 <view @click="keyongFn" class="buyData" v-else>{{itemDefault.packTimeShopName.split(',').length}}个门店可用</view>
+			 <view @click="keyongFn" class="buyData " style="display: flex;" v-else>{{itemDefault.packTimeShopName.split(',').length}}个门店可用
+			   <image src="../../static/img2/hjt.png" mode="" class="hjt"></image>
+			 </view>
 	 </view>
  </view>
  
@@ -495,7 +497,7 @@ color: #666E80;
 	background: #ffffff;
 }
 .numJsbox{
-	display: flex;
+	display: flex;overflow: hidden;
 }
 .buyCont{
 	position: absolute;
@@ -821,4 +823,8 @@ color: #666E80;
 .mealBox img{
 	width: 100%;
 }
+.hjt{
+	width: 12rpx;height: 24rpx;
+	margin-top: 6rpx;margin-left: 10rpx;
+}
 </style>

pages/subPack/maintainSubmit.vue

@@ -76,6 +76,7 @@
 				sheetDetail:[],
 				userInfo:'',
 				carInfo:'',
+				
 			}
 		},
 		onLoad(opt) {
@@ -94,6 +95,7 @@
 			}
 			this.sheetDetail.push(obj)
 			this.carInfo=this.$store.state.carInfo;
+			
 			this.userInfo=uni.getStorageSync("wxOpenData");
 			console.log(this.userInfo)
 		},

pages/user/myOrder/myOrder.vue

@@ -12,19 +12,27 @@
 		<view class="main">
 			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item)">
 				<view class="itemTop">
-					<view class="itemType" v-if="item.SheetType==1">商城-商品订单</view>
-					<view class="itemType" v-if="item.SheetType==2">商城-项目订单</view>
-					<view class="itemType" v-if="item.SheetType==3">商城-套餐订单</view>
-					<view class="itemType" v-if="item.SheetType==4">救援订单</view>
-					<view class="itemType" v-if="item.SheetType==5">钣喷订单</view>
-					<view class="itemType" v-if="item.SheetType==6">集客订单</view>
-					<view class="itemType" v-else></view>
+					<view class="orderCodeBox">
+						<view class="itemType" v-if="item.SheetType==1">商城-商品订单</view>
+						<view class="itemType" v-if="item.SheetType==2">商城-项目订单</view>
+						<view class="itemType" v-if="item.SheetType==3">商城-套餐订单</view>
+						<view class="itemType" v-if="item.SheetType==4">救援订单</view>
+						<view class="itemType" v-if="item.SheetType==5">钣喷订单</view>
+						<view class="itemType" v-if="item.SheetType==6">集客订单</view>
+						<view class="itemType" v-if="item.SheetType==7">保养订单</view>
+						<view class="itemType" v-else></view>
+						<view class="orderCode">:{{item.Code}}</view>
+					</view>
+					
                     <view class="itemSheetState redColor" v-if="item.SheetState==5">待成团</view>
 					<view class="itemSheetState redColor" v-if="item.SheetState==1">待付款</view>
-					<view class="itemSheetState orangeColor" v-if="item.SheetState==2">待服务</view>
+					<view v-if="item.SheetType==7">
+						<view class="itemSheetState orangeColor" v-if="item.SheetState==2">已完成</view>
+					</view>
+					<view class="itemSheetState orangeColor" v-if="item.SheetState==2&&item.SheetType!=7">待服务</view>
 					<view class="itemSheetState greenColor" v-if="item.SheetState==3">已完成</view>
 					<view class="itemSheetState" v-if="item.SheetState==4">已取消</view>
-         
+                   
 				</view>
 				<view class="itemShopBg">
 					<view class="shopName">{{item.SheetContent}}</view>
@@ -37,7 +45,10 @@
 				 </view>
 				<view class="itemName">{{item.CreateTime}}</view>
                 <view class="itemName" style="padding-top: 2rpx;padding-bottom: 0;">{{item.ShopName}}</view>
-				
+				<view class="bottom" v-if="item.SheetState == 1">
+					<view class="cancel" @click.stop="cancelBespeak(item)">取消订单</view>
+					<view class="defer"  @click.stop="pay(item)">立即支付</view>
+				</view>
 			</view>
 
 			<nodata v-show="items==''&&isload"></nodata>
@@ -106,6 +117,100 @@
 
 		},
 		methods: {
+			pay(item){
+				this.$http('openMallOrder/unifiedPay', {
+					sheetId:item.ID
+				},'POST').then(res => {
+					
+					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
+						 });
+						that.tabIndex=0
+						that.page = 1;
+						that.getData()
+				    },
+				    fail: function (err) {
+					  console.log(err)
+				      uni.showToast({
+						 title: '支付失败',
+						 icon:'none',
+						 duration: 2000
+				      });
+					
+				    }
+				}); 
+			},
+			cancelBespeak(item){
+				var that = this
+				uni.showModal({
+				    title: '提示',
+				    content: '是否取消该订单',
+					cancelText:'否',
+					confirmText:'是',
+				    success: function (res) {
+				        if (res.confirm) {
+							
+								uni.showLoading({
+									title: '加载中'
+								})
+								
+								that.$http('openOrderManagement/updateSheetState', {
+							
+									id: item.ID,
+							
+								}, 'POST').then(res => {
+									uni.hideLoading();
+									// var list = res.data.Items
+									
+									uni.showToast({
+										title: '取消成功',
+										icon: 'none',
+										duration: 2000
+									});
+									setTimeout(function() {
+										that.page = 1;
+										that.getData();
+									}, 100);
+								})
+							
+				          
+				        } else if (res.cancel) {
+				           
+				        }
+				    }
+				});
+			},
            decryptPhoneNumber: function(e) {
              console.log(e);
              this.code=e.detail.code
@@ -456,4 +561,37 @@
 			
 			height: 100%;
 			}
+			.orderCodeBox{
+				display: flex;
+			}
+			.orderCode{
+				color: #999999;    font-size: 24rpx;
+			}
+			.cancel {
+				color: #3C3C3C;
+				font-size: 24rpx;
+				width: 120rpx;
+				height: 40rpx;
+				border-radius: 20rpx;
+				border: 1rpx solid #DDDDDD;
+				text-align: center;
+				line-height: 40rpx;
+				margin-right: 20rpx;
+			}
+			
+			.defer {
+				color: #EC0F0A;
+				font-size: 24rpx;
+				width: 120rpx;
+				height: 40rpx;
+				border-radius: 20rpx;
+				border: 1rpx solid #EC0F0A;
+				text-align: center;
+				line-height: 40rpx;
+		
+			}
+			.bottom{
+				display: flex;
+				justify-content: flex-end;
+			}
 </style>

pages/user/user.vue

@@ -335,7 +335,7 @@
 					    <view class="KlineTxt2">我的评价</view>
 					</view>
 					<view class="klineRow" @click="gonavigateTo('../subPack/feedBack')">
-						<image class="klineIcon" src="../../static/img/icon_me7.png" mode=""></image>
+						<image class="klineIcon" src="../../static/img2/yjfk.png" mode=""></image>
 					    <view class="KlineTxt2">建议反馈</view>
 					</view>
 					<view class="klineRow" @click="gomember(showSetting.memberTitle)">

utils/request.js

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