From 800f10a99a19f4936dd2394d0e764a4c7ed7998a Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 05 九月 2025 18:31:49 +0800
Subject: [PATCH] 修BUG
---
small-program/pages/index/index.vue | 235 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 173 insertions(+), 62 deletions(-)
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 9bd939d..a5e872a 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -2,6 +2,10 @@
<view class="index">
<!-- 鎺ュ崟鏂� -->
<view class="index-j" v-if="userInfo && userInfo.useIdentity === 1">
+ <view class="kefubtn" @click="contactPhone()">
+ <image style="width: 36rpx;height: 36rpx" src="/static/icon/ic_kefu.png" mode="widthFix"></image>
+ <text>瀹㈡湇</text>
+ </view>
<view class="index-j-head">
<view :style="{ width: '100%', height: statusbarHeight + 'px' }"></view>
<view class="index-c-title" :style="{ height: navHeight + 'px' }">
@@ -20,69 +24,77 @@
</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-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 === 2">璁㈤鍗�</text>
+ <view class="index-list-item" v-if="orderList && orderList.length" v-for="(item, index) in orderList" :key="index">
+ <view @click="goOrderDetail(item.id)">
+ <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}}</text>
+ <text v-else-if="item.type === 2">璁㈤鍗�</text>
+ </view>
+ <view class="index-list-item-head-r">{{item.distance}}km</view>
</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}}鏂�
- </view>
- <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
- {{item.categoryName}}锝渰{item.priceNum1}}浜�
- </view>
- <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
- {{item.categoryName}}锝渰{item.priceNum1}}浜�
- </view>
- <view class="index-list-item-info" v-if="item.type === 1">
- {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
- </view>
- <view class="index-list-item-info" v-if="item.type === 2">
- {{item.wayInfoCopy}}
- </view>
-
- <view class="address" v-if="item.type === 1">
- <view class="address-xian"></view>
- <view class="address-row" v-if="item.wayInfo" v-for="(address, i) in item.wayInfo" :key="i">
- <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
- <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
- <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
- <text>{{item.location}}</text>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
+ {{item.categoryName}}锝渰{item.priceNum1}}鏂�
</view>
- </view>
- <template v-if="[0, 2].includes(item.type)">
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>{{item.location}}</text>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
+ {{item.categoryName}}锝渰{item.priceNum2}}浜�
</view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.totalDays}}澶╋級</text>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 0">
+ {{item.categoryName}}锝渰{item.priceNum1}}澶� 锝渰{item.priceNum2}}浜�
</view>
- </template>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼{{item.estimatedAccount / 100}}</text>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 1">
+ {{item.categoryName}}锝渰{item.priceNum1}}灏忔椂 锝渰{item.priceNum2}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2">
+ {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 1">
+ {{item.carUnit}} | {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}{{item.carType === 0?"澶�":"娆�"}}
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 2">
+ {{item.wayInfoCopy}}
+ </view>
+
+ <view class="address" v-if="item.type === 1">
+ <view class="address-xian"></view>
+ <view class="address-row" v-if="item.wayInfo" v-for="(address, i) in item.wayInfo" :key="i">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
+ <text>{{address.location}}</text>
+ </view>
+ </view>
+ <template v-if="[0, 2].includes(item.type)">
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
+ <text>{{item.location}}</text>
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.totalDays}}澶╋級</text>
+ </view>
+ </template>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼{{item.estimatedAccount / 100}}</text>
+ </view>
</view>
<view class="eidt">
<!-- <sunui-mverify @change="getaccept($event, item.id, index)"></sunui-mverify> -->
<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>
<!-- 鍙戝崟鏂� -->
- <view class="index-c" v-if="!userInfo || userInfo.useIdentity === 0">
+ <view class="index-c" v-if="!isLogin || !userInfo || userInfo.useIdentity === 0">
<view :style="{ width: '100%', height: statusbarHeight + 'px' }"></view>
<view class="index-c-title" :style="{ height: navHeight + 'px' }" @click="selectAddress(-1)">
<text class="index-c-title-logo">杩戝揩</text>
@@ -146,13 +158,13 @@
<input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
</view>
</view>
- <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row" >
<view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
<view class="list-item-row-val">
<textarea v-model="form.supplement" cols="30" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
</view>
</view>
- <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row" >
<view class="list-item-row-label">鍥剧墖</view>
<view class="list-item-row-upload">
<view class="upload-item" v-if=" form.multifileList" v-for="(item, index) in form.multifileList" :key="index">
@@ -165,10 +177,10 @@
</view>
</view>
</view>
- <view class="list-item-zk" @click="viewStatus = !viewStatus">
+ <!-- <view class="list-item-zk" @click="viewStatus = !viewStatus">
<text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
<u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
- </view>
+ </view> -->
</view>
<view class="list-item">
<view class="list-item-label">鑱旂郴浜轰俊鎭�</view>
@@ -321,11 +333,21 @@
<view class="phone">
<view class="phone-head">
<view></view>
- <text>瀹㈡湇鐢佃瘽</text>
+ <text>鑱旂郴瀹㈡湇</text>
</view>
- <view class="phone-item" v-if="serverPhone" v-for="(item,index) in serverPhone" :key="item" @click="contactPhoneDo(item)">
- <view></view>
- <text>{{item}}</text>
+ <view class="phone-item">
+ <view>
+ <image style="width: 36rpx;height: 36rpx" src="/static/icon/ic_kefu.png" mode="widthFix"></image>
+ <button open-type="contact" plain="true" bindcontact="handleContact">鍦ㄧ嚎瀹㈡湇</button>
+ </view>
+ <view class="line" v-if="serverPhone && serverPhone.length"></view>
+ </view>
+ <view class="phone-item" v-if="serverPhone" v-for="(item,index) in serverPhone" :key="item" @click="contactPhoneDo(item)">
+ <view>
+ <image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
+ <text>{{item}}</text>
+ </view>
+ <view class="line" v-if="index<serverPhone.length-1"></view>
</view>
<view style="width: 100%; height: 30rpx;"></view>
<!-- <view class="phone-botton" @click="contactPhone()" >鍏抽棴</view> -->
@@ -344,6 +366,20 @@
<view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
<view class="btn1" @click="show1 = false">鍙栨秷</view>
<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>
@@ -402,7 +438,7 @@
carRemark: '',
orderFood: [],
- viewStatus: false,
+ viewStatus: true,
form: {
startDate: '',
@@ -433,7 +469,9 @@
isOnce: true,
show1: false,
- orderId: null
+ show2: false,
+ orderId: null,
+ payOrderId:null
}
},
async onLoad() {
@@ -503,6 +541,7 @@
this.isLogin = false
console.log('鏈櫥闄�')
}
+ // this.payOrderId=null
},
watch: {
typeId: {
@@ -544,6 +583,18 @@
}
},
methods: {
+ goOrderDetail(id){
+ uni.navigateTo({
+ url: '/pages/order-details/order-details?id='+id
+ })
+ var that =this
+ setTimeout(function(){
+ that.orderId=null
+ that.payOrderId=null
+ that.show2=false
+ },1000)
+
+ },
clearFormParam(){
this.form.startDate = ''
this.form.address = ''
@@ -606,6 +657,7 @@
that.next = true
that.orderList = []
that.getOrderList()
+ that.goOrderDetail(that.orderId)
}, 2000)
}
})
@@ -676,6 +728,7 @@
// 鎻愪氦璁㈠崟
submit() {
var that = this
+ this.payOrderId=null
if (!this.form.startDate) {
return uni.showToast({ title: '璇烽�夋嫨鐢ㄩ鏃堕棿', icon: 'none' })
}
@@ -743,7 +796,9 @@
}
},
fail(err) {
- console.log(err)
+ that.payOrderId = res.data.id
+ that.show2=true
+ console.log("=====================", res.data.id,that.payOrderId,err)
}
})
}
@@ -1014,6 +1069,33 @@
border-radius: 44rpx;
}
.index-j {
+ .kefubtn{
+ background-color: white;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ position: fixed;
+ bottom: 100rpx;
+ flex-direction: column;
+ right:30rpx;
+ height: 88rpx;
+ width: 88rpx;
+ border: 1rpx solid #f2f2f2;
+ border-radius: 50%;
+ image{
+ width: 36rpx;
+ width: 36rpx;
+ }
+ text{
+ width: 44rpx;
+ height: 32rpx;
+ font-weight: 400;
+ font-size: 22rpx;
+ color: #222222;
+ line-height: 32rpx;
+ text-align: center;
+ }
+ }
width: 100%;
.index-j-head {
width: 100%;
@@ -1101,6 +1183,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;
@@ -1997,12 +2086,34 @@
color: #222222;
}
}
+
.phone-item {
width: 100%;
text-align: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #eeeeee;
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
+ // border-bottom: 1rpx solid #eeeeee;
line-height: 78rpx;
+ button{
+ border: 1rpx white solid;
+ display: inline;
+ width: 300rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ line-height: 32rpx;
+ color: #222222;
+ }
+ image{
+ width: 28rpx;
+ height: 28rpx;
+ margin-right: 30rpx;
+ }
+ .line{
+ width: 100%;
+ height: 1rpx;
+ background-color: #f2f2f2
+ }
text {
font-weight: 500;
font-size: 28rpx;
--
Gitblit v1.9.3