zN
zQ7KTR_DhuoiAdf=`9v*E0`lh?=GOy5yDHC1HN{Hq+g|3Avy8#Vr*Y(!Dvnz*2TR}C
zLTVARrne*!FRmC-@bXi6z5ua{*$1J
zTHICpo1Z=O-cfIHUy#j8adQBLlq0
zQ6^oNr|xMWf*tU6oA0z%-s9Yd*hY49%Q0DNPlj;^dSG<8>UN&5Bko98fjdzP(XWGZ
zKii45SGHlrMXjVZ7Aw+QFKUNq@!MPcw&3gG_^w&+aC-5b-g~O!7WeoY
z4V~-bT1$KpF6=Dgx8L3ieL1lV{Rt}YCz}^eKeLpWTg{Ad5iw?Q7gA+e?2Y|a)uq?Q
z!l9w*{>BWvRE>o~t@(~?g8y=;IjM{eSI7a*58bfQ(8^PRFTq9Ze0T~wADYCA4@~lD
zT?Lm7;k%Ay!Up^#i>6)0T0r-|h7cwXR(Rkl){fJ`SNJ*vO$O%R&OxFJ4>c;Y3s>bOTI8jwFkS=CA!uy%6ZoFIZ||7Iz;C8q7t_ap6VGgc
z-t+YJq{4&nwR0V<{5h55i4ZQO5q|k#$Tvghtoz>tcTJg3#uUrtdn&gzND3Fy!LPki
zQ>t*?lN{?d2MJ0Te6TA}fyiR#RW1k(3gW56Zf?*?Gs^J!@*%><9u3{`O@CP
zPf9dvo$08@>{PrT*ipjoe>Mqyp^!sGIQ4Hk&{cc&Af5yB{OOdPwc|$l$w*_``Nc%z
zq>IvB!?MeCVhT#;BA2e?ntM_!^ckJ5TGtnmBER3s!BZ;{DGsGxQ@9C3{T`>JjJ`$>
z=;4>#O#PzfFNMGZ268;(t;waTowoP6DyI3JY@Akeb)pI?4XhWn>#Xi*T=h{mufSvh-uc}=Q~dop!lx#n
zu^f!px)-spY-$>+A<&)<_rhHF;-iGx-A@7E9Wqa-Jcsj={_%~<;GJiuiLv+tQAcK>DyMcya%
zBo+NB|M&2gOS^GQe;%@@4_9&U4@Erny@MEeahit=K!d@?%W}=f7huupoyhZk+1!=o
z{7lY}dWHAX-4Bjp`w#ZZtWf|<7g94oJ2ka*RWfZ%;uxRIHDaP)?{z!2RPp0alt|M~
z_iZZq2TT?4!A(Wne?t-5epJHvfvTo+`QIBRaO;(0`0+;%;|`|+?)=9wJb&*L(t>KH
z-Ta(%=RX|8Pd|DPcaiSluZaE6^G3-PC_c8Qj0ZO!#GUK*;Ev1o;LZ;XlZNnL9~#0>
zL?7ObpI$MD%^x4a3wIY#<@=ZpjKjU_khcHiARhYUV5AL$c=(e8k=F0RudmvHts4iR
zUlKlmEX2}7V99^N-FSPSJ+kZ|2a&&QsD`Sc;iSUO%IBJ2gb1LzA^vFHNgKhhz9Q;
z#qI|RIQZ-ll=x91urS6kDwa#?vGcgt&8#6SW?riC<&Y?L;(VMEN}&t2xEvzwUlKdg
ztil_T#(?a^0uv+zypjBIJ`MqDcv%L68q@P|xw2?7M4f@isj$cS6MzCDnUYFCjJh@C
z1a%LCO^PwKROyn8XF!IenGxYOrz0rMOVzy*CQQ`ec9(NlhdVH|cb$
z2c!{Mpv4uyEPC~S)qr|aEVYD)>m(w<`w2<_ipRqiCq{l3WHCrj%t#M)^#BjW#2QGV
z&z&*OdmP53iu?@o`y03bcEEw=A^?;o1~qD)j82%*VwWE<{-M?sA~4!ohyi9|lmMs!
zDW_pZ#;Tg}k{2Fq)X8hz8t_PCE(44xGjS@lE}Jp>&7?Cx87S0^qfAOljA_kg^or;=
z<9aC74K|hu7M_qHGO;vUD&-?7=I13jm|8ehQc0}iD7`0m*Tslqm&Wq=@~B6Tpnme?
zp-Xc*h<4+$m0vO8wY#J{j$>RBugor3l&CWU<7s~3d>lb^*Ekiz<%xLZm(S;t;uN09
zAlQx6g``MRaV#y!+c3g>5vE8ao`tB?d0be6VLUXBN!&s!Z8QVTs1Z(`or*ks6QU7&
zs2PD76$J=`Hz{(7+#wbX6&Z-SU{I41U9y~l^OVJ)VD6#9?kZWxnBADk1Z?J@d+FeV
zoSG()paVk39I=MZ6@Z8QYzTvTlbH-*^#h_FASF;h0KkPzBu%=buWnQ|o*eV$YvD(r}OIcAgaoQ{H=K`P|0-xW_T693QHXdM67qw1&WKt|2c!;-(J~Cbs)o$^3m<;x0XG3w>uk)yEIb-T31XiS3s5Z{48bm|X!00006Nkl
-
- {{title}}
-
-
-
-
-
diff --git a/uni_modules/no-data/package.json b/uni_modules/no-data/package.json
deleted file mode 100644
index 2237b9b..0000000
--- a/uni_modules/no-data/package.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
- "id": "no-data",
- "displayName": "no-data",
- "version": "1.0.0",
- "description": "no-data",
- "keywords": [
- "no-data"
- ],
- "repository": "",
- "engines": {
- "HBuilderX": "^3.1.0",
- "uni-app": "^3.1.0",
- "uni-app-x": "^3.1.0"
- },
- "dcloudext": {
- "sale": {
- "regular": {
- "price": "0.00"
- },
- "sourcecode": {
- "price": "0.00"
- }
- },
- "contact": {
- "qq": ""
- },
- "declaration": {
- "ads": "",
- "data": "",
- "permissions": ""
- },
- "npmurl": "",
- "type": "component-vue",
- "darkmode": "-",
- "i18n": "-",
- "widescreen": "-"
- },
- "uni_modules": {
- "dependencies": [],
- "encrypt": [],
- "platforms": {
- "cloud": {
- "tcb": "-",
- "aliyun": "-"
- },
- "client": {
- "uni-app": {
- "vue": {
- "vue2": "-",
- "vue3": "-"
- },
- "web": {
- "safari": "-",
- "chrome": "-"
- },
- "app": {
- "vue": "-",
- "nvue": "-",
- "android": "-",
- "ios": "-",
- "harmony": "-"
- },
- "mp": {
- "weixin": "-",
- "alipay": "-",
- "toutiao": "-",
- "baidu": "-",
- "kuaishou": "-",
- "jd": "-",
- "harmony": "-",
- "qq": "-",
- "lark": "-",
- "xhs": "-"
- },
- "quickapp": {
- "huawei": "-",
- "union": "-"
- }
- },
- "uni-app-x": {
- "web": {
- "safari": "-",
- "chrome": "-"
- },
- "app": {
- "android": "-",
- "ios": "-",
- "harmony": "-"
- },
- "mp": {
- "weixin": "-"
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/uni_modules/no-data/readme.md b/uni_modules/no-data/readme.md
deleted file mode 100644
index f6364f2..0000000
--- a/uni_modules/no-data/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# no-data
\ No newline at end of file
diff --git a/utils/enumUtils.js b/utils/enumUtils.js
index 4b7513a..e0041b2 100644
--- a/utils/enumUtils.js
+++ b/utils/enumUtils.js
@@ -167,13 +167,13 @@ export const WAY_LIST = [
disabled: false,
id: PAYMENT_WAY.WECHAT,
name: "微信支付",
- path: "/static/product/way_wx.png",
+ path: "/pages/other_package/static/product/way_wx.png",
},
{
disabled: false,
id: PAYMENT_WAY.ALIPAY,
name: "支付宝支付",
- path: "/static/product/way_zfb.png",
+ path: "/pages/other_package/static/product/way_zfb.png",
},
]
diff --git a/utils/request.js b/utils/request.js
index 7af91df..22c812d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -4,6 +4,27 @@ import { BASE_URL, Authorization } from "@/utils/config.js";
// utils/http.js (修改后的版本)
// const baseUrl = 'http://192.168.0.108:8087';
+let requestCount = 0;
+
+function showLoading() {
+ if (requestCount === 0) {
+ uni.showLoading({
+ title: "加载中...",
+ mask: false
+ });
+ }
+ requestCount++;
+}
+
+function hideLoading() {
+ if (requestCount > 0) {
+ requestCount--;
+ }
+ if (requestCount === 0) {
+ uni.hideLoading();
+ }
+}
+
function request(options) {
const {
url,
@@ -13,11 +34,10 @@ function request(options) {
isShowLoading = true,
} = options;
- // const token = uni.getStorageSync(tokenKey); // 获取token, 根据实际情况调整获取方式
- const token = getStorageFun(TOKEN_NAME); // 获取token, 根据实际情况调整获取方式
+ const token = getStorageFun(TOKEN_NAME);
let defaultHeaders = {
Authorization: Authorization,
- "HSM-AUTH": token ? token : "", // 如果存在token, 则添加到请求头中
+ "HSM-AUTH": token ? token : "",
"content-type": ["post", "POST"].includes(method)
? "application/x-www-form-urlencoded"
: "application/json",
@@ -30,13 +50,7 @@ function request(options) {
}
return new Promise((resolve, reject) => {
if (isShowLoading) {
- // 请求之前做一些事
- uni.showToast({
- title: "加载中...",
- image: "https://static.tbmall.xin/static/loading.gif",
- // image: "/static/common/loading.gif", // 本地图片路径
- position: "middle", // 可选:top/middle/bottom
- });
+ showLoading();
}
uni.request({
url: BASE_URL + url,
@@ -44,12 +58,11 @@ function request(options) {
data,
header: {
...defaultHeaders,
- ...headers, // 使用展开运算符合并默认头和自定义头
+ ...headers,
},
success: (res) => {
if (isShowLoading) {
- // 请求之前做一些事
- uni.hideToast();
+ hideLoading();
}
let data = res.data;
@@ -114,8 +127,7 @@ function request(options) {
fail: (error) => {
console.log("错误-2", url);
if (isShowLoading) {
- // 请求之前做一些事
- uni.hideToast();
+ hideLoading();
}
uni.showToast({
title: "服务器异常,稍后再试",
diff --git a/vite.config.js b/vite.config.js
index 881c9fa..f7f604a 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -3,6 +3,17 @@ import uni from '@dcloudio/vite-plugin-uni';
export default defineConfig({
plugins: [uni()],
+ build: {
+ minify: 'terser',
+ terserOptions: {
+ compress: {
+ drop_console: process.env.NODE_ENV === 'production',
+ drop_debugger: process.env.NODE_ENV === 'production',
+ },
+ },
+ assetsInlineLimit: 4096,
+ cssCodeSplit: true,
+ },
server: {
port: 5173,
proxy: {