From 82735e4d46ac7b9969facef2acc8f8e793b68f71 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 16:11:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/order-details/order-details.vue | 103 +++++++++++++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 41 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index c5bbb2d..aef5d9a 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -58,14 +58,14 @@
<view v-if="info.type===0" class="order-info-wz">
{{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}{{feeFrom.priceParam1.unit}}{{feeFrom.priceParam2.name!=null?(' | '+info.priceNum2+feeFrom.priceParam2.unit):''}}</view>
<view v-if="info.type===1" class="order-info-wz">{{info.carUnit || ''}}{{' | '}}{{info.transportTypeName || ''}}{{' | '}}{{info.transportNum || '' }}{{info.transportUnit||''}}{{' | '}}闇�{{info.priceNum2 || '' }}杈�</view>
- <view class="order-info-address">
+ <view class="order-info-address" v-if="info.type!==1" @click="openAddr({ lat: info.lat, lgt: info.lgt, location: info.location })">
<image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
<view class="order-info-address-info">
<text>{{info.location || '' }}</text>
<text>{{info.locationRemark || '' }}</text>
</view>
</view>
- <view class="order-info-address">
+ <view class="order-info-address" v-if="info.type!==1">
<image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
<view class="order-info-address-info">
<text>{{info.startDate || ''}}{{' 鑷� '}}{{info.endDate || ''}}({{info.totalDays||0}}澶�)</text>
@@ -73,11 +73,14 @@
</view>
<view class="address" v-if="info.type===1 && wayList && wayList.length>0">
<view class="address-xian"></view>
- <view class="address-row" v-for="(item,index) in wayList" style="display: block;margin: 10px" :key="index">
+ <view class="address-row" v-for="(item,index) in wayList" style="display: block;margin: 10px" :key="index" @click="openAddr(item)">
<image v-if="index === 0" src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
<image v-if="index >0 && index < wayList.length-1" src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
<image v-if="index === wayList.length-1" src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
- <text>{{item.location || ''}}</text>
+ <view class="address-row-info">
+ {{item.location || ''}}
+ <image class="address-row-right" src="/static/icon/ar_address@2x.png" mode="widthFix"></image>
+ </view>
</view>
</view>
<view class="order-info-x"></view>
@@ -85,8 +88,8 @@
<view class="order-info-supplement-title">闇�姹傝ˉ鍏咃細</view>
<view class="order-info-supplement-val">{{info.supplement || '' }}</view>
<view class="order-info-supplement-list">
- <view class="order-info-supplement-list-item" v-for="(item,index) in info.multifileList" v-if="info.multifileList && info.multifileList.length>0" :key="item.imgurl">
- <image v-if="item.fileurlFull" :src="item.fileurlFull" @click="previemImg(item.fileurlFull)" mode="widthFix"></image>
+ <view class="order-info-supplement-list-item" v-for="(item,index) in info.multifileList" v-if="info.multifileList && info.multifileList.length>0" :key="item.imgurl" @click="previemImg(index, info.multifileList)">
+ <image v-if="item.fileurlFull" :src="item.fileurlFull" mode="widthFix"></image>
</view>
<view style="width: 156rpx; height: 0;"></view>
<view style="width: 156rpx; height: 0;"></view>
@@ -236,9 +239,9 @@
</view>
<view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![99].includes(info.status)"></view>
<view class="order-footer" v-if="![99].includes(info.status)">
- <template v-if="isPushlishor && info.isUpdate!=1 &&info.status ===2">
+ <template v-if="isPushlishor && info.isUpdate != 1 && info.status === 2 && canStart==1">
<sunui-mverify v-if="1==2" hint="寮�濮嬩綔涓�" @change="getaccept($event)"></sunui-mverify>
- <view class="order-footer-btn" >
+ <view class="order-footer-btn" v-if="comparisonTime(info.startDate)">
<view class="order-footer-btn-b" @click="show8 = true">寮�濮嬩綔涓�</view>
</view>
</template>
@@ -251,7 +254,6 @@
<view class="order-footer-btn-b" v-if="isPushlishor && ((info.status ===3 && info.type===2))" @click="payment1">瀹屾垚浣滀笟</view>
<view class="order-footer-btn-b" v-if="info.type !=2 && info.isUpdate!=1&& isPushlishor && (info.status ===0 || info.status ===1|| info.status ===2)" @click="jumpEdit()">淇敼璁㈠崟</view>
<view class="order-footer-btn-b" @click="show5 =true" v-if="isAcceptor&& (info.isUpdate==1 && info.status ===2)">淇敼纭</view>
- <!-- <view class="order-footer-btn-b" @click="startJobs()" v-if="userInfo.id === info.releaseMemberId && (info.status ===2)">寮�濮嬩綔涓�</view> -->
<view class="order-footer-btn-b" @click="show6 =true" v-if="!isPushlishor && (info.status ===1)">鎶㈠崟</view>
</view>
<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
@@ -490,8 +492,22 @@
},
onShow(options) {
this.getOrderData()
+ console.log(this.comparisonTime('2025-09-13'))
},
methods:{
+ comparisonTime(start) {
+ let startDate = new Date().getTime();
+ let endDate = new Date(start).getTime();
+
+ return startDate >= endDate;
+ },
+ openAddr(e) {
+ uni.openLocation({
+ latitude: e.lat,
+ longitude: e.lgt,
+ name: e.location
+ })
+ },
beginDo(e) {
var that = this
uni.requestSubscribeMessage({
@@ -716,11 +732,9 @@
})
},
- previemImg(src){
- uni.previewImage({
- current: src,
- urls: [src]
- });
+ previemImg(current, arr) {
+ let urls = arr.map(item => item.fileurlFull)
+ uni.previewImage({ current, urls });
},
contactPhone(phone){
if(phone !=null && phone!=''){
@@ -731,27 +745,7 @@
},
//璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱99=宸插彇娑�
getStatusInfo(){
- if(this.userInfo.id === this.info.acceptMemberId){
- //濡傛灉鏄帴鍗曟柟
- if(this.info.status === 0){
- return ''
- }else if(this.info.status === 1){
- return ''
- }else if(this.info.status === 2){
- if(this.info.isUpdate==1){
- return ''
- }
- return '鎮ㄥ凡鎺ュ崟锛岃鎸夋椂瀹屾垚璁㈠崟浠诲姟'
- }else if(this.info.status === 5){
- return '鎮ㄥ凡纭璐圭敤锛岀瓑寰呭彂鍗曟柟鏀粯'
- }else if(this.info.status === 3){
- return '璁㈠崟杩涜涓紝璇锋寜鏃跺畬鎴愯鍗曚换鍔�'
- }else if(this.info.status === 4){
- return '鎮ㄧ殑璁㈠崟宸插畬鎴�'
- }else if(this.info.status === 99){
- return '璁㈠崟宸插彇娑�'
- }
- }else{
+ if(this.isPushlishor){
//濡傛灉鏄彂甯冩柟
if(this.info.status === 0){
return '璇峰敖蹇畬鎴愭敮浠橈紝鍙戝竷璁㈠崟'
@@ -773,6 +767,27 @@
return '鎺ュ崟鏂瑰凡纭璐圭敤锛岃鐐瑰嚮涓嬫柟鈥滃畬鎴愬苟鏀粯鈥濇寜閽�'
}else if(this.info.status === 4){
return this.info.commentStatus==1?'鎮ㄧ殑璁㈠崟宸插畬鎴愶紝娆㈣繋鍐嶆浣跨敤': '鎮ㄧ殑璁㈠崟宸插畬鎴愶紝璇峰強鏃惰瘎浠�'
+ }else if(this.info.status === 99){
+ return '璁㈠崟宸插彇娑�'
+ }
+ //濡傛灉鏄帴鍗曟柟
+
+ }else{
+ if(this.info.status === 0){
+ return ''
+ }else if(this.info.status === 1){
+ return '鍙戝崟鏂瑰凡鎴愬姛鍙戣捣璁㈠崟锛屾偍鍙互杩涜鎺ュ崟'
+ }else if(this.info.status === 2){
+ if(this.info.isUpdate==1){
+ return ''
+ }
+ return '鎮ㄥ凡鎺ュ崟锛岃鎸夋椂瀹屾垚璁㈠崟浠诲姟'
+ }else if(this.info.status === 5){
+ return '鎮ㄥ凡纭璐圭敤锛岀瓑寰呭彂鍗曟柟鏀粯'
+ }else if(this.info.status === 3){
+ return '璁㈠崟杩涜涓紝璇锋寜鏃跺畬鎴愯鍗曚换鍔�'
+ }else if(this.info.status === 4){
+ return '鎮ㄧ殑璁㈠崟宸插畬鎴�'
}else if(this.info.status === 99){
return '璁㈠崟宸插彇娑�'
}
@@ -887,11 +902,11 @@
this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit ='浜�'
}else if(this.info.carType==2){
- //鎸夊皬鏃�
+ //鎸夐噸閲�
this.feeFrom.priceParam1.name ='鍖呰閲嶉噺'
this.feeFrom.priceParam1.unit ='鏂�'
- this.feeFrom.priceParam2.name =null
- this.feeFrom.priceParam2.unit =null
+ this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟'
+ this.feeFrom.priceParam2.unit ='浜�'
}
}else if(this.info.type==1 && this.info.carType==0){
//杩愯揣鍗� 鎸夊ぉ鏁�
@@ -1658,8 +1673,7 @@
z-index: 2;
width: 100%;
display: flex !important;
- align-items: center;
- margin-bottom: 30rpx ;
+ margin-bottom: 32rpx ;
margin-left: 0rpx !important;
margin-top: 0rpx !important;
&:last-child {
@@ -1671,10 +1685,17 @@
flex-shrink: 0;
margin-right: 24rpx;
}
- text {
+ .address-row-info {
+ width: 100%;
font-weight: 400;
font-size: 28rpx;
color: #333333;
+ .address-row-right {
+ width: 8rpx;
+ height: 16rpx;
+ margin-left: 12rpx;
+ margin-top: 15rpx;
+ }
}
}
}
--
Gitblit v1.9.3