From 2213052b052b4f56a23029161dc4aaefdaa17894 Mon Sep 17 00:00:00 2001
From: xiaogang <825201136@qq.com>
Date: Mon, 8 Jul 2024 15:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E6=96=87?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.development | 2 +
.env.production | 2 +
build.js | 11 +-
package.json | 1 +
pages.config.js | 2 +-
pnpm-lock.yaml | 66 +++++++
src/App.vue | 3 +
src/pages.json | 3 +-
src/pages/index/index.vue | 202 ---------------------
src/pages/xyyk/index.vue | 13 +-
src/pages/ycnc/components/brand.vue | 22 ++-
src/pages/ycnc/components/product-item.vue | 3 +-
src/pages/ycnc/config.js | 19 +-
src/pages/ycnc/index.vue | 8 +-
src/pages/ycnc/order.vue | 6 +-
src/pages/ycnc/orderDetail.vue | 4 +-
src/static/image/bg.png | Bin 150214 -> 0 bytes
src/static/image/ic_close.png | Bin 661 -> 0 bytes
src/static/image/icon-close.png | Bin 243 -> 0 bytes
src/static/image/input_c.png | Bin 34347 -> 0 bytes
src/static/image/popup_bg.png | Bin 80835 -> 0 bytes
src/static/image/popup_btn.png | Bin 4386 -> 0 bytes
src/static/image/tips_bg.png | Bin 62537 -> 0 bytes
src/static/ycnc/bg1.png | Bin 93208 -> 0 bytes
vite.config.js | 37 +++-
25 files changed, 160 insertions(+), 244 deletions(-)
delete mode 100644 src/pages/index/index.vue
delete mode 100644 src/static/image/bg.png
delete mode 100644 src/static/image/ic_close.png
delete mode 100644 src/static/image/icon-close.png
delete mode 100644 src/static/image/input_c.png
delete mode 100644 src/static/image/popup_bg.png
delete mode 100644 src/static/image/popup_btn.png
delete mode 100644 src/static/image/tips_bg.png
delete mode 100644 src/static/ycnc/bg1.png
diff --git a/.env.development b/.env.development
index 872f370..3a4f862 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,7 @@
#请求url前缀
# 中信建投
# VITE_BASE_URL = 'http://zxjt.test.86698.cn'
+# 兴业优酷
+# VITE_BASE_URL = 'http://192.168.110.50:8083'
# 邮储奶茶活动
VITE_BASE_URL = 'http://milk.api.test.86698.cn'
diff --git a/.env.production b/.env.production
index d873cf3..e8cae87 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,7 @@
#请求url前缀
# 中信建投
# VITE_BASE_URL = 'https://zxjt.86698.cn'
+# 兴业优酷
+# VITE_BASE_URL = 'http://192.168.110.50:8083'
# 邮储奶茶活动
VITE_BASE_URL = 'http://milk.api.test.86698.cn'
\ No newline at end of file
diff --git a/build.js b/build.js
index 50aca25..838581a 100644
--- a/build.js
+++ b/build.js
@@ -6,12 +6,10 @@ const { pages, pagesInclude } = config
const getPages = () => {
const srcPath = path.resolve(__dirname, pages)
- // console.log('00',srcPath);
- // console.log('01',fs.readdirSync(srcPath));
//所有的模块
const allModule = fs.readdirSync(srcPath);
// console.log('allModule',allModule);
- //指定特定页面的模块
+ //指定的完整模块
const completeModule = pagesInclude.filter(item => item.indexOf('.vue') === -1)
// console.log('completeModule',completeModule);
//需要排除的整个模块
@@ -29,8 +27,6 @@ const getPages = () => {
}
return acc
},{})
- // console.log(targetModule);
- // console.log(fs.readdirSync(path.resolve(__dirname,pages,'xyyk')));
//需要排除的特定的页面
const excludePages = [];
Object.keys(targetModule).forEach((ele,index) => {
@@ -42,7 +38,10 @@ const getPages = () => {
excludePages.push(...targetExclude)
})
console.log('排除的模块以及页面',[...excludeModule,...excludePages]);
- return [...excludeModule,...excludePages]
+ return {
+ exclude:[...excludeModule,...excludePages],
+ staticModule:[...completeModule,... Object.keys(targetModule)]
+ }
}
export default getPages
diff --git a/package.json b/package.json
index 4c56088..aa7382e 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
"@dcloudio/uni-quickapp-webview": "3.0.0-4010520240507001",
"@dcloudio/uni-ui": "^1.5.5",
"dayjs": "^1.11.11",
+ "fs.extra": "^1.3.2",
"js-md5": "^0.8.3",
"normalize.css": "^8.0.1",
"qs": "^6.12.1",
diff --git a/pages.config.js b/pages.config.js
index e3bb510..ab1a8b3 100644
--- a/pages.config.js
+++ b/pages.config.js
@@ -4,7 +4,7 @@ export default defineUniPages({
// 你也可以定义 pages 字段，它具有最高的优先级。
pages: [],
globalStyle: {
- navigationStyle: 'custom',
+ navigationStyle: 'default',
navigationBarTextStyle: 'black',
navigationBarTitleText: '首页',
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a1e107b..4133df1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -56,9 +56,15 @@ importers:
dayjs:
specifier: ^1.11.11
version: 1.11.11
+ fs.extra:
+ specifier: ^1.3.2
+ version: 1.3.2
js-md5:
specifier: ^0.8.3
version: 0.8.3
+ normalize.css:
+ specifier: ^8.0.1
+ version: 8.0.1
qs:
specifier: ^6.12.1
version: 6.12.1
@@ -2312,6 +2318,9 @@ packages:
resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
engines: {node: '>=10'}
+ foreachasync@3.0.0:
+ resolution: {integrity: sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==}
+
form-data@3.0.1:
resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
engines: {node: '>= 6'}
@@ -2327,10 +2336,16 @@ packages:
resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
engines: {node: '>= 0.6'}
+ fs-extra@0.6.4:
+ resolution: {integrity: sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==}
+
fs-extra@10.1.0:
resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
engines: {node: '>=12'}
+ fs.extra@1.3.2:
+ resolution: {integrity: sha512-Ig401VXtyrWrz23k9KxAx9OrnL8AHSLNhQ8YJH2wSYuH0ZUfxwBeY6zXkd/oOyVRFTlpEu/0n5gHeuZt7aqbkw==}
+
fs.realpath@1.0.0:
resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
@@ -2754,6 +2769,9 @@ packages:
jsonc-parser@3.2.1:
resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==}
+ jsonfile@1.0.1:
+ resolution: {integrity: sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==}
+
jsonfile@6.1.0:
resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
@@ -2926,6 +2944,10 @@ packages:
minimist@1.2.8:
resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+ mkdirp@0.3.5:
+ resolution: {integrity: sha512-8OCq0De/h9ZxseqzCH8Kw/Filf5pF/vMI6+BH7Lu0jXz2pqYCjTAQRolSxRIi+Ax+oCCjlxoJMP0YQ4XlrQNHg==}
+ deprecated: Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)
+
mkdirp@0.5.6:
resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
hasBin: true
@@ -2957,6 +2979,10 @@ packages:
natural-compare@1.4.0:
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+ ncp@0.4.2:
+ resolution: {integrity: sha512-PfGU8jYWdRl4FqJfCy0IzbkGyFHntfWygZg46nFk/dJD/XRrk2cj0SsKSX9n5u5gE0E0YfEpKWrEkfjnlZSTXA==}
+ hasBin: true
+
negotiator@0.6.3:
resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
engines: {node: '>= 0.6'}
@@ -2981,6 +3007,9 @@ packages:
resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
engines: {node: '>=0.10.0'}
+ normalize.css@8.0.1:
+ resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==}
+
npm-run-path@4.0.1:
resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
engines: {node: '>=8'}
@@ -3299,6 +3328,11 @@ packages:
resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+ rimraf@2.2.8:
+ resolution: {integrity: sha512-R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg==}
+ deprecated: Rimraf versions prior to v4 are no longer supported
+ hasBin: true
+
rimraf@3.0.2:
resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
deprecated: Rimraf versions prior to v4 are no longer supported
@@ -3751,6 +3785,9 @@ packages:
resolution: {integrity: sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==}
engines: {node: '>=10'}
+ walk@2.3.15:
+ resolution: {integrity: sha512-4eRTBZljBfIISK1Vnt69Gvr2w/wc3U6Vtrw7qiN5iqYJPH7LElcYh/iU4XWhdCy2dZqv1ToMyYlybDylfG/5Vg==}
+
walker@1.0.8:
resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
@@ -7080,6 +7117,8 @@ snapshots:
locate-path: 6.0.0
path-exists: 4.0.0
+ foreachasync@3.0.0: {}
+
form-data@3.0.1:
dependencies:
asynckit: 0.4.0
@@ -7092,12 +7131,25 @@ snapshots:
fresh@0.5.2: {}
+ fs-extra@0.6.4:
+ dependencies:
+ jsonfile: 1.0.1
+ mkdirp: 0.3.5
+ ncp: 0.4.2
+ rimraf: 2.2.8
+
fs-extra@10.1.0:
dependencies:
graceful-fs: 4.2.11
jsonfile: 6.1.0
universalify: 2.0.1
+ fs.extra@1.3.2:
+ dependencies:
+ fs-extra: 0.6.4
+ mkdirp: 0.3.5
+ walk: 2.3.15
+
fs.realpath@1.0.0: {}
fsevents@2.3.3:
@@ -7734,6 +7786,8 @@ snapshots:
jsonc-parser@3.2.1: {}
+ jsonfile@1.0.1: {}
+
jsonfile@6.1.0:
dependencies:
universalify: 2.0.1
@@ -7884,6 +7938,8 @@ snapshots:
minimist@1.2.8: {}
+ mkdirp@0.3.5: {}
+
mkdirp@0.5.6:
dependencies:
minimist: 1.2.8
@@ -7909,6 +7965,8 @@ snapshots:
natural-compare@1.4.0: {}
+ ncp@0.4.2: {}
+
negotiator@0.6.3: {}
neo-async@2.6.2: {}
@@ -7923,6 +7981,8 @@ snapshots:
normalize-range@0.1.2: {}
+ normalize.css@8.0.1: {}
+
npm-run-path@4.0.1:
dependencies:
path-key: 3.1.1
@@ -8227,6 +8287,8 @@ snapshots:
reusify@1.0.4: {}
+ rimraf@2.2.8: {}
+
rimraf@3.0.2:
dependencies:
glob: 7.2.3
@@ -8688,6 +8750,10 @@ snapshots:
dependencies:
xml-name-validator: 3.0.0
+ walk@2.3.15:
+ dependencies:
+ foreachasync: 3.0.0
+
walker@1.0.8:
dependencies:
makeerror: 1.0.12
diff --git a/src/App.vue b/src/App.vue
index d8e7136..b257c51 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -21,6 +21,9 @@ uni-page{
uni-page-body{
height: 100%;
}
+uni-page-head{
+ display: none !important;
+}
body{
font-family: 'PingFang SC','Source Han Sans';
}
diff --git a/src/pages.json b/src/pages.json
index 7b0e589..2a98f88 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -4,6 +4,7 @@
"path": "pages/ycnc/index",
"type": "home",
"style": {
+ "navigationStyle": "custom",
"navigationBarTitleText": "奶茶活动",
"navigationBarBackgroundColor": "#FFF"
}
@@ -37,7 +38,7 @@
}
],
"globalStyle": {
- "navigationStyle": "custom",
+ "navigationStyle": "default",
"navigationBarTextStyle": "black",
"navigationBarTitleText": "首页"
},
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
deleted file mode 100644
index 61fd37e..0000000
--- a/src/pages/index/index.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/xyyk/index.vue b/src/pages/xyyk/index.vue
index dee57df..aecf0ac 100644
--- a/src/pages/xyyk/index.vue
+++ b/src/pages/xyyk/index.vue
@@ -51,11 +51,12 @@
//页面连接中带code代表第一次进入页面,带订单号代表支付回调回来进入页面
const code = getQueryString('code');
const orderNo = getQueryString('order_no');
- if(code){
- getProductConfig()
- }else if(orderNo){
- queryOrderStatus()
- }
+ // if(code){
+ // getProductConfig()
+ // }else if(orderNo){
+ // queryOrderStatus()
+ // }
+ getProductConfig()
})
const getProductConfig = async () => {
@@ -211,7 +212,7 @@
box-sizing: border-box;
padding-top:290rpx;
.popup-title{
- font-weight:600;
+ font-weight:700;
color:#111B1F;
font-size:60rpx;
margin-top:24rpx;
diff --git a/src/pages/ycnc/components/brand.vue b/src/pages/ycnc/components/brand.vue
index 689d6f9..55b0b76 100644
--- a/src/pages/ycnc/components/brand.vue
+++ b/src/pages/ycnc/components/brand.vue
@@ -1,7 +1,7 @@
-
+
@@ -26,7 +26,7 @@
-
\ No newline at end of file
diff --git a/src/pages/ycnc/order.vue b/src/pages/ycnc/order.vue
index ddb64be..f1f7a16 100644
--- a/src/pages/ycnc/order.vue
+++ b/src/pages/ycnc/order.vue
@@ -13,7 +13,7 @@
-
+
@@ -21,7 +21,7 @@
@@ -143,7 +143,7 @@
box-sizing: border-box;
padding-bottom:30rpx
}
-.wrapper{
+.order-wrapper{
width:100%;
}
.no-more{
diff --git a/src/pages/ycnc/orderDetail.vue b/src/pages/ycnc/orderDetail.vue
index 534da5d..e590315 100644
--- a/src/pages/ycnc/orderDetail.vue
+++ b/src/pages/ycnc/orderDetail.vue
@@ -68,7 +68,7 @@
if(voucher_link){
window.location.href = voucher_link
}else{
- console.error(`${voucher_link}无有效值`);
+ console.error(`voucher_link无有效值`);
}
}
@@ -87,7 +87,7 @@
}
-