From 6f10244a0190d6142efe66694874924cf9364398 Mon Sep 17 00:00:00 2001
From: claw_bot <claw@jb18cm.plus>
Date: Thu, 12 Mar 2026 12:00:49 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=87=E6=8D=A2uview-plus=E4=B8=BAuvi?=
 =?UTF-8?q?ew-ui=202.0=E5=AE=98=E6=96=B9=E7=89=88=E6=9C=AC=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue        | 67 ++++++++++++++++++++++++++++++++++++--------------
 main.js        |  8 +++---
 pages.json     |  2 +-
 uni.scss       |  3 ++-
 utils/api.js   |  7 ++----
 vite.config.js |  2 +-
 6 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/App.vue b/App.vue
index 4a7648d..1d59228 100644
--- a/App.vue
+++ b/App.vue
@@ -1,15 +1,3 @@
-<script setup>
-// 全局注册u-toast组件
-import { useToast } from 'uview-plus'
-const toast = useToast()
-
-// 挂载到全局
-uni.$u = {
-  toast,
-  showModal: useToast().showModal
-}
-</script>
-
 <script>
 export default {
   onLaunch: function() {
@@ -25,15 +13,58 @@ export default {
 </script>
 
 <template>
-  <view>
-    <router-view />
-    <!-- 全局toast组件 -->
-    <u-toast ref="uToast" />
-    <!-- 全局modal组件 -->
-    <u-modal ref="uModal" />
+  <view id="app">
+    <!-- 全局uView配置 -->
+    <u-config :config="uConfig">
+      <router-view />
+      <!-- 全局toast组件 -->
+      <u-toast ref="uToast" />
+      <!-- 全局modal组件 -->
+      <u-modal ref="uModal" />
+    </u-config>
   </view>
 </template>
 
+<script setup>
+// uView全局配置
+const uConfig = {
+  // 主色调匹配项目品牌色
+  primaryColor: '#064e3b',
+  successColor: '#10B981',
+  warningColor: '#f59e0b',
+  errorColor: '#ef4444'
+}
+
+// 挂载全局方法
+uni.$u.toast = (title, options = {}) => {
+  uni.$refs.uToast.show({
+    title,
+    ...options
+  })
+}
+uni.$u.toast.success = (title) => {
+  uni.$refs.uToast.show({
+    title,
+    type: 'success'
+  })
+}
+uni.$u.toast.error = (title) => {
+  uni.$refs.uToast.show({
+    title,
+    type: 'error'
+  })
+}
+uni.$u.toast.loading = (title) => {
+  uni.$refs.uToast.show({
+    title,
+    type: 'loading'
+  })
+}
+uni.$u.showModal = (options) => {
+  uni.$refs.uModal.show(options)
+}
+</script>
+
 <style>
 /* 每个页面公共css */
 page {
diff --git a/main.js b/main.js
index ee6ab74..c6e3996 100644
--- a/main.js
+++ b/main.js
@@ -14,7 +14,7 @@ app.$mount()
 // #ifdef VUE3
 import { createSSRApp } from 'vue'
 import api from './utils/api'
-import uviewPlus from 'uview-plus'
+import uView from 'uview-ui'
 
 console.log('🚀 应用启动，导入api模块')
 
@@ -25,9 +25,9 @@ export function createApp() {
   app.config.globalProperties.$api = api
   console.log('✅ api已全局注册为 $api')
   
-  // 注册uView Plus
-  app.use(uviewPlus)
-  console.log('✅ uView Plus 已全局注册')
+  // 注册uView UI 2.0
+  app.use(uView)
+  console.log('✅ uView UI 2.0 已全局注册')
   
   return {
     app
diff --git a/pages.json b/pages.json
index 627dae1..70bcb0f 100644
--- a/pages.json
+++ b/pages.json
@@ -72,7 +72,7 @@
 	"easycom": {
 		"autoscan": true,
 		"custom": {
-			"^u-(.*)": "uview-plus/components/u-$1/u-$1.vue"
+			"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 		}
 	}
 }
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
index 38697c2..ad370bb 100644
--- a/uni.scss
+++ b/uni.scss
@@ -76,4 +76,5 @@ $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
 
 /* 引入uView样式 */
-@import "uview-plus/index.scss";
+@import "uview-ui/theme.scss";
+@import "uview-ui/index.scss";
diff --git a/utils/api.js b/utils/api.js
index 6e319c1..3417675 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -17,10 +17,7 @@ let loginLock = null;
 let loadingCount = 0;
 const showLoading = () => {
   if (loadingCount === 0) {
-    uni.showLoading({
-      title: '加载中...',
-      mask: true
-    });
+    uni.$u.toast.loading('加载中...');
   }
   loadingCount++;
 };
@@ -28,7 +25,7 @@ const hideLoading = () => {
   loadingCount--;
   if (loadingCount <= 0) {
     loadingCount = 0;
-    uni.hideLoading();
+    uni.$u.toast.hide();
   }
 };
 
diff --git a/vite.config.js b/vite.config.js
index f232269..4f8bc26 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -4,6 +4,6 @@ import uni from '@dcloudio/vite-plugin-uni'
 export default defineConfig({
   plugins: [uni()],
   optimizeDeps: {
-    include: ['uview-plus']
+    include: ['uview-ui']
   }
 })