From 8547b28d63efdfc6b4897d3a797bfde828988236 Mon Sep 17 00:00:00 2001
From: AhJindeg <AhJindeg@gmail.com>
Date: Mon, 2 Sep 2024 10:42:41 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=F0=9F=90=9E=20delete=20href.include?=
 =?UTF-8?q?s('login=3Fredirect=3D')?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/axios/service.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index aff542b0..a2ec60f0 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -206,10 +206,6 @@ const refreshToken = async () => {
 const handleAuthorized = () => {
   const { t } = useI18n()
   if (!isRelogin.show) {
-    // 如果已经到重新登录页面则不进行弹窗提示
-    if (window.location.href.includes('login?redirect=')) {
-      return
-    }
     isRelogin.show = true
     ElMessageBox.confirm(t('sys.api.timeoutMessage'), t('common.confirmTitle'), {
       showCancelButton: false,

From f750e3b41b143ddc7695ae656333b5a0a41b5be4 Mon Sep 17 00:00:00 2001
From: AhJindeg <AhJindeg@gmail.com>
Date: Tue, 3 Sep 2024 09:28:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E2=9C=A8=20add=20closeOnPressEscap?=
 =?UTF-8?q?e=20to=20ElMessageBox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/axios/service.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts
index a2ec60f0..3df813f2 100644
--- a/src/config/axios/service.ts
+++ b/src/config/axios/service.ts
@@ -211,6 +211,7 @@ const handleAuthorized = () => {
       showCancelButton: false,
       closeOnClickModal: false,
       showClose: false,
+      closeOnPressEscape: false,
       confirmButtonText: t('login.relogin'),
       type: 'warning'
     }).then(() => {

From c4fda86747df78858e9238f370e59f3f7306b436 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 3 Sep 2024 15:31:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=91=E5=95=86=E5=9F=8E=EF=BC=9A=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E8=A3=85=E4=BF=AE=E7=9A=84=E4=BB=B7=E6=A0=BC=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=20/=20100=20=E5=9C=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=90=8E=E5=8F=B0=E7=9A=84=E9=A2=84=E8=A7=88=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DiyEditor/components/mobile/ProductCard/index.vue      | 7 ++++---
 .../DiyEditor/components/mobile/ProductList/index.vue      | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/DiyEditor/components/mobile/ProductCard/index.vue b/src/components/DiyEditor/components/mobile/ProductCard/index.vue
index f05d4fa9..78ad84f3 100644
--- a/src/components/DiyEditor/components/mobile/ProductCard/index.vue
+++ b/src/components/DiyEditor/components/mobile/ProductCard/index.vue
@@ -67,15 +67,15 @@
             class="text-16px"
             :style="{ color: property.fields.price.color }"
           >
-            ￥{{ spu.price }}
+            ￥{{ fenToYuan(spu.price) }}
           </span>
           <!-- 市场价 -->
           <span
             v-if="property.fields.marketPrice.show && spu.marketPrice"
             class="ml-4px text-10px line-through"
             :style="{ color: property.fields.marketPrice.color }"
-            >￥{{ spu.marketPrice }}</span
-          >
+            >￥{{ fenToYuan(spu.marketPrice) }}
+          </span>
         </div>
         <div class="text-12px">
           <!-- 销量 -->
@@ -117,6 +117,7 @@
 <script setup lang="ts">
 import { ProductCardProperty } from './config'
 import * as ProductSpuApi from '@/api/mall/product/spu'
+import { fenToYuan } from '../../../../../utils'
 
 /** 商品卡片 */
 defineOptions({ name: 'ProductCard' })
diff --git a/src/components/DiyEditor/components/mobile/ProductList/index.vue b/src/components/DiyEditor/components/mobile/ProductList/index.vue
index 3ba63677..adbd1b67 100644
--- a/src/components/DiyEditor/components/mobile/ProductList/index.vue
+++ b/src/components/DiyEditor/components/mobile/ProductList/index.vue
@@ -54,7 +54,7 @@
               class="text-12px"
               :style="{ color: property.fields.price.color }"
             >
-              ￥{{ spu.price }}
+              ￥{{ fenToYuan(spu.price) }}
             </span>
           </div>
         </div>
@@ -65,6 +65,7 @@
 <script setup lang="ts">
 import { ProductListProperty } from './config'
 import * as ProductSpuApi from '@/api/mall/product/spu'
+import { fenToYuan } from './index'
 
 /** 商品栏 */
 defineOptions({ name: 'ProductList' })