floraachy/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2024-11-30 02:49:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

小程序自提地址选择 bug 修

Browse Source
This commit is contained in:
devil 2020-02-21 14:10:16 +08:00
parent 9b7c7e8fd4
commit 698724e1ba
6 changed files with 111 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
application/admin/controller/Site.php
View File

@ -117,6 +117,9 @@ class Site extends Common
*/ */
public function Save() public function Save()
{ {
// 参数
$params = $_POST;
// 导航 // 导航
$nav_type = input('nav_type', 'base'); $nav_type = input('nav_type', 'base');
@ -150,6 +153,25 @@ class Site extends Common
case 'imagesverify' : case 'imagesverify' :
$field_list[] = 'common_images_verify_rules'; $field_list[] = 'common_images_verify_rules';
break; break;
// 站点类型
case 'sitetype' :
// 自提地址处理
if(!empty($params['common_self_extraction_address']))
{
if(!is_array($params['common_self_extraction_address']))
{
$address = json_decode($params['common_self_extraction_address'], true);
} else {
$address = $params['common_self_extraction_address'];
}
foreach($address as $k=>$v)
{
$address[$k]['id'] = $k;
}
$params['common_self_extraction_address'] = json_encode($address, JSON_UNESCAPED_UNICODE);
}
break;
} }
// 开始处理空值 // 开始处理空值
@ -157,15 +179,15 @@ class Site extends Common
{ {
foreach($field_list as $field) foreach($field_list as $field)
{ {
if(!isset($_POST[$field])) if(!isset($params[$field]))
{ {
$_POST[$field] = ''; $params[$field] = '';
} }
} }
} }
// 基础配置 // 基础配置
$ret = ConfigService::ConfigSave($_POST); $ret = ConfigService::ConfigSave($params);
// 清除缓存 // 清除缓存
if($ret['code'] == 0) if($ret['code'] == 0)

10
sourcecode/alipay/pages/buy/buy.js
View File

@ -78,7 +78,7 @@ Page({
{ {
this.setData({ this.setData({
address: cache_address.data, address: cache_address.data,
address_id: cache_address.data.id || 0, address_id: cache_address.id,
}); });
} }
} }
@ -135,7 +135,7 @@ Page({
// 地址 // 地址
this.setData({ this.setData({
address: data.base.address || null, address: data.base.address || null,
address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null, address_id: ((data.base.address || null) != null) ? data.base.address.id : null,
}); });
my.setStorage({ my.setStorage({
key: app.data.cache_buy_user_address_select_key, key: app.data.cache_buy_user_address_select_key,
@ -303,11 +303,14 @@ Page({
// 销售+自提 模式选择事件 // 销售+自提 模式选择事件
buy_header_nav_event(e) { buy_header_nav_event(e) {
var value = e.currentTarget.dataset.value || 0;
if (value != this.data.site_model)
{
// 数据设置 // 数据设置
this.setData({ this.setData({
address: null, address: null,
address_id: null, address_id: null,
site_model: e.currentTarget.dataset.value || 0, site_model: value,
}); });
// 删除地址缓存 // 删除地址缓存
@ -315,5 +318,6 @@ Page({
// 数据初始化 // 数据初始化
this.init(); this.init();
}
}, },
}); });

10
sourcecode/baidu/pages/buy/buy.js
View File

@ -63,7 +63,7 @@ Page({
if ((cache_address || null) != null) { if ((cache_address || null) != null) {
this.setData({ this.setData({
address: cache_address, address: cache_address,
address_id: cache_address.id || null address_id: cache_address.id,
}); });
} }
} }
@ -116,7 +116,7 @@ Page({
// 地址 // 地址
this.setData({ this.setData({
address: data.base.address || null, address: data.base.address || null,
address_id: (data.base.address || null) != null && (data.base.address.id || null) != null ? data.base.address.id : null address_id: ((data.base.address || null) != null) ? data.base.address.id : null
}); });
swan.setStorage({ swan.setStorage({
key: app.data.cache_buy_user_address_select_key, key: app.data.cache_buy_user_address_select_key,
@ -280,11 +280,14 @@ Page({
// 销售+自提 模式选择事件 // 销售+自提 模式选择事件
buy_header_nav_event(e) { buy_header_nav_event(e) {
var value = e.currentTarget.dataset.value || 0;
if (value != this.data.site_model)
{
// 数据设置 // 数据设置
this.setData({ this.setData({
address: null, address: null,
address_id: null, address_id: null,
site_model: e.currentTarget.dataset.value || 0, site_model: value,
}); });
// 删除地址缓存 // 删除地址缓存
@ -292,5 +295,6 @@ Page({
// 数据初始化 // 数据初始化
this.init(); this.init();
}
}, },
}); });

10
sourcecode/qq/pages/buy/buy.js
View File

@ -66,7 +66,7 @@ Page({
{ {
this.setData({ this.setData({
address: cache_address, address: cache_address,
address_id: cache_address.id || null, address_id: cache_address.id,
}); });
} }
} }
@ -122,7 +122,7 @@ Page({
// 地址 // 地址
this.setData({ this.setData({
address: data.base.address || null, address: data.base.address || null,
address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null, address_id: ((data.base.address || null) != null) ? data.base.address.id : null,
}); });
qq.setStorage({ qq.setStorage({
key: app.data.cache_buy_user_address_select_key, key: app.data.cache_buy_user_address_select_key,
@ -289,11 +289,14 @@ Page({
// 销售+自提 模式选择事件 // 销售+自提 模式选择事件
buy_header_nav_event(e) { buy_header_nav_event(e) {
var value = e.currentTarget.dataset.value || 0;
if (value != this.data.site_model)
{
// 数据设置 // 数据设置
this.setData({ this.setData({
address: null, address: null,
address_id: null, address_id: null,
site_model: e.currentTarget.dataset.value || 0, site_model: value,
}); });
// 删除地址缓存 // 删除地址缓存
@ -301,5 +304,6 @@ Page({
// 数据初始化 // 数据初始化
this.init(); this.init();
}
}, },
}); });

10
sourcecode/toutiao/pages/buy/buy.js
View File

@ -66,7 +66,7 @@ Page({
{ {
this.setData({ this.setData({
address: cache_address, address: cache_address,
address_id: cache_address.id || null, address_id: cache_address.id,
}); });
} }
} }
@ -122,7 +122,7 @@ Page({
// 地址 // 地址
this.setData({ this.setData({
address: data.base.address || null, address: data.base.address || null,
address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null, address_id: ((data.base.address || null) != null) ? data.base.address.id : null,
}); });
tt.setStorage({ tt.setStorage({
key: app.data.cache_buy_user_address_select_key, key: app.data.cache_buy_user_address_select_key,
@ -289,11 +289,14 @@ Page({
// 销售+自提 模式选择事件 // 销售+自提 模式选择事件
buy_header_nav_event(e) { buy_header_nav_event(e) {
var value = e.currentTarget.dataset.value || 0;
if (value != this.data.site_model)
{
// 数据设置 // 数据设置
this.setData({ this.setData({
address: null, address: null,
address_id: null, address_id: null,
site_model: e.currentTarget.dataset.value || 0, site_model: value,
}); });
// 删除地址缓存 // 删除地址缓存
@ -301,5 +304,6 @@ Page({
// 数据初始化 // 数据初始化
this.init(); this.init();
}
}, },
}); });

11
sourcecode/weixin/pages/buy/buy.js
View File

@ -66,7 +66,7 @@ Page({
{ {
this.setData({ this.setData({
address: cache_address, address: cache_address,
address_id: cache_address.id || null, address_id: cache_address.id,
}); });
} }
} }
@ -122,7 +122,7 @@ Page({
// 地址 // 地址
this.setData({ this.setData({
address: data.base.address || null, address: data.base.address || null,
address_id: ((data.base.address || null) != null && (data.base.address.id || null) != null) ? data.base.address.id : null, address_id: ((data.base.address || null) != null) ? data.base.address.id : null,
}); });
wx.setStorage({ wx.setStorage({
key: app.data.cache_buy_user_address_select_key, key: app.data.cache_buy_user_address_select_key,
@ -184,6 +184,7 @@ Page({
if (this.data.common_order_is_booking != 1) { if (this.data.common_order_is_booking != 1) {
validation.push({ fields: 'payment_id', msg: '请选择支付方式' }); validation.push({ fields: 'payment_id', msg: '请选择支付方式' });
} }
if (app.fields_check(data, validation)) { if (app.fields_check(data, validation)) {
// 加载loding // 加载loding
wx.showLoading({title: '提交中...'}); wx.showLoading({title: '提交中...'});
@ -289,11 +290,14 @@ Page({
// 销售+自提 模式选择事件 // 销售+自提 模式选择事件
buy_header_nav_event(e) { buy_header_nav_event(e) {
var value = e.currentTarget.dataset.value || 0;
if (value != this.data.site_model)
{
// 数据设置 // 数据设置
this.setData({ this.setData({
address: null, address: null,
address_id: null, address_id: null,
site_model: e.currentTarget.dataset.value || 0, site_model: value,
}); });
// 删除地址缓存 // 删除地址缓存
@ -301,5 +305,6 @@ Page({
// 数据初始化 // 数据初始化
this.init(); this.init();
}
}, },
}); });