From 3bd09a9c5d94c1952dcbcfb9c532157e09777927 Mon Sep 17 00:00:00 2001
From: xiaogang <825201136@qq.com>
Date: Tue, 2 Jul 2024 09:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E5=82=A8=E5=A5=B6=E8=8C=B6=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env | 3 +-
package.json | 3 +-
pnpm-lock.yaml | 80 +++++++++
src/api/ycnc.js | 6 +
src/interceptors/request.js | 1 -
src/pages.json | 8 +
src/pages/ycnc/components/order-item.vue | 47 ++++--
src/pages/ycnc/components/product-item.vue | 50 +++---
src/pages/ycnc/detail.vue | 91 ++++++++---
src/pages/ycnc/hooks/usePay.js | 2 +-
src/pages/ycnc/index.vue | 105 +++++-------
src/pages/ycnc/order.vue | 142 ++++++++++++----
src/pages/ycnc/orderDetail.vue | 181 +++++++++++++++++++++
src/static/ycnc/bg-nodata.png | Bin 0 -> 16113 bytes
uni-pages.d.ts | 3 +-
vite.config.js | 41 +++--
16 files changed, 581 insertions(+), 182 deletions(-)
create mode 100644 src/pages/ycnc/orderDetail.vue
create mode 100644 src/static/ycnc/bg-nodata.png
diff --git a/.env b/.env
index 07cad84..1b4d3ca 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,4 @@
# 邮储奶茶活动
VITE_YCNC_APPID = '2vikrqptiia9pe9bf5ztrd'
-VITE_YCNC_SECRET = '6fpfwdkgcggyk0yf2yb6bt'
\ No newline at end of file
+VITE_YCNC_SECRET = '6fpfwdkgcggyk0yf2yb6bt'
+VITE_TEST_TOKEN = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjdXN0Tm8iOiIzOTY3ODA2ODcwMjIyIiwiZXhwIjoxNzE5NTQxNzA5LCJpZCI6IjIifQ.cDjKKYYTYOPPYUh8XidADpxr8xZ_WXbZ9b1pZt1Kzm4'
\ No newline at end of file
diff --git a/package.json b/package.json
index 13821d6..d93c381 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
"sass": "^1.77.5",
"sass-loader": "^10.1.1",
"unocss": "~0.58.9",
- "vite": "5.2.8"
+ "vite": "5.2.8",
+ "vite-plugin-zip-pack": "1.0.7"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2165210..a1e107b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -105,6 +105,9 @@ importers:
vite:
specifier: 5.2.8
version: 5.2.8(@types/node@20.14.2)(sass@1.77.5)(terser@5.31.1)
+ vite-plugin-zip-pack:
+ specifier: 1.0.7
+ version: 1.0.7(vite@5.2.8(@types/node@20.14.2)(sass@1.77.5)(terser@5.31.1))
packages:
@@ -2012,6 +2015,9 @@ packages:
core-js@3.37.1:
resolution: {integrity: sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==}
+ core-util-is@1.0.3:
+ resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
+
cross-env@7.0.3:
resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
@@ -2456,6 +2462,9 @@ packages:
ieee754@1.2.1:
resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+ immediate@3.0.6:
+ resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
+
immutable@4.3.6:
resolution: {integrity: sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==}
@@ -2526,6 +2535,9 @@ packages:
is-typedarray@1.0.0:
resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
+ isarray@1.0.0:
+ resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+
isexe@2.0.0:
resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
@@ -2745,6 +2757,9 @@ packages:
jsonfile@6.1.0:
resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+ jszip@3.10.1:
+ resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
+
kleur@3.0.3:
resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
engines: {node: '>=6'}
@@ -2767,6 +2782,9 @@ packages:
licia@1.40.0:
resolution: {integrity: sha512-iNujT47WfM7NTHOhxnXUdvW2ELAXNuViJZaLimId6a6b++5VQmse042Wkrx774KoYvVwD98qbdEtS3CWaAzzFQ==}
+ lie@3.3.0:
+ resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
+
lilconfig@2.1.0:
resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}
engines: {node: '>=10'}
@@ -3163,6 +3181,9 @@ packages:
resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+ process-nextick-args@2.0.1:
+ resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
+
process@0.11.10:
resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
engines: {node: '>= 0.6.0'}
@@ -3220,6 +3241,9 @@ packages:
read-cache@1.0.0:
resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
+ readable-stream@2.3.8:
+ resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
+
readdirp@3.6.0:
resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
engines: {node: '>=8.10.0'}
@@ -3291,6 +3315,9 @@ packages:
safe-area-insets@1.4.1:
resolution: {integrity: sha512-r/nRWTjFGhhm3w1Z6Kd/jY11srN+lHt2mNl1E/emQGW8ic7n3Avu4noibklfSM+Y34peNphHD/BSZecav0sXYQ==}
+ safe-buffer@5.1.2:
+ resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+
safe-buffer@5.2.1:
resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
@@ -3356,6 +3383,9 @@ packages:
resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
engines: {node: '>= 0.4'}
+ setimmediate@1.0.5:
+ resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
+
setprototypeof@1.2.0:
resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
@@ -3425,6 +3455,9 @@ packages:
resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
engines: {node: '>=8'}
+ string_decoder@1.1.1:
+ resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+
strip-ansi@6.0.1:
resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
engines: {node: '>=8'}
@@ -3658,6 +3691,11 @@ packages:
resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
engines: {node: '>= 0.8'}
+ vite-plugin-zip-pack@1.0.7:
+ resolution: {integrity: sha512-URNInflOMS8eSv9kfHK9O+TYBhFrbe3+0v5TM0PQZOTJ73/VDl1pfQC1f0xu687+c1zMuirMjsVQ3e23F3xU7w==}
+ peerDependencies:
+ vite: '>=2.x'
+
vite@5.2.8:
resolution: {integrity: sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -6738,6 +6776,8 @@ snapshots:
core-js@3.37.1: {}
+ core-util-is@1.0.3: {}
+
cross-env@7.0.3:
dependencies:
cross-spawn: 7.0.3
@@ -7180,6 +7220,8 @@ snapshots:
ieee754@1.2.1: {}
+ immediate@3.0.6: {}
+
immutable@4.3.6: {}
import-local@3.1.0:
@@ -7230,6 +7272,8 @@ snapshots:
is-typedarray@1.0.0: {}
+ isarray@1.0.0: {}
+
isexe@2.0.0: {}
istanbul-lib-coverage@3.2.2: {}
@@ -7696,6 +7740,13 @@ snapshots:
optionalDependencies:
graceful-fs: 4.2.11
+ jszip@3.10.1:
+ dependencies:
+ lie: 3.3.0
+ pako: 1.0.11
+ readable-stream: 2.3.8
+ setimmediate: 1.0.5
+
kleur@3.0.3: {}
klona@2.0.6: {}
@@ -7710,6 +7761,10 @@ snapshots:
licia@1.40.0: {}
+ lie@3.3.0:
+ dependencies:
+ immediate: 3.0.6
+
lilconfig@2.1.0: {}
lines-and-columns@1.2.4: {}
@@ -8058,6 +8113,8 @@ snapshots:
ansi-styles: 5.2.0
react-is: 17.0.2
+ process-nextick-args@2.0.1: {}
+
process@0.11.10: {}
prompts@2.4.2:
@@ -8109,6 +8166,16 @@ snapshots:
dependencies:
pify: 2.3.0
+ readable-stream@2.3.8:
+ dependencies:
+ core-util-is: 1.0.3
+ inherits: 2.0.4
+ isarray: 1.0.0
+ process-nextick-args: 2.0.1
+ safe-buffer: 5.1.2
+ string_decoder: 1.1.1
+ util-deprecate: 1.0.2
+
readdirp@3.6.0:
dependencies:
picomatch: 2.3.1
@@ -8192,6 +8259,8 @@ snapshots:
safe-area-insets@1.4.1: {}
+ safe-buffer@5.1.2: {}
+
safe-buffer@5.2.1: {}
safer-buffer@2.1.2: {}
@@ -8271,6 +8340,8 @@ snapshots:
gopd: 1.0.1
has-property-descriptors: 1.0.2
+ setimmediate@1.0.5: {}
+
setprototypeof@1.2.0: {}
shebang-command@2.0.0:
@@ -8332,6 +8403,10 @@ snapshots:
is-fullwidth-code-point: 3.0.0
strip-ansi: 6.0.1
+ string_decoder@1.1.1:
+ dependencies:
+ safe-buffer: 5.1.2
+
strip-ansi@6.0.1:
dependencies:
ansi-regex: 5.0.1
@@ -8569,6 +8644,11 @@ snapshots:
vary@1.1.2: {}
+ vite-plugin-zip-pack@1.0.7(vite@5.2.8(@types/node@20.14.2)(sass@1.77.5)(terser@5.31.1)):
+ dependencies:
+ jszip: 3.10.1
+ vite: 5.2.8(@types/node@20.14.2)(sass@1.77.5)(terser@5.31.1)
+
vite@5.2.8(@types/node@20.14.2)(sass@1.77.5)(terser@5.31.1):
dependencies:
esbuild: 0.20.2
diff --git a/src/api/ycnc.js b/src/api/ycnc.js
index 5f6c22b..ca2b625 100644
--- a/src/api/ycnc.js
+++ b/src/api/ycnc.js
@@ -32,3 +32,9 @@ export const goPay = (params) => http({
...params
})
+export const queryOrderDetail = (params) => http({
+ url:'/api/v1/auth/order/query',
+ method:'POST',
+ ...params
+})
+
diff --git a/src/interceptors/request.js b/src/interceptors/request.js
index 50ff467..41120b5 100644
--- a/src/interceptors/request.js
+++ b/src/interceptors/request.js
@@ -8,7 +8,6 @@ const httpInterceptor = {
// 拦截前触发
invoke(options) {
// 接口请求支持通过 query 参数配置 queryString
- console.log('options', options)
if (options.query) {
const queryStr = qs.stringify(options.query)
if (options.url.includes('?')) {
diff --git a/src/pages.json b/src/pages.json
index 8c03873..3df268c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -23,6 +23,14 @@
"navigationStyle": "custom",
"navigationBarTitleText": "我的订单"
}
+ },
+ {
+ "path": "pages/ycnc/orderDetail",
+ "type": "page",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTitleText": "订单详情"
+ }
}
],
"globalStyle": {
diff --git a/src/pages/ycnc/components/order-item.vue b/src/pages/ycnc/components/order-item.vue
index 3bb2371..104cb89 100644
--- a/src/pages/ycnc/components/order-item.vue
+++ b/src/pages/ycnc/components/order-item.vue
@@ -1,5 +1,5 @@
-
+
订单编号:{{ detail.order_no }}
{{ stateConfig[detail.state] }}
@@ -13,22 +13,20 @@
{{ detail.product_name }}
-
- ¥5元
+ ¥{{ detail.price }}元
-
+
数量
-
x1
下单时间:{{ detail.create_time }}
-
+
立即付款
- 查看卡密
+ 查看卡密
@@ -42,9 +40,22 @@
default:() => ({})
}
})
- const emits = defineEmits(['pay-event'])
- function goPay(){
- emits('pay-event', detail);
+ const emits = defineEmits(['pay-event','detail-event','pwd-event'])
+ function goPay(e){
+ if(e.stopPropagation) { //W3C阻止冒泡方法
+ e.stopPropagation();
+ }
+ emits('pay-event', props.detail);
+ }
+ function goDetail(e){
+ emits('detail-event', props.detail);
+ }
+
+ function goPwd(e){
+ if(e.stopPropagation) { //W3C阻止冒泡方法
+ e.stopPropagation();
+ }
+ emits('pwd-event', props.detail);
}
@@ -92,6 +103,17 @@
overflow: hidden;
white-space: nowrap;
}
+ .amount{
+ color: #333333;
+ font-weight: 400;
+ font-size:24rpx;
+ text:nth-child(1){
+ font-size:20rpx;
+ }
+ text:nth-child(2){
+ font-size:22rpx;
+ }
+ }
.name{
font-size: 24rpx;
color: #333333;
@@ -111,8 +133,9 @@
border-radius: 68rpx;
font-weight: 400;
font-size: 28rpx;
- text-align: center;
- line-height: 64rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
margin-left:48rpx;
}
.del{
diff --git a/src/pages/ycnc/components/product-item.vue b/src/pages/ycnc/components/product-item.vue
index cd7bcff..9cd5408 100644
--- a/src/pages/ycnc/components/product-item.vue
+++ b/src/pages/ycnc/components/product-item.vue
@@ -1,9 +1,13 @@
-
-
+
+
+
+
+
{{ config[detail.brandFlag].name}}
{{ detail.voucherTitle }}
@@ -37,7 +41,6 @@
}
})
const goBuy = (e) => {
- e = e || window.event;
if(e.stopPropagation) { //W3C阻止冒泡方法
e.stopPropagation();
}
@@ -52,11 +55,9 @@
.pro-item-wrapper{
width:212rpx;
height:370rpx;
- // background: url('../../../static/ycnc/bg-product.png') no-repeat;
- // background: url('/static/ycnc/bg-product.png') no-repeat;
background: url('/static/ycnc/bg-product.jpg') no-repeat;
background-size: 100% 100%;
- padding: 4rpx 4rpx 10rpx;
+ padding: 6rpx 6rpx 10rpx;
margin-top:20rpx;
margin-right: 20rpx;
&:nth-child(3n){
@@ -64,7 +65,7 @@
}
}
.bottom-container{
- padding: 0 12rpx;
+ padding: 0 8rpx;
}
.brand{
font-weight: 400;
@@ -72,20 +73,21 @@
color: #887F6E;
}
-.img{
+.img-container{
width:100%;
- height:156rpx;
- display: block;
+ height:152rpx;
box-sizing: border-box;
- border:1px solid red;
- margin-bottom:12rpx;
- border-radius:16rpx;
+ border-radius: 18rpx;
+ overflow: hidden;
+ .img{
+ width:100%;
+ height: 100%;
+ }
}
.name{
font-weight: 400;
font-size: 28rpx;
color: #3B2609;
- margin:4rpx 0;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -108,25 +110,13 @@
// text-decoration: line-through;
}
}
-// .btn{
-// width:166rpx;
-// height:66rpx;
-// background: url('../../../static/ycnc/bg-btn.png') no-repeat;
-// background-size: 100% 100%;
-// font-weight: 400;
-// font-size: 26rpx;
-// color: #FFFFFF;
-// text-align: center;
-// line-height: 66rpx;
-// margin-top:12rpx;
-// }
.btn{
width: 166rpx;
height: 56rpx;
background: linear-gradient( 180deg, #FFF8EA 0%, #FFD9BC 100%);
box-shadow: 0rpx 1 2rpx 0rpx #FAD5A8;
border-radius: 28rpx;
- margin-top:18rpx;
+ margin-top:20rpx;
.btn-content {
width: 158rpx;
height: 48rpx;
diff --git a/src/pages/ycnc/detail.vue b/src/pages/ycnc/detail.vue
index db16c86..46f5709 100644
--- a/src/pages/ycnc/detail.vue
+++ b/src/pages/ycnc/detail.vue
@@ -13,19 +13,28 @@
- {{ detailObj.name }}
+ {{ detailObj.name }}
¥{{ detailObj.show_price }}
{{ detailObj.price }}
-
-
+
+
+
-
- 立即支付
+
+
+ 立即支付
+
@@ -72,7 +81,7 @@
}
-
\ No newline at end of file
diff --git a/src/static/ycnc/bg-nodata.png b/src/static/ycnc/bg-nodata.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d7ee07dbc344ee3e5592b337e5d7ae8cda3e248
GIT binary patch
literal 16113
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
R|JASqWTliOYs5`L{s&7YO(y^V
literal 0
HcmV?d00001
diff --git a/uni-pages.d.ts b/uni-pages.d.ts
index 06a6106..2c45296 100644
--- a/uni-pages.d.ts
+++ b/uni-pages.d.ts
@@ -6,7 +6,8 @@
interface NavigateToOptions {
url: "/pages/ycnc/index" |
"/pages/ycnc/detail" |
- "/pages/ycnc/order";
+ "/pages/ycnc/order" |
+ "/pages/ycnc/orderDetail";
}
interface RedirectToOptions extends NavigateToOptions {}
diff --git a/vite.config.js b/vite.config.js
index 50e29ba..44bc11f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -2,21 +2,34 @@ import { defineConfig } from 'vite'
import uni from '@dcloudio/vite-plugin-uni'
import UniPages from '@uni-helper/vite-plugin-uni-pages'
import UnoCSS from 'unocss/vite'
+import zipPack from "vite-plugin-zip-pack"
+import dayjs from "dayjs";
// https://vitejs.dev/config/
import getPages from './build'
-const exclude = getPages()
+const exclude = getPages();
-export default defineConfig({
- plugins: [
- UniPages({
- exclude: ['**/components/**/**.*',...exclude],
- routeBlockLang: 'json5', // 虽然设了默认值,但是vue文件还是要加上 lang="json5", 这样才能很好地格式化
- // homePage 通过 vue 文件的 route-block 的type="home"来设定
- // pages 目录为 src/pages,分包目录不能配置在pages目录下
- // subPackages: ['src/pages-sub'], // 是个数组,可以配置多个,但是不能为pages里面的目录
- }),
- uni(),
- UnoCSS(),
- ],
-})
+const timeStringNow = dayjs().format("YYYY-MM-DD HH-mm-ss")
+
+export default defineConfig(({ command, mode }) => {
+ const { UNI_PLATFORM } = process.env // 得到 mp-weixin, h5, app 等
+ return {
+ plugins: [
+ UniPages({
+ exclude: ['**/components/**/**.*',...exclude],
+ routeBlockLang: 'json5', // 虽然设了默认值,但是vue文件还是要加上 lang="json5", 这样才能很好地格式化
+ // homePage 通过 vue 文件的 route-block 的type="home"来设定
+ // pages 目录为 src/pages,分包目录不能配置在pages目录下
+ // subPackages: ['src/pages-sub'], // 是个数组,可以配置多个,但是不能为pages里面的目录
+ }),
+ uni(),
+ UnoCSS(),
+ zipPack({
+ inDir: `dist/build/${UNI_PLATFORM}`, // 输入的文件夹,就是要打包的文件夹
+ outDir: `dist/build`, // 打包好的 zip 文件放到哪个文件夹下
+ outFileName: `${UNI_PLATFORM}-${timeStringNow}.zip`, //文件名不能包含\/:*?"<>|
+ pathPrefix: ''
+ })
+ ]
+ }
+})
\ No newline at end of file