513

src/components/AllorderInfo.vue

@@ -3,7 +3,7 @@
         <div class="box-con2">
             <div class="box-tit">
                 <div>
-                    <img src="/native/tabbar/icon_kapai_shangjia_da.png" alt="" />
+                    <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
                     <p>光之城卡牌</p>
                 </div>
                 <div class="box-tit-seller">{{ this.name }}</div>
@@ -30,11 +30,11 @@
             <div class="box-bor"></div>
             <div class="box-butm">
                 <div v-if="this.status == 'CREATED'" @click="cancel" class="box-but">取消订单</div>
-                <div v-if="this.status == 'CREATED'" class="box-but2">立即支付</div>
+                <div v-if="this.status == 'CREATED'" @click="pay" class="box-but2">立即支付</div>
                 <div v-if="this.status == 'PAYED'" @click="Apply" class="box-but">申请退款</div>
                 <div v-if="this.status == 'PAYED'" @click="remind" class="box-but3">提醒发货</div>
                 <div v-if="this.status == 'SEND'" @click="logistics" class="box-but">查看物流</div>
-                <div v-if="this.status == 'SEND'" class="box-but2">确认收货</div>
+                <div v-if="this.status == 'SEND'" @click="comfrim" class="box-but2">确认收货</div>
                 <div v-if="this.status == 'COMPETED'" class="box-but">申请售后</div>
                 <div v-if="this.status == 'COMPETED'" @click="logistics" class="box-but3">查看物流</div>
                 <div v-if="this.status == 'CANCELED'" @click="deletes" class="box-but">删除订单</div>
@@ -159,6 +159,64 @@ export default {
                 }
             });
         },
+        comfrim() {
+            wx.showModal({
+                title: '提示',
+                content: '确定收货？',
+                success: res => {
+                    if (res.confirm) {
+                        this.$http.post('/orderInfo/finish', { orderInfoId: this.id }).then(res => {
+                            wx.hideLoading();
+                            wx.showToast({
+                                icon: 'none',
+                                title: '收货成功'
+                            });
+                            setTimeout(() => {
+                                this.refreash();
+                            }, 1000);
+                        });
+                    }
+                }
+            });
+        },
+        pay() {
+            wx.showLoading({
+                title: '加载中'
+            });
+            this.$http
+                .get('/payDelegation/wxPay', {
+                    orderId: this.id
+                })
+                .then(res => {
+                    res.package = res.packageValue;
+                    // console.log(res);
+                    wx.requestPayment({
+                        ...res,
+                        success: () => {
+                            wx.hideLoading();
+                            wx.showToast({
+                                title: '支付成功'
+                            });
+                            this.refreash();
+                        },
+                        fail: e => {
+                            console.log(e);
+                            wx.hideLoading();
+                            wx.showToast({
+                                icon: 'none',
+                                title: '支付失败'
+                            });
+                        }
+                    });
+                })
+                .catch(e => {
+                    wx.hideLoading();
+                    wx.showToast({
+                        title: e.error,
+                        icon: 'none'
+                    });
+                });
+        },
         cancel() {
             wx.showModal({
                 title: '提示',

src/pages/confirmorder.vue

@@ -30,7 +30,7 @@
         </div>
         <img src="../static/imgs/img_dizhitiao@3x.png" alt="" />
         <div class="box-tit">
-            <img src="/native/tabbar/icon_kapai_shangjia_da.png" alt="" />
+            <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
             <p>光之城卡牌</p>
         </div>
         <div v-for="(item, index) in Boxes" :key="index.id">
@@ -118,7 +118,7 @@ export default {
                 });
                 return;
             }
-            this.showLoading();
+            // this.showLoading();
             this.$http
                 .post('/orderInfo/createOrderInfo', {
                     caseId: this.caseId,
@@ -378,7 +378,6 @@ export default {
                 font-weight: bold;
                 color: #000000;
                 line-height: 20px;
-                min-width: 70px;
             }
             .box-buttom-p {
                 height: 22px;

src/pages/orderdetails.vue

@@ -41,7 +41,7 @@
         <div class="box-bg"></div>
         <div class="box-tit">
             <div>
-                <img src="/native/tabbar/icon_kapai_shangjia_da.png" alt="" />
+                <img src="/native/tabbar/icon_kapai_shangjia_da@3x.png" alt="" />
                 <p>光之城卡牌</p>
             </div>
             <div class="box-tit-seller">联系卖家</div>
@@ -104,26 +104,26 @@
                     <p>订单编号</p>
                     <div class="box-footer-cr">
                         <span @click="orderCopy">复制</span>
-                        <p class="box-footer-p">2019052035464</p>
+                        <p class="box-footer-p">{{ status.transactionId }}</p>
                     </div>
                 </div>
             </div>
             <div class="box-footer">
                 <div class="box-footer-con">
                     <p>创建时间</p>
-                    <p class="box-footer-p">{{ cardCaseInfo.createdAt }}</p>
+                    <p class="box-footer-p">{{ status.createdAt }}</p>
                 </div>
             </div>
             <div class="box-footer">
                 <div class="box-footer-con">
                     <p>付款时间</p>
-                    <p class="box-footer-p">2021-05-20 07:54:36</p>
+                    <p class="box-footer-p">{{ status.paidTime }}</p>
                 </div>
             </div>
             <div class="box-footer">
                 <div class="box-footer-con">
                     <p>成交时间</p>
-                    <p class="box-footer-p">2021-05-20 07:54:46</p>
+                    <p class="box-footer-p">{{ status.paidTime }}</p>
                 </div>
             </div>
         </div>
@@ -476,18 +476,18 @@ export default {
             });
         },
         orderCopy() {
-            // wx.setClipboardData({
-            //     data: this.orderInfoId + '',
-            //     success(res) {
-            //         wx.getClipboardData({
-            //             success(res) {
-            //                 wx.showToast({
-            //                     title: '订单单号复制成功'
-            //                 });
-            //             }
-            //         });
-            //     }
-            // });
+            wx.setClipboardData({
+                data: this.status.transactionId + '',
+                success(res) {
+                    wx.getClipboardData({
+                        success(res) {
+                            wx.showToast({
+                                title: '订单单号复制成功'
+                            });
+                        }
+                    });
+                }
+            });
         },
         logisticCopy() {
             wx.setClipboardData({