update 升级uview-plus版本

master
管理员 1 year ago
parent 3963e0c2e2
commit ad1688ecb3

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

File diff suppressed because it is too large Load Diff

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

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

Loading…
Cancel
Save