修改部分文件

This commit is contained in:
xiaogang 2024-07-08 15:13:35 +08:00
parent 4c5efc8852
commit 2213052b05
25 changed files with 160 additions and 244 deletions

View File

@ -1,5 +1,7 @@
#请求url前缀 #请求url前缀
# 中信建投 # 中信建投
# VITE_BASE_URL = 'http://zxjt.test.86698.cn' # 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' VITE_BASE_URL = 'http://milk.api.test.86698.cn'

View File

@ -1,5 +1,7 @@
#请求url前缀 #请求url前缀
# 中信建投 # 中信建投
# VITE_BASE_URL = 'https://zxjt.86698.cn' # 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' VITE_BASE_URL = 'http://milk.api.test.86698.cn'

View File

@ -6,12 +6,10 @@ const { pages, pagesInclude } = config
const getPages = () => { const getPages = () => {
const srcPath = path.resolve(__dirname, pages) const srcPath = path.resolve(__dirname, pages)
// console.log('00',srcPath);
// console.log('01',fs.readdirSync(srcPath));
//所有的模块 //所有的模块
const allModule = fs.readdirSync(srcPath); const allModule = fs.readdirSync(srcPath);
// console.log('allModule',allModule); // console.log('allModule',allModule);
//指定特定页面的模块 //指定完整模块
const completeModule = pagesInclude.filter(item => item.indexOf('.vue') === -1) const completeModule = pagesInclude.filter(item => item.indexOf('.vue') === -1)
// console.log('completeModule',completeModule); // console.log('completeModule',completeModule);
//需要排除的整个模块 //需要排除的整个模块
@ -29,8 +27,6 @@ const getPages = () => {
} }
return acc return acc
},{}) },{})
// console.log(targetModule);
// console.log(fs.readdirSync(path.resolve(__dirname,pages,'xyyk')));
//需要排除的特定的页面 //需要排除的特定的页面
const excludePages = []; const excludePages = [];
Object.keys(targetModule).forEach((ele,index) => { Object.keys(targetModule).forEach((ele,index) => {
@ -42,7 +38,10 @@ const getPages = () => {
excludePages.push(...targetExclude) excludePages.push(...targetExclude)
}) })
console.log('排除的模块以及页面',[...excludeModule,...excludePages]); console.log('排除的模块以及页面',[...excludeModule,...excludePages]);
return [...excludeModule,...excludePages] return {
exclude:[...excludeModule,...excludePages],
staticModule:[...completeModule,... Object.keys(targetModule)]
}
} }
export default getPages export default getPages

View File

@ -56,6 +56,7 @@
"@dcloudio/uni-quickapp-webview": "3.0.0-4010520240507001", "@dcloudio/uni-quickapp-webview": "3.0.0-4010520240507001",
"@dcloudio/uni-ui": "^1.5.5", "@dcloudio/uni-ui": "^1.5.5",
"dayjs": "^1.11.11", "dayjs": "^1.11.11",
"fs.extra": "^1.3.2",
"js-md5": "^0.8.3", "js-md5": "^0.8.3",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
"qs": "^6.12.1", "qs": "^6.12.1",

View File

@ -4,7 +4,7 @@ export default defineUniPages({
// 你也可以定义 pages 字段,它具有最高的优先级。 // 你也可以定义 pages 字段,它具有最高的优先级。
pages: [], pages: [],
globalStyle: { globalStyle: {
navigationStyle: 'custom', navigationStyle: 'default',
navigationBarTextStyle: 'black', navigationBarTextStyle: 'black',
navigationBarTitleText: '首页', navigationBarTitleText: '首页',
}, },

View File

@ -56,9 +56,15 @@ importers:
dayjs: dayjs:
specifier: ^1.11.11 specifier: ^1.11.11
version: 1.11.11 version: 1.11.11
fs.extra:
specifier: ^1.3.2
version: 1.3.2
js-md5: js-md5:
specifier: ^0.8.3 specifier: ^0.8.3
version: 0.8.3 version: 0.8.3
normalize.css:
specifier: ^8.0.1
version: 8.0.1
qs: qs:
specifier: ^6.12.1 specifier: ^6.12.1
version: 6.12.1 version: 6.12.1
@ -2312,6 +2318,9 @@ packages:
resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
engines: {node: '>=10'} engines: {node: '>=10'}
foreachasync@3.0.0:
resolution: {integrity: sha512-J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==}
form-data@3.0.1: form-data@3.0.1:
resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==} resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
engines: {node: '>= 6'} engines: {node: '>= 6'}
@ -2327,10 +2336,16 @@ packages:
resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==} resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
engines: {node: '>= 0.6'} engines: {node: '>= 0.6'}
fs-extra@0.6.4:
resolution: {integrity: sha512-5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ==}
fs-extra@10.1.0: fs-extra@10.1.0:
resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
engines: {node: '>=12'} engines: {node: '>=12'}
fs.extra@1.3.2:
resolution: {integrity: sha512-Ig401VXtyrWrz23k9KxAx9OrnL8AHSLNhQ8YJH2wSYuH0ZUfxwBeY6zXkd/oOyVRFTlpEu/0n5gHeuZt7aqbkw==}
fs.realpath@1.0.0: fs.realpath@1.0.0:
resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
@ -2754,6 +2769,9 @@ packages:
jsonc-parser@3.2.1: jsonc-parser@3.2.1:
resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==} resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==}
jsonfile@1.0.1:
resolution: {integrity: sha512-KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==}
jsonfile@6.1.0: jsonfile@6.1.0:
resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
@ -2926,6 +2944,10 @@ packages:
minimist@1.2.8: minimist@1.2.8:
resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} 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: mkdirp@0.5.6:
resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==} resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
hasBin: true hasBin: true
@ -2957,6 +2979,10 @@ packages:
natural-compare@1.4.0: natural-compare@1.4.0:
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
ncp@0.4.2:
resolution: {integrity: sha512-PfGU8jYWdRl4FqJfCy0IzbkGyFHntfWygZg46nFk/dJD/XRrk2cj0SsKSX9n5u5gE0E0YfEpKWrEkfjnlZSTXA==}
hasBin: true
negotiator@0.6.3: negotiator@0.6.3:
resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
engines: {node: '>= 0.6'} engines: {node: '>= 0.6'}
@ -2981,6 +3007,9 @@ packages:
resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==} resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}
normalize.css@8.0.1:
resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==}
npm-run-path@4.0.1: npm-run-path@4.0.1:
resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
engines: {node: '>=8'} engines: {node: '>=8'}
@ -3299,6 +3328,11 @@ packages:
resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
engines: {iojs: '>=1.0.0', node: '>=0.10.0'} 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: rimraf@3.0.2:
resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
deprecated: Rimraf versions prior to v4 are no longer supported deprecated: Rimraf versions prior to v4 are no longer supported
@ -3751,6 +3785,9 @@ packages:
resolution: {integrity: sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==} resolution: {integrity: sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==}
engines: {node: '>=10'} engines: {node: '>=10'}
walk@2.3.15:
resolution: {integrity: sha512-4eRTBZljBfIISK1Vnt69Gvr2w/wc3U6Vtrw7qiN5iqYJPH7LElcYh/iU4XWhdCy2dZqv1ToMyYlybDylfG/5Vg==}
walker@1.0.8: walker@1.0.8:
resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==} resolution: {integrity: sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==}
@ -7080,6 +7117,8 @@ snapshots:
locate-path: 6.0.0 locate-path: 6.0.0
path-exists: 4.0.0 path-exists: 4.0.0
foreachasync@3.0.0: {}
form-data@3.0.1: form-data@3.0.1:
dependencies: dependencies:
asynckit: 0.4.0 asynckit: 0.4.0
@ -7092,12 +7131,25 @@ snapshots:
fresh@0.5.2: {} 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: fs-extra@10.1.0:
dependencies: dependencies:
graceful-fs: 4.2.11 graceful-fs: 4.2.11
jsonfile: 6.1.0 jsonfile: 6.1.0
universalify: 2.0.1 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: {} fs.realpath@1.0.0: {}
fsevents@2.3.3: fsevents@2.3.3:
@ -7734,6 +7786,8 @@ snapshots:
jsonc-parser@3.2.1: {} jsonc-parser@3.2.1: {}
jsonfile@1.0.1: {}
jsonfile@6.1.0: jsonfile@6.1.0:
dependencies: dependencies:
universalify: 2.0.1 universalify: 2.0.1
@ -7884,6 +7938,8 @@ snapshots:
minimist@1.2.8: {} minimist@1.2.8: {}
mkdirp@0.3.5: {}
mkdirp@0.5.6: mkdirp@0.5.6:
dependencies: dependencies:
minimist: 1.2.8 minimist: 1.2.8
@ -7909,6 +7965,8 @@ snapshots:
natural-compare@1.4.0: {} natural-compare@1.4.0: {}
ncp@0.4.2: {}
negotiator@0.6.3: {} negotiator@0.6.3: {}
neo-async@2.6.2: {} neo-async@2.6.2: {}
@ -7923,6 +7981,8 @@ snapshots:
normalize-range@0.1.2: {} normalize-range@0.1.2: {}
normalize.css@8.0.1: {}
npm-run-path@4.0.1: npm-run-path@4.0.1:
dependencies: dependencies:
path-key: 3.1.1 path-key: 3.1.1
@ -8227,6 +8287,8 @@ snapshots:
reusify@1.0.4: {} reusify@1.0.4: {}
rimraf@2.2.8: {}
rimraf@3.0.2: rimraf@3.0.2:
dependencies: dependencies:
glob: 7.2.3 glob: 7.2.3
@ -8688,6 +8750,10 @@ snapshots:
dependencies: dependencies:
xml-name-validator: 3.0.0 xml-name-validator: 3.0.0
walk@2.3.15:
dependencies:
foreachasync: 3.0.0
walker@1.0.8: walker@1.0.8:
dependencies: dependencies:
makeerror: 1.0.12 makeerror: 1.0.12

View File

@ -21,6 +21,9 @@ uni-page{
uni-page-body{ uni-page-body{
height: 100%; height: 100%;
} }
uni-page-head{
display: none !important;
}
body{ body{
font-family: 'PingFang SC','Source Han Sans'; font-family: 'PingFang SC','Source Han Sans';
} }

View File

@ -4,6 +4,7 @@
"path": "pages/ycnc/index", "path": "pages/ycnc/index",
"type": "home", "type": "home",
"style": { "style": {
"navigationStyle": "custom",
"navigationBarTitleText": "奶茶活动", "navigationBarTitleText": "奶茶活动",
"navigationBarBackgroundColor": "#FFF" "navigationBarBackgroundColor": "#FFF"
} }
@ -37,7 +38,7 @@
} }
], ],
"globalStyle": { "globalStyle": {
"navigationStyle": "custom", "navigationStyle": "default",
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "首页" "navigationBarTitleText": "首页"
}, },

View File

@ -1,202 +0,0 @@
<template>
<view class="content">
<!-- <view class='tips-text'>暂无可以领取的红包</view> -->
<view class="tips-area">
<image src="../../static/image/tips_bg.png" class="tips-img" mode="widthFix"></image>
</view>
<uni-popup ref="popupRef" type="center" :is-mask-click="false" :mask-click="false">
<view class="popup-content">
<view class="title">恭喜你提现成功!</view>
<view class="number">{{num}}<text></text></view>
<view class="tips">*24小时内在微信"服务通知"中领取</view>
<view class="btn" @click="closePopup">
<image src="../../static/image/popup_btn.png"></image>
</view>
<view class="close">
<image src="../../static/image/ic_close.png" @click="closePopup"></image>
</view>
</view>
</uni-popup>
</view>
</template>
<script setup>
import { ref,onMounted } from 'vue';
import {getQueryString} from '../../utils/utils'
import { checkTradeNo,getAccessPage,sendPacket } from '../../api'
const popupRef = ref(null)
//
const num = ref(0);
//code
const isRedirect = () => {
return !!getQueryString('code')
}
onMounted(() => {
const isRedir = isRedirect()
if(!isRedir){
const orderInfo = {
tid:getQueryString('tid'),
timeStamp:getQueryString('timeStamp'),
sign:getQueryString('sign'),
tradeNo:getQueryString('tradeNo'),
};
uni.setStorageSync('orderInfo',JSON.stringify(orderInfo));
checkEvent()
}else{
sendEvent()
}
})
//
const checkEvent = () => {
const params = {tradeNo:getQueryString('tradeNo')}
checkTradeNo({params}).then(res => {
if(res.status === true){
recieveEvent()
}else{
uni.showModal({
title: '提示',
content: '暂无可领取的红包!!!',
showCancel:false,
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
}
}).catch(() => {
uni.showModal({
title: '提示',
content: '暂无可领取的红包!!!',
showCancel:false,
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
})
}
//
const sendEvent = () => {
const orderInfo = JSON.parse(uni.getStorageSync('orderInfo'))
const {tid,timeStamp,sign,tradeNo} = orderInfo
const params = {
tid:Number(tid),
code:getQueryString('code'),
timeStamp,
sign,
tradeNo,
}
sendPacket({params}).then(res => {
//
num.value = res.amount / 100
popupRef.value.open()
}).catch((err) => {
console.log(err)
})
}
//
const recieveEvent = () => {
const orderInfo = JSON.parse(uni.getStorageSync('orderInfo'))
const {tid,timeStamp,sign,tradeNo} = orderInfo
const url = `https://lsxdwx.access.86698.cn/?tid=${tid}&tradeNo=${tradeNo}`
console.log(url);
window.location.href = url;
}
const closePopup = () => {
popupRef.value.close()
}
</script>
<style lang='scss'>
.content {
width: 100vw;
height:100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-end;
background: url('../../static/image/bg.png') no-repeat;
background-size: 100% 100%;
box-sizing:border-box;
padding-bottom:20rpx;
.tips-text{
color:#310000;
font-size:40rpx;
position: absolute;
top:50%;
left:50%;
transform: translate(-50%,-50%);
}
.btn-area{
position: absolute;
top:50%;
left:50%;
transform: translate(-50%,-50%);
image{
width:300rpx;
height:100rpx;
border-radius:100rpx;
}
}
.tips-area{
width:700rpx;
margin-top:40rpx;
.tips-img{
display: block;
width:100%;
}
}
}
.popup-content{
width:750rpx;
height:850rpx;
background: url("../../static/image/popup_bg.png") no-repeat;
background-size:100% 800rpx;
display: flex;
flex-direction: column;
align-items: center;
box-sizing: border-box;
padding-top:230rpx;
.title{
font-weight:bolder;
margin-bottom:20rpx;
color:#0A0200;
font-size:34rpx;
}
.number{
color:#F71E00;
font-size:90rpx;
font-weight:bolder;
margin-bottom:15rpx;
> text{
font-size:40rpx;
}
}
.tips{
color:#43403F;
font-size:30rpx;
margin-bottom:85rpx;
opacity: 0.6;
font-size:28rpx;
font-weight:400;
}
.btn > image{
width:300rpx;
height:90rpx;
}
.close {
margin-top:60rpx;
> image {
width:60rpx;
height:60rpx;
}
}
}
</style>

View File

@ -51,11 +51,12 @@
//code, //code,
const code = getQueryString('code'); const code = getQueryString('code');
const orderNo = getQueryString('order_no'); const orderNo = getQueryString('order_no');
if(code){ // if(code){
getProductConfig() // getProductConfig()
}else if(orderNo){ // }else if(orderNo){
queryOrderStatus() // queryOrderStatus()
} // }
getProductConfig()
}) })
const getProductConfig = async () => { const getProductConfig = async () => {
@ -211,7 +212,7 @@
box-sizing: border-box; box-sizing: border-box;
padding-top:290rpx; padding-top:290rpx;
.popup-title{ .popup-title{
font-weight:600; font-weight:700;
color:#111B1F; color:#111B1F;
font-size:60rpx; font-size:60rpx;
margin-top:24rpx; margin-top:24rpx;

View File

@ -1,7 +1,7 @@
<template> <template>
<scroll-view scroll-y class="pro-container box-border" :style="{backgroundImage: 'url('+config[brandName].src+')',height:`${config[brandName].height}rpx`}"> <scroll-view scroll-y class="pro-container box-border" :style="{backgroundImage: 'url('+config[brandName].src+')',height:`${config[brandName].height}rpx`}">
<view class="pro-wrapper flex flex-wrap"> <view class="pro-wrapper flex flex-wrap">
<view v-for="(item,index) in products" :key="index"> <view v-for="(item,index) in products" :key="index" class="product-container">
<ProductItem :detail="item" :index="index"/> <ProductItem :detail="item" :index="index"/>
</view> </view>
</view> </view>
@ -26,7 +26,7 @@
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.pro-container{ .pro-container{
width:780rpx; width:780rpx;
padding: 136rpx 60rpx 72rpx; padding: 136rpx 60rpx 72rpx;
@ -36,11 +36,23 @@
overflow-y: auto; overflow-y: auto;
} }
.pro-wrapper{ .pro-wrapper{
view:nth-child(3n) > .pro-item-wrapper{ .product-container{
width: calc((100% - 40rpx) / 3);
margin-right: 20rpx;
margin-bottom: 20rpx;
}
// view:nth-child(3n) > .pro-item-wrapper{
// margin-right:0 !important;
// }
view:nth-child(3n) {
margin-right:0 !important; margin-right:0 !important;
} }
view:nth-child(3n+1):nth-last-child(-n+3) > .pro-item-wrapper, // view:nth-child(3n+1):nth-last-child(-n+3) > .pro-item-wrapper,
view:nth-child(3n+1):nth-last-child(-n+3)~view > .pro-item-wrapper{ // view:nth-child(3n+1):nth-last-child(-n+3)~view > .pro-item-wrapper{
// margin-bottom: 0 !important;
// }
view:nth-child(3n+1):nth-last-child(-n+3),
view:nth-child(3n+1):nth-last-child(-n+3)~view{
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
} }

View File

@ -52,7 +52,8 @@
<style lang="scss"> <style lang="scss">
.pro-item-wrapper{ .pro-item-wrapper{
width:206rpx; // width:206rpx;
width:100%;
height:370rpx; height:370rpx;
background: url('/static/ycnc/bg-product.png') no-repeat; background: url('/static/ycnc/bg-product.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;

View File

@ -1,9 +1,16 @@
import MX from '../../static/ycnc/bg-mxbc.png' // import MX from '../../static/ycnc/bg-mxbc.png'
import BW from '../../static/ycnc/bg-bwcj.png' // import BW from '../../static/ycnc/bg-bwcj.png'
import NX from '../../static/ycnc/bg-nxdc.png' // import NX from '../../static/ycnc/bg-nxdc.png'
import CoCo from '../../static/ycnc/bg-coco.png' // import CoCo from '../../static/ycnc/bg-coco.png'
import CBD from '../../static/ycnc/bg-cbd.png' // import CBD from '../../static/ycnc/bg-cbd.png'
import CYYS from '../../static/ycnc/bg-cyys.png' // import CYYS from '../../static/ycnc/bg-cyys.png'
import MX from '/static/ycnc/bg-mxbc.png'
import BW from '/static/ycnc/bg-bwcj.png'
import NX from '/static/ycnc/bg-nxdc.png'
import CoCo from '/static/ycnc/bg-coco.png'
import CBD from '/static/ycnc/bg-cbd.png'
import CYYS from '/static/ycnc/bg-cyys.png'
const config = { const config = {
"MX":{ "MX":{

View File

@ -1,7 +1,7 @@
<route lang="json5" type="home"> <route lang="json5" type="home">
{ {
style: { style: {
// navigationStyle: 'custom', navigationStyle: 'custom',
navigationBarTitleText: '奶茶活动', navigationBarTitleText: '奶茶活动',
navigationBarBackgroundColor:'#FFF', navigationBarBackgroundColor:'#FFF',
}, },
@ -160,9 +160,9 @@
} }
.wrapper{ .wrapper{
width:100%; width:100%;
min-height:100%; min-height:100vh;
background: url('../../static/ycnc/bg.png') no-repeat; background: url('/static/ycnc/bg.png') no-repeat;
background-size:cover; background-size:cover;
padding-top:750rpx; padding-top:730rpx;
} }
</style> </style>

View File

@ -13,7 +13,7 @@
<block v-for="item in tabs" :key="item.state"> <block v-for="item in tabs" :key="item.state">
<wd-tab :title="item.tabName" :name="item.state"> <wd-tab :title="item.tabName" :name="item.state">
<scroll-view scroll-y class="page-wrapper" @scrolltolower="queryNext"> <scroll-view scroll-y class="page-wrapper" @scrolltolower="queryNext">
<view class="wrapper flex flex-col flex-items-center" v-if="Array.isArray(list[item.state]) && list[item.state].length > 0"> <view class="order-wrapper flex flex-col flex-items-center" v-if="Array.isArray(list[item.state]) && list[item.state].length > 0">
<view v-for="(ele,index) in list[item.state]" :key="`${ele.id}-${item.state}`"> <view v-for="(ele,index) in list[item.state]" :key="`${ele.id}-${item.state}`">
<OrderItem :detail="ele" @pay-event="pay" @detail-event="viewDetail" @pwd-event="viewPwd"/> <OrderItem :detail="ele" @pay-event="pay" @detail-event="viewDetail" @pwd-event="viewPwd"/>
</view> </view>
@ -21,7 +21,7 @@
</view> </view>
<view class="no-data" v-else> <view class="no-data" v-else>
<image <image
src="../../static/ycnc/bg-nodata.png" src="/static/ycnc/bg-nodata.png"
mode="scaleToFill" mode="scaleToFill"
class="no-img" class="no-img"
/> />
@ -143,7 +143,7 @@
box-sizing: border-box; box-sizing: border-box;
padding-bottom:30rpx padding-bottom:30rpx
} }
.wrapper{ .order-wrapper{
width:100%; width:100%;
} }
.no-more{ .no-more{

View File

@ -68,7 +68,7 @@
if(voucher_link){ if(voucher_link){
window.location.href = voucher_link window.location.href = voucher_link
}else{ }else{
console.error(`${voucher_link}无有效值`); console.error(`voucher_link无有效值`);
} }
} }
@ -87,7 +87,7 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.page{ .page{
background-color: #fafafa; background-color: #fafafa;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 661 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

View File

@ -1,4 +1,6 @@
import { defineConfig } from 'vite' import { defineConfig } from 'vite'
import path from 'path';
import fs from 'fs-extra';
import uni from '@dcloudio/vite-plugin-uni' import uni from '@dcloudio/vite-plugin-uni'
import UniPages from '@uni-helper/vite-plugin-uni-pages' import UniPages from '@uni-helper/vite-plugin-uni-pages'
import UnoCSS from 'unocss/vite' import UnoCSS from 'unocss/vite'
@ -7,10 +9,30 @@ import dayjs from "dayjs";
// https://vitejs.dev/config/ // https://vitejs.dev/config/
import getPages from './build' import getPages from './build'
const exclude = getPages(); const {exclude,staticModule} = getPages();
const timeStringNow = dayjs().format("YYYY-MM-DD HH-mm-ss") const timeStringNow = dayjs().format("YYYY-MM-DD HH-mm-ss")
console.log('staticModule',staticModule);
function copyFile() {
return {
enforce: 'post',
async writeBundle() {
await fs.copy(
path.resolve(__dirname,`src/static/ycnc`),
path.join(
__dirname,
'dist',
process.env.NODE_ENV === 'production' ? 'build' : 'dev',
process.env.UNI_PLATFORM,
'static/ycnc'
)
);
},
};
}
export default defineConfig(({ command, mode }) => { export default defineConfig(({ command, mode }) => {
const { UNI_PLATFORM } = process.env // 得到 mp-weixin, h5, app 等 const { UNI_PLATFORM } = process.env // 得到 mp-weixin, h5, app 等
return { return {
@ -24,12 +46,13 @@ export default defineConfig(({ command, mode }) => {
}), }),
uni(), uni(),
UnoCSS(), UnoCSS(),
zipPack({ // copyFile(),
inDir: `dist/build/${UNI_PLATFORM}`, // 输入的文件夹,就是要打包的文件夹 // zipPack({
outDir: `dist/build`, // 打包好的 zip 文件放到哪个文件夹下 // inDir: `dist/build/${UNI_PLATFORM}`, // 输入的文件夹,就是要打包的文件夹
outFileName: `${UNI_PLATFORM}-${timeStringNow}.zip`, //文件名不能包含\/:*?"<>| // outDir: `dist/build`, // 打包好的 zip 文件放到哪个文件夹下
pathPrefix: '' // outFileName: `${UNI_PLATFORM}-${timeStringNow}.zip`, //文件名不能包含\/:*?"<>|
}) // pathPrefix: ''
// }),
] ]
} }
}) })