代码更新

miniapp/app/pages/goodsDetail/index.js

@@ -1,9 +1,28 @@
+const WxParse = require('../../wxParse/wxParse.js');
 const $ = global;
 
 new $.Page({
     data: {
-        amount: 1,
-        unitPrice: 599
+        amount: 1
+    },
+    onLoad(options) {
+        const id = options.id;
+        if (id) {
+            $.wx.showToast({
+                title: '加载中'
+            }, 'loading');
+            $.request(`product/${id}`, 'GET', {}).then((res) => {
+                if (res.data) {
+                    $.wx.hideToast('loading');
+                    const article = res.data.info;
+                    this.setData({
+                        detail: res.data,
+                        unitPrice: res.data.price
+                    });
+                    WxParse.wxParse('article', 'html', article, this, 5)
+                }
+            });
+        }
     },
     minusAmount() {
         if (this.data.amount > 1) {
@@ -54,8 +73,40 @@ new $.Page({
             order_id,
             order_type
         }).then((res) => {
-            $.wx.hideToast('loading');
-
+            if (res.msg) {
+                const {
+                    timestamp,
+                    sign,
+                    noncestr
+                } = res.msg;
+                const pck = res.msg.package;
+                wx.requestPayment({
+                    timeStamp: timestamp + '',
+                    nonceStr: noncestr,
+                    package: pck,
+                    signType: 'MD5',
+                    paySign: sign,
+                    success(res) {
+                        console.log('支付成功', res);
+                        $.wx.showToast({
+                            title: '支付成功'
+                        });
+                    },
+                    fail() {
+                        $.wx.showToast({
+                            title: '支付失败'
+                        });
+                    },
+                    complete() {
+                        setTimeout(function () {
+                            $.router.goto({
+                                path: '/pages/order/index',
+                                type: $.ROUTER_TYPE.CLOSE_CURRENT
+                            })
+                        }, 2000);
+                    }
+                });
+            }
         });
     }
 });

miniapp/app/pages/goodsDetail/index.wxml

@@ -1,11 +1,13 @@
+<import src="/wxParse/wxParse.wxml" />
 <view class="page">
     <view class="page-hd">
-        <image class="goods-img" mode="widthFix" src="/img/demo/goods.png"></image>
+        <!-- <image class="goods-img" mode="widthFix" src="/img/demo/goods.png"></image> -->
+        <image class="goods-img" mode="widthFix" src="{{detail.photo}}"></image>
         <view class="goods-info">
-            <view class="goods-name">belecoo贝丽可高景观婴儿推车可坐躺折叠双向四轮减震宝宝手推</view>
+            <view class="goods-name">{{detail.name}}</view>
             <view class="space-bt">
                 <view>快递费：免邮费 广东广州</view>
-                <view>总销量120笔</view>
+                <view>总销量{{detail.sell_num}}笔</view>
             </view>
             <view class="price">
                 <text class="unit">￥</text>{{unitPrice}}</view>
@@ -19,7 +21,8 @@
         <view class="details">
             <view class="details-hd">商品详情</view>
             <view class="details-bd">
-                <image class="g" mode="widthFix" src="/img/demo/goods-detail.png" style="width: 100%;display: block;"></image>
+                <!-- <image class="g" mode="widthFix" src="/img/demo/goods-detail.png" style="width: 100%;display: block;"></image> -->
+                <template is="wxParse" data="{{wxParseData:article.nodes}}" />
             </view>
         </view>
     </view>

miniapp/app/pages/goodsDetail/index.wxss

@@ -66,4 +66,8 @@
 
 .booking {
     margin-top: 20rpx;
+}
+
+.page-hd {
+    font-size: 0;
 }

miniapp/app/pages/order/index.js

@@ -20,7 +20,7 @@ new $.Page({
                 res.data.forEach(e => {
                     e.orderText = orderTexts[e.status];
                     if (e.order_type == 'product_order') {
-                        if (e.status == 0) 
+                        if (e.status == 0)
                             e.orderText = '待付款';
                         goods.push(e);
                     } else {
@@ -47,8 +47,31 @@ new $.Page({
                 order_id: id,
                 order_type: type
             }).then((res) => {
-                $.wx.hideToast('loading');
-    
+                if (res.msg) {
+                    const {
+                        timestamp,
+                        sign,
+                        noncestr
+                    } = res.msg;
+                    const pck = res.msg.package;
+                    wx.requestPayment({
+                        timeStamp: timestamp + '',
+                        nonceStr: noncestr,
+                        package: pck,
+                        signType: 'MD5',
+                        paySign: sign,
+                        success(res) {
+                            console.log('支付成功', res);
+                            $.wx.hideToast('loading');
+
+                        },
+                        fail() {
+                            $.wx.showToast({
+                                title: '支付失败'
+                            });
+                        }
+                    });
+                }
             });
         }
     },