From 3d460140b7af3a281b54d17b457c8aff12b9d5c2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 17:09:52 +0800
Subject: [PATCH] 前端
---
small-program/pages/order-details/order-details.vue | 475 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 340 insertions(+), 135 deletions(-)
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index 2fa75fd..b58da71 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -8,6 +8,9 @@
<view class="order-head-info" v-if="isAcceptor && info.isUpdate ==1" style="color: red;">
璁㈠崟淇℃伅宸蹭慨鏀癸紝璇峰強鏃剁‘璁わ紝{{timeInfo}}鍚庡皢鑷姩鍚屾剰
</view>
+ <view class="order-head-info" v-if="isPushlishor && info.type ==2 && info.status ==0" style="color: red;">
+ 鍓╀綑鏀粯鏃堕棿锛寋{timeInfo1}}鍚庡皢鑷姩鍙栨秷
+ </view>
<view class="order-head-info" v-else >{{getStatusInfo()}}</view>
</view>
<view class="order-quxiao">
@@ -48,20 +51,21 @@
<view class="order-info-title">
<view class="x"></view>
<text v-if="info.type===0">鐢ㄥ伐鍗�-{{(info.workType===0?'閲囨憳宸�':(info.workType===1?'鍒嗘嫞宸�':'鍖呰宸�')) }}</text>
- <text v-if="info.type===1">杩愯揣鍗�-{{info.categoryName || ''}}-{{info.carUnit || ''}}</text>
+ <text v-if="info.type===1">杩愯揣鍗�-{{info.categoryName || ''}}</text>
<text v-if="info.type===2">璁㈤鍗�</text>
</view>
- <view v-if="info.type===0" class="order-info-wz">{{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}{{info.workType === 0?'鏂�':'浜�'}}</view>
- <view v-if="info.type===1" class="order-info-wz">{{info.transportTypeName || ''}}{{' | '}}{{info.transportNum || '' }}{{info.transportUnit||''}}{{' | '}}闇�{{info.priceNum2 || '' }}杈�</view>
- <view class="order-info-address">
+ <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" 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>
@@ -69,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>
@@ -81,14 +88,22 @@
<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>
</view>
</view>
<view class="order-info-price">
+ <view class="price-row" v-if="feeFrom.priceParam1.name">
+ <view class="price-row-label">{{feeFrom.priceParam1.name}}</view>
+ <view class="price-row-val" > {{(info.originPriceNum1||0) }}{{feeFrom.priceParam1.unit}} </view>
+ </view>
+ <view class="price-row" v-if="feeFrom.priceParam2.name">
+ <view class="price-row-label">{{feeFrom.priceParam2.name}}</view>
+ <view class="price-row-val" > {{(info.originPriceNum2||0) }}{{feeFrom.priceParam2.unit}} </view>
+ </view>
<view class="price-row">
<view class="price-row-label">璐圭敤鏍囧噯</view>
<view class="price-row-val" v-if="info.type !==2">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</view>
@@ -100,18 +115,60 @@
</view>
<view class="price-row">
<view class="price-row-label">棰勪及鎬昏垂鐢�(鍏�)</view>
- <view class="price-row-val" :style="{color: userInfo.id !== info.acceptMemberId ? '#FF0000' : ''}">
- 楼{{((info.estimatedAccount||0)/100).toFixed(2) }}
+ <view class="price-row-val" :style="{color: (!isPushlishor&&info.status!=4&&info.status!=5) || (isPushlishor&&info.type!=2 &&info.status!=4&&info.status!=5) ? '#FF0000' : ''}">
+ 楼{{((info.originEstimatedAccount||0)/100).toFixed(2) }}
</view>
- </view>
-
- <view class="price-row" v-if="isAcceptor">
- <view class="price-row-label">瀹為檯鍒拌处(鍏�)</view>
- <view class="price-row-val" style="color: #FF0000;">
- 楼{{((info.estimatedAccount * (1 - (info.platformRata || 0))) / 100).toFixed(2) }}
- </view>
- </view>
+ </view>
</view>
+ <template v-if="info.type!=2&&(info.status==5|| info.status==4)">
+ <view class="order-info-x"></view>
+ <view class="order-info-supplement" >
+ <view class="order-info-supplement-title">宸茬‘璁よ垂鐢�</view>
+ </view>
+ <view class="order-info-price">
+ <view class="price-row" v-if="feeFrom.priceParam1.name">
+ <view class="price-row-label">瀹為檯{{feeFrom.priceParam1.name}}</view>
+ <view class="price-row-val" > {{(info.priceNum1||0) }}{{feeFrom.priceParam1.unit}} </view>
+ </view>
+ <view class="price-row" v-if="feeFrom.priceParam2.name">
+ <view class="price-row-label">瀹為檯{{feeFrom.priceParam2.name}}</view>
+ <view class="price-row-val" > {{(info.priceNum2||0) }}{{feeFrom.priceParam2.unit}} </view>
+ </view>
+ <view class="price-row" >
+ <view class="price-row-label">鍏朵粬璐圭敤</view>
+ <view class="price-row-val" >楼{{((info.confirmOtherFee||0)/100).toFixed(2) }} </view>
+ </view>
+ <view class="price-row">
+ <view class="price-row-label">瀹為檯鎬昏垂鐢�(鍏�)</view>
+ <view class="price-row-val" :style="{color: info.status !=4 ? '#FF0000' : ''}">
+ 楼{{((info.estimatedAccount||0)/100).toFixed(2) }}
+ </view>
+ </view>
+ <view class="price-row" >
+ <view class="price-row-label">澶囨敞</view>
+ <view class="price-row-val" >
+ {{ info.confirmFeeRemark ||'' }}
+ </view>
+ </view>
+ </view>
+ </template>
+ <template v-if="info.type==2 || info.status==4">
+ <view class="order-info-x"></view>
+ <view class="order-info-supplement" >
+ <view class="order-info-supplement-title">瀹為檯璐圭敤</view>
+ </view>
+ <view class="order-info-price">
+ <view class="price-row" v-if="isPushlishor">
+ <view class="price-row-label" >瀹為檯鏀粯(鍏�)</view>
+ <view class="price-row-val" style="color: #FF0000;">楼{{((info.payAccount||0)/100).toFixed(2) }} </view>
+ </view>
+ <view class="price-row" v-if="isAcceptor && info.status==4" >
+ <view class="price-row-label">瀹為檯鍒拌处(鍏�)</view>
+ <view class="price-row-val" style="color: #FF0000;">楼{{((info.receiveAccount||0)/100).toFixed(2) }} </view>
+ </view>
+
+ </view>
+ </template>
</view>
<view class="order-info" v-if="info.commentStatus ===1">
<view class="order-info-title">
@@ -158,6 +215,10 @@
<text>寮�濮嬫椂闂达細</text>
<text>{{info.workStartTime||'-'}}</text>
</view>
+ <view class="order-info-list-item" v-if="info.confirmFeeTime">
+ <text>璐圭敤纭鏃堕棿锛�</text>
+ <text>{{info.confirmFeeTime||'-'}}</text>
+ </view>
<view class="order-info-list-item" v-if="info.finishTime">
<text>瀹屾垚鏃堕棿锛�</text>
<text>{{info.finishTime||'-'}}</text>
@@ -178,24 +239,25 @@
</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">
- <sunui-mverify hint="寮�濮嬩綔涓�" @change="getaccept($event)"></sunui-mverify>
+ <template v-if="isPushlishor && info.isUpdate != 1 && info.status === 2 && info.canStart===1">
+ <sunui-mverify v-if="1==2" hint="寮�濮嬩綔涓�" @change="getaccept($event)"></sunui-mverify>
+ <view class="order-footer-btn" v-if="comparisonTime(info.startDate)">
+ <view class="order-footer-btn-b" @click="show8 = true">寮�濮嬩綔涓�</view>
+ </view>
</template>
- <view class="order-footer-btn" v-else>
+ <view class="order-footer-btn" v-else >
<view class="order-footer-btn-a" @click="show = true" v-if="1==2&& isAcceptor && info.status ===2">鍙栨秷璁㈠崟</view>
<view class="order-footer-btn-a" @click="show = true" v-if="isPushlishor && (info.status ===0 || info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view>
<view class="order-footer-btn-b" @click="show2=true" v-if="isPushlishor && (info.status ===4 && info.commentStatus!=1)">鍘昏瘎浠�</view>
<view class="order-footer-btn-b" v-if="isPushlishor&&((info.status ===5 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">{{info.type === 2 ? '缁х画鏀粯' : '瀹屾垚骞舵敮浠�'}}</view>
- <view class="order-footer-btn-a" @click="show7 = true" v-if=" info.type!==2 &&isAcceptor && info.status ===3">纭璐圭敤</view>
+ <view class="order-footer-btn-b" @click="show7 = true" v-if=" info.type!==2 &&isAcceptor && info.status ===3">纭璐圭敤</view>
<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>
</view>
-
<u-modal
title="娓╅Θ鎻愮ず"
:show="show"
@@ -235,7 +297,21 @@
</view>
<view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
<view class="btn1" @click="show6 = false">鎴戝啀鎯虫兂</view>
- <view class="btn2" @click="acceptDo">纭鎺ュ崟</view>
+ <view class="btn2" @click="acceptDo()">纭鎺ュ崟</view>
+ </view>
+ </u-modal>
+ <u-modal
+ title="娓╅Θ鎻愮ず"
+ :show="show8"
+ 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="show8 = false">鎴戝啀鎯虫兂</view>
+ <view class="btn2" @click="beginDo()">纭寮�濮�</view>
</view>
</u-modal>
<u-modal
@@ -286,42 +362,46 @@
</view>
<view class="querenfee-c">
<view class="querenfee-c-info1">璐圭敤鏍囧噯锛�</view>
- <viem class=" money">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</viem>
+ <viem class="money">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</viem>
</view>
<view class="querenfee-c" >
- <view class="querenfee-c-info1"><text style="color: red;">*</text>{{feeFrom.priceParam1.name}}锛�</view>
+ <view class="querenfee-c-info1"><text style="color: red;">*</text>瀹為檯{{feeFrom.priceParam1.name}}:</view>
<view class="querenfee-c-input">
- <input type="number" v-model="feeForm.priceNum1" placeholder="璇疯緭鍏�" />
+ <input type="number" placeholder-style="color: #999999; font-size: 50rpx; font-weight: 500;" @input="getTotal" v-model="feeFrom.priceNum1" placeholder="0" />
</view>
- <text class="querenfee-c-info1" >{{feeFrom.priceParam1.unit}}</text>
+ <text class="querenfee-c-danw">{{feeFrom.priceParam1.unit}}</text>
</view>
<view class="querenfee-c" v-if="feeFrom.priceParam2.name !=null">
- <view class="querenfee-c-info1"><text style="color: red;">*</text>{{feeFrom.priceParam2.name}}锛�</view>
+ <view class="querenfee-c-info1"><text style="color: red;">*</text>瀹為檯{{feeFrom.priceParam2.name}}锛�</view>
<view class="querenfee-c-input">
- <input type="number" v-model="feeForm.priceNum2" placeholder="璇疯緭鍏�" />
+ <input type="number" v-model="feeFrom.priceNum2" placeholder-style="color: #999999; font-size: 50rpx; font-weight: 500;" @input="getTotal" placeholder="0" />
</view>
- <text class="querenfee-c-info1" >{{feeFrom.priceParam2.unit}}</text>
+ <text class="querenfee-c-danw" >{{feeFrom.priceParam2.unit}}</text>
</view>
<view class="querenfee-c">
<view class="querenfee-c-info1">鍏朵粬璐圭敤锛�</view>
<view class="querenfee-c-input">
- <input type="number" v-model="feeForm.confirmOtherFee" placeholder="璇疯緭鍏�" />
+ <input type="digit" v-model="feeFrom.confirmOtherFee" placeholder-style="color: #999999; font-size: 50rpx; font-weight: 500;" @input="getTotal" placeholder="0" />
</view>
+ <text class="querenfee-c-danw">鍏�</text>
</view>
- <view class="querenfee-c">
- <view class="querenfee-c-info1">澶囨敞淇℃伅锛�</view>
- <view class="querenfee-c-input">
- <u--textarea placeholder="濡傞渶澶囨敞锛岃杈撳叆" border="none" v-model="feeForm.confirmFeeRemark" ></u--textarea>
+ <view class="querenfee-c" style="flex-direction: column;">
+ <view class="querenfee-c-info1" style="margin-bottom: 30rpx;">澶囨敞淇℃伅锛�</view>
+ <view class="querenfee-c-input" style="width: 100%; height: 200rpx; padding: 30rpx; box-sizing: border-box;">
+ <u--textarea placeholder="濡傞渶澶囨敞锛岃杈撳叆" border="none" v-model="feeFrom.confirmFeeRemark" ></u--textarea>
</view>
</view>
<view class="querenfee-c">
<view class="querenfee-c-info1">瀹為檯鎬昏垂鐢細</view>
- <view class="querenfee-c-input">
+ <view class="querenfee-c-price">
+ 锟{confirmPayFee}}
+ </view>
+ <!-- <view class="querenfee-c-input">
<image src="/static/icon/ic_money@2x.png" mode="widthFix"></image>
<text class="querenfee-c-input money">{{confirmPayFee}}</text>
- </view>
+ </view> -->
</view>
- <view class="querenfee-c">
+ <view class="querenfee-c" style="margin-top: 12rpx;">
<view class="querenfee-tips">鏈�缁堣垂鐢ㄧ敱鍙戝崟鏂规敮浠橈紝鎺ュ崟鏂规敹鍒扮殑閲戦灏嗘墸闄ゅ钩鍙版墜缁垂鐢�</view>
</view>
<view class="querenfee-botton" @click="confirmFee">纭璐圭敤</view>
@@ -360,20 +440,25 @@
},
data() {
return {
- isPushlishor:false,
- isAcceptor:false,
+ isPushlishor:false,//鏄惁鍙戝崟鏂�
+ isAcceptor:false,//鏄惁鎺ュ崟鏂�
show: false,
show1: false,
show2: false,
count: 5,
show3:false,
timer:null,
+ timer1:null,
show4:false,
show5:false,
show6:false,
- show7:true,
+ show7:false,
+ show8:false,
+ actionFlag:null,
timeInfo:'00:00:00',
+ timeInfo1:'00:00:00',
lessTime:null,
+ lessTime1:null,
value:0,
wayList:[],
bgImg: require('@/static/image/bg_green@2x.png'),
@@ -403,29 +488,49 @@
console.log(options)
var id = options.id
this.id = id
+ this.actionFla=options.flag
},
onShow(options) {
this.getOrderData()
+ console.log(this.comparisonTime('2025-09-13'))
},
- methods:{
- getaccept(e) {
- if (!e.msg) return;
+ 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({
+ tmplIds: ['3rOz7DAnawrkKDM8b5_XW4FLivISWYov6d7QSC4ORsg'],
+ success(res) {
+ that.startJobs()
+ },
+ fail(err) {
+ that.startJobs()
+ }
+ })
+ },
+ startJobs(e) {
+ var that = this
this.$u.api.begin({ orderId: this.info.id })
.then(res => {
if (res.code === 200) {
- this.getOrderData()
+ that.show8=false
+ that.getOrderData()
}
})
},
- // 寮�濮嬩綔涓�
- startJobs() {
- this.$u.api.begin({ orderId: this.info.id })
- .then(res => {
- if (res.code === 200) {
- this.getOrderData()
- }
- })
- },
+
// 淇敼
jumpEdit() {
if (this.info.type === 0 && this.info.workType === 0) {
@@ -456,8 +561,49 @@
}
})
},
+ getTotal() {
+ this.$u.api.getTotal({
+ price: this.info.price,
+ priceUnit: this.feeFrom.priceParam1.unit,
+ priceNum1: this.feeFrom.priceNum1 || 0,
+ priceNum2: this.feeFrom.priceNum2 || 0,
+ confirmOtherFee:(this.feeFrom.confirmOtherFee||0)*100,
+ type: this.info.type,
+ carType:this.info.carType ,
+ workType: this.info.workType
+ }).then(res => {
+ if (res.code === 200) {
+ this.confirmPayFee = (res.data / 100) || '0'
+ }
+ })
+ },
confirmFee(){
- console.log("confirmFee")
+ var that =this
+ if (!this.feeFrom.priceNum1) {
+ return uni.showToast({
+ title: '瀹為檯' + this.feeFrom.priceParam1.name + '涓嶈兘涓虹┖',
+ icon: 'none'
+ })
+ }
+ if (this.feeFrom.priceParam2.name && !this.feeFrom.priceNum2) {
+ return uni.showToast({
+ title: '瀹為檯' + this.feeFrom.priceParam2.name + '涓嶈兘涓虹┖',
+ icon: 'none'
+ })
+ }
+ this.$u.api.confirmFee({
+ confirmFeeRemark: this.feeFrom.confirmFeeRemark,
+ confirmOtherFee: (this.feeFrom.confirmOtherFee||0)*100,
+ orderId: this.info.id,
+ priceNum1: this.feeFrom.priceNum1,
+ priceNum2: this.feeFrom.priceNum2
+ }).then(res => {
+ if (res.code === 200) {
+ that.show7 = false
+ uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'success', duration: 2000 });
+ that.getOrderData()
+ }
+ })
},
payment() {
var that = this
@@ -524,17 +670,6 @@
}
})
},
- beginDo(){
- var that = this
- var param = {orderId: this.id}
- this.$u.api.begin(param).then(res =>{
- if(res.code ===200){
- that.show3=false
- uni.showToast({ title: '鎿嶄綔鎴愬姛', icon: 'error', duration: 2000 });
- that.getOrderData()
- }
- })
- },
confirmUpdDo(status){
var that = this
var param = {orderId: this.id,status:status}
@@ -550,7 +685,7 @@
}
})
},
- acceptDo(){
+ acceptDoBiz(){
var that = this
var param = {orderId: this.id}
this.$u.api.accept(param).then(res =>{
@@ -560,6 +695,18 @@
that.getOrderData()
}
})
+ },
+ acceptDo() {
+ var that = this;
+ uni.requestSubscribeMessage({
+ tmplIds: ['AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8','3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk','tDpYImlrdv-0d3euTrHbYZ1cEZvjVHTNlqHvV0tpLHg'],
+ success(res) {
+ that.acceptDoBiz()
+ },
+ fail(err) {
+ that.acceptDoBiz()
+ }
+ })
},
cancelDo(){
var that = this
@@ -585,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!=''){
@@ -600,17 +745,45 @@
},
//璁㈠崟鐘舵��:0=寰呮敮浠� 1=寰呮帴鍗曪紱2=宸叉帴鍗曪紱3=杩涜涓紱4=宸插畬鎴愶紱99=宸插彇娑�
getStatusInfo(){
- if(this.userInfo.id === this.info.acceptMemberId){
+ if(this.isPushlishor){
+ //濡傛灉鏄彂甯冩柟
+ if(this.info.status === 0){
+ return '璇峰敖蹇畬鎴愭敮浠橈紝鍙戝竷璁㈠崟'
+ }else if(this.info.status === 1){
+ return '鎮ㄨ鍗曞凡缁忔垚鍔熷彂璧凤紝璇疯�愬績绛夊緟鎺ュ崟'
+ }else if(this.info.status === 5){
+ return '鎺ュ崟鏂瑰凡纭璐圭敤锛岃鏀粯'
+ }else if(this.info.status === 2){
+ if(this.info.isUpdate==1){
+ return '璁㈠崟宸蹭慨鏀癸紝璇风瓑寰呮帴鍗曟柟纭'
+ }
+ return '璁㈠崟宸叉帴鍗曪紝璇风偣鍑讳笅鏂光�滃紑濮嬩綔涓氣�濇寜閽�'
+ }else if(this.info.status === 3){
+ if(this.info.type ==2){
+ return '璁㈠崟浣滀笟杩涜涓紝璇风偣鍑讳笅鏂光�滃畬鎴愨�濇寜閽畬鎴愪綔涓�'
+ }
+ return '璁㈠崟姝ｅ湪杩涜涓紝绛夊緟浣滀笟瀹屾垚鎺ュ崟鏂圭‘璁よ垂鐢�'
+ }else if(this.info.status === 5){
+ 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 ''
+ 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){
@@ -618,25 +791,29 @@
}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 === 3){
- return this.info.type!=2?'璁㈠崟瀹屾垚鍚庤鐐瑰嚮涓嬫柟鈥滃畬鎴愬苟鏀粯鈥濇寜閽�':'璁㈠崟姝ｅ湪杩涜涓�'
- }else if(this.info.status === 4){
- return this.info.commentStatus==1?'鎮ㄧ殑璁㈠崟宸插畬鎴愶紝娆㈣繋鍐嶆浣跨敤': '鎮ㄧ殑璁㈠崟宸插畬鎴愶紝璇峰強鏃惰瘎浠�'
- }else if(this.info.status === 99){
- return '璁㈠崟宸插彇娑�'
- }
}
+ },
+ updateTimeInfo1(){
+ if(this.timer1){
+ clearInterval(this.timer1)
+ }
+ var that =this
+ this.lessTime1 = Math.floor( Number(that.info.cancelCountdown || 0)/1000) ;
+ if(this.lessTime1>0){
+ this.timer1 = setInterval(function(){
+ let h = Math.floor(that.lessTime1/60/60) ;
+ let m = Math.floor((that.lessTime1 - h*60*60)/60);
+ let s= Math.floor(that.lessTime1- h*60*60 -m*60);
+ that.timeInfo1 =(h<10?'0':'')+ h+":"+(m<10?'0':'')+m+":"+(s<10?'0':'')+s;
+ that.lessTime1 =that.lessTime1-1;
+ if(that.lessTime1 <=0){
+ that.timeInfo1 ="00:00:00"
+ clearInterval(that.timer1)
+ }
+ // console.log( that.timeInfo)
+ },1000)
+ }
+
},
updateTimeInfo(){
if(this.timer){
@@ -652,6 +829,10 @@
that.timeInfo =(h<10?'0':'')+ h+":"+(m<10?'0':'')+m+":"+(s<10?'0':'')+s;
that.lessTime =that.lessTime-1;
// console.log( that.timeInfo)
+ if(that.lessTime<=0){
+ that.timeInfo ="00:00:00"
+ clearInterval(that.timer)
+ }
},1000)
}
@@ -662,8 +843,6 @@
this.isPushlishor =false
this.isAcceptor =false
this.$u.api.getDetail(param).then(res =>{
- console.error("=============================",res.data.releaseMemberId,res.data.acceptMemberId,that.userInfo.id)
-
if(res.code ===200){
if(that.userInfo.id === res.data.releaseMemberId ){
//濡傛灉鏄彂鍗曟柟
@@ -672,15 +851,8 @@
//濡傛灉鏄帴鍗曟柟
that.isAcceptor =true
}
- if(that.isAcceptor ||that.isPushlishor ){
+ // if(that.isAcceptor ||that.isPushlishor ){
that.info = res.data
- if(that.userInfo.id === that.info.releaseMemberId ){
- //濡傛灉鏄彂鍗曟柟
- that.isPushlishor =true
- }else if(that.userInfo.id === that.info.acceptMemberId ){
- //濡傛灉鏄帴鍗曟柟
- that.isAcceptor =true
- }
that.amount = ((that.info.estimatedAccount || 0) / 100).toFixed(2)
if(that.info.wayInfo){
that.wayList = JSON.parse(that.info.wayInfo)
@@ -688,10 +860,13 @@
if(res.data.isUpdate == 1){
that.updateTimeInfo()
}
+ if(res.data.status == 0){
+ that.updateTimeInfo1()
+ }
that.initPriceNumParam()
- }else{
- uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
- }
+ // }else{
+ // uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
+ // }
}
})
},
@@ -702,13 +877,13 @@
this.feeFrom.priceParam2.unit =null
if(this.info.type==0 && this.info.workType==1){
//鍒嗘嫞宸�
- this.feeFrom.priceParam1.name ='瀹為檯鐢ㄥ伐澶╂暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄥ伐澶╂暟'
this.feeFrom.priceParam1.unit ='澶�'
- this.feeFrom.priceParam2.name ='瀹為檯鐢ㄥ伐浜烘暟锛�'
+ this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit ='浜�'
}else if(this.info.type==0 && this.info.workType==0){
//閲囨憳宸�
- this.feeFrom.priceParam1.name ='瀹為檯閲囨憳閲嶉噺锛�'
+ this.feeFrom.priceParam1.name ='閲囨憳閲嶉噺'
this.feeFrom.priceParam1.unit ='鏂�'
this.feeFrom.priceParam2.name =null
this.feeFrom.priceParam2.unit =null
@@ -716,30 +891,30 @@
//鍖呰宸�
if(this.info.carType==0){
//鎸夊ぉ
- this.feeFrom.priceParam1.name ='瀹為檯鐢ㄥ伐澶╂暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄥ伐澶╂暟'
this.feeFrom.priceParam1.unit ='澶�'
- this.feeFrom.priceParam2.name ='瀹為檯鐢ㄥ伐浜烘暟锛�'
+ this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit ='浜�'
}else if(this.info.carType==1){
//鎸夊皬鏃�
- this.feeFrom.priceParam1.name ='瀹為檯鐢ㄥ伐鏃堕棿锛�'
- this.feeFrom.priceParam1.unit ='鏃�'
- this.feeFrom.priceParam2.name ='瀹為檯鐢ㄥ伐浜烘暟锛�'
+ this.feeFrom.priceParam1.name ='宸ヤ綔鏃堕暱'
+ this.feeFrom.priceParam1.unit ='灏忔椂'
+ this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit ='浜�'
- }else if(this.info.carType==1){
- //鎸夊皬鏃�
- this.feeFrom.priceParam1.name ='瀹為檯鍖呰閲嶉噺锛�'
+ }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){
//杩愯揣鍗� 鎸夊ぉ鏁�
- this.feeFrom.priceParam1.name ='瀹為檯鐢ㄨ溅澶╂暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄨ溅澶╂暟'
this.feeFrom.priceParam1.unit ='澶�'
}else if(this.info.type==1 && this.info.carType==1){
//杩愯揣鍗� 鎸夋鏁�
- this.feeFrom.priceParam1.name ='瀹為檯鐢ㄨ溅娆℃暟锛�'
+ this.feeFrom.priceParam1.name ='鐢ㄨ溅娆℃暟'
this.feeFrom.priceParam1.unit ='娆�'
}
}
@@ -812,6 +987,7 @@
width: 100%;
margin-top: 46rpx;
display: flex;
+ justify-content: space-between;
.querenfee-c-info {
align-items: center;
font-weight: 500;
@@ -823,12 +999,27 @@
margin-left: 10rpx;
}
}
- .querenfee-c-info1 {
- width: 50%;
+ .querenfee-c-danw {
+ display: flex;
+ align-items: center;
+ flex-shrink: 0;
font-weight: 400;
font-size: 30rpx;
- color: #666666;
- margin-bottom: 20rpx;
+ color: #333333;
+ margin-left: 10rpx;
+ }
+ .querenfee-c-price {
+ font-weight: 600;
+ font-size: 44rpx;
+ color: #FF0000;
+ }
+ .querenfee-c-info1 {
+ width: 50%;
+ display: flex;
+ align-items: center;
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
}
.querenfee-tips{
width: 100%;
@@ -840,13 +1031,15 @@
.money{
width: 50%;
text-align: right;
- color: red !important;
+ font-weight: 600;
+ font-size: 34rpx;
+ color: #FF0000 !important;
}
.querenfee-c-input {
- width: 100%;
- padding: 0 30rpx;
+ width: 260rpx;
+ height: 100rpx;
+ padding: 10rpx 30rpx;
box-sizing: border-box;
- height: 60rpx;
background: #F7F7F7;
border-radius: 10rpx;
border: 1rpx solid #EEEEEE;
@@ -862,7 +1055,12 @@
flex: 1;
height: 100%;
font-weight: 500;
+ font-size: 56rpx;
color: #222222;
+ text-align: right;
+ .querenfee-c-input-placeholder {
+ font-size: 32rpx !important;
+ }
}
}
}
@@ -876,7 +1074,7 @@
color: #FFFFFF;
background: #00BC12;
border-radius: 44rpx;
- margin-top: 264rpx;
+ margin-top: 40rpx;
}
}
.zhifu {
@@ -1046,6 +1244,7 @@
font-weight: 500;
font-size: 32rpx;
color: #666666;
+ margin-right: 2rpx;
border-radius: 44rpx;
border: 1rpx solid #B2B2B2;
}
@@ -1474,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 {
@@ -1487,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