From acb05239afb477efc73874fd88bdc502ce94c2b2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 03 九月 2025 17:20:43 +0800
Subject: [PATCH] 前端
---
small-program/pages/index/index.vue | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 9bd939d..41ec7ff 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -20,19 +20,17 @@
</view>
</view>
<view class="index-j-list">
- <view class="index-list-item" v-if="orderList" v-for="(item, index) in orderList" :key="index">
+ <view class="index-list-item" v-if="orderList && orderList.length" v-for="(item, index) in orderList" :key="index">
<view class="index-list-item-head">
<view class="index-list-item-head-l">
<view class="xoam"></view>
<text v-if="item.type === 0 && item.workType === 0">鐢ㄥ伐鍗� - 閲囨憳宸�</text>
<text v-else-if="item.type === 0 && item.workType === 1">鐢ㄥ伐鍗� - 鍒嗘嫞宸�</text>
<text v-else-if="item.type === 0 && item.workType === 2">鐢ㄥ伐鍗� - 鍖呰宸�</text>
-
- <text v-else-if="item.type === 1">杩愯揣鍗�-{{item.categoryName}}-{{item.carUnit}}</text>
-
+ <text v-else-if="item.type === 1">杩愯揣鍗�-{{item.categoryName}}</text>
<text v-else-if="item.type === 2">璁㈤鍗�</text>
</view>
- <view class="index-list-item-head-r">璺濈 {{item.distance}}km</view>
+ <view class="index-list-item-head-r">{{item.distance}}km</view>
</view>
<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
{{item.categoryName}}锝渰{item.priceNum1}}鏂�
@@ -44,7 +42,7 @@
{{item.categoryName}}锝渰{item.priceNum1}}浜�
</view>
<view class="index-list-item-info" v-if="item.type === 1">
- {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
+ {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
</view>
<view class="index-list-item-info" v-if="item.type === 2">
{{item.wayInfoCopy}}
@@ -78,6 +76,8 @@
<view class="eidt-btn" @click="show1 = true, orderId = item.id">鎶㈠崟</view>
</view>
</view>
+ <view v-if="orderList && orderList.length&& !next" class="more">宸插姞杞藉叏閮�</view>
+ <view v-if="(!orderList || !orderList.length)&& !next" class="more">鏆傛棤璁㈠崟鍝�</view>
</view>
</view>
@@ -346,6 +346,20 @@
<view class="btn2" @click="getaccept1">纭</view>
</view>
</u-modal>
+ <u-modal
+ title="鏀粯鏈垚鍔�"
+ :show="show2"
+ closeOnClickOverlay
+ showCancelButton
+ >
+ <view class="slot-content">
+ 璇风‘璁ゆ槸鍚﹀彇娑堟敮浠樻垨鏌ョ湅璁㈠崟缁х画鏀粯锛�
+ </view>
+ <view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
+ <view class="btn1" @click="show2 = false;payOrderId=null">鍙栨秷鏀粯</view>
+ <view class="btn2" @click="goOrderDetail(payOrderId)">鏌ョ湅璁㈠崟</view>
+ </view>
+ </u-modal>
</view>
</template>
@@ -433,7 +447,9 @@
isOnce: true,
show1: false,
- orderId: null
+ show2: false,
+ orderId: null,
+ payOrderId:null
}
},
async onLoad() {
@@ -503,6 +519,7 @@
this.isLogin = false
console.log('鏈櫥闄�')
}
+ this.payOrderId=null
},
watch: {
typeId: {
@@ -544,6 +561,14 @@
}
},
methods: {
+ goOrderDetail(id){
+ uni.navigateTo({
+ url: `/pages/order-details/order-details?id=`+id
+ })
+ this.orderId=null
+ this.payOrderId=null
+ this.show2=false
+ },
clearFormParam(){
this.form.startDate = ''
this.form.address = ''
@@ -606,6 +631,7 @@
that.next = true
that.orderList = []
that.getOrderList()
+ that.goOrderDetail(that.orderId)
}, 2000)
}
})
@@ -676,6 +702,7 @@
// 鎻愪氦璁㈠崟
submit() {
var that = this
+ this.payOrderId=null
if (!this.form.startDate) {
return uni.showToast({ title: '璇烽�夋嫨鐢ㄩ鏃堕棿', icon: 'none' })
}
@@ -743,6 +770,8 @@
}
},
fail(err) {
+ that.payOrderId = res.data.id
+ that.show2=true
console.log(err)
}
})
@@ -1101,6 +1130,13 @@
width: 100%;
padding: 24rpx 30rpx;
box-sizing: border-box;
+ .more{
+ width: 100%;
+ margin-top: 40rpx;
+ text-align: center;
+ font-size: 24rpx;
+ color: #666666;
+ }
.index-list-item {
width: 100%;
padding: 30rpx;
--
Gitblit v1.9.3