diff --git a/App.vue b/App.vue index c068c0a1..c3f6a85c 100644 --- a/App.vue +++ b/App.vue @@ -2805,8 +2805,8 @@ ...{ name: result.name || null, address: result.address || null, - lat: result.latitude || null, - lng: result.longitude || null, + lat: result.lat || null, + lng: result.lng || null, status: result.status || 1, }, }; @@ -2879,8 +2879,8 @@ var address = { name: i18n.t('shopxo-uniapp.app.tghyu3'), address: '', - latitude: res.latitude || null, - longitude: res.longitude || null, + lat: res.latitude || null, + lng: res.longitude || null, status: 1, }; uni.setStorageSync(cache_key, address); diff --git a/components/realstore-list/realstore-list.vue b/components/realstore-list/realstore-list.vue index fffe4021..ae1370ae 100644 --- a/components/realstore-list/realstore-list.vue +++ b/components/realstore-list/realstore-list.vue @@ -70,7 +70,11 @@ export default { }, propIsChoiceBackType: { type: String, - default: 'back', + default: '', + }, + propIsOpenRealstoreRedirect: { + type: Boolean, + default: true, }, propData: { type: Object, @@ -216,7 +220,7 @@ export default { break; // 进入门店详情页面 case 'realstore-detail' : - app.globalData.url_open('/pages/plugins/realstore/detail/detail?id='+data.id, true); + app.globalData.url_open(data.url, this.propIsOpenRealstoreRedirect); break; } } else { diff --git a/pages/common/open-setting-location/open-setting-location.vue b/pages/common/open-setting-location/open-setting-location.vue index 51ee6ce3..1dc8caba 100644 --- a/pages/common/open-setting-location/open-setting-location.vue +++ b/pages/common/open-setting-location/open-setting-location.vue @@ -104,7 +104,11 @@ export default { uni.chooseLocation({ success: (res) => { // 位置数据存储缓存中,改变状态值(成功) - res['status'] = 1; + res['status'] = 1; + res['lat'] = res.latitude; + res['lng'] = res.longitude; + delete res['latitude']; + delete res['longitude']; uni.setStorageSync(this.cache_key, res); // 触发自定义事件并传递参数给上一页 diff --git a/pages/plugins/realstore/index/index.vue b/pages/plugins/realstore/index/index.vue index b291e7b7..a133741d 100644 --- a/pages/plugins/realstore/index/index.vue +++ b/pages/plugins/realstore/index/index.vue @@ -91,9 +91,9 @@ - + - + diff --git a/pages/plugins/realstore/search/search.vue b/pages/plugins/realstore/search/search.vue index 72601cbe..77d6c1f5 100644 --- a/pages/plugins/realstore/search/search.vue +++ b/pages/plugins/realstore/search/search.vue @@ -43,7 +43,7 @@ - + @@ -91,6 +91,8 @@ is_choice_mode: 0, // 选择模式回调类型(back返回上一页,realstore-detail进入门店详情) choice_mode_back_type: 'back', + // 打开门店详情页面是否关闭当前页面(0否,1是) + is_open_realstore_redirect: true, // 显示类型模式(0列表,1地图) show_type_mode: 0, // 地图 @@ -133,6 +135,7 @@ params: params, is_choice_mode: parseInt(params.is_choice_mode || 0), choice_mode_back_type: (params.choice_mode_back_type === undefined) ? 'back' : (params.choice_mode_back_type || ''), + is_open_realstore_redirect: (params.is_open_realstore_redirect === undefined) ? true : parseInt(params.is_open_realstore_redirect || 0) == 1, show_type_mode: parseInt(params.show_type_mode || 0), search_keywords_value: params.keywords || "", nav_active_value: params.category_id || 0,