From 01e96c8855927df67ac8a6831e345b6cb33140d1 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 09 五月 2023 18:49:40 +0800
Subject: [PATCH] 样式修改
---
pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue | 2
pages/public-page/forward/forward.vue | 16
static/image/banner/carnNUm.png | 0
static/image/banner/clock.png | 0
pages/driver-page/drvier-my/drvier-my.vue | 25
pages/register/register.vue | 21
pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue | 96 ++++
pages/customer-page/customer-index/customer-index.vue | 159 +++++--
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 2
pages/tabbar-page/index-tabbar/index-tabbar.vue | 43 +
static/image/banner/transpartent.png | 0
components/combined-title/combined-title.vue | 119 ++---
pages/customer-page/customer-my/customer-my.vue | 2
pages/driver-page/driver-index/driver-index.vue | 76 ++-
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 95 ----
api/request.js | 3
static/image/banner/avatar.png | 0
static/image/banner/add.png | 0
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 341 ++++++++++------
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 69 ++
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 116 ++++-
21 files changed, 746 insertions(+), 439 deletions(-)
diff --git a/api/request.js b/api/request.js
index de6bdef..d34daa8 100644
--- a/api/request.js
+++ b/api/request.js
@@ -83,9 +83,6 @@
const BaseUrl = "http://192.168.31.14:9997";
const webSocketUrl = "ws://192.168.31.14:9997/wrzs/ws/info"
-// // 绾夸笂寮�鍙�
-// const BaseUrl = "http://hesuancj.cn:9997";
-// const webSocketUrl = "ws://hesuancj.cn:9997/wrzs/ws/info"
// 绾夸笂鐢熶骇
// const BaseUrl = "https://mx.jzeg.cn:9095";
// const webSocketUrl = "wss://mx.jzeg.cn:9095/wrzs/ws/info"
diff --git a/components/combined-title/combined-title.vue b/components/combined-title/combined-title.vue
index f334fd9..4266d16 100644
--- a/components/combined-title/combined-title.vue
+++ b/components/combined-title/combined-title.vue
@@ -3,20 +3,15 @@
<view class="title_wrapper">
<!-- 寮�濮� -->
<view class="title_start">
- <view class="icon">
- </view>
- <view class="text">
- {{title}}
- </view>
+ <view class="icon"></view>
+ <view class="text">{{ title }}</view>
</view>
<!-- 缁撳熬 -->
<view class="title_end" v-if="$slots.rightText">
<view class="title_end_text" @click="rightTextClick">
- <image src="../../static/image/鏃犱汉鍊煎畧/鑱斿悎 1.png" mode=""></image>
- <text>
- <slot name="rightText"></slot>
- </text>
+ <image src="https://mx.jzeg.cn:9095/appimg/image/banner/add.png" mode=""></image>
+ <text><slot name="rightText"></slot></text>
</view>
</view>
</view>
@@ -24,65 +19,63 @@
</template>
<script>
- export default {
- name:"combined-title",
- data() {
- return {
-
- };
- },
- props:{
- title:{
- type:String,
- default:''
- }
- },
- methods:{
- rightTextClick(){
- this.$emit('rightText')
- }
+export default {
+ name: 'combined-title',
+ data() {
+ return {};
+ },
+ props: {
+ title: {
+ type: String,
+ default: ''
+ }
+ },
+ methods: {
+ rightTextClick() {
+ this.$emit('rightText');
}
}
+};
</script>
<style lang="scss" scope>
- .title{
- width:100%;
- margin:vww(16) auto ;
- .title_wrapper{
- height:vww(14);
- display:flex;
- justify-content: space-between;
- align-items: center;
- box-sizing: border-box;
- .title_start{
- .icon{
- display:inline-block;
- width:vww(4);
- height:vww(12);
- background-color: #007AFF;
- border-radius: vww(2);
- }
- .text{
- display:inline-block;
- margin-left:vww(8);
- font-size: vww(16);
- }
- }
- .title_end{
- .title_end_text{
- display: flex;
- align-items: center;
- image{
- margin-right:vww(8);
- width:vww(21);
- height:vww(21);
- }
- text{
- font-size: vww(16);
- }
- }
- }
+.title {
+ width: 100%;
+ margin: vww(16) auto;
+ .title_wrapper {
+ height: vww(14);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ box-sizing: border-box;
+ .title_start {
+ .icon {
+ display: inline-block;
+ width: vww(4);
+ height: vww(12);
+ background-color: #007aff;
+ border-radius: vww(2);
+ }
+ .text {
+ display: inline-block;
+ margin-left: vww(8);
+ font-size: vww(16);
+ }
+ }
+ .title_end {
+ .title_end_text {
+ display: flex;
+ align-items: center;
+ image {
+ margin-right: vww(8);
+ width: vww(21);
+ height: vww(21);
+ }
+ text {
+ font-size: vww(16);
+ }
+ }
}
}
+}
</style>
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index c74a242..558f7c3 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -19,17 +19,23 @@
</view>
</view>
<view class="second-line">
- <view class="coal-name">{{ item.coalName }}</view>
- <view class="black-block"></view>
- <view class="coal-type" v-if="item.orderType">{{ item.orderType }}</view>
+ <view class="coal-name">
+ <view class="">{{ item.coalName }}</view>
+ <view class="black-bar"></view>
+ <view class="coal-type" v-if="item.orderType">{{ item.orderType }}</view>
+ </view>
</view>
<view class="third-line">
- <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view>
+ <view class="time-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;li ne-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
<view class="send-date">{{ item.sendDate }}</view>
</view>
<view class="fourth-line">
- <u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.carNum - item.cars2 != 0" shape="circle"></u-button>
- <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button>
+ <view class="receive" @click.stop="receiveClick(item)"><view class="button-image">棰嗗彇</view></view>
+ <view class="forward" @click.stop="forwardClick(item)"><view class="button-image">杞彂</view></view>
</view>
</view>
</view>
@@ -45,30 +51,38 @@
<view class=""><u-icon name="arrow-right" color="#999999" size="40"></u-icon></view>
</view>
<view class="second">
- <view class="">{{ item.coalName || '' }}</view>
+ <view class="coal-name">{{ item.coalName || '' }}</view>
<view class="order-type">{{ item.orderType || '' }}</view>
</view>
<view class="third">
<view class="third-line">
- <view class="third-line_text">棰嗗彇鏁帮細</view>
+ <view class="third-line_text">棰嗗彇鏁�:</view>
<view class="third-line_num">{{ item.cars2 }}</view>
</view>
<view class="third-line">
- <view class="third-line_text">鍓╀綑鏁帮細</view>
+ <view class="third-line_text">鍓╀綑鏁�:</view>
<view class="third-line_num" v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
<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>
<view class="fourth">
- <view class="fourth-icon"><u-icon name="clock" color="#999999" size="40"></u-icon></view>
+ <view class="fourth-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
<view class="senddate">{{ item.sendDate }}</view>
</view>
<view class="fourth">
- <view class="fourth-icon"><u-icon name="clock" color="#999999" size="40"></u-icon></view>
+ <view class="fourth-icon">
+ <view
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;"
+ ></view>
+ </view>
<view class="senddate">{{ item.orderCode }}</view>
</view>
</view>
@@ -162,17 +176,19 @@
},
// 鑾峰彇鍘嗗彶鎻愮叅鍗�
getJhOrderPlanDataPage() {
- this.loading = true;
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
if (res.data.records) {
this.total = res.data.total;
if (this.pageCurrent > 1) {
this.historyCoalData = this.historyCoalData.concat(res.data.records);
this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
- this.loading = false;
+ uni.hideLoading();
} else {
this.historyCoalData = res.data.records;
- this.loading = false;
+ uni.hideLoading();
}
}
});
@@ -236,15 +252,6 @@
},
// 鎻愮叅鍗曡鎯�
cardBodyClick(v) {
- // console.log(name, 'name');
- // let code = null;
- // let cars2 = null;
- // this.orderPlanData.forEach(item => {
- // if (item.id == name) {
- // code = item.code;
- // cars2 = item.cars2;
- // }
- // });
uni.navigateTo({ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&code=${v.code}&cars2=${v.cars2}` });
},
// 鐐瑰嚮鍘嗗彶鎻愮叅鍗曡幏鍙栬鎯�
@@ -314,7 +321,7 @@
margin: vww(10) vww(10) 0;
}
.second {
- width: 50%;
+ width: 100%;
height: 31rpx;
font-size: 30rpx;
font-family: Microsoft YaHei;
@@ -322,6 +329,12 @@
color: #515151;
margin: vww(10) vww(10) 0;
@include flex;
+ justify-content: flex-start;
+ .coal-name {
+ min-width: vww(30);
+ height: vww(20);
+ margin-right: vww(21);
+ }
.order-type {
color: #035cfb;
border: 2px solid #035cfb;
@@ -350,7 +363,7 @@
}
}
.fourth {
- width: 50%;
+ width: 100%;
height: 31rpx;
font-size: 30rpx;
font-family: Microsoft YaHei;
@@ -358,6 +371,14 @@
color: #515151;
margin: vww(10) vww(10) 0;
@include flex;
+ .fourth-icon {
+ width: vww(13);
+ height: vww(13);
+ margin-right: vww(14);
+ }
+ .senddate {
+ flex: 1;
+ }
}
}
}
@@ -412,13 +433,14 @@
}
}
.second-line {
- width: 60%;
+ width: 100%;
height: vww(30);
+ margin-left: vww(12);
display: flex;
- justify-content: space-evenly;
align-items: center;
+ justify-content: flex-start;
.coal-name {
- width: 30%;
+ flex-grow: 1;
height: 30rpx;
font-size: 30rpx;
font-family: Microsoft YaHei;
@@ -426,20 +448,23 @@
color: #515151;
position: relative;
display: flex;
- justify-content: space-between;
- }
- .black-block {
- width: 2rpx;
- height: 30rpx;
- background: #515151;
- }
- .coal-type {
- width: 24%;
- height: 30rpx;
- font-size: 30rpx;
- font-family: Microsoft YaHei;
- font-weight: 300;
- color: #515151;
+ align-items: center;
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ margin-left: vww(12);
+ }
+ .coal-type {
+ margin-left: vww(12);
+ min-width: vww(50);
+ height: 30rpx;
+ line-height: 30rpx;
+ font-size: 30rpx;
+ font-family: Microsoft YaHei;
+ font-weight: 300;
+ color: #515151;
+ }
}
}
.third-line {
@@ -447,9 +472,10 @@
height: vww(30);
margin-left: vww(15);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
.send-date {
+ margin-left: vww(14);
width: 148rpx;
height: 24rpx;
line-height: 24rpx;
@@ -460,15 +486,50 @@
}
}
.fourth-line {
- width: 40%;
+ width: 100%;
height: vww(30);
@include flex;
+ justify-content: flex-start;
position: relative;
- left: 60%;
bottom: vww(10);
- .u-button {
- width: vww(50);
- height: vww(30);
+ left: 25%;
+ .receive,
+ .forward {
+ width: vww(123);
+ height: vww(48);
+ @include flex;
+ justify-content: center;
+ color: #ffffff;
+ font-size: 28rpx;
+ position: absolute;
+ .button-image {
+ width: 100%;
+ height: 100%;
+ background: url('../../../static/image/banner/button.png') no-repeat;
+ background-size: cover;
+ font-size: 28rpx;
+ font-family: Microsoft YaHei;
+ font-weight: 300;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(45);
+ }
+ }
+ .forward {
+ width: vww(106);
+ left: vww(140);
+ .button-image {
+ width: 100%;
+ height: 100%;
+ background: url('../../../static/image/banner/transpartent.png') no-repeat;
+ background-size: cover;
+ font-size: 28rpx;
+ font-family: Microsoft YaHei;
+ font-weight: 300;
+ color: #3b56eb;
+ text-align: center;
+ line-height: vww(45);
+ }
}
}
}
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 839572e..0e81689 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -7,7 +7,7 @@
<view class="top-title">鍙戣繍璁″垝璇︽儏</view>
</view>
<view class="middle-container">
- <view class="dept-name">{{ deptName }}({{ coalName }})</view>
+ <view class="dept-name" v-show="deptName">{{ deptName }}({{ coalName }})</view>
<view class="dept-num">
<text
style="font-size: 46rpx;
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index 2010e92..0b8994f 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -361,7 +361,7 @@
position: fixed;
top: 0;
.navgation {
- width: 77rpx;
+ width: 80rpx;
height: 37rpx;
font-size: 40rpx;
font-family: Adobe Heiti Std;
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 66b528c..6af93fb 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -54,16 +54,20 @@
<view class="point-number">{{ value.clean.toFixed(2) || 0 }}</view>
</view>
<view class="second-line">
- <view class="coal-name">{{ value.coalName }}</view>
- <view class="black-block"></view>
- <view class="coal-type">{{ value.orderType }}</view>
+ <view class="coal-name">
+ <view class="">{{ value.coalName }}</view>
+ <view class="black-bar"></view>
+ <view class="coal-type" v-if="value.orderType">{{ value.orderType }}</view>
+ </view>
+ <!-- <view class="black-block"><view class="black-bar"></view></view>
+ <view class="coal-type">{{ value.orderType }}</view> -->
</view>
<view class="third-line">
<view class="carnum-icon"><image src="https://mx.jzeg.cn:9095/appimg/image/banner/carNO.png" mode="widthFix"></image></view>
<view class="carnum-text">{{ value.carNo || '' }}</view>
</view>
<view class="fourth-line">
- <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view>
+ <view class="time-icon"><u-icon name="clock" color="#515151" size="28"></u-icon></view>
<view class="send-date">{{ value.sendDate }}</view>
</view>
</view>
@@ -71,110 +75,116 @@
</view>
</view>
<u-popup :show="conditinonShow" mode="bottom" :closeable="true" :closeOnClickOverlay="true" @close="conditinonclose">
- <view class="filter-main">
- <view class="filter-body date-button">
- <view class="condition-name">鏃ユ湡</view>
- <view class="filter-name">
- <u-button :text="dateselect" @click="opencalendar"></u-button>
- <view class="filter-button ">
- <uni-calendar
- ref="calendar"
- class="uni-calendar--hook"
- :clear-date="true"
- :date="info.date"
- :insert="info.insert"
- :lunar="info.lunar"
- :startDate="info.startDate"
- :endDate="info.endDate"
- :range="info.range"
- @confirm="confirm"
- />
+ <scroll-view scroll-y="true" class="scroll-Y">
+ <view class="filter-main">
+ <view class="filter-body date-button">
+ <view class="condition-name">鏃ユ湡</view>
+ <view class="filter-name">
+ <u-button :text="dateselect" @click="opencalendar"></u-button>
+ <view class="filter-button ">
+ <uni-calendar
+ ref="calendar"
+ class="uni-calendar--hook"
+ :clear-date="true"
+ :date="info.date"
+ :insert="info.insert"
+ :lunar="info.lunar"
+ :startDate="info.startDate"
+ :endDate="info.endDate"
+ :range="info.range"
+ @confirm="confirm"
+ />
+ </view>
+ </view>
+ </view>
+ <view class="filter-body">
+ <view class="condition-name">鐓ょ</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in coalList" :key="index" @click="filterCondition(0, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small" :class="{ shadowactive: item.active }"></u-button>
+ </view>
+ <!-- <view class="toggle-button">
+ <u-button :text="coalShow < coalTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(0)" v-if="coalTotal > 3"></u-button>
+ </view> -->
+ </view>
+ </view>
+ <view class="filter-body" v-if="typeList.length !== 0">
+ <view class="condition-name">绫诲瀷</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in typeList" :key="index" @click="filterCondition(1, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small"></u-button>
+ </view>
+ <!-- <view class="toggle-button">
+ <u-button :text="typeShow < typeTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(1)" v-if="typeTotal > 3"></u-button>
+ </view> -->
+ </view>
+ </view>
+ <view class="filter-body" v-if="roleType !== 1">
+ <view class="condition-name">瀹㈡埛</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in customerList" :key="index" @click="filterCondition(2, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small"></u-button>
+ </view>
+ <!-- <view class="toggle-button">
+ <u-button :text="customerShow < customerTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(2)" v-if="customerTotal > 3"></u-button>
+ </view> -->
+ </view>
+ </view>
+ <view class="filter-body" v-if="roleType == 1">
+ <view class="condition-name">璐т唬</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in forwarderList" :key="index" @click="filterCondition(3, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'primary' : ''"></u-button>
+ </view>
+ <!-- <view class="toggle-button">
+ <u-button
+ :text="forwarderShow < forwarderTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
+ type="primary"
+ size="small"
+ @click="toggle(3)"
+ v-if="forwarderTotal > 3"
+ ></u-button>
+ </view> -->
+ </view>
+ </view>
+ <view class="filter-body" v-if="roleType != 3">
+ <view class="condition-name">杞﹂槦</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in fleetList" :key="index" @click="filterCondition(4, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small"></u-button>
+ </view>
+ <!-- <view class="toggle-button">
+ <u-button :text="fleetShow < fleetTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(4)" v-if="fleetTotal > 3"></u-button>
+ </view> -->
+ </view>
+ </view>
+ <view class="filter-body">
+ <view class="condition-name">鐭垮満</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in filedList" :key="index" @click="filterCondition(5, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small"></u-button>
+ </view>
+ <!-- <view class="toggle-button">
+ <u-button :text="filedShow < filedTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(5)" v-if="filedTotal > 3"></u-button>
+ </view> -->
+ </view>
+ </view>
+ <view class="filter-body" v-if="roleType == 2">
+ <view class="condition-name">杞︾墝鍙�</view>
+ <view class="filter-name">
+ <view class="filter-button" v-for="(item, index) in carNoList" :key="index" @click="filterCondition(6, index, item.condition)">
+ <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small" v-if="index < carNoShow"></u-button>
+ </view>
+ <!-- <view class="toggle-button">
+ <u-button :text="carNoShow < carNoTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(6)" v-if="carNoTotal > 3"></u-button>
+ </view> -->
</view>
</view>
</view>
- <view class="filter-body">
- <view class="condition-name">鐓ょ</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in coalList" :key="index" @click="filterCondition(0, index, item.condition)">
- <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small" :class="{ shadowactive: item.active }"></u-button>
- </view>
- <!-- <view class="toggle-button">
- <u-button :text="coalShow < coalTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(0)" v-if="coalTotal > 3"></u-button>
- </view> -->
- </view>
- </view>
- <view class="filter-body" v-if="typeList.length !== 0">
- <view class="condition-name">绫诲瀷</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in typeList" :key="index" @click="filterCondition(1, index, item.condition)">
- <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small"></u-button>
- </view>
- <!-- <view class="toggle-button">
- <u-button :text="typeShow < typeTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(1)" v-if="typeTotal > 3"></u-button>
- </view> -->
- </view>
- </view>
- <view class="filter-body" v-if="roleType !== 1">
- <view class="condition-name">瀹㈡埛</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in customerList" :key="index" @click="filterCondition(2, index, item.condition)">
- <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small"></u-button>
- </view>
- <!-- <view class="toggle-button">
- <u-button :text="customerShow < customerTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(2)" v-if="customerTotal > 3"></u-button>
- </view> -->
- </view>
- </view>
- <view class="filter-body" v-if="roleType == 1">
- <view class="condition-name">璐т唬</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in forwarderList" :key="index" @click="filterCondition(3, index, item.condition)">
- <u-button :text="item.condition" :type="item.active ? 'primary' : ''"></u-button>
- </view>
- <!-- <view class="toggle-button">
- <u-button
- :text="forwarderShow < forwarderTotal ? '鏌ョ湅鏇村' : '鏀惰捣'"
- type="primary"
- size="small"
- @click="toggle(3)"
- v-if="forwarderTotal > 3"
- ></u-button>
- </view> -->
- </view>
- </view>
- <view class="filter-body" v-if="roleType != 3">
- <view class="condition-name">杞﹂槦</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in fleetList" :key="index" @click="filterCondition(4, index, item.condition)">
- <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small"></u-button>
- </view>
- <!-- <view class="toggle-button">
- <u-button :text="fleetShow < fleetTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(4)" v-if="fleetTotal > 3"></u-button>
- </view> -->
- </view>
- </view>
- <view class="filter-body">
- <view class="condition-name">鐭垮満</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in filedList" :key="index" @click="filterCondition(5, index, item.condition)">
- <u-button :text="item.condition" :type="item.active ? 'success' : ''" size="small"></u-button>
- </view>
- <!-- <view class="toggle-button">
- <u-button :text="filedShow < filedTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(5)" v-if="filedTotal > 3"></u-button>
- </view> -->
- </view>
- </view>
- <view class="filter-body" v-if="roleType == 2">
- <view class="condition-name">杞︾墝鍙�</view>
- <view class="filter-name">
- <view class="filter-button" v-for="(item, index) in carNoList" :key="index" @click="filterCondition(6, index, item.condition)">
- <u-button :text="item.condition" :type="item.active ? 'primary' : ''" size="small" v-if="index < carNoShow"></u-button>
- </view>
- <!-- <view class="toggle-button">
- <u-button :text="carNoShow < carNoTotal ? '鏌ョ湅鏇村' : '鏀惰捣'" type="primary" size="small" @click="toggle(6)" v-if="carNoTotal > 3"></u-button>
- </view> -->
- </view>
- </view>
+ </scroll-view>
+ <view class="utils-button">
+ <view class="reset-button"><u-button type="default" text="閲嶇疆" :plain="true" shape="circle" @click="resetCondition"></u-button></view>
+ <view class="confirm-button"><u-button type="primary" text="纭畾" :plain="true" shape="circle" @click="confirmCondition"></u-button></view>
</view>
</u-popup>
<tab-bar :current="1"></tab-bar>
@@ -414,6 +424,45 @@
this.totalTon = 0;
}
},
+ // 纭畾绛涢��
+ confirmCondition() {
+ this.conditinonShow = false;
+ },
+ // 閲嶇疆绛涢��
+ resetCondition() {
+ this.conditinonShow = false;
+ this.filterList = this.taskList;
+ if (this.filterList.length != 0) {
+ this.totalLength = this.filterList.map(v => v.taskCoalList.length).reduce((x, y) => x + y);
+ this.totalTon = this.filterList.map(v =>
+ v.taskCoalList.reduce((prev, cur) => {
+ return cur.clean + prev;
+ }, 0)
+ );
+ this.totalTon = this.totalTon.reduce((x, y) => x + y);
+ } else {
+ this.totalLength = 0;
+ this.totalTon = 0;
+ }
+ this.coalList.forEach(v => {
+ v.active = false;
+ });
+ this.typeList.forEach(v => {
+ v.active = false;
+ });
+ this.customerList.forEach(v => {
+ v.active = false;
+ });
+ this.forwarderList.forEach(v => {
+ v.active = false;
+ });
+ this.fleetList.forEach(v => {
+ v.active = false;
+ });
+ this.filedList.forEach(v => {
+ v.active = false;
+ });
+ },
confirm(e) {
console.log(e, '鏃ユ湡閫夋嫨');
this.first = e.range.before;
@@ -560,6 +609,33 @@
::v-deep .toggle-button .u-button {
width: vww(40);
}
+.scroll-Y {
+ height: 900rpx;
+}
+.utils-button {
+ width: 94%;
+ height: vww(30);
+ margin: vww(50) auto;
+ @include flex;
+ .reset-button {
+ /deep/ .u-button {
+ border: 1px solid #c5c5c5;
+ outline: none;
+ }
+ }
+ .confirm-button {
+ /deep/ .u-button {
+ border: 1px solid #3b56eb;
+ outline: none;
+ color: #3b56eb;
+ }
+ }
+ /deep/ .u-button {
+ width: 279rpx;
+ height: 60rpx;
+ font-size: 28rpx;
+ }
+}
.white-block {
width: 100%;
height: vww(50);
@@ -614,7 +690,7 @@
}
}
.content-title {
- width: 158rpx;
+ width: 160rpx;
height: 38rpx;
font-size: 40rpx;
font-family: Adobe Heiti Std;
@@ -631,8 +707,11 @@
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
overflow: hidden;
+ position: relative;
+ top: -170rpx;
.data-filter {
width: 635rpx;
height: 68rpx;
@@ -736,13 +815,13 @@
}
}
.second-line {
- width: 60%;
+ width: 100%;
height: vww(15);
display: flex;
justify-content: space-between;
align-items: center;
.coal-name {
- width: 60%;
+ flex-grow: 1;
height: 30rpx;
font-size: 30rpx;
font-family: Microsoft YaHei;
@@ -750,34 +829,38 @@
color: #515151;
position: relative;
display: flex;
- justify-content: space-between;
- }
- .black-block {
- width: 2rpx;
- height: 30rpx;
- background: #515151;
- }
- .coal-type {
- width: 24%;
- height: 30rpx;
- font-size: 30rpx;
- font-family: Microsoft YaHei;
- font-weight: 300;
- color: #515151;
+ align-items: center;
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ margin-left: vww(12);
+ }
+ .coal-type {
+ margin-left: vww(12);
+ min-width: vww(50);
+ height: 30rpx;
+ line-height: 30rpx;
+ font-size: 30rpx;
+ font-family: Microsoft YaHei;
+ font-weight: 300;
+ color: #515151;
+ }
}
}
.third-line {
width: 40%;
height: vww(14);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
.carnum-icon {
width: 28rpx;
- height: 24rpx;
+ height: 28rpx;
+ margin-right: vww(10);
image {
width: 28rpx;
- height: 24rpx;
+ height: 28rpx;
}
}
.carnum-text {
@@ -791,14 +874,18 @@
width: 40%;
height: vww(14);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
+ .time-icon {
+ margin-right: vww(10);
+ }
}
}
}
}
}
.filter-main {
+ height: 950rpx;
width: 100%;
display: flex;
flex-direction: column;
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 633f96d..fec4372 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
@@ -4,16 +4,16 @@
<view class="top-information">
<view class="cutomer-name">瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
- <view class="">鐭垮満:{{ coalDetailsData.deptName || '' }}</view>
- <view class="">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+ <view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
+ <view class="">鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
</view>
<view class="block-information">
<view class="block-main">
<view class="basic">
<view class="coalName">{{ coalDetailsData.coalName }}</view>
- <view class="black-block"></view>
- <view class="order-type">{{ coalDetailsData.orderType }}</view>
+ <!-- <view class="black-block"></view>
+ <view class="order-type">{{ coalDetailsData.orderType }}</view> -->
<view
class="status-button"
style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
@@ -26,8 +26,8 @@
<view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view>
<view class="send-date">{{ coalDetailsData.sendDate }}</view>
</view>
- <view class="coal-code">鎻愮叅鍗曠紪鐮亄{ coalDetailsData.code || '' }}</view>
- <view class="order-code">璁㈠崟缂栧彿:{{ coalDetailsData.orderCode || '' }}</view>
+ <view class="coal-code">鎻愮叅鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
+ <view class="order-code">璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
<view class="weigh-item">
<view class="item">
<view class="concrete" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">鐨�</view>
@@ -122,7 +122,7 @@
openId: null,
openName: ''
},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�', '鏀剧┖'], // 鐘舵��
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌'], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -153,6 +153,16 @@
},
openid() {
return uni.getStorageSync('openid');
+ },
+ // 鑾峰彇浠婂ぉ鏃ユ湡
+ currentDate() {
+ let time = new Date();
+ let year = time.getFullYear();
+ let month = time.getMonth() + 1;
+ month = month < 10 ? '0' + month : month;
+ let date = time.getDate();
+ date = date < 10 ? '0' + date : date;
+ return `${year}-${month}-${date}`;
}
},
methods: {
@@ -210,6 +220,15 @@
this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
if (res.code == 0) {
this.dayRZ = res.data;
+ this.dayRZ = this.dayRZ.map(v => {
+ let slicedate = v.taskStatusDes.slice(0, 10);
+ if (slicedate == this.currentDate) {
+ return {
+ ...v,
+ taskStatusDes: v.taskStatusDes.slice(10)
+ };
+ }
+ });
}
});
},
@@ -376,8 +395,12 @@
font-family: Microsoft YaHei;
font-weight: 300;
.fild-name {
- @include flex justify-content: space-between;
+ @include flex;
+ justify-content: space-between;
width: 100%;
+ view {
+ min-width: 296rpx;
+ }
}
}
.block-information {
@@ -414,11 +437,13 @@
color: #fff;
}
.basic {
- width: 40%;
+ width: 100%;
height: vww(15);
- @include flex justify-content: space-between;
- .coalName {
- width: 50%;
+ @include flex;
+ justify-content: flex-start;
+ .coalName,
+ .order-type {
+ width: 45%;
height: 30rpx;
font-size: 30rpx;
font-family: Microsoft YaHei;
@@ -430,16 +455,19 @@
width: 2rpx;
height: 30rpx;
background: #515151;
+ position: relative;
+ top: vww(2);
}
}
.time {
- width: 30%;
+ width: 35%;
height: vww(12);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
.send-date {
width: 148rpx;
height: 24rpx;
+ margin-left: vww(14);
font-size: 28rpx;
font-family: Microsoft YaHei;
font-weight: 300;
@@ -458,9 +486,10 @@
.weigh-item {
width: 100%;
height: vww(36);
- @include flex justify-content: space-around;
+ @include flex;
+ justify-content: space-around;
.item {
- width: vww(50);
+ min-width: vww(50);
height: vww(45);
font-size: 21rpx;
font-family: Microsoft YaHei;
@@ -501,14 +530,16 @@
.top-button,
.bottom-button {
width: 100%;
- height: vww(80);
+ height: vww(47);
@include flex;
.u-button {
width: 40%;
+ height: 60rpx;
font-size: 28rpx;
font-family: Microsoft YaHei;
font-weight: 300;
color: #497bfb;
+ border: 2px solid #3b56eb;
}
}
}
@@ -528,6 +559,10 @@
font-family: Microsoft YaHei;
font-weight: 300;
color: #ffffff;
+ background: #497bfb;
+ letter-spacing: 4rpx;
+ border-radius: 37rpx 37rpx 37rpx 37rpx;
+ box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
}
}
}
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 96f39bd..e6bbd9d 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -53,7 +53,7 @@
<view class="unit">鍚�</view>
</view>
</view>
- <view class="block-sideline" v-else>
+ <view class="block-sideline" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞嚭'">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
<view class="weigh-item">
<view class="item">
@@ -232,8 +232,11 @@
// 鐩戝惉閲嶉噺鍙樺寲
globalweigh: {
handler(v) {
- this.weighData.weigh = this.realTimeWeigh = v;
- console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ // this.weighData.weigh = this.realTimeWeigh = v;
+ // console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ setTimeout(() => {
+ this.weighData.weigh = this.realTimeWeigh = v;
+ }, 0);
},
deep: true,
immediate: true
@@ -284,6 +287,7 @@
this.weighData.tmId = res.data.id;
this.weighData.carNo = res.data.carNo;
this.weighData.tmCode = res.data.code;
+ this.weighData.filedId = res.data.filedId;
if (this.weighList.orderType == '澶栬喘' && this.weighList.hair == 0) {
this.firstHairCustomernameShow = true;
}
@@ -351,47 +355,6 @@
}
});
},
- /**
- * 鍒濆鍖� weoSocket
- */
- // initWebSocket() {
- // let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
- // let socket = uni.connectSocket({
- // url: wsUrl,
- // header: {
- // CLIENT_TOC: 'Y'
- // },
- // complete: res => {
- // console.log(res, 'socket缁撴灉');
- // }
- // });
- // socket.onOpen(() => {
- // console.log('onOpen');
- // });
- // // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
- // socket.onMessage(res => {
- // console.log('socketWeigh', res);
- // let nowWeighObj = JSON.parse(res.data.slice(7));
- // if (nowWeighObj.eqCode == this.weighHouseCode) {
- // if (nowWeighObj.eqInfraredStatus) {
- // this.infraredStatus = true;
- // this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
- // } else {
- // this.infraredStatus = false;
- // this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
- // }
- // }
- // });
- // socket.onClose(() => {
- // uni.closeSocket();
- // console.log('webSocketClose');
- // this.$u.toast('纾呮埧宸插叧闂�');
- // });
- // socket.onError(err => {
- // console.log('socket鎶ラ敊', err);
- // this.$u.toast('纾呮埧鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
- // });
- // },
// 鏀剧┖
evacuation() {
this.evacuationModalShow = true;
@@ -523,7 +486,7 @@
height: vww(36);
@include flex justify-content: space-around;
.item {
- width: vww(50);
+ min-width: vww(50);
height: vww(45);
font-size: 21rpx;
font-family: Microsoft YaHei;
@@ -553,12 +516,14 @@
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
- @include flex justify-content: center;
+ @include flex;
+ justify-content: center;
.block-main {
width: 94%;
height: 565rpx;
- margin-top: vww(22);
+ margin-top: vww(10);
@include flex;
+ justify-content: space-around;
align-items: flex-start;
flex-direction: column;
.main-information {
@@ -570,42 +535,6 @@
color: #303030;
@include flex;
}
- }
- }
- .two {
- flex: 4;
- border: vww(2) solid #dddddd;
- margin: vww(20);
- border-radius: vww(10);
- padding: vww(20);
- .uni-table {
- .uni-table-tr {
- padding: 0;
- border: vww(1) solid #c6c6c6;
- .uni-table-th {
- font-size: vww(14);
- height: vww(30);
- line-height: vww(30);
- padding: vww(5) vww(10);
- color: #111111;
- font-weight: 500;
- background: #e2e2e2;
- }
- .uni-table-td {
- font-size: vww(14);
- font-weight: 400;
- height: vww(30);
- line-height: vww(30);
- padding: vww(5) vww(10);
- color: #111111;
- }
- }
- }
- p {
- text-align: center;
- font-size: vww(20);
- font-weight: 500;
- margin-top: vww(5);
}
}
.three {
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index e513409..5e5d716 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -35,8 +35,8 @@
</view>
<view class="second-line">
<view class="coal-name">{{ item.coalName }}</view>
- <view class="black-block"></view>
- <view class="coal-type">{{ item.orderType }}</view>
+ <!-- <view class="black-block"><view class="black-bar"></view></view>
+ <view class="coal-type">{{ item.orderType }}</view> -->
</view>
<view class="third-line">
<view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view>
@@ -68,7 +68,7 @@
<view class="sign">瑁�</view>
<view class="filedname">
<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>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -80,7 +80,7 @@
<view class="main-information">
<view class="sign">鍗�</view>
<view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerNameCopy }}</text>
+ <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>
@@ -95,7 +95,7 @@
</view>
<view class="type">
<view class="coal-name">{{ item.coalName }}</view>
- <view class="order-type">{{ item.orderType }}</view>
+ <!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
<view class="fourth-line" @click="toAppointmentClick(item)"><view class="button-img">绔嬪嵆棰勭害</view></view>
@@ -120,7 +120,7 @@
<view class="sign">瑁�</view>
<view class="filedname">
<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>
+ <text v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' || item.orderType == '杞叆'">{{ item.customerName }}</text>
</view>
</view>
<view class="main-divider"></view>
@@ -132,7 +132,7 @@
<view class="main-information">
<view class="sign">鍗�</view>
<view class="filedname">
- <text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' || item.orderType == '杞嚭'">{{ item.customerNameCopy }}</text>
+ <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>
@@ -147,7 +147,7 @@
</view>
<view class="type">
<view class="coal-name">{{ item.coalName }}</view>
- <view class="order-type">{{ item.orderType }}</view>
+ <!-- <view class="order-type">{{ item.orderType }}</view> -->
</view>
</view>
</view>
@@ -417,13 +417,14 @@
}
}
.second-line {
- width: 60%;
+ width: 100%;
height: vww(68);
+ margin-left: vww(12);
display: flex;
- justify-content: space-evenly;
+ justify-content: flex-start;
align-items: center;
.coal-name {
- width: 30%;
+ min-width: vww(50);
height: 30rpx;
font-size: 30rpx;
font-family: Microsoft YaHei;
@@ -431,36 +432,47 @@
color: #515151;
position: relative;
display: flex;
- justify-content: space-between;
- padding: vww(2) vww(4);
- text-align: center;
+ justify-content: center;
}
.black-block {
- width: 2rpx;
- height: 30rpx;
- background: #515151;
- }
- .coal-type {
- width: 24%;
+ min-width: vww(50);
height: 30rpx;
font-size: 30rpx;
font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
- padding: vww(2) vww(4);
+ position: relative;
+ top: vww(2);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ }
+ }
+ .coal-type {
+ min-width: vww(50);
+ height: 30rpx;
+ font-size: 30rpx;
+ font-family: Microsoft YaHei;
+ font-weight: 300;
+ color: #515151;
text-align: center;
}
}
.third-line {
- width: 30%;
+ width: 100%;
height: vww(68);
margin-left: vww(15);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
.send-date {
width: 148rpx;
height: 24rpx;
+ margin-left: vww(14);
line-height: 24rpx;
font-size: 28rpx;
font-family: Microsoft YaHei;
@@ -559,22 +571,29 @@
}
}
.third-line {
- @include thirdLine width: 94%;
+ @include thirdLine;
+ width: 94%;
+ justify-content: flex-start;
.clock {
width: 33%;
height: vww(21);
+ // margin-right: vww(70);
line-height: vww(21);
@include flex;
+ justify-content: flex-start;
+ .send-date {
+ margin-left: vww(14);
+ }
}
.type {
- width: 40%;
- margin-right: vww(6);
+ flex: 1;
+ margin-right: vww(10);
display: flex;
- justify-content: space-between;
+ justify-content: center;
align-items: center;
.order-type,
.coal-name {
- width: 120rpx;
+ // min-width: 120rpx;
height: 42rpx;
line-height: 42rpx;
border: 2px solid #035cfb;
@@ -584,6 +603,7 @@
font-weight: 300;
color: #035cfb;
text-align: center;
+ padding: vww(3) vww(11);
}
}
}
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index d47aead..8638d70 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -3,8 +3,8 @@
<view class="driver-banner">
<view class="navgation">鎴戠殑</view>
<view class="avatar">
- <view class="avatar-imgage"></view>
- <view class="avatar-name">{{ userInfo.name }}</view>
+ <view class="avatar-imgage" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/avatar.png')no-repeat;background-size: cover;"></view>
+ <view class="avatar-name">{{ userInfo.name || '' }}</view>
<view class="edit-button"><u-button type="primary" @click="editBtnClick" shape="circle" plain>缂栬緫涓汉璧勬枡</u-button></view>
</view>
<view class="personal-information">
@@ -17,7 +17,7 @@
</view>
<view class="information-value">
{{ userInfo.idCard }}
- <u-icon name="arrow-right" color="#999999" size="30"></u-icon>
+ <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.idCard"></u-icon>
</view>
</view>
<view class="information-line">
@@ -27,7 +27,7 @@
</view>
<view class="information-value">
{{ userInfo.phone }}
- <u-icon name="arrow-right" color="#999999" size="30"></u-icon>
+ <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.phone"></u-icon>
</view>
</view>
<view class="information-line">
@@ -37,7 +37,7 @@
</view>
<view class="information-value">
{{ userInfo.carNo }}
- <u-icon name="arrow-right" color="#999999" size="30"></u-icon>
+ <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.carNo"></u-icon>
</view>
</view>
<view class="information-line">
@@ -47,7 +47,7 @@
</view>
<view class="information-value">
{{ userInfo.axleNum }}
- <u-icon name="arrow-right" color="#999999" size="30"></u-icon>
+ <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.axleNum"></u-icon>
</view>
</view>
<view class="information-line last">
@@ -57,7 +57,7 @@
</view>
<view class="information-value">
{{ userInfo.weight }}
- <u-icon name="arrow-right" color="#999999" size="30"></u-icon>
+ <u-icon name="arrow-right" color="#999999" size="30" v-if="userInfo.weight"></u-icon>
</view>
</view>
</view>
@@ -370,7 +370,7 @@
position: fixed;
top: 0;
.navgation {
- width: 77rpx;
+ width: 80rpx;
height: 37rpx;
font-size: 40rpx;
font-family: Adobe Heiti Std;
@@ -389,10 +389,9 @@
.avatar-imgage {
width: 98rpx;
height: 98rpx;
- background: #fcfcfc;
- border: 4px solid #ffffff;
- border-radius: 50%;
margin-left: vww(18);
+ @include flex;
+ justify-content: center;
}
.avatar-name {
width: 136rpx;
@@ -441,7 +440,7 @@
height: 50rpx;
}
.label-text {
- width: 118rpx;
+ width: 120rpx;
font-size: 30rpx;
font-family: Source Han Sans CN;
font-weight: 400;
@@ -450,7 +449,7 @@
}
}
.information-value {
- width: vww(125);
+ min-width: vww(125);
@include flex;
font-size: 30rpx;
font-family: Source Han Sans CN;
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 756f545..522c0dc 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -26,15 +26,23 @@
</view>
</view>
<view class="second-line">
- <view class="coal-name">{{ item.coalName }}</view>
- <view class="black-block"></view>
- <view class="coal-type">{{ item.orderType }}</view>
+ <view class="coal-name">
+ <view class="">{{ item.coalName }}</view>
+ <view class="black-bar"></view>
+ <view class="coal-type" v-if="item.orderType">{{ item.orderType }}</view>
+ </view>
</view>
<view class="third-line">
- <view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view>
+ <view class="time-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
<view class="send-date">{{ item.sendDate }}</view>
</view>
- <view class="fourth-line"><u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button></view>
+ <view class="fourth-line">
+ <view class="forward" @click.stop="forwardClick(item)"><view class="button-image">杞彂</view></view>
+ </view>
</view>
</view>
<!-- <view class="transparent">
@@ -50,7 +58,7 @@
<view class=""><u-icon name="arrow-right" color="#999999" size="40"></u-icon></view>
</view>
<view class="second">
- <view class="">{{ item.coalName || '' }}</view>
+ <view class="coal-name">{{ item.coalName || '' }}</view>
<view class="order-type" v-if="item.orderType">{{ item.orderType || '' }}</view>
</view>
<view class="third">
@@ -69,11 +77,19 @@
</view>
</view>
<view class="fourth">
- <view class="fourth-icon"><u-icon name="clock" color="#999999" size="40"></u-icon></view>
+ <view class="fourth-icon">
+ <view
+ style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clock.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
<view class="senddate">{{ item.sendDate }}</view>
</view>
<view class="fourth">
- <view class="fourth-icon"><u-icon name="clock" color="#999999" size="40"></u-icon></view>
+ <view class="fourth-icon">
+ <view
+ style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9095/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover"
+ ></view>
+ </view>
<view class="senddate">{{ item.orderCode }}</view>
</view>
</view>
@@ -145,16 +161,18 @@
methods: {
// 鑾峰彇鍘嗗彶鎻愮叅鍗�
getJhOrderPlanDataPage() {
- this.loading = true;
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
if (res.data.records) {
if (this.pageCurrent > 1) {
this.historyCoalData = this.historyCoalData.concat(res.data.records);
this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
- this.loading = false;
+ uni.hideLoading();
} else {
this.historyCoalData = res.data.records;
- this.loading = false;
+ uni.hideLoading();
}
}
});
@@ -251,7 +269,7 @@
margin: vww(10) vww(10) 0;
}
.second {
- width: 50%;
+ width: 100%;
height: 31rpx;
font-size: 30rpx;
font-family: Microsoft YaHei;
@@ -259,6 +277,12 @@
color: #515151;
margin: vww(10) vww(10) 0;
@include flex;
+ justify-content: flex-start;
+ .coal-name {
+ min-width: vww(30);
+ height: vww(20);
+ margin-right: vww(21);
+ }
.order-type {
color: #035cfb;
border: 2px solid #035cfb;
@@ -295,6 +319,14 @@
color: #515151;
margin: vww(10) vww(10) 0;
@include flex;
+ .fourth-icon {
+ width: vww(13);
+ height: vww(13);
+ margin-right: vww(14);
+ }
+ .senddate {
+ flex: 1;
+ }
}
}
}
@@ -376,13 +408,14 @@
}
}
.second-line {
- width: 60%;
+ width: 100%;
height: vww(30);
+ margin-left: vww(12);
display: flex;
- justify-content: space-evenly;
+ justify-content: flex-start;
align-items: center;
.coal-name {
- width: 30%;
+ flex-grow: 1;
height: 30rpx;
font-size: 30rpx;
font-family: Microsoft YaHei;
@@ -390,20 +423,23 @@
color: #515151;
position: relative;
display: flex;
- justify-content: space-between;
- }
- .black-block {
- width: 2rpx;
- height: 30rpx;
- background: #515151;
- }
- .coal-type {
- width: 24%;
- height: 30rpx;
- font-size: 30rpx;
- font-family: Microsoft YaHei;
- font-weight: 300;
- color: #515151;
+ align-items: center;
+ .black-bar {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ margin-left: vww(12);
+ }
+ .coal-type {
+ margin-left: vww(12);
+ min-width: vww(50);
+ height: 30rpx;
+ line-height: 30rpx;
+ font-size: 30rpx;
+ font-family: Microsoft YaHei;
+ font-weight: 300;
+ color: #515151;
+ }
}
}
.third-line {
@@ -411,11 +447,12 @@
height: vww(30);
margin-left: vww(15);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
.send-date {
width: 148rpx;
height: 24rpx;
+ margin-left: vww(14);
line-height: 24rpx;
font-size: 28rpx;
font-family: Microsoft YaHei;
@@ -430,9 +467,22 @@
position: relative;
left: 60%;
bottom: vww(10);
- .u-button {
- width: vww(50);
- height: vww(30);
+ .forward {
+ width: vww(123);
+ height: vww(48);
+ left: vww(140);
+ .button-image {
+ width: 100%;
+ height: 100%;
+ background: url('../../../static/image/banner/button.png') no-repeat;
+ background-size: cover;
+ font-size: 28rpx;
+ font-family: Microsoft YaHei;
+ font-weight: 300;
+ color: #fff;
+ text-align: center;
+ line-height: vww(45);
+ }
}
}
}
diff --git a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
index 0d7dbb5..ab50e65 100644
--- a/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
+++ b/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue
@@ -228,7 +228,7 @@
position: fixed;
top: 0;
.navgation {
- width: 77rpx;
+ width: 80rpx;
height: 37rpx;
font-size: 40rpx;
font-family: Adobe Heiti Std;
diff --git a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
index ceb911d..ee0fa01 100644
--- a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
+++ b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
@@ -1,5 +1,65 @@
<template>
<view>
+ <view class="main">
+ <view class="main-body">
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">杞︾墝鍙�</view>
+ <view class="">{{ faYunDetailobj.carNo || '' }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鎻愮叅鍗曠姸鎬�</view>
+ <view class="">{{ coalStatus[faYunDetailobj.status] }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鍏ュ満鏃堕棿</view>
+ <view class="">{{ faYunDetailobj.inTime || '' }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鐨噸</view>
+ <view class="">{{ faYunDetailobj.skin || 0 }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">姣涢噸</view>
+ <view class="">{{ faYunDetailobj.hair || '' }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鍑�閲�</view>
+ <view class="">{{ faYunDetailobj.clean || '' }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">璁㈠崟鍓╀綑閲�</view>
+ <view class="">{{ faYunDetailobj.allowance || '' }}</view>
+ </view>
+ </view>
+ <view class="body-container">
+ <view class="container-block">
+ <view class="">鎻愮叅鍗曠紪鍙�</view>
+ <view class="">{{ faYunDetailobj.code || '' }}</view>
+ </view>
+ </view>
+ <view class="body-container last">
+ <view class="container-block">
+ <view class="">璁㈠崟缂栧彿</view>
+ <view class="">{{ faYunDetailobj.orderCode || '' }}</view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- <view>
<combined-title title="鍙戣繍璇︽儏"></combined-title>
<view class="compDetails">
<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
@@ -45,7 +105,7 @@
</uni-tr>
</uni-table>
</view>
- </view>
+ </view> -->
</template>
<script>
@@ -74,6 +134,40 @@
</script>
<style scoped lang="scss">
+@mixin flex {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+.main {
+ width: 100%;
+ margin-top: vww(10);
+ @include flex justify-content: center;
+ .main-body {
+ width: 690rpx;
+ height: 1062rpx;
+ background: #ffffff;
+ box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
+ border-radius: 20rpx;
+ @include flex flex-direction: column;
+ align-items: flex-start;
+ .body-container {
+ width: 100%;
+ height: vww(56);
+ border-bottom: vww(1) solid #d6d6d6;
+ @include flex;
+ justify-content: center;
+ .container-block {
+ width: 96%;
+ height: vww(56);
+ @include flex;
+ }
+ }
+ .last {
+ border-bottom: none;
+ }
+ }
+}
.uni-table {
.uni-table-tr {
padding: 0;
diff --git a/pages/public-page/forward/forward.vue b/pages/public-page/forward/forward.vue
index e1a090f..ed2d14a 100644
--- a/pages/public-page/forward/forward.vue
+++ b/pages/public-page/forward/forward.vue
@@ -204,6 +204,9 @@
// 瀹㈡埛
if (this.roleType == 1) {
this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.personalForward.carNum, tempcarNumSurplus1);
+ if (this.jhOrderPlanForwardList[index].carNum == 0) {
+ this.jhOrderPlanForwardList[index].carNum == tempcarNumSurplus1;
+ }
}
tempcarNumSurplus1 = 0;
// 璐т唬
@@ -214,11 +217,13 @@
});
} else {
if (this.roleType == 1) {
- this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.carNumSurplus1);
+ this.jhOrderPlanForwardList[index].carNum = this.carNumSurplus1;
+ // this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.carNumSurplus1);
}
tempcarNumSurplus1 = 0;
if (this.roleType == 2) {
- this.jhOrderPlanForwardList[index].carNum = this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.forwardSurplus);
+ this.jhOrderPlanForwardList[index].carNum = this.forwardSurplus;
+ // this.allrelay(this.jhOrderPlanForwardList[index].carNum, this.forwardSurplus);
}
tempforwardSurplus = 0;
}
@@ -233,14 +238,14 @@
let tempcarNumSurplus1 = this.carNumSurplus1;
// 璐т唬
if (this.roleType == 2) {
- this.jhOrderPlanForwardList[index].carNum = this.allrelayto(this.jhOrderPlanForwardList[index].carNum, this.forwardSurplus);
+ this.jhOrderPlanForwardList[index].carNum = 0;
if (this.jhOrderPlanForwardList[index].carNum <= 0) {
this.jhOrderPlanForwardList[index].carNum = 0;
}
}
// 瀹㈡埛
if (this.roleType == 1) {
- this.jhOrderPlanForwardList[index].carNum = this.allrelayto(this.jhOrderPlanForwardList[index].carNum, this.carNumSurplus1);
+ this.jhOrderPlanForwardList[index].carNum = 0;
if (this.jhOrderPlanForwardList[index].carNum <= 0) {
this.jhOrderPlanForwardList[index].carNum = 0;
}
@@ -347,8 +352,9 @@
if (this.jhOrderPlanForwardList.length === 0) {
this.$u.toast('璇疯嚦灏戦�夋嫨涓�缁勮浆鍙戝璞�');
}
+ let reg = /^[1-9]\d*$/;
this.jhOrderPlanForwardList.forEach(v => {
- if (isNaN(Number(v.carNum)) || Number(v.carNum) <= 0) {
+ if (!reg.test(v.carNum) || Number(v.carNum) <= 0) {
this.$u.toast('璇疯緭鍏ュ悎娉曟暟瀛�');
isPass = false;
return isPass;
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 2ff209a..e32320d 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -107,7 +107,7 @@
// },
// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
onReady() {
- // this.$refs.regesterFormRef.setRules(this.rules);
+ this.$refs.regesterFormRef.setRules(this.rules);
// this.$refs.regesterFormRef.validate().then(res => {}).catch(err => {
// console.log(err);
// })
@@ -120,6 +120,9 @@
},
data() {
return {
+ // 杞︾墝鍙烽敭鐩樻帶鍒�
+ carNumShow: false,
+ keyValue: '',
registerFormModel: {
phone: '',
password: '',
@@ -192,6 +195,16 @@
required: true,
message: '璇疯緭鍏ヨ溅鐗屽彿',
trigger: ['blur', 'change']
+ },
+ {
+ transform(value) {
+ return String(value);
+ },
+ validator: (rule, value, callback) => {
+ return uni.$u.test.carNo(value);
+ },
+ message: '璇疯緭鍏ユ纭殑杞︾墝鍙�',
+ trigger: ['change', 'blur']
}
],
carImg: {
@@ -287,11 +300,8 @@
}
},
// 鍗曢�夋浜嬩欢
- groupChange(e) {
- console.log('鍗曢�夋灏忕粍', e);
- },
+ groupChange(e) {},
radioChange(e) {
- console.log('鍗曢�夋', e);
if (
this.registerFormModel.name == '' &&
this.registerFormModel.idCard == '' &&
@@ -299,7 +309,6 @@
this.registerFormModel.carNo == '' &&
this.registerFormModel.password == ''
) {
- console.log('鍙樹簡');
this.$refs.regesterFormRef.clearValidate();
this.beforeChangeValue = e;
}
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 3921269..6111883 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -2,7 +2,10 @@
<view>
<view class="search-bar">
<view class="icon-body">
- <view class="icon-box" @click="messagePage"><u-icon name="chat" color="#fff" size="50"></u-icon></view>
+ <view class="icon-box" @click="messagePage">
+ <u-badge :isDot="true" type="error" v-if="dotShow"></u-badge>
+ <u-icon name="chat" color="#fff" size="50"></u-icon>
+ </view>
</view>
</view>
<customer-index v-if="roleType == 1" ref="customerIndexRef" :orderPlanDataStore="orderPlanDataStore"></customer-index>
@@ -15,7 +18,7 @@
<driver-index v-if="roleType == 3" ref="driverIndexRef" :indexdriverBillOfLoadingData="indexdriverBillOfLoadingData"></driver-index>
<tab-bar :current="0"></tab-bar>
<!-- 鎺ㄩ�佹秷鎭脊绐� -->
- <u-modal :show="messagePushShow" :title="messageList.title" @confirm="messageconfirm">
+ <u-modal :show="messagePushShow" :title="messageList.title" @confirm="messageconfirm" confirm-text="鍓嶅幓鏌ョ湅">
<view class="slot-content"><rich-text :nodes="messageList.content"></rich-text></view>
</u-modal>
<view class="white-block"></view>
@@ -117,7 +120,8 @@
indexdriverBillOfLoadingData: {},
messagePushShow: false,
messageList: {},
- isconnect: false
+ isconnect: false,
+ dotShow: false
};
},
onShow() {
@@ -126,6 +130,7 @@
this.initWebsocket();
}
this.userAuthorization();
+ this.messageReq();
},
onHide() {
console.log('椤甸潰闅愯棌');
@@ -252,12 +257,10 @@
this.messageList = JSON.parse(res.data.slice(5));
this.messagePushShow = true;
} else {
- console.log('websocket鍚姩涓�');
}
});
socket.onClose(e => {
console.log('webSocketClose', e);
- // this.$u.toast('杩炴帴宸叉柇寮�锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
this.isconnect = false;
});
socket.onError(err => {
@@ -267,6 +270,23 @@
},
messageconfirm() {
this.messagePushShow = false;
+ uni.navigateTo({
+ url: '/pages/public-page/message/message'
+ });
+ },
+ messageReq() {
+ this.$reqGet('getMessageByUser', { current: 1, size: 10 }).then(res => {
+ if (res.code == 0) {
+ this.messageList = res.data.records;
+ this.messageList.map(v => {
+ if (v.status !== 1) {
+ this.dotShow = true;
+ } else {
+ this.dotShow = false;
+ }
+ });
+ }
+ });
}
}
};
@@ -281,12 +301,14 @@
.search-bar {
height: vww(20);
width: 96%;
- position: fixed;
+ position: absolute;
top: vww(96);
right: vww(32);
z-index: 1;
.icon-body {
position: relative;
+ display: flex;
+ justify-content: flex-end;
.icon-box {
width: vww(30);
height: vww(30);
@@ -294,8 +316,13 @@
display: flex;
justify-content: center;
align-items: center;
- position: absolute;
- right: vww(-3);
+ position: relative;
+ /deep/ .u-badge {
+ position: absolute;
+ left: vww(18);
+ top: vww(5);
+ z-index: 1;
+ }
}
}
}
diff --git "a/static/image/\346\227\240\344\272\272\345\200\274\345\256\210/\350\201\224\345\220\210 1.png" b/static/image/banner/add.png
similarity index 100%
rename from "static/image/\346\227\240\344\272\272\345\200\274\345\256\210/\350\201\224\345\220\210 1.png"
rename to static/image/banner/add.png
Binary files differ
diff --git a/static/image/banner/avatar.png b/static/image/banner/avatar.png
new file mode 100644
index 0000000..fba5c96
--- /dev/null
+++ b/static/image/banner/avatar.png
Binary files differ
diff --git a/static/image/banner/carnNUm.png b/static/image/banner/carnNUm.png
new file mode 100644
index 0000000..bf3ab3b
--- /dev/null
+++ b/static/image/banner/carnNUm.png
Binary files differ
diff --git a/static/image/banner/clock.png b/static/image/banner/clock.png
new file mode 100644
index 0000000..8dc0817
--- /dev/null
+++ b/static/image/banner/clock.png
Binary files differ
diff --git a/static/image/banner/transpartent.png b/static/image/banner/transpartent.png
new file mode 100644
index 0000000..a95bb4c
--- /dev/null
+++ b/static/image/banner/transpartent.png
Binary files differ
--
Gitblit v1.9.1