DaMowang vor 2 Jahren
Ursprung
Commit
e71075afb6

+ 1 - 1
src/pages/index/index.vue

@@ -28,7 +28,7 @@
                     </div>
                     <div class="search flex_r flex_jb flex_ac">
                         <span class="iconfont">&#xe661;</span>
-                        <input v-model="searchKey" class="inp" placeholder="搜索你要的内容">
+                        <input v-model="searchKey" @confirm="toSearch" class="inp" placeholder="搜索你要的内容">
                         <span class="search_btn" @click="toSearch">搜索</span>
                     </div>
                     <div class="scan-ico iconfont">&#xe8cf;</div>

+ 2 - 2
src/pages/my/index.vue

@@ -210,7 +210,6 @@ export default {
     },
     data() {
         return {
-            token: uni.getStorageSync("token"),
             shopInfo: {}, // 商铺信息
             isShiMing: true, //未实名提示弹窗
             userinfo: {}, // 获取用户信息
@@ -227,7 +226,8 @@ export default {
         this.closeAuto(); //关闭实名功能
     },
     onShow() {
-        if (!this.token) this.login()
+        let token = uni.getStorageSync("token");
+        if (!token) this.login()
         else {
             this.getuserInfo();
             this.getchayou(); //获取茶友

+ 4 - 1
src/pagesB/components/up/index.vue

@@ -74,7 +74,10 @@ export default {
             immediate: true,
             deep: true,
             handler(str) {
-                if (str) this.imgs = JSON.parse(str)
+                if (str){
+                    if(this.count == 1) this.imgs = [str]
+                    else this.imgs = JSON.parse(str)
+                }
             }
         }
     },

+ 3 - 1
src/pagesB/my/addShop.vue

@@ -136,7 +136,9 @@ export default {
                 post("v1/merchant/apply",this.formData).then(res=>{
                     if (res.code == 0) {
                         that.$toast("提交成功,请关注审核状态")
-                        uni.navigateBack({ delta: 1 })
+                        setTimeout(() => {
+                            uni.navigateBack({ delta: 1 })
+                        }, 1500);
                     }
                 })
             })

+ 1 - 1
src/pagesB/my/shuZhiWallet.vue

@@ -2,7 +2,7 @@
   <div class='shuZhiWallet'>
         <view class="hander-top">
             <view class="icon-back-wrap" @click="onBack">
-                <image class="icon-back" src="@/pagesB/static/preview/icon-back.png" mode="widthFix" />
+                <image class="icon-back" src="@/static/preview/icon-back.png" mode="widthFix" />
             </view>
             <!-- <view class="count">数智钱包</view> -->
             <view class="capsule"></view>

+ 1 - 1
src/pagesC/settledMerchant/index.vue

@@ -111,7 +111,7 @@ export default {
     },
     onLoad(da) {
         this.getLocation();
-        if(da.key) this.navSearch(da.key)
+        if(da.key) this.navSearch(decodeURIComponent(da.key))
         else this.getList();
         this.oldKeywordList = this.getLS("oldKeywords") || [];
     },

+ 1 - 1
src/utils/myfun.js

@@ -163,6 +163,6 @@ export function toast(msg, duration) {
     uni.showToast({
         title: msg,
         icon: "none",
-        duration: duration ? duration : 1200,
+        duration: duration ? duration : 1500,
     });
 }