From c6834722817712a4fe8c4df356794a5e1006fa26 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 18 Oct 2019 16:49:46 +0800
Subject: [PATCH] =?UTF-8?q?'=E5=95=86=E9=93=BA=E5=86=85=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E7=8E=87=E8=BF=87=E6=BB=A4=E5=95=86=E5=93=81?=
 =?UTF-8?q?'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/mapcommon.js       | 2 +-
 js/store_commodity.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/mapcommon.js b/js/mapcommon.js
index 0bcaa81..042920c 100644
--- a/js/mapcommon.js
+++ b/js/mapcommon.js
@@ -341,7 +341,7 @@ function getLocation(callback) {
 		callback(obj);
 	}, {
 		//超时未获取到经纬度信息  执行失败回调  (默认为5秒)
-		timeout: 3000
+		timeout: 10000
 	});
 	//JZL.saveItems('.user_pos', 'user_pos');
 }
diff --git a/js/store_commodity.js b/js/store_commodity.js
index b92d6cc..76fcab5 100644
--- a/js/store_commodity.js
+++ b/js/store_commodity.js
@@ -36,6 +36,7 @@ function pullupRefresh() {
 		nowpage += 1
 		mui.ajax(qlgUrl('app/Shopping/getShopIndexGoodsList'), {
 			data: {
+				from_id,
 				page: nowpage,
 				PerPage: 10,
 				shopId: shopId