diff --git a/application/service/ConfigService.php b/application/service/ConfigService.php index 01cfa5a9807f98fd51748d81ac32db568a98de0c..db3c6e680c8753dcaaf373a71a19088881250610 100755 --- a/application/service/ConfigService.php +++ b/application/service/ConfigService.php @@ -316,8 +316,8 @@ class ConfigService $map = \base\GeoTransUtil::BdToGcj($v['lng'], $v['lat']); if(isset($map['lng']) && isset($map['lat'])) { - $v['lng_gcj'] = $map['lng']; - $v['lat_gcj'] = $map['lat']; + $v['lng'] = $map['lng']; + $v['lat'] = $map['lat']; } } } diff --git a/application/service/OrderService.php b/application/service/OrderService.php index 42e9b37d03f6fa074282e90cf636787566adce60..a9b5cfd5d78dd6fcf18b1e58e2e4cb4696bf0051 100755 --- a/application/service/OrderService.php +++ b/application/service/OrderService.php @@ -892,8 +892,8 @@ class OrderService $map = \base\GeoTransUtil::BdToGcj($data['lng'], $data['lat']); if(isset($map['lng']) && isset($map['lat'])) { - $data['lng_gcj'] = $map['lng']; - $data['lat_gcj'] = $map['lat']; + $data['lng'] = $map['lng']; + $data['lat'] = $map['lat']; } } } diff --git a/public/appmini/old/alipay/pages/extraction-address/extraction-address.js b/public/appmini/old/alipay/pages/extraction-address/extraction-address.js index cdb4b134507af1b41924b1d78d813db8a845a5fd..9e7a8f9ce10c67ce91dbecde4234e38647a59391 100644 --- a/public/appmini/old/alipay/pages/extraction-address/extraction-address.js +++ b/public/appmini/old/alipay/pages/extraction-address/extraction-address.js @@ -107,8 +107,8 @@ Page({ return false; } - var lng = parseFloat(ads.lng_gcj || 0); - var lat = parseFloat(ads.lat_gcj || 0); + var lng = parseFloat(ads.lng || 0); + var lat = parseFloat(ads.lat || 0); if (lng <= 0 || lat <= 0) { app.showToast("坐标有误"); return false; diff --git a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss index 176f325a21fef7958b0d9e649770a89c6a574a19..20af770b33ca89b62942a7aec1dc18032c3ae018 100644 --- a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss +++ b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss @@ -26,6 +26,13 @@ height: 85rpx; line-height: 85rpx; } +.address-alias { + border: 1px solid #d2364c; + color: #d2364c; + padding: 2rpx 10rpx; + border-radius: 6rpx; + margin-right: 10rpx; +} /* * 商品信息 diff --git a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml index 5c53b002d6dd6685bfef6f3aefa222f21dbcb70b..d9d9c5270eaa96ec8ef5ef6c8f2f760c4510de09 100644 --- a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml +++ b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml @@ -2,6 +2,7 @@ + {{detail.address_data.alias}} {{detail.address_data.name}} {{detail.address_data.tel}} @@ -9,7 +10,7 @@ {{detail.address_data.province_name}}{{detail.address_data.city_name}}{{detail.address_data.county_name}}{{detail.address_data.address}} - 查看位置 + 查看位置 @@ -46,7 +47,7 @@ - + diff --git a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js index 2adfa54dfb64be7a7d5139c7d05cdb5412eacd65..41720dc8dbe0f6ce99846bed99753fedf2e32abc 100644 --- a/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js @@ -140,8 +140,8 @@ Page({ } var ads = this.data.detail.address_data; - var lng = parseFloat(ads.lng_gcj || 0); - var lat = parseFloat(ads.lat_gcj || 0); + var lng = parseFloat(ads.lng || 0); + var lat = parseFloat(ads.lat || 0); if (lng <= 0 || lat <= 0) { app.showToast("坐标有误"); return false; diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js index 882cb74fde825c95a69dbf59bc37d417edae481c..18906b6d4fdfdc097f13306874c6efd8369ed6c5 100755 --- a/public/appmini/old/baidu/app.js +++ b/public/appmini/old/baidu/app.js @@ -62,7 +62,7 @@ App({ // 请求地址 request_url: "{{request_url}}", - // request_url: 'http://tp5-dev.com/', + request_url: 'http://tp5-dev.com/', // request_url: 'https://test.shopxo.net/', // 基础信息 diff --git a/public/appmini/old/baidu/app.json b/public/appmini/old/baidu/app.json index 5caf4d933017de0ff1f6c55c6cab57b281246768..27be7a63bb428d4c7704547f010bf410f6a59673 100755 --- a/public/appmini/old/baidu/app.json +++ b/public/appmini/old/baidu/app.json @@ -27,7 +27,8 @@ "pages/user-orderaftersale/user-orderaftersale", "pages/user-orderaftersale-detail/user-orderaftersale-detail", "pages/coupon/coupon", - "pages/user-coupon/user-coupon" + "pages/user-coupon/user-coupon", + "pages/extraction-address/extraction-address" ], "window": { "navigationBarTitleText": "{{application_title}}", diff --git a/public/appmini/old/baidu/pages/buy/buy.css b/public/appmini/old/baidu/pages/buy/buy.css index 5610fdb6759722f55fd22c8c0ed41ecaeccf8412..c3283e906982f64dcc48368ef7ffabdfd2dd08b2 100755 --- a/public/appmini/old/baidu/pages/buy/buy.css +++ b/public/appmini/old/baidu/pages/buy/buy.css @@ -12,7 +12,7 @@ padding: 10rpx 35rpx 10rpx 10rpx; } .address-detail .icon { - width: 35rpx; + width: 30rpx; height: 35rpx !important; } .address-detail .text { @@ -30,6 +30,13 @@ height: 85rpx; line-height: 85rpx; } +.address-alias { + border: 1px solid #d2364c; + color: #d2364c; + padding: 2rpx 10rpx; + border-radius: 6rpx; + margin-right: 10rpx; +} /** * 商品 @@ -130,9 +137,8 @@ .content-textarea-view textarea { height: 180rpx; } -.content-textarea-view textarea, .content-textarea-view view { - padding: 10rpx; + padding: 12rpx; } /** diff --git a/public/appmini/old/baidu/pages/buy/buy.js b/public/appmini/old/baidu/pages/buy/buy.js index a111b397e20a4391029fd0fe3b238cc1cb4aac68..c2ee221c420d73a666814373ff31c75600a58eef 100755 --- a/public/appmini/old/baidu/pages/buy/buy.js +++ b/public/appmini/old/baidu/pages/buy/buy.js @@ -8,31 +8,25 @@ Page({ payment_list: [], goods_list: [], address: null, - address_id: 0, + address_id: null, total_price: 0, user_note_value: '', is_first: 1, extension_data: [], payment_id: 0, common_order_is_booking: 0, + common_site_type: 0, + extraction_address: [], // 优惠劵 plugins_coupon_data: null, plugins_use_coupon_id: 0, plugins_choice_coupon_value: '选择优惠劵', - popup_plugins_coupon_status: false, + popup_plugins_coupon_status: false }, onLoad(params) { - if ((params.data || null) == null || app.get_length(JSON.parse(params.data)) == 0) { - swan.alert({ - title: '温馨提示', - content: '订单信息有误', - buttonText: '确认', - success: () => { - swan.navigateBack(); - } - }); - } else { + //params['data'] = '{"buy_type":"goods","goods_id":"1","stock":"1","spec":"[]"}'; + if ((params.data || null) != null && app.get_length(JSON.parse(params.data)) > 0) { this.setData({ params: JSON.parse(params.data) }); // 删除地址缓存 @@ -41,25 +35,29 @@ Page({ }, onShow() { - swan.setNavigationBarTitle({ title: app.data.common_pages_title.buy }); this.init(); this.setData({ is_first: 0 }); }, // 获取数据列表 init() { + // 订单参数信息是否正确 + if (this.data.params == null) { + this.setData({ + data_list_loding_status: 2, + data_list_loding_msg: '订单信息有误' + }); + swan.stopPullDownRefresh(); + return false; + } + // 本地缓存地址 if (this.data.is_first == 0) { var cache_address = swan.getStorageSync(app.data.cache_buy_user_address_select_key); if ((cache_address || null) != null) { this.setData({ address: cache_address, - address_id: cache_address.id - }); - } else { - this.setData({ - address: null, - address_id: 0 + address_id: cache_address.id || null }); } } @@ -93,35 +91,30 @@ Page({ extension_data: data.extension_data || [], data_list_loding_status: 3, common_order_is_booking: data.common_order_is_booking || 0, - plugins_coupon_data: data.plugins_coupon_data || null, + common_site_type: data.common_site_type || 0, + extraction_address: data.base.extraction_address || [], + plugins_coupon_data: data.plugins_coupon_data || null }); // 优惠劵选择处理 - if ((data.plugins_coupon_data || null) != null) - { - if ((data.plugins_coupon_data.coupon_choice || null) != null) - { + if ((data.plugins_coupon_data || null) != null) { + if ((data.plugins_coupon_data.coupon_choice || null) != null) { this.setData({ plugins_choice_coupon_value: data.plugins_coupon_data.coupon_choice.coupon.desc }); } else { - var coupon_count = ((data.plugins_coupon_data.coupon_list || null) != null) ? data.plugins_coupon_data.coupon_list.length : 0; - this.setData({ plugins_choice_coupon_value: (coupon_count > 0) ? '可选优惠劵' + coupon_count + '张' : '暂无可用优惠劵' }); + var coupon_count = (data.plugins_coupon_data.coupon_list || null) != null ? data.plugins_coupon_data.coupon_list.length : 0; + this.setData({ plugins_choice_coupon_value: coupon_count > 0 ? '可选优惠劵' + coupon_count + '张' : '暂无可用优惠劵' }); } } // 地址 - if (this.data.address == null || this.data.address_id == 0) { - if ((data.base.address || null) != null) { - this.setData({ - address: data.base.address, - address_id: data.base.address.id - }); - - swan.setStorage({ - key: app.data.cache_buy_user_address_select_key, - data: data.base.address - }); - } - } + this.setData({ + address: data.base.address || null, + address_id: (data.base.address || null) != null && (data.base.address.id || null) != null ? data.base.address.id : null + }); + swan.setStorage({ + key: app.data.cache_buy_user_address_select_key, + data: data.base.address || null + }); // 支付方式 this.payment_list_data(data.payment_list); @@ -131,7 +124,9 @@ Page({ data_list_loding_status: 2, data_list_loding_msg: res.data.msg }); - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { @@ -167,7 +162,10 @@ Page({ data['coupon_id'] = this.data.plugins_use_coupon_id; // 数据验证 - var validation = [{ fields: 'address_id', msg: '请选择地址' }]; + var validation = []; + if (this.data.common_site_type == 0 || this.data.common_site_type == 2) { + validation.push({ fields: 'address_id', msg: '请选择地址', is_can_zero: 1 }); + } if (this.data.common_order_is_booking != 1) { validation.push({ fields: 'payment_id', msg: '请选择支付方式' }); } @@ -229,7 +227,7 @@ Page({ // 优惠劵弹层开启 plugins_coupon_open_event(e) { - this.setData({ popup_plugins_coupon_status: true}); + this.setData({ popup_plugins_coupon_status: true }); }, // 优惠劵弹层关闭 @@ -243,7 +241,7 @@ Page({ var value = e.currentTarget.dataset.value; this.setData({ plugins_use_coupon_id: value, - popup_plugins_coupon_status: false, + popup_plugins_coupon_status: false }); this.init(); }, @@ -252,9 +250,24 @@ Page({ plugins_coupon_not_use_event(e) { this.setData({ plugins_use_coupon_id: 0, - popup_plugins_coupon_status: false, + popup_plugins_coupon_status: false }); this.init(); }, + // 地址选择事件 + address_event(e) { + if (this.data.common_site_type == 0) { + swan.navigateTo({ + url: '/pages/user-address/user-address?is_back=1' + }); + } else if (this.data.common_site_type == 2) { + swan.navigateTo({ + url: '/pages/extraction-address/extraction-address?is_back=1' + }); + } else { + app.showToast('当前模式不允许使用地址'); + } + } + }); \ 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 6bd6b59a3b5ce520f17042eb710ed8ce6e2d8e13..de0d7bdeba65c5df1be466c946735e9aaee4ae1c 100755 --- a/public/appmini/old/baidu/pages/buy/buy.swan +++ b/public/appmini/old/baidu/pages/buy/buy.swan @@ -1,125 +1,132 @@ - - - - - - - {{address.name}} - {{address.tel}} + + + + + + + + + + + + {{address.alias}} + {{address.name}} + {{address.tel}} + + + + {{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}} + - - - {{address.province_name}}{{address.city_name}}{{address.county_name}}{{address.address}} + + 请选择地址 - - 请选择地址 - - - - + + - - - - - - {{item.title}} - - {{spec.type}}:{{spec.value}} - - - - - ￥{{item.price}} - - ￥{{item.original_price}} - - x{{item.stock}} - + + + + + + {{item.title}} + + {{spec.type}}:{{spec.value}} + + + + + ￥{{item.price}} + + ￥{{item.original_price}} + + x{{item.stock}} + + - - - -