diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php index 817d1d1be6b92af13be138eec4b9b31c72a8f0fb..d360aa113cf04053c371928782dadfd20eb0b89e 100755 --- a/application/api/controller/Goods.php +++ b/application/api/controller/Goods.php @@ -11,6 +11,7 @@ namespace app\api\controller; use app\service\GoodsService; +use app\service\BuyService; use app\service\GoodsCommentsService; /** @@ -126,6 +127,7 @@ class Goods extends Common 'common_app_is_limitedtimediscount' => (int) MyC('common_app_is_limitedtimediscount'), 'common_app_is_good_thing' => (int) MyC('common_app_is_good_thing'), 'common_app_is_poster_share' => (int) MyC('common_app_is_poster_share'), + 'common_cart_total' => BuyService::UserCartTotal(['user'=>$this->user]), // 优惠劵 'plugins_coupon_data' => $this->PluginsCouponGoods($goods_id), diff --git a/public/appmini/old/alipay/app.acss b/public/appmini/old/alipay/app.acss index 7fa3fe4f5024e54179d93f2a4fd764bf0d799b3e..9efb9e910fea8091e6a0a3bd8614c058f0e55518 100644 --- a/public/appmini/old/alipay/app.acss +++ b/public/appmini/old/alipay/app.acss @@ -55,21 +55,7 @@ textarea { .spacing-mb { margin-bottom: 20rpx; } .spacing-mt { margin-top: 20rpx; } -/* 在线客服 */ -.customer-service { - position: fixed; - bottom: 100rpx; - right: 0; -} -.customer-service image { - width: 80rpx; - height: 80rpx; - margin-right: 20rpx; -} - - .drift { position: fixed; left: -1000px; } - .nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; } .tips { background: #ffffeb url('/images/tips.png') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 10rpx 10rpx 10rpx 45rpx; font-size: 26rpx; border-radius: 2px; display: block; } @@ -407,4 +393,22 @@ textarea { } .coupon-container .item-disabled { border: 1px solid #dfdfdf !important; +} + +/** + * 快捷导航 + */ +.common-quick-nav { + border: 0; + padding: 15rpx; + background: rgba(0, 0, 0, 0.6); + position: fixed; + right: 10rpx; + border-radius: 50%; + width: 90rpx; + height: 90rpx; +} +.common-quick-nav image { + width: 60rpx; + height: 60rpx; } \ No newline at end of file diff --git a/public/appmini/old/alipay/images/default-cart-icon.png b/public/appmini/old/alipay/images/default-cart-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..260fe785d1d6b771d7b12fc8a592d333fc9282f5 Binary files /dev/null and b/public/appmini/old/alipay/images/default-cart-icon.png differ diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss index 318d88496d71e867b85ae8389de22ae6fc8a4498..3ecb11ed0898ba4ed71209d498c6e11c973f0947 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss @@ -299,4 +299,18 @@ } .coupon-container .v-left .desc { margin-top: 5rpx; +} + +/* + * 购物车入口 + */ +.quick-nav-cart { + bottom: calc(35% + 110rpx); + width: 60rpx; + height: 60rpx; +} +.quick-nav-cart .badge-icon { + position: absolute; + top: -5px; + left: calc(50% + 23rpx); } \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml index e470bf9119d6c3bc5624948a2edd2af96c7af8a9..366723650f1d667ce027134a6d816ccfc1952ea3 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml @@ -184,4 +184,14 @@ - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js index a8c7f3feebb7d7db69bd6be0aadeb9d7408d89f4..65230d4ee74a8623a5122fc37d8d8c328eaa60a3 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js @@ -43,6 +43,9 @@ Page({ // 优惠劵 plugins_coupon_data: null, + + // 购物车快捷导航 + quick_nav_cart_count: 0, }, onLoad(params) { @@ -117,6 +120,7 @@ Page({ common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0, plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null, plugins_coupon_data: data.plugins_coupon_data || null, + quick_nav_cart_count: data.common_cart_total || 0, }); // 限时秒杀倒计时 @@ -308,6 +312,7 @@ Page({ success: (res) => { my.hideLoading(); if (res.data.code == 0) { + this.setData({ quick_nav_cart_count: this.data.quick_nav_cart_count + this.data.temp_buy_number}); this.popup_close_event(); app.showToast(res.data.msg, 'success'); } else { diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.json b/public/appmini/old/alipay/pages/goods-detail/goods-detail.json index 55e2d05affa6488b5d2b4ef24f1d955cb4fcef8c..7835ba959e4458c76c6d20a70a4650a9efa83ca2 100755 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.json +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.json @@ -1,6 +1,7 @@ { "pullRefresh": true, "usingComponents": { - "popup": "mini-antui/es/popup/index" + "popup": "mini-antui/es/popup/index", + "badge": "mini-antui/es/badge/index" } } \ No newline at end of file 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 3e79440713ab1616097bee43df5d439c1ee5588a..6b8ded7a8a64ac6c4396e90f79b353b98111c6f6 100755 --- 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 @@ -71,4 +71,17 @@ } .detail-list .item view { line-height: 46rpx; +} + +/* + * 扩展数据 + */ +.extension-list .item { + padding: 20rpx 30rpx; +} +.extension-list .item .title { + padding-right: 20rpx; +} +.extension-list .item .content { + padding-left: 20rpx; } \ No newline at end of file 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 e57aa515ca78b85fab5dcf77dcdd028cb5723416..9b6004c96295114a7eb196c3ae7d0e25d83af761 100755 --- 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 @@ -31,6 +31,7 @@ + {{item.name}} @@ -38,6 +39,14 @@ + + + + {{item.name}} + {{item.tips}} + + + 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 ae89b389a4aa024e6456ee03955d15894e041836..a51d8198632c729a4dab18ac3b68bb5761718d5a 100755 --- 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 @@ -1,12 +1,14 @@ const app = getApp(); Page({ data: { - detail: null, - detail_list: [], + params: null, data_list_loding_status: 1, data_list_loding_msg: '', data_bottom_line_status: false, - params: null, + + detail: null, + detail_list: [], + extension_data: [], }, onLoad(params) { @@ -41,25 +43,27 @@ Page({ self.setData({ detail: data, detail_list:[ - {name: "订单号", value: data.order_no}, - {name: "状态", value: data.status_name}, - {name: "支付状态", value: data.pay_status_name}, - {name: "单价", value: data.price}, - {name: "总价", value: data.total_price}, - {name: "优惠", value: data.preferential_price}, - {name: "支付金额", value: data.pay_price}, - {name: "支付方式", value: data.payment_name}, - {name: "快递公司", value: data.express_name}, - {name: "快递单号", value: data.express_number}, - {name: "用户留言", value: data.user_note}, - {name: "创建时间", value: data.add_time}, - {name: "确认时间", value: data.confirm_time}, - {name: "支付时间", value: data.pay_time}, - {name: "发货时间", value: data.delivery_time}, - {name: "收货时间", value: data.collect_time}, - {name: "取消时间", value: data.close_time}, - {name: "关闭时间", value: data.close_time}, + {name: "订单号", value: data.order_no || ''}, + {name: "状态", value: data.status_name || ''}, + {name: "支付状态", value: data.pay_status_name || ''}, + {name: "单价", value: data.price || ''}, + {name: "总价", value: data.total_price || ''}, + {name: "优惠金额", value: data.preferential_price || ''}, + {name: "增加金额", value: data.increase_price || '' }, + {name: "支付金额", value: data.pay_price || ''}, + {name: "支付方式", value: data.payment_name || ''}, + {name: "快递公司", value: data.express_name || ''}, + {name: "快递单号", value: data.express_number || ''}, + {name: "用户留言", value: data.user_note || ''}, + {name: "创建时间", value: data.add_time || ''}, + {name: "确认时间", value: data.confirm_time || ''}, + {name: "支付时间", value: data.pay_time || ''}, + {name: "发货时间", value: data.delivery_time || ''}, + {name: "收货时间", value: data.collect_time || ''}, + {name: "取消时间", value: data.close_time || ''}, + {name: "关闭时间", value: data.close_time || ''}, ], + extension_data: data.extension_data || [], data_list_loding_status: 3, data_bottom_line_status: true, data_list_loding_msg: '', diff --git a/public/appmini/old/baidu/app.css b/public/appmini/old/baidu/app.css index 4fe08e418eede6ef01b3e73f676235e559d1ebde..2d2c021bb46f8e7b429078f5b8eb8d7ce84c92cd 100755 --- a/public/appmini/old/baidu/app.css +++ b/public/appmini/old/baidu/app.css @@ -62,21 +62,7 @@ textarea { .spacing-mb { margin-bottom: 20rpx; } .spacing-mt { margin-top: 20rpx; } -/* 在线客服 */ -.customer-service { - position: fixed; - bottom: 100rpx; - right: 0; -} -.customer-service image { - width: 80rpx; - height: 80rpx; - margin-right: 20rpx; -} - - .drift { position: fixed; left: -1000px; } - .nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; } .tips { background: #ffffeb url('data:image/png;base64,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') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 10rpx 10rpx 10rpx 45rpx; font-size: 26rpx; border-radius: 2px; display: block; } @@ -475,4 +461,22 @@ button[disabled].bg-primary { } .coupon-container .item-disabled { border: 1px solid #dfdfdf !important; +} + +/** + * 快捷导航 + */ +.common-quick-nav { + border: 0; + padding: 15rpx; + background: rgba(0, 0, 0, 0.6); + position: fixed; + right: 10rpx; + border-radius: 50%; + width: 90rpx; + height: 90rpx; +} +.common-quick-nav image { + width: 60rpx; + height: 60rpx; } \ No newline at end of file diff --git a/public/appmini/old/baidu/images/default-cart-icon.png b/public/appmini/old/baidu/images/default-cart-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..260fe785d1d6b771d7b12fc8a592d333fc9282f5 Binary files /dev/null and b/public/appmini/old/baidu/images/default-cart-icon.png differ diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css index e076a3c0333d8e1ccea290fe9950b0b69bcc78fe..c9d25944073785788c2b7a71d5c02fdb632f26ca 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.css +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.css @@ -328,4 +328,18 @@ } .coupon-container .v-left .desc { margin-top: 5rpx; +} + +/* + * 购物车入口 + */ +.quick-nav-cart { + bottom: calc(35% + 110rpx); + width: 60rpx; + height: 60rpx; +} +.quick-nav-cart .badge-icon { + position: absolute; + top: -5px; + left: calc(50% + 23rpx); } \ No newline at end of file diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js index 888541e678234efbd1582184e6c9cea34060c880..58dbeac9b694d46275b5fa4e32d6bb12bf9fa286 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js @@ -44,6 +44,9 @@ Page({ // 优惠劵 plugins_coupon_data: null, + + // 购物车快捷导航 + quick_nav_cart_count: 0, }, onLoad(params) { @@ -117,6 +120,7 @@ Page({ common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0, plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null, plugins_coupon_data: data.plugins_coupon_data || null, + quick_nav_cart_count: data.common_cart_total || 0, }); // 限时秒杀倒计时 @@ -286,6 +290,7 @@ Page({ success: res => { swan.hideLoading(); if (res.data.code == 0) { + this.setData({ quick_nav_cart_count: this.data.quick_nav_cart_count + this.data.temp_buy_number}); this.popup_close_event(); app.showToast(res.data.msg, "success"); } else { diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.json b/public/appmini/old/baidu/pages/goods-detail/goods-detail.json index 7d179bfd5fd5f445a1ef926625a70f5712237393..bdfdb2f27e0d3b15c8a4799cbe35c2021a7a02d6 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.json +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.json @@ -1,6 +1,7 @@ { "enablePullDownRefresh": true, "usingComponents": { - "component-popup": "/components/popup/popup" + "component-popup": "/components/popup/popup", + "component-badge": "/components/badge/badge" } } \ No newline at end of file diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan index ae92f3bc414aa5bd404022d9984dfe4db1f0f17f..b820cb4c78d11c7dd557ba759b3660b8732d335b 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.swan @@ -188,4 +188,14 @@ - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.css b/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.css index 07068a42a66937522b5e1d3ce332ca1ccf91e020..a847a2bbe98cadb2e20ab2541f977d7862e26281 100755 --- a/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.css +++ b/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.css @@ -71,4 +71,17 @@ } .detail-list .item view { line-height: 46rpx; +} + +/* + * 扩展数据 + */ +.extension-list .item { + padding: 20rpx 30rpx; +} +.extension-list .item .title { + padding-right: 20rpx; +} +.extension-list .item .content { + padding-left: 20rpx; } \ No newline at end of file diff --git a/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js b/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js index 919256bf473da410a62e8f01a0e0bb3cec2e08f5..756ae8f372a2f46c685826c644e8dcb682643178 100755 --- a/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js @@ -1,12 +1,14 @@ const app = getApp(); Page({ data: { - detail: null, - detail_list: [], + params: null, data_list_loding_status: 1, data_list_loding_msg: '', data_bottom_line_status: false, - params: null + + detail: null, + detail_list: [], + extension_data: [], }, onLoad(params) { @@ -39,7 +41,28 @@ Page({ var data = res.data.data; self.setData({ detail: data, - detail_list: [{ name: "订单号", value: data.order_no || '' }, { name: "状态", value: data.status_name || '' }, { name: "支付状态", value: data.pay_status_name || '' }, { name: "单价", value: data.price || '' }, { name: "总价", value: data.total_price || '' }, { name: "优惠", value: data.preferential_price || '' }, { name: "支付金额", value: data.pay_price || '' }, { name: "支付方式", value: data.payment_name || '' }, { name: "快递公司", value: data.express_name || '' }, { name: "快递单号", value: data.express_number || '' }, { name: "用户留言", value: data.user_note || '' }, { name: "创建时间", value: data.add_time || '' }, { name: "确认时间", value: data.confirm_time || '' }, { name: "支付时间", value: data.pay_time || '' }, { name: "发货时间", value: data.delivery_time || '' }, { name: "收货时间", value: data.collect_time || '' }, { name: "取消时间", value: data.close_time || '' }, { name: "关闭时间", value: data.close_time || '' }], + detail_list:[ + {name: "订单号", value: data.order_no || ''}, + {name: "状态", value: data.status_name || ''}, + {name: "支付状态", value: data.pay_status_name || ''}, + {name: "单价", value: data.price || ''}, + {name: "总价", value: data.total_price || ''}, + {name: "优惠金额", value: data.preferential_price || ''}, + {name: "增加金额", value: data.increase_price || '' }, + {name: "支付金额", value: data.pay_price || ''}, + {name: "支付方式", value: data.payment_name || ''}, + {name: "快递公司", value: data.express_name || ''}, + {name: "快递单号", value: data.express_number || ''}, + {name: "用户留言", value: data.user_note || ''}, + {name: "创建时间", value: data.add_time || ''}, + {name: "确认时间", value: data.confirm_time || ''}, + {name: "支付时间", value: data.pay_time || ''}, + {name: "发货时间", value: data.delivery_time || ''}, + {name: "收货时间", value: data.collect_time || ''}, + {name: "取消时间", value: data.close_time || ''}, + {name: "关闭时间", value: data.close_time || ''}, + ], + extension_data: data.extension_data || [], data_list_loding_status: 3, data_bottom_line_status: true, data_list_loding_msg: '' diff --git a/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.swan b/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.swan index 53cae23697ad2ee61706569898a0d14e9c77afb3..9334f429b65d60ddc8466c91f2bd2f538a86cba0 100755 --- a/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.swan +++ b/public/appmini/old/baidu/pages/user-order-detail/user-order-detail.swan @@ -31,6 +31,7 @@ + {{item.name}} @@ -38,6 +39,14 @@ + + + + {{item.name}} + {{item.tips}} + + + diff --git a/public/appmini/old/weixin/app.wxss b/public/appmini/old/weixin/app.wxss index 5a853961dedd8f1fd3e08db55dfbe173812e51b7..e817b3beddde5524aaadbab3745a7614e43e3360 100755 --- a/public/appmini/old/weixin/app.wxss +++ b/public/appmini/old/weixin/app.wxss @@ -62,21 +62,7 @@ textarea { .spacing-mb { margin-bottom: 20rpx; } .spacing-mt { margin-top: 20rpx; } -/* 在线客服 */ -.customer-service { - position: fixed; - bottom: 100rpx; - right: 0; -} -.customer-service image { - width: 80rpx; - height: 80rpx; - margin-right: 20rpx; -} - - .drift { position: fixed; left: -1000px; } - .nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; } .tips { background: #ffffeb url('data:image/png;base64,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') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 10rpx 10rpx 10rpx 45rpx; font-size: 26rpx; border-radius: 2px; display: block; } @@ -318,24 +304,31 @@ button[disabled].bg-primary { line-height: 85rpx; } -/* - 在线客服 -*/ -.common-online-service { +/** + * 快捷导航 + */ +.common-quick-nav { border: 0; padding: 15rpx; background: rgba(0, 0, 0, 0.6); position: fixed; right: 10rpx; - bottom: 35%; - line-height: 30rpx; border-radius: 50%; + width: 90rpx; + height: 90rpx; } -.common-online-service image { +.common-quick-nav image { width: 60rpx; height: 60rpx; } +/** + * 在线客服 + */ +.common-online-service { + bottom: 35%; +} + /** * 表单 */ diff --git a/public/appmini/old/weixin/images/default-cart-icon.png b/public/appmini/old/weixin/images/default-cart-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..260fe785d1d6b771d7b12fc8a592d333fc9282f5 Binary files /dev/null and b/public/appmini/old/weixin/images/default-cart-icon.png differ diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js index 240e0b280c3bc4696e20ec7c8eafde19406a3f47..9f3d4b84c6c84fec2f018aad96dbefc22d499045 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -62,6 +62,9 @@ Page({ // 优惠劵 plugins_coupon_data: null, + + // 购物车快捷导航 + quick_nav_cart_count: 0, }, onLoad(params) { @@ -152,6 +155,7 @@ Page({ common_app_is_poster_share: data.common_app_is_poster_share || 0, plugins_coupon_data: data.plugins_coupon_data || null, + quick_nav_cart_count: data.common_cart_total || 0, }); // 限时秒杀倒计时 @@ -327,6 +331,7 @@ Page({ success: (res) => { wx.hideLoading(); if (res.data.code == 0) { + this.setData({ quick_nav_cart_count: this.data.quick_nav_cart_count + this.data.temp_buy_number}); this.popup_close_event(); app.showToast(res.data.msg, "success"); } else { diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.json b/public/appmini/old/weixin/pages/goods-detail/goods-detail.json index 7d179bfd5fd5f445a1ef926625a70f5712237393..bdfdb2f27e0d3b15c8a4799cbe35c2021a7a02d6 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.json +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.json @@ -1,6 +1,7 @@ { "enablePullDownRefresh": true, "usingComponents": { - "component-popup": "/components/popup/popup" + "component-popup": "/components/popup/popup", + "component-badge": "/components/badge/badge" } } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml index 9461a13a197ab71b7cbdae404efc3097fa775b2c..1870ec10a294e0e530a6281842c18000c8afb365 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml @@ -228,4 +228,14 @@ - \ No newline at end of file + + + + + + + + + + + \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss index 3d924c2f9769350ba2263f8f28b1fb64914f74fa..07c6570790ae5b31a6d07c6f47b04c4ac48273a8 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss @@ -323,4 +323,18 @@ } .coupon-container .v-left .desc { margin-top: 5rpx; +} + +/* + * 购物车入口 + */ +.quick-nav-cart { + bottom: calc(35% + 110rpx); + width: 60rpx; + height: 60rpx; +} +.quick-nav-cart .badge-icon { + position: absolute; + top: -5px; + left: calc(50% + 23rpx); } \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/lib/online-service/content.wxml b/public/appmini/old/weixin/pages/lib/online-service/content.wxml index 8828928c34650f93bb17c3f7a2c5932c5954c6cb..968819ec6ea3bfbc093928f1760fb24768a242cf 100644 --- a/public/appmini/old/weixin/pages/lib/online-service/content.wxml +++ b/public/appmini/old/weixin/pages/lib/online-service/content.wxml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js index 62179e87fc3125cef0ad06edf34deb56ec6a1314..235cea892b9846a5640c437c1e6f4fe8c6581a9c 100755 --- a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js @@ -1,12 +1,14 @@ const app = getApp(); Page({ data: { - detail: null, - detail_list: [], + params: null, data_list_loding_status: 1, data_list_loding_msg: '', data_bottom_line_status: false, - params: null, + + detail: null, + detail_list: [], + extension_data: [], }, onLoad(params) { @@ -45,7 +47,8 @@ Page({ {name: "支付状态", value: data.pay_status_name || ''}, {name: "单价", value: data.price || ''}, {name: "总价", value: data.total_price || ''}, - {name: "优惠", value: data.preferential_price || ''}, + {name: "优惠金额", value: data.preferential_price || ''}, + {name: "增加金额", value: data.increase_price || '' }, {name: "支付金额", value: data.pay_price || ''}, {name: "支付方式", value: data.payment_name || ''}, {name: "快递公司", value: data.express_name || ''}, @@ -59,6 +62,7 @@ Page({ {name: "取消时间", value: data.close_time || ''}, {name: "关闭时间", value: data.close_time || ''}, ], + extension_data: data.extension_data || [], data_list_loding_status: 3, data_bottom_line_status: true, data_list_loding_msg: '', diff --git a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml index 098b19147c965129a6e3ed5a428887a35d9fcc1b..144f22ea2a3d99a9e2ee0e7c17b07e7855585dd9 100755 --- a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml +++ b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml @@ -31,6 +31,7 @@ + {{item.name}} @@ -38,6 +39,14 @@ + + + + {{item.name}} + {{item.tips}} + + + diff --git a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss index 07068a42a66937522b5e1d3ce332ca1ccf91e020..a847a2bbe98cadb2e20ab2541f977d7862e26281 100755 --- a/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss +++ b/public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss @@ -71,4 +71,17 @@ } .detail-list .item view { line-height: 46rpx; +} + +/* + * 扩展数据 + */ +.extension-list .item { + padding: 20rpx 30rpx; +} +.extension-list .item .title { + padding-right: 20rpx; +} +.extension-list .item .content { + padding-left: 20rpx; } \ No newline at end of file