From befa09d2f39e0ed0fadf2643bc34e13796de3d16 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Thu, 29 Sep 2022 16:35:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95)?=
 =?UTF-8?q?=EF=BC=9A=E5=AF=B9=E6=8E=A5=E6=94=AF=E4=BB=98=E5=AE=9D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v1_5_0_C/myOrder.html | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/v1_5_0_C/myOrder.html b/v1_5_0_C/myOrder.html
index 47e77e8..85a599f 100644
--- a/v1_5_0_C/myOrder.html
+++ b/v1_5_0_C/myOrder.html
@@ -31,9 +31,7 @@
                     </p>
                 </div>
                 <div class="middle">
-                    <img :src="item.show_url" alt="" v-if="item.type===1">
-                    <img :src="`http://lsxdemall.oss-cn-beijing.aliyuncs.com/commonproductlogo/${item.pay_type===1?'zfbreduce':'wxreduce'}.png`"
-                        alt="" v-else>
+                    <img :src="item.show_url" alt="">
                     <div class="right">
                         <div class="title_originalPrice">
                             <p class="title">{{item.product_name}}</p>
@@ -58,6 +56,7 @@
 
         <!-- 支付弹窗 -->
         <pay-pop :show.sync="show" :active="active" @payFunction="payFunction" :money="activeOrder.pay_amount" />
+        <div></div>
     </div>
 
     <script>
@@ -70,7 +69,7 @@
                     limit: 50,
                     page: 1,
                     orderList: [],
-                    activeOrder: {}
+                    activeOrder: {},
                 }
             },
 
@@ -116,15 +115,18 @@
                     window.location.replace('./couponCollection.html');
                 },
 
-                /* 立即支付 */
+                /* 立即支付按钮 */
                 immediatelyPay (item) {
                     this.activeOrder = item;
                     this.show = true
+                    this.active = item.pay_type === 5 ? 1 : 2
                 },
 
                 /* 去支付 */
                 payFunction ({ payType, isSupport }) {
-                    this.active = payType
+                    /* payType 1:微信 2:支付宝 */
+                    /* 后端 微信是5 */
+                    this.active = payType === 2 ? 1 : 5
                     this.show = false
                     /* 判断浏览器 */
                     if (isSupport) {
@@ -134,10 +136,28 @@
                         this.popShow = true
                         return
                     }
-                    /* 请求支付 */
-                    req.axiosPut(`/key/order/setPayType/${this.activeOrder.order_number}/${payType}`).then(({ data, code }) => {
+
+                    /* 设置支付类型 */
+                    if (this.active !== this.activeOrder.pay_type) { /* 支付类型是否变化 */
+                        req.axiosPut(`/key/order/setPayType/${this.activeOrder.order_number}/${this.active}`).then(({ code }) => {
+                            if (code === 200) {
+                                this.getOrderList()
+                                this.payRealFunction()
+                            }
+                        })
+                    } else {
+                        this.payRealFunction()
+                    }
+                },
+
+                /* 调用支付 */
+                payRealFunction () {
+                    req.axiosGet(`/key/coupon/createPay/${this.activeOrder.order_number}`).then(({ code, data }) => {
                         if (code === 200) {
-                            console.log(data);
+                            const div = document.createElement('div')//创建div
+                            div.innerHTML = data//将返回的form 放入div
+                            document.body.appendChild(div);
+                            document.forms[0].submit();
                         }
                     })
                 },