订单接口对接

pages/europeOrder/eorderDetail.vue

@@ -3,7 +3,7 @@
 
 	   <view class="top">
 		   
-		   <view class="nav"  :style="{top: iStatusBarHeight + 'px'}">
+		   <view class="nav" >
 			   <view>
 				     <image src="../../static/img/baiback22.png" mode="" class="gobackImg" @click="goback"></image>
 					<!-- <image src="../../static/img/baigoindex22.png" mode="" class="goIndexImg" @click="goIndex()"></image> -->
@@ -13,15 +13,15 @@
 			   <view style="width: 92rpx;"></view>
 		   </view>
 		   <view style="height: 44px;"></view>
-		   <view class="SheetState" v-if="orderData.SheetState==1">等待付款</view>
-		   <view class="SheetState" v-if="orderData.SheetState==2">请尽快到店享受服务</view>
-		   <view class="SheetState" v-if="orderData.SheetState==3||orderData.SheetState==5">订单已完成</view>
-		   <view class="SheetState" v-if="orderData.SheetState==0">订单已取消</view>
-		   <view class="SheetState" v-if="orderData.SheetState==4">订单已完成</view>
+		   <view class="SheetState" v-if="orderData.sheetState==1">等待付款</view>
+		   <view class="SheetState" v-if="orderData.sheetState==2">请尽快到店享受服务</view>
+		   <view class="SheetState" v-if="orderData.sheetState==3||orderData.sheetState==5">订单已完成</view>
+		   <view class="SheetState" v-if="orderData.sheetState==0">订单已取消</view>
+		   <view class="SheetState" v-if="orderData.sheetState==4">订单已完成</view>
 	   </view>
 	 <view v-if="orderData">
 		 <!-- 服务确认码 -->
-		 <view class="orderTop" v-if="orderData.SheetState==2 || orderData.SheetState==3 || orderData.SheetState==4 || orderData.SheetState==5">
+		 <view class="orderTop" v-if="orderData.sheetState==2 || orderData.sheetState==3 || orderData.sheetState==4 || orderData.sheetState==5">
 		 
 		 	<view class="maBox">
 		 
@@ -29,24 +29,24 @@
 		 			<span>服务确认码</span>
 		 		</view>
 		 		<view style="text-decoration:line-through; color: #999999; font-size: 26rpx;"
-		 			v-if="orderData.SheetState==3 || orderData.SheetState==4 || orderData.SheetState==5 && orderData.ServiceCode!=null">{{orderData.ServiceCode}}</view>
-		 		<view class="rightShou" v-if="orderData.SheetState==2">
+		 			v-if="orderData.sheetState==3 || orderData.sheetState==4 || orderData.sheetState==5 && orderData.serviceCode!=null">{{orderData.serviceCode}}</view>
+		 		<view class="rightShou" v-if="orderData.sheetState==2">
 		 			<view class="timeRight" style="color: #FF2400;" @click="showMa">收起</view>
 		 			<image src="../../static/img/icon_arrow_up_orange.png" style="width: 17rpx; height: 11rpx; margin-left:10rpx ;">
 		 			</image>
 		 		</view>
-		 		<view style="color: #999999; font-size: 26rpx;" v-if="orderData.SheetState==3 || orderData.SheetState==4 || orderData.SheetState==5">已使用</view>
+		 		<view style="color: #999999; font-size: 26rpx;" v-if="orderData.sheetState==3 || orderData.sheetState==4 || orderData.sheetState==5">已使用</view>
 		 	</view>
 		 	<!-- 确认码 -->
-		 	<view class="querenMa" v-if="isShowMa==true && orderData.SheetState==2">
+		 	<view class="querenMa" v-if="isShowMa==true && orderData.sheetState==2">
 		 		<view style="color: #FF2400; font-size: 24rpx; text-align: center;">请到店出示券码即可开始服务</view>
 		 		<view class="maBoximg">
-		 			<tki-qrcode cid="qrcode1" ref="qrcode" :val="orderData.ServiceCode" :size="308" :unit="unit"
+		 			<tki-qrcode cid="qrcode1" ref="qrcode" :val="orderData.serviceCode" :size="308" :unit="unit"
 		 				:pdground="pdground" :icon="icon" :iconSize="iconsize" :lv="lv" :onval="onval"
 		 				:loadMake="loadMake" :usingComponents="true" @result="qrR" />
 		 		</view>
 		 		<view style="color: #333333; font-size: 26rpx; font-weight: bold; text-align: center;">
-		 			{{orderData.ServiceCode}}
+		 			{{orderData.serviceCode}}
 		 		</view>
 		 	</view>
 		 
@@ -55,16 +55,16 @@
 		 <view class="orderTop">
 		 		   <view class="timeBox">
 		 			   <view class="timeLeft">
-		 				   <span v-if="orderData.SheetState==1||orderData.SheetState==2||orderData.SheetState==0">预约到店：{{orderData.OrderTime}}</span>
-						   <span v-else>服务时间：{{orderData.ServiceTime}}</span>
-		 				   <image v-if="orderData.SheetState==1||orderData.SheetState==2" src="../../static/img/icon_edit.png" mode="" class="timeEditImg" @click="timeShowClick"></image>
+		 				   <span v-if="orderData.sheetState==1||orderData.sheetState==2||orderData.sheetState==0">预约到店：{{orderData.orderTime}}</span>
+						   <span v-else>服务时间：{{orderData.serviceTime}}</span>
+		 				   <image v-if="orderData.sheetState==1||orderData.sheetState==2" src="../../static/img/icon_edit.png" mode="" class="timeEditImg" @click="timeShowClick"></image>
 		 			   </view>
 		 			   <view class="timeRight" @click="qrcodeClick">订单码</view>
 		 		   </view>
 		 		   <view class="shopBox">
 		 			   <image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
 		 			   <view class="shopCont">
-		 				   <view class="shopName">{{orderData.ShopName}}</view>
+		 				   <view class="shopName">{{orderData.shopName}}</view>
 		 				   <view class="Address">
 		 					   {{orderData.ProvinceName}}{{orderData.CityName}}{{orderData.AreaName}}{{orderData.Address}}
 		 				   </view>
@@ -82,26 +82,26 @@
 		 		   </view>
 		 		   <view class="people">
 		 			     <image src="../../static/img/icon_ren.png" mode="" class="shopBoximg"></image>
-		 				 <view class="peopleCont">{{orderData.ContactName}}</view>
-		 				 <view class="peopleCont" style="padding-left: 20rpx;">{{orderData.ContactPhone}}</view>
+		 				 <view class="peopleCont">{{orderData.contactName}}</view>
+		 				 <view class="peopleCont" style="padding-left: 20rpx;">{{orderData.contactPhone}}</view>
 		 		   </view>
 		 		   <view class="PlateNumberBox">
 		 			   <image src="../../static/img/icon_che.png" mode="" class="shopBoximg"></image>
 		 			   <view class="">
 		 				   <view class="PlateNumberBoxTop">
-		 					   <view class="PlateNumbercx">  <span v-if="orderData.Brand">{{orderData.Brand}}</span> 
-		 					      <span style="padding-left: 20rpx;" v-if="orderData.Series">{{orderData.Series}}</span>
+		 					   <view class="PlateNumbercx">  <span v-if="orderData.brand">{{orderData.brand}}</span> 
+		 					      <span style="padding-left: 20rpx;" v-if="orderData.series">{{orderData.series}}</span>
 		 					   </view>
-		 					   <view class="PlateNumber">{{orderData.PlateNumber}}</view>
+		 					   <view class="PlateNumber">{{orderData.plateNumber}}</view>
 		 				   </view>
-		 				   <view class="CarModel">{{orderData.CarModel}}</view>
+		 				   <view class="CarModel">{{orderData.carModel}}</view>
 		 			   </view>
 		 		   </view>
 		 		   
 		 </view>
 		 <view style="margin-top: -40rpx;"></view>
 		 <!-- 商品明细-->
-		 <view class="detailedBox itemBox" v-if="orderData.goods.length!=0">
+		 <view class="detailedBox itemBox" v-if="orderData.goodsList.length!=0">
 		 		   <view class="detailedTitle">商品明细</view>
 		 		   <view class="detailedLineBox">
 		 			   <view class="detailedLine" v-for="(item,index) in orderData.goods">
@@ -121,7 +121,7 @@
 		 </view>
 		  <!-- 商品明细-->
 		 		<!-- 项目明细 -->
-		 		<view class="detailedBox itemBox" v-if=" orderData.items.length!=0">
+		 		<view class="detailedBox itemBox" v-if=" orderData.itemList.length!=0">
 		 			   <view class="detailedTitle">项目明细</view>
 		 			   <view class="detailedLineBox">
 		 				   <view class="detailedLine" v-for="(item,index) in orderData.items">
@@ -144,19 +144,19 @@
 		 		<view class="goodscost">
 		 			<view class="goodscostLine">
 		 				<view class="goodscostTxt">商品费</view>
-		 				<view class="goodsCostNum">￥{{orderData.GoodsMoney}}</view>
+		 				<view class="goodsCostNum">￥{{orderData.goodsMoney}}</view>
 		 			</view>
 		 			<view class="goodscostLine">
 		 				<view class="goodscostTxt">项目费</view>
-		 				<view class="goodsCostNum">￥{{orderData.ItemMoney}}</view>
+		 				<view class="goodsCostNum">￥{{orderData.itemMoney}}</view>
 		 			</view>
 		 			<view class="goodscostLine">
 		 				<view class="goodscostTxt">优惠券优惠</view>
-		 				<view class="goodsCostNum">-￥{{orderData.CouponMoney}}</view>
+		 				<view class="goodsCostNum">-￥{{orderData.couponMoney}}</view>
 		 			</view>
 		 			<view class="goodscostLine">
 		 				<view class="goodscostTxt">实付款</view>
-		 				<view class="goodsCostNum" style="color: #FF4F00;">￥{{orderData.PayMoney}}</view>
+		 				<view class="goodsCostNum" style="color: #FF4F00;">￥{{orderData.payMoney}}</view>
 		 			</view>
 		 		</view>
 		 		<!-- 商品费 -->
@@ -165,20 +165,20 @@
 		 			 <view class="detailedTitle">订单信息</view>
 		 			 <view class="informationLine">
 		 				 <view class="informationTxt">订单编号：</view>
-		 				 <view class="informationNum">{{orderData.Code}}</view>
-		 				 <view class="copyBtn" @click="copy(orderData.Code)">复制</view>
+		 				 <view class="informationNum">{{orderData.code}}</view>
+		 				 <view class="copyBtn" @click="copy(orderData.code)">复制</view>
 		 			 </view>
 		 			 <view class="informationLine">
 		 				 <view class="informationTxt">下单人：</view>
-		 				 <view class="informationNum">{{orderData.MemberName}}</view>	
+		 				 <view class="informationNum">{{orderData.memberName}}</view>	
 		 			 </view>
 		 			 <view class="informationLine">
 		 				 <view class="informationTxt">下单时间：</view>
-		 				 <view class="informationNum">{{orderData.CreateTime}}</view>	
+		 				 <view class="informationNum">{{orderData.createTime}}</view>	
 		 			 </view>
 		 			 <view class="informationLine">
 		 				 <view class="informationTxt">下单备注：</view>
-		 				 <view class="informationNum">{{orderData.Comment}}</view>	
+		 				 <view class="informationNum">{{orderData.comment}}</view>	
 		 			 </view>
 		 		</view>
 		 		<!-- 订单信息 -->
@@ -187,30 +187,33 @@
 		 			 <view class="detailedTitle">支付信息</view>
 		 			 <view class="informationLine">
 		 				 <view class="informationTxt">支付状态：</view>
-		 				 <view class="informationNum" v-if="orderData.SheetState==2||orderData.SheetState==3||orderData.SheetState==4">已支付</view>
-		 				 <view class="informationNum" v-if="orderData.SheetState==1">未支付</view>
+		 				 <view class="informationNum" v-if="orderData.sheetState==2||orderData.sheetState==3||orderData.sheetState==4">已支付</view>
+		 				 <view class="informationNum" v-if="orderData.sheetState==1">未支付</view>
 		 			 </view>
 		 			 <view class="informationLine">
 		 				 <view class="informationTxt">支付方式：</view>
-		 				 <view class="informationNum">{{orderData.PayMethod==1?'线上支付':'线下支付'}}</view>	
+		 				 <view class="informationNum">{{orderData.payMethod==1?'线上支付':'线下支付'}}</view>	
 		 			 </view>
 		 			 <view class="informationLine">
 		 				 <view class="informationTxt">支付时间：</view>
-		 				 <view class="informationNum" v-if="orderData.PayTime">{{orderData.PayTime}}</view>	
+		 				 <view class="informationNum" v-if="orderData.payTime">{{orderData.payTime}}</view>	
 		 			 </view>
 		 		</view>
 		 		<!-- 支付信息 -->
 		 		<view style="height: 150rpx;"></view>
-		 		<view class="orderBottom" v-if="orderData.SheetState==1||orderData.SheetState==2">
+		 		<!-- <view class="orderBottom" v-if="orderData.SheetState==1||orderData.SheetState==2">
 					<view class="payBtn" v-if="orderData.SheetState!=2" @click="orderPay">立即支付</view>
 		 			<view class="cancelBtn" style="margin-right: 16rpx;"  @click="cancelOrder">取消订单</view>
 		 		</view>
 		 		<view class="orderBottom" v-if="orderData.EvaluateState==1">
 		 			<view class="cancelBtn" style="margin-right: 16rpx;" @click="gopingjia">查看评价</view>
 		 		</view>
-		 		<view class="orderBottom" v-if="orderData.EvaluateState==0&&orderData.EState==1"><!-- 4 -->
+		 		<view class="orderBottom" v-if="orderData.EvaluateState==0&&orderData.EState==1">
 		 				<view class="payBtn" @click="evaluate">立即评价</view>
-		 		</view>
+		 		</view> -->
+				<view class="orderBottom" v-if="orderData.sheetState==2">
+					<view class="cancelBtn" style="margin-right: 16rpx;" @click="">核销</view>
+				</view>
 		 		<!-- 二维码 -->
 		 		<view v-if="qrcodeShow" class="qrcodeBox" @click="qrcodeShow=false">
 		 			<view  @click.stop="qrc">
@@ -373,7 +376,7 @@ export default {
 		},
 		call(){
 			uni.makePhoneCall({
-			    phoneNumber: this.orderData.MobilePhone
+			    phoneNumber: this.orderData.contactPhone
 			}); 
 		},
 		qrcodeClick(){
@@ -398,9 +401,9 @@ export default {
 		getData(){
 			uni.showLoading({ title: '加载中'});
 			
-			this.$http('miniAppMyBMemberCar/queryMiniAppSheetDetail', {
-			 lat:this.location.lat,
-			 lng:this.location.lng,
+			this.$http('h5BmSheet/h5BmSheetDetail', {
+			 //lat:this.location.lat,
+			// lng:this.location.lng,
 			  id:this.id,
 			 },'GET').then(res => {
 				  uni.hideLoading();
@@ -509,9 +512,9 @@ export default {
 	   },
 	   timeCk(){
 		   this.timeShow=false;
-		   this.$http('miniApp/maintainOrder/changeOrderTime', {
+		   this.$http('h5BmSheet/h5UpdateTimeOfAppointment', {
 		     id:this.id,
-			 orderTime:this.orderTime
+			 billDate:this.orderTime
 		    },'POST').then(res => {
 		   	  if(res.code==0){
 				  uni.showToast({
@@ -524,7 +527,7 @@ export default {
 		   })
 	   },
 	   getOrderTimes(){
-	   		   this.$http('miniApp/maintainOrder/getOrderTimes', {
+	   		   this.$http('h5BmSheet/getOrderTimes', {
 	   		     
 	   		    },'GET').then(res => {
 	   		   	  

pages/europeOrder/europeOrder.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="box">
 		<view class="zdyNavBox">
-			<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+			
 			<view class="zdyNav">
 				<view class="zdyNavLeft">
 					<image src="../../static/img/nav_icon_back.png" mode="aspectFit" class="backImg" @click="goback">
@@ -12,13 +12,13 @@
 				<view style="width: 50px;"></view>
 			</view>
 		</view>
-		<view class="status_bar" :style="{height: iStatusBarHeight + 'px'}"></view>
+		
 		<view style="height: 44px;"></view>
 		<view class="tab">
 			<view class="tabLine" :class="{tabActive:tabIndex==5}" @click="tabClick(5)">全部</view>
 			<view class="tabLine" :class="{tabActive:tabIndex==1}"  @click="tabClick(1)">待付款</view>
 			<view class="tabLine" :class="{tabActive:tabIndex==2}"  @click="tabClick(2)">待服务</view>
-			<view class="tabLine" :class="{tabActive:tabIndex==4}"  @click="tabClick(4)">待评价</view>
+			<view class="tabLine" :class="{tabActive:tabIndex==4}"  @click="tabClick(3)">已完成</view>
 		</view>
 		<view class="main">
 		  <view class="itemLine" v-for="(item,index) in items" @click="goDetail(item.ID)">
@@ -31,21 +31,25 @@
 				  <view class="itemSheetState" v-if="item.SheetState==0">已取消</view>
 			  </view>
 			  <view class="itemLineImgBox">
-				  <view class="itemGoddsImgBox">
-					  <view v-for="(v,i) in item.goods.concat(item.items)" v-if="i<4">
-						<image  :src="v.Url" mode="" class="goodsImg" v-if="i<4&&v"></image>
+				  <view class="itemGoddsImgBox" v-if="item.goodsUrl">
+					  <view v-for="(v,i) in item.goodsUrl.split(',')" v-if="i<4">
+						<image  :src="v" mode="" class="goodsImg" v-if="i<4&&v"></image>
 						<image src="../../static/img/noimg.png" mode="" class="goodsImg" v-else></image>
 					  </view>
-					  <view v-if="item.goods.concat(item.items).length==0">
-						    <image src="../../static/img/noimg.png" mode="" class="goodsImg" ></image>
+					 
+				  </view>
+				  <view class="itemGoddsImgBox" v-else> 
+					  <view >
+					  	  <image src="../../static/img/noimg.png" mode="" class="goodsImg" ></image>
 					  </view>
 				  </view>
-				  <view>
+				  
+				 <view v-if="item.goodsUrl&&item.goodsUrl.split(',').length>3">
 				  		 <image src="../../static/img/diandian.png" mode="widthFix" class="diandianImg"></image>
 				  </view>
 			  </view>
 			  <view class="raleMoneyBox">
-				  <span>实付款</span>  <span class="raleMoneySpan">￥{{item.raleMoney}}</span>
+				  <span>实付款</span>  <span class="raleMoneySpan">￥{{item.PayMoney}}</span>
 			  </view>
 			  <!-- 待服务的-->
 			  <view class="daifuwuBOxDiv" v-if="item.SheetState==2">
@@ -58,12 +62,12 @@
 					  <view class="daifuwuBOxLIne">预约到店信息:{{item.OrderTime}}</view>
 				  </view>
 			  </view>
-			  <view class="itemLineBottom" v-if="item.SheetState==1||item.SheetState==3||item.SheetState==4||item.SheetState==2">
+			  <!-- <view class="itemLineBottom" v-if="item.SheetState==1||item.SheetState==3||item.SheetState==4||item.SheetState==2">
 				  <view class="itemBtn1" v-if="item.SheetState==1||item.SheetState==2" @click.stop="cancelOrder(item)">取消订单</view>
 				  <view class="itemBtn2" v-if="item.SheetState==1" @click.stop="orderPay(item)">立即支付</view>
 				  <view class="itemBtn2" v-if="item.EvaluateState==0&&item.EState==1" @click.stop="goEvaluate(item)">立即评价</view>
 				  <view class="itemBtn1" v-if="item.EvaluateState==1" @click.stop="gopingjia(item)">查看评价</view>
-			  </view>
+			  </view> -->
 		  </view>
 		  
 		  <nodata v-show="items==''&&isload"></nodata>
@@ -211,16 +215,18 @@ export default {
 				var padata={
 					page:this.page,
 					limit:10,
-					state:this.state
+					sheetState:this.state
 				}
 			}
 		
-			this.$http('miniAppMyBMemberCar/listMiniAppBMSheetPage', padata,'GET').then(res => {
+			this.$http('h5BmSheet/listH5BMSheetPage', padata,'GET').then(res => {
 				  uni.hideLoading();
 				  this.isload=true;
 				  //this.list=res.data;	
 				  var a=res.data.Items;
+				
 				  this.items=this.items.concat(a)
+				    console.log( this.items)
 			})
 		},
        orderPay(item){

utils/request.js

@@ -1,6 +1,6 @@
 //测试地址
 const baseUrl = 'http://api.dms.66km.com.cn/'
-//const baseUrl = 'http://192.168.0.123:20187/'
+//const baseUrl = 'http://192.168.0.124:20187/'
 //const baseUrl = 'http://syadmin.66km.com/'
 //const baseUrl = 'http://apidms.66km.com/'
 //正式地址
@@ -12,13 +12,13 @@ const http = (url = '', date = {}, type = 'POST', header = {
 		header={};
 		const wxOpenData = uni.getStorageSync("wxOpenData");
 		//var wxOpenData=$store.state.wxOpenData
-		// if(wxOpenData.loginInfo){
-		// 	header['accessToken']=wxOpenData.loginInfo.token;
-		// 	header['uid']=wxOpenData.loginInfo.uid; 
-		// }
+		 if(wxOpenData.loginInfo){
+		 	header['accessToken']=wxOpenData.loginInfo.token;
+	 	   header['uid']=wxOpenData.loginInfo.uid; 
+		 }
 		//console.log($store.state.carInfo)
-		header['token']='870347EA782D4A8D90848EEDF6A0B327';
-		header['uid']='BD04C2D5-0C07-40C9-9F8A-91BB30EDF2F6'; 
+		//header['token']='870347EA782D4A8D90848EEDF6A0B327';
+		//header['uid']='BD04C2D5-0C07-40C9-9F8A-91BB30EDF2F6'; 
 		header['Content-Type']='application/x-www-form-urlencoded';
 		//console.log(header)
         uni.request({