From d9ac9eb2eb99e742c3e30eb3f97d49f27dd7e5e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Thu, 25 Aug 2022 12:46:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/set/editionIntro.vue                      |  2 +-
 pages/mine/set/setUp.vue                             | 10 ++++++++--
 pages/order/afterSales/afterSales.vue                |  1 +
 pages/order/afterSales/afterSalesDetail.vue          |  6 ------
 pages/tabbar/home/template/tpl_banner.vue            |  2 +-
 pages/tabbar/home/template/tpl_promotions_detail.vue |  4 +++-
 utils/request.js                                     |  2 +-
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pages/mine/set/editionIntro.vue b/pages/mine/set/editionIntro.vue
index 8109206..4e90bdd 100644
--- a/pages/mine/set/editionIntro.vue
+++ b/pages/mine/set/editionIntro.vue
@@ -29,7 +29,7 @@
 
       <view>
         <view style="margin:20rpx 0; color:#003a8c;" @click="navigateTo('/pages/mine/help/tips?type=user')">《{{config.name}}用户协议》</view>
-        <view>CopyRight @{{config.name}} </view>
+        <view>CopyRight ©{{config.name}} </view>
       </view>
     </view>
   </view>
diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue
index 176cd23..df48137 100644
--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -65,8 +65,14 @@ export default {
      * 清除缓存重新登录
      */
     async confirm() {
-      await logout();
-      this.clear();
+			try{
+				await logout();
+				this.clear();
+			}catch(e){
+				//TODO handle the exception
+				this.clear();
+			}
+      
     },
 
     /**
diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue
index 15b41c4..9fcdac3 100644
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -125,6 +125,7 @@
             <div class="sale" v-if="current === 0 && sku.afterSaleStatus">
               <div
                 v-if="
+									order.flowPrice != 0 &&
                   sku.afterSaleStatus.includes('NOT_APPLIED') ||
                   sku.afterSaleStatus.includes('PART_AFTER_SALE')
                 "
diff --git a/pages/order/afterSales/afterSalesDetail.vue b/pages/order/afterSales/afterSalesDetail.vue
index 5f12746..50f8b4d 100644
--- a/pages/order/afterSales/afterSalesDetail.vue
+++ b/pages/order/afterSales/afterSalesDetail.vue
@@ -335,12 +335,6 @@ export default {
             type: "error",
           });
           return false;
-        } else if (checkBankno(this.form.bankAccountNumber) === false) {
-          this.$refs.uToast.show({
-            title: "银行卡卡号不正确",
-            type: "error",
-          });
-          return false;
         } else if (this.$u.test.chinese(this.form.bankAccountName) === false) {
           this.$refs.uToast.show({
             title: "银行开户名输入错误",
diff --git a/pages/tabbar/home/template/tpl_banner.vue b/pages/tabbar/home/template/tpl_banner.vue
index d1bd2f8..128f847 100644
--- a/pages/tabbar/home/template/tpl_banner.vue
+++ b/pages/tabbar/home/template/tpl_banner.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="layout">
     <div class="box">
-      <u-swiper @click="clickSwiper" interval="5000" duration="500" height="300" v-if="res" name="img" :list="res.list">
+      <u-swiper @click="clickSwiper" interval="5000" duration="500" height="350" v-if="res" name="img" :list="res.list">
         <u-loading slot="loading"></u-loading>
       </u-swiper>
     </div>
diff --git a/pages/tabbar/home/template/tpl_promotions_detail.vue b/pages/tabbar/home/template/tpl_promotions_detail.vue
index 0939658..bc146cc 100644
--- a/pages/tabbar/home/template/tpl_promotions_detail.vue
+++ b/pages/tabbar/home/template/tpl_promotions_detail.vue
@@ -39,8 +39,10 @@
               :key="_index"
             >
               <div class="item-img-box">
-                <img
+                <u-image
                   class="item-img"
+                  width="156rpx"
+                  height="156rpx"
                   :src="i.thumbnail ? i.thumbnail : i.goodsImage"
                   alt
                 />
diff --git a/utils/request.js b/utils/request.js
index a05d24e..d8e112e 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -121,7 +121,7 @@ http.interceptors.response.use(
       if (!isRefreshing) {
         console.log('旧token', token)
         isRefreshing = true;
-        let oldRefreshToken = storage.getRefreshToken();
+		let oldRefreshToken = storage.getRefreshToken();
         //调用刷新token的接口
         return refreshTokenFn(oldRefreshToken)
           .then((res) => {