diff --git a/application/admin/view/default/appconfig/alipaymini.html b/application/admin/view/default/appconfig/alipaymini.html new file mode 100644 index 000000000..6b7b2fee7 --- /dev/null +++ b/application/admin/view/default/appconfig/alipaymini.html @@ -0,0 +1,38 @@ +{{include file="public/header" /}} + + +
+
+ + {{include file="appconfig/nav" /}} + + + +
+

PS：如【APP/小程序】中开启（开启在线客服），则以下配置必填 [企业编码] 和 [聊天窗编码]

+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+ +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/admin/view/default/appconfig/app.html b/application/admin/view/default/appconfig/app.html index 7499c2700..9d248e898 100644 --- a/application/admin/view/default/appconfig/app.html +++ b/application/admin/view/default/appconfig/app.html @@ -108,4 +108,4 @@ {{include file="public/footer" /}} - \ No newline at end of file diff --git a/application/admin/view/default/appconfig/nav.html b/application/admin/view/default/appconfig/nav.html index 934e844f6..22f3a823c 100644 --- a/application/admin/view/default/appconfig/nav.html +++ b/application/admin/view/default/appconfig/nav.html @@ -8,4 +8,7 @@
  • 微信小程序
    • +
  • + 支付宝小程序 +
    • \ No newline at end of file diff --git a/application/admin/view/default/appconfig/weixinmini.html b/application/admin/view/default/appconfig/weixinmini.html index f9d25fe32..832c61252 100644 --- a/application/admin/view/default/appconfig/weixinmini.html +++ b/application/admin/view/default/appconfig/weixinmini.html @@ -39,4 +39,4 @@ {{include file="public/footer" /}} - \ No newline at end of file diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php index b82332d2a..abe4ca25d 100755 --- a/application/api/controller/Goods.php +++ b/application/api/controller/Goods.php @@ -138,6 +138,13 @@ class Goods extends Common 'plugins_coupon_data' => $this->PluginsCouponGoods($goods_id), ]; + // 支付宝小程序在线客服 + if(APPLICATION_CLIENT_TYPE == 'alipay') + { + $result['common_app_mini_alipay_tnt_inst_id'] = MyC('common_app_mini_alipay_tnt_inst_id', null, true); + $result['common_app_mini_alipay_scene'] = MyC('common_app_mini_alipay_scene', null, true); + } + // 秒杀 if($result['common_app_is_limitedtimediscount'] == 1) { diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php index 60b3308d8..7c047776c 100755 --- a/application/api/controller/Index.php +++ b/application/api/controller/Index.php @@ -57,10 +57,17 @@ class Index extends Common 'common_app_is_enable_search' => (int) MyC('common_app_is_enable_search', 1), 'common_app_is_enable_answer' => (int) MyC('common_app_is_enable_answer', 1), 'common_app_is_header_nav_fixed' => (int) MyC('common_app_is_header_nav_fixed', 0), - 'common_app_is_online_service' => (int) MyC('common_app_is_online_service', 0), + 'common_app_is_online_service' => (int) MyC('common_app_is_online_service', 0), 'common_app_is_limitedtimediscount' => $common_app_is_limitedtimediscount, ]; + // 支付宝小程序在线客服 + if(APPLICATION_CLIENT_TYPE == 'alipay') + { + $result['common_app_mini_alipay_tnt_inst_id'] = MyC('common_app_mini_alipay_tnt_inst_id', null, true); + $result['common_app_mini_alipay_scene'] = MyC('common_app_mini_alipay_scene', null, true); + } + // 秒杀 if($common_app_is_limitedtimediscount == 1) { diff --git a/application/api/controller/User.php b/application/api/controller/User.php index a97da1865..40e0d8412 100755 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -449,6 +449,13 @@ class User extends Common 'common_app_is_head_vice_nav' => (int) MyC('common_app_is_head_vice_nav', 0), ); + // 支付宝小程序在线客服 + if(APPLICATION_CLIENT_TYPE == 'alipay') + { + $result['common_app_mini_alipay_tnt_inst_id'] = MyC('common_app_mini_alipay_tnt_inst_id', null, true); + $result['common_app_mini_alipay_scene'] = MyC('common_app_mini_alipay_scene', null, true); + } + // 返回数据 return DataReturn('success', 0, $result); } diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 4c983c3ec..da4d7a0a3 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -1193,9 +1193,10 @@ class BuyService { // 订单收货地址 $data = [ - 'order_id' => $order_id, - 'user_id' => $user_id, + 'order_id' => $order_id, + 'user_id' => $user_id, 'address_id' => isset($address['id']) ? intval($address['id']) : 0, + 'alias' => isset($address['alias']) ? $address['alias'] : '', 'name' => isset($address['name']) ? $address['name'] : '', 'tel' => isset($address['tel']) ? $address['tel'] : '', 'province' => isset($address['province']) ? intval($address['province']) : 0, diff --git a/public/appmini/old/alipay/app.acss b/public/appmini/old/alipay/app.acss index 4b730869a..0a8b27546 100644 --- a/public/appmini/old/alipay/app.acss +++ b/public/appmini/old/alipay/app.acss @@ -413,4 +413,11 @@ textarea { .common-quick-nav image { width: 60rpx; height: 60rpx; +} + +/** + * 在线客服 + */ +.common-online-service { + bottom: 35%; } \ No newline at end of file diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js index d0012e09b..c12fbd76e 100644 --- a/public/appmini/old/alipay/app.js +++ b/public/appmini/old/alipay/app.js @@ -67,8 +67,8 @@ App({ // 请求地址 request_url: "{{request_url}}", - // request_url: 'http://tp5-dev.com/', - // request_url: 'http://test.shopxo.net/', + request_url: 'http://tp5-dev.com/', + request_url: 'http://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", @@ -669,4 +669,10 @@ App({ return true; }, + // 获取用户openid + get_user_openid() { + var user = this.get_user_cache_info(); + return (user == false) ? null : user.alipay_openid || null; + }, + }); diff --git a/public/appmini/old/alipay/app.json b/public/appmini/old/alipay/app.json index 5602b18dd..588ad91ec 100644 --- a/public/appmini/old/alipay/app.json +++ b/public/appmini/old/alipay/app.json @@ -27,10 +27,11 @@ "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": { - "defaultTitle": "{{application_title}}", + "defaultTitle": "test", "titleBarColor": "#d2364c" }, "tabBar": { diff --git a/public/appmini/old/alipay/images/goods-detail-video-close.png b/public/appmini/old/alipay/images/goods-detail-video-close.png new file mode 100644 index 000000000..3356ecb57 Binary files /dev/null and b/public/appmini/old/alipay/images/goods-detail-video-close.png differ diff --git a/public/appmini/old/alipay/images/goods-detail-video-play.png b/public/appmini/old/alipay/images/goods-detail-video-play.png new file mode 100644 index 000000000..789c39849 Binary files /dev/null and b/public/appmini/old/alipay/images/goods-detail-video-play.png differ diff --git a/public/appmini/old/alipay/pages/answer-form/answer-form.js b/public/appmini/old/alipay/pages/answer-form/answer-form.js index cde7a2276..dd17acfdf 100755 --- a/public/appmini/old/alipay/pages/answer-form/answer-form.js +++ b/public/appmini/old/alipay/pages/answer-form/answer-form.js @@ -80,7 +80,9 @@ Page({ }, 2000); } else { this.setData({form_submit_loading: false}); - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/alipay/pages/answer-list/answer-list.js b/public/appmini/old/alipay/pages/answer-list/answer-list.js old mode 100755 new mode 100644 index 729c1cd46..da3e4da29 --- a/public/appmini/old/alipay/pages/answer-list/answer-list.js +++ b/public/appmini/old/alipay/pages/answer-list/answer-list.js @@ -76,7 +76,9 @@ Page({ this.setData({ data_list_loding_status: 0 }); - app.showToast(res.data.msg); + if (app.is_login_check(res.data)) { + app.showToast(res.data.msg); + } } }, fail: () => { diff --git a/public/appmini/old/alipay/pages/buy/buy.acss b/public/appmini/old/alipay/pages/buy/buy.acss index cad5bfc2c..dd3ff279d 100644 --- a/public/appmini/old/alipay/pages/buy/buy.acss +++ b/public/appmini/old/alipay/pages/buy/buy.acss @@ -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; +} /** * 商品 diff --git a/public/appmini/old/alipay/pages/buy/buy.axml b/public/appmini/old/alipay/pages/buy/buy.axml index e6a5762d4..5b5b5c561 100644 --- a/public/appmini/old/alipay/pages/buy/buy.axml +++ b/public/appmini/old/alipay/pages/buy/buy.axml @@ -1,126 +1,133 @@ - - - - - - - {{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.title}} + + + {{spec.type}}:{{spec.value}} + + + + + ￥{{item.price}} + + ￥{{item.original_price}} + + x{{item.stock}} + + + + + + + +