update 升级uview-plus版本

uniapp/package.json

@@ -56,7 +56,7 @@
     "dayjs": "^1.11.7",
     "pinia": "2.0.22",
     "pinia-plugin-unistorage": "^0.0.17",
-    "uview-plus": "^3.1.38",
+    "uview-plus": "^3.3.31",
     "vue": "^3.3.2",
     "vue-i18n": "^9.2.2"
   },

uniapp/src/util/modules/http.js

@@ -1,5 +1,5 @@
-import uviewPlus from 'uview-plus';
-import { useAuthStore, useCommonStore} from '@/store';
+import { http } from 'uview-plus';
+import { useAuthStore, useCommonStore } from '@/store';
 import { env } from '@/env';
 
 const HEADER_FORM = 'application/x-www-form-urlencoded'
@@ -8,15 +8,16 @@ const HEADER_JSON = 'application/json;charset=UTF-8';
 const HEADER_TEXT = 'text/plain;charset=UTF-8';
 
 export {
-	HEADER_FORM,HEADER_UPLOAD,HEADER_JSON,HEADER_TEXT
+	HEADER_FORM, HEADER_UPLOAD, HEADER_JSON, HEADER_TEXT
 }
 
 
-export const HttpConfig = ()=>{
-	
+
+export const HttpConfig = () => {
+
 	// 初始化请求配置
-	uni.$u.http.setConfig((config) => {
-	
+	http.setConfig((config) => {
+
 		/* config 为默认全局配置*/
 		config.baseURL = env.baseApi;
 		config.custom = {
@@ -29,15 +30,15 @@ export const HttpConfig = ()=>{
 		}
 		return config
 	})
-	
+
 	// 请求拦截
-	uni.$u.http.interceptors.request.use((config) => {
+	http.interceptors.request.use((config) => {
 		// 初始化请求拦截器时，会执行此方法，此时data为undefined，赋予默认{}
 		config.data = config.data || {};
 		config.custom = config.custom || {};
-		if(!config.header["Content-Type"]){
+		if (!config.header["Content-Type"]) {
 			let type = (config.custom.type || 'none').toLowerCase();
-			switch(type){
+			switch (type) {
 				case 'form':
 					config.header["Content-Type"] = HEADER_FORM;
 					break;
@@ -52,37 +53,37 @@ export const HttpConfig = ()=>{
 					break;
 			}
 		}
-	
+
 		if (config.custom.auth) {
 			config.header.Authorization = 'Bearer ' + (useAuthStore().token || "");
-			
+
 		}
 		if (config.custom.loading) {
 			//打开加载动画
 			useCommonStore().showLoading();
 		}
-	
+
 		return config
 	}, config => {
 		return Promise.reject(config)
 	})
-	
-	
+
+
 	// 响应拦截
-	uni.$u.http.interceptors.response.use(async (response) => {
+	http.interceptors.response.use(async (response) => {
 		useCommonStore().hideLoading();
 		const data = response.data;
 		const custom = response.config.custom || {};
-		
+
 		if (data.code == 401) {
-			if(custom.showError){
-				uni.showToast({title:'请重新登录',icon:'error',duration:3000});
+			if (custom.showError) {
+				uni.showToast({ title: '请重新登录', icon: 'error', duration: 3000 });
 			}
 			useAuthStore().$reset();
 			uni.reLaunch({
-				url:"/pages/index/login"
+				url: "/pages/index/login"
 			})
-		}else if (data.code == 200) {
+		} else if (data.code == 200) {
 			if (!custom.returnData) {
 				return data
 			} else {
@@ -90,7 +91,7 @@ export const HttpConfig = ()=>{
 			}
 		} else {
 			if (custom.showError) {
-				uni.showToast({title: data.message || data.msg,icon:'error',duration:3000});
+				uni.showToast({ title: data.message || data.msg, icon: 'error', duration: 3000 });
 			}
 			if (custom.catch) {
 				return Promise.reject(data)
@@ -109,9 +110,9 @@ export const HttpConfig = ()=>{
 		} else {
 			errorData = message || '网络错误';
 		}
-		uni.showToast({title: errorData,icon:'error',duration:3000});
+		uni.showToast({ title: errorData, icon: 'error', duration: 3000 });
 		return Promise.reject(response)
 	})
 }
 
-export const http = uni.$u.http;
+export { http };

uniapp/src/w-components/index.js

@@ -7,7 +7,9 @@ import {
 	PageAnimationTypeOut
 } from './modules/PageAnimationType.js'
 
-import {env} from '@/env'
+import { env } from '@/env'
+
+import { throttle, debounce } from 'uview-plus'
 
 const sys = uni.getSystemInfoSync();
 
@@ -18,11 +20,11 @@ const $w = {
 	...sys.safeAreaInsets,
 	...util,
 	...uni.$u,
-	t:uni.$u.throttle,
-	d:uni.$u.debounce,
-	url:(uri="")=>{
-		if(Array.isArray(uri)){
-			for(let i=0;i<uri.length;i++) {
+	t: throttle,
+	d: debounce,
+	url: (uri = "") => {
+		if (Array.isArray(uri)) {
+			for (let i = 0; i < uri.length; i++) {
 				uri[i] = $w.https(uri[i]);
 			}
 			return uri;
@@ -30,21 +32,21 @@ const $w = {
 			return $w.https(uri);
 		}
 	},
-	https:(uri="")=>{
-		if(uri.toString().includes("://")){
-			if(uri.includes("?")){
-				return uri+"&"+uni.$v.substr(1);
-			}else{
-				return uri+uni.$v;
+	https: (uri = "") => {
+		if (uri.toString().includes("://")) {
+			if (uri.includes("?")) {
+				return uri + "&" + uni.$v.substr(1);
+			} else {
+				return uri + uni.$v;
 			}
-		}else if(uri.startsWith("//")){
-			if(uri.includes("?")){
-				return "https:" + uri+"&"+uni.$v.substr(1);
-			}else{
-				return "https:" + uri+uni.$v;
+		} else if (uri.startsWith("//")) {
+			if (uri.includes("?")) {
+				return "https:" + uri + "&" + uni.$v.substr(1);
+			} else {
+				return "https:" + uri + uni.$v;
 			}
-		}else{
-			return env.baseResources+uri+uni.$v;
+		} else {
+			return env.baseResources + uri + uni.$v;
 		}
 	}
 };
@@ -53,7 +55,7 @@ const $w = {
 
 
 const wComponents = {
-	install(Vue){
+	install(Vue) {
 		prototypes();
 		Vue.config.globalProperties.$w = $w;
 		uni.$w = $w;