Quellcode durchsuchen

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

twt vor 3 Jahren
Ursprung
Commit
8cf8513e2b
47 geänderte Dateien mit 1001 neuen und 1091 gelöschten Zeilen
  1. 3 2
      manifest.json
  2. 1 1
      pages/me/me.vue
  3. 323 375
      pages/order/myorder.vue
  4. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  5. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/chose-city/chose-city.js.map
  6. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/nodata/nodata.js.map
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tki-qrcode/tki-qrcode.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-plate-input/uni-plate-input.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/addphone.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/phoneList.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/addCar.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cailist.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/carModel.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/empower.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/iphoneLogin.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/intimity.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/me.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/setup.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/treaty.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/evaluate.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/myorder.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDetail.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shopList.js.map
  26. 2 1
      unpackage/dist/dev/mp-weixin/app.json
  27. 3 3
      unpackage/dist/dev/mp-weixin/common/vendor.js
  28. 15 15
      unpackage/dist/dev/mp-weixin/components/chose-city/chose-city.js
  29. 14 14
      unpackage/dist/dev/mp-weixin/components/nodata/nodata.js
  30. 15 15
      unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.js
  31. 14 14
      unpackage/dist/dev/mp-weixin/components/uni-plate-input/uni-plate-input.js
  32. 16 16
      unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.js
  33. 16 16
      unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.js
  34. 137 137
      unpackage/dist/dev/mp-weixin/pages/index/addCar.js
  35. 16 16
      unpackage/dist/dev/mp-weixin/pages/index/cailist.js
  36. 155 155
      unpackage/dist/dev/mp-weixin/pages/index/carModel.js
  37. 59 14
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  38. 16 16
      unpackage/dist/dev/mp-weixin/pages/me/intimity.js
  39. 1 1
      unpackage/dist/dev/mp-weixin/pages/me/me.wxml
  40. 16 16
      unpackage/dist/dev/mp-weixin/pages/me/setup.js
  41. 16 16
      unpackage/dist/dev/mp-weixin/pages/me/treaty.js
  42. 16 16
      unpackage/dist/dev/mp-weixin/pages/order/evaluate.js
  43. 61 95
      unpackage/dist/dev/mp-weixin/pages/order/myorder.js
  44. 1 1
      unpackage/dist/dev/mp-weixin/pages/order/myorder.wxml
  45. 43 94
      unpackage/dist/dev/mp-weixin/pages/order/myorder.wxss
  46. 18 18
      unpackage/dist/dev/mp-weixin/pages/order/orderDetail.js
  47. 2 2
      unpackage/dist/dev/mp-weixin/pages/shop/shopList.js

+ 3 - 2
manifest.json

@@ -50,9 +50,10 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxf8f3d4de9b244403",
+        "appid" : "wx9ca21d7c8495757e",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : false,
+            "postcss" : true
         },
         "usingComponents" : true,
         "permission" : {

+ 1 - 1
pages/me/me.vue

@@ -20,7 +20,7 @@
 		<view class="orderBox">
 			<view class="orderTitleBg">
 				<view class="orderTitle">我的订单</view>
-				<view class="orderAll" @click="goorder(5)">
+				<view class="orderAll" @click="goorder(6)">
 					<view style="color: #999999; font-size: 24rpx; margin-right: 5rpx;">全部订单</view>
 					<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
 

+ 323 - 375
pages/order/myorder.vue

@@ -1,376 +1,324 @@
-<template>
-	<view class="box">
-		<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(3)">待收货</view>
-			<view class="tabLine" :class="{tabActive:tabIndex==2}"  @click="tabClick(4)">待服务</view>
-			<view class="tabLine" :class="{tabActive:tabIndex==4}"  @click="tabClick(5)">待评价</view>
-		</view>
-		<view class="main">
-		  <view class="itemLine" v-for="(item,index) in items" @click="goDetail(item.ID)">
-			  <view class="flex2 itemlineTOp">
-				  <view class="itemCode">{{item.Code}}</view>
-				  <view class="itemSheetState" v-if="item.SheetState==1">待付款</view>
-				  <view class="itemSheetState" v-if="item.SheetState==2">待服务</view>
-				  <view class="itemSheetState" v-if="item.SheetState==3||item.SheetState==5">已完成</view>
-				  <view class="itemSheetState" v-if="item.SheetState==4">已完成</view>
-				  <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>
-						<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>
-				  <view>
-				  		 <image src="../../static/img/diandian.png" mode="widthFix" class="diandianImg"></image>
-				  </view>
-			  </view>
-			  <view class="raleMoneyBox">
-				  <span>实付款</span>  <span class="raleMoneySpan">¥{{item.raleMoney}}</span>
-			  </view>
-			  <view class="itemLineBottom" v-if="item.SheetState==1||item.SheetState==3||item.SheetState==4">
-				  <view class="itemBtn1" v-if="item.SheetState==1" @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 class="daifuwuBOxDiv" v-if="item.SheetState==2">
-				  <view class="daifuwuBOx">
-					  <view class="daifuwuBOxTop">
-						  <image src="../../static/img/orderyytime.png" mode="" class="orderyytimeImg"></image>
-						  <view class="daifuwuBOxTitle">预约信息</view>
-					  </view>
-					  <view class="daifuwuBOxLIne">门店名称:{{item.ShopName}}</view>
-					  <view class="daifuwuBOxLIne">预约到店信息:{{item.OrderTime}}</view>
-				  </view>
-			  </view>
-		  </view>
-		  
-		  <nodata v-show="items==''&&isload"></nodata>
-		</view>
-	</view>
-</template>
-
-<script>
-import nodata from '@/components/nodata/nodata.vue'	
-export default {
-	components: {
-		   nodata
-	},
-	data() {
-		return {
-			page:1,
-			state:'',
-			num:'',
-			tabIndex:'',
-			items:[],
-			isload:false,
-		}
-	},
-	onLoad(opt) {
-        var num=opt.num;
-		this.tabIndex=num;
-		this.items=[]
-       if(num==5){
-		   this.state=''
-	   }else{
-		   this.state=num
-	   }
-		this.getData()
-	},
-	onShow() {
-		console.log(this.tabIndex)
-		var evaluate = uni.getStorageSync("evaluate")
-		 if(evaluate){
-			 this.items=[]
-			 this.getData()
-			  uni.removeStorageSync('evaluate');
-		} 
-		
-	},
-	methods: {
-		goEvaluate(item){
-			uni.navigateTo({
-				url:'evaluate?shopID=' + item.ShopID + '&sheetID=' + item.ID
-			})
-		},
-		gopingjia(item){
-			 uni.navigateTo({
-				url:'../me/myAppraiseDetail?id='+item.ID
-			}) 
-		},
-		cancelOrder(item){
-			var that=this;
-			uni.showModal({
-			    title: '提示',
-			    content: '确定要取消订单吗',
-			    success: function (res) {
-			        if (res.confirm) {
-			          uni.showLoading({ });
-			          that.$http('miniAppMyBMemberCar/updateBMSheetState', {
-			            id:item.ID
-			           },'POST').then(res => {
-			          	uni.hideLoading();
-						that.page=1;
-						that.items=[]
-			            that.getData()
-			          })
-			        } else if (res.cancel) {
-			           
-			        }
-			    }
-			});
-		},
-	
-		tabClick(num){
-			this.tabIndex=num;
-			if(num==5){
-				 this.state=''
-			}else{
-				this.state=num
-			}
-			this.items=[];
-			this.page=1;
-			this.getData()
-		},
-		goDetail(id){
-			uni.navigateTo({
-				url:'orderDetail?id='+id
-			})
-		},
-		getData(){
-			uni.showLoading({ });
-			this.isload=false;
-			if(this.state==4){
-				var padata={
-					page:this.page,
-					limit:10,
-					evaluateState:1
-				}
-			}else{
-				var padata={
-					page:this.page,
-					limit:10,
-					state:this.state
-				}
-			}
-		
-			this.$http('miniAppMyBMemberCar/listMiniAppBMSheetPage', padata,'GET').then(res => {
-				  uni.hideLoading();
-				  this.isload=true;
-				  //this.list=res.data;	
-				  var a=res.data.Items;
-				  this.items=this.items.concat(a)
-			})
-		},
-       orderPay(item){
-       	uni.showLoading({ });
-       	this.$http('miniApp/maintainOrder/orderPay', {
-       	  sheetID:item.ID
-       	 },'POST').then(res => {
-       		  uni.hideLoading();
-       		  var payInfo=JSON.parse(res.data.payInfo)
-       		uni.requestPayment({
-       		    provider: 'wxpay',
-       		   // timeStamp: String(Date.now()),
-       			timeStamp:payInfo.timeStamp,
-       		    nonceStr: payInfo.nonceStr,
-       		    package: payInfo.package,
-       		    signType: payInfo.signType,
-       		    paySign: payInfo.paySign,
-       		    success: function (res) {
-       		        console.log('success:' + JSON.stringify(res));
-       				 uni.showToast({
-       					 title: '支付成功',
-       					icon:'none',
-       					 duration: 2000
-       				 });
-       				uni.switchTab({
-       					url:'../index/index'
-       				})			
-       		    },
-       		    fail: function (err) {
-       		        console.log('fail:' + JSON.stringify(err));
-       									 
-       		    }
-       		}); 
-       	})
-       },
-	},
-	onReachBottom(){
-		this.page++;
-		/* if(this.tabindex==2){
-			this.getbMemberShopList()
-		}else if(this.tabindex==3){
-			this.getShopFootprint()
-		} */
-		this.getData()
-	},
-	onPullDownRefresh() {
-	       this.page=1;
-		  this.items=[];
-	      this.getData() 
-	       setTimeout(function () {
-	           uni.stopPullDownRefresh();
-	       }, 1000);
-	  }
-}
-</script>
-
-<style scoped>
-	.box{
-		min-height: 100vh;
-		background: #F4F5F7;
-	}
-	.tab{
-		background: #FFFFFF;
-		display: flex;
-		justify-content: space-between;
-		padding: 0 15rpx;
-		line-height: 84rpx;
-		position: fixed;
-		left: 0;
-		top: 44px;
-		width: 720rpx;
-		z-index: 11;
-	}
-	.main{
-		padding-top:88rpx;
-		padding-left: 24rpx;
-		padding-right: 24rpx;
-	}
-	/*  #ifdef MP-WEIXIN  */
-	.tab{
-		position: fixed;
-		left: 0;
-		top: 0;
-	}
-	.main{
-		padding-top: 88rpx ;
-	}
-	/*  #endif  */
-	.tabLine{
-		width: 180rpx;
-		text-align: center;
-	}
-	.tabActive{
-		color: #FF4F00;
-		border-bottom: 4rpx solid #FF4F00;
-	}
-	.flex2{
-		display: flex;
-		justify-content: space-between;
-	}
-	.itemLine{
-		background: #FFFFFF;
-		margin-top: 20rpx;
-	}
-	.itemCode{
-		font-size: 28rpx;
-		color: #999999;
-	}
-	.itemlineTOp{
-		padding: 25rpx 20rpx;
-	}
-	.itemSheetState{
-		font-size: 30rpx;
-		color: #FF4F00
-	}
-	.goodsImg{
-		width: 126rpx;
-		height: 126rpx;
-		margin-left: 18rpx;
-		border-radius: 5rpx;
-	}
-	.itemLineImgBox{
-		display: flex;
-	}
-	.itemGoddsImgBox{
-		display: flex;
-		width:558rpx;
-	
-	}
-	.diandianImg{
-		width: 50rpx;
-		margin-left: 50rpx;
-		margin-top: 50rpx;
-	}
-	.raleMoneyBox{
-		text-align: right;
-		color: #666666;
-		font-size: 24rpx;
-		line-height: 50rpx;
-		padding-bottom: 20rpx;
-		/* border-bottom:  1px solid #EEEEEE; */
-	}
-	.raleMoneySpan{
-		color: #3C3C3C;
-		font-size: 32rpx;
-		padding-right: 24rpx;
-		padding-left: 10rpx;
-	}
-	.itemLineBottom{
-		display: flex;
-		justify-content: flex-end;
-		padding-top: 20rpx;padding-bottom: 20rpx;padding-right: 20rpx;
-		border-top: 1px solid #EEEEEE; ;
-	}
-	.daifuwuBOxDiv{
-		padding: 20rpx;
-	}
-	.itemBtn1{
-		width: 150rpx;
-		height: 56rpx;
-		border-radius: 36rpx;
-		border: 2rpx solid #DDDDDD;
-		text-align: center;
-		line-height: 56rpx;
-		font-size: 28rpx;
-		color: #3C3C3C;
-		margin-left: 40rpx;
-	}
-	.itemBtn2{
-		width: 150rpx;
-		height: 56rpx;
-		border-radius: 36rpx;
-		border: 2rpx solid #FF4F00;
-		text-align: center;
-		line-height: 56rpx;
-		font-size: 28rpx;
-		color: #FF4F00;
-		margin-left: 40rpx;
-	}
-	.daifuwuBOx{
-		width: 662rpx;
-		height: 175rpx;
-		background: rgba(255, 79, 0, 0.04);
-		border-radius: 6rpx;
-	}
-	.orderyytimeImg{
-		width: 32rpx;
-		height: 32rpx;
-	}
-	.daifuwuBOxTop{
-		display: flex;
-		padding: 20rpx 0 20rpx 20rpx;
-		color: #FF4F00;
-		font-size: 28rpx;
-	}
-	.daifuwuBOxTitle{
-		line-height: 32rpx;padding-left: 10rpx;
-	}
-	.daifuwuBOxLIne{
-		color: #666666;
-		font-size: 26rpx;
-		line-height: 40rpx;
-		padding-left: 20rpx;
-	}
+<template>
+	<view class="box">
+		<view class="tab">
+			<view class="tabLine" :class="{tabActive:tabIndex==6}" @click="tabClick(6)">全部</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==3}" @click="tabClick(3)">待收货</view>
+			<view class="tabLine" :class="{tabActive:tabIndex==4}" @click="tabClick(4)">待服务</view>
+			<view class="tabLine" :class="{tabActive:tabIndex==5}" @click="tabClick(5)">待评价</view>
+		</view>
+		<view class="main">
+			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item.ID)">
+				<view class="itemTop">
+					<view style="color: #999999; font-size: 24rpx;">保养订单</view>
+					<view class="itemSheetState">待付款</view>
+					<view class="itemSheetState" v-if="item.SheetState==2">待确定</view>
+					<view class="itemSheetState" v-if="item.SheetState==3">待收货</view>
+					<view class="itemSheetState" v-if="item.SheetState==4">待服务</view>
+					<view class="itemSheetState" v-if="item.SheetState==5">待评价</view>
+				</view>
+				<view class="itemShopBg">
+					<view class="shopName">这是门店名称</view>
+					<view class="price">231.8</view>
+				</view>
+				<view class="itemName">项目名称1,项目名称2,项目名称3,项目名称1,项目名称2,项目名称3项目名称1,项目名称2,项目名称3</view>
+				<view class="plateNumber">鲁A12345(2000km)</view>
+
+				<view class="itemLineBottom" v-if="item.SheetState==0||item.SheetState==3||item.SheetState==4">
+					<view class="itemBtn1" v-if="item.SheetState==1" @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>
+
+			<nodata v-show="items==''&&isload"></nodata>
+		</view>
+	</view>
+</template>
+
+<script>
+	import nodata from '@/components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata
+		},
+		data() {
+			return {
+				page: 1,
+				tabIndex: '',
+				items: [],
+				isload: false,
+			}
+		},
+		onLoad(opt) {
+
+			this.tabIndex = opt.num;
+
+			this.getData()
+		},
+		onShow() {
+			console.log(this.tabIndex)
+			// var evaluate = uni.getStorageSync("evaluate")
+			// if(evaluate){
+
+			this.getData()
+			// 	  uni.removeStorageSync('evaluate');
+			// } 
+
+		},
+		methods: {
+			goEvaluate(item) {
+				uni.navigateTo({
+					url: 'evaluate?shopID=' + item.ShopID + '&sheetID=' + item.ID
+				})
+			},
+			gopingjia(item) {
+				uni.navigateTo({
+					url: '../me/myAppraiseDetail?id=' + item.ID
+				})
+			},
+			cancelOrder(item) {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定要取消订单吗',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({});
+							that.$http('miniAppMyBMemberCar/updateBMSheetState', {
+								id: item.ID
+							}, 'POST').then(res => {
+								uni.hideLoading();
+								that.page = 1;
+
+								that.getData()
+							})
+						} else if (res.cancel) {
+
+						}
+					}
+				});
+			},
+
+			tabClick(num) {
+				this.tabIndex = num;
+
+
+				this.page = 1;
+				this.getData()
+			},
+			goDetail(id) {
+				// uni.navigateTo({
+				// 	url: 'orderDetail?id=' + id
+				// })
+			},
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.isload = false;
+				if (this.tabIndex == 6) {
+					var padata = {
+						page: this.page,
+						limit: 10,
+					}
+				} else {
+					if (this.tabIndex == 5) {
+						var padata = {
+							page: this.page,
+							limit: 10,
+							evaluateState:'待评价'
+						}
+					} else {
+						var padata = {
+							page: this.page,
+							limit: 10,
+							state: this.tabIndex
+						}
+					}
+				}
+
+				this.$http('worldKeepCar/keepCarMy/listMiNiTMSheetPage', padata, 'GET').then(res => {
+					uni.hideLoading();
+					this.isload = true;
+
+					var list = res.data.Items;
+
+					if (this.page == 1) {
+						this.items = list
+					} else {
+						this.items = this.items.concat(list)
+					}
+
+				})
+			},
+			orderPay(item) {
+				uni.showLoading({});
+				this.$http('miniApp/maintainOrder/orderPay', {
+					sheetID: item.ID
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					var payInfo = JSON.parse(res.data.payInfo)
+					uni.requestPayment({
+						provider: 'wxpay',
+						// timeStamp: String(Date.now()),
+						timeStamp: payInfo.timeStamp,
+						nonceStr: payInfo.nonceStr,
+						package: payInfo.package,
+						signType: payInfo.signType,
+						paySign: payInfo.paySign,
+						success: function(res) {
+							console.log('success:' + JSON.stringify(res));
+							uni.showToast({
+								title: '支付成功',
+								icon: 'none',
+								duration: 2000
+							});
+							uni.switchTab({
+								url: '../index/index'
+							})
+						},
+						fail: function(err) {
+							console.log('fail:' + JSON.stringify(err));
+
+						}
+					});
+				})
+			},
+		},
+		onReachBottom() {
+			this.page++;
+			/* if(this.tabindex==2){
+				this.getbMemberShopList()
+			}else if(this.tabindex==3){
+				this.getShopFootprint()
+			} */
+			this.getData()
+		},
+		onPullDownRefresh() {
+			this.page = 1;
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+	}
+
+	.tab {
+		background: #FFFFFF;
+		display: flex;
+		justify-content: space-between;
+		line-height: 92rpx;
+		position: fixed;
+		width: 100%;
+		height: 92rpx;
+		z-index: 11;
+	}
+
+	.tabLine {
+		width: 180rpx;
+		text-align: center;
+	}
+
+	.tabActive {
+		color: #FF4F00;
+		border-bottom: 4rpx solid #FF4F00;
+	}
+
+	.main {
+		padding-top: 92rpx;
+		background-color: #F4F5F7;
+	}
+
+	.itemBg {
+		margin: 20rpx 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		padding: 20rpx;
+	}
+
+	.itemTop {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.itemSheetState {
+		font-size: 24rpx;
+		color: #FF2400
+	}
+
+	.itemShopBg {
+		display: flex;
+		justify-content: space-between;
+		margin: 20rpx 0;
+	}
+
+	.shopName {
+		color: #333333;
+		font-size: 30rpx;
+	}
+
+	.price {
+		color: #333333;
+		font-size: 32rpx;
+	}
+
+	.itemName {
+		color: #666666;
+		font-size: 24rpx;
+
+		height: 30rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.plateNumber {
+		color: #666666;
+		font-size: 24rpx;
+		margin: 15rpx 0 20rpx;
+	}
+
+	.itemLineBottom {
+		display: flex;
+		justify-content: flex-end;
+
+	}
+
+	.itemBtn1 {
+		width: 150rpx;
+		height: 56rpx;
+		border-radius: 36rpx;
+		border: 2rpx solid #DDDDDD;
+		text-align: center;
+		line-height: 56rpx;
+		font-size: 28rpx;
+		color: #3C3C3C;
+		margin-left: 40rpx;
+	}
+
+	.itemBtn2 {
+		width: 150rpx;
+		height: 56rpx;
+		border-radius: 36rpx;
+		border: 2rpx solid #FF4F00;
+		text-align: center;
+		line-height: 56rpx;
+		font-size: 28rpx;
+		color: #FF4F00;
+		margin-left: 40rpx;
+	}
 </style>

Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/chose-city/chose-city.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/nodata/nodata.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/tki-qrcode/tki-qrcode.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/uni-plate-input/uni-plate-input.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/addphone.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/iPhone/phoneList.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/addCar.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/cailist.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/carModel.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/empower.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/iphoneLogin.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/intimity.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/me.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/setup.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/treaty.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/evaluate.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/myorder.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/orderDetail.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/shop/shopList.js.map


+ 2 - 1
unpackage/dist/dev/mp-weixin/app.json

@@ -67,5 +67,6 @@
       "desc": "获取定位"
     }
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }

+ 3 - 3
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -2611,7 +2611,7 @@ module.exports = g;
 
 /***/ }),
 
-/***/ 228:
+/***/ 244:
 /*!**********************************************************!*\
   !*** /Users/guo/Desktop/txCar/static/dataJson/city.json ***!
   \**********************************************************/
@@ -2622,7 +2622,7 @@ module.exports = JSON.parse("{\"data\":{\"list\":[{\"citycode\":513200,\"name\":
 
 /***/ }),
 
-/***/ 257:
+/***/ 273:
 /*!****************************************************************!*\
   !*** /Users/guo/Desktop/txCar/components/tki-qrcode/qrcode.js ***!
   \****************************************************************/
@@ -3835,7 +3835,7 @@ QRCode;exports.default = _default;
 
 /***/ }),
 
-/***/ 265:
+/***/ 281:
 /*!********************************************************************************************************!*\
   !*** /Users/guo/Desktop/txCar/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***!
   \********************************************************************************************************/

Datei-Diff unterdrückt, da er zu groß ist
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/chose-city/chose-city.js


Datei-Diff unterdrückt, da er zu groß ist
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/nodata/nodata.js


Datei-Diff unterdrückt, da er zu groß ist
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/tki-qrcode/tki-qrcode.js


Datei-Diff unterdrückt, da er zu groß ist
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/uni-plate-input/uni-plate-input.js


Datei-Diff unterdrückt, da er zu groß ist
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/iPhone/addphone.js


Datei-Diff unterdrückt, da er zu groß ist
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/iPhone/phoneList.js


Datei-Diff unterdrückt, da er zu groß ist
+ 137 - 137
unpackage/dist/dev/mp-weixin/pages/index/addCar.js


Datei-Diff unterdrückt, da er zu groß ist
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/index/cailist.js


Datei-Diff unterdrückt, da er zu groß ist
+ 155 - 155
unpackage/dist/dev/mp-weixin/pages/index/carModel.js


Datei-Diff unterdrückt, da er zu groß ist
+ 59 - 14
unpackage/dist/dev/mp-weixin/pages/index/index.js


Datei-Diff unterdrückt, da er zu groß ist
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/me/intimity.js


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/me/me.wxml


Datei-Diff unterdrückt, da er zu groß ist
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/me/setup.js


Datei-Diff unterdrückt, da er zu groß ist
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/me/treaty.js


Datei-Diff unterdrückt, da er zu groß ist
+ 16 - 16
unpackage/dist/dev/mp-weixin/pages/order/evaluate.js


Datei-Diff unterdrückt, da er zu groß ist
+ 61 - 95
unpackage/dist/dev/mp-weixin/pages/order/myorder.js


Datei-Diff unterdrückt, da er zu groß ist
+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/order/myorder.wxml


+ 43 - 94
unpackage/dist/dev/mp-weixin/pages/order/myorder.wxss

@@ -1,102 +1,76 @@
 
-.box.data-v-1f8e8190{
+.box.data-v-1f8e8190 {
 	min-height: 100vh;
 	background: #F4F5F7;
 }
-.tab.data-v-1f8e8190{
+.tab.data-v-1f8e8190 {
 	background: #FFFFFF;
 	display: flex;
 	justify-content: space-between;
-	padding: 0 15rpx;
-	line-height: 84rpx;
+	line-height: 92rpx;
 	position: fixed;
-	left: 0;
-	top: 44px;
-	width: 720rpx;
+	width: 100%;
+	height: 92rpx;
 	z-index: 11;
 }
-.main.data-v-1f8e8190{
-	padding-top:88rpx;
-	padding-left: 24rpx;
-	padding-right: 24rpx;
-}
-.tab.data-v-1f8e8190{
-	position: fixed;
-	left: 0;
-	top: 0;
-}
-.main.data-v-1f8e8190{
-	padding-top: 88rpx ;
-}
-.tabLine.data-v-1f8e8190{
+.tabLine.data-v-1f8e8190 {
 	width: 180rpx;
 	text-align: center;
 }
-.tabActive.data-v-1f8e8190{
+.tabActive.data-v-1f8e8190 {
 	color: #FF4F00;
 	border-bottom: 4rpx solid #FF4F00;
 }
-.flex2.data-v-1f8e8190{
-	display: flex;
-	justify-content: space-between;
-}
-.itemLine.data-v-1f8e8190{
-	background: #FFFFFF;
-	margin-top: 20rpx;
-}
-.itemCode.data-v-1f8e8190{
-	font-size: 28rpx;
-	color: #999999;
+.main.data-v-1f8e8190 {
+	padding-top: 92rpx;
+	background-color: #F4F5F7;
 }
-.itemlineTOp.data-v-1f8e8190{
-	padding: 25rpx 20rpx;
+.itemBg.data-v-1f8e8190 {
+	margin: 20rpx 24rpx;
+	background-color: #FFFFFF;
+	border-radius: 10rpx;
+	padding: 20rpx;
 }
-.itemSheetState.data-v-1f8e8190{
-	font-size: 30rpx;
-	color: #FF4F00
+.itemTop.data-v-1f8e8190 {
+	display: flex;
+	justify-content: space-between;
 }
-.goodsImg.data-v-1f8e8190{
-	width: 126rpx;
-	height: 126rpx;
-	margin-left: 18rpx;
-	border-radius: 5rpx;
+.itemSheetState.data-v-1f8e8190 {
+	font-size: 24rpx;
+	color: #FF2400
 }
-.itemLineImgBox.data-v-1f8e8190{
+.itemShopBg.data-v-1f8e8190 {
 	display: flex;
+	justify-content: space-between;
+	margin: 20rpx 0;
 }
-.itemGoddsImgBox.data-v-1f8e8190{
-	display: flex;
-	width:558rpx;
+.shopName.data-v-1f8e8190 {
+	color: #333333;
+	font-size: 30rpx;
 }
-.diandianImg.data-v-1f8e8190{
-	width: 50rpx;
-	margin-left: 50rpx;
-	margin-top: 50rpx;
+.price.data-v-1f8e8190 {
+	color: #333333;
+	font-size: 32rpx;
 }
-.raleMoneyBox.data-v-1f8e8190{
-	text-align: right;
+.itemName.data-v-1f8e8190 {
 	color: #666666;
 	font-size: 24rpx;
-	line-height: 50rpx;
-	padding-bottom: 20rpx;
-	/* border-bottom:  1px solid #EEEEEE; */
+
+	height: 30rpx;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 }
-.raleMoneySpan.data-v-1f8e8190{
-	color: #3C3C3C;
-	font-size: 32rpx;
-	padding-right: 24rpx;
-	padding-left: 10rpx;
+.plateNumber.data-v-1f8e8190 {
+	color: #666666;
+	font-size: 24rpx;
+	margin: 15rpx 0 20rpx;
 }
-.itemLineBottom.data-v-1f8e8190{
+.itemLineBottom.data-v-1f8e8190 {
 	display: flex;
 	justify-content: flex-end;
-	padding-top: 20rpx;padding-bottom: 20rpx;padding-right: 20rpx;
-	border-top: 1px solid #EEEEEE;
-}
-.daifuwuBOxDiv.data-v-1f8e8190{
-	padding: 20rpx;
 }
-.itemBtn1.data-v-1f8e8190{
+.itemBtn1.data-v-1f8e8190 {
 	width: 150rpx;
 	height: 56rpx;
 	border-radius: 36rpx;
@@ -107,7 +81,7 @@
 	color: #3C3C3C;
 	margin-left: 40rpx;
 }
-.itemBtn2.data-v-1f8e8190{
+.itemBtn2.data-v-1f8e8190 {
 	width: 150rpx;
 	height: 56rpx;
 	border-radius: 36rpx;
@@ -118,29 +92,4 @@
 	color: #FF4F00;
 	margin-left: 40rpx;
 }
-.daifuwuBOx.data-v-1f8e8190{
-	width: 662rpx;
-	height: 175rpx;
-	background: rgba(255, 79, 0, 0.04);
-	border-radius: 6rpx;
-}
-.orderyytimeImg.data-v-1f8e8190{
-	width: 32rpx;
-	height: 32rpx;
-}
-.daifuwuBOxTop.data-v-1f8e8190{
-	display: flex;
-	padding: 20rpx 0 20rpx 20rpx;
-	color: #FF4F00;
-	font-size: 28rpx;
-}
-.daifuwuBOxTitle.data-v-1f8e8190{
-	line-height: 32rpx;padding-left: 10rpx;
-}
-.daifuwuBOxLIne.data-v-1f8e8190{
-	color: #666666;
-	font-size: 26rpx;
-	line-height: 40rpx;
-	padding-left: 20rpx;
-}
 

Datei-Diff unterdrückt, da er zu groß ist
+ 18 - 18
unpackage/dist/dev/mp-weixin/pages/order/orderDetail.js


Datei-Diff unterdrückt, da er zu groß ist
+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/shop/shopList.js