From 75c59736f953339109657393af11e25d8b1c27e7 Mon Sep 17 00:00:00 2001 From: Devil Date: Mon, 15 Mar 2021 00:02:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E5=9C=B0=E5=9D=80=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/BaseService.php | 2 +- .../pages/extraction-address/extraction-address.js | 8 ++++---- .../pages/extraction-address/extraction-address.js | 8 ++++---- .../pages/extraction-address/extraction-address.js | 8 ++++---- .../pages/extraction-address/extraction-address.js | 8 ++++---- .../pages/extraction-address/extraction-address.js | 8 ++++---- .../distribution/extraction-switch/extraction-switch.js | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/application/service/BaseService.php b/application/service/BaseService.php index 4b9782c44..0a5c01d90 100644 --- a/application/service/BaseService.php +++ b/application/service/BaseService.php @@ -65,7 +65,7 @@ class BaseService // 订单相关 'home_is_enable_order_bulk_pay' => (int) MyC('home_is_enable_order_bulk_pay', 0), - 'home_buy_extraction_address_position'=> (int) MyC('home_buy_extraction_address_position', 0), + 'home_extraction_address_position' => (int) MyC('home_extraction_address_position', 0), // 用户中心相关 'common_user_center_notice' => MyC('common_user_center_notice', null, true), diff --git a/sourcecode/alipay/default/pages/extraction-address/extraction-address.js b/sourcecode/alipay/default/pages/extraction-address/extraction-address.js index 8d5a03871..baf157a85 100644 --- a/sourcecode/alipay/default/pages/extraction-address/extraction-address.js +++ b/sourcecode/alipay/default/pages/extraction-address/extraction-address.js @@ -10,13 +10,13 @@ Page({ user_location_cache_key: app.data.cache_userlocation_key, user_location: null, is_first: 1, - home_buy_extraction_address_position: 0, + home_extraction_address_position: 0, }, onLoad(params) { this.setData({ params: params, - home_buy_extraction_address_position: app.get_config('config.home_buy_extraction_address_position', 0), + home_extraction_address_position: app.get_config('config.home_extraction_address_position', 0), }); }, @@ -25,7 +25,7 @@ Page({ my.removeStorage({key: this.data.user_location_cache_key}); // 是否获取位置 - if((this.data.params.is_buy || 0) == 1 && this.data.home_buy_extraction_address_position == 1) + if((this.data.params.is_buy || 0) == 1 && this.data.home_extraction_address_position == 1) { my.navigateTo({ url: '/pages/common/open-setting-location/open-setting-location' @@ -37,7 +37,7 @@ Page({ my.setNavigationBar({ title: app.data.common_pages_title.extraction_address }); // 是否需要选择地理位置 - if(this.data.home_buy_extraction_address_position == 1) + if(this.data.home_extraction_address_position == 1) { // 首次不请求数据 if(this.data.is_first == 0) diff --git a/sourcecode/baidu/default/pages/extraction-address/extraction-address.js b/sourcecode/baidu/default/pages/extraction-address/extraction-address.js index b9745fb48..9562e88e5 100644 --- a/sourcecode/baidu/default/pages/extraction-address/extraction-address.js +++ b/sourcecode/baidu/default/pages/extraction-address/extraction-address.js @@ -10,13 +10,13 @@ Page({ user_location_cache_key: app.data.cache_userlocation_key, user_location: null, is_first: 1, - home_buy_extraction_address_position: 0, + home_extraction_address_position: 0, }, onLoad(params) { this.setData({ params: params, - home_buy_extraction_address_position: app.get_config('config.home_buy_extraction_address_position', 0), + home_extraction_address_position: app.get_config('config.home_extraction_address_position', 0), }); }, @@ -25,7 +25,7 @@ Page({ swan.removeStorage({key: this.data.user_location_cache_key}); // 是否获取位置 - if((this.data.params.is_buy || 0) == 1 && this.data.home_buy_extraction_address_position == 1) + if((this.data.params.is_buy || 0) == 1 && this.data.home_extraction_address_position == 1) { swan.navigateTo({ url: '/pages/common/open-setting-location/open-setting-location' @@ -37,7 +37,7 @@ Page({ swan.setNavigationBarTitle({ title: app.data.common_pages_title.extraction_address }); // 是否需要选择地理位置 - if(this.data.home_buy_extraction_address_position == 1) + if(this.data.home_extraction_address_position == 1) { // 首次不请求数据 if(this.data.is_first == 0) diff --git a/sourcecode/qq/default/pages/extraction-address/extraction-address.js b/sourcecode/qq/default/pages/extraction-address/extraction-address.js index bca39c203..087903939 100644 --- a/sourcecode/qq/default/pages/extraction-address/extraction-address.js +++ b/sourcecode/qq/default/pages/extraction-address/extraction-address.js @@ -10,13 +10,13 @@ Page({ user_location_cache_key: app.data.cache_userlocation_key, user_location: null, is_first: 1, - home_buy_extraction_address_position: 0, + home_extraction_address_position: 0, }, onLoad(params) { this.setData({ params: params, - home_buy_extraction_address_position: app.get_config('config.home_buy_extraction_address_position', 0), + home_extraction_address_position: app.get_config('config.home_extraction_address_position', 0), }); }, @@ -25,7 +25,7 @@ Page({ qq.removeStorage({key: this.data.user_location_cache_key}); // 是否获取位置 - if((this.data.params.is_buy || 0) == 1 && this.data.home_buy_extraction_address_position == 1) + if((this.data.params.is_buy || 0) == 1 && this.data.home_extraction_address_position == 1) { qq.navigateTo({ url: '/pages/common/open-setting-location/open-setting-location' @@ -37,7 +37,7 @@ Page({ qq.setNavigationBarTitle({ title: app.data.common_pages_title.extraction_address }); // 是否需要选择地理位置 - if(this.data.home_buy_extraction_address_position == 1) + if(this.data.home_extraction_address_position == 1) { // 首次不请求数据 if(this.data.is_first == 0) diff --git a/sourcecode/toutiao/default/pages/extraction-address/extraction-address.js b/sourcecode/toutiao/default/pages/extraction-address/extraction-address.js index 7539df45c..d6a32e4ba 100644 --- a/sourcecode/toutiao/default/pages/extraction-address/extraction-address.js +++ b/sourcecode/toutiao/default/pages/extraction-address/extraction-address.js @@ -10,13 +10,13 @@ Page({ user_location_cache_key: app.data.cache_userlocation_key, user_location: null, is_first: 1, - home_buy_extraction_address_position: 0, + home_extraction_address_position: 0, }, onLoad(params) { this.setData({ params: params, - home_buy_extraction_address_position: app.get_config('config.home_buy_extraction_address_position', 0), + home_extraction_address_position: app.get_config('config.home_extraction_address_position', 0), }); }, @@ -25,7 +25,7 @@ Page({ tt.removeStorage({key: this.data.user_location_cache_key}); // 是否获取位置 - if((this.data.params.is_buy || 0) == 1 && this.data.home_buy_extraction_address_position == 1) + if((this.data.params.is_buy || 0) == 1 && this.data.home_extraction_address_position == 1) { tt.navigateTo({ url: '/pages/common/open-setting-location/open-setting-location' @@ -37,7 +37,7 @@ Page({ tt.setNavigationBarTitle({ title: app.data.common_pages_title.extraction_address }); // 是否需要选择地理位置 - if(this.data.home_buy_extraction_address_position == 1) + if(this.data.home_extraction_address_position == 1) { // 首次不请求数据 if(this.data.is_first == 0) diff --git a/sourcecode/weixin/default/pages/extraction-address/extraction-address.js b/sourcecode/weixin/default/pages/extraction-address/extraction-address.js index 8eb72dc40..d2903b4f0 100644 --- a/sourcecode/weixin/default/pages/extraction-address/extraction-address.js +++ b/sourcecode/weixin/default/pages/extraction-address/extraction-address.js @@ -10,13 +10,13 @@ Page({ user_location_cache_key: app.data.cache_userlocation_key, user_location: null, is_first: 1, - home_buy_extraction_address_position: 0, + home_extraction_address_position: 0, }, onLoad(params) { this.setData({ params: params, - home_buy_extraction_address_position: app.get_config('config.home_buy_extraction_address_position', 0), + home_extraction_address_position: app.get_config('config.home_extraction_address_position', 0), }); }, @@ -25,7 +25,7 @@ Page({ wx.removeStorage({key: this.data.user_location_cache_key}); // 是否获取位置 - if((this.data.params.is_buy || 0) == 1 && this.data.home_buy_extraction_address_position == 1) + if((this.data.params.is_buy || 0) == 1 && this.data.home_extraction_address_position == 1) { wx.navigateTo({ url: '/pages/common/open-setting-location/open-setting-location' @@ -37,7 +37,7 @@ Page({ wx.setNavigationBarTitle({ title: app.data.common_pages_title.extraction_address }); // 是否需要选择地理位置 - if(this.data.home_buy_extraction_address_position == 1) + if(this.data.home_extraction_address_position == 1) { // 首次不请求数据 if(this.data.is_first == 0) diff --git a/sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.js b/sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.js index 9d0cbcf4a..5ac6c0e33 100644 --- a/sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.js +++ b/sourcecode/weixin/default/pages/plugins/distribution/extraction-switch/extraction-switch.js @@ -9,13 +9,13 @@ Page({ user_location_cache_key: app.data.cache_userlocation_key, user_location: null, is_first: 1, - home_buy_extraction_address_position: 0, + home_extraction_address_position: 0, }, onLoad(params) { this.setData({ params: params, - home_buy_extraction_address_position: app.get_config('config.home_buy_extraction_address_position', 0), + home_extraction_address_position: app.get_config('config.home_extraction_address_position', 0), }); }, @@ -24,7 +24,7 @@ Page({ wx.removeStorage({key: this.data.user_location_cache_key}); // 是否获取位置 - if(this.data.home_buy_extraction_address_position == 1) + if(this.data.home_extraction_address_position == 1) { wx.navigateTo({ url: '/pages/common/open-setting-location/open-setting-location' @@ -36,7 +36,7 @@ Page({ wx.setNavigationBarTitle({ title: app.data.common_pages_title.extraction_address }); // 是否需要选择地理位置 - if(this.data.home_buy_extraction_address_position == 1) + if(this.data.home_extraction_address_position == 1) { // 首次不请求数据 if(this.data.is_first == 0)