代码更新

miniapp/app/app.wxss

@@ -153,7 +153,7 @@ button:after {
 .total {
     height: 100rpx;
     margin-top: 20rpx;
-    line-height: 100rpx;
+    line-height: 97rpx;
     background-color: #fff;
     display: flex;
 }

miniapp/app/pages/goodsDetail/index.js

@@ -35,7 +35,27 @@ new $.Page({
             });
         }
         $.wx.showToast({
-            title: '微信支付尚未接入'
+            title: '购买中'
+        }, 'loading');
+        $.request('product_order/store', 'POST', {
+            amount,
+            address,
+            contact: name,
+            phone,
+            product_id: 1
+        }).then((res) => {
+            if (res.data) {
+                this.callWXPay(res.data.id, res.data.order_type || 'product_order');
+            }
+        });
+    },
+    callWXPay(order_id, order_type) {
+        $.request('payments/pay', 'POST', {
+            order_id,
+            order_type
+        }).then((res) => {
+            $.wx.hideToast('loading');
+
         });
     }
 });

miniapp/app/pages/order/index.js

@@ -20,6 +20,8 @@ new $.Page({
                 res.data.forEach(e => {
                     e.orderText = orderTexts[e.status];
                     if (e.order_type == 'product_order') {
+                        if (e.status == 0) 
+                            e.orderText = '待付款';
                         goods.push(e);
                     } else {
                         services.push(e);
@@ -34,10 +36,20 @@ new $.Page({
     },
     toPay(e) {
         const {
-            id
+            id,
+            type
         } = e.target.dataset;
-        if (id) {
-
+        if (id && type) {
+            $.wx.showToast({
+                title: '支付中'
+            }, 'loading');
+            $.request('payments/pay', 'POST', {
+                order_id: id,
+                order_type: type
+            }).then((res) => {
+                $.wx.hideToast('loading');
+    
+            });
         }
     },
     addComment(e) {

miniapp/app/pages/order/index.wxml

@@ -15,7 +15,7 @@
                     <view class="right">
                         <view class="text-top">{{item.orderText}}</view>
                         <view class="text-bottom" wx:if="{{item.status != 0}}">￥{{item.price}}</view>
-                        <view class="btn-blue" bindtap="toPay" data-id="{{item.id}}" wx:if="{{item.status == 1}}">立即付款</view>
+                        <view class="btn-blue" bindtap="toPay" data-id="{{item.id}}" data-type="{{item.order_type}}" wx:if="{{item.status == 1}}">立即付款</view>
                         <view class="btn-blue" bindtap="addComment" data-id="{{item.id}}" wx:if="{{item.status == 2 && !item.comment}}">添加评价</view>
                     </view>
                 </view>
@@ -49,6 +49,7 @@
                     <view class="right">
                         <view class="text-top">{{item.orderText}}</view>
                         <view class="text-bottom">￥{{item.price}}</view>
+                        <view class="btn-blue" bindtap="toPay" data-id="{{item.id}}" data-type="{{item.order_type}}" wx:if="{{item.status == 0}}">立即付款</view>
                     </view>
                 </view>
             </view>