zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:6a0904cf64f2d7737b50bb2d6569f0516850c1af
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
...
compare: zenghuapei:0e26bdbf4badd2d5011630fcd359921c2e587b29
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

3 Commits
6a0904cf64 ... 0e26bdbf4b

Author SHA1 Message Date
tangqian 0e26bdbf4b Merge branch 'feature/mall_product' 2023-06-02 15:45:12 +08:00
tangqian e1aaf55a53 fix: 修改相关提成单位 2023-06-02 15:44:51 +08:00
TianYu 5adf5115eb fix: 取消支付宝支付 2023-06-02 15:27:23 +08:00
6 changed files with 36 additions and 21 deletions
Show Stats Expand all files Collapse all files

2
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -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,

12
yudao-ui-app/pages/member_application/index.vue
View File

@ -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: [],

14
yudao-ui-app/pages/member_equity/index.vue
View File

@ -56,7 +56,7 @@
</view>
<view class="money-box money-time">
<text>返费结束时间</text>
<text class="money-text">{{item.endTime}}</text>
<text class="money-text">{{dateConvert(item.startTime)}}</text>
</view>
</view>
</view>
@ -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}`,

12
yudao-ui-app/pages/member_others/index.vue
View File

@ -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: [],

12
yudao-ui-app/pages/member_renew/index.vue
View File

@ -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:[],

5
yudao-ui-app/pages/sale_performance/index.vue
View File

@ -71,7 +71,10 @@
<view>{{ item.grade }}</view>
</text>
</view>
<text>￥{{item.payPrice | currency}}</text>
<view class="price-wrap">
<text style="display:block; margin-bottom: 6rpx;">￥{{item.payPrice | currency}}</text>
<u-tag v-if="item.refundStatus === 2" plain text="已退款" type="error"></u-tag>
</view>
</view>
</u-list-item>
</u-list>