From d101cd1b6a07458521ca288036015a2d7bc987f1 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: Fri, 30 Sep 2022 16:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B9=8B=E5=89=8D=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E6=96=B9=E6=B3=95=E5=87=BA=E9=94=99=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/deposit/index.vue | 16 ++++-------
 pages/order/myOrder.vue      |  2 +-
 utils/filters.js             | 56 +++++++++++++++++-------------------
 3 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/pages/mine/deposit/index.vue b/pages/mine/deposit/index.vue
index 85287ee..2b9bda5 100644
--- a/pages/mine/deposit/index.vue
+++ b/pages/mine/deposit/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="wap">
-    <u-navbar back-text="" title="预存款列表">
+    <u-navbar  title="预存款列表">
     </u-navbar>
     <view class="wrapper-show-money">
       <view class="money-view">
@@ -28,7 +28,7 @@
             </view>
 
             <u-empty v-if="datas.length==0" mode="history" text="暂无记录" />
-            <u-loadmore v-else bg-color='#f8f8f8' :status="status" />
+      
           </scroll-view>
 
         </swiper-item>
@@ -45,7 +45,7 @@ export default {
   data() {
     return {
       walletNum: 0,
-      status: "loadmore",
+
       current: 0,
       swiperCurrent: 0,
       userInfo: "", //用户详情信息
@@ -82,27 +82,23 @@ export default {
    
     /**分页获取预存款充值记录 */
     getRecharge() {
-      this.status = "loading";
+
       getUserRecharge(this.params).then((res) => {
         if (res.data.success) {
           if (res.data.result.records.length != 0) {
-            this.status = "loadmore";
+       
             this.datas.push(...res.data.result.records);
-          } else {
-            this.status = "nomore";
           }
         }
       });
     },
 
     getWallet() {
-      this.status = "loading";
+    
       getWalletLog(this.params).then((res) => {
         if (res.data.success) {
           if (res.data.result.records.length != 0) {
             this.datas.push(...res.data.result.records);
-          } else {
-            this.status = "nomore";
           }
         }
       });
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index a4e0996..2d1eb1c 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -331,7 +331,7 @@ export default {
         this.initData(0);
       }
     }
-    this.loadData(this.status);
+    // this.loadData(this.status);
   },
 
   onLoad(options) {
diff --git a/utils/filters.js b/utils/filters.js
index 9635a05..adec726 100644
--- a/utils/filters.js
+++ b/utils/filters.js
@@ -1,6 +1,6 @@
 import Foundation from "./Foundation.js";
 import storage from "@/utils/storage.js";
-import { getUserInfo } from '@/api/members';
+import { getUserInfo } from "@/api/members";
 import Vue from "vue";
 /**
  * 金钱单位置换  2999 --> 2,999.00
@@ -107,38 +107,36 @@ export function isLogin(val) {
   }
 }
 
-
-export function tipsToLogin(){
-if(!isLogin('auth')){
-  uni.showModal({
-    title: "提示",
-    content: "当前用户未登录是否登录？",
-    confirmText: "确定",
-    cancelText: "取消",
-    confirmColor:Vue.prototype.$mainColor,
-    success: res => {
-      if (res.confirm) {
-        navigateToLogin()
-      } else if (res.cancel) {
-        uni.navigateBack()
-      }
-    },
-  })
-    return
-	}
+export function tipsToLogin() {
+  if (!isLogin("auth")) {
+    uni.showModal({
+      title: "提示",
+      content: "当前用户未登录是否登录？",
+      confirmText: "确定",
+      cancelText: "取消",
+      confirmColor: Vue.prototype.$mainColor,
+      success: (res) => {
+        if (res.confirm) {
+          navigateToLogin();
+        } else if (res.cancel) {
+          uni.navigateBack();
+        }
+      },
+    });
+    return false;
+  }
+  return true;
 }
 
-
-
 /**
  * 获取用户信息并重新添加到缓存里面
  */
-export async function userInfo(){
-	let res = await getUserInfo();
-	if(res.data.success){
-		storage.setUserInfo(res.data.result);
-		return res.data.result 
-	}
+export async function userInfo() {
+  let res = await getUserInfo();
+  if (res.data.success) {
+    storage.setUserInfo(res.data.result);
+    return res.data.result;
+  }
 }
 
 /**
@@ -149,7 +147,7 @@ export async function userInfo(){
 
 export function forceLogin() {
   let userInfo = storage.getUserInfo();
-  if (!userInfo ||  !userInfo.id) {
+  if (!userInfo || !userInfo.id) {
     // #ifdef MP-WEIXIN
 
     uni.navigateTo({