From adc14180ebdc6b3a5251034a0693289dfa015161 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 31 一月 2024 08:27:42 +0800
Subject: [PATCH] feat:换肤代码提交
---
pages/driver-page/driver-index/test-index.vue | 202 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 177 insertions(+), 25 deletions(-)
diff --git a/pages/driver-page/driver-index/test-index.vue b/pages/driver-page/driver-index/test-index.vue
index ebf2b9e..6202822 100644
--- a/pages/driver-page/driver-index/test-index.vue
+++ b/pages/driver-page/driver-index/test-index.vue
@@ -52,6 +52,14 @@
size="40"></u-icon>
</div>
</div>
+ <div class="statusBox">
+ <view class="status">
+ <u-tag :text="coalStatus[item.statusWeigh] || ''"
+ plain>
+ </u-tag>
+ </view>
+ </div>
+
<div class="twoLine">
<div class="twoleft">
<view class="time-icon"><u-icon name="clock"
@@ -65,15 +73,16 @@
</div>
</div>
<div class="threeLine">
- <span class="more">MORE>></span>
+ <span class="more" @click="todoHistory">MORE>></span>
</div>
</div>
<!-- 涔濆鏍� -->
- <view class="gridBox">
+ <view class="gridBox" >
<u-grid
:border="false"
col="4"
+ v-if="!loading"
>
<u-grid-item
v-for="(listItem,listIndex) in list"
@@ -202,47 +211,51 @@
<view class="time-icon"><u-icon name="clock"
color="#515151"
size="30"></u-icon></view>
- <view class="send-date"><text class="create-date"> {{ item.createTime }}</text></view>
+ <view class="send-date"> {{ item.createTime }}</view>
</div>
<span class="more">
- <div class="qiangdanBtn">绔嬪嵆鎶㈠崟</div>
+ <div class="qiangdanBtn" @click.stop="toAppointmentClick(item)">绔嬪嵆棰勭害</div>
</span>
</div>
</div>
<div v-if="!driverBillOfLoadingData.list3.length"><u-empty
mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
- iconSize="30"></u-empty></div>
+ textSize="30"></u-empty></div>
<!-- 閫氱煡閫氬憡 -->
<combined-title title="閫氱煡鍏憡"></combined-title>
<div class="tongzhi">
<u-list
v-if="noticeList && noticeList.length"
height="280rpx"
+ @scrolltolower="scrolltolower"
+ pagingEnabled
>
<u-list-item
v-for="(item, index) in noticeList"
:key="index"
>
- <u-cell
- :title="`鍒楄〃闀垮害-${index + 1}`"
- :value="item.date"
- >
- <u-avatar
+ <div class="listItem" @click="todoNotice(item)">
+
+ <div class="listItemTop">
+ <u-avatar
slot="icon"
shape="square"
size="35"
:src="item.url"
customStyle="margin: -3px 5px -3px 0"
></u-avatar>
- </u-cell>
+ <div v-html="item.title"></div></div>
+
+ <span class="listDate">{{ item.createTime }}</span>
+ </div>
</u-list-item>
</u-list>
<u-empty
v-if="!noticeList.length"
mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
- iconSize="30"></u-empty>
+ textSize="30"></u-empty>
</div>
<!-- 寮曞椤� -->
<view class="noob-tour"
@@ -273,16 +286,27 @@
@confirm="qiangDanConfirm"
@cancel="qiangDanCancel"></u-modal>
</view>
+ <!-- 鍥剧墖棰勮寮瑰嚭妗� -->
+ <view class="previewImage-container">
+ <previewImage ref="previewImage"
+ :imgs="driverTourImgList"
+ :saveBtn='false'></previewImage>
+ </view>
+ <!-- 閫氱煡鍏憡 -->
+ <u-modal :show="noticeModelShow" :title="notice.title" @confirm="noticConfirm" >
+ <div v-html="notice.content"></div>
+ </u-modal>
</div>
</template>
<script>
- import { customerId } from '@/utils/status';
import { onlineurl } from '@/api/request.js'
import { BaseUrl } from '@/api/publicInterface.js'
import combinedTitle from '@/components/combined-title/combined-title.vue';
import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
import { mapState } from 'vuex';
import { Debounce } from '../../../utils/util';
+ import labaIcon from '@/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 27 鎷疯礉 3.jpg'
+ import newIcon from '@/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 27.jpg'
export default {
components: {
combinedTitle,
@@ -311,6 +335,13 @@
},
data() {
return {
+ labaIcon,
+ newIcon,
+ noticeModelShow:false,
+ notice:{
+ title:'',
+ content:"",
+ },
noticeList: [],
urls: [
'https://cdn.uviewui.com/uview/album/1.jpg',
@@ -332,10 +363,10 @@
src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(1).jpg',
title: '鍘嗗彶璁㈠崟'
},
- {
- src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(2).jpg',
- title: '璐ㄦ'
- },
+ // {
+ // src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(2).jpg',
+ // title: '璐ㄦ'
+ // },
{
src: '/static/image/鏃犱汉鍊煎畧/鍙告満绔椤�/缁� 15(3).jpg',
title: '杞﹂槦绠＄悊'
@@ -364,6 +395,11 @@
},
// 鎶㈠崟妯℃�佹
qiangDanShow: false,
+ noticePage:{
+ current:1,
+ page:10,
+ },
+
qiangDanTitle: '鎶㈠崟鎻愮ず',
qiangDanContent: '',
qiangDanOrderPlanId: null,
@@ -380,10 +416,11 @@
mounted() {
// this.TourImgList = TourImgList
this.getLogOn()
-
+ this.getNoticeList();
},
onShow() {
this.init();
+
},
methods: {
// 璺宠浆鍦板浘
@@ -402,6 +439,27 @@
url: `/pages/public-page/aboutus/index`
});
break;
+
+ case '鏁版嵁缁熻':
+ uni.navigateTo({
+ url: `/pages/public-page/dataStatistics/index`
+ });
+ break;
+
+ case '鍘嗗彶璁㈠崟':
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/historicalOrders/index?historyData=${JSON.stringify(this.driverBillOfLoadingData.list2)}`
+ });
+ break;
+
+ case '鎿嶄綔鎸囧崡':
+ this.noobTour();
+ break;
+ case '娑堟伅':
+ uni.navigateTo({
+ url: '/pages/public-page/message/message'
+ });
+ break;
default:
break;
@@ -411,6 +469,44 @@
init() {
this.qiangDanList();
},
+ scrolltolower() {
+ this.loadmore()
+ },
+ loadmore(){
+ this.noticePage.current ++;
+ this.getNoticeList();
+
+ },
+ getNoticeList(){
+ this.$reqGet('noticeList',{...this.noticePage,isNotice:'1'}).then(res => {
+ console.log(res,'resresres')
+ if(res.code == 0){
+ let result = res.data.records;
+ if(result.length){
+ this.noticeList = this.noticeList.concat(result)
+ }else{
+ //鍚﹀垯灏辨槸绌�
+
+ }
+
+ let arr = this.noticeList.sort((a,b)=>{
+ return new Date(a) - new Date(b);
+ })
+ console.log(arr)
+ this.noticeList = arr.map((item,i)=>{
+ if(i == 0){
+ item.url = this.newIcon
+
+ }else{
+ item.url = this.labaIcon
+ }
+ return item
+ });
+
+ }
+ })
+
+ },
// 鍙告満棣栭〉鍒楄〃
qiangDanList() {
uni.showLoading({
@@ -420,7 +516,9 @@
uni.hideLoading();
this.driverBillOfLoadingData = res.data;
this.loading = false;
- });
+ }).finally(() => {
+ this.loading = false;
+ })
},
// 鎶㈠崟鎸夐挳
qiangDanBtn:Debounce(function(value){
@@ -507,6 +605,22 @@
});
})
},
+ todoHistory(){
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/historicalOrders/index`
+ });
+ },
+ todoNotice(item){
+ console.log(item,'item')
+ if(item){
+ this.noticeModelShow = true;
+ this.notice = item;
+ }
+
+ },
+ noticConfirm(){
+ this.noticeModelShow = false;
+ }
}
};
@@ -538,7 +652,7 @@
}
.ingOrder{
width: 94%;
- height: 330rpx;
+ height: 380rpx;
margin: 0 auto;
background: #FFFFFF;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73,120,240,0.14), 0rpx 7rpx 45rpx 0rpx rgba(73,120,240,0.12);
@@ -547,6 +661,15 @@
display: flex;
flex-direction: column;
padding-top: 20rpx;
+ .statusBox{
+ width: 94%;
+ margin: 0 auto;
+ margin-top: 20rpx;
+ }
+ .status{
+ display: flex;
+ width: 150rpx;
+ }
.firstLine{
flex: 0 1 60%;
@@ -622,11 +745,11 @@
.twoLine{
flex: 0 1 25%;
width: 92%;
- margin: 35rpx auto;
+ margin: 20rpx auto;
display: flex;
justify-content: space-between;
.twoleft{
- width: 313rpx;
+ width: 325rpx;
display: flex;
justify-content: space-around;
align-items: center;
@@ -654,6 +777,7 @@
justify-content: flex-end;
height: 100rpx;
margin-bottom: 20rpx;
+ transform: translateY(-20rpx);
.more{
width: 106rpx;
height: 20rpx;
@@ -807,6 +931,7 @@
font-family: Microsoft YaHei;
font-weight: 300;
margin-right: 20rpx;
+
.qiangdanBtn{
width: 230rpx;
height:60rpx;
@@ -937,12 +1062,13 @@
justify-content: space-between;
align-items: center;
.date{
- width: 200rpx;
+ width: 300rpx;
display: flex;
align-items: center;
justify-content: space-around;
.send-date{
- font-size: 28rpx;
+ width: 260rpx;
+ font-size: 25rpx;
font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
@@ -974,11 +1100,37 @@
width: 94%;
margin: 0 auto;
height: 280rpx;
- background-color: #fff;
+ // background-color: #fff;
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;
transform: translateY(-10rpx);
}
+ .listItem{
+ display: flex;
+ align-items: center;
+ height: 80rpx;
+ width: 94%;
+ justify-content: space-between;
+ border-bottom: solid 1px #E3E3E3;
+ margin: 0 auto;
+ margin-top: 20rpx;
+ .listDate{
+ font-size: 24rpx;
+ font-family: Microsoft YaHei;
+ font-weight: 300;
+ color: #6E6E6E;
+ }
+ .listItemTop{
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ font-size: 28rpx;
+ white-space: nowrap;
+ text-overflow:ellipsis;
+ overflow:hidden;
+ }
+
+ }
}
}
--
Gitblit v1.9.1