自提地址切换优化

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),

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)

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)

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)

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)

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)

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)