~fyy/unattended-app.git

			@@ -1,12 +1,12 @@
			<template>
			<div class="warp" :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/diverbanner.png)`, backgroundSize: 'contain', backgroundRepeat: 'no-repeat' }">
			<scroll-view
			<scroll-view
			scroll-y class="page" @scroll="onScroll">
			<div class="warp-box">
			<!-- 当前的订单 -->
			<!-- 占位 -->
			<div class="ingOrderBox"></div>
			<div class="ingOrder" v-for="item,i in driverBillOfLoadingData.list2" :key="i" v-if="i == 0"
			<div class="ingOrder" v-for="(item,i) in driverBillOfLoadingData.list2" :key="i" v-if="i == 0"
			@click="list3CardIconClick(item)"
			>
			<!-- 第一行 -->
			@@ -47,7 +47,7 @@
			@click.stop="skipMap(item)"
			size="40"></u-icon
			>
			<u-icon
			<u-icon
			@click.stop="skipMap(item)"
			name="map"
			color="#4978F0"
			@@ -61,7 +61,7 @@
			</u-tag>
			</view>
			</div>


			<div class="twoLine">
			<div class="twoleft">
			<view class="time-icon"><u-icon name="clock"
			@@ -79,7 +79,7 @@
			</div>
			</div>
			<!-- 蒙层 -->


			<!-- 九宫格 -->
			<view class="gridBoxBg no-right no-left">
			<view class="gridBox" >
			@@ -91,7 +91,7 @@
			<u-grid-item
			v-for="(listItem,listIndex) in list"
			:key="listIndex"


			>
			<u--image :showLoading="true" :src="listItem.src" width="50px" height="50px" @click="gridClick(listItem)"></u--image>
			<text class="grid-text" >{{listItem.title}}</text>
			@@ -99,7 +99,7 @@
			</u-grid>
			</view>
			</view>


			<!-- 立即抢单 -->
			<div class="orderGrabbing" v-for="item,i in driverBillOfLoadingData.list1" :key="i">
			<!-- 第一行 -->
			@@ -242,8 +242,8 @@
			:key="index"
			>
			<div class="listItem" @click="todoNotice(item)">

			<div class="listItemTop">

			<div class="listItemTop">
			<u-avatar
			slot="icon"
			shape="square"
			@@ -252,7 +252,7 @@
			customStyle="margin: -3px 5px -3px 0"
			></u-avatar>
			<div v-html="item.title"></div></div>


			<span class="listDate">{{ item.createTime }}</span>
			</div>
			</u-list-item>
			@@ -282,7 +282,7 @@
			</u-cell>
			</u-cell-group>
			</view>


			</div>
			</scroll-view>
			<view class="mark" ref="mark" :style="{ display:markFlag ,top: markFlag ? 0 : '100vh'}">
			@@ -410,7 +410,7 @@
			current:1,
			page:10,
			},


			qiangDanTitle: '抢单提示',
			qiangDanContent: '',
			qiangDanOrderPlanId: null,
			@@ -432,7 +432,7 @@
			},
			onShow() {
			this.init();


			},
			methods: {
			// 跳转地图
			@@ -462,11 +462,11 @@
			uni.navigateTo({
			url: `/pages/public-page/historicalOrders/index?historyData=${JSON.stringify(this.driverBillOfLoadingData.list2)}`
			});
			break;
			break;

			case '操作指南':
			this.noobTour();
			break;
			break;
			case '消息':
			uni.navigateTo({
			url: '/pages/public-page/message/message'
			@@ -478,7 +478,7 @@
			url: '/pages/public-page/cooperationBase/index'
			});
			break;


			default:
			break;
			}
			@@ -530,7 +530,7 @@
			this.noticeList = this.noticeList.concat(result)
			}else{
			//否则就是空


			}

			let arr = this.noticeList.sort((a,b)=>{
			@@ -546,7 +546,7 @@
			}
			return item
			});


			}
			})

			@@ -578,7 +578,7 @@
			this.qiangDanContent = `已抢${value.tmcCount}单，确定抢单？`;
			}
			} ,500)


			,
			// 抢单模态框
			qiangDanConfirm() {
			@@ -665,7 +665,7 @@
			noticConfirm(){
			this.noticeModelShow = false;
			}


			}
			};
			</script>
			@@ -699,7 +699,7 @@
			height: 380rpx!important;

			}


			.ingOrder{
			width: 94%;
			height: 380rpx;
			@@ -720,7 +720,7 @@
			display: flex;
			width: 150rpx;
			}


			.firstLine{
			flex: 0 1 60%;
			width: 92%;
			@@ -776,9 +776,9 @@
			border-right: 2px dotted #303030;
			transform: translateX(15rpx);
			}


			}


			}
			.centerTitle{
			display: flex;
			@@ -799,7 +799,7 @@
			display: flex;
			justify-content: space-between;
			.twoleft{


			display: flex;
			justify-content: space-around;
			align-items: center;
			@@ -915,9 +915,9 @@
			border-right: 2px dotted #303030;
			transform: translateX(15rpx);
			}


			}


			}
			.centerTitle{
			display: flex;
			@@ -939,7 +939,7 @@
			display: flex;
			justify-content: space-between;
			.twoleft{


			display: flex;
			justify-content: space-around;
			align-items: center;
			@@ -981,7 +981,7 @@
			font-family: Microsoft YaHei;
			font-weight: 300;
			margin-right: 20rpx;


			.qiangdanBtn{
			width: 230rpx;
			height:60rpx;
			@@ -1062,9 +1062,9 @@
			border-right: 2px dotted #303030;
			transform: translateX(15rpx);
			}


			}


			}
			.centerTitle{
			display: flex;
			@@ -1086,7 +1086,7 @@
			display: flex;
			justify-content: space-between;
			.twoleft{


			display: flex;
			justify-content: space-around;
			align-items: center;
			@@ -1179,14 +1179,14 @@
			justify-content: space-around;
			align-items: center;
			font-size: 28rpx;
			white-space: nowrap;
			text-overflow:ellipsis;
			overflow:hidden;
			white-space: nowrap;
			text-overflow:ellipsis;
			overflow:hidden;
			}

			}
			}


			}
			.gridBoxBg{
			// box-shadow:0 0 10px 10px #9fb1c5;
			@@ -1213,4 +1213,4 @@
			// /* .right-bottom, .right-top 组合 */
			// box-shadow: 5px 5px 10px -4px #fff, 5px -5px 10px -4px #fff;
			// }
			</style>
			</style>