From 324ab3129b383cae9d12e8859f3615f212c360b4 Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Thu, 10 Nov 2022 14:27:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=89=EF=BC=9A=E5=A2=9E=E5=8A=A0wait=5Fpay=5Forder?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E6=9C=89=E6=97=A0=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/details.html | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/coupon/details.html b/coupon/details.html
index 27d7095..875152b 100644
--- a/coupon/details.html
+++ b/coupon/details.html
@@ -14,8 +14,6 @@
     <link href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/siteqiexchange/css/swiper.min.css" rel="stylesheet">
     <link rel="stylesheet" href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/details.css?v=12">
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js"></script>
-    <link rel="stylesheet" href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/payPop.css">
-    <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/payPop.js"></script>
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/modelPop.js"></script>
     <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.4.1/vconsole.min.js"></script>
 </head>
@@ -217,16 +215,12 @@
                 goodsShow: [
                     'https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220120/9bedd7af6a8a570be8f2858564f9ec6d.png'
                 ],
-                show: false,  /* 控制支付弹窗 */
-                payType: 1, /* 支付方式 */
-
                 /* 提示框状态 */
                 popShow: false,
                 popTitle: '',
                 popText: '',
                 popStatus: 1, /*1 成功 2提示 3失败 */
                 bottomText: '', /* 复制按钮 */
-                href: '',/* 支付地址 */
                 receive_time: {},
                 orderNumber: '',
                 isLogin: false,/* 是否跳登录页 */
@@ -344,6 +338,7 @@
 
         methods: {
             bindAvailable () {
+                console.log(347,goodsDetail);
                 if (goodsDetail.available != 1) {
                     this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
                     return
@@ -416,16 +411,6 @@
 
             /* 弹窗回调 */
             backFunctionPop (type) {
-                if (this.bottomText === '点击复制' && type) {
-                    var aux = document.createElement("input");
-                    aux.setAttribute("value", this.href);
-                    document.body.appendChild(aux);
-                    aux.select();
-                    document.execCommand("copy");
-                    document.body.removeChild(aux);
-                    this.openDialog('复制成功')
-                }
-
                 if (this.isLogin) {
                     this.delayedOut()
                 }
@@ -441,11 +426,16 @@
 
             //兑换商品
             exchangeGoodsFn () {
+                //wait_pay_order  1有订单  5无订单
+                if (goodsDetail.wait_pay_order == 1) {
+                    this.openErrorDialog('您有未支付的订单');
+                    return
+                }
+                if (goodsDetail.available != 1) {
+                    this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
+                    return
+                }
                 if (this.goodsDetail.type === 1 && this.goodInfo.product_type === 1) {  /* 兑换码 */
-                    if (goodsDetail.available != 1) {
-                        this.openErrorDialog(product_status(goodsDetail.available, goodsDetail));
-                        return
-                    }
                     if (!this.account) {
                         this.openDialog('请输入兑换账号！');
                         return false;
@@ -523,7 +513,6 @@
                     }
                 }
                 localStorage.setItem('account', this.reAccount);
-                // this.show = true
                 window.location.href = './settlement.html';
             },