From a12ac4f4388672c62c6fb59c5ef975e5dff5fc06 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 16 五月 2023 11:08:45 +0800
Subject: [PATCH] 修改部分问题
---
pages/public-page/forward/forward.vue | 5
pages/driver-page/drvier-my/drvier-my.vue | 16 +-
pages/public-page/mapRoute/mapRoute.vue | 102 ++++++++++---
api/request.js | 6
pages/tabbar-page/index-tabbar/index-tabbar.vue | 2
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 59 +++----
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 14 +
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 119 +++++++++++-----
pages/driver-page/driver-index/driver-index.vue | 78 +++++-----
9 files changed, 248 insertions(+), 153 deletions(-)
diff --git a/api/request.js b/api/request.js
index d34daa8..23839ae 100644
--- a/api/request.js
+++ b/api/request.js
@@ -81,8 +81,10 @@
// const BaseUrl = "http://192.168.31.18:9997"
// const webSocketUrl = "ws://192.168.31.18:9997/wrzs/ws/info"
-const BaseUrl = "http://192.168.31.14:9997";
-const webSocketUrl = "ws://192.168.31.14:9997/wrzs/ws/info"
+// const BaseUrl = "http://192.168.31.14:9997";
+// const webSocketUrl = "ws://192.168.31.14:9997/wrzs/ws/info"
+const BaseUrl = "http://192.168.0.106:9997";
+const webSocketUrl = "ws://192.168.0.106:9997/wrzs/ws/info"
// 绾夸笂鐢熶骇
// const BaseUrl = "https://mx.jzeg.cn:9095";
// const webSocketUrl = "wss://mx.jzeg.cn:9095/wrzs/ws/info"
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index da4f78a..90a2217 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -43,40 +43,19 @@
<view class="main-information">
<view class="sign">瑁�</view>
<view class="filedname">
- <text v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'">{{ value.deptName.slice(0, 16) }}</text>
- <text v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'">
- {{ value.customerName.slice(0, 16) }}
- </text>
- <text v-show="value.deptName.length >= 15 || value.customerName.length >= 15">...</text>
+ <text v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'">{{ value.deptName || '' }}</text>
+ <text v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'">{{ value.customerName || '' }}</text>
</view>
</view>
<view class="main-divider"></view>
<view class="point-number">{{ value.clean.toFixed(2) || 0 }}</view>
- <!-- <view class="dispatch-receive">
- <view v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'" class="container">
- <view class="dispatch">{{ value.deptName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ value.customerName }}</view>
- </view>
- <view v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'" class="container">
- <view class="dispatch">{{ value.customerName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ value.deptName }}</view>
- </view>
- </view> -->
- <!-- <view class="point-number">{{ value.clean.toFixed(2) || 0 }}</view> -->
</view>
<view class="first-extra">
<view class="main-information">
<view class="sign">鍗�</view>
<view class="filedname">
- <text v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'">
- {{ value.customerName.slice(0, 16) }}
- </text>
- <text v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'">
- {{ value.deptName.slice(0, 16) }}
- </text>
- <text v-show="value.customerName.length >= 15 || value.deptName.length >= 15">...</text>
+ <text v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'">{{ value.customerName || '' }}</text>
+ <text v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'">{{ value.deptName || '' }}</text>
</view>
</view>
</view>
@@ -696,10 +675,13 @@
align-items: center;
.content-text {
height: vww(40);
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
+ margin-top: 31rpx;
+ margin-bottom: 31rpx;
.content-container {
width: 100%;
- height: vww(16);
+ min-height: vww(16);
font-size: 40rpx;
font-weight: bold;
color: #3b56eb;
@@ -707,7 +689,7 @@
}
.content-num {
width: 96rpx;
- height: 24rpx;
+ min-height: 24rpx;
font-size: 24rpx;
font-weight: 400;
color: #333333;
@@ -735,11 +717,11 @@
flex-direction: column;
overflow: hidden;
position: relative;
- top: -170rpx;
+ top: -145rpx;
.data-filter {
width: 635rpx;
height: 68rpx;
- border: 2px solid #5b95fd;
+ border: 2px solid rgba(73, 95, 252, 0.6);
box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6);
border-radius: 34rpx;
margin-top: vww(21);
@@ -769,6 +751,15 @@
@include flex;
flex-direction: column;
margin-top: vww(5);
+ margin-bottom: vww(5);
+ overflow: hidden;
+ &:last-child {
+ .card-main {
+ &:last-child {
+ border-bottom: 0;
+ }
+ }
+ }
.card-top {
width: 96%;
@include flex;
@@ -788,6 +779,7 @@
height: vww(150);
border-bottom: vww(1) solid #d6d6d6;
margin-top: vww(12);
+ margin-left: vww(20);
padding-bottom: vww(12);
position: relative;
@include flex flex-direction: column;
@@ -819,7 +811,7 @@
}
}
.main-divider {
- width: 548rpx;
+ width: 530rpx;
height: 1rpx;
background: #e3e3e3;
position: absolute;
@@ -894,10 +886,10 @@
}
.third-line {
width: 40%;
- height: vww(14);
+ min-height: vww(15);
display: flex;
justify-content: flex-start;
- align-items: center;
+ align-items: flex-start;
.carnum-icon {
width: 28rpx;
height: 28rpx;
@@ -919,6 +911,7 @@
display: flex;
justify-content: flex-start;
align-items: center;
+ color: #515151;
.time-icon {
margin-right: vww(10);
}
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 253db2c..6cdfb20 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -2,7 +2,8 @@
<view class="bill-of-lading-details">
<view class="top-banner" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
<view class="top-information">
- <view class="cutomer-name">瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
+ <view class="cutomer-name" v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+ <view class="cutomer-name" v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
<view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
<view class="">鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
@@ -140,7 +141,9 @@
primarySkin: null,
primaryHair: null,
primaryClean: null,
- scrollTop: 0
+ scrollTop: 0,
+ // 纾呭崟绫诲瀷
+ orderType: ''
};
},
onShow() {
@@ -193,10 +196,15 @@
},
// 鑾峰彇鎻愮叅鍗曡鎯�
getTakeCoal() {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
if (res.code == 0) {
+ uni.hideLoading();
console.log(res, '鎻愮叅鍗曡鎯�');
this.coalDetailsData = res.data;
+ this.orderType = this.coalDetailsData.orderType;
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁拌祴鍊�
this.getWeightHouseObj.deptId = this.coalDetailsData.deptId;
this.getWeightHouseObj.filedId = this.coalDetailsData.filedId;
@@ -216,6 +224,8 @@
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
this.primaryClean = this.coalDetailsData.cleanTwo;
+ } else {
+ this.$u.toast('鍔犺浇澶辫触');
}
});
},
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 060535d..65ca4f9 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -9,12 +9,9 @@
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
- <view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName.slice(0, 16) }}</text>
- <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">
- {{ item.customerNameCopy.slice(0, 16) }}
- </text>
- <text v-show="item.deptName.length >= 15 || item.customerNameCopy.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerNameCopy }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -26,10 +23,11 @@
<view class="first-extra">
<view class="main-information">
<view class="sign">鍗�</view>
- <view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerNameCopy.slice(0, 16) }}</text>
- <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName.slice(0, 16) }}</text>
- <text v-show="item.customerNameCopy.length >= 15 || item.deptName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">
+ {{ item.customerNameCopy ? item.customerNameCopy : item.customerName }}
+ </text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
</view>
</view>
</view>
@@ -59,17 +57,14 @@
v-if="driverBillOfLoadingData.list3 ? (driverBillOfLoadingData.list3.length == 0 ? true : false) : true"
></u-empty>
- <view class="appointment-form" v-if="driverBillOfLoadingData.list3 && driverBillOfLoadingData.list3.length !== 0">
+ <view class="appointment-form">
<view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list3" :key="index">
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
- <view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName.slice(0, 16) }}</text>
- <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">
- {{ item.customerName.slice(0, 16) }}
- </text>
- <text v-show="item.deptName.length >= 15 || item.customerName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -80,10 +75,9 @@
<view class="second-line">
<view class="main-information">
<view class="sign">鍗�</view>
- <view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName.slice(0, 16) }}</text>
- <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName.slice(0, 16) }}</text>
- <text v-show="item.deptName.length >= 15 || item.customerName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
</view>
</view>
<view class="map-icon" @click.stop="skipMap(item)">
@@ -115,17 +109,14 @@
iconSize="1000"
v-if="driverBillOfLoadingData.list2 ? (driverBillOfLoadingData.list2.length == 0 ? true : false) : true"
></u-empty>
- <view class="appointment-form" v-if="driverBillOfLoadingData.list2 && driverBillOfLoadingData.list2.length !== 0">
+ <view class="appointment-form">
<view class="appointment-form-item" v-for="(item, index) in driverBillOfLoadingData.list2" :key="index" @click="list3CardIconClick(item)">
<view class="first-line">
<view class="main-information">
<view class="sign">瑁�</view>
- <view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName.slice(0, 16) }}</text>
- <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">
- {{ item.customerName.slice(0, 16) }}
- </text>
- <text v-show="item.deptName.length >= 15 || item.customerName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -136,10 +127,9 @@
<view class="second-line">
<view class="main-information">
<view class="sign">鍗�</view>
- <view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName.slice(0, 16) }}</text>
- <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName.slice(0, 16) }}</text>
- <text v-show="item.deptName.length >= 15 || item.customerName.length >= 15">...</text>
+ <view class="filedname exceedHide">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName }}</text>
</view>
</view>
<view class="map-icon" @click.stop="skipMap(item)">
@@ -158,7 +148,7 @@
</view>
</view>
</view>
- <view class="white-block" v-if="driverBillOfLoadingData.list2.length !== 0">娌℃湁鏁版嵁浜�...</view>
+ <view class="white-block"></view>
</view>
</view>
</view>
@@ -213,7 +203,7 @@
skipMap(val) {
uni.navigateTo({
url: `/pages/public-page/mapRoute/mapRoute?customerId=${val.customerId}&filedId=${val.filedId}&orderType=${val.orderType}${
- val.toFiledId ? `&toFiledId=${val.toFiledId}` : ''
+ val.toFiledId ? `&toFiledId=${val.toFiledId}&filedId=${val.filedId}` : ''
}`
});
},
@@ -358,6 +348,11 @@
line-height: vww(40);
}
}
+.exceedHide {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
::v-deep.driver-index {
width: 100%;
margin: 0 auto;
@@ -459,20 +454,19 @@
.second-line {
width: 100%;
height: vww(68);
- margin-left: vww(12);
+ margin-left: vww(21);
display: flex;
justify-content: flex-start;
align-items: center;
.coal-name {
min-width: vww(50);
- height: 30rpx;
+ height: 35rpx;
font-size: 30rpx;
-
font-weight: 300;
color: #515151;
position: relative;
display: flex;
- justify-content: center;
+ justify-content: flex-start;
}
.black-block {
min-width: vww(50);
@@ -503,7 +497,7 @@
.third-line {
width: 100%;
height: vww(68);
- margin-left: vww(15);
+ margin-left: vww(21);
display: flex;
justify-content: flex-start;
align-items: center;
@@ -612,6 +606,7 @@
@include thirdLine;
width: 94%;
justify-content: flex-start;
+ margin-left: vww(18);
.clock {
width: 33%;
height: vww(21);
@@ -631,7 +626,7 @@
align-items: center;
.order-type,
.coal-name {
- // min-width: 120rpx;
+ width: 120rpx;
height: 42rpx;
line-height: 42rpx;
border: 2px solid #035cfb;
@@ -641,6 +636,9 @@
color: #035cfb;
text-align: center;
padding: vww(3) vww(11);
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
}
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 464ddd6..e431b8c 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -16,7 +16,7 @@
<view class="label-text">韬唤璇佸彿</view>
</view>
<view class="information-value">
- {{ userInfo.idCard }}
+ {{ userInfo.idCard || '' }}
<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.idCard"></u-icon>
</view>
</view>
@@ -26,7 +26,7 @@
<view class="label-text">鎵嬫満鍙�</view>
</view>
<view class="information-value">
- {{ userInfo.phone }}
+ {{ userInfo.phone || '' }}
<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.phone"></u-icon>
</view>
</view>
@@ -36,7 +36,7 @@
<view class="label-text">杞︾墝鍙�</view>
</view>
<view class="information-value">
- {{ userInfo.carNo }}
+ {{ userInfo.carNo || '' }}
<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.carNo"></u-icon>
</view>
</view>
@@ -46,7 +46,7 @@
<view class="label-text">杞﹁酱鏁�</view>
</view>
<view class="information-value">
- {{ userInfo.axleNum }}
+ {{ userInfo.axleNum || '' }}
<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon>
</view>
</view>
@@ -56,7 +56,7 @@
<view class="label-text">浣撻噸</view>
</view>
<view class="information-value">
- {{ userInfo.weight }}
+ {{ userInfo.weight || '' }}
<u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.weight"></u-icon>
</view>
</view>
@@ -393,7 +393,9 @@
justify-content: center;
}
.avatar-name {
- width: 136rpx;
+ width: 200rpx;
+ display: flex;
+ flex-wrap: wrap;
height: 32rpx;
font-size: 34rpx;
font-weight: bold;
@@ -402,7 +404,7 @@
}
.edit-button {
position: relative;
- left: vww(94);
+ left: vww(73);
top: vww(4);
}
}
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index f4d80ff..04e9c87 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -8,21 +8,28 @@
<view class="collection-form">
<view class="collection-form-item" v-for="(item, index) in orderPlanData" :key="index" @click="cardBodyClick(item)">
<view class="first-line">
- <view class="dispatch-receive">
- <view v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'" class="container">
- <view class="dispatch">{{ item.deptName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ item.customerName }}</view>
- </view>
- <view v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'" class="container">
- <view class="dispatch">{{ item.customerName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ item.deptName }}</view>
+ <view class="main-information">
+ <view class="sign">瑁�</view>
+ <view class="filedname">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.deptName.slice(0, 16) }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName.slice(0, 16) }}</text>
+ <text v-show="item.deptName.length >= 15 || item.customerName.length >= 15">...</text>
</view>
</view>
+ <view class="main-divider"></view>
<view class="point-number">
<text class="residue">{{ item.carNumSurplusHuodai || 0 }}</text>
<text>/{{ item.carNum }}</text>
+ </view>
+ </view>
+ <view class="first-extra">
+ <view class="main-information">
+ <view class="sign">鍗�</view>
+ <view class="filedname">
+ <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerName.slice(0, 16) }}</text>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.deptName.slice(0, 16) }}</text>
+ <text v-show="item.customerName.length >= 15 || item.deptName.length >= 15">...</text>
+ </view>
</view>
</view>
<view class="second-line">
@@ -72,7 +79,7 @@
<view class="third-line_num" v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
</view>
<view class="third-line">
- <view class="third-line_text">鎻愮叅鍗曚釜鏁帮細锛�</view>
+ <view class="third-line_text">鎻愮叅鍗曚釜鏁帮細</view>
<view class="third-line_num">{{ item.tmCount }}</view>
</view>
</view>
@@ -235,6 +242,13 @@
justify-content: space-between;
align-items: center;
}
+@mixin firstLine {
+ width: 94%;
+ height: vww(68);
+ margin: vww(18) vww(16) 0 vww(16);
+ display: flex;
+ justify-content: space-between;
+}
.scroll-Y {
height: 900rpx;
.more_text {
@@ -345,12 +359,13 @@
top: vww(-144);
.collection-form-item {
width: 690rpx;
- height: 300rpx;
+ height: 340rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 25rpx 0rpx rgba(73, 120, 240, 0.15);
border-radius: 20rpx;
overflow: hidden;
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
position: relative;
align-items: flex-start;
margin-top: vww(10);
@@ -360,34 +375,36 @@
margin: vww(10) vww(16) 0 vww(16);
display: flex;
justify-content: space-between;
- .dispatch-receive {
- width: 70%;
+ .main-information {
+ width: 88%;
+ height: vww(28);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
- .container {
- width: 100%;
- display: flex;
- justify-content: space-between;
- align-items: center;
- }
- .receive-icon {
- width: 62rpx;
- height: 14rpx;
- border-bottom: 3px solid #275fa5;
- position: relative;
- &:after {
- content: '';
- position: absolute;
- width: 3px;
- height: 10px;
- background-color: #275fa5;
- right: 0;
- transform: rotate(-45deg);
- }
+ .sign {
+ width: vww(28);
+ height: vww(28);
+ line-height: vww(28);
+ text-align: center;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/blueblock.png') no-repeat;
+ background-size: contain;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ margin-right: vww(20);
}
}
+ .main-divider {
+ width: 548rpx;
+ height: 1rpx;
+ background: #e3e3e3;
+ position: absolute;
+ top: 98rpx;
+ left: vww(50);
+ }
.point-number {
+ position: absolute;
+ right: 0;
width: 15%;
text {
font-size: 24rpx;
@@ -401,10 +418,32 @@
}
}
}
+ .first-extra {
+ @include firstLine;
+ .main-information {
+ width: 100%;
+ height: vww(28);
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ .sign {
+ width: vww(28);
+ height: vww(28);
+ line-height: vww(28);
+ text-align: center;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/redblock.png') no-repeat;
+ background-size: contain;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ margin-right: vww(20);
+ }
+ }
+ }
.second-line {
width: 100%;
- height: vww(30);
- margin-left: vww(12);
+ height: vww(40);
+ margin-left: vww(18);
display: flex;
justify-content: flex-start;
align-items: center;
@@ -436,8 +475,8 @@
}
.third-line {
width: 40%;
- height: vww(30);
- margin-left: vww(15);
+ height: vww(50);
+ margin-left: vww(18);
display: flex;
justify-content: flex-start;
align-items: center;
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index 37b9201..03a6cd2 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -9,7 +9,10 @@
</view>
<view v-if="roleType == 1" class="notice-bar">
<u-notice-bar :text="text" :fontSize="30"></u-notice-bar>
- <view class="notice-icon" style="background: url('../../../static/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;"></view>
+ <view
+ class="notice-icon"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/notice.png') no-repeat;background-size: cover; width: 42rpx;height: 42rpx;"
+ ></view>
</view>
<view v-else-if="roleType == 2" class="notice-bar"><u-notice-bar :text="text1" :fontSize="30"></u-notice-bar></view>
<view class="card-main">
diff --git a/pages/public-page/mapRoute/mapRoute.vue b/pages/public-page/mapRoute/mapRoute.vue
index f686e1c..24b8544 100644
--- a/pages/public-page/mapRoute/mapRoute.vue
+++ b/pages/public-page/mapRoute/mapRoute.vue
@@ -15,6 +15,7 @@
<text>{{ duration || '' }}</text>
</view>
</view>
+ <!-- <view class="" @click="awaken"><button type="default">璺宠浆</button></view> -->
</view>
</template>
@@ -38,13 +39,13 @@
{
latitude: null,
longitude: null,
- iconPath: '../../../static/image/banner/location.png',
+ iconPath: 'https://mx.jzeg.cn:9095/appimg/image/banner/location.png',
width: 23,
height: 33,
id: 0,
callout: {
content: '璧风偣', //鏂囨湰
- color: '#ffffff', //鏂囧瓧棰滆壊
+ color: '#000000', //鏂囧瓧棰滆壊
fontSize: 14, //鏂囨湰澶у皬
borderRadius: 15, //杈规鍦嗚
borderWidth: '10',
@@ -55,7 +56,7 @@
{
latitude: null,
longitude: null,
- iconPath: '../../../static/image/banner/location.png',
+ iconPath: 'https://mx.jzeg.cn:9095/appimg/image/banner/location.png',
width: 23,
height: 33,
id: 1,
@@ -81,7 +82,9 @@
}
],
distance: null,
- duration: null
+ duration: null,
+ fromLocation: {},
+ toLocation: {}
};
},
methods: {
@@ -93,39 +96,45 @@
let qqmapsdk = new QQMapWX({
key: 'HTNBZ-LZGRQ-YDB5S-B4KAS-KLHJH-GHBUE' // 蹇呭～
});
- const params = this.toFiledId ? { toFiledId: this.toFiledId } : { customerId: this.customerId, filedId: this.filedId };
- this.$reqGet('getAppLocation', params).then(res => {
- console.log(res, '鑵捐缁忕含搴�');
+ const params = this.toFiledId ? { filedId: this.filedId, toFiledId: this.toFiledId } : { customerId: this.customerId, filedId: this.filedId };
+ this.$reqGet('getAppLocation', params).then(result => {
+ console.log(result, '鑵捐缁忕含搴�');
let _this = this;
+ console.log(_this.orderType, '绫诲瀷');
let fromLocation;
let toLocation;
if (_this.orderType == '澶栬喘' || _this.orderType == '澶栭攢') {
- _this.$set(_this.markers[0], 'longitude', res.data.customerLongitude);
- _this.$set(_this.markers[0], 'latitude', res.data.customerLatitude);
fromLocation = {
- longitude: res.data.customerLongitude,
- latitude: res.data.customerLatitude
+ longitude: result.data.customerLongitude,
+ latitude: result.data.customerLatitude
};
- _this.$set(_this.markers[1], 'longitude', res.data.filedLongitude);
- _this.$set(_this.markers[1], 'latitude', res.data.filedLatitude);
toLocation = {
- longitude: res.data.filedLongitude,
- latitude: res.data.filedLatitude
+ longitude: result.data.filedLongitude,
+ latitude: result.data.filedLatitude
};
} else if (_this.orderType == '鍐呰喘' || _this.orderType == '鍐呴攢') {
- _this.$set(_this.markers[0], 'longitude', res.data.filedLongitude);
- _this.$set(_this.markers[0], 'latitude', res.data.filedLatitude);
fromLocation = {
- longitude: res.data.filedLongitude,
- latitude: res.data.filedLatitude
+ longitude: result.data.filedLongitude,
+ latitude: result.data.filedLatitude
};
- _this.$set(_this.markers[1], 'longitude', res.data.customerLongitude);
- _this.$set(_this.markers[1], 'latitude', res.data.customerLatitude);
toLocation = {
- longitude: res.data.customerLongitude,
- latitude: res.data.customerLatitude
+ longitude: result.data.customerLongitude,
+ latitude: result.data.customerLatitude
};
+ } else {
+ fromLocation = {
+ longitude: result.data.filedLongitude,
+ latitude: result.data.filedLatitude
+ };
+ toLocation = {
+ longitude: result.data.toFiledLongitude,
+ latitude: result.data.toFiledLatitude
+ };
+ _this.fromLocation = fromLocation;
+ _this.toLocation = toLocation;
}
+ _this.fromLocation = fromLocation;
+ _this.toLocation = toLocation;
//璋冪敤璺濈璁＄畻鎺ュ彛
qqmapsdk.direction({
mode: 'driving',
@@ -158,6 +167,22 @@
arrowLine: true
}
];
+ if (_this.orderType == '澶栬喘' || _this.orderType == '澶栭攢') {
+ _this.$set(_this.markers[0], 'longitude', result.data.customerLongitude);
+ _this.$set(_this.markers[0], 'latitude', result.data.customerLatitude);
+ _this.$set(_this.markers[1], 'longitude', result.data.filedLongitude);
+ _this.$set(_this.markers[1], 'latitude', result.data.filedLatitude);
+ } else if (_this.orderType == '鍐呰喘' || _this.orderType == '鍐呴攢') {
+ _this.$set(_this.markers[0], 'longitude', result.data.filedLongitude);
+ _this.$set(_this.markers[0], 'latitude', result.data.filedLatitude);
+ _this.$set(_this.markers[1], 'longitude', result.data.customerLongitude);
+ _this.$set(_this.markers[1], 'latitude', result.data.customerLatitude);
+ } else {
+ _this.$set(_this.markers[0], 'longitude', result.data.filedLongitude);
+ _this.$set(_this.markers[0], 'latitude', result.data.filedLatitude);
+ _this.$set(_this.markers[1], 'longitude', result.data.toFiledLongitude);
+ _this.$set(_this.markers[1], 'latitude', result.data.toFiledLatitude);
+ }
},
fail: function(error) {
console.error(error);
@@ -185,6 +210,31 @@
.toString()
.padStart(2, '0');
return hours + ':' + minutes;
+ },
+ // 鍞ら啋
+ awaken() {
+ uni.getSystemInfo({
+ success: function(res) {
+ if (res.platform == 'android') {
+ uni.navigateTo({
+ url: `intent://map/routeplan?type=drive&fromcoord=&from=${_this.fromLocation}&tocoord=${_this.toLocation.latitude},${
+ _this.toLocation.longitude
+ }&to=name&policy=0&referer=myapp#Intent;scheme=qqmap;package=com.tencent.map;end`
+ });
+ } else if (res.platform == 'ios') {
+ uni.navigateTo({
+ url: `qqmap://map/routeplan?type=drive&fromcoord=&from=${_this.fromLocation}&tocoord=${_this.toLocation.latitude},${
+ _this.toLocation.longitude
+ }&to=name&policy=0&referer=myapp`
+ });
+ } else {
+ uni.showToast({
+ title: '褰撳墠璁惧涓嶆敮鎸佸湴鍥惧鑸�',
+ icon: 'none'
+ });
+ }
+ }
+ });
}
},
onLoad(params) {
@@ -196,10 +246,8 @@
}
},
onShow() {
- if (this.orderType !== '杞叆' || this.orderType !== '杞嚭') {
- this.getLocation();
- } else {
- }
+ this.getLocation();
+ // this.awaken();
}
};
</script>
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index b15ebb7..31aa244 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -286,7 +286,7 @@
this.$reqGet('getMessageByUser', { current: 1, size: 10 }).then(res => {
if (res.code == 0) {
this.messageList = res.data.records;
- this.messageList.map(v => {
+ this.messageList.forEach(v => {
if (v.status !== 1) {
this.dotShow = true;
} else {
--
Gitblit v1.9.1