From b5d3561a2e06106ed9cce2c6bcc9c2463951e998 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 15 十一月 2024 11:06:26 +0800
Subject: [PATCH] 新增申请页面不显示发运通知单的问题修改

---
 pages/home/home.vue | 1115 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 712 insertions(+), 403 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 03973df..f0910eb 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -2,235 +2,262 @@
 	<view class="home">
 		<!-- 杞挱鍥� -->
 		<view class="home_swipe"><u-swiper :list="list3" indicator indicatorMode="line" circular></u-swiper></view>
+
+		<!-- 鍥捐〃 -->
+		<combined-title title="鐓や粨搴撳瓨鏄庣粏"></combined-title>
+		<view class="charts-box">
+			<qiun-data-charts type="pie" :opts="opts" :chartData="chartData" v-if="uchartsData.length > 0" />
+			<u-empty mode="data" iconSize="200" textSize="25" width="350" height="350" icon="http://cdn.uviewui.com/uview/empty/data.png" v-if="uchartsData.length == 0"></u-empty>
+		</view>
 		<!-- 鎴戠殑鐢宠 -->
-		<combined-title title="鎴戠殑鐢宠" detailsPath="/pages/my-application/my-application"></combined-title>
-		<combination-card v-for="(item, index) in shenqingData" index="index">
-			<template v-slot:top>
-				<view>
-					<text>{{ item.title }}</text>
-				</view>
-			</template>
-			<template v-slot:center>
-				<view class="center-container">
-					<view class="center-content__one center-margin">
-						<view class="">
-							<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
+		<combined-title title="鎴戠殑鐢宠" detailsPath="/pages/my-application/my-application" v-if="shenqingMenu"></combined-title>
+		<view class="card-group">
+			<combination-card class="card" v-for="(item, index) in shenqingData" index="index" v-if="shenqingMenu">
+				<template v-slot:top>
+					<view>
+						<text>{{ item.title }}</text>
+					</view>
+				</template>
+				<template v-slot:center>
+					<view class="center-container">
+						<view class="center-content__one center-margin">
+							<view class="">
+								<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
+							</view>
+							<view class="">
+								<text>瀹℃壒鐜妭锛歿{ item.currTaskName || '' }}</text>
+							</view>
 						</view>
-						<view class="">
-							<text>瀹℃壒鐜妭锛歿{ item.currTaskName }}</text>
+						<view class="center-content__two center-margin">
+							<view class="">
+								鐘舵�侊細
+								<text :style="{ color: statusColor[item.status] }">{{ status[item.status] }}</text>
+							</view>
+							<view class="">
+								缁撴灉锛�
+								<text :style="{ color: resultColor[item.result] }">{{ result[item.result] }}</text>
+							</view>
+						</view>
+						<view class="center-content__three center-margin">
+							<text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
+						</view>
+						<view class="center-content__four">
+							<text>鎻愪氦鐢宠鏃堕棿锛歿{ item.applyTime }}</text>
 						</view>
 					</view>
-					<view class="center-content__two center-margin">
-						<view class="">
-							鐘舵�侊細
-							<text :style="{ color: statusColor[item.status] }">{{ status[item.status] }}</text>
+				</template>
+				<template v-slot:bottom>
+					<view class="bottom-container">
+						<!-- 鎸夐挳鍖哄煙 -->
+						<view class="bottom-content__chulizhong bottom-content__item">
+							<!-- <view @click="withDrawClick(item.procInstId)" v-if="item.status == 1">
+								<image src="@/static/home/cehui.png" mode=""></image>
+								<view>鎾ゅ洖</view>
+							</view> -->
+							<view @click="() => checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">
+								<image src="@/static/home/jindu.png" mode=""></image>
+								<view>鏌ョ湅杩涘害</view>
+							</view>
+							<view @click="() => shenqingDetail(item)" v-if="item.actType == 'Offsetting' || item.actType == 'XsWaybill'">
+								<image src="@/static/home/biaodan.png" mode=""></image>
+								<view>鐢宠璇︽儏</view>
+							</view>
+							<!-- <view @click="apply(item)" v-if="item.status == 3">
+								<image src="@/static/home/history.png" mode=""></image>
+								<view>閲嶆柊鐢宠</view>
+							</view> -->
+							<!-- <view @click="editMyApplication(item)" v-if="item.status == 1 && item.processName == '鍙戣繍閫氱煡鍗�'">
+								<image src="@/static/home/history.png" mode=""></image>
+								<view>缂栬緫</view>
+							</view> -->
+							<view @click="() => checkTheScheduleClick(item.procInstId)" v-if="item.status !== 1">
+								<image src="@/static/home/history.png" mode=""></image>
+								<view>瀹℃壒鍘嗗彶</view>
+							</view>
+							<!-- <view @click="deleteWithDrawApplication(item.tableId)" v-if="item.status == 3">
+								<image src="@/static/home/delete.png" mode=""></image>
+								<view>鍒犻櫎</view>
+							</view> -->
 						</view>
-						<view class="">
-							缁撴灉锛�
-							<text :style="{ color: resultColor[item.result] }">{{ result[item.result] }}</text>
-						</view>
+						<!-- 宸茬粨鏉熷皬缁勬寜閽� -->
+						<!-- <view class="bottom-content__chulizhong bottom-content__item" v-if="item.status == 2">
+              <view @click="theFormDataClick">
+                <image src="@/static/home/biaodan.png" mode=""></image>
+                <view>琛ㄥ崟鏁版嵁</view>
+              </view>
+
+            </view> -->
 					</view>
-					<view class="center-content__three center-margin">
-						<text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
-					</view>
-					<view class="center-content__four">
-						<text>鎻愪氦鐢宠鏃堕棿锛歿{ item.applyTime }}</text>
-					</view>
-				</view>
-			</template>
-			<template v-slot:bottom>
-				<view class="bottom-container">
-					<!-- 鎸夐挳鍖哄煙 -->
-					<view class="bottom-content__chulizhong bottom-content__item">
-						<view @click="withDrawClick(item.id)" v-if="item.status == 1">
-							<image src="@/static/home/cehui.png" mode=""></image>
-							<view>鎾ゅ洖</view>
-						</view>
-						<view @click="checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">
-							<image src="@/static/home/jindu.png" mode=""></image>
-							<view>鏌ョ湅杩涘害</view>
-						</view>
-						<view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2">
-							<image src="@/static/home/biaodan.png" mode=""></image>
-							<view>琛ㄥ崟鏁版嵁</view>
-						</view>
-						<view @click="apply(item)" v-if="item.status == 3">
-							<image src="@/static/home/history.png" mode=""></image>
-							<view>閲嶆柊鐢宠</view>
-						</view>
-						<view @click="editMyApplication(item)" v-if="item.status == 3">
-							<image src="@/static/home/history.png" mode=""></image>
-							<view>缂栬緫</view>
-						</view>
-						<view @click="approvalHistoryClick(item.procInstId)" v-if="item.status == 2 || item.status == 3">
-							<image src="@/static/home/history.png" mode=""></image>
-							<view>瀹℃壒鍘嗗彶</view>
-						</view>
-					</view>
-					<!-- 宸茬粨鏉熷皬缁勬寜閽� -->
-					<!-- <view class="bottom-content__chulizhong bottom-content__item" v-if="item.status == 2">
-						<view @click="theFormDataClick">
-							<image src="@/static/home/biaodan.png" mode=""></image>
-							<view>琛ㄥ崟鏁版嵁</view>
-						</view>
-						
-					</view> -->
-				</view>
-			</template>
-		</combination-card>
+				</template>
+			</combination-card>
+		</view>
 
 		<!-- 鎴戠殑寰呭姙 -->
 		<combined-title title="鎴戠殑寰呭姙" detailsPath="/pages/my-todo/my-todo"></combined-title>
-		<combination-card v-for="(item, index) in daibanData" index="index">
-			<template v-slot:top>
-				<view>
-					<text>{{ item.actBusiness.title }}</text>
-				</view>
-			</template>
-			<template v-slot:center>
-				<view class="center-container">
-					<view class="center-content__one center-margin">
-						<view class="">
-							<text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
-						</view>
-						<view class="">
-							<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
-						</view>
+		<view class="card-group">
+			<combination-card class="card" v-for="(item, index) in daibanData" index="index">
+				<template slot="top">
+					<view>
+						<text>{{ item.actBusiness.title }}</text>
 					</view>
-					<view class="center-content__two center-margin">
-						<text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
-					</view>
+				</template>
+				<template slot="center">
+					<view class="center-container">
+						<view class="center-content__one center-margin">
+							<view class="">
+								<text>浠诲姟鍚嶇О锛歿{ item.name || '' }}</text>
+							</view>
+							<view class="">
+								<text>鎵�灞炴祦绋嬶細{{ item.processName || '' }}</text>
+							</view>
+						</view>
+						<view class="center-content__two center-margin">
+							<text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
+						</view>
 
-					<view class="center-content__three">
-						<text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
-					</view>
-				</view>
-			</template>
-			<template v-slot:bottom>
-				<view class="bottom-container">
-					<!-- 寰呭姙鎸夐挳 -->
-					<view class="bottom-content__item">
-						<!-- <view @click="theFormDataClick">
-							<image src="@/static/home/jindu.png" mode=""></image>
-							<view>鐢宠璇︽儏</view>
-						</view> -->
-						<view @click="adopClick(item)">
-							<image src="@/static/home/tongguo.png" mode=""></image>
-							<view>閫氳繃</view>
-						</view>
-						<view @click="rejectClick(item)">
-							<image src="@/static/home/bohui.png" mode=""></image>
-							<view>椹冲洖</view>
-						</view>
-						<view @click="approvalHistoryClick(item.procInstId)">
-							<image src="@/static/home/history.png" mode=""></image>
-							<view>鍘嗗彶</view>
+						<view class="center-content__three">
+							<text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
 						</view>
 					</view>
-				</view>
-			</template>
-		</combination-card>
+				</template>
+				<template slot="bottom">
+					<view class="bottom-container">
+						<!-- 寰呭姙鎸夐挳 -->
+						<view class="bottom-content__item">
+							<view @click="() => daibanDetail(item)" v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">
+								<image src="@/static/home/jindu.png" mode=""></image>
+								<view>鐢宠璇︽儏</view>
+							</view>
+							<view @click="() => adopClick(item)">
+								<image src="@/static/home/tongguo.png" mode=""></image>
+								<view>閫氳繃</view>
+							</view>
+							<view @click="() => rejectClick(item)">
+								<image src="@/static/home/bohui.png" mode=""></image>
+								<view>椹冲洖</view>
+							</view>
+							<view @click="() => checkTheScheduleClick(item.procInstId)">
+								<image src="@/static/home/history.png" mode=""></image>
+								<view>鍘嗗彶</view>
+							</view>
+						</view>
+					</view>
+				</template>
+			</combination-card>
+		</view>
 
 		<!-- 鎴戠殑宸插姙 -->
 		<combined-title title="鎴戠殑宸插姙 " detailsPath="/pages/my-have-todo/my-have-todo"></combined-title>
-		<combination-card v-for="(item, index) in yibanData" index="index">
-			<template v-slot:top>
-				<view>
-					<text>{{ item.actBusiness.title }}</text>
-				</view>
-			</template>
-			<template v-slot:center>
-				<view class="center-container">
-					<view class="center-content__one center-margin">
-						<view>
-							<text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
-						</view>
-						<view>
-							<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
-						</view>
+		<view class="card-group">
+			<combination-card class="card" v-for="(item, index) in yibanData" index="index">
+				<template v-slot:top>
+					<view>
+						<text>{{ item.actBusiness.title }}</text>
 					</view>
-					<view class="center-content__two center-margin">
-						<view>
-							<text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
-						</view>
-						<view>
-							<text>瀹℃壒鎿嶄綔锛歿{ item.deleteReason }}</text>
-						</view>
-					</view>
-					<view class="center-content__three center-margin">
-						<view class="">
-							<text>瀹℃壒鎰忚锛歿{ item.comment }}</text>
-						</view>
-						<view class="">
-							<text>
-								鑰楁椂锛歿{
-									item.duration >= 86400000
-										? parseInt(item.duration / 86400000 + '澶�' + parseInt(item.duration % 86400000) / 3600000 + '鏃�' + parseInt(item.duration % 3600000) / 60000 + '鍒�')
-										: item.duration >= 3600000
-										? parseInt(item.duration / 3600000) + '鏃�' + parseInt((item.duration / 3600000) % 3600000) + '鍒�'
-										: parseInt(item.duration / 60000) + '鍒�'
-								}}
-							</text>
-						</view>
-					</view>
-					<view class="center-content__four">
-						<text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
-					</view>
-				</view>
-			</template>
-			<template v-slot:bottom>
-				<view class="bottom-container">
-					<!-- 宸插姙鎸夐挳 -->
-					<view class="bottom-content__item">
-						<view @click="theFormDataClick(item.tableId)">
-							<image src="@/static/home/biaodan.png" mode=""></image>
-							<view>琛ㄥ崟鏁版嵁</view>
-						</view>
-						<view @click="approvalHistoryClick(item.procInstId)">
-							<image src="@/static/home/history.png" mode=""></image>
-							<view>瀹℃壒鍘嗗彶</view>
-						</view>
-						<view @click="deleteApplicationClick(item.id)">
-							<image src="@/static/home/delete.png" mode=""></image>
-							<view>鍒犻櫎</view>
-						</view>
-					</view>
-				</view>
-			</template>
-		</combination-card>
-		<combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua"></combined-title>
-		<combination-card :showTop="false">
-			<template v-slot:top></template>
-			<template v-slot:center>
-				<view class="main-block-box" v-for="(item,index) in fyData" :key="item.id">
-					<view class="jihua-main-line">
-						<view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view>
-					</view>
-					<view class="jihua-main-line">
-						<view class="main-flex">
-							<view>鐓ょ锛歿{item.order.coalName || ''}}</view>
-							<view>鍓╀綑閲忥細{{item.order.executiveSurplus || ''}}</view>
-						</view>
-					</view>
-					<view class="jihua-main-line">
-						<view class="main-flex">
-							<view class="carNum-box">
-								<view>璁″垝杞︽暟锛�</view>
-								<u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan"
-									@change="inputTotalChange(item)"></u--input>
+				</template>
+				<template v-slot:center>
+					<view class="center-container" @click="() => shenqingDetail(item)">
+						<view class="center-content__one center-margin">
+							<view>
+								<text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
 							</view>
-							<view>瀹為檯鍙戣溅鏁帮細{{item.order.numReal || ''}}</view>
+							<view>
+								<text>鎵�灞炴祦绋嬶細{{ item.processName || '' }}</text>
+							</view>
+						</view>
+						<view class="center-content__two center-margin">
+							<view>
+								<text>鍙戣捣浜猴細{{ item.actBusiness.createByName || '' }}</text>
+							</view>
+							<view>
+								<text>瀹℃壒鎿嶄綔锛歿{ item.deleteReason }}</text>
+							</view>
+						</view>
+						<view class="center-content__three center-margin">
+							<view class="">
+								<text>瀹℃壒鎰忚锛歿{ item.comment == 'undefined' ? '鏈~鍐�' : item.comment || '鏈~鍐�' }}</text>
+							</view>
+							<view class="">
+								<text>
+									鑰楁椂锛歿{
+										item.duration >= 86400000
+											? parseInt(item.duration / 86400000 + '澶�' + parseInt(item.duration % 86400000) / 3600000 + '鏃�' + parseInt(item.duration % 3600000) / 60000 + '鍒�')
+											: item.duration >= 3600000
+											? parseInt(item.duration / 3600000) + '鏃�' + parseInt((item.duration / 3600000) % 3600000) + '鍒�'
+											: parseInt(item.duration / 60000) + '鍒�'
+									}}
+								</text>
+							</view>
+						</view>
+						<view class="center-content__four">
+							<text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
 						</view>
 					</view>
-				</view>
-			</template>
-		    <template v-slot:bottom></template>
-		</combination-card>
+				</template>
+				<template v-slot:bottom>
+					<view class="bottom-container">
+						<!-- 宸插姙鎸夐挳 -->
+						<view class="bottom-content__item">
+							<view @click="() => shenqingDetail(item)" v-if="item.processName == '鍙戣繍閫氱煡鍗�'">
+								<image src="@/static/home/biaodan.png" mode=""></image>
+								<view>琛ㄥ崟鏁版嵁</view>
+							</view>
+              <view @click="() => daibanDetail(item)"  v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">
+                <image src="@/static/home/jindu.png" mode=""></image>
+                <view>璇︽儏</view>
+              </view>
+							<view @click="() => checkTheScheduleClick(item.procInstId)">
+								<image src="@/static/home/history.png" mode=""></image>
+								<view>瀹℃壒鍘嗗彶</view>
+							</view>
+							<view @click="deleteApplicationClick(item.id)">
+								<image src="@/static/home/delete.png" mode=""></image>
+								<view>鍒犻櫎</view>
+							</view>
+						</view>
+					</view>
+				</template>
+			</combination-card>
+		</view>
+
+		<!-- 鏃ヨ鍒� -->
+		<combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua" v-if="rijihuaMenu"></combined-title>
+		<view class="card-group bottomChild">
+			<combination-card class="card" :showTop="false" v-for="(item, index) in fyData.slice(0, 2)" :key="item.id" v-if="rijihuaMenu">
+				<template v-slot:top></template>
+				<template v-slot:center>
+					<view class="main-block-box">
+						<view class="jihua-main-line">
+							<view class="name">瀹㈡埛鍚嶇О锛歿{ item.customerName || '' }}</view>
+						</view>
+						<view class="jihua-main-line">
+							<view class="main-flex">
+								<view>鐓ょ锛歿{ item.order.coalName || '' }}</view>
+								<view>鍓╀綑閲忥細{{ item.order.executiveSurplus || '' }}</view>
+							</view>
+						</view>
+						<view class="jihua-main-line">
+							<view class="main-flex">
+								<view class="carNum-box">
+									<view>璁″垝杞︽暟锛�</view>
+									<u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" :disabled="true" v-model="item.numPlan" @change="inputTotalChange(item)"></u--input>
+								</view>
+								<view>瀹為檯鍙戣溅鏁帮細{{ item.order.numReal || '' }}</view>
+							</view>
+						</view>
+					</view>
+				</template>
+				<template v-slot:bottom></template>
+			</combination-card>
+		</view>
 
 		<!-- 鎾ゅ洖妯℃�佹 -->
 		<view class="wodeshenqingMotai">
-			<u-modal width="684rpx" :show="withDrawShow" title="鎾ゅ洖鍘熷洜" :showCancelButton="true" @confirm="withDrawConfirm" @cancel="withDrawCancel">
-				<view class="slot-content"><u--textarea v-model="withDrawData.reason" placeholder="璇疯緭鍏ユ挙鍥炲師鍥�"></u--textarea></view>
+			<u-modal width="684rpx" :show="withDrawShow" title="鎻愮ず" :showCancelButton="true" @confirm="withDrawConfirm" @cancel="withDrawCancel">
+				<view class="slot-content">
+					<!-- <u--textarea v-model="withDrawData.reason" placeholder="璇疯緭鍏ユ挙鍥炲師鍥�"></u--textarea> -->
+					<text>纭鎾ゅ洖璇ョ敵璇峰悧锛�</text>
+				</view>
 			</u-modal>
 		</view>
 
@@ -257,14 +284,14 @@
 					</view>
 					<u--textarea v-model="rejectForm.comment" placeholder="璇疯緭鍏ュ鎵规剰瑙�"></u--textarea>
 					<!-- <view class="rejectBack">
-						<view class="rejectBack-title"><text>椹冲洖鑷�</text></view>
-						<view class="data-selet" @click="statusSeletShow = true">
-							<view class="content">
-								<text>{{ dataSeletText }}</text>
-							</view>
-							<view class="uni-select__icon"><image src="@/static/icon/select.png" mode="鍔犺浇澶辫触"></image></view>
-						</view>
-					</view> -->
+            <view class="rejectBack-title"><text>椹冲洖鑷�</text></view>
+            <view class="data-selet" @click="statusSeletShow = true">
+              <view class="content">
+                <text>{{ dataSeletText }}</text>
+              </view>
+              <view class="uni-select__icon"><image src="@/static/icon/select.png" mode="鍔犺浇澶辫触"></image></view>
+            </view>
+          </view> -->
 				</view>
 			</u-modal>
 		</view>
@@ -285,32 +312,85 @@
 		<!-- <u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker> -->
 
 		<!-- 鑿滃崟鏍� -->
-		<popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
+		<!-- <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu> -->
+		<u-gap height="15" bgColor="#eeeeee"></u-gap>
+		<view class="utils">
+			<view class="utils-container">
+				<view class="utils-container-body" @click="redirectLogin">
+					<view class="top"><u-icon name="backspace" color="#FF4233" size="70"></u-icon></view>
+					<view class="bottom-text"><text>閫�鍑�</text></view>
+				</view>
+				<!-- <view class="utils-container-body" @click="huanBang">
+					<view class="top"><u-icon name="lock-open" color="#1987FF" size="70"></u-icon></view>
+					<view class="bottom-text"><text>鎹㈢粦</text></view>
+				</view> -->
+			</view>
+		</view>
+		<u-gap height="60" bgColor="#eeeeee"></u-gap>
 	</view>
 </template>
 
 <script>
 import { timeConsuming } from '@/utils/nowDate.js';
-import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
+import { BaseUrl } from '@/utils/request.js';
+// import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
 import combinedTitle from '@/components/common/combined-title/combined-title.vue';
 import combinationCard from '@/components/common/combination-card/combination-card.vue';
-import { setAccessToken } from '@/utils/status.js';
+import { setAccessToken, redirectLogin } from '@/utils/status.js';
+import { logout } from '@/api/global.js';
+
 export default {
 	name: 'home',
+	onLaunch() {
+		let that = this;
+		uni.addInterceptor('redirectTo', {
+			//鐩戝惉鍏抽棴鏈〉闈㈣烦杞�
+			success(e) {
+				that.watchRouter();
+			}
+		});
+	},
+	computed: {
+		rijihuaMenu() {
+			return this.$store.state.rijihuaMenu;
+		},
+		shenqingMenu() {
+			return this.$store.state.shenqingMenu;
+		}
+	},
 	data() {
 		return {
+			// ucharts鍥捐〃
+			chartData: {},
+			opts: {
+				color: ['#FAC858', '#EE6666', '#73C0DE', '#91CB74', '#1890FF', '#3CA272', '#FC8452', '#9A60B4', '#ea7ccc'],
+				padding: [5, 5, 5, 5],
+				extra: {
+					pie: {
+						activeOpacity: 0.5,
+						activeRadius: 10,
+						offsetAngle: 0,
+						labelWidth: 15,
+						border: true,
+						borderWidth: 3,
+						borderColor: '#FFFFFF'
+					}
+				}
+			},
+			uchartsData: [],
+			userId: null,
 			// menuShow:false,// 鑿滃崟鏄剧ず
 			status: ['鑽夌', '澶勭悊涓�', '宸茬粨鏉�', '宸叉挙鍥�'],
 			statusColor: ['#dd8b8c', '#FF9900', '#007AFF', '#06BE00'],
 			result: ['鏈彁浜�', '澶勭悊涓�', '閫氳繃', '椹冲洖'],
 			resultColor: ['#dd8b8c', '#FF9900', '#06BE00', '#be2b2d'],
-			list3: ['https://cdn.uviewui.com/uview/swiper/swiper3.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper1.png'],
+			list3: ['../../../../static/groupAppTotalImg/banner.png'],
 			// 鎾ゅ洖妯℃�佹
 			withDrawShow: false,
 			fyData: [],
 			withDrawData: {
-				reason: '',
-				id: '', // 鎾ゅ洖鐢宠ID
+				// reason: '',
+				// id: '', // 鎾ゅ洖鐢宠ID
 				procInstId: ''
 			},
 			withDrawContent: '',
@@ -340,19 +420,24 @@
 			// dataSeletText: '璇烽�夋嫨鐘舵��',
 			// 椹冲洖璇锋眰
 			rejectForm: {
-				procInstIds: '',
-				comment: ''
+        id: "",
+        procInstId: "",
+        comment: "",
+        type: 0,
+        backTaskKey: "-1",
+        sendMessage: true,
+        sendSms: true,
+        sendEmail: true,
 			},
 			modalType: 0,
 			// 鍒犻櫎鐢宠妯℃�佹
 			deleteApplicationModalShow: false,
-			procInstId:'',
+			procInstId: '',
 			// 閫夋嫨鍣�
 			statusSeletShow: false,
 			statusList: [['涓浗', '缇庡浗', '鏃ユ湰']],
 			// data
 			shenqingData: [],
-			daibanData: [],
 			daibanData: [],
 			yibanData: [],
 			menuShow: false,
@@ -373,69 +458,153 @@
 			haveTodoParams: {
 				pageNumber: 1,
 				pageSize: 2,
-				sort: 'createTime',
-				order: 'desc'
+				// sort: 'createTime',
+				// order: 'desc'
 			}
 		};
 	},
+	// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
+	// onReady() {
+
+	// },
 	// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
 	onNavigationBarButtonTap(e) {
-		console.log(e);
-		this.$refs.menuRef.menuClick();
+		console.log('閫�鍑哄鑸爮鎸夐挳浜嬩欢', e);
+		// this.$refs.menuRef.menuClick();
+	},
+	// 鐩戝惉宸︿笂瑙掔殑鍥為��浜嬩欢
+	onUnload(event) {
+		//澶氬眰绾ц烦杞箣鍚庯紝鐩戝惉宸︿笂瑙掕繑鍥炰簨浠讹紝鐩存帴閫�鍥炲埌index
+		console.log('鐩戝惉宸︿笂瑙�', event);
+		this.logout();
 	},
 	onShow() {
-		if (this.menuShow == true) {
-			this.$refs.menuRef.menuClick();
-		}
+		// 鑿滃崟娉ㄩ噴锛坅pp寰呯敤锛�
+		// if (this.menuShow == true) {
+		// 	this.$refs.menuRef.menuClick();
+		// }
 		this.init();
 	},
 	components: {
 		combinedTitle,
-		combinationCard,
-		popupMenu
+		combinationCard
+		// popupMenu
 	},
 	methods: {
-		getUserInfo() {
-			this.$reqGet('getUserInfo').then(res => {
-				if (res.code == 0) {
-					uni.setStorageSync('userInfo', res.data.sysUser);
-				}
-			});
+		watchRouter() {
+			console.log('璺敱璺宠浆');
 		},
 		init() {
-			this.getUserInfo();
+			this.getUserInfo(); // 鐢ㄦ埛淇℃伅
 			this.getProcessDataList(); // 鐢宠鍒楄〃
 			this.todoList(); // 鎴戠殑寰呭姙
 			this.doneList(); // 鎴戠殑宸插姙
-			this.xscarshippingdayplan();  //鏃ヨ鍒�
+			this.xscarshippingdayplan(); // 鏃ヨ鍒�
 		},
-		xscarshippingdayplan(allList) { //宸茬粡璁剧疆鐨�
-		console.log(allList,'allList==========')
+    //浠e姙璇︽儏
+    daibanDetail(item) {
+      console.log(item,'item=====------000000')
+      if(item?.actBusiness?.actType == 'Offsetting') {  //鏀舵 actType = 鈥極ffsetting鈥�
+        uni.navigateTo({
+          url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,
+
+        })
+      }else if(item?.actBusiness?.actType == 'XsWaybill') {
+        uni.navigateTo({
+          url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`
+        })
+      }
+    },
+    //浠e姙璇︽儏
+    shenqingDetail(item) {
+      console.log(item,'item====寰呭姙===璇︽儏')
+      if(item.actType == 'Offsetting') {  //鏀舵 actType = 鈥極ffsetting鈥�
+        uni.navigateTo({
+          url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,
+
+        })
+      }else if(item.actType == 'XsWaybill') {
+        uni.navigateTo({
+          url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`
+        })
+      }
+    },
+		getUserInfo() {
+			this.$reqGet('getUserInfo').then(res => {
+        console.log(res,'res=====绯荤粺鐧诲綍===')
+				if (res.code == 0) {
+					uni.setStorageSync('userInfo', res.data.sysUser);
+          this.$store.commit('SET_PERMISSIONS',res.data.permissions)
+					//uni.setStorageSync('permissions', res.data.permissions);
+					this.userId = res.data.sysUser.userId;
+					this.$nextTick(() => {
+						this.coalbunker();
+					});
+				}
+			});
+		},
+		getServerData() {
+			console.log('鍔犺浇鍥捐〃', this.uchartsData);
+			//妯℃嫙浠庢湇鍔″櫒鑾峰彇鏁版嵁鏃剁殑寤舵椂
+			setTimeout(() => {
+				//妯℃嫙鏈嶅姟鍣ㄨ繑鍥炴暟鎹紝濡傛灉鏁版嵁鏍煎紡鍜屾爣鍑嗘牸寮忎笉鍚岋紝闇�鑷鎸変笅闈㈢殑鏍煎紡鎷兼帴
+				let res = {
+					series: [
+						{
+							data: this.uchartsData
+						}
+					]
+				};
+				this.chartData = JSON.parse(JSON.stringify(res));
+			}, 500);
+		},
+		// 鐓や粨褰撳墠鍓╀綑閲�
+		coalbunker() {
+			this.uchartsData = [];
+			this.$reqGet('coalbunker', { customerId: this.userId }).then(res => {
+				let newArr = res.data.records;
+				newArr.forEach(item => {
+					if (item.stock != null) {
+						let a = { name: '', value: '', labelText: '' };
+						a.name = item.bunkerName + '鍓╀綑閲�';
+						a.value = item.stock;
+						// a.labelText ='鍓╀綑閲忥細' + item.stock;
+						this.uchartsData.push(a);
+					}
+				});
+				this.getServerData(); // 鍔犺浇鍥捐〃
+			});
+		},
+		xscarshippingdayplan(allList) {
+			//宸茬粡璁剧疆鐨�
+			console.log(allList, 'allList==========');
 			let params = {
 				current: 1,
 				size: 2,
 				shippingDate: this.todayDate()
-			}
-			this.$reqGet('xscarshippingdayplan', params).then(res => {
-				if (res.code == 0) {
-					this.fyData = res.data.records
+			};
+			this.$reqGet('xscarshippingdayplan', params)
+				.then(res => {
+					if (res.code == 0) {
+						this.fyData = res.data.records;
+						uni.hideLoading();
+					}
+				})
+				.catch(e => {
 					uni.hideLoading();
-				}
-			}).catch(e => {
-				uni.hideLoading();
-			})
+				});
 		},
 		todayDate() {
-			let yes = new Date().getTime()
-			let date = new Date(yes)
-			let y = date.getFullYear()
-			let m = date.getMonth() + 1
-			m = m < 10 ? ('0' + m) : m
-			let d = date.getDate()
-			d = d < 10 ? ('0' + d) : d
-			const time = y + '-' + m + '-' + d
-			console.log('todayDate---------', time)
-			return time
+			let yes = new Date().getTime();
+			let date = new Date(yes);
+			let y = date.getFullYear();
+			let m = date.getMonth() + 1;
+			m = m < 10 ? '0' + m : m;
+			let d = date.getDate();
+			d = d < 10 ? '0' + d : d;
+			const time = y + '-' + m + '-' + d;
+			console.log('todayDate---------', time);
+			return time;
 		},
 		getProcessDataList() {
 			this.$reqGet('getProcessDataList', this.myApplicationParams).then(res => {
@@ -455,8 +624,8 @@
 		},
 		doneList() {
 			uni.showLoading({
-				title:'鍔犺浇涓�...'
-			})
+				title: '鍔犺浇涓�...'
+			});
 			this.$reqGet('doneList', this.haveTodoParams).then(res => {
 				uni.hideLoading();
 				if (res.code === 0) {
@@ -469,33 +638,27 @@
 			this.menuShow = e;
 		},
 		// 鎾ゅ洖妯℃�佹
-		withDrawClick(id) {
+		withDrawClick(procInstId) {
 			this.withDrawShow = true;
-			this.withDrawData.id = id;
+			this.withDrawData.procInstId = procInstId;
 		},
 		withDrawConfirm() {
-			this.shenqingData.forEach(i => {
-				if (i.id == this.withDrawData.id) {
-					this.withDrawData.procInstId = i.procInstId;
+			this.$reqPost('cancel', this.withDrawData).then(res => {
+				this.withDrawShow = false;
+				if (res.code == 0) {
+					uni.showToast({
+						title: res.data,
+						duration: 2000
+					});
 				}
+				// 鍒锋柊鍒楄〃
+				this.getProcessDataList();
+				this.todoList();
+				this.doneList();
 			});
-			if (this.withDrawData.reason.length >= 2) {
-				this.$reqPost('withDraw', this.withDrawData, 'form').then(res => {
-					this.withDrawShow = false;
-					if (res.code == 0) {
-						uni.showToast({
-							title: res.data,
-							duration: 2000
-						});
-					}
-					this.getProcessDataList();
-				});
-			} else {
-				uni.showToast({
-					title: '璇疯鑼冭緭鍏�',
-					duration: 2000
-				});
-			}
+		},
+		withDrawCancel() {
+			this.withDrawShow = false;
 		},
 		// 閫氳繃
 		adopClick(v) {
@@ -511,14 +674,15 @@
 		// 閫氳繃妯℃�佹
 		adoptModalConfirm() {
 			this.adoptModalShow = false;
-			this.adoptForm.comment = this.adoptModalContent;
-
-			this.$reqPost('passAll', this.adoptForm, 'form').then(res => {
+			this.adoptForm.comment = this.adoptModalContent || '';
+			this.$reqPost('passAll', this.adoptForm).then(res => {
 				if (res.code == 0) {
 					this.$u.toast('鎿嶄綔鎴愬姛!');
 				} else {
-					this.$u.toast('娣诲姞澶辫触!!');
+					this.$u.toast('閫氳繃澶辫触!!');
 				}
+				this.todoList(); // 鎴戠殑寰呭姙
+				this.doneList();
 			});
 		},
 		adoptModalCancel() {
@@ -526,42 +690,50 @@
 		},
 		// 椹冲洖
 		rejectClick(v) {
+      console.log('椹冲洖====',v)
 			this.modalType = 1;
 			this.rejectModalShow = true;
-			this.rejectForm.procInstIds = v.procInstId;
+			this.rejectForm.procInstId = v.procInstId;
+      this.rejectForm.id = v.id;
+      this.rejectForm.procDefId = v.procDefId;
+      this.rejectForm.priority = v.priority;
+      this.rejectForm.type = 1;
 		},
 		// 椹冲洖妯℃�佹
 		rejectModalConfirm() {
 			this.rejectModalShow = false;
 
-			this.$reqPost('backAll', this.rejectForm, 'form').then(res => {
+			this.$reqPost('back', this.rejectForm).then(res => {
 				if (res.code == 0) {
 					this.$u.toast('鎿嶄綔鎴愬姛锛�');
 				} else {
 					this.$u.toast('鎿嶄綔澶辫触锛侊紒锛�');
 				}
 				this.todoList(); // 鎴戠殑寰呭姙
+				this.doneList();
 			});
 		},
 		rejectModalCancel() {
 			this.rejectModalShow = false;
 		},
-		withDrawCancel() {
-			this.withDrawShow = false;
+		// 鍒犻櫎鐢宠
+		deleteApplicationClick(id) {
+			this.deleteApplicationModalShow = true;
+			this.procInstId = id;
+			console.log(id);
 		},
 		// 鍒犻櫎鐢宠妯℃�佹
 		deleteApplicationModalConfirm() {
 			this.deleteApplicationModalShow = false;
-			this.$reqPost('deleteHistoric',{ids:this.procInstId},'form').then(res=>{
-				if(res.code == 0){
-					this.$u.toast('鎿嶄綔鎴愬姛锛�')
+			this.$reqPost('deleteHistoric', { ids: this.procInstId }, 'form').then(res => {
+				if (res.code == 0) {
+					this.$u.toast('鎿嶄綔鎴愬姛锛�');
 					this.yibanData = [];
 					this.doneList(); // 鎴戠殑宸插姙
 				} else {
-					this.$u.toast('鎿嶄綔澶辫触锛侊紒锛�')
+					this.$u.toast('鎿嶄綔澶辫触锛侊紒锛�');
 				}
-			})
-			
+			});
 		},
 		deleteApplicationModalCancel() {
 			this.deleteApplicationModalShow = false;
@@ -573,90 +745,105 @@
 			});
 		},
 		// 琛ㄥ崟鏁版嵁
-		theFormDataClick(v) {
-			uni.navigateTo({
-				url: `/pages/the-form-data/the-form-data?index=${v}`
-			});
+		// theFormDataClick(item) {
+    //   console.log(item,'鐢宠杩樻槸-----item')
+		// 	// uni.navigateTo({
+		// 	// 	url: `/pages/the-form-data/the-form-data?index=${v}`
+		// 	// });
+    //
+		// },
+		// 鍒犻櫎鎾ゅ洖鐢宠
+		deleteWithDrawApplication(id) {
+			this.deleteWithDrawApplicationGlobal(id)
+				.then(res => {
+					if (res.code == 0) {
+						// 鍒锋柊鍒楄〃
+						this.getProcessDataList();
+					}
+				})
+				.catch(err => {
+					console.log('鍒犻櫎鎾ゅ洖鐢宠寮傚父');
+				});
 		},
 		// 閲嶆柊鐢宠
-		apply(v){
-			if (!v.procDefId || v.procDefId == 'null') {
-				this.$u.toast('娴佺▼瀹氫箟涓虹┖');
-				return;
-			}
-			this.form.id = v.id;
-			this.form.procDefId = v.procDefId;
-			this.form.title = v.title;
-			// 鍔犺浇瀹℃壒浜�
-			// this.userLoading = true;
-			uni.showLoading({
-				title: '瀹℃壒浜哄姞杞戒腑'
-			});
-			// getFirstNode(v.procDefId).then((res) => {
-			this.$reqGet('getFirstNode', {}, v.procDefId).then(res => {
-				// this.userLoading = false;
-				console.log('瀹℃壒浜�', res);
-				uni.hideLoading();
-				if (res.data) {
-					this.error = '';
-					if (res.data.type == 3 || res.data.type == 4) {
-						this.isGateway = true;
-						this.form.firstGateway = true;
-						this.showAssign = false;
-						this.isCustom = false;
-						return;
-					}
-					if (res.data.type == 5) {
-						this.isCustom = true;
-						this.isGateway = false;
-						this.form.firstGateway = false;
-						this.showAssign = false;
-						return;
-					}
-					if (res.data.type == 1) {
-						this.showAssign = true;
-						this.isGateway = false;
-						this.form.firstGateway = false;
-						this.isCustom = false;
-						if (res.data.users && res.data.users.length > 0) {
-							this.assigneeList = res.data.users;
-							// 榛樿鍕鹃��
-							let ids = [];
-							res.data.users.forEach(e => {
-								ids.push(e.userId);
-							});
-							this.form.assignees = ids;
-							this.showAssign = true;
-							// 鑾峰彇琛ㄥ崟鍐呭锛岄噸鏂板垱寤虹敵璇�
-							this.$reqPost('apply',this.form,'form').then(res=>{
-								console.log('閲嶆柊鎻愪氦鐢宠',res);
-								if(res.code == 0){
-									uni.showToast({
-										title:res.data,
-										icon:'success',
-										duration:2000	
-									});
-								}
-								// 鍒濆鍖栫敵璇峰垪琛�
-								// this.myApplication.pageNumber = 1;
-								// this.shenqingData = [];
-								// this.getMoreNews();
-								this.getProcessDataList();
-							})
-						} else {
-							this.form.assignees = [];
-							this.showAssign = true;
-							this.error = '璇疯繘鍏�"娴佺▼绠$悊"涓哄鎵硅妭鐐瑰垎閰嶅�欓�夊鎵逛汉鍛�';
-						}
-					}
-				}
-				console.log(this.form);
-			});
-			
-			this.modalVisible = true;
-		},
+		// apply(v) {
+		// 	if (!v.procDefId || v.procDefId == 'null') {
+		// 		this.$u.toast('娴佺▼瀹氫箟涓虹┖');
+		// 		return;
+		// 	}
+		// 	this.form.id = v.id;
+		// 	this.form.procDefId = v.procDefId;
+		// 	this.form.title = v.title;
+		// 	// 鍔犺浇瀹℃壒浜�
+		// 	// this.userLoading = true;
+		// 	uni.showLoading({
+		// 		title: '瀹℃壒浜哄姞杞戒腑'
+		// 	});
+		// 	// getFirstNode(v.procDefId).then((res) => {
+		// 	this.$reqGet('getFirstNode', {}, v.procDefId).then(res => {
+		// 		// this.userLoading = false;
+		// 		console.log('瀹℃壒浜�', res);
+		// 		uni.hideLoading();
+		// 		if (res.data) {
+		// 			this.error = '';
+		// 			if (res.data.type == 3 || res.data.type == 4) {
+		// 				this.isGateway = true;
+		// 				this.form.firstGateway = true;
+		// 				this.showAssign = false;
+		// 				this.isCustom = false;
+		// 				return;
+		// 			}
+		// 			if (res.data.type == 5) {
+		// 				this.isCustom = true;
+		// 				this.isGateway = false;
+		// 				this.form.firstGateway = false;
+		// 				this.showAssign = false;
+		// 				return;
+		// 			}
+		// 			if (res.data.type == 1) {
+		// 				this.showAssign = true;
+		// 				this.isGateway = false;
+		// 				this.form.firstGateway = false;
+		// 				this.isCustom = false;
+		// 				if (res.data.users && res.data.users.length > 0) {
+		// 					this.assigneeList = res.data.users;
+		// 					// 榛樿鍕鹃��
+		// 					let ids = [];
+		// 					res.data.users.forEach(e => {
+		// 						ids.push(e.userId);
+		// 					});
+		// 					this.form.assignees = ids;
+		// 					this.showAssign = true;
+		// 					// 鑾峰彇琛ㄥ崟鍐呭锛岄噸鏂板垱寤虹敵璇�
+		// 					this.$reqPost('apply', this.form, 'form').then(res => {
+		// 						console.log('閲嶆柊鎻愪氦鐢宠', res);
+		// 						if (res.code == 0) {
+		// 							uni.showToast({
+		// 								title: res.data,
+		// 								icon: 'success',
+		// 								duration: 2000
+		// 							});
+		// 						}
+		// 						// 鍒濆鍖栫敵璇峰垪琛�
+		// 						// this.myApplication.pageNumber = 1;
+		// 						// this.shenqingData = [];
+		// 						// this.getMoreNews();
+		// 						this.getProcessDataList();
+		// 					});
+		// 				} else {
+		// 					this.form.assignees = [];
+		// 					this.showAssign = true;
+		// 					this.error = '璇疯繘鍏�"娴佺▼绠$悊"涓哄鎵硅妭鐐瑰垎閰嶅�欓�夊鎵逛汉鍛�';
+		// 				}
+		// 			}
+		// 		}
+		// 		console.log(this.form);
+		// 	});
+
+		// 	this.modalVisible = true;
+		// },
 		// 淇敼
-		editMyApplication(v){
+		editMyApplication(v) {
 			console.log('淇敼鐢宠');
 			uni.navigateTo({
 				url: `/pages/edit-my-application/edit-my-application?index=${v.tableId}`
@@ -668,47 +855,102 @@
 				url: `/pages/approval-history/approval-history?index=${v}`
 			});
 		},
-		// 鍒犻櫎鐢宠
-		deleteApplicationClick(id) {
-			this.deleteApplicationModalShow = true;
-			this.procInstId = id;
-			console.log(id);
+		redirectLogin() {
+			redirectLogin();
+		},
+		huanBang() {
+			uni.navigateTo({
+				url: '/pages/register/register'
+			});
 		}
 	}
 };
 </script>
 
+
 <style lang="scss" scoped>
 ::v-deep.home {
-	height: 100%;
 	width: 100%;
+	display: flex;
+	flex-direction: column;
+
+	// 妯悜鑿滃崟鏍�
+	.utils {
+		.utils-container {
+			display: flex;
+			// justify-content: space-between;
+			justify-content: center;
+			width: 66%;
+			margin: 0 auto;
+			.utils-container-body {
+				display: flex;
+				align-items: center;
+			}
+		}
+	}
+
 	.home_swipe {
-	  width: 100%;
-	  .u-swiper {
-	   height: vww(160) !important;
-	   .u-swiper__wrapper {
-	    height: vww(160) !important;
-	    .u-swiper__wrapper__item {
-	     .u-swiper__wrapper__item__wrapper {
-	      .u-swiper__wrapper__item__wrapper__image {
-	       height: vww(160) !important;
-	      }
-	     }
-	    }
-	   }
-	  }
-	 }
+		width: 100%;
+
+		.u-swiper {
+			height: vww(160) !important;
+
+			.u-swiper__wrapper {
+				height: vww(160) !important;
+
+				.u-swiper__wrapper__item {
+					.u-swiper__wrapper__item__wrapper {
+						.u-swiper__wrapper__item__wrapper__image {
+							height: vww(160) !important;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	// echarts鍥捐〃
+	.charts-box {
+		width: 91%;
+		height: vww(270);
+		margin: 0 auto;
+		.u-empty {
+			height: 100%;
+		}
+	}
+
+	.u-input {
+		height: vww(16);
+		width: vww(100);
+	}
+
+	//鍗$墖
+	.card-group {
+		.card {
+			&:nth-of-type(2) {
+				.combination-card {
+					margin-bottom: 0px !important;
+				}
+			}
+		}
+	}
+	.bottomChild {
+		margin-bottom: vww(20);
+	}
 
 	// 鍗$墖涓棿
 	.center-container {
 		display: flex;
 		flex-direction: column;
+
 		.center-content__one {
 			display: flex;
+
 			view {
 				width: 50%;
 			}
 		}
+
 		.center-content__two {
 			display: flex;
 			// margin: vww(10) 0;
@@ -716,15 +958,19 @@
 				width: 50%;
 			}
 		}
+
 		.center-content__three {
 			display: flex;
+
 			view {
 				width: 50%;
 			}
 		}
+
 		.center-content__four {
 		}
 	}
+
 	// 涓棿閮ㄥ垎鏍峰紡
 	.center-margin {
 		margin-bottom: vww(16);
@@ -735,14 +981,17 @@
 		.bottom-content__item {
 			display: flex;
 			justify-content: space-around;
+
 			view {
 				display: flex;
 				justify-content: center;
 				align-content: center;
 				margin-right: vww(10);
+
 				view {
 					display: inline-block;
 				}
+
 				image {
 					width: vww(16);
 					height: vww(16);
@@ -760,6 +1009,7 @@
 			.u-textarea {
 				width: vww(280);
 				height: vww(90) !important;
+
 				.uni-textarea-wrapper {
 					height: vww(90) !important;
 				}
@@ -772,21 +1022,25 @@
 		// width:100%;
 		// height:vww(244);
 		.slot-content {
+			width: vww(330);
 			.rejectMesaage {
 				display: flex;
 				padding: vww(3);
 				border: 1px solid #0307ff;
 				border-radius: vww(4);
 				font-size: 13px;
+
 				text {
 					margin-left: vww(5);
 				}
 			}
+
 			.u-textarea {
 				margin-top: vww(10);
 				width: vww(280);
 				height: vww(90) !important;
-				.uni-textarea-wrapper {
+
+				.u-textarea__field {
 					height: vww(90) !important;
 				}
 			}
@@ -803,24 +1057,29 @@
 				border: 1px solid #0307ff;
 				border-radius: vww(4);
 				font-size: 13px;
+
 				text {
 					margin-left: vww(5);
 				}
 			}
+
 			.u-textarea {
 				margin-top: vww(10);
 				width: vww(280);
 				height: vww(90) !important;
-				.uni-textarea-wrapper {
+
+				.u-textarea__field {
 					height: vww(90) !important;
 				}
 			}
 
 			.rejectBack {
 				margin-top: vww(24);
+
 				.rejectBack-title {
 					font-size: vww(13);
 				}
+
 				// 涓嬫媺鑿滃崟
 				.data-selet {
 					border: 1px solid #d1d1d1;
@@ -832,15 +1091,18 @@
 					font-size: 13px;
 					color: #666;
 					margin-top: vww(8);
+
 					.uni-select__icon {
 						display: flex;
 						align-content: center;
 						margin: 0 10px;
+
 						image {
 							width: 10px;
 							height: 5.5px;
 						}
 					}
+
 					.content {
 						margin-left: vww(8);
 						width: vww(280);
@@ -849,5 +1111,52 @@
 			}
 		}
 	}
+
+	//鏃ュ彂杩愯鍒�
+	.main-block-box {
+		// box-shadow: 0px 0px 8px 0px rgba(216,218,238,0.80);
+		height: vww(80);
+		// padding: vww(10);
+		box-sizing: border-box;
+		margin-top: vww(12);
+		border-radius: vww(8);
+
+		&:first-child {
+			margin-top: vww(5);
+		}
+
+		.jihua-main-line {
+			width: 100%;
+			display: flex;
+
+			view {
+				font-size: vww(14);
+			}
+
+			.name {
+				font-weight: 600 !important;
+			}
+
+			.main-flex {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+
+				view {
+					font-size: vww(14);
+					line-height: vww(32);
+				}
+
+				.carNum-box {
+					display: flex;
+
+					view {
+						font-size: vww(14);
+						line-height: vww(32);
+					}
+				}
+			}
+		}
+	}
 }
 </style>

--
Gitblit v1.9.1