From 037d2c5b24903084109359e9a24b76922ce23a5d Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Wed, 15 Jun 2022 14:41:42 +0800
Subject: [PATCH] =?UTF-8?q?C=E7=AB=AF=E7=AB=8B=E5=87=8F=E9=87=91=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 exchange.html |  7 +++----
 reduce.html   | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/exchange.html b/exchange.html
index b7e72e6..a126895 100644
--- a/exchange.html
+++ b/exchange.html
@@ -68,7 +68,7 @@
         <img :src="describe.bg_image" v-show="describe.type==1&&describe.bg_image">
         <div v-html="describe.content" class="goodsTip" v-show="describe.type==3&&describe.content"></div>
       </div>
-      <button class="exchange-btn" :class="exchangeOpen?bgcolor:''"
+      <button class="exchange-btn" 
         :style="{'background': exchangeOpen?bgcolor:'#D7D7D7','color':exchangeOpen?ftcolor:'#333'}"
         @click="exchangeGoodsFn">立即兑换</button>
     </div>
@@ -118,6 +118,7 @@
   </div>
 </body>
 <script>
+  let goodsCount=null;
   new Vue({
     el: '#exchangePage',
     data() {
@@ -151,7 +152,7 @@
     created() {
       document.title = sessionStorage.getItem('title');
       let detailsConfig = JSON.parse(sessionStorage.getItem('product_detail'));
-      let goodsCount = sessionStorage.getItem('goodsCount');
+      goodsCount = sessionStorage.getItem('goodsCount');
       this.backAble = goodsCount > 1;//多个商品才有返回
       this.bgcolor = detailsConfig.button_color;
       this.ftcolor = detailsConfig.font_color;
@@ -174,7 +175,6 @@
     },
     methods: {
       backgoodsFn() {
-        let goodsCount = sessionStorage.getItem('goodsCount');
         if (goodsCount > 1) {
           window.location.replace('./homepage.html');
         } else {
@@ -287,7 +287,6 @@
             this.popboxshow = true;
             this.tiptext = res.message;
             if (res.code == -1) {
-              let goodsCount = sessionStorage.getItem('goodsCount');
               if (goodsCount > 1) {
                 setTimeout(() => {
                   window.location.replace('./homepage.html');
diff --git a/reduce.html b/reduce.html
index 2fb9107..c1a2781 100644
--- a/reduce.html
+++ b/reduce.html
@@ -12,7 +12,7 @@
   </script>
   <script src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/siteqiexchange/js/swiper.min.js"></script>
   <link href="https://lsxdemall.oss-cn-beijing.aliyuncs.com/siteqiexchange/css/swiper.min.css" rel="stylesheet" />
-  <link rel="stylesheet" href="http://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/homepage1_3_0.css" />
+  <link rel="stylesheet" href="http://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/css/homepage1_3_0.css?v=1" />
   <script src="http://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/js/api1_3_0.js"></script>
   <style>
     * {
@@ -48,6 +48,10 @@
       </div>
     </div>
     <div class="couponShow">
+      <span>
+        <img @click="backgoodsFn" v-if="backAble" class="backIcon"
+          src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/backprepageBtn.png" alt="">
+      </span>
       <div class="coupon-left">
         <p class="coupon_money">
           <span>￥</span>{{reduceInfo.reduce_amount}}
@@ -82,6 +86,7 @@
   </div>
 </body>
 <script>
+  let goodsCount=null;
   new Vue({
     el: "#reduce",
     data() {
@@ -95,6 +100,7 @@
         goodInfo: {}, //商品信息
         reduceInfo: {}, //券信息
         orderId: '',
+        backAble: true,
         tip: `1、立减金自领取之日起0天有效，请在有效期内使用<br />
             2、微信立减金自领取后每个立减金一次性使用，不兑换，不找零，到期后自动失效，逾期未使用不再补发。使用微信支付进行付款（大于立减金面额0.01元以上）即可自动抵扣<br />
             3、多张立减金可在单笔微信支付订单中一起使用，但当用户的立减金超过8张时，系统会选取其中一部分使用，不保证在一张订单中全部使用<br />
@@ -106,6 +112,8 @@
     created() {
       /*  获取立减金信息*/
       this.goodInfo = JSON.parse(sessionStorage.getItem("goodsInfo"));
+      goodsCount = sessionStorage.getItem('goodsCount');
+      this.backAble = goodsCount > 1;//多个商品才有返回
       this.reduceInfo = JSON.parse(
         sessionStorage.getItem("goodsInfo")
       ).entity;
@@ -124,6 +132,13 @@
       },
     },
     methods: {
+      backgoodsFn() {
+        if (goodsCount > 1) {
+          window.location.replace('./homepage.html');
+        } else {
+          history.go(-2);
+        }
+      },
       receiveFn() {
         let self = this;
         let data = {
@@ -155,7 +170,6 @@
             } else {
               self.openErrorDialog(res.message);
               if (res.code == -1) {
-                let goodsCount = sessionStorage.getItem("goodsCount");
                 if (goodsCount > 1) {
                   setTimeout(() => {
                     window.location.replace("./homepage.html");