Merge remote-tracking branch 'origin/master'

miniapp/app/pages/cart/index.js

@@ -181,11 +181,12 @@ new $.Page({
         goodsList.forEach((g) => {
             carts.push({
                 id: g.id,
-                amount: g.product_amount
+                product_id: g.product_id,
+                product_amount: g.product_amount
             });
         });
         $.request('shopcar/pstore', 'POST', {
-            products_prices: cart
+            data: carts
         }).then(() => {
             this.setData({
                 hasAmountModify: false
@@ -195,11 +196,22 @@ new $.Page({
 
     toSettle() {
         const products = [];
-        const goodsList = this.data.goodsList;
+        const { name, phone, address, goodsList } = this.data;
         if (goodsList.length === 0) return;
+        if (!name || !phone || !address) {
+            return $.wx.showToast({
+                title: '请把地址信息填写完整'
+            });
+        }
+        if (!this._isPhone(phone)) {
+            return $.wx.showToast({
+                title: '请输入正确的手机号码'
+            });
+        }
         goodsList.forEach((g) => {
             if (g.checked) {
                 g.amount = g.product_amount;
+                g.id = g.product_id;
                 products.push(g);
             }
         });
@@ -208,14 +220,57 @@ new $.Page({
                 title: '请先选择购买商品'
             });
         }
-        $.router.goto({
-            path: '/pages/orderDetail/index',
-            params: {
-                isCabinet: false,
-                products
-            },
-            query: {
-                source: 'cart'
+        $.wx.showToast({
+            title: '购买中'
+        }, 'loading');
+        $.request('product_order/store', 'POST', {
+            address,
+            contact: name,
+            phone,
+            products
+        }).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) => {
+            if (res.msg) {
+                const {
+                    timestamp,
+                    paySign,
+                    nonceStr
+                } = res.msg;
+                const pck = res.msg.package;
+                wx.requestPayment({
+                    timeStamp: timestamp + '',
+                    nonceStr,
+                    package: pck,
+                    signType: 'MD5',
+                    paySign,
+                    success(res) {
+                        $.wx.showToast({
+                            title: '支付成功'
+                        });
+                    },
+                    fail() {
+                        $.wx.showToast({
+                            title: '支付失败'
+                        });
+                    },
+                    complete() {
+                        setTimeout(function () {
+                            $.router.goto({
+                                path: '/pages/order/index',
+                                type: $.ROUTER_TYPE.SWITCH_TAB
+                            });
+                        }, 2000);
+                    }
+                });
             }
         });
     }

miniapp/app/pages/cart/index.wxml

@@ -30,6 +30,28 @@
                     </view>
                 </view>
             </view>
+            <view class="module-ft">
+                <view class="booking">
+                    <view class="input-item">
+                        <view class="label">姓名</view>
+                        <view class="input-content">
+                            <input type="text" class="input-text" bindinput="_handleInput" data-name="name" placeholder="您的称呼" />
+                        </view>
+                    </view>
+                    <view class="input-item">
+                        <view class="label">电话</view>
+                        <view class="input-content">
+                            <input type="number" class="input-text" bindinput="_handleInput" data-name="phone" placeholder="您的手机号码" />
+                        </view>
+                    </view>
+                    <view class="input-item ">
+                        <view class="label ">地址</view>
+                        <view class="input-content">
+                            <input type="text" class="input-text" bindinput="_handleInput" data-name="address" placeholder="寄送地址" />
+                        </view>
+                    </view>
+                </view>
+            </view>
         </view>
         <view class="empty-content" wx:else>
             <view class="empty-content-text">购物车空空如也</view>

miniapp/app/pages/cart/index.wxss

@@ -196,4 +196,13 @@ text {
     position: fixed;
     bottom: 0;
     width: 100%;
+    z-index: 10;
+}
+
+.booking{
+    border-top: solid 1rpx #ccc;
+}
+
+.label{
+    line-height: 80rpx;
 }

miniapp/app/pages/goodsDetail/index.js

@@ -57,11 +57,13 @@ new $.Page({
             title: '购买中'
         }, 'loading');
         $.request('product_order/store', 'POST', {
-            amount,
             address,
             contact: name,
             phone,
-            product_id: this.data.detail.id
+            products: [{
+                id: this.data.detail.id,
+                amount
+            }]
         }).then((res) => {
             if (res.data) {
                 this.callWXPay(res.data.id, res.data.order_type || 'product_order');

miniapp/app/pages/order/index.js

@@ -14,17 +14,19 @@ new $.Page({
     },
     init() {
         $.request('my/orders', 'GET', {}).then((res) => {
-            const services = []
-            const goods = []
-            if (res.data && res.data.length > 0) {
-                res.data.forEach(e => {
+            if (res.data) {
+                const services = res.data.others || [];
+                const goods = res.data.product_orders || [];
+                services.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);
+                });
+                goods.forEach(e => {
+                    e.orderText = orderTexts[e.status];
+                    if (e.status == 0) e.orderText = '待付款';
+                    e.text = '';
+                    for (let p of e.products) {
+                        let t = `${p.name}×${p.amount}`;
+                        e.text += e.text ? ('；' + t) : t;
                     }
                 });
                 this.setData({

miniapp/app/pages/order/index.wxml

@@ -43,8 +43,8 @@
                     <view class="left">
                         <image class="order-img" src="{{item.photo}}"></image>
                         <view class="info">
-                            <view class="name">{{item.classify1}}</view>
-                            <view class="text">{{item.classify2}}</view>
+                            <view class="name">{{item.text}}</view>
+                            <!-- <view class="text">{{item.classify2}}</view> -->
                             <view class="text">{{item.created_at}}</view>
                         </view>
                     </view>