From 92f0dd4c467019f218e05164b87ff7b2c753b39a Mon Sep 17 00:00:00 2001
From: pplokijuhyg <1162963624@qq.com>
Date: Mon, 23 Dec 2019 17:24:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/order/commodity/index.js   | 44 ++++++++++++++++++++++++---
 components/order/commodity/index.wxml | 24 +++++++--------
 components/order/tab/index.wxml       | 28 +++++++++--------
 3 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/components/order/commodity/index.js b/components/order/commodity/index.js
index 17e3ab3..f639a85 100644
--- a/components/order/commodity/index.js
+++ b/components/order/commodity/index.js
@@ -1,9 +1,11 @@
+import bin from "../../../utils/bin"
 Component({
     properties: {
-        num:String,
-        cprice:String,
-        freight:String,
-        goods:Array
+        num: String,
+        cprice: String,
+        freight: String,
+        goods: Array,
+        gid: String
     },
     data: {},
     methods: {
@@ -11,6 +13,40 @@ Component({
             wx.navigateTo({
                 url: "/pages/undetermined/undetermined"
             })
+        },
+        cancel() {
+            bin.getuserid().then((id) => {
+                bin.request({
+                    url: "User/cancelOrder",
+                    urldata: {
+                        user_id: id,
+                        order_id: this.data.gid
+                    }
+                }).then((res) => {
+                    console.log(res)
+                })
+            })
+
+        },
+        pay(){
+            bin.getuserid().then((id)=>{
+                bin.request({
+                    url:"Cart/getWXPayData",
+                    urldata:{
+                        user_id:id,
+                        order_id:this.data.gid
+                    }
+                }).then((res)=>{
+                    console.log(res)
+                    wx.requestPayment({
+                        timeStamp:res.data.result.wdata.timeStamp + "",
+                        nonceStr:res.data.result.wdata.nonceStr,
+                        package:res.data.result.wdata.package,
+                        signType:"MD5",
+                        paySign:res.data.result.wdata.sign
+                    })
+                })
+            })
         }
     }
 })
\ No newline at end of file
diff --git a/components/order/commodity/index.wxml b/components/order/commodity/index.wxml
index 31abf4e..2efdcc5 100644
--- a/components/order/commodity/index.wxml
+++ b/components/order/commodity/index.wxml
@@ -1,14 +1,12 @@
 <view class="commodity" bindtap="todetail">
-                <message wx:for="{{goods}}" title="{{item.goods_name}}" spec="{{item.spec_key_name}}" price="{{item.goods_price}}" num="{{goods_num}}" image="{{item.image}}"></message>
-                <view class="aggregate">
-                    共计{{num}}件商品  合计: 
-                    <text>￥{{cprice}}</text> 
-                    (含运费￥{{freight}})
-                </view>
-                <view class="operation">
-                    <view class="button">评价</view>
-
-                    <view class="button hlight">评价</view>
-
-                </view>
-            </view>
\ No newline at end of file
+    <message wx:for="{{goods}}" title="{{item.goods_name}}" spec="{{item.spec_key_name}}" price="{{item.goods_price}}" num="{{item.goods_num}}" image="{{item.image}}"></message>
+    <view class="aggregate">
+        共计{{num}}件商品  合计:
+        <text>￥{{cprice}}</text>
+        (含运费￥{{freight}})
+    </view>
+    <view class="operation">
+        <view class="button" catch:tap="cancel">取消订单</view>
+        <view class="button hlight" catch:tap="pay">立即付款</view>
+    </view>
+</view>
\ No newline at end of file
diff --git a/components/order/tab/index.wxml b/components/order/tab/index.wxml
index 93dd0b1..b69a174 100644
--- a/components/order/tab/index.wxml
+++ b/components/order/tab/index.wxml
@@ -1,13 +1,17 @@
 <van-tabs class="tab" swipe-threshold="5">
-        <van-tab title="待付款">
-            <commodity wx:for="{{WAITPAY}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}"  freight="{{item.integral_money}}" goods="{{item.goods_list}}"> </commodity>
-        </van-tab>
-        <van-tab title="代发货">
-        <commodity wx:for="{{WAITSEND}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}"  freight="{{item.integral_money}}" goods="{{item.goods_list}}"> </commodity></van-tab>
-        <van-tab title="待收货"> 
-        <commodity wx:for="{{WAITRECEIVE}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}"  freight="{{item.integral_money}}" goods="{{item.goods_list}}"> </commodity></van-tab>
-        <van-tab title="已完成">
-        <commodity wx:for="{{FINISH}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}"  freight="{{item.integral_money}}" goods="{{item.goods_list}}"> </commodity> </van-tab>
-        <van-tab title="售后">
-        <commodity wx:for="{{AFTERSALE}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}"  freight="{{item.integral_money}}" goods="{{item.goods_list}}"> </commodity> </van-tab>
-    </van-tabs>
\ No newline at end of file
+    <van-tab title="待付款">
+        <commodity wx:for="{{WAITPAY}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}" gid="{{item.order_id}}"></commodity>
+    </van-tab>
+    <van-tab title="代发货">
+        <commodity wx:for="{{WAITSEND}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    </van-tab>
+    <van-tab title="待收货">
+        <commodity wx:for="{{WAITRECEIVE}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    </van-tab>
+    <van-tab title="已完成">
+        <commodity wx:for="{{FINISH}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    </van-tab>
+    <van-tab title="售后">
+        <commodity wx:for="{{AFTERSALE}}" wx:for-index="j" wx:key="{{j}}" num="{{item.goods_num}}" cprice="{{item.goods_price}}" freight="{{item.integral_money}}" goods="{{item.goods_list}}"></commodity>
+    </van-tab>
+</van-tabs>
\ No newline at end of file