update uni-app

This commit is contained in:
全栈小学生 2023-09-15 18:44:30 +08:00
parent 8035b67c76
commit 55261a17eb
11 changed files with 267 additions and 190 deletions

View File

@ -26,6 +26,7 @@
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"pinia": "^2.0.36", "pinia": "^2.0.36",
"qrcode": "^1.5.1", "qrcode": "^1.5.1",
"qs": "^6.11.2",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"uview-plus": "^3.1.29", "uview-plus": "^3.1.29",
"vue": "^3.3.0", "vue": "^3.3.0",
@ -5235,6 +5236,21 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"dev": true "dev": true
}, },
"node_modules/body-parser/node_modules/qs": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"dev": true,
"dependencies": {
"side-channel": "^1.0.4"
},
"engines": {
"node": ">=0.6"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/brace-expansion": { "node_modules/brace-expansion": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz", "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
@ -5334,7 +5350,6 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz", "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
"dev": true,
"dependencies": { "dependencies": {
"function-bind": "^1.1.1", "function-bind": "^1.1.1",
"get-intrinsic": "^1.0.2" "get-intrinsic": "^1.0.2"
@ -6155,6 +6170,21 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"dev": true "dev": true
}, },
"node_modules/express/node_modules/qs": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"dev": true,
"dependencies": {
"side-channel": "^1.0.4"
},
"engines": {
"node": ">=0.6"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/fast-glob": { "node_modules/fast-glob": {
"version": "3.3.1", "version": "3.3.1",
"resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.1.tgz", "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.1.tgz",
@ -6365,7 +6395,6 @@
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz", "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
"integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
"dev": true,
"dependencies": { "dependencies": {
"function-bind": "^1.1.1", "function-bind": "^1.1.1",
"has": "^1.0.3", "has": "^1.0.3",
@ -6481,7 +6510,6 @@
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz", "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz",
"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
"dev": true,
"engines": { "engines": {
"node": ">= 0.4" "node": ">= 0.4"
} }
@ -6490,7 +6518,6 @@
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz", "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
"dev": true,
"engines": { "engines": {
"node": ">= 0.4" "node": ">= 0.4"
} }
@ -9319,8 +9346,7 @@
"node_modules/object-inspect": { "node_modules/object-inspect": {
"version": "1.12.3", "version": "1.12.3",
"resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz", "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz",
"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
"dev": true
}, },
"node_modules/omggif": { "node_modules/omggif": {
"version": "1.0.10", "version": "1.0.10",
@ -9988,15 +10014,17 @@
} }
}, },
"node_modules/qs": { "node_modules/qs": {
"version": "6.11.0", "version": "6.11.2",
"resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
"dev": true,
"dependencies": { "dependencies": {
"side-channel": "^1.0.4" "side-channel": "^1.0.4"
}, },
"engines": { "engines": {
"node": ">=0.6" "node": ">=0.6"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/querystringify": { "node_modules/querystringify": {
@ -10457,7 +10485,6 @@
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz", "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
"dev": true,
"dependencies": { "dependencies": {
"call-bind": "^1.0.0", "call-bind": "^1.0.0",
"get-intrinsic": "^1.0.2", "get-intrinsic": "^1.0.2",
@ -16164,6 +16191,15 @@
"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"dev": true "dev": true
},
"qs": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"dev": true,
"requires": {
"side-channel": "^1.0.4"
}
} }
} }
}, },
@ -16248,7 +16284,6 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz", "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
"dev": true,
"requires": { "requires": {
"function-bind": "^1.1.1", "function-bind": "^1.1.1",
"get-intrinsic": "^1.0.2" "get-intrinsic": "^1.0.2"
@ -16913,6 +16948,15 @@
"resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"dev": true "dev": true
},
"qs": {
"version": "6.11.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
"dev": true,
"requires": {
"side-channel": "^1.0.4"
}
} }
} }
}, },
@ -17085,7 +17129,6 @@
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz", "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
"integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
"dev": true,
"requires": { "requires": {
"function-bind": "^1.1.1", "function-bind": "^1.1.1",
"has": "^1.0.3", "has": "^1.0.3",
@ -17176,14 +17219,12 @@
"has-proto": { "has-proto": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz", "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz",
"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="
"dev": true
}, },
"has-symbols": { "has-symbols": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz", "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
"dev": true
}, },
"hash-sum": { "hash-sum": {
"version": "2.0.0", "version": "2.0.0",
@ -19444,8 +19485,7 @@
"object-inspect": { "object-inspect": {
"version": "1.12.3", "version": "1.12.3",
"resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz", "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz",
"integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
"dev": true
}, },
"omggif": { "omggif": {
"version": "1.0.10", "version": "1.0.10",
@ -19937,10 +19977,9 @@
"integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==" "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ=="
}, },
"qs": { "qs": {
"version": "6.11.0", "version": "6.11.2",
"resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
"dev": true,
"requires": { "requires": {
"side-channel": "^1.0.4" "side-channel": "^1.0.4"
} }
@ -20325,7 +20364,6 @@
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz", "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
"dev": true,
"requires": { "requires": {
"call-bind": "^1.0.0", "call-bind": "^1.0.0",
"get-intrinsic": "^1.0.2", "get-intrinsic": "^1.0.2",

View File

@ -57,6 +57,7 @@
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"pinia": "^2.0.36", "pinia": "^2.0.36",
"qrcode": "^1.5.1", "qrcode": "^1.5.1",
"qs": "^6.11.2",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"uview-plus": "^3.1.29", "uview-plus": "^3.1.29",
"vue": "^3.3.0", "vue": "^3.3.0",

View File

@ -0,0 +1 @@
{}

View File

@ -0,0 +1 @@
{}

View File

@ -4,7 +4,7 @@
<!-- 日期列表 --> <!-- 日期列表 -->
<scroll-view class="scroll-view_H b-t b-b" scroll-x> <scroll-view class="scroll-view_H b-t b-b" scroll-x>
<block v-for="(item,index) in dateArr" :key="index"> <block v-for="(item,index) in dateArr" :key="index">
<div class="flex-box" @click="selectDateEvent(index,item)" :class="{ borderb: index==dateActive}"> <div class="flex-box" @click="selectDateEvent(index,item)" :class="{ borderb: index==dateActive }" :style="{borderColor: selectedBorderColor}">
<view class="date-box" :style="{color:index==dateActive?selectedTabColor:'#333'}"> <view class="date-box" :style="{color:index==dateActive?selectedTabColor:'#333'}">
<text class="fontw">{{item.week}}</text> <text class="fontw">{{item.week}}</text>
<text class="text-xs">{{item.date}}</text> <text class="text-xs">{{item.date}}</text>
@ -19,7 +19,7 @@
<view class="item"> <view class="item">
<view class="item-box" :class="{'disable':item.disable, <view class="item-box" :class="{'disable':item.disable,
'active':isMultiple?item.isActive:_index==timeActive}" :style="{color:isMultiple?item.isActive? selectedItemColor:'#333' 'active':isMultiple?item.isActive:_index==timeActive}" :style="{color:isMultiple?item.isActive? selectedItemColor:'#333'
:_index==timeActive?selectedItemColor:'#333'}" @click="selectTimeEvent(_index,item)"> :_index==timeActive?selectedItemColor:'#333', borderColor:(isMultiple?item.isActive:_index==timeActive? selectedBorderColor:'')}" @click="selectTimeEvent(_index,item)">
<text v-if="isQuantum">{{item.begin}}~{{item.end}}</text> <text v-if="isQuantum">{{item.begin}}~{{item.end}}</text>
<text v-else>{{item.time}}</text> <text v-else>{{item.time}}</text>
<text class="all">{{item.disable?disableText:undisableText}}</text> <text class="all">{{item.disable?disableText:undisableText}}</text>
@ -104,6 +104,10 @@
type: String, type: String,
default: "#FB4B5C" default: "#FB4B5C"
}, },
selectedBorderColor: { // border
type: String,
default: "#FB4B5C"
},
beginTime: { beginTime: {
type: String, type: String,
default: "09:00:00" default: "09:00:00"
@ -415,6 +419,6 @@
} }
.borderb { .borderb {
border-bottom: 2px solid #FB4B5C; border-bottom: 2px solid;
} }
</style> </style>

View File

@ -29,7 +29,6 @@ class Language {
*/ */
public async loadLocaleMessages(path: string, locale: string) { public async loadLocaleMessages(path: string, locale: string) {
try { try {
let route = 'app'; // 默认系统 let route = 'app'; // 默认系统
// 检测当前访问的是系统app还是插件 // 检测当前访问的是系统app还是插件
@ -42,11 +41,11 @@ class Language {
else file = file.split('.').splice(1).join('.') else file = file.split('.').splice(1).join('.')
// 是否已加载 // 是否已加载
if (this.loadLocale.includes(`${locale}/${file}`)) { if (this.loadLocale.includes(`${route}/${locale}/${file}`)) {
this.setI18nLanguage(locale, file) this.setI18nLanguage(locale, file)
return nextTick() return nextTick()
} }
this.loadLocale.push(`${locale}/${file}`) this.loadLocale.push(`${route}/${locale}/${file}`)
// 引入语言包文件 // 引入语言包文件
const messages = await import(`../${route}/locale/${locale}/${file}.json`) const messages = await import(`../${route}/locale/${locale}/${file}.json`)

View File

@ -5,13 +5,3 @@
--primary-color-light: #ecf5ff; --primary-color-light: #ecf5ff;
--page-bg-color: #f7f7f7; --page-bg-color: #f7f7f7;
} }
/* 多行超出隐藏 */
.multi-hidden {
word-break: break-all;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}

View File

@ -1,8 +1,8 @@
@font-face { @font-face {
font-family: "iconfont"; /* Project id 3952239 */ font-family: "iconfont"; /* Project id 3952239 */
src: url('//at.alicdn.com/t/c/font_3952239_d5svxl1mnu5.woff2?t=1693022806663') format('woff2'), src: url('//at.alicdn.com/t/c/font_3952239_8vg0d3zzqa7.woff2?t=1694674505913') format('woff2'),
url('//at.alicdn.com/t/c/font_3952239_d5svxl1mnu5.woff?t=1693022806663') format('woff'), url('//at.alicdn.com/t/c/font_3952239_8vg0d3zzqa7.woff?t=1694674505913') format('woff'),
url('//at.alicdn.com/t/c/font_3952239_d5svxl1mnu5.ttf?t=1693022806663') format('truetype'); url('//at.alicdn.com/t/c/font_3952239_8vg0d3zzqa7.ttf?t=1694674505913') format('truetype');
} }
.iconfont { .iconfont {
@ -13,6 +13,30 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.iconkaidian:before {
content: "\e6fb";
}
.icongouwuche:before {
content: "\e699";
}
.iconliebiaoxingshi:before {
content: "\e742";
}
.iconshangpinliebiao:before {
content: "\e61c";
}
.iconjiahao1:before {
content: "\e84f";
}
.iconjianhao:before {
content: "\e850";
}
.iconfenxiang1:before { .iconfenxiang1:before {
content: "\e64d"; content: "\e64d";
} }

View File

@ -1,3 +1,15 @@
@import 'uview-plus/index.scss'; @import 'uview-plus/index.scss';
@import 'common.scss'; @import 'common.scss';
@import 'iconfont.css'; @import 'iconfont.css';
/* 多行超出隐藏 */
.multi-hidden {
word-break: break-all;
text-overflow: ellipsis;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}

View File

@ -13,7 +13,6 @@ export const redirectInterceptor = () => {
uni.addInterceptor(name, { uni.addInterceptor(name, {
invoke(args) { invoke(args) {
const route = urlDeconstruction(args.url) const route = urlDeconstruction(args.url)
// 加载语言包 // 加载语言包
language.loadLocaleMessages(route.path, uni.getLocale()) language.loadLocaleMessages(route.path, uni.getLocale())
@ -34,7 +33,6 @@ export const redirectInterceptor = () => {
export const launchInterceptor = () => { export const launchInterceptor = () => {
const launch = uni.getLaunchOptionsSync() const launch = uni.getLaunchOptionsSync()
launch.path = `/${launch.path}` launch.path = `/${launch.path}`
// 加载语言包 // 加载语言包
language.loadLocaleMessages(launch.path, uni.getLocale()) language.loadLocaleMessages(launch.path, uni.getLocale())

View File

@ -1,17 +1,20 @@
import useMemberStore from '@/stores/member' import useMemberStore from '@/stores/member'
import { t } from '@/locale' import {t} from '@/locale'
import { getToken, getAppChannel } from './common' import {getToken, getAppChannel} from './common'
import qs from 'qs';
interface RequestConfig { interface RequestConfig {
showSuccessMessage ?: boolean showSuccessMessage?: boolean
} }
interface RequestOptions extends UniNamespace.RequestOptions, RequestOptions { } interface RequestOptions extends UniNamespace.RequestOptions, RequestOptions {
}
class Request { class Request {
private baseUrl : string private baseUrl: string
private config : RequestOptions = { private config: RequestOptions = {
url: '', url: '',
header: {} header: {}
} }
@ -44,25 +47,26 @@ class Request {
} }
} }
public get(url : string, data : AnyObject = {}, config : RequestConfig = {}) { public get(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
config.showSuccessMessage == undefined && (config.showSuccessMessage = false) config.showSuccessMessage == undefined && (config.showSuccessMessage = false)
Object.assign(this.config, config) Object.assign(this.config, config)
console.log('get request', url, data)
return this.request('GET', url, data) return this.request('GET', url, data)
} }
public post(url : string, data : AnyObject = {}, config : RequestConfig = {}) { public post(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
config.showSuccessMessage == undefined && (config.showSuccessMessage = false) config.showSuccessMessage == undefined && (config.showSuccessMessage = false)
Object.assign(this.config, config) Object.assign(this.config, config)
return this.request('POST', url, data) return this.request('POST', url, data)
} }
public put(url : string, data : AnyObject = {}, config : RequestConfig = {}) { public put(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
config.showSuccessMessage == undefined && (config.showSuccessMessage = false) config.showSuccessMessage == undefined && (config.showSuccessMessage = false)
Object.assign(this.config, config) Object.assign(this.config, config)
return this.request('PUT', url, data) return this.request('PUT', url, data)
} }
public delete(url : string, config : RequestConfig = {}) { public delete(url: string, config: RequestConfig = {}) {
config.showSuccessMessage == undefined && (config.showSuccessMessage = false) config.showSuccessMessage == undefined && (config.showSuccessMessage = false)
Object.assign(this.config, config) Object.assign(this.config, config)
return this.request('DELETE', url) return this.request('DELETE', url)
@ -71,7 +75,7 @@ class Request {
/** /**
* *
*/ */
public upload(url : string, data : AnyObject = {}, config : RequestConfig = {}) { public upload(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
this.requestInterceptors() this.requestInterceptors()
const params = Object.assign(uni.$u.deepClone(this.config), { const params = Object.assign(uni.$u.deepClone(this.config), {
@ -85,11 +89,11 @@ class Request {
success: res => { success: res => {
const data = JSON.parse(res.data) const data = JSON.parse(res.data)
if (data.code == 1) { if (data.code == 1) {
this.config.showSuccessMessage && uni.showToast({ title: data.msg, icon: 'none' }) this.config.showSuccessMessage && uni.showToast({title: data.msg, icon: 'none'})
resolve(data) resolve(data)
} else { } else {
if (data.code == 0) { if (data.code == 0) {
uni.showToast({ title: data.msg, icon: 'none' }) uni.showToast({title: data.msg, icon: 'none'})
} else { } else {
this.handleAuthError(data.code) this.handleAuthError(data.code)
} }
@ -106,14 +110,19 @@ class Request {
/** /**
* *
*/ */
private request(method : string, url : string, data ?: AnyObject) { private request(method: string, url: string, data ?: AnyObject) {
this.requestInterceptors() this.requestInterceptors()
const params = Object.assign(uni.$u.deepClone(this.config), { let source = {
url: this.baseUrl + url, url: this.baseUrl + url,
method, method,
data };
}) if (source.method.toUpperCase() == 'GET') {
source.url += '?' + qs.stringify(data);
} else {
source.data = data;
}
const params = Object.assign(uni.$u.deepClone(this.config), source)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
uni.request({ uni.request({
@ -121,11 +130,11 @@ class Request {
success: res => { success: res => {
const data = res.data const data = res.data
if (data.code == 1) { if (data.code == 1) {
this.config.showSuccessMessage && uni.showToast({ title: data.msg, icon: 'none' }) this.config.showSuccessMessage && uni.showToast({title: data.msg, icon: 'none'})
resolve(data) resolve(data)
} else { } else {
if (data.code == 0) { if (data.code == 0) {
uni.showToast({ title: data.msg, icon: 'none' }) uni.showToast({title: data.msg, icon: 'none'})
} else { } else {
this.handleAuthError(data.code) this.handleAuthError(data.code)
} }
@ -142,7 +151,7 @@ class Request {
}) })
} }
private handleAuthError(code : number) { private handleAuthError(code: number) {
switch (code) { switch (code) {
case 401: case 401:
useMemberStore().logout() useMemberStore().logout()
@ -153,16 +162,16 @@ class Request {
private handleRequestFail(res) { private handleRequestFail(res) {
if (res.errMsg && res.errMsg == "request:ok") { if (res.errMsg && res.errMsg == "request:ok") {
if (typeof res.data == 'string') { if (typeof res.data == 'string') {
uni.showToast({ icon: 'none', title: this.baseUrl + t('requestFail') }) uni.showToast({icon: 'none', title: this.baseUrl + t('requestFail')})
return return
} }
} }
if (res.errMsg == 'request:fail') { if (res.errMsg == 'request:fail') {
uni.showToast({ icon: 'none', title: this.baseUrl + t('requestFail') }) uni.showToast({icon: 'none', title: this.baseUrl + t('requestFail')})
return return
} }
if (res.errMsg && res.errMsg == 'request:fail url not in domain list') { if (res.errMsg && res.errMsg == 'request:fail url not in domain list') {
uni.showToast({ icon: 'none', title: this.baseUrl + t('notInDomainList') }); uni.showToast({icon: 'none', title: this.baseUrl + t('notInDomainList')});
return return
} }
} }