修改bug

main
ihzero 2024-05-04 11:40:56 +08:00
parent 43e25cd7d4
commit ed601cc8fa
10 changed files with 66 additions and 14 deletions

2
.env
View File

@ -1 +1,3 @@
VITE_APP_VERSION_CODE = 100
VITE_APP_VERSION = 1.0.0

View File

@ -75,6 +75,18 @@
"navigationBarTitleText": "个人信息"
}
},
{
"path": "pages/notfound/index",
"style": {
"enablePullDownRefresh": false,
"onReachBottomDistance": 100,
"navigationBarTitleText": "错误页",
"app-plus": {
"contentAdjust": false,
"bounce": "none"
}
}
},
{
"path": "pages/upgrade/index",
"style": {
@ -85,7 +97,7 @@
"background": "transparent",
"titleNView": false,
"scrollIndicator": false,
"popGesture": "none",
"animationType": "fade-in",
"animationDuration": 200

View File

@ -1,6 +1,6 @@
<template>
<view class="flex-center flex-col" @click="onClick">
<uv-icon :name="data.icon" size="50rpx" color="#909399"></uv-icon>
<uv-icon :name="data.icon" size="60rpx" color="#909399"></uv-icon>
<view class="text-28rpx mt-10rpx">{{ data.title }}</view>
</view>
</template>

View File

@ -62,7 +62,7 @@
<view class="px-base space-y-15rpx mt-30rpx">
<view class="card" v-for="(item, i) in opList" :key="i">
<TitleComp :title="item.title"></TitleComp>
<view class="grid grid-cols-3 mt-20rpx gap-20rpx">
<view class="grid grid-cols-3 mt-20rpx gap-34rpx">
<template v-for="(child, ii) in item.children" :key="ii">
<OpItem
:data="child"

View File

@ -0,0 +1,20 @@
<template>
<view>
<CuNavbar></CuNavbar>
<view class="h-60vh flex-center">
<uv-empty :text="message" :icon="NotFoundImg"> </uv-empty>
</view>
</view>
</template>
<script setup>
import CuNavbar from '@/components/cu-navbar/index'
import NotFoundImg from '@/static/images/404.svg'
import { onLoad } from '@dcloudio/uni-app'
import { ref } from 'vue'
const message = ref('')
onLoad((opt) => {
message.value = opt.msg?.replace(/\s+/g, '');
})
</script>

View File

@ -56,8 +56,8 @@ import checkUpdate from '@/pages/upgrade/check-update'
const modalRef = ref(null)
const userStore = useUserStore()
const sysInfo = sys()
const varsion = computed(() => sysInfo.appVersion)
// const sysInfo = sys()
const varsion = computed(() => import.meta.env.VITE_APP_VERSION)
const goPath = (url) => {
uni.navigateTo({
url,

View File

@ -11,14 +11,11 @@ export default function () {
if (widgetInfo.version) {
let data = {
action: 'checkVersion',
appid: appId,
appVersion: appVersion,
wgtVersion: widgetInfo.version
};
http.get('/latest-app-versions').then(resData => {
console.log(resData);
// _id : string
// appid : string
// name : string
@ -41,8 +38,9 @@ export default function () {
// min_uni_version : string | null // 升级 wgt 的最低 uni-app 版本
const info = resData[systemInfo.platform];
const appVersionCode = import.meta.env.VITE_APP_VERSION_CODE;
let resInfo = null
if (info == null || systemInfo.appVersionCode >= info?.version) {
if (info == null || appVersionCode >= info?.version) {
resInfo = {
code: 0
}

View File

@ -1 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1714236482886" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8963" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M109.714286 73.142857c-21.942857 0-36.571429 14.628571-36.571429 36.571429v804.571428c0 21.942857 14.628571 36.571429 36.571429 36.571429h804.571428c21.942857 0 36.571429-14.628571 36.571429-36.571429v-804.571428c0-21.942857-14.628571-36.571429-36.571429-36.571429h-804.571428z m0-73.142857h804.571428c58.514286 0 109.714286 51.2 109.714286 109.714286v804.571428c0 58.514286-51.2 109.714286-109.714286 109.714286h-804.571428C51.2 1024 0 972.8 0 914.285714v-804.571428C0 51.2 51.2 0 109.714286 0z m438.857143 292.571429h219.428571c21.942857 0 36.571429 14.628571 36.571429 36.571428s-14.628571 36.571429-36.571429 36.571429h-219.428571c-21.942857 0-36.571429-14.628571-36.571429-36.571429s14.628571-36.571429 36.571429-36.571428z m-219.428572 438.857142c21.942857 0 36.571429-14.628571 36.571429-36.571428S351.085714 658.285714 329.142857 658.285714s-36.571429 14.628571-36.571428 36.571429 14.628571 36.571429 36.571428 36.571428z m0 73.142858C270.628571 804.571429 219.428571 753.371429 219.428571 694.857143S270.628571 585.142857 329.142857 585.142857 438.857143 636.342857 438.857143 694.857143 387.657143 804.571429 329.142857 804.571429z m-7.314286-446.171429L241.371429 277.942857c-14.628571-14.628571-36.571429-14.628571-51.2 0-14.628571 14.628571-14.628571 36.571429 0 51.2L292.571429 431.542857c7.314286 7.314286 21.942857 14.628571 29.257142 14.628572s21.942857 0 29.257143-7.314286l153.6-153.6c14.628571-14.628571 14.628571-36.571429 0-51.2-14.628571-14.628571-36.571429-14.628571-51.2 0L321.828571 358.4zM548.571429 658.285714h219.428571c21.942857 0 36.571429 14.628571 36.571429 36.571429s-14.628571 36.571429-36.571429 36.571428h-219.428571c-21.942857 0-36.571429-14.628571-36.571429-36.571428s14.628571-36.571429 36.571429-36.571429z" p-id="8964" fill="#515151"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1714793743175" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4325" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M760.896 94C862.574 94 945 176.426 945 278.104v517.792C945 897.574 862.574 980 760.896 980H243.104C141.426 980 59 897.574 59 795.896V278.104C59 176.426 141.426 94 243.104 94h517.792z m0 59.834H243.104c-67.946 0-123.156 54.53-124.254 122.215l-0.016 2.055v517.792c0 67.946 54.53 123.156 122.215 124.254l2.055 0.016h517.792c67.946 0 123.156-54.53 124.254-122.215l0.016-2.055V278.104c0-67.946-54.53-123.156-122.215-124.254l-2.055-0.016z m-448.753 407.33c53.38 0 96.654 43.273 96.654 96.654 0 53.381-43.273 96.655-96.654 96.655-53.381 0-96.655-43.274-96.655-96.655 0-53.38 43.274-96.654 96.655-96.654z m0 46.026c-27.962 0-50.629 22.667-50.629 50.628 0 27.962 22.667 50.629 50.629 50.629 27.961 0 50.628-22.667 50.628-50.629 0-27.961-22.667-50.628-50.628-50.628zM800.018 627.9c16.523 0 29.917 13.395 29.917 29.917 0 16.523-13.394 29.917-29.917 29.917h-266.95c-16.523 0-29.917-13.394-29.917-29.917 0-16.522 13.394-29.917 29.917-29.917h266.95zM425.23 305.114c0.088 0.092 0.174 0.185 0.26 0.279 8.617 9.398 8.108 23.968-1.143 32.742l-110.51 104.812c-9.052 8.585-23.35 8.206-31.935-0.845a22.589 22.589 0 0 1-1.249-1.43 22.966 22.966 0 0 1-3.245-2.7l-59.546-59.546c-8.937-8.936-8.937-23.425 0-32.362 8.936-8.936 23.425-8.936 32.362 0l48.192 48.192 94.88-89.987c9.052-8.585 23.35-8.207 31.934 0.845z m374.788 39.728c16.523 0 29.917 13.394 29.917 29.916 0 16.523-13.394 29.917-29.917 29.917h-266.95c-16.523 0-29.917-13.394-29.917-29.917 0-16.522 13.394-29.916 29.917-29.916h266.95z" fill="#333333" p-id="4326"></path></svg>

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -1 +1,15 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1714236407533" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7697" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M154.24 310.08a32 32 0 0 1-32-30.4V201.28A75.52 75.52 0 0 1 199.04 128h619.2A75.2 75.2 0 0 1 896 201.28v653.44A75.2 75.2 0 0 1 818.24 928H199.04a75.52 75.52 0 0 1-77.44-73.28v-78.4a32 32 0 0 1 32-32 32 32 0 0 1 32 32v78.4a12.16 12.16 0 0 0 12.48 11.52h620.16a11.84 11.84 0 0 0 12.48-11.52V201.28a11.84 11.84 0 0 0-12.48-11.52H199.04a12.16 12.16 0 0 0-12.48 11.52v78.4a32 32 0 0 1-32.32 30.4z" p-id="7698" fill="#515151"></path><path d="M125.44 371.52h58.24a25.92 25.92 0 0 1 29.12 29.44 25.92 25.92 0 0 1-29.12 29.44H125.44a25.92 25.92 0 0 1-28.8-29.44 25.92 25.92 0 0 1 28.8-29.44zM125.44 625.6h58.24a25.92 25.92 0 0 1 29.12 29.44 25.92 25.92 0 0 1-29.12 29.44H125.44a25.92 25.92 0 0 1-28.8-29.44 25.92 25.92 0 0 1 28.8-29.44zM125.44 498.56h58.24a25.92 25.92 0 0 1 29.12 29.44 25.92 25.92 0 0 1-29.12 29.44H125.44A25.92 25.92 0 0 1 96 528a25.92 25.92 0 0 1 29.44-29.44z" p-id="7699" fill="#515151"></path><path d="M593.6 534.4a132.8 132.8 0 0 0 57.28-109.44 137.92 137.92 0 0 0-275.84 0 135.04 135.04 0 0 0 57.28 109.44A169.92 169.92 0 0 0 320 708.48V736h384v-27.52a166.4 166.4 0 0 0-110.4-174.08z m-160-109.44a82.88 82.88 0 1 1 82.56 82.24 82.88 82.88 0 0 1-83.84-82.24z m-53.12 258.24c11.84-91.84 88.32-105.6 135.68-105.6s122.24 13.76 136 105.6z" p-id="7700" fill="#515151"></path></svg>
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg t="1714236407533" class="icon" viewBox="0 0 1024 1024" version="1.1"
xmlns="http://www.w3.org/2000/svg" p-id="7697" xmlns:xlink="http://www.w3.org/1999/xlink"
width="200" height="200">
<path
d="M154.24 310.08a32 32 0 0 1-32-30.4V201.28A75.52 75.52 0 0 1 199.04 128h619.2A75.2 75.2 0 0 1 896 201.28v653.44A75.2 75.2 0 0 1 818.24 928H199.04a75.52 75.52 0 0 1-77.44-73.28v-78.4a32 32 0 0 1 32-32 32 32 0 0 1 32 32v78.4a12.16 12.16 0 0 0 12.48 11.52h620.16a11.84 11.84 0 0 0 12.48-11.52V201.28a11.84 11.84 0 0 0-12.48-11.52H199.04a12.16 12.16 0 0 0-12.48 11.52v78.4a32 32 0 0 1-32.32 30.4z"
p-id="7698" fill="#515151"></path>
<path
d="M125.44 371.52h58.24a25.92 25.92 0 0 1 29.12 29.44 25.92 25.92 0 0 1-29.12 29.44H125.44a25.92 25.92 0 0 1-28.8-29.44 25.92 25.92 0 0 1 28.8-29.44zM125.44 625.6h58.24a25.92 25.92 0 0 1 29.12 29.44 25.92 25.92 0 0 1-29.12 29.44H125.44a25.92 25.92 0 0 1-28.8-29.44 25.92 25.92 0 0 1 28.8-29.44zM125.44 498.56h58.24a25.92 25.92 0 0 1 29.12 29.44 25.92 25.92 0 0 1-29.12 29.44H125.44A25.92 25.92 0 0 1 96 528a25.92 25.92 0 0 1 29.44-29.44z"
p-id="7699" fill="#515151"></path>
<path
d="M593.6 534.4a132.8 132.8 0 0 0 57.28-109.44 137.92 137.92 0 0 0-275.84 0 135.04 135.04 0 0 0 57.28 109.44A169.92 169.92 0 0 0 320 708.48V736h384v-27.52a166.4 166.4 0 0 0-110.4-174.08z m-160-109.44a82.88 82.88 0 1 1 82.56 82.24 82.88 82.88 0 0 1-83.84-82.24z m-53.12 258.24c11.84-91.84 88.32-105.6 135.68-105.6s122.24 13.76 136 105.6z"
p-id="7700" fill="#515151"></path>
</svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@ -11,7 +11,8 @@ http.setConfig((config) => {
config.header = Object.assign({
Accept: 'application/json',
'app-cli-os': systemInfo.platform,
'app-cli-version': systemInfo.appVersionCode
// 'app-cli-version': systemInfo.appVersionCode
'app-cli-version': import.meta.env.VITE_APP_VERSION_CODE
}, config.header);
/* 设置全局配置 */
config.validateStatus = (statusCode) => {
@ -58,6 +59,11 @@ http.interceptors.response.use(async (response) => {
url: '/pages/login/index'
})
return Promise.reject(response)
} else if (statusCode === 404) {
uni.redirectTo({
url: `/pages/notfound/index?msg=${data.message}`,
})
return Promise.reject(response)
}
uni.showToast({
title: data.message || '服务器错误',
@ -77,7 +83,7 @@ http.interceptors.response.use(async (response) => {
}
return response.data;
}, (error) => {
console.log(error);
uni.showToast({
title: error.errMsg,
icon: 'none'