diff --git a/public/appmini/old/alipay/pages/buy/buy.acss b/public/appmini/old/alipay/pages/buy/buy.acss index dd3ff279d70c797358d2ff48e3cdbb83ea9130f8..4bb0d5515237f9d1e6b5de00acd6694cfd305d23 100644 --- a/public/appmini/old/alipay/pages/buy/buy.acss +++ b/public/appmini/old/alipay/pages/buy/buy.acss @@ -143,6 +143,17 @@ padding: 8rpx 10rpx; } +/** + * 销售+自提 模式选择 + */ +.buy-header-nav { + background: #e9e9e9; +} +.buy-header-nav .item { + padding: 25rpx 0; + width: 50%; +} + /** * 插件样式区域 */ diff --git a/public/appmini/old/alipay/pages/buy/buy.axml b/public/appmini/old/alipay/pages/buy/buy.axml index 38f690b0c6768c1e759fd205c71606fe6e60594c..229593aad7fec2ab124c1bb07ba271dbdde34949 100644 --- a/public/appmini/old/alipay/pages/buy/buy.axml +++ b/public/appmini/old/alipay/pages/buy/buy.axml @@ -4,8 +4,15 @@ + + + + {{item.name}} + + + - + @@ -19,7 +26,7 @@ - 请选择地址 + {{(common_site_type == 0 || (common_site_type == 4 && site_model == 0)) ? '请选择收货地址' : '请选择取货地址'}} diff --git a/public/appmini/old/alipay/pages/buy/buy.js b/public/appmini/old/alipay/pages/buy/buy.js index df186480002be39632e6ac31a76403273f821042..0efaee462b51d8da954a1d956b1747e1c98ea717 100644 --- a/public/appmini/old/alipay/pages/buy/buy.js +++ b/public/appmini/old/alipay/pages/buy/buy.js @@ -17,6 +17,11 @@ Page({ common_order_is_booking: 0, common_site_type: 0, extraction_address: [], + site_model: 0, + buy_header_nav: [ + { name: "快递邮寄", value: 0 }, + { name: "自提点取货", value: 2 } + ], // 优惠劵 plugins_coupon_data: null, @@ -87,6 +92,7 @@ Page({ data['address_id'] = this.data.address_id; data['payment_id'] = this.data.payment_id; data['coupon_id'] = this.data.plugins_use_coupon_id; + data['site_model'] = this.data.site_model; my.request({ url: app.get_request_url("index", "buy"), method: "POST", @@ -178,10 +184,11 @@ Page({ data['payment_id'] = this.data.payment_id; data['user_note'] = this.data.user_note_value; data['coupon_id'] = this.data.plugins_use_coupon_id; + data['site_model'] = this.data.site_model; // 数据验证 var validation = []; - if (this.data.common_site_type == 0 || this.data.common_site_type == 2) + if (this.data.common_site_type == 0 || this.data.common_site_type == 2 || this.data.common_site_type == 4) { validation.push({ fields: 'address_id', msg: '请选择地址', is_can_zero: 1 }); } @@ -278,12 +285,12 @@ Page({ // 地址选择事件 address_event(e) { - if(this.data.common_site_type == 0) + if (this.data.common_site_type == 0 || (this.data.common_site_type == 4 && this.data.site_model == 0)) { my.navigateTo({ url: '/pages/user-address/user-address?is_back=1' }); - } else if (this.data.common_site_type == 2) + } else if (this.data.common_site_type == 2 || (this.data.common_site_type == 4 && this.data.site_model == 2)) { my.navigateTo({ url: '/pages/extraction-address/extraction-address?is_back=1' @@ -293,4 +300,19 @@ Page({ } }, + // 销售+自提 模式选择事件 + buy_header_nav_event(e) { + // 数据设置 + this.setData({ + address: null, + address_id: null, + site_model: e.currentTarget.dataset.value || 0, + }); + + // 删除地址缓存 + my.removeStorageSync({key: app.data.cache_buy_user_address_select_key}); + + // 数据初始化 + this.init(); + }, }); diff --git a/public/appmini/old/alipay/pages/user-address-save/user-address-save.js b/public/appmini/old/alipay/pages/user-address-save/user-address-save.js index 394d701c5c0755e617f884c06bd29afb53f4921f..f02e294b8c20024489ea58755f51a314601c3699 100644 --- a/public/appmini/old/alipay/pages/user-address-save/user-address-save.js +++ b/public/appmini/old/alipay/pages/user-address-save/user-address-save.js @@ -4,14 +4,19 @@ Page({ data: { data_list_loding_status: 1, data_list_loding_msg: '处理错误', + params: null, + + name : '', + tel : '', + address: '', + is_default: 0, + province_id: null, + city_id: null, + county_id: null, province_list: [], city_list: [], county_list: [], - province_id: null, - city_id: null, - county_id: null, - is_default: 0, default_province: "请选择省", default_city: "请选择市", @@ -20,8 +25,6 @@ Page({ province_value: null, city_value: null, county_value: null, - - params: null, }, onLoad(params) { diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js index 3a70210572f3638b8d7941278707067f3490ebd0..9bbcd807f5cefb487bee5d4fd8cc1760b46b4721 100755 --- a/public/appmini/old/baidu/app.js +++ b/public/appmini/old/baidu/app.js @@ -621,8 +621,12 @@ App({ } }, - // 登录校验 - is_login_check(res) { + /** + * 登录校验 + * object 回调操作对象 + * method 回调操作对象的函数 + */ + is_login_check(res, object, method) { if(res.code == -400) { swan.clearStorage(); diff --git a/public/appmini/old/baidu/pages/buy/buy.css b/public/appmini/old/baidu/pages/buy/buy.css index 77c40a430ec46c10002b863d180408792d7d6c57..937284f4c4991705e572f19fdd476ec75ac4683e 100755 --- a/public/appmini/old/baidu/pages/buy/buy.css +++ b/public/appmini/old/baidu/pages/buy/buy.css @@ -142,6 +142,17 @@ padding: 10rpx; } +/** + * 销售+自提 模式选择 + */ +.buy-header-nav { + background: #e9e9e9; +} +.buy-header-nav .item { + padding: 25rpx 0; + width: 50%; +} + /** * 插件样式区域 */ diff --git a/public/appmini/old/baidu/pages/buy/buy.js b/public/appmini/old/baidu/pages/buy/buy.js index 67eabab230b241e9363ee6e21663f8886879ec6e..d105d69839572811708e1ffa77f8107eed98191a 100755 --- a/public/appmini/old/baidu/pages/buy/buy.js +++ b/public/appmini/old/baidu/pages/buy/buy.js @@ -17,6 +17,11 @@ Page({ common_order_is_booking: 0, common_site_type: 0, extraction_address: [], + site_model: 0, + buy_header_nav: [ + { name: "快递邮寄", value: 0 }, + { name: "自提点取货", value: 2 } + ], // 优惠劵 plugins_coupon_data: null, @@ -72,6 +77,7 @@ Page({ data['address_id'] = this.data.address_id; data['payment_id'] = this.data.payment_id; data['coupon_id'] = this.data.plugins_use_coupon_id; + data['site_model'] = this.data.site_model; swan.request({ url: app.get_request_url("index", "buy"), method: "POST", @@ -160,10 +166,11 @@ Page({ data['payment_id'] = this.data.payment_id; data['user_note'] = this.data.user_note_value; data['coupon_id'] = this.data.plugins_use_coupon_id; + data['site_model'] = this.data.site_model; // 数据验证 var validation = []; - if (this.data.common_site_type == 0 || this.data.common_site_type == 2) { + if (this.data.common_site_type == 0 || this.data.common_site_type == 2 || this.data.common_site_type == 4) { validation.push({ fields: 'address_id', msg: '请选择地址', is_can_zero: 1 }); } if (this.data.common_order_is_booking != 1) { @@ -257,17 +264,32 @@ Page({ // 地址选择事件 address_event(e) { - if (this.data.common_site_type == 0) { + if (this.data.common_site_type == 0 || (this.data.common_site_type == 4 && this.data.site_model == 0)) { swan.navigateTo({ url: '/pages/user-address/user-address?is_back=1' }); - } else if (this.data.common_site_type == 2) { + } else if (this.data.common_site_type == 2 || (this.data.common_site_type == 4 && this.data.site_model == 2)) { swan.navigateTo({ url: '/pages/extraction-address/extraction-address?is_back=1' }); } else { app.showToast('当前模式不允许使用地址'); } - } + }, + + // 销售+自提 模式选择事件 + buy_header_nav_event(e) { + // 数据设置 + this.setData({ + address: null, + address_id: null, + site_model: e.currentTarget.dataset.value || 0, + }); + + // 删除地址缓存 + swan.removeStorageSync(app.data.cache_buy_user_address_select_key); + // 数据初始化 + this.init(); + }, }); \ No newline at end of file diff --git a/public/appmini/old/baidu/pages/buy/buy.swan b/public/appmini/old/baidu/pages/buy/buy.swan index ab2f28717cca14da7f80c1e769bdad18bcd8841d..3002a8e5170e3ea4cfab40d1dcb4cdb99c7a0e30 100755 --- a/public/appmini/old/baidu/pages/buy/buy.swan +++ b/public/appmini/old/baidu/pages/buy/buy.swan @@ -4,8 +4,15 @@ + + + + {{item.name}} + + + - + @@ -19,7 +26,7 @@ - 请选择地址 + {{(common_site_type == 0 || (common_site_type == 4 && site_model == 0)) ? '请选择收货地址' : '请选择取货地址'}} diff --git a/public/appmini/old/baidu/pages/user-address-save/user-address-save.js b/public/appmini/old/baidu/pages/user-address-save/user-address-save.js index 4119fee9470e4026fd0913855bc0ac5e524d7cff..895880e9f0c3c74ae6d073a9c5a32af4537bf4ef 100755 --- a/public/appmini/old/baidu/pages/user-address-save/user-address-save.js +++ b/public/appmini/old/baidu/pages/user-address-save/user-address-save.js @@ -2,13 +2,21 @@ const app = getApp(); Page({ data: { - province_list: [], - city_list: [], - county_list: [], + data_list_loding_status: 1, + data_list_loding_msg: '处理错误', + params: null, + + name : '', + tel : '', + address: '', + is_default: 0, province_id: null, city_id: null, county_id: null, - is_default: 0, + + province_list: [], + city_list: [], + county_list: [], default_province: "请选择省", default_city: "请选择市", @@ -16,9 +24,7 @@ Page({ province_value: null, city_value: null, - county_value: null, - - params: null + county_value: null }, onLoad(params) { diff --git a/public/appmini/old/qq/pages/buy/buy.js b/public/appmini/old/qq/pages/buy/buy.js index 49061445316d5ec329e36133945e405ee85d730f..7516917894da9467c33d3f12bc916a4ce80631dd 100755 --- a/public/appmini/old/qq/pages/buy/buy.js +++ b/public/appmini/old/qq/pages/buy/buy.js @@ -17,6 +17,11 @@ Page({ common_order_is_booking: 0, common_site_type: 0, extraction_address: [], + site_model: 0, + buy_header_nav: [ + { name: "快递邮寄", value: 0 }, + { name: "自提点取货", value: 2 } + ], // 优惠劵 plugins_coupon_data: null, @@ -75,6 +80,7 @@ Page({ data['address_id'] = this.data.address_id; data['payment_id'] = this.data.payment_id; data['coupon_id'] = this.data.plugins_use_coupon_id; + data['site_model'] = this.data.site_model; qq.request({ url: app.get_request_url("index", "buy"), method: "POST", @@ -166,10 +172,11 @@ Page({ data['payment_id'] = this.data.payment_id; data['user_note'] = this.data.user_note_value; data['coupon_id'] = this.data.plugins_use_coupon_id; + data['site_model'] = this.data.site_model; // 数据验证 var validation = []; - if (this.data.common_site_type == 0 || this.data.common_site_type == 2) + if (this.data.common_site_type == 0 || this.data.common_site_type == 2 || this.data.common_site_type == 4) { validation.push({ fields: 'address_id', msg: '请选择地址', is_can_zero: 1 }); } @@ -264,12 +271,12 @@ Page({ // 地址选择事件 address_event(e) { - if(this.data.common_site_type == 0) + if (this.data.common_site_type == 0 || (this.data.common_site_type == 4 && this.data.site_model == 0)) { qq.navigateTo({ url: '/pages/user-address/user-address?is_back=1' }); - } else if (this.data.common_site_type == 2) + } else if (this.data.common_site_type == 2 || (this.data.common_site_type == 4 && this.data.site_model == 2)) { qq.navigateTo({ url: '/pages/extraction-address/extraction-address?is_back=1' @@ -279,4 +286,19 @@ Page({ } }, + // 销售+自提 模式选择事件 + buy_header_nav_event(e) { + // 数据设置 + this.setData({ + address: null, + address_id: null, + site_model: e.currentTarget.dataset.value || 0, + }); + + // 删除地址缓存 + qq.removeStorageSync(app.data.cache_buy_user_address_select_key); + + // 数据初始化 + this.init(); + }, }); diff --git a/public/appmini/old/qq/pages/buy/buy.qml b/public/appmini/old/qq/pages/buy/buy.qml index 8e623eaa5c5e4786ea7896d9d29152d54900cd92..42124d2633dce429ae6cdf89c43337b07785a313 100755 --- a/public/appmini/old/qq/pages/buy/buy.qml +++ b/public/appmini/old/qq/pages/buy/buy.qml @@ -4,8 +4,15 @@ + + + + {{item.name}} + + + - + @@ -19,7 +26,7 @@ - 请选择地址 + {{(common_site_type == 0 || (common_site_type == 4 && site_model == 0)) ? '请选择收货地址' : '请选择取货地址'}} diff --git a/public/appmini/old/qq/pages/buy/buy.qss b/public/appmini/old/qq/pages/buy/buy.qss index c3283e906982f64dcc48368ef7ffabdfd2dd08b2..76e55ea298bd99cd4db76f4e2768b21d38743424 100755 --- a/public/appmini/old/qq/pages/buy/buy.qss +++ b/public/appmini/old/qq/pages/buy/buy.qss @@ -141,6 +141,17 @@ padding: 12rpx; } +/** + * 销售+自提 模式选择 + */ +.buy-header-nav { + background: #e9e9e9; +} +.buy-header-nav .item { + padding: 25rpx 0; + width: 50%; +} + /** * 插件样式区域 */ diff --git a/public/appmini/old/qq/pages/user-address-save/user-address-save.js b/public/appmini/old/qq/pages/user-address-save/user-address-save.js index d4095e3fb2f63634c95b8e3bc2e9d5cc099a98e5..837906529708d7025129bd43dfff0d1b224382e3 100755 --- a/public/appmini/old/qq/pages/user-address-save/user-address-save.js +++ b/public/appmini/old/qq/pages/user-address-save/user-address-save.js @@ -2,13 +2,21 @@ const app = getApp(); Page({ data: { - province_list: [], - city_list: [], - county_list: [], + data_list_loding_status: 1, + data_list_loding_msg: '处理错误', + params: null, + + name : '', + tel : '', + address: '', + is_default: 0, province_id: null, city_id: null, county_id: null, - is_default: 0, + + province_list: [], + city_list: [], + county_list: [], default_province: "请选择省", default_city: "请选择市", @@ -17,8 +25,6 @@ Page({ province_value: null, city_value: null, county_value: null, - - params: null, }, onLoad(params) { diff --git a/public/appmini/old/toutiao/pages/buy/buy.js b/public/appmini/old/toutiao/pages/buy/buy.js index 8b989b00dc70f3949b436fffaa35d497c36dbfd7..a39b380aa16b9afe162b941b5c58fbe977c68dee 100755 --- a/public/appmini/old/toutiao/pages/buy/buy.js +++ b/public/appmini/old/toutiao/pages/buy/buy.js @@ -17,6 +17,11 @@ Page({ common_order_is_booking: 0, common_site_type: 0, extraction_address: [], + site_model: 0, + buy_header_nav: [ + { name: "快递邮寄", value: 0 }, + { name: "自提点取货", value: 2 } + ], // 优惠劵 plugins_coupon_data: null, @@ -75,6 +80,7 @@ Page({ data['address_id'] = this.data.address_id; data['payment_id'] = this.data.payment_id; data['coupon_id'] = this.data.plugins_use_coupon_id; + data['site_model'] = this.data.site_model; tt.request({ url: app.get_request_url("index", "buy"), method: "POST", @@ -166,10 +172,11 @@ Page({ data['payment_id'] = this.data.payment_id; data['user_note'] = this.data.user_note_value; data['coupon_id'] = this.data.plugins_use_coupon_id; + data['site_model'] = this.data.site_model; // 数据验证 var validation = []; - if (this.data.common_site_type == 0 || this.data.common_site_type == 2) + if (this.data.common_site_type == 0 || this.data.common_site_type == 2 || this.data.common_site_type == 4) { validation.push({ fields: 'address_id', msg: '请选择地址', is_can_zero: 1 }); } @@ -264,12 +271,12 @@ Page({ // 地址选择事件 address_event(e) { - if(this.data.common_site_type == 0) + if (this.data.common_site_type == 0 || (this.data.common_site_type == 4 && this.data.site_model == 0)) { tt.navigateTo({ url: '/pages/user-address/user-address?is_back=1' }); - } else if (this.data.common_site_type == 2) + } else if (this.data.common_site_type == 2 || (this.data.common_site_type == 4 && this.data.site_model == 2)) { tt.navigateTo({ url: '/pages/extraction-address/extraction-address?is_back=1' @@ -279,4 +286,19 @@ Page({ } }, + // 销售+自提 模式选择事件 + buy_header_nav_event(e) { + // 数据设置 + this.setData({ + address: null, + address_id: null, + site_model: e.currentTarget.dataset.value || 0, + }); + + // 删除地址缓存 + tt.removeStorageSync(app.data.cache_buy_user_address_select_key); + + // 数据初始化 + this.init(); + }, }); diff --git a/public/appmini/old/toutiao/pages/buy/buy.ttml b/public/appmini/old/toutiao/pages/buy/buy.ttml index 556422d45bd4c0c748c2d529651178f5bd5c6c91..4e8e8f1ac69aee8b4d23b698f197d272d42eabd6 100755 --- a/public/appmini/old/toutiao/pages/buy/buy.ttml +++ b/public/appmini/old/toutiao/pages/buy/buy.ttml @@ -4,8 +4,15 @@ + + + + {{item.name}} + + + - + @@ -19,7 +26,7 @@ - 请选择地址 + {{(common_site_type == 0 || (common_site_type == 4 && site_model == 0)) ? '请选择收货地址' : '请选择取货地址'}} diff --git a/public/appmini/old/toutiao/pages/buy/buy.ttss b/public/appmini/old/toutiao/pages/buy/buy.ttss index c3283e906982f64dcc48368ef7ffabdfd2dd08b2..76e55ea298bd99cd4db76f4e2768b21d38743424 100755 --- a/public/appmini/old/toutiao/pages/buy/buy.ttss +++ b/public/appmini/old/toutiao/pages/buy/buy.ttss @@ -141,6 +141,17 @@ padding: 12rpx; } +/** + * 销售+自提 模式选择 + */ +.buy-header-nav { + background: #e9e9e9; +} +.buy-header-nav .item { + padding: 25rpx 0; + width: 50%; +} + /** * 插件样式区域 */ diff --git a/public/appmini/old/toutiao/pages/user-address-save/user-address-save.js b/public/appmini/old/toutiao/pages/user-address-save/user-address-save.js index 50d754480eda93673d19999d2ae90237a5c99048..4c3f8f998b7b7fe45b72429b9d0db881c1a1f64b 100755 --- a/public/appmini/old/toutiao/pages/user-address-save/user-address-save.js +++ b/public/appmini/old/toutiao/pages/user-address-save/user-address-save.js @@ -2,13 +2,21 @@ const app = getApp(); Page({ data: { - province_list: [], - city_list: [], - county_list: [], + data_list_loding_status: 1, + data_list_loding_msg: '处理错误', + params: null, + + name : '', + tel : '', + address: '', + is_default: 0, province_id: null, city_id: null, county_id: null, - is_default: 0, + + province_list: [], + city_list: [], + county_list: [], default_province: "请选择省", default_city: "请选择市", @@ -17,8 +25,6 @@ Page({ province_value: null, city_value: null, county_value: null, - - params: null, }, onLoad(params) { diff --git a/public/appmini/old/weixin/pages/buy/buy.js b/public/appmini/old/weixin/pages/buy/buy.js index df28ab77e8a0aa11866bd7bcc45664cc5534fd0f..f8da5c23cbf5f96d88822f3d9a3e2308032ef99f 100755 --- a/public/appmini/old/weixin/pages/buy/buy.js +++ b/public/appmini/old/weixin/pages/buy/buy.js @@ -176,7 +176,7 @@ Page({ // 数据验证 var validation = []; - if (this.data.common_site_type == 0 || this.data.common_site_type == 2) + if (this.data.common_site_type == 0 || this.data.common_site_type == 2 || this.data.common_site_type == 4) { validation.push({ fields: 'address_id', msg: '请选择地址', is_can_zero: 1 }); } diff --git a/public/appmini/old/weixin/pages/user-address-save/user-address-save.js b/public/appmini/old/weixin/pages/user-address-save/user-address-save.js index b20f0c6016b7b863db6487158d7846071fd9f5f6..f9d04b2c4be798da5852dad4908f2c7faba429fe 100755 --- a/public/appmini/old/weixin/pages/user-address-save/user-address-save.js +++ b/public/appmini/old/weixin/pages/user-address-save/user-address-save.js @@ -2,13 +2,21 @@ const app = getApp(); Page({ data: { - province_list: [], - city_list: [], - county_list: [], + data_list_loding_status: 1, + data_list_loding_msg: '处理错误', + params: null, + + name : '', + tel : '', + address: '', + is_default: 0, province_id: null, city_id: null, county_id: null, - is_default: 0, + + province_list: [], + city_list: [], + county_list: [], default_province: "请选择省", default_city: "请选择市", @@ -17,8 +25,6 @@ Page({ province_value: null, city_value: null, county_value: null, - - params: null, }, onLoad(params) {