From 730079ce4971f5b32156b0ca712ec8ed76e806a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?= =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com> Date: Tue, 3 Jun 2025 18:13:16 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8A=A5=E5=90=8D=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E8=BE=B9=E6=A1=86=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=87=8C=E7=9A=84?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=BE=B9=E6=A1=86=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E5=85=A8=202.=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=8F=91=E5=B8=83=EF=BC=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=87=8C=E7=9A=84=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=203.banner=E4=B8=8A=E7=9A=84=E6=A0=87=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=96=87=E5=AD=97=E5=86=85=E5=AE=B9=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=B1=95=E7=A4=BA=204.=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=87=8C=E7=9A=84=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E9=97=B4=E8=B7=9D=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=A6=81=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- components/fuyu-MixSwiper/fuyu-MixSwiper.vue | 83 +- packageA/my/orderList.vue | 2086 ++++++++-------- packageA/my/pendinPayDetail.vue | 153 +- packageA/my/success.vue | 2 +- packageA/qrcodeSwiper.vue | 244 +- pages/index/index.vue | 2254 +++++++++--------- 7 files changed, 2422 insertions(+), 2403 deletions(-) diff --git a/.gitignore b/.gitignore index eea31a7..6594faf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .DS_Store node_modules +unpackage dist/ npm-debug.log* yarn-debug.log* @@ -9,10 +10,10 @@ yarn-error.log* tests/**/coverage/ tests/e2e/reports selenium-debug.log - # Editor directories and files .idea .vscode +.history *.suo *.ntvs* *.njsproj diff --git a/components/fuyu-MixSwiper/fuyu-MixSwiper.vue b/components/fuyu-MixSwiper/fuyu-MixSwiper.vue index 950b99f..2e0006f 100644 --- a/components/fuyu-MixSwiper/fuyu-MixSwiper.vue +++ b/components/fuyu-MixSwiper/fuyu-MixSwiper.vue @@ -1,42 +1,12 @@ - + - {{ item.title?item.title:'' }} + + {{ item.title?item.title:'' }} + - - - - - - - - - - - - - - - - - - - - - - - - + @@ -70,7 +40,7 @@ data() { return { swiperCurrent: 0, //轮播下标 - autoplaySwiper: true, + autoplaySwiper: false, isShow: true, videoIndex: null, videoId: null, @@ -79,43 +49,7 @@ } }, created() { - // #ifdef MP-WEIXIN - const regex = /^(http|https):\/\//; - this.list.forEach(v => { - const bool = regex.test(v.url); - if (!bool) { - const fs = uni.getFileSystemManager(); - const res = new Promise((resolve, reject) => { - fs.readFile({ - filePath: v.url, // 相对于static目录的路径 - encoding: 'base64', - success: (res) => { - v.url = res.data - // 为临时文件生成一个文件名,您可以根据需要自定义文件名 - const fileName = `temp_video_${Date.now()}.mp4`; - // 指定临时文件的完整路径 - const tempFilePath = `${uni.env.USER_DATA_PATH}/${fileName}`; - // 将Base64编码的数据写入临时文件 - fs.writeFile({ - filePath: tempFilePath, // 临时文件路径 - data: v.url, // Base64数据(去掉数据URI部分) - encoding: 'base64', // 指定编码格式为base64 - success: () => { - v.url = tempFilePath - }, - fail: (err) => { - console.error('写入文件失败:', err); - } - }); - }, - fail: (err) => { - console.error('读取视频文件失败:', err); - } - }); - }); - } - }) - // #endif + }, methods: { swiperChange(e) { @@ -213,7 +147,7 @@ bottom: 30rpx; .text { position: relative; /* 确保文字在模糊背景之上 */ - z-index: 10; /* 确保文字位于最上层 */ + z-index: 110; /* 确保文字位于最上层,高于伪元素 */ } } .fnon_tit::after { @@ -223,6 +157,7 @@ backdrop-filter: blur(4px); /* 调整模糊程度 */ pointer-events: none; /* 确保模糊效果不会干扰点击事件 */ border-radius: 36rpx; + z-index: 10; /* 确保伪元素在背景和文字之间 */ } .dots { position: absolute; diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue index df8a03d..85c9b41 100644 --- a/packageA/my/orderList.vue +++ b/packageA/my/orderList.vue @@ -1,149 +1,112 @@ - - + + - - - {{ item.text }} - - - + + + {{ item.text }} + + + - - 待审核 - 未通过 - - + + 待审核 + 未通过 + - - - - - - - - - {{ item.title }} - - - {{ item.user.nickname }} - - #{{ items_t }} - - - - - {{ + + + + + + + + + {{ item.title }} + + + {{ item.user.nickname }} + + #{{ items_t }} + + + + + + {{ "报名中" }} - {{ dateWeeks(item.sign_start_time) }} |{{ item.address_detail }} - - + {{ dateWeeks(item.sign_start_time) }} |{{ item.address_detail }} + + - - - - - - + + + + + + + + + 未开始 + + + + + {{ Number(item.join_info.people_number) + "人已上车" }} + + + 核销: + {{item.verification_num}} + /{{item.stock}} + + 核销 + 详情 + + - - - 核销 - 详情 - - + + + + 暂无发布活动 + 前往发布 + - - - - 暂无发布活动 - 前往发布 - + + + + - - - - - - - - - + + + + &:first-child { + border-radius: 18rpx 0 0 18rpx; + } + + &:nth-child(3) { + border-radius: 0 18rpx 18rpx 0; + } + } + } + + .bottom { + margin:20rpx 10rpx 30rpx 10rpx; + .number { + font-family: Source Han Sans CN, Source Han Sans CN; + font-weight: 400; + font-size: 26rpx; + color: #3d3d3d; + line-height: 30rpx; + width: 150rpx; + margin-left: 20rpx; + } + + .text { + font-family: PingFang SC, PingFang SC; + font-weight: 800; + font-size: 26rpx; + color: #7a7a7a; + } + + .money { + width: 150rpx; + font-family: PingFang SC, PingFang SC; + font-weight: 800; + font-size: 36rpx; + color: #ff2323; + justify-content: flex-end; + } + } + + .ovr { + width: 312rpx; + background: #ffffff; + border-radius: 20rpx 20rpx 20rpx 20rpx; + margin-top: 18rpx; + margin-right: 24rpx; + } + } + + .part { + width: 168rpx; + height: 70rpx; + background: url(@/static/index/shangche.png); + background-size: 168rpx 70rpx; + background-repeat: no-repeat; + font-family: "YouSheBiaoTiHei"; + font-weight: 400; + font-size: 42rpx; + color: #bbfc5b; + } + + .part1 { + width: 168rpx; + height: 70rpx; + background: url(@/static/index/hexiao.png); + background-size: 168rpx 70rpx; + background-repeat: no-repeat; + font-family: "YouSheBiaoTiHei"; + font-weight: 400; + font-size: 42rpx; + color: #323232; + } + + .tofb { + margin-top: 50rpx; + width: 280rpx; + height: 70rpx; + background: #323232; + border-radius: 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 500; + font-size: 32rpx; + color: #BBFC5B; + display: flex; + align-items: center; + justify-content: center; + } + \ No newline at end of file diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue index 34a0119..39c3d62 100644 --- a/packageA/my/pendinPayDetail.vue +++ b/packageA/my/pendinPayDetail.vue @@ -9,12 +9,12 @@ - {{detail.title}} + {{detail.title}} - {{ detailAny.user.nickname }} - {{ detailAny.join_info.people_number }}人玩过 + {{ detailAny.user.nickname }} + {{ detailAny.join_info.people_number }}人玩过 ¥{{detailAny.totalprice}} @@ -22,22 +22,22 @@ - - + + - {{formattedTime.formattedTime}} - - + {{formattedTime.formattedTime}} + + - - {{detail.address_detail}} + {{detail.address_detail}} - + @@ -45,9 +45,9 @@ - 核销二维码 + 核销二维码 - + @@ -57,7 +57,7 @@ --> - 左右滑动二维码核销({{qrindex}}/{{detailAny.num}})张 + 左右滑动二维码核销({{qrindex}}/{{detailAny.num}})张 @@ -66,28 +66,28 @@ - 订单状态 - 待核销 + 订单状态 + 待核销 - - 订单编号 - {{detailAny.order_no}} + + 订单编号 + {{detailAny.order_no}} - - 创建时间 - {{ formattime(detailAny.createtime)}} + + 创建时间 + {{ formattime(detailAny.createtime)}} - - 付款金额 - ¥{{detailAny.totalprice}} + + 付款金额 + ¥{{detailAny.totalprice}} - - 付款方式 - {{detailAny.pay_type == 'wechat' ? '微信支付' : '余额'}} + + 付款方式 + {{detailAny.pay_type == 'wechat' ? '微信支付' : '余额'}} - - 付款时间 - {{ formattime(detailAny.createtime)}} + + 付款时间 + {{ formattime(detailAny.createtime)}} @@ -96,7 +96,7 @@ - 申请售后 + 申请售后 @@ -106,40 +106,40 @@ @open="buyOpen" :safeAreaInsetBottom="false" :closeable="true"> - {{detail.title}} - - ¥{{detail.price}} - 公益 - + {{detail.title}} + + ¥{{detail.price}} + 公益 + - + - {{formattedTime.formattedTime}} (共计{{formattedTimeList.length}}节) - - + {{formattedTime.formattedTime}} (共计{{formattedTimeList.length}}节) + + - {{detail.address_detail}} - + {{detail.address_detail}} + - 立 即 支 付 - 确 认 报 名 + 立 即 支 付 + 确 认 报 名 @@ -149,18 +149,18 @@ - 保 存 海 报 - + --> - 分 享 发 布 + 分 享 发 布 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index 581f7f0..4b1f63d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,1050 +1,1070 @@ - - - - - - - - - - - - 搜索 - - - - - - - - + + + + + + + + + + + + 搜索 + + + - - - - - - - {{ tab.name }} - - - - - - - - - - - + + + + + + + + + {{ item.title ? item.title : '' }} + + + + - - - {{ item.title }} - - - - {{ item.user.nickname }} - {{ item.teacher.name }} - - #{{ items_t }} - - + + + + + + + - - - {{ '报名中' }} - - {{ dateWeeks(item.start_time) }} - {{ item.address_detail }} - + + + + + + + + {{ tab.name }} + + + + + + + + + + - - - - - - - - + + + {{ item.title }} + + + + {{ item.user.nickname }} + {{ + item.teacher.name }} + + #{{ items_t + }} + + - - - - - - - - {{ Number(item.join_info.people_number)+"人已上车" }} - - - - 已结束 - - - 上车 - - - + + + {{ '报名中' }} + + {{ dateWeeks(item.start_time) }} + {{ item.address_detail }} + - - - - - - - + + + + + + + + + + + + + + + + + + {{ Number(item.join_info.people_number) + "人已上车" }} + + + + 已结束 + + + 上车 + + + + + + + + + + + - + + - - - 我的标签 - - - - - {{ item_bq.name }} - - - - + {{ item_bq.name }} + + + + - 全部标签 + 全部标签 - - - - - - {{ item.name }} - - - - - + {{ item.name }} + + + + + + + + - - - - - 暂无数据 - - - - - + + 暂无数据 + + + + + \ No newline at end of file