From 77b52c06afdb843ee67c6e938afab0458143d76f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 05 九月 2025 10:48:48 +0800
Subject: [PATCH] 前端
---
admin/src/components/business/OperaOrderDetailWindow.vue | 37 +++---
/dev/null | 0
small-program/main.js | 4
small-program/pages/packaging-worker/packaging-worker.vue | 17 +-
small-program/pages/demand-hall/demand-hall.vue | 35 +++--
small-program/pages/sorting/sorting.vue | 2
small-program/pages/index/index.vue | 126 ++++++++++++--------
server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java | 18 ++-
admin/.env.development | 3
small-program/pages/order-details/order-details.vue | 77 ++++++------
small-program/pages/freight/freight.vue | 9 +
11 files changed, 186 insertions(+), 142 deletions(-)
diff --git a/admin/.env.development b/admin/.env.development
index 80ca267..8df256e 100644
--- a/admin/.env.development
+++ b/admin/.env.development
@@ -1,3 +1,4 @@
# 寮�鍙戠幆澧冮厤缃�
NODE_ENV = 'development'
-VUE_APP_API_URL = 'http://192.168.1.54:10010'
+#VUE_APP_API_URL = 'http://192.168.1.54:10010'
+VUE_APP_API_URL = 'https://jinkuai.832smartfarm.com/jinkuai_admin'
diff --git a/admin/src/components/business/OperaOrderDetailWindow.vue b/admin/src/components/business/OperaOrderDetailWindow.vue
index 8658b5a..f4efe42 100644
--- a/admin/src/components/business/OperaOrderDetailWindow.vue
+++ b/admin/src/components/business/OperaOrderDetailWindow.vue
@@ -59,15 +59,14 @@
<div class="cont"><span class="label">鍝佺锛�</span> <span class="txt">{{info.categoryName || ''}}</span></div>
</div>
<div class="line">
- <div class="cont" v-if="info.workType==1"><span class="label">浜烘暟锛�</span> <span class="txt">{{info.priceNum1 || '' }}浜�</span></div>
- <div class="cont" v-if="info.workType==0"><span class="label">閲嶉噺锛�</span> <span class="txt">{{info.priceNum1 || '' }}鏂�</span></div>
- <div class="cont"><span class="label">鐢ㄥ伐鏃堕棿锛�</span><span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}</span></div>
- <div class="cont"><span class="label">鐢ㄥ伐澶╂暟锛�</span><span class="txt">{{info.totalDays || 0 }}澶�</span></div>
+ <div class="cont" ><span class="label">鐢ㄥ伐鏃堕棿锛�</span><span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }} 锛� {{info.totalDays || 0 }} 锛夊ぉ</span></div>
+ <div class="cont"><span class="label">鐢ㄥ伐鍦扮偣锛�</span> <span class="txt">{{info.location || '' }}</span></div>
+ <div class="cont"><span class="label">棰勪及鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.originEstimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
</div>
<div class="line">
- <div class="cont"><span class="label">鐢ㄥ伐鍦扮偣锛�</span> <span class="txt">{{info.location || '' }}</span></div>
<div class="cont"><span class="label">璐圭敤鏍囧噯锛�</span><span class="txt">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</span></div>
- <div class="cont"><span class="label">棰勪及鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
+ <div class="cont" :style="feeFrom.priceParam2.name!=null?'':'flex: 2'"><span class="label">{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.originPriceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
+ <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">{{feeFrom.priceParam2.name }}</span><span class="txt">{{info.originPriceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div>
</div>
<div class="line">
<div class="cont"><span class="label">鍦扮偣鎻忚堪锛�</span><span class="txt">{{info.locationRemark || '' }}</span></div>
@@ -99,9 +98,9 @@
</div>
<div class="detail" v-if="info.type==1">
<div class="line">
- <div class="cont"><span class="label"> 璁㈠崟绫诲瀷锛�</span> <span class="txt">{{(info.type==0?'鐢ㄥ伐鍗�':(info.type==1?'璐ц繍鍗�':'璁㈠崟鍗�')) }}</span></div>
+ <div class="cont"><span class="label"> 璁㈠崟绫诲瀷锛�</span> <span class="txt">{{(info.type==0?'鐢ㄥ伐鍗�':(info.type==1?'璐ц繍鍗�':'璁㈤鍗�')) }}</span></div>
<div class="cont"><span class="label">杞﹁締锛�</span> <span class="txt">{{info.categoryName || ''}}-{{info.carUnit || ''}}</span></div>
- <div class="cont"><span class="label">鐢ㄨ溅鏃堕棿锛�</span> <span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}</span></div>
+ <div class="cont"><span class="label">鐢ㄨ溅鏃堕棿锛�</span> <span class="txt">{{info.startDate|| '' }}-{{info.endDate|| '' }}锛� {{info.totalDays || 0 }} 锛夊ぉ</span></div>
</div>
<div class="line">
<div class="cont" > <span class="label"> 鍦板潃淇℃伅锛�</span> <span class="label" v-if="!wayList || wayList.length==0">-</span> </div>
@@ -116,12 +115,12 @@
</div>
</div>
<div class="line">
- <div class="cont"><span class="label">鐢ㄥ伐澶╂暟锛�</span><span class="txt">{{info.totalDays || 0 }}</span></div>
+ <div class="cont"><span class="label">{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.originPriceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
<div class="cont"><span class="label">杩愯緭閲嶉噺/鏁伴噺锛�</span> <span class="txt">{{info.transportNum || '' }}{{info.transportUnit || ''}}</span></div>
<div class="cont"><span class="label">璐圭敤鏍囧噯锛�</span><span class="txt">{{((info.price||0)/100).toFixed(2) }}{{info.priceUnit || '' }}</span></div>
</div>
<div class="line">
- <div class="cont"><span class="label">棰勪及鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.estimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
+ <div class="cont"><span class="label">棰勪及鎬昏垂鐢細</span><span class="txt yellowbtn">{{((info.originEstimatedAccount||0)/100).toFixed(2) }}鍏�</span></div>
</div>
<div class="line">
<div class="cont" ><span class="label">闇�姹傝ˉ鍏咃細</span><span class="txt">{{info.supplement || '' }}</span></div>
@@ -191,8 +190,8 @@
</div>
<div class="detail" style=" ">
<div class="line">
- <div class="cont"><span class="label">瀹為檯{{feeFrom.priceParam1.name }}锛�</span><span class="txt">{{info.priceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
- <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">瀹為檯{{feeFrom.priceParam2.name }}锛�</span><span class="txt">{{info.priceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div>
+ <div class="cont"><span class="label">瀹為檯{{feeFrom.priceParam1.name }}</span><span class="txt">{{info.priceNum1 || 0 }}{{feeFrom.priceParam1.unit }}</span></div>
+ <div class="cont" v-if="feeFrom.priceParam2.name!=null"><span class="label">瀹為檯{{feeFrom.priceParam2.name }}</span><span class="txt">{{info.priceNum2 || 0 }}{{feeFrom.priceParam2.unit }}</span></div>
<div class="cont" :style="feeFrom.priceParam2.name!=null?'':'flex: 2'"><span class="label">鍏朵粬璐圭敤锛�</span> <span class="txt">{{((info.confirmOtherFee||0)/100).toFixed(2) }}鍏�</span></div>
</div>
<div class="line">
@@ -371,30 +370,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.name = '宸ヤ綔鏃堕暱锛�'
this.feeFrom.priceParam1.unit = '鏃�'
this.feeFrom.priceParam2.name = '鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit = '浜�'
- } else if (this.info.carType === 1) {
+ } else if (this.info.carType === 2) {
// 鎸夊皬鏃�
- this.feeFrom.priceParam1.name = '鍖呰閲嶉噺'
+ this.feeFrom.priceParam1.name = '鍖呰閲嶉噺锛�'
this.feeFrom.priceParam1.unit = '鏂�'
this.feeFrom.priceParam2.name = null
this.feeFrom.priceParam2.unit = null
}
} 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 = '娆�'
}
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
index 3912b7d..f015f0c 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -261,9 +261,12 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if( (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) &&
- ( Constants.equalsInteger(orders.getCarType(),Constants.ZERO) || Constants.equalsInteger(orders.getCarType(),Constants.ONE) ))
- || (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ONE))
+ if( (Constants.equalsInteger(orders.getType(),Constants.ZERO)
+ && Constants.equalsInteger(orders.getWorkType(),Constants.TWO) &&
+ ( Constants.equalsInteger(orders.getCarType(),Constants.ZERO)
+ || Constants.equalsInteger(orders.getCarType(),Constants.ONE) ))
+ || (Constants.equalsInteger(orders.getType(),Constants.ZERO)
+ && Constants.equalsInteger(orders.getWorkType(),Constants.ONE))
){
if(Objects.isNull(orders.getPriceNum2())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -845,8 +848,9 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
if(
- (Constants.equalsInteger(orders.getType(),Constants.ZERO) && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO ))
- || Constants.equalsInteger(orders.getType(),Constants.ONE)
+ (Constants.equalsInteger(orders.getType(),Constants.ZERO)
+ && Constants.equalsInteger(orders.getWorkType(),Constants.ZERO ))
+ || Constants.equalsInteger(orders.getType(),Constants.ONE)
|| Constants.equalsInteger(orders.getType(),Constants.TWO)
){
orders.setPriceNum2(Constants.ONE);
@@ -855,7 +859,9 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
}
- BigDecimal bigDecimalPrice = orders.getPrice().multiply(new BigDecimal(orders.getPriceNum1().toString())).multiply(new BigDecimal(orders.getPriceNum2().toString()));
+ BigDecimal bigDecimalPrice = orders.getPrice().
+ multiply(new BigDecimal(orders.getPriceNum1().toString()))
+ .multiply(new BigDecimal(orders.getPriceNum2().toString()));
return bigDecimalPrice.divide(new BigDecimal("1"),0,BigDecimal.ROUND_HALF_UP).longValue();//orders.getPrice() * orders.getPriceNum1() * orders.getPriceNum2();
}
diff --git a/small-program/main.js b/small-program/main.js
index 118ee2f..5674b6d 100644
--- a/small-program/main.js
+++ b/small-program/main.js
@@ -15,10 +15,10 @@
})
// Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
-Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
+// Vue.prototype.$baseUrl = 'http://192.168.1.54:10011/'
// Vue.prototype.$baseUrl = 'https://test.doumee.cn/jinkuai_web/'
-// Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'
+Vue.prototype.$baseUrl = 'https://jinkuai.832smartfarm.com/jinkuai_web/'
const app = new Vue({
store,
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index b92e48e..0ec55e5 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -60,13 +60,19 @@
{{item.categoryName}}锝渰{item.priceNum1}}鏂�
</view>
<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
- {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ {{item.categoryName}}锝渰{item.priceNum2}}浜�
</view>
- <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
- {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 0">
+ {{item.categoryName}}锝渰{item.priceNum1}}澶� 锝渰{item.priceNum2}}浜�
+ </view>
+ <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.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}}
@@ -90,9 +96,10 @@
<text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.totalDays}}澶╋級</text>
</view>
</template>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼{{item.estimatedAccount / 100}}</text>
+ <view class="index-list-item-price">
+ <text v-if="item.status==4 || item.type==2">宸叉敮浠橈細</text>
+ <text v-if="item.status!=4&& item.type!=2">棰勪及锛�</text>
+ <text>楼{{item.payAccount / 100}}</text>
</view>
<view class="eidt">
<view>
@@ -127,7 +134,7 @@
<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">杩愯揣鍗�</text>
+ <text v-else-if="item.type === 1">杩愯揣鍗� - {{item.categoryName}}</text>
<text v-else-if="item.type === 2">璁㈤鍗�</text>
<view class="tips" v-if="item.acceptType === 1">娲惧崟</view>
<view class="tips1" v-if="item.acceptType === 0">鎶㈠崟</view>
@@ -152,12 +159,9 @@
</view>
<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2&& item.carType === 2">
{{item.categoryName}}锝渰{item.priceNum1}}鏂�
- </view>
+ </view>
<view class="index-list-item-info" v-if="item.type === 1">
- {{item.categoryName}}-{{item.carUnit}}
- </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}}{{item.carType === 0?"澶�":"娆�"}}
</view>
<view class="index-list-item-info" v-if="item.type === 2">
{{item.wayInfoCopy}}
@@ -182,8 +186,9 @@
</view>
</template>
<view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼{{item.estimatedAccount / 100}}</text>
+ <text v-if="item.status==4">宸叉敮浠橈細</text>
+ <text v-if="item.status!=4">棰勪及锛�</text>
+ <text>楼{{item.payAccount / 100}}</text>
</view>
<view class="eidt">
<view class="eidt-tips" v-if="item.isUpdate === 1">
diff --git a/small-program/pages/freight/freight.vue b/small-program/pages/freight/freight.vue
index 9951efe..0bf7615 100644
--- a/small-program/pages/freight/freight.vue
+++ b/small-program/pages/freight/freight.vue
@@ -143,14 +143,14 @@
<view class="list-item-row" v-if="form.carType==1">
<view class="list-item-row-label">鐢ㄨ溅娆℃暟<b>*</b></view>
<view class="list-item-row-val">
- <input type="number" v-model="form.priceNum1" placeholder="璇疯緭鍏�" />
+ <input type="number" v-model="form.priceNum1" @input="getPrice" placeholder="璇疯緭鍏�" />
<text>娆�</text>
</view>
</view>
<view class="list-item-row">
<view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
<view class="list-item-row-val">
- <input type="digit" @blur="getPrice" v-model="form.price" placeholder="璇疯緭鍏�" />
+ <input type="digit" @input="getPrice" v-model="form.price" placeholder="璇疯緭鍏�" />
<text>{{form.priceUnit}}</text>
</view>
</view>
@@ -307,6 +307,7 @@
} else if (news === 1) {
this.form.priceUnit = '鍏�/娆�'
}
+ this.getPrice()
}
}
},
@@ -488,8 +489,9 @@
this.$u.api.getTotal({
price: Number(this.form.price).toFixed(2) * 100,
priceUnit: this.form.priceUnit,
- priceNum1: this.form.priceNum1,
+ priceNum1: this.form.carType!=1?this.form.totalDays:this.form.priceNum1,
priceNum2: this.form.priceNum2,
+ carType:this.form.carType ,
type: 1
}).then(res => {
if (res.code === 200) {
@@ -541,6 +543,7 @@
let time = this.form.startDate == this.form.endDate ? 1 : 0
this.form.totalDays = e.length - time;
this.show2 = false
+ this.getPrice()
},
addAddr() {
this.form.wayInfoDTOList.push({
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 41ec7ff..119a4e7 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -21,55 +21,63 @@
</view>
<view class="index-j-list">
<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}}</text>
- <text v-else-if="item.type === 2">璁㈤鍗�</text>
+ <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.carUnit}} | {{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>{{item.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> -->
@@ -82,7 +90,7 @@
</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>
@@ -323,9 +331,12 @@
<view></view>
<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" 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> -->
@@ -2033,12 +2044,27 @@
color: #222222;
}
}
+
+ .phone > .phone-item:last-of-type {
+ /* 鏍峰紡 */
+ border-bottom:none !important;
+ }
.phone-item {
width: 100%;
text-align: center;
justify-content: space-between;
- border-bottom: 1rpx solid #eeeeee;
+ // border-bottom: 1rpx solid #eeeeee;
line-height: 78rpx;
+ image{
+ width: 28rpx;
+ height: 28rpx;
+ margin-right: 30rpx;
+ }
+ .line{
+ width: 100%;
+ height: 1rpx;
+ background-color: #f2f2f2
+ }
text {
font-weight: 500;
font-size: 28rpx;
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index eadd734..cf4ca6a 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -55,7 +55,7 @@
<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===0" class="order-info-wz">{{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}{{feeFrom.priceParam1.unit}}{{info.type==0&info.workType==2&&info.carType==2?' | '+info.priceNum2+'浜�':''}}</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">
<image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
@@ -111,16 +111,10 @@
</view>
<view class="price-row">
<view class="price-row-label">棰勪及鎬昏垂鐢�(鍏�)</view>
- <view class="price-row-val" :style="{color: userInfo.id !== info.acceptMemberId ? '#FF0000' : ''}">
+ <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&&(info.type==2 || (info.status!=5&& 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>
</view>
<template v-if="info.type!=2&&(info.status==5|| info.status==4)">
<view class="order-info-x"></view>
@@ -142,7 +136,7 @@
</view>
<view class="price-row">
<view class="price-row-label">瀹為檯鎬昏垂鐢�(鍏�)</view>
- <view class="price-row-val" style="color: #FF0000">
+ <view class="price-row-val" :style="{color: info.status !=4 ? '#FF0000' : ''}">
楼{{((info.estimatedAccount||0)/100).toFixed(2) }}
</view>
</view>
@@ -160,12 +154,12 @@
<view class="order-info-supplement-title">瀹為檯璐圭敤</view>
</view>
<view class="order-info-price">
- <view class="price-row">
- <view class="price-row-label" v-if="isPushlishor">瀹為檯鏀粯</view>
+ <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-label">瀹為檯鍒拌处(鍏�)</view>
<view class="price-row-val" style="color: #FF0000;">楼{{((info.receiveAccount||0)/100).toFixed(2) }} </view>
</view>
@@ -351,23 +345,23 @@
<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" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" @input="getTotal" v-model="feeFrom.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-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-input">
- <input type="number" v-model="feeFrom.priceNum2" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" @input="getTotal" 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="digit" v-model="feeFrom.confirmOtherFee" placeholder-style="color: #999999; font-size: 56rpx; font-weight: 500;" 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>
@@ -532,8 +526,11 @@
price: this.info.price,
priceUnit: this.feeFrom.priceParam1.unit,
priceNum1: this.feeFrom.priceNum1 || 0,
- priceNum2: this.feeFrom.priceNum2 || 0,
- type: this.info.type
+ 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'
@@ -541,6 +538,7 @@
})
},
confirmFee(){
+ var that =this
if (!this.feeFrom.priceNum1) {
return uni.showToast({
title: '瀹為檯' + this.feeFrom.priceParam1.name + '涓嶈兘涓虹┖',
@@ -670,7 +668,7 @@
}
})
},
- acceptDo(){
+ acceptDoBiz(){
var that = this
var param = {orderId: this.id}
this.$u.api.accept(param).then(res =>{
@@ -680,6 +678,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
@@ -820,15 +830,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)
@@ -840,9 +843,9 @@
that.updateTimeInfo1()
}
that.initPriceNumParam()
- }else{
- uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
- }
+ // }else{
+ // uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
+ // }
}
})
},
@@ -853,13 +856,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
@@ -874,10 +877,10 @@
}else if(this.info.carType==1){
//鎸夊皬鏃�
this.feeFrom.priceParam1.name ='宸ヤ綔鏃堕暱'
- this.feeFrom.priceParam1.unit ='鏃�'
+ this.feeFrom.priceParam1.unit ='灏忔椂'
this.feeFrom.priceParam2.name ='鐢ㄥ伐浜烘暟'
this.feeFrom.priceParam2.unit ='浜�'
- }else if(this.info.carType==1){
+ }else if(this.info.carType==2){
//鎸夊皬鏃�
this.feeFrom.priceParam1.name ='鍖呰閲嶉噺'
this.feeFrom.priceParam1.unit ='鏂�'
diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index 85f3044..c77922b 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/small-program/pages/packaging-worker/packaging-worker.vue
@@ -44,13 +44,6 @@
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- <view class="list-item-row">
- <view class="list-item-row-label">鐢ㄥ伐鏁伴噺<b>*</b></view>
- <view class="list-item-row-val">
- <input type="number" v-model="form.priceNum2" @blur="getPrice" placeholder="璇疯緭鍏�" />
- <text>浜�</text>
- </view>
- </view>
<view class="list-item-row" v-if="viewStatus">
<view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
<view class="list-item-row-val">
@@ -92,6 +85,13 @@
<text v-if="form.carType === 0">澶�</text>
<text v-if="form.carType === 1">灏忔椂</text>
<text v-if="form.carType === 2">鏂�</text>
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鐢ㄥ伐鏁伴噺<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="number" v-model="form.priceNum2" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <text>浜�</text>
</view>
</view>
<view class="list-item-row">
@@ -294,8 +294,9 @@
this.$u.api.getTotal({
price: Number(this.form.price) * 100,
priceNum1: this.form.priceNum1,
- priceNum2: this.form.priceNum2,
+ priceNum2: this.form.priceNum2,
type: this.form.type,
+ carType:this.form.carType ,
workType: this.form.workType
}).then(res => {
if (res.code === 200) {
diff --git a/small-program/pages/sorting/sorting.vue b/small-program/pages/sorting/sorting.vue
index 3cdd9aa..6c65bfe 100644
--- a/small-program/pages/sorting/sorting.vue
+++ b/small-program/pages/sorting/sorting.vue
@@ -272,7 +272,7 @@
priceUnit: this.form.priceUnit,
priceNum1: this.form.priceNum1,
priceNum2: this.form.priceNum2,
- type: this.form.type,
+ type: this.form.type,
workType: this.form.workType
}).then(res => {
if (res.code === 200) {
diff --git a/small-program/static/icon/ic_money.png b/small-program/static/icon/ic_money.png
deleted file mode 100644
index f677914..0000000
--- a/small-program/static/icon/ic_money.png
+++ /dev/null
Binary files differ
diff --git a/small-program/static/icon/ic_money@3x.png b/small-program/static/icon/ic_money@3x.png
deleted file mode 100644
index ea2108e..0000000
--- a/small-program/static/icon/ic_money@3x.png
+++ /dev/null
Binary files differ
diff --git a/small-program/static/icon/ic_renzhengzhong.png b/small-program/static/icon/ic_renzhengzhong.png
deleted file mode 100644
index dc328a2..0000000
--- a/small-program/static/icon/ic_renzhengzhong.png
+++ /dev/null
Binary files differ
diff --git a/small-program/static/icon/ic_renzhengzhong@3x.png b/small-program/static/icon/ic_renzhengzhong@3x.png
deleted file mode 100644
index 72a7128..0000000
--- a/small-program/static/icon/ic_renzhengzhong@3x.png
+++ /dev/null
Binary files differ
diff --git a/small-program/static/image/ic_sanlunche@2x.png b/small-program/static/image/ic_sanlunche@2x.png
deleted file mode 100644
index 825cf5f..0000000
--- a/small-program/static/image/ic_sanlunche@2x.png
+++ /dev/null
Binary files differ
diff --git a/small-program/static/image/ic_xiaohuoche@2x.png b/small-program/static/image/ic_xiaohuoche@2x.png
deleted file mode 100644
index 33b9826..0000000
--- a/small-program/static/image/ic_xiaohuoche@2x.png
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3