搜索页、列表页无结果换图；订单cell距离重新计算

src/components/order/index.vue

@@ -280,27 +280,31 @@
 				}
 				return address
 			},
-			/**  
-			 * echo distance(116.3896,39.91917,116.3940,39.91726);
-			 * 计算两点之间直线距离  
-			 * @param float $lon1    经度  
-			 * @param float $lat1    维度  
-			 * @param float $lon2    经度  
-			 * @param float $lat2    维度  
-			 * @return float         浮点数  
-			 */
-			distance(la1, lo1, la2, lo2) {
-				var La1 = la1 * Math.PI / 180.0;
-				var La2 = la2 * Math.PI / 180.0;
-				var La3 = La1 - La2;
-				var Lb3 = lo1 * Math.PI / 180.0 - lo2 * Math.PI / 180.0;
-				var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(La3 / 2), 2), Math.cos(La1) * Math.cos(La2) * Math.pow(
-					Math.sin(Lb3 / 2), 2)));
-				s = s * 6378.137; //地球半径  
-				s = Math.round(s * 10000) / 10000;
-				// console.log("计算结果",s,'KM');   
-				return s ? s.toFixed(2) : 0;
-			},
+			/**
+			 * echo distance(116.3896,39.91917,116.3940,39.91726);
+			 * 计算两点之间直线距离  
+			 * @param float $lon1    经度  
+			 * @param float $lat1    维度  
+			 * @param float $lon2    经度  
+			 * @param float $lat2    维度  
+			 * @return float         浮点数  
+			 */  
+			distance(lat1, lng1, lat2, lng2) {  
+				console.log(lat1, lng1, lat2, lng2)
+				var radLat1 = this.Rad(lat1);
+				var radLat2 =  this.Rad(lat2);
+				var a = radLat1 - radLat2;
+				var  b = this.Rad(lng1) - this.Rad(lng2);
+				var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a/2),2) +
+				Math.cos(radLat1)*Math.cos(radLat2)*Math.pow(Math.sin(b/2),2)));
+				s = s *6378.137 ;// EARTH_RADIUS;
+				s = Math.round(s * 10000)/10000 //输出为米
+				console.log("计算结果",s,'M');   
+				return Number(s?s.toFixed(2):0);
+			 },
+			 Rad(d){
+				  return d * Math.PI / 180.0;//经纬度转换成三角函数中度分表形式。
+			 },
 		}
 	}
 </script>

src/components/order/noOrder.vue

@@ -11,11 +11,23 @@
 			customStyle: {
 				type: String,
 				default: 'background-color: #FFFFFF'
+			},
+			type: { // 图片
+				type: String,
+				default: 'white',
 			}
 		},
 		computed: {
-			wudingdanImage() {
-				return process.uniEnv.qn_base_url + 'wudingdan.png'
+			wudingdanImage() {
+				var name = 'wudingdan.png'
+				switch(this.type) {
+					case 'black':
+						name = "zwdd.png"
+						break
+					default:
+						break
+				}
+				return process.uniEnv.qn_base_url + name
 			}
 		}
 	}

src/pages/index/index.vue

@@ -115,8 +115,8 @@
 		computed: {
 			buttonStyle() {
 				return {
-					width: "400rpx",
-					height: "104rpx",
+					width: "300rpx",
+					height: "80rpx",
 					"font-size": "32rpx",
 					"font-weight": "bold",
 				};
@@ -525,7 +525,7 @@
 				.tip-other {
 					font-size: 28rpx;
 					color: #666666;
-					margin-bottom: 20rpx;
+					margin-bottom: 30rpx;
 				}
 
 				.settle-button {}

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" customStyle="margin-top: 100rpx;background-color: #F4F5F7" />
+				<NoOrder v-if="noMore" type="black" customStyle="margin-top: 100rpx;background-color: #F4F5F7" />
 				<template v-else>
 					<view v-for="(item, index) in orderList" :key="item.orderId">
 						<OrderCell :orderData="item" :type="orderType" :location="dataValue" @click="handleClick(item)"

src/pages/order/detail.vue

@@ -81,12 +81,17 @@
 						<view class="order-cell between-cell" v-for="(record,index) in shwoOrderRecords" :key="record.operationContent">
 							<view class="node-view"></view>
 							<view class="line-view-left">
-							<text>{{$u.timeFormat(record.operationDatetime, 'yyyy.mm.dd hh:MM:ss')}} </text>
+								<text>{{$u.timeFormat(record.operationDatetime, 'yyyy.mm.dd \n hh:MM:ss')}} </text>
 							</view>
-							<text v-show="record.operationType==='报备'"> {{record.orderRecordRemark}}</text>
 							<view class="line-view-right">
-								<text style="color: red;">{{record.overTime?'（超时）':''}}{{record.exception?'（异常）':''}}</text>
-							<text>{{record.operationType}}</text>
+								<view>
+									<text>{{record.operationType}}</text>
+									<text style="color: red;">{{record.overTime?'（超时）':''}}{{record.exception?'（异常）':''}}</text>
+								</view>
+								<view v-show="record.operationType==='报备' || record.operationType==='改约'">
+									<text>{{record.operationType==='报备' ? '下次联系时间：' : '改约时间：'}}</text>
+									<text style="color: #2272FF;">{{record.orderRecordRemark}}</text>
+								</view>
 							</view>
 						</view>
 					</view>
@@ -903,11 +908,11 @@
 					margin-left: 6rpx;
 				}
 				.line-view-left {
-					width: 270rpx;
+					width: 170rpx;
 					flex-shrink: 0;
 				}
 				.line-view-right {
-					text-align: right;
+					// text-align: right;
 				}
 				
 				.record-line-view ::before {
@@ -1060,7 +1065,7 @@
 
 	.between-cell {
 		display: flex;
-		justify-content: space-between;
+		// justify-content: space-between;
 		align-items: flex-start;
 	}
 	.cell-title {

src/pages/order/search.vue

@@ -31,7 +31,7 @@
 				</view>
 				<u-loadmore :status="loadStatus" bgColor="#F4F5F7"></u-loadmore>
 			</view>
-			<view v-else="search.keyword" class="empty-result">
+			<view v-else-if="loaded" class="empty-result">
 				<u-image width="374" height="256" :src="searchEmpty">
 					<u-loading slot="loading"></u-loading>
 				</u-image>
@@ -60,7 +60,7 @@
 					orderStatusRangeType: '',
 				},
 				orderList: [],
-				
+				loaded: false,
 			};
 		},
 		onLoad() {
@@ -85,6 +85,7 @@
 				
 				// 状态处理
 				self.search.pageNumber += 1
+				self.loaded = false
 				self.$u.api.listOrder(self.search).then((res) => {
 					if (res.code == 200) {
 						if (res.data) {
@@ -94,6 +95,7 @@
 					} else {
 						self.$u.toast(res.message);
 					}
+					self.loaded = true
 				});
 			
 			},