From 9b92d7ac4c562d0d726420ba4bdada9d2a25a98a Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 8 Nov 2022 18:51:19 +0800
Subject: [PATCH] bug

---
 src/project/tianfuxing/AppHome/AddMerchants.vue | 4 ++--
 src/project/tianfuxing/AppHome/AppHome.vue      | 8 ++++++--
 src/project/tianfuxing/AppHome/StoreDetail.vue  | 2 +-
 src/project/tianfuxing/AppMy/AddDiscounts.vue   | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/project/tianfuxing/AppHome/AddMerchants.vue b/src/project/tianfuxing/AppHome/AddMerchants.vue
index 4a6b231..2908a61 100644
--- a/src/project/tianfuxing/AppHome/AddMerchants.vue
+++ b/src/project/tianfuxing/AppHome/AddMerchants.vue
@@ -173,8 +173,8 @@
               title: '温馨提示',
               content: '提交申请成功，请等待后台审核！'
             }).then(() => {
-              wx.navigateBack()
-            })
+              uni.navigateBack()
+            }).catch(() => {})
           }
         })
       },
diff --git a/src/project/tianfuxing/AppHome/AppHome.vue b/src/project/tianfuxing/AppHome/AppHome.vue
index 8265d1a..b21c03a 100644
--- a/src/project/tianfuxing/AppHome/AppHome.vue
+++ b/src/project/tianfuxing/AppHome/AppHome.vue
@@ -27,7 +27,7 @@
           <span>文明榜单</span>
         </div>
       </div>
-      <swiper class="banner" indicatorDots circular :autoplay="true" :interval="5000">
+      <swiper class="banner" indicatorDots circular :autoplay="true" :interval="5000" v-if="bannerList.length">
 				<swiper-item v-for="(item, index) in bannerList" :key="index">
           <image :src="item.imgUrl" mode="aspectFill" />
 				</swiper-item>
@@ -99,6 +99,11 @@
       ...mapState(['user', 'token'])
     },
 
+    onShow () {
+      this.isMore = false
+      this.getList()
+    },
+
     onLoad () {
       if (!this.token) {
         this.autoLogin()
@@ -106,7 +111,6 @@
         this.getUserInfo()
       }
 
-      this.getList()
       this.getBannerList()
     },
 
diff --git a/src/project/tianfuxing/AppHome/StoreDetail.vue b/src/project/tianfuxing/AppHome/StoreDetail.vue
index 275f941..2c1b7bc 100644
--- a/src/project/tianfuxing/AppHome/StoreDetail.vue
+++ b/src/project/tianfuxing/AppHome/StoreDetail.vue
@@ -10,7 +10,7 @@
     <div class="back-wrapper" @click="back" v-show="!isFixed" :style="{marginTop : statusBarHeight + 'px'}">
       <image src="/static/img/left.png"/>
     </div>
-    <image class="banner" :src="info.merchantPhoto || 'https://jisheng-xiaochengxu.oss-cn-hangzhou.aliyuncs.com/admin/5bad9165-fa6e-4c81-894d-2beae426260b.png'" />
+    <image class="banner" :src="info.merchantInfo.merchantPhoto" />
     <div class="wrapper">
       <div class="top">
         <image :src="info.merchantInfo.photoUrl" />
diff --git a/src/project/tianfuxing/AppMy/AddDiscounts.vue b/src/project/tianfuxing/AppMy/AddDiscounts.vue
index bf2fa39..a4096e9 100644
--- a/src/project/tianfuxing/AppMy/AddDiscounts.vue
+++ b/src/project/tianfuxing/AppMy/AddDiscounts.vue
@@ -2,7 +2,7 @@
   <div class="AddDiscounts">
     <div class="form">
       <input placeholder="输入优惠内容标题" v-model="title" placeholder-style="color: #999; font-size: 15px;" />
-      <textarea placeholder="输入优惠内容详情" v-model="content" placeholder-class="input-placeholder" placeholder-style="color: #999; font-size: 15px;" />
+      <textarea placeholder="输入优惠内容详情" :maxlength="1000" v-model="content" placeholder-class="input-placeholder" placeholder-style="color: #999; font-size: 15px;" />
     </div>
     <div class="btn-wrapper">
       <div class="btn" hover-class="text-hover" @click="save">发布</div>