mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
DESKTOP-GMUNQ1B\k 2024-03-15 14:40:48 +08:00
parent ba7056e3be
commit 1299140eee
3 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pages/admin/order/index.vue
View File

@ -272,15 +272,16 @@
}) })
}, },
// 保留两位小数 // 保留两位小数
toFixed2(num){ toFixed2(num) {
if (!num) return "0.00";
let str = num; let str = num;
if(typeof num =='string'){ if (typeof num == 'string') {
str = +str; str = +str;
str = str.toFixed(2); str = str.toFixed(2);
}else str = str.toFixed(2); } else str = str.toFixed(2);
return str || '0.00'; return str || '0.00';
}, },
navToOrder(item, type=2){ navToOrder(item, type = 2) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/admin/orderList/index?merId=${this.mer_id}&types=${type}&pay_time=${item.pay_time.split(' ')[0]}` url: `/pages/admin/orderList/index?merId=${this.mer_id}&types=${type}&pay_time=${item.pay_time.split(' ')[0]}`
}) })

11
pages/index/index.vue
View File

@ -49,6 +49,7 @@
</view> </view>
<view class="content-middlea-one" style="font-size: 22rpx;color: #7f7f7f;"> <view class="content-middlea-one" style="font-size: 22rpx;color: #7f7f7f;">
<text v-if="index==1">(次日18点后可提现)</text> <text v-if="index==1">(次日18点后可提现)</text>
<text v-if="index == 3">(点击查看进度详情)</text>
</view> </view>
</view> </view>
</view> </view>
@ -882,10 +883,12 @@
methods: { methods: {
// 提现页面 // 提现页面
handleToWithDraw(item, index) { handleToWithDraw(item, index) {
if(index==3||index==4) return; if (index == 4) return;
let url; let url;
if(index<2) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id; if (index == 0) url = "/pages/users/embody/embody?mer_id=" + this.userInfoData.service.mer_id;
else url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=2`; if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=2`;
if (index == 3) url = "/pages/activeCode/subsidy";
uni.navigateTo({ uni.navigateTo({
url: url url: url
}) })
@ -895,12 +898,14 @@
initTypeLiseMenu() { initTypeLiseMenu() {
}, },
//关闭弹窗 //关闭弹窗
close() { close() {
this.isFshow = false; this.isFshow = false;
this.$refs.popup.close() this.$refs.popup.close()
this.num = 15 this.num = 15
}, },
//获取交易信息 //获取交易信息
codelist() { codelist() {

18
pages/payment/payment_detail.vue
View File

@ -64,8 +64,8 @@
searchParams: { searchParams: {
page: 1, page: 1,
limit: 15, limit: 15,
section_startTime: '', section_startTime: new Date().format("yyyy-MM-dd"),
section_endTime: '', section_endTime: new Date().format("yyyy-MM-dd"),
mer_id: '' mer_id: ''
}, },
loadend: false, loadend: false,
@ -81,16 +81,16 @@
computed: { computed: {
startTimeTxt() { startTimeTxt() {
if (this.searchParams.section_startTime) { if (this.searchParams.section_startTime) {
return new Date(this.searchParams.section_startTime).format("yyyy年MM月dd"); return new Date(this.searchParams.section_startTime).format("yyyy年MM月dd日");
} else { } else {
return "开始时间"; return new Date().format("yyyy年MM月dd日");
} }
}, },
endTimeTxt() { endTimeTxt() {
if (this.searchParams.section_endTime) { if (this.searchParams.section_endTime) {
return new Date(this.searchParams.section_endTime).format("yyyy年MM月dd"); return new Date(this.searchParams.section_endTime).format("yyyy年MM月dd日");
} else { } else {
return "结束时间"; return new Date().format("yyyy年MM月dd日");
} }
} }
}, },
@ -116,8 +116,8 @@
handleReset() { handleReset() {
this.loadend = false; this.loadend = false;
this.searchParams.page = 1; this.searchParams.page = 1;
this.searchParams.section_startTime = ''; this.searchParams.section_startTime = new Date().format("yyyy-MM-dd");
this.searchParams.section_endTime = ''; this.searchParams.section_endTime = new Date().format("yyyy-MM-dd");
this.paymentData = []; this.paymentData = [];
this.getData(); this.getData();
}, },
@ -200,7 +200,7 @@
left: 0; left: 0;
width: 100%; width: 100%;
background-color: #EFEFEF; background-color: #EFEFEF;
padding: 30rpx 40rpx; padding: 30rpx;
.payment-detail-head-wrap { .payment-detail-head-wrap {
display: flex; display: flex;