b2894lxlx/yunxinwei-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
weicw
2023-09-28 21:19:51 +08:00
parent 81ecfd9df0
commit 0256bd355d
21 changed files with 1025 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pages/order/index.vue
View File

@@ -13,11 +13,12 @@
<text class="order-time">{{ item.merchantName }}</text>
</view>
<view class="item-top-right">
<text class="state-text" v-if="item.payStatus == 10">待支付</text>
<text class="state-text" v-if="item.payStatus == 20 && item.receiptStatus == 10">待绑定</text>
<text class="state-text" v-if="item.orderStatus == 30 && item.receiptStatus == 20">已完成</text>
<text class="state-text" v-if="item.receiptStatus == 21">退租中</text>
<text class="state-text" v-if="item.receiptStatus == 30">已退租</text>
<text class="state-text" v-if="item.payStatus == 20 && (item.receiptStatus == 30 || item.currPeriods >= item.periods)">已完成</text>
<text class="state-text" v-else-if="item.payStatus == 10">待支付</text>
<text class="state-text" v-else-if="item.payStatus == 20 && item.receiptStatus == 10">待绑定</text>
<text class="state-text" v-else-if="item.orderStatus == 30 && item.receiptStatus == 20">进行中</text>
<text class="state-text" v-else-if="item.receiptStatus == 21">进行中</text>
</view>
</view>
<!-- 商品列表 -->
@@ -115,6 +116,12 @@
<!-- <view class="btn-item" v-if="item.equipmentGoods.equipmentCategory == '锂电池租赁' || item.equipmentGoods.equipmentCategory == '电动车租赁'" @click="handleTargetDetail(item.orderId)">续费</view> -->
<view class="btn-item" @click="handleTargetDetail(item.orderId)">详情</view>
</block>
<block
v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0 && item.receiptStatus != 30">
<view class="btn-item" @click="handleTargetDetail(item.orderId)"
v-if="item.equipmentGoods.equipmentCategory != '10' && !orderEnd">我要续费 </view>
</block>
</view>
</view>
</view>
@@ -181,7 +188,8 @@
import {
pageOrder,
removeOrder,
receiptOrder
receiptOrder,
addOrder
} from '@/websoft/api/order.js'
import {
bindEquipment
@@ -190,7 +198,9 @@
uploadFile
} from '@/websoft/api/upload.js'
import { fileUrl } from '@/config.js';
import {
createOrderNo,dateFormat
} from '@/utils/util.js'
// 每页记录数量
const pageSize = 15
@@ -201,12 +211,18 @@
}, {
name: `待支付`,
value: 'payment'
}, {
},
{
name: `待绑定`,
value: 'delivery'
}, {
name: `已完成`,
},
{
name: `进行中`,
value: 'comment'
},
{
name: `已完成`,
value: 'refund'
}]
export default {
@@ -303,7 +319,7 @@
app.curTab = index > -1 ? index : 0
}
},
/**
* 上拉加载的回调 (页面初始化时也会执行一次)
* 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10
@@ -321,7 +337,6 @@
// })
// .catch(() => app.mescroll.endErr())
},
// 获取订单列表
getOrderList(pageNo = 1) {
const app = this
@@ -343,11 +358,11 @@
}
if (curTab == 3) {
app.where.payStatus = 20;
app.where.receiptStatus = 20;
app.where.orderStatus = 30;
}
if (curTab == 4) {
app.where.receiptStatus = 20;
app.where.isComment = 0;
app.where.payStatus = 20;
app.where.orderStatus = 40;
}
app.where.userId = uni.getStorageSync('userId');
app.where.isRenew = 0;