'商铺内需要优惠率过滤商品'

js/mapcommon.js

@@ -341,7 +341,7 @@ function getLocation(callback) {
 		callback(obj);
 	}, {
 		//超时未获取到经纬度信息  执行失败回调  (默认为5秒)
-		timeout: 3000
+		timeout: 10000
 	});
 	//JZL.saveItems('.user_pos', 'user_pos');
 }

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