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

src/components/createCom/XhInput.vue

@@ -93,11 +93,7 @@
 		},
 		watch: {},
 		mounted() {},
-		methods: {
-			handleFocus() {
-				console.log('handle focus')
-			}
-		}
+		methods: {}
 	}
 </script>
 

src/pages/index/index.vue

@@ -3,7 +3,7 @@
 		scroll-anchoring scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
 				refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh"
 				@refresherrestore="onRestore" @refresherabort="onAbort" enable-back-to-top>
-		<TabBarPage title="充电桩自营平台">
+		<TabBarPage title="扳手会">
 		<image class="banner-image" :src="bannerImage" @click="handleClickBanner"></image>
 
 		<view class="msg-view">
@@ -52,7 +52,7 @@
 									@click="handleClick(item.orderId)" @action="handleAction(item.orderId)">
 								</OrderCell>
 							</view>
-							<u-loadmore :status="currentLoadStatus" bgColor="#F4F5F7"></u-loadmore>
+							<u-loadmore v-show="(search.pageNumber == 1 && loadedOrder) || search.pageNumber > 2" :status="currentLoadStatus" bgColor="#F4F5F7"></u-loadmore>
 						<!-- </scroll-view> -->
 					</view>
 
@@ -161,9 +161,8 @@
 		onShow() {
 			// 每次进入页面都刷新入驻状态
 			this.pageNumber = 0
-			if (this.vuex_token) {
-				this.initSettleInfo();
-			}
+			
+			this.initSettleInfo();
 			this.getLocation()
 		},
 		// onPullDownRefresh() {
@@ -196,24 +195,28 @@
 					url: 'pages/order/detail?id=' + orderId
 				})
 			},
-			async initSettleInfo() {
-				let self = this;
-				const callBack = (vm, result) => {
-					// 后台自动判断入驻流程是否完成，前台通过status确定状态
-					if (result && result.record) {
-						vm.loaded = true;
-						vm.needSettled = result.needSettled;
-						vm.status = Number(result.record.status || '0');
-						// vm.status = 8
-					}
-				};
-				await app.getBaseInfo(self, callBack);
-
-				// 加载消息列表
-				self.loadMessageList();
-				self.search.pageNumber = 0
-				self.loadedOrder = false
-				self.loadOrderList();
+			async initSettleInfo() {
+				let self = this;
+				// 加载消息列表
+				this.loadMessageList();
+				if (this.vuex_token) {
+	
+					const callBack = (vm, result) => {
+						// 后台自动判断入驻流程是否完成，前台通过status确定状态
+						if (result && result.record) {
+							
+							vm.needSettled = result.needSettled;
+							vm.status = Number(result.record.status || '0');
+							// vm.status = 8
+						}
+					};
+					self.search.pageNumber = 0
+					self.loadedOrder = false
+					self.loadOrderList();
+					await app.getBaseInfo(self, callBack);
+					this.loaded = true;
+				}
+				
 			},
 			loadMessageList() {
 				let self = this;
@@ -240,10 +243,11 @@
 					self.loadedOrder = true
 					self.triggered = false;
 					self._freshing = false;
-					if (res.code == 200 && res.data) {
+					if (res.code == 200 && res.data) {
 						if (self.search.pageNumber == 1) {
 							self.orderList = []
 						}
+						
 						if (res.data.list) {
 							self.orderList.push(...res.data.list);
 						}

src/pages/index/order.vue

@@ -31,7 +31,7 @@
 						<OrderCell :orderData="item" :type="orderType" :location="dataValue" @click="handleClick(item)"
 							@action="handleAction(item)"> </OrderCell>
 					</view>
-					<u-loadmore :status="loadStatus" bgColor="#F4F5F7"></u-loadmore>
+					<u-loadmore v-show="(pageNumber == 1 && loaded) || pageNumber > 2"  :status="loadStatus" bgColor="#F4F5F7"></u-loadmore>
 				</template>
 			</scroll-view>
 			<!-- </swiper-item> -->
@@ -220,41 +220,6 @@
 				var self = this;
 				self.$u.api.listOrder(param).then((res) => {
 					if (res.code == 200) {
-						/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
-						// res.data.type = self.orderType
-						// if (res.data.list) {
-						// 	if (res.data.list.length == 0 && res.data.total > 0) {
-						// 		res.data.total = 15
-						// 		res.data.list = [{
-						// 			orderServiceType: '安装', // 服务类型：安装、维修
-						// 			categoryName: '充电桩', // 品类：充电桩
-						// 			orderBusinessTypeText: '分配单', // 业务类型：分配单、订单池
-						// 			orderNumber: 'OR2021041809827', // 工单编号
-						// 			contactName: '郭小清', // 客户信息
-						// 			contactPhone: '13631612077', // 联系方式
-						// 			contactAddress: '湾街道荔枝花园D座125号', // 详细地址
-						// 			contactAddressLatitud: '116.3896', // 联系人地址经度	
-						// 			contactAddressLongitud: '39.91917', // 联系人地址纬度	
-						// 			orderStatus: 0, // 工单状态
-						// 			appointmentDatetime: '', // 预约时间
-						// 			currentWillOverTime: 10000, // 剩余时间
-						// 			currentOverTime: new Date().getTime() + 10000, // 超过时间点
-						// 			auditDatetime: '2021.04.19  12:45:09', // 审核时间
-						// 			submissionTime: '2021.04.19  16:24:48', // 提交时间
-						// 			auditResults: {}, // 审核结果
-						// 			orderBusinessType: 'R', // 业务类型 R 为抢单
-						// 			orderId: '1100000216'
-						// 		}]
-						// 		res.data.list = [...res.data.list, ...res.data.list, ...res.data.list, ...res.data
-						// 			.list,
-						// 			...res.data.list, ...res.data.list, ...res.data.list, ...res.data.list, ...
-						// 			res
-						// 			.data.list, ...res.data.list
-						// 		]
-						// 	}
-						// }
-						/*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/
-						// 后台需要返回type，防止数据返回延迟期间点击了其他的tab
 						if (res.data.type != self.orderType) return
 						self.triggered = false;
 						self._freshing = false;

src/pages/mine/wallet/statement.vue

@@ -6,7 +6,7 @@
 			<view class="statement-content-view">
 				<view class="head-view">
 					<view class="head-top-view">
-						<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+						<picker mode="date" :value="date" fields="month" @change="bindDateChange" :end="endTime">
 						    <view class="date-input">
 								<text class="date-text">{{date}}</text>
 								<u-icon name="arrow-down"></u-icon>
@@ -71,6 +71,9 @@
 					...this.data,
 					number: this.data.statementList.length
 				}
+			},
+			endTime() {
+				this.$u.DateTimeFormat(new Date().getTime(), 'YYYY-MM-DD')
 			},
 			items() {
 				return {

src/pages/order/complete.vue

@@ -669,7 +669,7 @@
                     }
                 }, 10)
             },
-			handleTouchstart() {
+			handleTouchstart() { // 防止输入光标滚动出现错乱
 				uni.hideKeyboard()
 			}
 		}

src/pages/order/detail.vue

@@ -149,7 +149,7 @@
 			<!-- 异常预约 ，现场拍照 这里是调用拍照的两个组件-->
 			<view class="right">
 				<view v-if="errorSignIn || scenePhoto" @click="$u.throttle(handleClickRight, 500)" :class="['button', {'active': scenePhoto}]">
-					<text>{{errorSignIn ? '异常' : '拍照'}}</text>
+					<text>{{errorSignIn ? '异常签到' : '拍照'}}</text>
 
 				</view>
 			</view>
@@ -516,6 +516,7 @@
 					this.allowRejection = true
 					this.submitType = "orderAccept"
 					this.readMore = false
+					this.isAllowDianhuaAndDaohang = false
 				} else if (orderStatus < 31 && orderBusinessType === '订单池') {
 					// 抢单
 					this.centerButton = "appoint1"
@@ -524,6 +525,7 @@
 					this.submitType = "orderGan"
 					this.showTimeOut=false
 					this.readMore = false
+					this.isAllowDianhuaAndDaohang = false
 				} else if (orderStatus === 31 && !this.order.appointmentDatetime) {
 					// 预约
 					this.centerButton = "appoint2"