From cf6ac8cddf9e5212344eff55c2f1405575a32c03 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Fri, 30 Sep 2022 11:38:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=E5=9B=9E=E8=B0=83=E4=B8=BA=E9=A9=BC?=
 =?UTF-8?q?=E5=B3=B0=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 v1_5_0_C/couponCollection.html |  2 +-
 v1_5_0_C/exchange.html         | 14 +++++++-------
 v1_5_0_C/modelPop.js           |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/v1_5_0_C/couponCollection.html b/v1_5_0_C/couponCollection.html
index 6091c83..5b6d505 100644
--- a/v1_5_0_C/couponCollection.html
+++ b/v1_5_0_C/couponCollection.html
@@ -241,7 +241,7 @@
 
         <!-- 弹出提示 -->
         <model-pop :show.sync="popShow" :title="popTitle" :status="popStatus" :text="popText"
-            @back_function="backFunctionPop"></model-pop>
+            @backFunction="backFunctionPop"></model-pop>
         <!-- tab -->
         <tab-component v-if="!suspension" :current="1" />
     </div>
diff --git a/v1_5_0_C/exchange.html b/v1_5_0_C/exchange.html
index 9cdea47..cb14fa3 100644
--- a/v1_5_0_C/exchange.html
+++ b/v1_5_0_C/exchange.html
@@ -23,7 +23,7 @@
     <div id="exchangePage">
         <!-- 时提框 -->
         <model-pop :show.sync="popShow" :title="popTitle" :status="popStatus" :text="popText"
-            @back_function="backFunctionPop"></model-pop>
+            @backFunction="backFunctionPop"></model-pop>
 
         <div v-if="!suspension" class="content">
             <!-- 返回模块-->
@@ -218,7 +218,7 @@
             document.title = sessionStorage.getItem('title');
             let detailsConfig = JSON.parse(sessionStorage.getItem('product_detail'));
             goodsCount = sessionStorage.getItem('goodsCount');
-            this.backAble = goodsCount > 1;//多个商品才有返回
+            this.backAble = true;//多个商品才有返回
             this.bgcolor = detailsConfig.button_color;
             this.ftColor = detailsConfig.font_color;
             this.describe = detailsConfig.describe;
@@ -255,11 +255,11 @@
             },
 
             backHandler () {
-                if (goodsCount > 1) {
-                    window.location.replace('./couponCollection.html');
-                } else {
-                    history.go(-2);
-                }
+                // if (goodsCount > 1) {
+                window.location.replace('./myOrder.html');
+                // } else {
+                //     history.go(-2);
+                // }
             },
 
             // 单条弹框
diff --git a/v1_5_0_C/modelPop.js b/v1_5_0_C/modelPop.js
index 6103dab..6081d6d 100644
--- a/v1_5_0_C/modelPop.js
+++ b/v1_5_0_C/modelPop.js
@@ -45,7 +45,7 @@ const modelPop = {
     colesFunction(type) {
       /* type 关闭方式 */
       this.$emit("update:show", false)
-      this.$emit("back_function", type)
+      this.$emit("backfunction", type)
     }
   }
 }