From b68be4a41beae35286352e408d2d6430a1c0bb0e Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Fri, 12 Sep 2025 09:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8uni.loading=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/dev.js                                 |  2 +-
 pages/index/index.vue                         |  7 ++-
 pages/lease/lease.vue                         | 20 ++++---
 pages/login/login.vue                         | 29 +++++++----
 .../realNameAuthentication.vue                | 13 ++---
 pages/test/test.vue                           | 52 +++++++++----------
 utils/request.js                              |  2 +-
 7 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/config/dev.js b/config/dev.js
index 5e761df..23fba98 100644
--- a/config/dev.js
+++ b/config/dev.js
@@ -2,7 +2,7 @@
 export const DEV_CONFIG = {
   // 临时token，用于开发测试
   TEMP_TOKEN:
-    'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjIwZGUwMWIxLTYyZTMtNDZiNi04ZDY2LWM5MGNkMzk0MzBkZSJ9.3XuGxoM7Q4sQBt7UJXYgHG_FWI88unIsvq7ni-Jg5_UDpgjLa7SaM-ZDIgWQw73r-Jrs37g5ubahxTa8aiZTkA',
+    'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjViMTMzOTU5LWRkOGYtNDUwZS1hNDNmLTQyNTZmNzljNjU4YyJ9.vEal-nq4biYni9F3YhBr6pt6mEepOYFQzlSeERQ-Ft_YejklpzmjhvIF9nO3PkjS7F5ns4unIUt8Ov0JEWnY2Q',
 
   // 是否使用临时token
   USE_TEMP_TOKEN: true,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5f02f60..9213645 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -341,9 +341,12 @@ export default {
         }
 
         console.log('续费数据:', renewData)
-
+        uni.showLoading({
+          title: '正在生成续费订单',
+          mask: 'true',
+        })
         const response = await renewDevice(renewData)
-
+        uni.hideLoading()
         if (response.code === 200) {
           const data = response.data
           const wxpPayParams = data.payParams
diff --git a/pages/lease/lease.vue b/pages/lease/lease.vue
index fae5dfc..8c24253 100644
--- a/pages/lease/lease.vue
+++ b/pages/lease/lease.vue
@@ -170,7 +170,6 @@
         </view>
       </view>
     </uv-popup>
-    <uv-toast ref="toast"></uv-toast>
   </view>
 </template>
 
@@ -481,15 +480,20 @@ export default {
         content: `确认支付 ¥${this.payAmount} 吗？\n\n${this.formData.quantity}台${this.formData.equipment}\n周期：${this.formData.period}`,
         success: async res => {
           if (res.confirm) {
-            this.$refs.toast.show({
-              type: 'loading',
-              message: '正在提交订单中...',
-              overlay: true, // 启用遮罩
-              duration: 10000,
+            // this.$refs.toast.show({
+            //   type: 'loading',
+            //   message: '正在提交订单中...',
+            //   overlay: true, // 启用遮罩
+            //   duration: 10000,
+            // })
+            uni.showLoading({
+              title: '正在生成订单',
+              mask: 'true',
             })
             // 这里可以调用支付API
             const response = await createLeaseOrder(this.formData)
-            this.$refs.toast.hide()
+            // this.$refs.toast.hide()
+            uni.hideLoading()
             if (response.code === 200) {
               const data = response.data
               console.log(data)
@@ -520,7 +524,7 @@ export default {
                 fail: function (res) {
                   uni.showToast({
                     title: '支付失败',
-                    icon: 'fail',
+                    icon: 'error',
                   })
                 },
                 complete: function (res) {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index f998c04..42c0e3f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -79,10 +79,11 @@
 
 <script>
 import { wxLogin } from '@/api/auth/auth.js'
-import { forceHideLoading } from '@/utils/request.js'
+// import { forceHideLoading } from '@/utils/request.js'
 import { getServiceTerms, getPrivacyPolicy } from '@/api/article/article.js'
 import { commonEnum } from '../../enum/commonEnum'
 import { getNavBarHeight, getTitleBarHeight } from '../../utils/system'
+import { mapState } from 'vuex'
 
 export default {
   data() {
@@ -121,7 +122,7 @@ export default {
   },
 
   onUnload() {
-    forceHideLoading()
+    // forceHideLoading()
     if (this.pageLoading) {
       this.pageLoading.destroy()
     }
@@ -227,7 +228,7 @@ export default {
 
     async Login() {
       console.log('开始登录流程')
-      this.showLoading()
+      // this.showLoading()
 
       try {
         // 1. 未同意显示协议确认弹窗
@@ -235,6 +236,10 @@ export default {
           const confirmed = await this.showLoginConfirmation()
           if (!confirmed) return
         }
+        uni.showLoading({
+          title: '登录中',
+          mask: 'true',
+        })
 
         // 2. 获取微信登录code
         const wxCode = await this.getWxLoginCode()
@@ -242,25 +247,27 @@ export default {
         // 3. 执行登录请求
         const loginResult = await this.executeLogin(wxCode)
 
+        uni.hideLoading()
+
         // 4. 处理登录成功
         this.handleLoginSuccess(loginResult)
       } catch (error) {
         this.handleLoginError(error)
       } finally {
-        this.hideLoading()
+        // this.hideLoading()
       }
     },
 
     // 显示加载状态
-    showLoading() {
-      this.pageLoading?.show('登录中...')
-    },
+    // showLoading() {
+    //   this.pageLoading?.show('登录中...')
+    // },
 
     // 隐藏加载状态
-    hideLoading() {
-      this.pageLoading?.hide()
-      forceHideLoading()
-    },
+    // hideLoading() {
+    //   this.pageLoading?.hide()
+    //   forceHideLoading()
+    // },
 
     // 显示登录确认弹窗
     showLoginConfirmation() {
diff --git a/pages/realNameAuthentication/realNameAuthentication.vue b/pages/realNameAuthentication/realNameAuthentication.vue
index d2e4459..a1b0098 100644
--- a/pages/realNameAuthentication/realNameAuthentication.vue
+++ b/pages/realNameAuthentication/realNameAuthentication.vue
@@ -81,15 +81,12 @@ export default {
     async getshuaxin() {
       try {
         // 显示加载Toast（30秒超时自动隐藏）
-        this.$refs.toast.show({
-          type: 'loading',
-          message: '正在刷新实名信息...',
-          overlay: true,
-          duration: 30000,
+        uni.showLoading({
+          title: '正在刷新实名信息',
+          mask: 'true',
         })
-
         const res = await refreshRealName()
-        this.$refs.toast.hide()
+        uni.hideLoading()
 
         if (res.code === 200) {
           this.handleRefreshSuccess(res.data)
@@ -97,7 +94,7 @@ export default {
           this.handleRefreshFail(res.msg || '人脸认证失败')
         }
       } catch (error) {
-        this.$refs.toast.hide()
+        uni.hideLoading()
         this.handleRefreshFail(error.message || '网络异常')
       }
     },
diff --git a/pages/test/test.vue b/pages/test/test.vue
index 392962e..f9e69e6 100644
--- a/pages/test/test.vue
+++ b/pages/test/test.vue
@@ -1,3 +1,29 @@
+<template>
+  <view @click="open()">123</view>
+</template>
+<script>
+export default {
+  data() {
+    return {}
+  },
+  methods: {
+    open() {
+      uni.downloadFile({
+        url: 'https://api.ccttiot.com/安装协议（准备好）-1757570264575.pdf',
+        success: function (res) {
+          var filePath = res.tempFilePath
+          uni.openDocument({
+            filePath: filePath,
+            showMenu: true,
+            success: function (res) {},
+          })
+        },
+      })
+    },
+  },
+}
+</script>
+<style lang="scss"></style>
 <!--<template>-->
 <!--  <view style="width: 750rpx; height: 750rpx">-->
 <!--    <l-signature-->
@@ -64,29 +90,3 @@
 <!--}-->
 <!--</script>-->
 <!--<style lang="scss"></style>-->
-<template>
-  <view @click="open()">123</view>
-</template>
-<script>
-export default {
-  data() {
-    return {}
-  },
-  methods: {
-    open() {
-      uni.downloadFile({
-        url: 'https://api.ccttiot.com/安装协议（准备好）-1757570264575.pdf',
-        success: function (res) {
-          var filePath = res.tempFilePath
-          uni.openDocument({
-            filePath: filePath,
-            showMenu: true,
-            success: function (res) {},
-          })
-        },
-      })
-    },
-  },
-}
-</script>
-<style lang="scss"></style>
diff --git a/utils/request.js b/utils/request.js
index d6b3b05..f4dd455 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -19,7 +19,7 @@ const ENV_CONFIG = {
   release: {
     // 正式版
     // baseUrl: 'https://chu.chuangtewl.com/prod-api',
-    // baseUrl: 'http://192.168.2.88:4601',
+    // baseUrl: 'http://192.168.2.21:4601',
     baseUrl: 'http://192.168.2.21:4601',
     appId: 1,
   },