Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/components/appoint/appoint-time.vue

@@ -188,9 +188,9 @@
 				let morrow = this.moment(now).add(1, 'days')
 				let content
 				if(day == now) {
-					content = this.moment(day).format('今天')
+					content = '今天'
 				} else if(day == morrow) {
-					content = this.moment(day).format('明天')
+					content = '明天'
 				} else {
 					content = this.moment(day).format('周dd')
 				}

src/pages.json

@@ -290,7 +290,9 @@
 				    "style" :                                                                                    
 				    {
 						"navigationBarTitleText": "订单详情",
-						"navigationStyle": "custom"
+						"navigationStyle": "custom",
+						"navigationStyle": "custom", // 隐藏系统导航栏
+						"disableScroll": true
 				    }
 				    
 				},

src/pages/index/order.vue

@@ -25,7 +25,7 @@
 				scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
 				refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh"
 				@refresherrestore="onRestore" @refresherabort="onAbort">
-				<NoOrder v-if="noMore" type="black" customStyle="margin-top: 100rpx;background-color: #F4F5F7" />
+				<NoOrder v-if="noMore" type="black" :customStyle="noOrderCustomStyle" />
 				<template v-else>
 					<view v-for="(item, index) in orderList" :key="item.orderId">
 						<OrderCell :orderData="item" :type="orderType" :location="dataValue" @click="handleClick(item)"
@@ -142,7 +142,11 @@
 			noMore() {
 				console.log('nomore：', this.orderList.length == 0 && this.pageNumber != 0)
 				return this.orderList.length == 0 && this.loaded
+			},
+			noOrderCustomStyle() {
+				return this.curNow == 0 ? 'margin-top: 100rpx;background-color: #F4F5F7' : 'margin-top: 200rpx;background-color: #F4F5F7'
 			}
+			
 		},
 		methods: {
 			sectionChange(index) {

src/pages/mine/wallet/index.vue

@@ -2,8 +2,10 @@
 	<view class="wallet-view">
 		<u-navbar back-icon-color="#333333" background="#F4F5F7" title="我的钱包" titleColor="#333333"
 			:border-bottom="false"></u-navbar>
-		<view class="wallet-content-view">
-			<image class="header-image" mode="widthFix" :src="qianbaobeijing"></image>
+		<view class="wallet-content-view">
+			<view class="header-view">
+				<image class="header-image" mode="widthFix" :src="qianbaobeijing"></image>
+			</view>
 			<view class="survey-view">
 				<view class="survey-top-view">
 					<view class="survey-top-left">
@@ -182,13 +184,17 @@
 		.wallet-content-view {
 			position: relative;
 			overflow: auto;
-			background-color: #F4F5F7;
-			.header-image {
-				position: absolute;
-				width: 100%;
-				margin-left: 4rpx;
-				margin-top: 10rpx;
+			background-color: #F4F5F7;
+			.header-view {
+				position: absolute;
+				width: 100%;
+				padding-top: 10rpx;
+				padding-left: 6rpx;
+				.header-image {
+					width: 100%;
+				}
 			}
+			
 
 			.survey-view {
 				position: relative;

src/pages/order/detail.vue

@@ -231,7 +231,7 @@
 				contactAddressLatitud:0,
 				num:0,
 				showTimeOut:true,
-				clicking: false,
+				clicking: false
 			}
 		},
 		onLoad(option) {
@@ -669,14 +669,28 @@
 				})
 			},
 			filish(){
-				// 去完工
-				uni.navigateTo({
-					url: 'pages/order/complete?orderId='+this.order.orderId
-						+ "&categoryId=" + this.order.categoryId
-						+ "&orderServiceType=" + this.order.orderServiceType
-						+ "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
-						+ "&partnerCompanyId=" + this.order.partnerCompanyId
-				})
+				let self = this
+				var data = {
+					'orderId': self.orderId
+				};
+				self.$u.api.orderDetail(data, self.orderId).then((res) => {
+					if (res.code == 200) {
+						if(res.data.orderStatus > 31 && res.data.orderStatus < 80){
+							// 去完工
+							uni.navigateTo({
+								url: 'pages/order/complete?orderId='+this.order.orderId
+									+ "&categoryId=" + this.order.categoryId
+									+ "&orderServiceType=" + this.order.orderServiceType
+									+ "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
+									+ "&partnerCompanyId=" + this.order.partnerCompanyId
+							})	
+						}else{
+							this.commonToast('当前工单已被改派！','warning')
+						}
+					} else {
+						console.log(res.message, "获取订单详情失败！");
+					}
+				});
 			},
 			rejectOrder() { // 拒单
 				// 检查是否可以拒单