商品详情购物车入口

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),

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; }
@@ -408,3 +394,21 @@ 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

public/appmini/old/alipay/pages/goods-detail/goods-detail.acss

@@ -300,3 +300,17 @@
 .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

public/appmini/old/alipay/pages/goods-detail/goods-detail.axml

@@ -185,3 +185,13 @@
     <import src="/pages/common/nodata.axml" />
     <template is="nodata" data="{{status: data_list_loding_status, msg: data_list_loding_msg}}"></template>
 </view>
+
+<!-- 购物车 -->
+<navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none">
+  <view class="common-quick-nav quick-nav-cart">
+    <view class="badge-icon">
+      <badge text="{{quick_nav_cart_count}}" dot="{{false}}"></badge>
+    </view>
+    <image src="/images/default-cart-icon.png" class="dis-block"></image>
+  </view>
+</navigator>
\ No newline at end of file

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 {

public/appmini/old/alipay/pages/goods-detail/goods-detail.json

 {
   "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

public/appmini/old/alipay/pages/user-order-detail/user-order-detail.acss

@@ -72,3 +72,16 @@
 .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

public/appmini/old/alipay/pages/user-order-detail/user-order-detail.axml

@@ -31,6 +31,7 @@
       </view>
   </view>
 
+  <!-- 订单基础数据 -->
   <view a:if="{{detail_list.length > 0}}" class="detail-list bg-white">
     <view a:for="{{detail_list}}" class="item br-b oh">
       <view class="title fl">{{item.name}}</view>
@@ -38,6 +39,14 @@
     </view>
   </view>
 
+  <!-- 扩展数据 -->
+  <view a:if="{{extension_data.length > 0}}" class="extension-list bg-white spacing-mt">
+    <view a:for="{{extension_data}}" class="item br-b oh">
+      <text class="title">{{item.name}}</text>
+      <text class="content cr-888 br-l">{{item.tips}}</text>
+    </view>
+  </view>
+
   <import src="/pages/common/bottom_line.axml" />
   <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
 </view>

public/appmini/old/alipay/pages/user-order-detail/user-order-detail.js

 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: '',

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; }
@@ -476,3 +462,21 @@ 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

public/appmini/old/baidu/pages/goods-detail/goods-detail.css

@@ -329,3 +329,17 @@
 .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

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 {

public/appmini/old/baidu/pages/goods-detail/goods-detail.json

 {
   "enablePullDownRefresh": true,
   "usingComponents": {
-    "component-popup": "/components/popup/popup"
+    "component-popup": "/components/popup/popup",
+    "component-badge": "/components/badge/badge"
   }
 }
\ No newline at end of file

public/appmini/old/baidu/pages/goods-detail/goods-detail.swan

@@ -189,3 +189,13 @@
     <import src="/pages/common/nodata.swan" />
     <template is="nodata" data="{{{status: data_list_loding_status, msg: data_list_loding_msg}}}"></template>
 </view>
+
+<!-- 购物车 -->
+<navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none">
+  <view class="common-quick-nav quick-nav-cart">
+    <view class="badge-icon">
+      <component-badge number="{{quick_nav_cart_count}}"></component-badge>
+    </view>
+    <image src="/images/default-cart-icon.png" class="dis-block"></image>
+  </view>
+</navigator>
\ No newline at end of file

public/appmini/old/baidu/pages/user-order-detail/user-order-detail.css

@@ -72,3 +72,16 @@
 .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

public/appmini/old/baidu/pages/user-order-detail/user-order-detail.js

 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: ''

public/appmini/old/baidu/pages/user-order-detail/user-order-detail.swan

@@ -31,6 +31,7 @@
       </view>
   </view>
 
+  <!-- 订单基础数据 -->
   <view s-if="detail_list.length > 0" class="detail-list bg-white">
     <view s-for="item, index in detail_list" class="item br-b oh">
       <view class="title fl">{{item.name}}</view>
@@ -38,6 +39,14 @@
     </view>
   </view>
 
+  <!-- 扩展数据 -->
+  <view s-if="extension_data.length > 0" class="extension-list bg-white spacing-mt">
+    <view s-for="item, index in extension_data" class="item br-b oh">
+      <text class="title">{{item.name}}</text>
+      <text class="content cr-888 br-l">{{item.tips}}</text>
+    </view>
+  </view>
+
   <import src="/pages/common/bottom_line.swan" />
   <template is="bottom_line" data="{{{status: data_bottom_line_status}}}"></template>
 </view>

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%;
+}
+
 /**
  * 表单
  */

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 {

public/appmini/old/weixin/pages/goods-detail/goods-detail.json

 {
   "enablePullDownRefresh": true,
   "usingComponents": {
-    "component-popup": "/components/popup/popup"
+    "component-popup": "/components/popup/popup",
+    "component-badge": "/components/badge/badge"
   }
 }
\ No newline at end of file

public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml

@@ -229,3 +229,13 @@
   <import src="/pages/lib/online-service/content.wxml" />
   <template is="online_service"></template>
 </view>
+
+<!-- 购物车 -->
+<navigator url="/pages/cart/cart" open-type="switchTab" hover-class="none">
+  <view class="common-quick-nav quick-nav-cart">
+    <view class="badge-icon">
+      <component-badge prop-number="{{quick_nav_cart_count}}"></component-badge>
+    </view>
+    <image src="/images/default-cart-icon.png" class="dis-block"></image>
+  </view>
+</navigator>
\ No newline at end of file

public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss

@@ -324,3 +324,17 @@
 .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

public/appmini/old/weixin/pages/lib/online-service/content.wxml

 <template name="online_service">
-  <button open-type="contact" class="common-online-service">
-    <image src="/pages/lib/online-service/icon.png"></image>
+  <button open-type="contact" class="common-quick-nav common-online-service">
+    <image src="/pages/lib/online-service/icon.png" class="dis-block"></image>
   </button>
 </template>
\ No newline at end of file

public/appmini/old/weixin/pages/user-order-detail/user-order-detail.js

 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: '',

public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxml

@@ -31,6 +31,7 @@
       </view>
   </view>
 
+  <!-- 订单基础数据 -->
   <view wx:if="{{detail_list.length > 0}}" class="detail-list bg-white">
     <view wx:for="{{detail_list}}" wx:key="item" class="item br-b oh">
       <view class="title fl">{{item.name}}</view>
@@ -38,6 +39,14 @@
     </view>
   </view>
 
+  <!-- 扩展数据 -->
+  <view wx:if="{{extension_data.length > 0}}" class="extension-list bg-white  spacing-mt">
+    <view wx:for="{{extension_data}}" wx:key="item" class="item br-b oh">
+      <text class="title">{{item.name}}</text>
+      <text class="content cr-888 br-l">{{item.tips}}</text>
+    </view>
+  </view>
+
   <import src="/pages/common/bottom_line.wxml" />
   <template is="bottom_line" data="{{status: data_bottom_line_status}}"></template>
 </view>

public/appmini/old/weixin/pages/user-order-detail/user-order-detail.wxss

@@ -72,3 +72,16 @@
 .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