From c7606f3649f0f61cd46647cff7644b6d1e5fc583 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Sun, 23 Aug 2020 23:31:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=B8=A6=E4=BB=B6=E7=AE=80=E5=8D=95?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/shundaijian.js         | 67 ++++++++++++++++++++++++++++++++++++---
 templete/shundaijian.html |  4 +--
 2 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/js/shundaijian.js b/js/shundaijian.js
index 54afd65..d8a8c0f 100644
--- a/js/shundaijian.js
+++ b/js/shundaijian.js
@@ -1,6 +1,7 @@
 mui.plusReady(function(){
 	
 })
+const waiting = plus.nativeUI.showWaiting("正在加载")
 
 const app = new Vue({
 	el: '#app',
@@ -29,6 +30,7 @@ const app = new Vue({
 			// 		self.back();
 			// 	}
 			// });
+			waiting.close();
 			this.orderList = [
 				{
 					from_address: '测试dizhi 测试地址测试地址测试地址测试地址测试地址测试地址',
@@ -38,19 +40,76 @@ const app = new Vue({
 					before: '2020/20/20 11:20',
 					shop_phone: '15270565303',
 					buyer_phone: '15270565304',
-					
-				}
+					distance_to_shop: '20km',
+					distance_to_buyer: '>100km',
+				},
+				{
+					from_address: '测试22222dizhi 测试地址测试地址测试地址测试地址测试地址测试地址',
+					to_address: '测试地址测试地址测试地址测试地址测试地址测试地址',
+					deliver_fee: '20.00',
+					fee: '38.00',
+					before: '2020/20/20 11:20',
+					shop_phone: '15270565303',
+					buyer_phone: '15270565304',
+					distance_to_shop: '412m',
+					distance_to_buyer: '800m',
+				},
+				{
+					from_address: '测试dizhi 测试地址测试地址测试地址测试地址测试地址测试地址',
+					to_address: '测试地址测试地址测试地址测试地址测试地址测试地址',
+					deliver_fee: '8.00',
+					fee: '18.00',
+					before: '2020/20/20 11:20',
+					shop_phone: '15270565303',
+					buyer_phone: '15270565304',
+					distance_to_shop: '20km',
+					distance_to_buyer: '>100km',
+				},
+				{
+					from_address: '测试22222dizhi 测试地址测试地址测试地址测试地址测试地址测试地址',
+					to_address: '测试地址测试地址测试地址测试地址测试地址测试地址',
+					deliver_fee: '20.00',
+					fee: '38.00',
+					before: '2020/20/20 11:20',
+					shop_phone: '15270565303',
+					buyer_phone: '15270565304',
+					distance_to_shop: '412m',
+					distance_to_buyer: '800m',
+				},
+				{
+					from_address: '测试dizhi 测试地址测试地址测试地址测试地址测试地址测试地址',
+					to_address: '测试地址测试地址测试地址测试地址测试地址测试地址',
+					deliver_fee: '8.00',
+					fee: '18.00',
+					before: '2020/20/20 11:20',
+					shop_phone: '15270565303',
+					buyer_phone: '15270565304',
+					distance_to_shop: '20km',
+					distance_to_buyer: '>100km',
+				},
+				{
+					from_address: '测试22222dizhi 测试地址测试地址测试地址测试地址测试地址测试地址',
+					to_address: '测试地址测试地址测试地址测试地址测试地址测试地址',
+					deliver_fee: '20.00',
+					fee: '38.00',
+					before: '2020/20/20 11:20',
+					shop_phone: '15270565303',
+					buyer_phone: '15270565304',
+					distance_to_shop: '412m',
+					distance_to_buyer: '800m',
+				},
 			]
 		},
 	},
 	created() {
-		this.loadData();
 		plus.geolocation.getCurrentPosition((p) => {
 			console.log(p.coords.latitude);
 			console.log(p.coords.longitude);
 			this.location=[p.coords.latitude, p.coords.longitude];
+			this.loadData();
 		},function (err) {
-			
+			mui.alert('获取当前位置失败')
+			waiting.close();
 		})
 	},
 })
\ No newline at end of file
diff --git a/templete/shundaijian.html b/templete/shundaijian.html
index 370510e..8c105b0 100644
--- a/templete/shundaijian.html
+++ b/templete/shundaijian.html
@@ -57,12 +57,12 @@
 				</div>
 				<div class="loc_range">
 					<span>我</span>
-					<span class="between">1km</span>
+					<span class="between">{{each.distance_to_shop}}</span>
 					<span class="with_img">
 						<img src="../img/gothere.png" alt="">
 						商家
 					</span>
-					<span class="between">2km</span>
+					<span class="between">{{each.distance_to_buyer}}</span>
 					<span class="with_img">
 						<img src="../img/gothere.png" alt="">
 						购户