From d8c97426a21ea12ddb71f6ee02f1bc4220b76f07 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Thu, 23 Nov 2023 15:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E5=8D=A1=E5=AF=86=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=85=91=E6=8D=A2=E6=88=90=E5=8A=9F=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8D=A1=E5=AF=86=E6=9F=A5=E7=9C=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/lookCard.html | 19 +++++++++++++------
 coupon/myOrder.html  |  2 +-
 exchange.html        | 15 ++-------------
 order.html           |  2 +-
 4 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/coupon/lookCard.html b/coupon/lookCard.html
index adba319..87d3f7f 100644
--- a/coupon/lookCard.html
+++ b/coupon/lookCard.html
@@ -9,6 +9,9 @@
     <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/vue.min.js?v=1367936144322" type="text/javascript"
         charset="utf-8"></script>
     <link rel="stylesheet" href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/lookCard.css">
+    <script type="text/javascript" src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/common/axios.js?v=1367936144322">
+    </script>
+    <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api2_0.js"></script>
 </head>
 
 <body>
@@ -35,7 +38,7 @@
                 <template v-if="cardData.card_number">
                     <div class="item item-margin">
                         <p class="title">卡号：</p>
-                        <p class="number">{{cardData.card_number}}</p>
+                        <p class="number">{{cardData.card_number||'卡密正在生成中，请稍后刷新再查看'}}</p>
                         <p class="copy" @click="copyFunction(cardData.card_number)">
                             <img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/copyNumber.png"
                                 alt="">
@@ -44,7 +47,7 @@
                     </div>
                     <div class="item">
                         <p class="title">密码：</p>
-                        <p class="number">{{cardData.card_password}}</p>
+                        <p class="number">{{cardData.card_password||'卡密正在生成中，请稍后刷新再查看'}}</p>
                         <p class="copy" @click="copyFunction(cardData.card_password)">
                             <img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/copyNumber.png"
                                 alt="">
@@ -55,7 +58,7 @@
                 <template v-else>
                     <div class="item item-margin">
                         <p class="title">卡密：</p>
-                        <p class="number">{{cardData.card_password}}</p>
+                        <p class="number">{{cardData.card_password||'卡密正在生成中，请稍后刷新再查看'}}</p>
                         <p class="copy" @click="copyFunction(cardData.card_password)">
                             <img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/copyNumber.png"
                                 alt="">
@@ -78,10 +81,14 @@
                 };
             },
 
-
-
             created () {
-                this.cardData = JSON.parse(localStorage.getItem('cardProductDetail'));
+                const orderNumber = localStorage.getItem('orderNumber');
+                /* 获取卡密详情 */
+                req.axiosGet(`/key/order/detail/${orderNumber}`).then(res => {
+                    if (res.code == 200) {
+                        this.cardData = res.data;
+                    }
+                });
             },
 
             methods: {
diff --git a/coupon/myOrder.html b/coupon/myOrder.html
index 3e00931..37a133f 100644
--- a/coupon/myOrder.html
+++ b/coupon/myOrder.html
@@ -181,7 +181,7 @@
 
                 /* 查看卡密 */
                 lookCard (item) {
-                    localStorage.setItem("cardProductDetail", JSON.stringify(item));
+                    localStorage.setItem("orderNumber", item.order_number);
                     window.location.href = './lookCard.html';
                 },
 
diff --git a/exchange.html b/exchange.html
index c414f3f..52286c6 100644
--- a/exchange.html
+++ b/exchange.html
@@ -239,24 +239,13 @@
       //刷新页面
       successchangeBtnFn () {
         if (this.goodInfo.product_type === 2 && this.goodInfo.card_show == 2) {
-          this.getCardDetails();
+          localStorage.setItem("orderNumber", this.order_number);
+          window.location.href = './coupon/lookCard.html';
         } else {
           window.location.replace(document.referrer);
         }
       },
 
-      /* 获取卡密详情 */
-      getCardDetails () {
-        req.axiosGet(`/key/order/detail/${this.order_number}`).then(res => {
-          if (res.code == 200) {
-            localStorage.setItem('cardProductDetail', JSON.stringify(res.data));
-            window.location.replace('./coupon/lookCard.html');
-          } else {
-            this.openErrorDialog(res.message);
-          }
-        });
-      },
-
       //兑换商品
       exchangeGoodsFn () {
         if (goodsDetail.available != 1) {
diff --git a/order.html b/order.html
index fa72463..304c0db 100644
--- a/order.html
+++ b/order.html
@@ -250,7 +250,7 @@
 
                 /* 查看卡密 */
                 lookCard (item) {
-                    localStorage.setItem("cardProductDetail", JSON.stringify(item));
+                    localStorage.setItem("orderNumber", item.order_number);
                     window.location.href = './coupon/lookCard.html';
                 },
 
