From 5844d45e6563994c4903484ab2bc5e1bd7d38aa0 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: Fri, 13 Jun 2025 13:53:56 +0800 Subject: [PATCH] 1 --- .cursor/rules/mcp.mdc | 13 ++ packageA/center/applyDetail.vue | 55 +++++- packageA/my/cancelActivity.vue | 4 +- packageA/my/classCheck.vue | 8 +- packageA/my/exercise.vue | 1 - packageA/my/orderList.vue | 8 +- packageA/my/pendinPay.vue | 330 ++++++++++++-------------------- packageB/card/index.vue | 62 +++++- packageB/wallet/index.vue | 58 +++++- pages/center/index.vue | 4 +- 10 files changed, 298 insertions(+), 245 deletions(-) create mode 100644 .cursor/rules/mcp.mdc diff --git a/.cursor/rules/mcp.mdc b/.cursor/rules/mcp.mdc new file mode 100644 index 0000000..7e2b12d --- /dev/null +++ b/.cursor/rules/mcp.mdc @@ -0,0 +1,13 @@ +--- +description: +globs: +alwaysApply: true +--- +# MCP Interactive Feedback 规则 + +1. 在任何流程、任务、对话进行时，无论是询问、回复、或完成阶段性任务，皆必须调用 MCP mcp-feedback-enhanced。 +2. 每当收到用户反馈，若反馈内容非空，必须再次调用 MCP mcp-feedback-enhanced，并根据反馈内容调整行为。 +3. 仅当用户明确表示「结束」或「不再需要交互」时，才可停止调用 MCP mcp-feedback-enhanced，流程才算结束。 +4. 除非收到结束指令，否则所有步骤都必须重复调用 MCP mcp-feedback-enhanced。 + +5. 完成任务前，必须使用 MCP mcp-feedback-enhanced 工具向用户询问反馈。 \ No newline at end of file diff --git a/packageA/center/applyDetail.vue b/packageA/center/applyDetail.vue index eb7885c..9aa18d6 100644 --- a/packageA/center/applyDetail.vue +++ b/packageA/center/applyDetail.vue @@ -302,7 +302,7 @@ - 《用户参与须知》 - 我同意 （{{timeLog}}） - 我同意 + + + 取消 + 我同意（{{timeLog}}） + 我同意 + @@ -1503,6 +1508,7 @@ export default { display: flex; justify-content: center; align-items: center; + width: 100%; // margin: 30rpx 0; .zhixiao { height: 80rpx; @@ -1836,4 +1842,47 @@ export default { } } } +.btn_2 { + width: 50%; + height: 80rpx; + background: #323232; + border-radius: 198rpx 198rpx 198rpx 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 32rpx; + color: #BBFC5B; + line-height: 80rpx; + text-align: center; + margin-top: 40rpx; + z-index: 100; + } + .btn_3 { + width: 50%; + height: 80rpx; + background: #E2E2E2; + border-radius: 198rpx 198rpx 198rpx 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 32rpx; + color: #999999; + line-height: 80rpx; + text-align: center; + margin-top: 40rpx; + z-index: 100; + } + .btn_4 { + width: 50%; + height: 80rpx; + background: #ffffff; + border: 1px solid #999999; + border-radius: 198rpx 198rpx 198rpx 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 32rpx; + color: #999999; + line-height: 80rpx; + text-align: center; + margin-top: 40rpx; + z-index: 100; + } \ No newline at end of file diff --git a/packageA/my/cancelActivity.vue b/packageA/my/cancelActivity.vue index 3b21139..570c6a5 100644 --- a/packageA/my/cancelActivity.vue +++ b/packageA/my/cancelActivity.vue @@ -51,11 +51,11 @@ 订单编号 {{detailAny.order_no}} - + 报名人昵称 {{ detailAny.user.nickname }} - + 核销/报名人数 {{detailAny.verification.have_number}} / {{ detailAny.verification.total_number }} diff --git a/packageA/my/classCheck.vue b/packageA/my/classCheck.vue index ab1c351..56e369e 100644 --- a/packageA/my/classCheck.vue +++ b/packageA/my/classCheck.vue @@ -50,15 +50,15 @@ 订单编号: {{item.order_no}} - + 预约时间: {{item.reservation_time_text}} - + 开始时间: {{item.start_time_text}} - + 结束时间: {{item.end_time_text}} @@ -432,7 +432,7 @@ margin-top: 27rpx; width: 414rpx; height: 1rpx; - background: #D9D9D9; + background: #eeeeee; border-radius: 0rpx 0rpx 0rpx 0rpx; } } diff --git a/packageA/my/exercise.vue b/packageA/my/exercise.vue index 8a77935..0e19b21 100644 --- a/packageA/my/exercise.vue +++ b/packageA/my/exercise.vue @@ -234,7 +234,6 @@ } }, onShow() { - console.log(this.selected); this.page = 1; this.list = []; this.getList(this.selected); diff --git a/packageA/my/orderList.vue b/packageA/my/orderList.vue index 5fc391c..913d6bf 100644 --- a/packageA/my/orderList.vue +++ b/packageA/my/orderList.vue @@ -32,7 +32,7 @@ + v-for="(item, index) in hotList" :key="index" @click.stop="detail(item.id)"> @@ -97,9 +97,9 @@ 核销 + class="part1 flex justify-center align-items" @click.stop="toHexiao"> 核销 详情 + @click.stop="detail(item.id)"> 详情 @@ -144,7 +144,7 @@ style="justify-content: flex-end;padding: 0rpx 30rpx 30rpx 0rpx;"> 查看详情 + @click.stop="goAfterInfo(item.id)"> 查看详情 diff --git a/packageA/my/pendinPay.vue b/packageA/my/pendinPay.vue index 7735c32..ac95be2 100644 --- a/packageA/my/pendinPay.vue +++ b/packageA/my/pendinPay.vue @@ -1,201 +1,97 @@ @@ -239,7 +135,7 @@ img: 'width: 100%' }, - value_slide:0, + value_slide: 0, scrollTop: 0, overlay: false, userInfo: {}, @@ -254,7 +150,7 @@ order_no: '', PayPirce: 0, detail: {}, - detailAny:{}, + detailAny: {}, people: {}, qrUrl: '', is_collect: 0, @@ -311,13 +207,13 @@ }, methods: { - + //星期 dateWeeks(timestamp) { return dateWeek(timestamp) }, //完整时间 - formattime(e){ + formattime(e) { return dayjs(e).format('YYYY-MM-DD HH:mm:ss') }, @@ -492,7 +388,7 @@ this.getMoney() }, //取消订单 - nobuy(){ + nobuy() { let that = this; let o = that.order_no uni.$u.http.post('/api/school.newactivity.order/freecancel', { @@ -768,7 +664,7 @@ activity_id: this.id, order_no: this.order_no, is_compute: 1, - num:1 + num: 1 }).then(res => { if (res.code == 1) { this.PayPirce = res.data.order_data.totalprice @@ -875,10 +771,11 @@ - \ No newline at end of file diff --git a/packageB/card/index.vue b/packageB/card/index.vue index 2d4443b..0f90278 100644 --- a/packageB/card/index.vue +++ b/packageB/card/index.vue @@ -67,18 +67,17 @@ 提交信息 - - 《【搭+】入驻协议》 + 《【搭+】入驻协议》 @@ -86,8 +85,13 @@ - 我同意 - 我同意 + + + 取消 + 我同意 + 我同意 + @@ -275,7 +279,7 @@ justify-content: center; align-items: center; // margin: 30rpx 0; - height: 146rpx; + width: 100%; .zhixiao { height: 80rpx; @@ -302,5 +306,47 @@ font-size: 36rpx; } } - + .btn_2 { + width: 50%; + height: 80rpx; + background: #323232; + border-radius: 198rpx 198rpx 198rpx 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 32rpx; + color: #BBFC5B; + line-height: 80rpx; + text-align: center; + margin-top: 40rpx; + z-index: 100; + } + .btn_3 { + width: 50%; + height: 80rpx; + background: #E2E2E2; + border-radius: 198rpx 198rpx 198rpx 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 32rpx; + color: #999999; + line-height: 80rpx; + text-align: center; + margin-top: 40rpx; + z-index: 100; + } + .btn_4 { + width: 50%; + height: 80rpx; + background: #ffffff; + border: 1px solid #999999; + border-radius: 198rpx 198rpx 198rpx 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 32rpx; + color: #999999; + line-height: 80rpx; + text-align: center; + margin-top: 40rpx; + z-index: 100; + } \ No newline at end of file diff --git a/packageB/wallet/index.vue b/packageB/wallet/index.vue index c62d276..a4188c2 100644 --- a/packageB/wallet/index.vue +++ b/packageB/wallet/index.vue @@ -119,7 +119,7 @@ + :closeOnClickOverlay="false" :safeAreaInsetBottom="false"> 预计待入账金额说明 ①这是您已结束活动产生的、正在结算中的款项金额。 @@ -129,7 +129,10 @@ ⑤最终转入“当前余额”的金额=活动应结算总额−7日内发生的退款总额。 - 我已知晓 + + 取消 + 我同意 + + :closeOnClickOverlay="false" :safeAreaInsetBottom="false"> 当前余额 前余额指已经完成所有结算流程、您可以随时发起提现的金额。 - 我已知晓 + + 取消 + 我同意 + + :closeOnClickOverlay="false" :safeAreaInsetBottom="false"> 累计收益 指自您入驻以来，所有已完成结算的活动为您带来的结算款项总和。累计收益=提现金额总和+当前余额。 - 我已知晓 + + 取消 + 我同意 + @@ -184,8 +193,8 @@ loadStatus: 'loading', tipsShow:false, popupStyle: { - width: '600rpx', - padding: '24rpx 24rpx 42rpx 24rpx', + width: '620rpx', + padding: '30rpx 30rpx 42rpx 30rpx', height: '660rpx', margin: '0 auto', // 水平居中 display: 'flex', @@ -347,7 +356,7 @@ justify-content: center; align-items: center; // margin: 30rpx 0; - height: 146rpx; + width: 100%; .zhixiao { height: 100rpx; @@ -374,4 +383,35 @@ font-size: 36rpx; } } + + .btn_2 { + width: 50%; + height: 80rpx; + background: #323232; + border-radius: 198rpx 198rpx 198rpx 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 32rpx; + color: #BBFC5B; + line-height: 80rpx; + text-align: center; + margin-top: 40rpx; + z-index: 100; + } + + .btn_4 { + width: 50%; + height: 80rpx; + background: #ffffff; + border: 1px solid #999999; + border-radius: 198rpx 198rpx 198rpx 198rpx; + font-family: YouSheBiaoTiHei, YouSheBiaoTiHei; + font-weight: 400; + font-size: 32rpx; + color: #999999; + line-height: 80rpx; + text-align: center; + margin-top: 40rpx; + z-index: 100; + } \ No newline at end of file diff --git a/pages/center/index.vue b/pages/center/index.vue index 8308e36..eca2efe 100644 --- a/pages/center/index.vue +++ b/pages/center/index.vue @@ -45,11 +45,11 @@ style="width: 44rpx;height: 44rpx;padding-right: 8rpx;" /> 集合地点 - + - +