From 77e675c5d22dbd30eacc4c55d4736a1bc57fc60c 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, 10 Jun 2025 18:28:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E4=B8=8B?= =?UTF-8?q?=E6=BB=91UI=202.=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E4=B8=8B?= =?UTF-8?q?=E6=BB=91UI=203.=E6=96=B0=E5=A2=9E=E5=8F=91=E5=B8=83=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BC=B9=E7=AA=97=E5=80=92=E8=AE=A1=E6=97=B6=204.?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E5=85=8D=E8=B4=A3=E5=A3=B0=E6=98=8E=E5=BC=B9=E7=AA=97=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E4=B8=8E=E5=8D=95=E9=80=89=E6=A1=86=E8=81=94=E5=8A=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98=205.=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=87=8D=E5=A4=8D=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=206.=E4=B8=8B=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=80=80=E6=AC=BE=E6=94=BF=E7=AD=96=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=207.=E5=94=AE=E5=90=8E=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=80=E6=AC=BE=E6=94=BF=E7=AD=96=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=208.=E9=A6=96=E9=A1=B5=E6=96=B0=E5=A2=9E=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E5=88=B7=E6=96=B0=E6=8E=A5=E5=8F=A3=209.=E6=88=91?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E6=B4=BB=E5=8A=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=E6=8E=A5=E5=8F=A3=2010.?= =?UTF-8?q?=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84=E6=96=B0=E5=A2=9E=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E5=88=B7=E6=96=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packageA/afterSales/index.vue | 11 +- packageA/afterSales/info.vue | 1499 ++++++++++--------- packageA/center/applyDetail.vue | 132 +- packageA/my/orderList.vue | 1 + packageA/my/pendinPayDetail.vue | 12 +- packageA/my/pendinPayStatus.vue | 15 +- pages.json | 3 +- pages/activity/index.vue | 7 +- pages/activity/stationStemys.vue | 10 +- pages/center/index.vue | 61 +- pages/fenl/index.vue | 14 +- pages/index/index.vue | 2395 +++++++++++++++--------------- pages/my/index.vue | 27 +- 13 files changed, 2212 insertions(+), 1975 deletions(-) diff --git a/packageA/afterSales/index.vue b/packageA/afterSales/index.vue index 0d407f4..dffbc24 100644 --- a/packageA/afterSales/index.vue +++ b/packageA/afterSales/index.vue @@ -39,7 +39,7 @@ - 选择退款数量 (剩余{{detailAny.verification.total_number - detailAny.verification.have_number}}张) + 选择退款数量 (已核销{{detailAny.verification.have_number}}张) {{ nummoney }} @@ -74,9 +74,9 @@ - + - 确定 + 确定 @@ -305,7 +305,8 @@ this.detail = res.data.detail.detail; this.detailAny = res.data.detail; this.order_no = res.data.detail.order_no; - this.priceGem = res.data.detail.payprice; + this.priceGem = res.data.detail.detail.price; + console.log(res.data.detail); this.activityInfo = uni.getStorageSync('init_info') } else { uni.showToast({ @@ -393,7 +394,7 @@ \ No newline at end of file diff --git a/packageA/center/applyDetail.vue b/packageA/center/applyDetail.vue index 78f2287..d129cc5 100644 --- a/packageA/center/applyDetail.vue +++ b/packageA/center/applyDetail.vue @@ -162,7 +162,7 @@ 退款政策 - - + + + + + 申请退款时间 + 退款比例 + 退款金额 + + + + + + + {{item.refund_time}} + {{item.refund_scale}} + {{item.refund_price}} + + + + + - + 我已知晓 @@ -212,7 +215,7 @@ - @@ -276,7 +279,7 @@ - 《免责声明》 - 我同意 + 我同意 ({{timeLog}}) 我同意 @@ -341,6 +344,8 @@ export default { data() { return { + timer:null, + timeLog:0, showYes: true, order_no: {}, qunShow: false, @@ -564,6 +569,15 @@ export default { this.agreeShow = true }, protocolClick(tag) { + //timeLog 开始倒计时 + this.timeLog = 5; + this.timer = setInterval(() => { + this.timeLog--; + if (this.timeLog === 0) { + this.agreeShow=true; + clearInterval(this.timer); + } + }, 1000); this.show = true }, loginShow() { @@ -685,7 +699,8 @@ export default { close() { this.type = 0 this.selectedTime = null - this.show = false + this.show = false; + clearInterval(this.timer); }, buyClose() { this.type = 0 @@ -1461,8 +1476,6 @@ export default { justify-content: center; align-items: center; // margin: 30rpx 0; - height: 146rpx; - .zhixiao { height: 80rpx; background: #E8E8E8; @@ -1727,4 +1740,71 @@ export default { .no { background: linear-gradient(180deg, #FFF1D6 0%, #FFFFFF 30%); } + +.refund-policy-table { + width: 100%; + + .table-container { + width: 100%; + border: 1px solid #C1C1C1; + border-radius: 20rpx; + overflow: hidden; + } + + .table-header { + display: flex; + background-color: #E8E8E8; + + .th-item { + flex: 1; + text-align: center; + font-size: 26rpx; + color: #323232; + padding: 24rpx 10rpx; + border-right: 1px solid #C1C1C1; + border-bottom: 1px solid #C1C1C1; + + &:first-child { + flex: 2; + /* 第一列宽度为其他列的2倍 */ + } + + &:last-child { + border-right: none; + } + } + } + + .table-body { + .table-row { + display: flex; + border-top: 1px solid #C1C1C1; + + + + &:first-child { + border-top: none; + } + + .td-item { + flex: 1; + text-align: center; + font-size: 26rpx; + color: #323232; + padding: 24rpx 10rpx; + border-right: 1px solid #C1C1C1; + background-color: #F7F7F7; + + &:first-child { + flex: 2; + /* 第一列宽度为其他列的2倍 */ + } + + &:last-child { + border-right: none; + } + } + } + } +} \ No newline at end of file diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue index 56f0402..0d83714 100644 --- a/packageA/my/orderList.vue +++ b/packageA/my/orderList.vue @@ -1175,6 +1175,7 @@ export default { width: 202rpx; height: 202rpx; margin-right: 20rpx; + object-fit: cover; &:first-child { border-radius: 18rpx 0 0 18rpx; diff --git a/packageA/my/pendinPayDetail.vue b/packageA/my/pendinPayDetail.vue index daa5a11..d873bc6 100644 --- a/packageA/my/pendinPayDetail.vue +++ b/packageA/my/pendinPayDetail.vue @@ -95,14 +95,14 @@ - - 申请售后 + + 申请售后 - - 取消订单 + + 取消订单 - - 取消订单 + + 取消订单 diff --git a/packageA/my/pendinPayStatus.vue b/packageA/my/pendinPayStatus.vue index 133e8d3..64ba5e1 100644 --- a/packageA/my/pendinPayStatus.vue +++ b/packageA/my/pendinPayStatus.vue @@ -54,23 +54,23 @@ 订单状态 {{ toptitle }} - + 订单编号 {{detailAny.order_no}} - + 创建时间 {{ formattime(detailAny.createtime)}} - + 付款金额 ¥{{detailAny.totalprice}} - + 付款方式 {{detailAny.pay_type == 'wechat' ? '微信支付' : '余额'}} - + 付款时间 {{ formattime(detailAny.paytime)}} @@ -79,9 +79,8 @@ - - - 申请售后 + + 申请售后 diff --git a/pages.json b/pages.json index edbccb0..476cb56 100644 --- a/pages.json +++ b/pages.json @@ -22,7 +22,8 @@ "path": "pages/fenl/index", "style": { "navigationBarTitleText": "分类", - "navigationStyle": "custom" //单个页面设置 + "navigationStyle": "custom", //单个页面设置 + "enablePullDownRefresh": true } }, { diff --git a/pages/activity/index.vue b/pages/activity/index.vue index ce2d442..cc6849c 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -19,7 +19,7 @@ - + @@ -41,7 +41,7 @@ --> - + @@ -263,6 +263,9 @@ background-image: url("https://naweigetetest2.hschool.com.cn/dyqc/bgx2.png"); background-size: 100%; background-repeat: no-repeat; + position: fixed; + height: 100vh; + width: 100%; } .w-100 { diff --git a/pages/activity/stationStemys.vue b/pages/activity/stationStemys.vue index ced1a5f..ea8808d 100644 --- a/pages/activity/stationStemys.vue +++ b/pages/activity/stationStemys.vue @@ -1,8 +1,8 @@