From b1f320f361db663a5b00ed5f512335c52967a2ae Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 8 Jun 2022 16:08:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=9A=84sql=EF=BC=8C=E5=B0=86=E5=B9=B3=E5=8F=B0id=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/coupon/couponCenter.vue                    | 2 +-
 pages/cart/coupon/couponDetail.vue                    | 2 +-
 pages/cart/coupon/index.vue                           | 2 +-
 pages/cart/coupon/myCoupon.vue                        | 4 ++--
 pages/product/product/promotion/-promotion-coupon.vue | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/cart/coupon/couponCenter.vue b/pages/cart/coupon/couponCenter.vue
index 0a48d22..0e0d7f9 100644
--- a/pages/cart/coupon/couponCenter.vue
+++ b/pages/cart/coupon/couponCenter.vue
@@ -24,7 +24,7 @@
               <view>
                 <!-- 根据scopeType 判断是否是 平台、品类或店铺  -->
                 <view v-if="item.scopeType">
-                  <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
+                  <span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
                   <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
                   <view v-else>{{  item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用</view>
                 </view>
diff --git a/pages/cart/coupon/couponDetail.vue b/pages/cart/coupon/couponDetail.vue
index 2f2a39f..66dd99b 100644
--- a/pages/cart/coupon/couponDetail.vue
+++ b/pages/cart/coupon/couponDetail.vue
@@ -14,7 +14,7 @@
       </view>
       <view class="bottom-view">
         <view class="text">• 使用平台：{{
-                    coupon.scopeType == 'ALL' && coupon.id == 'platform'
+                    coupon.scopeType == 'ALL' && coupon.storeId == '0'
                       ? "全平台"
                       : coupon.scopeType == "PORTION_CATEGORY"
                       ? "仅限品类"
diff --git a/pages/cart/coupon/index.vue b/pages/cart/coupon/index.vue
index 8d218ca..f34ce21 100644
--- a/pages/cart/coupon/index.vue
+++ b/pages/cart/coupon/index.vue
@@ -34,7 +34,7 @@
       <view class="right">
         <view class="desc">
           <view v-if="item.scopeType">
-            <span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
+            <span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
             <span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
             <view v-else
               >{{
diff --git a/pages/cart/coupon/myCoupon.vue b/pages/cart/coupon/myCoupon.vue
index 41b562c..ac59a4a 100644
--- a/pages/cart/coupon/myCoupon.vue
+++ b/pages/cart/coupon/myCoupon.vue
@@ -32,7 +32,7 @@
               <view class="content">
                 <view class="title-1">{{ coupon.title }}</view>
                 <view class="title-2">使用平台：{{
-                    coupon.scopeType == 'ALL' && coupon.id == 'platform'
+                    coupon.scopeType == 'ALL' && coupon.storeId == '0'
                       ? "全平台"
                       : coupon.scopeType == "PORTION_CATEGORY"
                       ? "仅限品类"
@@ -188,7 +188,7 @@ export default {
      * 立即使用优惠券
      */
     useItNow(item) {
-      if (item.storeId && item.storeId!='platform') {
+      if (item.storeId && item.storeId!='0') {
         uni.navigateTo({
           url: `/pages/product/shopPage?id=${item.storeId}`,
         });
diff --git a/pages/product/product/promotion/-promotion-coupon.vue b/pages/product/product/promotion/-promotion-coupon.vue
index 0948a1e..6b0936b 100644
--- a/pages/product/product/promotion/-promotion-coupon.vue
+++ b/pages/product/product/promotion/-promotion-coupon.vue
@@ -11,7 +11,7 @@
 					<view class="text">
 						<div class="coupon-List-title">
 							<view v-if="item.scopeType">
-								<span v-if="item.scopeType == 'ALL' && item.id == 'platform'">全平台</span>
+								<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
 								<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
 								<view v-else>{{
                          item.storeName == "platform" ? "全平台" : item.storeName + "店铺"
@@ -181,4 +181,4 @@
 			}
 		}
 	}
-</style>
+</style>

From 1456fd9076f77483ea91f49710188d4159caa32a Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Wed, 8 Jun 2022 16:10:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=9A=84sql=EF=BC=8C=E5=B0=86=E5=B9=B3=E5=8F=B0id=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/coupon/couponCenter.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/cart/coupon/couponCenter.vue b/pages/cart/coupon/couponCenter.vue
index 0065d94..e8806ad 100644
--- a/pages/cart/coupon/couponCenter.vue
+++ b/pages/cart/coupon/couponCenter.vue
@@ -24,7 +24,7 @@
 							<view>
 								<!-- 根据scopeType 判断是否是 平台、品类或店铺  -->
 								<view class="coupon-title wes-3" v-if="item.scopeType">
-									<span v-if="item.scopeType == 'ALL' && item.storeId == 'platform'">全平台</span>
+									<span v-if="item.scopeType == 'ALL' && item.storeId == '0'">全平台</span>
 									<span v-if="item.scopeType == 'PORTION_CATEGORY'">仅限品类</span>
 									<view v-else>{{ item.storeName == 'platform' ? '全平台' :item.storeName+'店铺' }}使用
 									</view>