bonus
/
Zlpt_Portal_h5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单管理

This commit is contained in:
hongchao 2025-02-25 15:22:01 +08:00
parent 749ef2a157
commit 18418736a7
2 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pages/index/index.vue
View File

@ -58,6 +58,7 @@
</view>
<view class="order-data">
<TitleTip />
<text class="order-title-label">承租订单</text>
<van-cell-group inset>
<van-grid :column-num="3">
<van-grid-item v-for="(o, i) in orderData" :key="i" @click="onViewMyOrder(o)">
@ -67,6 +68,16 @@
</van-grid-item>
</van-grid>
</van-cell-group>
<text class="order-title-label">出租订单</text>
<van-cell-group inset>
<van-grid :column-num="3">
<van-grid-item v-for="(o, i) in orderDataTwo" :key="i" @click="onViewMyOrder(o)">
<van-icon :name="o.order_icon" size="30" />
<text class="order-title">{{ o.order_title }}</text>
<text class="order-count">{{ o.order_count }}</text>
</van-grid-item>
</van-grid>
</van-cell-group>
</view>
<view class="to-do-list">
@ -120,6 +131,8 @@ const orderData = ref([
{ order_title: '承租订单', order_count: 0, order_status: 0, order_icon: orderIcon_1, type: 2 },
{ order_title: '租赁中', order_status: 4, order_count: 0, order_icon: orderIcon_4, type: 2 },
{ order_title: '已完成', order_status: 20, order_count: 0, order_icon: orderIcon_6, type: 2 },
])
const orderDataTwo = ref([
{ order_title: '出租订单', order_count: 0, order_status: 0, order_icon: orderIcon_1, type: 1 },
{ order_title: '租赁中', order_status: 4, order_count: 0, order_icon: orderIcon_4, type: 1 },
{ order_title: '已完成', order_status: 20, order_count: 0, order_icon: orderIcon_6, type: 1 },
@ -191,9 +204,9 @@ const getOrderStatusCountData = async () => {
orderData.value[0].order_count = res.data[0].orderCount
orderData.value[1].order_count = res.data[0].leaseOrderCount
orderData.value[2].order_count = res.data[0].completeOrderCount
orderData.value[3].order_count = res2.data[0].orderCount
orderData.value[4].order_count = res2.data[0].leaseOrderCount
orderData.value[5].order_count = res2.data[0].completeOrderCount
orderDataTwo.value[0].order_count = res2.data[0].orderCount
orderDataTwo.value[1].order_count = res2.data[0].leaseOrderCount
orderDataTwo.value[2].order_count = res2.data[0].completeOrderCount
}
const onViewMyOrder = (order) => {
@ -459,4 +472,15 @@ onShow(async () => {
padding: 0;
background-color: #f8f8f8;
}
.order-title-label {
font-size: 12px;
font-weight: bold;
color: #333;
margin: 10px 0;
display: inline-block; /* 使元素仅包裹内容 */
border: 1px solid #81d4fa; /* 添加边框，颜色可根据需求调整 */
background-color: #e1f5fe; /* 设置浅蓝色背景色 */
padding: 5px; /* 添加内边距，让内容与边框有间距 */
border-radius: 4px; /* 给边框添加圆角 */
}
</style>

50
src/pages/order-list/index.vue
View File

@ -17,7 +17,7 @@
</van-tabs>
<scroll-view scroll-y style="padding: 10px; box-sizing: border-box">
<scroll-view scroll-y style="padding: 10px; box-sizing: border-box" @scrolltolower="onScrollToLower">
<van-search
v-model="orderQueryParams.keyWord"
placeholder="请输入搜索内容"
@ -132,7 +132,7 @@
size="mini"
style="margin-right: 6px"
class="primary-lease"
v-if="goods.orderStatus == 4"
v-if="goods.orderStatus == 4 && !orderQueryParams.flag"
@click.stop="onReturnGoods(item, goods)"
>
发起退租
@ -630,7 +630,7 @@ const repairList = ref([])
const handleTitle = ref('')
const repairIndex = ref(0)
const orderQueryParams = ref({
pageSize: 20,
pageSize: 10,
pageNum: 1,
flag: true,
orderStatus: '',
@ -638,7 +638,7 @@ const orderQueryParams = ref({
keyWord: '',
})
const pickUpCodeRef = ref(null);
const submitPickupCode = async () => {
const submitPickupCode = async() => {
try {
console.log("222222222222",pickUpCodeForm.value.pickUpCode)
if(pickUpCodeForm.value.pickUpCode==null || pickUpCodeForm.value.pickUpCode==''){
@ -657,16 +657,17 @@ const submitPickupCode = async () => {
orderStatus: 4,
pickupCode:pickUpCodeForm.value.pickUpCode
}
const res = editOrderStatusAPI(editParamsOne)
const res = await editOrderStatusAPI(editParamsOne)
showPickUpCodeTwo.value = false
console.log("bbbbbbbbbbbbb")
if (res.code === 200) {
showPickUpCodeTwo.value = false
console.log("yyyyyyyyyyy")
uni.showToast({
title: '收货成功',
icon: 'none'
});
uni.showToast({
title: '收货成功',
icon: 'none'
});
orderQueryParams.value.pageNum = 1
getOrderListData()
}else{
console.log("cxxxxxxxcxxxxxxxxx")
@ -742,7 +743,7 @@ const onClickLeft = () => {
// 获取订单列表
const getOrderListData = async () => {
const res = await getOrderListAPI(orderQueryParams.value)
orderList.value = res.rows
orderList.value = res.data.rows
}
// 发起减免
@ -1158,12 +1159,37 @@ onLoad((options) => {
activeTabs.value = tabIndex
orderQueryParams.value.orderStatus = options?.status == 0 ? '' : options?.status
orderQueryParams.value.code = options?.code
getOrderListData()
// getOrderListData()
})
onShow(() => {
getOrderListData()
})
// 是否正在加载数据的标志
const isLoading = ref(false);
// 新增：下拉触底事件处理函数
const onScrollToLower = async () => {
if (isLoading.value) return; // 如果正在加载数据，直接返回
isLoading.value = true; // 开始加载数据
orderQueryParams.value.pageNum++; // 页码加1
try {
const res = await getOrderListAPI(orderQueryParams.value);
if (res.data.rows.length > 0) {
orderList.value = [...orderList.value, ...res.data.rows]; // 合并新数据
} else {
orderQueryParams.value.pageNum--; // 如果没有新数据，页码减1
uni.showToast({
title: '没有更多数据了',
icon: 'none'
});
}
} catch (error) {
console.error('分页查询出错:', error);
orderQueryParams.value.pageNum--; // 查询出错，页码减1
} finally {
isLoading.value = false; // 加载数据结束
}
};
</script>
<style lang="scss" scoped>