From 5adf5115eb6811f4345e5c970abbc35c8b337efb Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Fri, 2 Jun 2023 15:27:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8F=96=E6=B6=88=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/pages/member_application/index.vue | 12 ++++++------ yudao-ui-app/pages/member_equity/index.vue | 14 +++++++++++++- yudao-ui-app/pages/member_others/index.vue | 12 ++++++------ yudao-ui-app/pages/member_renew/index.vue | 12 ++++++------ yudao-ui-app/pages/sale_performance/index.vue | 5 ++++- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue index 016c2f5e5..a2333e1cd 100644 --- a/yudao-ui-app/pages/member_application/index.vue +++ b/yudao-ui-app/pages/member_application/index.vue @@ -75,13 +75,13 @@ icon: "icon-weixinzhifu", value: 'WXPAY', title: '微信快捷支付' - }, - { - name: "支付宝", - icon: "icon-zhifubao", - value: 'ALIPAY', - title: '支付宝快捷支付' } + // { + // name: "支付宝", + // icon: "icon-zhifubao", + // value: 'ALIPAY', + // title: '支付宝快捷支付' + // } ], pay_close: false, activeIndex: [], diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue index a97999a24..ed5dfd6d2 100644 --- a/yudao-ui-app/pages/member_equity/index.vue +++ b/yudao-ui-app/pages/member_equity/index.vue @@ -56,7 +56,7 @@ 返费结束时间 - {{item.endTime}} + {{dateConvert(item.startTime)}} @@ -136,6 +136,18 @@ this.equityData = equity.data }, methods: { + dateConvert(date){ + const _date = new Date(date) + _date.setFullYear(_date.getFullYear() + 1) + _date.setDate(_date.getDate() - 30) + const Y = _date.getFullYear() + "-" + const M = + (_date.getMonth() + 1 < 10 + ? "0" + (_date.getMonth() + 1) + : _date.getMonth() + 1) + "-"; + const D = (_date.getDate() < 10 ? "0" + _date.getDate() : _date.getDate()) + return Y + M + D + }, handleDetailed(reportId){ uni.navigateTo({ url:`/pages/member_detail/index?reportId=${reportId}`, diff --git a/yudao-ui-app/pages/member_others/index.vue b/yudao-ui-app/pages/member_others/index.vue index 322c08a35..433105fea 100644 --- a/yudao-ui-app/pages/member_others/index.vue +++ b/yudao-ui-app/pages/member_others/index.vue @@ -88,13 +88,13 @@ icon: "icon-weixinzhifu", value: 'WXPAY', title: '微信快捷支付' - }, - { - name: "支付宝", - icon: "icon-zhifubao", - value: 'ALIPAY', - title: '支付宝快捷支付' } + // { + // name: "支付宝", + // icon: "icon-zhifubao", + // value: 'ALIPAY', + // title: '支付宝快捷支付' + // } ], pay_close: false, activeIndex: [], diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue index 1bbd12ca6..44f814207 100644 --- a/yudao-ui-app/pages/member_renew/index.vue +++ b/yudao-ui-app/pages/member_renew/index.vue @@ -83,13 +83,13 @@ import store from '@/store/index'; icon: "icon-weixinzhifu", value: 'WXPAY', title: '微信快捷支付' - }, - { - name: "支付宝", - icon: "icon-zhifubao", - value: 'ALIPAY', - title: '支付宝快捷支付' } + // { + // name: "支付宝", + // icon: "icon-zhifubao", + // value: 'ALIPAY', + // title: '支付宝快捷支付' + // } ], pay_close: false, activeIndex:[], diff --git a/yudao-ui-app/pages/sale_performance/index.vue b/yudao-ui-app/pages/sale_performance/index.vue index e7e53ee0b..e318ce445 100644 --- a/yudao-ui-app/pages/sale_performance/index.vue +++ b/yudao-ui-app/pages/sale_performance/index.vue @@ -71,7 +71,10 @@ {{ item.grade }} - ￥{{item.payPrice | currency}} + + ￥{{item.payPrice | currency}} + + From e1aaf55a53bbc422495c4665da46a8dd1da3d1fd Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 2 Jun 2023 15:44:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=8F=90=E6=88=90=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/recharge/RechargeOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml index b9ee82a3a..299df9a38 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml @@ -106,7 +106,7 @@ e.name as tenantName, a.out_trade_no, a.pay_time, - b.nickname, + a.real_name as nickname, a.real_name, a.uid, a.user_phone,