From 206c77f857775a9cbb65a4fef38dd2cb95f6cb1d Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Tue, 19 Mar 2024 14:43:38 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=9B=9E=E8=B0=83=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index abaca27..2427271 100644
--- a/index.html
+++ b/index.html
@@ -217,7 +217,7 @@
             // 统一跳转逻辑判断
             gotoPage(data, type) {
                 // 微信授权回调地址 
-                let wxauth_url = "https://openapi.1688sup.com/wechat/oauth";
+                let wxauth_url = "https://22233.cn/wechat/oauth";
                 // 第一步：判断是否是 微信静默授权 是 -> 拼接回调地址
                 if (data.is_have_webview_voucher) {
                     // 第二步：判断是否是包码 是 -> 走包码回调地址

From 0325454c9fa4f17ec47c948e83512f245d1a5e53 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Tue, 19 Mar 2024 16:06:54 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 2427271..abaca27 100644
--- a/index.html
+++ b/index.html
@@ -217,7 +217,7 @@
             // 统一跳转逻辑判断
             gotoPage(data, type) {
                 // 微信授权回调地址 
-                let wxauth_url = "https://22233.cn/wechat/oauth";
+                let wxauth_url = "https://openapi.1688sup.com/wechat/oauth";
                 // 第一步：判断是否是 微信静默授权 是 -> 拼接回调地址
                 if (data.is_have_webview_voucher) {
                     // 第二步：判断是否是包码 是 -> 走包码回调地址

From 09255aba7dfdaedd9243fbf6a488ef96c9581ea1 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Tue, 19 Mar 2024 16:20:25 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E7=A6=81=E6=AD=A2toDetails?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/myOrder.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/coupon/myOrder.html b/coupon/myOrder.html
index 986d93a..77d04ca 100644
--- a/coupon/myOrder.html
+++ b/coupon/myOrder.html
@@ -227,7 +227,8 @@
                 },
 
                 /* 立即支付按钮 */
-                immediatelyPay(item) {
+                immediatelyPay(item, event) {
+                    event.stopPropagation();
                     localStorage.setItem('goodsInfo', JSON.stringify(item));
                     window.location.href = `./settlement.html?orderNumber=${item.order_number}&payType=${item.pay_type}`;
                 },

From 5a099c9469fdc2275328ca176c4928146f1239fe Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Tue, 19 Mar 2024 16:29:41 +0800
Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=20=E9=98=BB=E6=AD=A2=E4=BA=8B=E4=BB=B6=E5=86=92?=
 =?UTF-8?q?=E6=B3=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/myOrder.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/coupon/myOrder.html b/coupon/myOrder.html
index 77d04ca..2a349e0 100644
--- a/coupon/myOrder.html
+++ b/coupon/myOrder.html
@@ -28,7 +28,8 @@
             <img v-show='!!loadShowHeight' class='img-lodging'
                 src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/img-logding.png" alt="">
             <div class="content" slot="content" @scroll="scrollBottom($event)">
-                <div class="content-item" v-for="item in orderList" :key="item.order_number" @click="toDetails(item)">
+                <div class="content-item" v-for="item in orderList" :key="item.order_number"
+                    @click.stop="toDetails(item)">
                     <div class="top">
                         <p class="time">{{item.update_time}}</p>
                         <p class="status" :style="{color:statusColor(item.status)}">{{item.status_text}}
@@ -191,7 +192,7 @@
                 },
 
                 /*跳转详情*/
-                toDetails(order) {
+                toDetails(order, event) {
                     sessionStorage.setItem('orderNumber', order.order_number);
                     switch (order.goods.product_type) {
                         case 1:
@@ -227,8 +228,7 @@
                 },
 
                 /* 立即支付按钮 */
-                immediatelyPay(item, event) {
-                    event.stopPropagation();
+                immediatelyPay(item) {
                     localStorage.setItem('goodsInfo', JSON.stringify(item));
                     window.location.href = `./settlement.html?orderNumber=${item.order_number}&payType=${item.pay_type}`;
                 },

From bfa77829f8a9a8bea08701d4dc8a0b32d60fc921 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Tue, 19 Mar 2024 16:31:45 +0800
Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E9=98=BB=E6=AD=A2=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=86=92=E6=B3=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/myOrder.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coupon/myOrder.html b/coupon/myOrder.html
index 2a349e0..78a8cca 100644
--- a/coupon/myOrder.html
+++ b/coupon/myOrder.html
@@ -50,7 +50,7 @@
                         <!-- 立即支付 -->
                         <div v-if="item.status==6" class="cancel-pay">
                             <p class="button" @click="immediatelyCancel(item)">取消订单</p>
-                            <p class="button" @click="immediatelyPay(item)">立即支付</p>
+                            <p class="button" @click.stop="immediatelyPay(item)">立即支付</p>
                         </div>
                         <template v-if="item.type==2">
                             <!-- 立减金待领取 -->

From dd6f91e05cc886f9616a63abb77346c7bcabc893 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Tue, 19 Mar 2024 16:34:42 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/myOrder.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/coupon/myOrder.html b/coupon/myOrder.html
index 78a8cca..677fa5b 100644
--- a/coupon/myOrder.html
+++ b/coupon/myOrder.html
@@ -49,19 +49,19 @@
                         <p class="money">实付金额：￥<span>{{item.pay_amount}}</span></p>
                         <!-- 立即支付 -->
                         <div v-if="item.status==6" class="cancel-pay">
-                            <p class="button" @click="immediatelyCancel(item)">取消订单</p>
+                            <p class="button" @click.stop="immediatelyCancel(item)">取消订单</p>
                             <p class="button" @click.stop="immediatelyPay(item)">立即支付</p>
                         </div>
                         <template v-if="item.type==2">
                             <!-- 立减金待领取 -->
-                            <p class="button" @click="receiveFn(item)" v-if="item.status==0">去兑换</p>
+                            <p class="button" @click.stop="receiveFn(item)" v-if="item.status==0">去兑换</p>
                             <!-- 立减金领取过期 -->
-                            <p class="button filter" @click="receiveFn(item)" v-if="item.status==5">去兑换
+                            <p class="button filter" @click.stop="receiveFn(item)" v-if="item.status==5">去兑换
                             </p>
                         </template>
                         <template v-if="item.type==1">
                             <!-- 查看卡密 -->
-                            <p class="button-card" @click="lookCard(item)"
+                            <p class="button-card" @click.stop="lookCard(item)"
                                 v-if="item.status==2&&item.goods.product_type==2&&item.goods.card_show==2">查看卡密</p>
                             <!-- 款项状态 -->
                             <p class="pay_status" v-if="[2,3].includes(item.pay_status)&&item.status==3">

From de7986c47df38cbea6ab15835a47e4017befd686 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Tue, 19 Mar 2024 17:23:11 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/myOrder.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/coupon/myOrder.html b/coupon/myOrder.html
index 677fa5b..487d14a 100644
--- a/coupon/myOrder.html
+++ b/coupon/myOrder.html
@@ -192,7 +192,9 @@
                 },
 
                 /*跳转详情*/
-                toDetails(order, event) {
+                toDetails(order) {
+                    if (order.status === 4 || order.status === 6) return;
+
                     sessionStorage.setItem('orderNumber', order.order_number);
                     switch (order.goods.product_type) {
                         case 1:

From 1b9a52c844763666b9761dd8134a7e1efd733750 Mon Sep 17 00:00:00 2001
From: zhangds <c664256297@163.com>
Date: Tue, 19 Mar 2024 17:55:37 +0800
Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/details.html | 48 +++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/coupon/details.html b/coupon/details.html
index 0701538..1405aad 100644
--- a/coupon/details.html
+++ b/coupon/details.html
@@ -215,7 +215,7 @@
     let goodsCount = null, goodsDetail = null;
     new Vue({
         el: '#exchangePage',
-        data () {
+        data() {
             return {
                 account: '',
                 reAccount: '',
@@ -253,7 +253,7 @@
 
 
         filters: {
-            cardType (val) {
+            cardType(val) {
                 return val.map((item) => {
                     return item == 1 ? "借记卡" : "信用卡" + " ";
                 }).join(" ");
@@ -261,17 +261,17 @@
         },
 
         watch: {
-            account (va) {
+            account(va) {
                 va && this.watchAccount();
             },
 
-            reAccount (va) {
+            reAccount(va) {
                 va && this.watchAccount();
             },
 
             productType: {
                 immediate: true,
-                handler (newVal) {
+                handler(newVal) {
                     this.maxlen = 50;
                     this.acctype = "text";
                     switch (Number(newVal)) {
@@ -345,15 +345,17 @@
             modelPop
         },
 
-        created () {
+        created() {
             /* 配置信息 */
             document.title = localStorage.getItem('title');
             let detailsConfig = JSON.parse(localStorage.getItem('product_detail'));
             goodsCount = localStorage.getItem('goodsCount');
             this.backAble = goodsCount > 1;//多个商品才有返回
-            this.bgcolor = detailsConfig.button_color;
-            this.ftColor = detailsConfig.font_color;
-            this.describe = detailsConfig.describe;
+            if (detailsConfig) {
+                this.bgcolor = detailsConfig.button_color;
+                this.ftColor = detailsConfig.font_color;
+                this.describe = detailsConfig.describe;
+            }
 
             //商品详情
             goodsDetail = JSON.parse(localStorage.getItem('goodsInfo'));
@@ -364,18 +366,18 @@
 
         computed: {
             /* 手机号验证 */
-            computedAccount () {
+            computedAccount() {
                 return /^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(this.account);
             },
 
             /* 兑换按钮验证 */
-            computedExChange () {
+            computedExChange() {
                 return this.exchangeOpen || (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2) || this.goodInfo.is_e_card && this.computedAccount && this.jd_code.length === 6;
             }
         },
 
         methods: {
-            bindAvailable () {
+            bindAvailable() {
                 if (goodsDetail.wait_pay_order == 1) {
                     this.openErrorDialog('您有未支付的订单');
                     return;
@@ -387,7 +389,7 @@
             },
 
             /* 获取京东E卡短信 */
-            sendJDSms () {
+            sendJDSms() {
                 if (this.cunt === 60) {
                     req.axiosPost('/key/order/jdSendSms', { code_batch_id: this.goodsDetail.code_batch_id, mobile: this.account })
                         .then((res) => {
@@ -408,7 +410,7 @@
             },
 
             /* 请求详情 */
-            getDetails (goods_id, code_batch_id) {
+            getDetails(goods_id, code_batch_id) {
                 const token = localStorage.getItem('token');
                 return new Promise((resolve, reject) => {
                     req.axiosPost(`/key/product_detail/${goods_id}`, { token, code_batch_id }).then(({ code, data, message }) => {
@@ -452,11 +454,11 @@
             },
 
             /* 跳转订单 */
-            toOrder () {
+            toOrder() {
                 window.location.replace('./myOrder.html');
             },
 
-            openErrorDialog (tip, bottomText) {
+            openErrorDialog(tip, bottomText) {
                 this.popTitle = '温馨提示';
                 this.popText = tip;
                 this.popStatus = 2;
@@ -464,7 +466,7 @@
                 this.bottomText = bottomText;
             },
 
-            backHandler () {
+            backHandler() {
                 if (goodsCount > 1) {
                     window.location.replace('./couponCollection.html');
                 } else {
@@ -473,7 +475,7 @@
             },
 
             // 单条弹框
-            openDialog (tip) {
+            openDialog(tip) {
                 this.promtshow = true;
                 this.promttip = tip;
                 setTimeout(() => {
@@ -483,14 +485,14 @@
             },
 
             /* 弹窗回调 */
-            backFunctionPop (type) {
+            backFunctionPop(type) {
                 if (this.isLogin) {
                     this.delayedOut();
                 }
             },
 
             /* 延时自动退出 */
-            delayedOut (time = 1) {
+            delayedOut(time = 1) {
                 let entryLink = localStorage.getItem('entryLink');
                 setTimeout(() => {
                     window.location.replace(entryLink);
@@ -498,7 +500,7 @@
             },
 
             //兑换商品
-            exchangeGoodsFn () {
+            exchangeGoodsFn() {
                 //wait_pay_order  1有订单  5无订单
                 if (goodsDetail.wait_pay_order == 1) {
                     this.openErrorDialog('您有未支付的订单');
@@ -603,7 +605,7 @@
                 window.location.href = './settlement.html';
             },
 
-            focusFn (a) {
+            focusFn(a) {
                 let ele = document.querySelector('.ipt-acc');
                 setTimeout(function () {
                     ele.scrollIntoView(false);
@@ -612,7 +614,7 @@
                 }, 400);
             },
             /* 监听账号 */
-            watchAccount () {
+            watchAccount() {
                 if ((this.account === this.reAccount) && this.account) {
                     this.exchangeOpen = true;
                 } else {