From 98233cafe4b4942d537c4ad566b714cff0388dcf Mon Sep 17 00:00:00 2001
From: zhangxiaoxu <819527061@qq.com>
Date: 星期三, 14 一月 2026 10:00:59 +0800
Subject: [PATCH] 字段修改

---
 pages/home/home.vue | 1951 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 1,535 insertions(+), 416 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 0c69672..2e7ff38 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -2,235 +2,477 @@
 	<view class="home">
 		<!-- 杞挱鍥� -->
 		<view class="home_swipe"><u-swiper :list="list3" indicator indicatorMode="line" circular></u-swiper></view>
+
+		<!-- 鍥捐〃 -->
+		<combined-title v-if="uchartsData && uchartsData.length > 0" title="鐓や粨搴撳瓨鏄庣粏"></combined-title>
+		<view class="charts-box" v-if="uchartsData && uchartsData.length > 0">
+			<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>
+
+
+    <view class="huoshiju-box" v-if="roles && roles.includes(2000144)">
+      <!-- 浜у搧褰撳墠浠锋牸 -->
+      <view class="price-group" v-if="coalData && coalData.length > 0">
+        <combined-title title="浜у搧褰撳墠浠锋牸"></combined-title>
+        <view class="price-box">
+          <div class="price-box-inside">
+            <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" >
+              <uni-tr>
+                <uni-th width="100" align="center">鐓ょ</uni-th>
+                <uni-th width="100" align="center">闀垮崗鎴�(鍏�)</uni-th>
+                <uni-th width="100" align="center">鏅�氭埛(鍏�)</uni-th>
+              </uni-tr>
+              <uni-tr v-for="(item,index) in coalData" :key="index">
+                <uni-td align="left">{{item.coalName}}</uni-td>
+                <uni-td align="center">{{item.price1 || ''}}</uni-td>
+                <uni-td align="center">{{item.price2 || ''}}</uni-td>
+              </uni-tr>
+            </uni-table>
+<!--            <view class="price-line">
+              <view class="name">涓叅</view>
+              <view class="price"><view class="priceNum">344</view><view class="priceUnit">鍏�</view></view>
+            </view>
+            <view class="price-line">
+              <view class="name">涓叅</view>
+              <view class="price"><view class="priceNum">344</view><view class="priceUnit">鍏�</view></view>
+            </view>
+            <view class="price-line">
+              <view class="name">涓叅</view>
+              <view class="price"><view class="priceNum">344</view><view class="priceUnit">鍏�</view></view>
+            </view>
+            <view class="price-line">
+              <view class="name">涓叅</view>
+              <view class="price"><view class="priceNum">344</view><view class="priceUnit">鍏�</view></view>
+            </view>-->
+          </div>
+
+        </view>
+      </view>
+      <!-- 褰撴棩鏀舵鎯呭喌 -->
+      <view class="shoukuan-group" v-if="shoukuanJiluTemp && shoukuanJiluTemp.length > 0">
+        <view class="currentDay-box">
+          <combined-title title="褰撴棩鏀舵鎯呭喌">
+          </combined-title>
+          <view class="total-box">
+            <view class="total1">灏忚:</view>
+            <view class="total2">{{shoukuanToatl}}
+              <view class="small">鍏�</view>
+            </view>
+          </view>
+        </view>
+        <view class="shoukuan-box">
+          <div class="shoukuan-box-inside">
+            <view class="shoukuan-main" v-for="(item,index) in shoukuanJilu" :key="index">
+              <view class="shoukuan-line shoukuanFirst-line">
+                <view class="text1">{{item.customerName || ''}}</view>
+              </view>
+              <view class="shoukuan-line">
+                <view class="name">閲戦锛�</view>
+                <view class="text1 num">{{item.money || ''}}
+                   <view class="small">鍏�</view>
+                </view>
+              </view>
+              <view class="shoukuan-line">
+                <view class="name">璐﹀锛�</view>
+                <view class="text1">{{item.ledgerName || ''}}</view>
+              </view>
+            </view>
+            <view v-if="shoukuanJiluTemp && shoukuanJiluTemp.length > 2" class="shouqiIcon" @click="handleShouKuanIsMore">
+              <image v-if="!shoukuanIsMore" src="@/static/home/xialaIcon.png"></image>
+              <image v-else src="@/static/home/shouqiIcon.png"></image>
+            </view>
+          </div>
+        </view>
+      </view>
+      <!-- 鐓ょ鍙戣繍鎯呭喌 -->
+      <view class="shoukuan-group" v-if="coalTongjiTemp && coalTongjiTemp.length > 0">
+        <view class="currentDay-box">
+          <combined-title title="鐓ょ鍙戣繍鎯呭喌">
+          </combined-title>
+        </view>
+        <view class="shoukuan-box">
+          <view class="coalFayun-total">
+            <view class="total-block">
+              <view class="num">{{d2Sum || 0}}</view>
+              <view class="name">鎬昏閲戦(鍏�)</view>
+            </view>
+            <view class="total-block">
+              <view class="num">{{dsumSum || 0}}</view>
+              <view class="name">姹借繍鎬昏(鍚�)</view>
+            </view>
+            <view class="total-block">
+              <view class="num">{{lyDSumSum || 0}}</view>
+              <view class="name">璺繍鎬昏(鍚�)</view>
+            </view>
+            <view class="total-block">
+              <view class="num">{{d1Sum || 0}}</view>
+              <view class="name">鎬诲惃鏁�(鍚�)</view>
+            </view>
+          </view>
+          <div class="shoukuan-box-inside">
+            <view class="shoukuan-main" v-for="(item,index) in coalTongji" :key="index">
+              <view class="shoukuan-line shoukuanFirst-line">
+                <view class="text1">{{item.coalName}}</view>
+              </view>
+              <view class="shoukuan-line">
+                <view class="name">璐﹀锛�</view>
+                <view class="text1">{{item.ledgerName || ''}}</view>
+              </view>
+              <view class="coalTongji-box">
+                <view class="shoukuan-line">
+                  <view class="name">鍗曚环锛�</view>
+                  <view class="text1 num">
+                    {{item.d3 || 0}}
+                    <view class="small">鍏�</view>
+                  </view>
+                </view>
+                <view class="shoukuan-line">
+                  <view class="name">閲戦锛�</view>
+                  <view class="text1 num">
+                    {{item.d2 || 0}}
+                    <view class="small">鍏�</view>
+                  </view>
+                </view>
+              </view>
+              <view class="coalTongji-box marginTop">
+                <view class="caol-block">
+                  <view class="name">鏃ユ苯杩愰噺(鍚�)</view>
+                  <view class="num">{{item.dSum || 0}}</view>
+                </view>
+                <view class="caol-block">
+                  <view class="name">鏃ヨ矾杩愰噺(鍚�)</view>
+                  <view class="num">{{item.lyDSum || 0}}</view>
+                </view>
+                <view class="caol-block">
+                  <view class="name">鏃ュ悎璁�(鍚�)</view>
+                  <view class="num">{{item.d1 || 0}}</view>
+                </view>
+              </view>
+            </view>
+            <view class="shouqiIcon"  v-if="coalTongjiTemp && coalTongjiTemp.length > 2" @click="handleCoalIsMore">
+              <image v-if="!coalShowIsMore" src="@/static/home/xialaIcon.png"></image>
+              <image v-else src="@/static/home/shouqiIcon.png"></image>
+            </view>
+          </div>
+
+        </view>
+      </view>
+      <!-- 鍒嗗鎴风叅绉嶅彂杩愭儏鍐� -->
+      <view class="shoukuan-group" v-if="kehuTongjiTemp && kehuTongjiTemp.length > 0">
+        <view class="currentDay-box">
+          <combined-title title="鍒嗗鎴风叅绉嶅彂杩愭儏鍐�">
+          </combined-title>
+        </view>
+
+        <view class="shoukuan-box">
+          <div class="shoukuan-box-inside">
+            <view class="shoukuan-main" v-for="(item,index) in kehuTongji" :key="index">
+              <view class="shoukuan-line">
+<!--                <view class="name">瀹㈡埛锛�</view>-->
+                <view class="text1">{{item.customerName}}</view>
+<!--                <view class="meizhong">
+                  <view class="coal">{{item.coalName}}</view>
+                </view>-->
+              </view>
+              <view class="shoukuan-line coal-line">
+                <view class="coal" v-if="item.coalName">{{item.coalName}}</view>
+                <view class="coal" v-if="item.type">{{item.type || ''}}</view>
+                <view class="coal" v-if="item.carSize">{{item.carSize || ''}}杞�</view>
+              </view>
+              <view class="shoukuan-line">
+                <view class="name">璐﹀锛�</view>
+                <view class="text1">{{item.ledgerName}}</view>
+              </view>
+<!--              <view class="coalTongji-box">
+                <view class="shoukuan-line kehu-block">
+                  <view class="name">杞︽暟锛�</view>
+                  <view class="text1 num">{{item.carSize || ''}}</view>
+                </view>
+                <view class="shoukuan-line kehu-block">
+                  <view class="name">鏂瑰紡锛�</view>
+                  <view class="text1 num">{{item.type || ''}}</view>
+                </view>
+&lt;!&ndash;                <view class="shoukuan-line kehu-block">
+                  <view class="name">鐓ょ锛�</view>
+                  <view class="text1">{{item.coalName}}</view>
+                </view>&ndash;&gt;
+              </view>-->
+              <view class="coalTongji-box marginTop">
+                <view class="caol-block">
+                  <view class="name">鍙戣繍閲�(鍚�)</view>
+                  <view class="num">{{item.executive || 0}}</view>
+                </view>
+                <view class="caol-block">
+                  <view class="name">鍗曚环(鍏�)</view>
+                  <view class="num">{{item.coalPrice || 0}}</view>
+                </view>
+                <view class="caol-block">
+                  <view class="name">閲戦(鍏�)</view>
+                  <view class="num">{{item.amount || 0}}</view>
+                </view>
+              </view>
+            </view>
+            <view class="shouqiIcon" v-if="kehuTongjiTemp && kehuTongjiTemp.length > 2" @click="handlekehuTongjiShowIsMore">
+              <image v-if="!kehuTongjiShowIsMore" src="@/static/home/xialaIcon.png"></image>
+              <image v-else src="@/static/home/shouqiIcon.png"></image>
+            </view>
+          </div>
+
+        </view>
+      </view>
+    </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 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>
+				</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>
+								<text>鎵�灞炴祦绋嬶細{{ item.processName || '' }}</text>
+							</view>
 						</view>
-						<view>
-							<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
+						<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 class="center-content__two center-margin">
-						<view>
-							<text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
-						</view>
-						<view>
-							<text>瀹℃壒鎿嶄綔锛歿{ item.deleteReason }}</text>
+				</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>
-					<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>
+				</template>
+			</combination-card>
+		</view>
+
+		<!-- 鏃ヨ鍒� -->
 		<combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua"></combined-title>
-		<combination-card :showTop="false"  v-for="(item,index) in fyData.slice(0,2)" :key="item.id">
-			  <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 class="card-group bottomChild">
+			<combination-card class="card" :showTop="false" v-for="(item, index) in fyData.slice(0, 2)" :key="item.id">
+				<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 +499,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 +527,231 @@
 		<!-- <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="editorPass" @click="handlePwd">
+        <image class="icon" src="@/static/home/editorIcon.png"></image>
+        <view class="">淇敼瀵嗙爜</view>
+    </view>
+    <view class="huiseBox"></view>
+		<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 class="passWord-main-box">
+      <u-popup :show="passShow"
+               :closeable="true"
+               :closeOnClickOverlay="true"
+               @close="handleClosePassShow"
+               mode="center"
+               width="90%"
+               class="passBox">
+        <view class="popup-box">
+          <u-form :model="formData" ref="uForm" borderBottom :rules="rules" :label-width="150">
+            <u-form-item prop="password" label="鍘熷瘑鐮�" borderBottom>
+              <u-input
+                  class="flex-1"
+                  type="password"
+                  v-model="formData.password"
+                  :border="false"
+                  placeholder="璇疯緭鍏ュ師鏉ョ殑瀵嗙爜"
+              />
+            </u-form-item>
+            <u-form-item prop="newpassword1" label="鏂板瘑鐮�" borderBottom>
+              <u-input
+                  class="flex-1"
+                  type="password"
+                  v-model="formData.newpassword1"
+                  placeholder="瀵嗙爜搴旂敱8-16浣嶆暟瀛椼�佸瓧姣嶃�佺鍙风粍鎴愩�傝涓嶈浣跨敤瀹规槗琚寽鍒扮殑瀵嗙爜"
+                  :border="false"
+              />
+            </u-form-item>
+            <view class="intensity">
+              <view class="psdText">瀵嗙爜寮哄害</view>
+              <view
+                  class="line"
+                  :class="[level.includes('low') ? 'low' : '']"></view>
+              <view
+                  class="line"
+                  :class="[level.includes('middle') ? 'middle' : '']"></view>
+              <view
+                  class="line"
+                  :class="[level.includes('high') ? 'high' : '']"></view>
+              <div class="warningtext">
+                瀵嗙爜搴旂敱8-16浣嶆暟瀛椼�佸瓧姣嶃�佺鍙风粍鎴愩�傝涓嶈浣跨敤瀹规槗琚寽鍒扮殑瀵嗙爜
+              </div>
+            </view>
+            <u-form-item prop="newpassword2" label="纭瀵嗙爜" borderBottom>
+              <u-input
+                  class="flex-1"
+                  type="password"
+                  v-model="formData.newpassword2"
+                  placeholder="鍐嶆杈撳叆鏂板瘑鐮�"
+                  :border="false"
+              />
+            </u-form-item>
+          </u-form>
+          <view class="sumbmit-box">
+            <u-button type="primary" shape="circle" @click="handlePassConfirm" :loading="sumbLoading"> 纭畾 </u-button>
+          </view>
+        </view>
+      </u-popup>
+    </view>
 	</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';
+import UText from "../../uni_modules/uview-ui/components/u-text/u-text.vue";
+
 export default {
 	name: 'home',
+	onLaunch() {
+		let that = this;
+		uni.addInterceptor('redirectTo', {
+			//鐩戝惉鍏抽棴鏈〉闈㈣烦杞�
+			success(e) {
+				that.watchRouter();
+			}
+		});
+	},
+	computed: {
+		rijihuaMenu() {
+      console.log(this.$store.state.rijihuaMenu,'this.$store.state.rijihuaMenu==============',this.$store.state)
+			return this.$store.state.rijihuaMenu;
+		},
+		shenqingMenu() {
+			return this.$store.state.shenqingMenu;
+		}
+	},
 	data() {
+    const validatePass = (rule, value, callback) => {
+      if (this.formData.newpassword1 !== "") {
+        if (value !== this.formData.newpassword1) {
+          callback(new Error("涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!"));
+        } else {
+          callback();
+        }
+      } else {
+        callback();
+      }
+    };
+    const checkPassword = (rule, value, callback) => {
+      // let roles = this.$store.getters.roles;//褰撳墠鐢ㄦ埛瑙掕壊id
+      // let passL = 8;
+      // if (roles.concat(1)){
+      //   passL = 10
+      // }
+      let passL = 8;
+      this.level = []
+      if(!value) {
+        return callback('瀵嗙爜涓嶈兘涓虹┖')
+      }
+      if(value.length < passL) {
+        return callback(`瀵嗙爜涓嶈兘灏戜簬${passL}浣峘)
+      }
+      if(value.length > 16) {
+        return callback('瀵嗙爜涓嶈兘澶т簬16浣�')
+      }
+      //鏍¢獙鏄暟瀛�
+      const regex1 = /^\d+$/
+      // 鏍¢獙瀛楁瘝
+      const regex2 = /^[A-Za-z]+$/
+      // 鏍¢獙绗﹀彿
+      const regex3 =
+          /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�乚+$/
+      if(regex1.test(value)) {
+        this.level.push('low')
+        return callback('瀵嗙爜寮哄害杩囦綆')
+      }else if(regex2.test(value)) {
+        this.level.push('low')
+        return callback('瀵嗙爜寮哄害杩囦綆')
+      }else if(regex3.test(value)) {
+        this.level.push('low')
+        return callback('瀵嗙爜寮哄害杩囦綆')
+      }else if(/^[A-Za-z\d]+$/.test(value)) {
+        this.level.push('low')
+        this.level.push('middle')
+        return callback('瀵嗙爜寮哄害杩囦綆')
+      }else if(
+          /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�乗d]+$/.test(
+              value
+          )
+      ) {
+        this.level.push('low')
+        this.level.push('middle')
+        return callback('瀵嗙爜寮哄害杩囦綆')
+      }else if(
+          /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�丄-Za-z]+$/.test(
+              value
+          )
+      ) {
+        this.level.push('low')
+        this.level.push('middle')
+        return callback('瀵嗙爜寮哄害杩囦綆')
+      } else if (
+          /^[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]路~锛丂#锟�%鈥︹��&*锛堬級鈥斺�擻-+={}|銆娿�嬶紵锛氣�溾�濄�愩�戙�侊紱鈥�'锛屻�傘�丄-Za-z\d]+$/.test(
+              value
+          )
+      ) {
+        this.level.push('low')
+        this.level.push('middle')
+        this.level.push('high')
+      }
+      return callback()
+    };
 		return {
+      level:[],
+			// 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 +781,23 @@
 			// 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 +818,349 @@
 			haveTodoParams: {
 				pageNumber: 1,
 				pageSize: 2,
-				sort: 'createTime',
-				order: 'desc'
-			}
+				// sort: 'createTime',
+				// order: 'desc'
+			},
+      coalData:[],
+      shoukuanJilu:[],
+      shoukuanJiluTemp:[],
+      shoukuanIsMore:false,  //
+      shoukuanToatl:0,
+      coalTongji:[], //鐓ょ缁熻
+      coalTongjiTemp:[], //鐓ょ缁熻
+      coalShowIsMore: false,
+      kehuTongji:[], //鐓ょ缁熻
+      kehuTongjiTemp:[], //鐓ょ缁熻
+      kehuTongjiShowIsMore: false,
+      roles:[],
+      d2Sum:0,  //鎬昏閲戦
+      d1Sum:0,  //鎬昏
+      lyDSumSum:0,  //璺繍
+      dsumSum:0,  //姹借繍
+      passShow: false,  //瀵嗙爜寮规
+      sumbLoading: false,
+      formData: {
+        password:'',
+        newpassword1:'',
+        newpassword2:'',
+      },
+      rules: {
+        password: [{
+          type: 'string',
+          required: true,
+          message: '璇峰~鍐欏瘑鐮�',
+          trigger: ['blur', 'change']
+        }],
+        newpassword1: [{
+          required: true,
+          validator: checkPassword,
+          trigger: 'change'
+        }],
+        newpassword2: [{
+          required: true,
+          validator: validatePass,
+          trigger: "blur"
+        }]
+      }
 		};
+	},
+	// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
+	onReady() {
+    this.$refs.uForm.setRules(this.rules)
 	},
 	// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
 	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: {
+    UText,
 		combinedTitle,
-		combinationCard,
-		popupMenu
+		combinationCard
+		// popupMenu
 	},
+  watch: {
+    shoukuanIsMore: {
+      handler(newVal,oldVal) {
+        let temp = newVal.toString() || ''
+        if(this.shoukuanJiluTemp && this.shoukuanJiluTemp.length > 0) {
+          if(temp == 'false') {
+            this.shoukuanJilu = this.shoukuanJiluTemp.slice(0,2)
+            console.log(this.shoukuanJilu,'this.shoukuanJilu------鏀舵鎯呭喌')
+            this.coalShowIsMore = false
+          }else if(temp == 'true') {
+            this.shoukuanJilu = this.shoukuanJiluTemp
+            this.coalShowIsMore = true
+          }
+        }
+      },
+      immediate: true,
+      deep: true
+    },
+    coalShowIsMore: {
+      handler(newVal,oldVal) {
+        let temp = newVal.toString() || ''
+        if(this.coalTongjiTemp && this.coalTongjiTemp.length > 0) {
+          if(temp == 'false') {
+            this.coalTongji = this.coalTongjiTemp.slice(0,2)
+            this.coalShowIsMore = false
+          }else if(temp == 'true') {
+            this.coalTongji = this.coalTongjiTemp
+            this.coalShowIsMore = true
+          }
+        }
+      },
+      immediate: true,
+      deep: true
+    },
+    kehuTongjiShowIsMore: {
+      handler(newVal,oldVal) {
+        let temp = newVal.toString() || ''
+        if(this.kehuTongjiTemp && this.kehuTongjiTemp.length > 0) {
+          if(temp == 'false') {
+            this.kehuTongji = this.kehuTongjiTemp.slice(0,2)
+            this.kehuTongjiShowIsMore = false
+          }else if(temp == 'true') {
+            this.kehuTongji = this.kehuTongjiTemp
+            this.kehuTongjiShowIsMore = true
+          }
+        }
+      },
+      immediate: true,
+      deep: true
+    },
+  },
 	methods: {
-		getUserInfo() {
-			this.$reqGet('getUserInfo').then(res => {
-				if (res.code == 0) {
-					uni.setStorageSync('userInfo', res.data.sysUser);
-				}
-			});
+    handlePassConfirm() { //淇敼瀵嗙爜
+      //鍒楄〃鏌ヨ
+      this.$refs.uForm.validate().then(res => {
+        this.sumbLoading = true
+        uni.showLoading({
+          title: '姝e湪鍔犺浇...'
+        });
+        this.formData.deptId = uni.getStorageSync('userInfo')?.deptId
+        this.formData.username = uni.getStorageSync('userInfo')?.username
+        this.$reqPut('editInfo',this.formData).then(res => {
+          if (res.code == 0) {
+            this.passShow = false
+            this.sumbLoading = false
+            this.$u.toast('淇敼瀵嗙爜鎴愬姛!');
+            setTimeout(() => {
+              uni.reLaunch({
+                url:"/pages/login/login"
+              })
+            }, 1000)
+            uni.hideLoading();
+          }else {
+            this.$u.toast(res.msg || '淇敼瀵嗙爜澶辫触');
+            this.sumbLoading = false
+            uni.hideLoading();
+          }
+        })
+      })
+
+    },
+    handleClosePassShow() {
+      this.passShow = false
+    },
+    handlePwd() {
+      this.passShow = true
+    },
+    handleShouKuanIsMore() {  //褰撴棩鏀舵鎯呭喌
+      this.shoukuanIsMore = !this.shoukuanIsMore
+    },
+    handleCoalIsMore() {  //鐓ょ鍙戣繍鎯呭喌
+      this.coalShowIsMore = !this.coalShowIsMore
+    },
+    handlekehuTongjiShowIsMore() {  //鐓ょ鍙戣繍鎯呭喌
+      this.kehuTongjiShowIsMore = !this.kehuTongjiShowIsMore
+    },
+		watchRouter() {
+			console.log('璺敱璺宠浆');
 		},
 		init() {
-			this.getUserInfo();
+			this.getUserInfo(); // 鐢ㄦ埛淇℃伅
 			this.getProcessDataList(); // 鐢宠鍒楄〃
 			this.todoList(); // 鎴戠殑寰呭姙
 			this.doneList(); // 鎴戠殑宸插姙
-			this.xscarshippingdayplan();  //鏃ヨ鍒�
+			this.xscarshippingdayplan(); // 鏃ヨ鍒�
+      this.currentCoalPrice()  //鐓ょ浠锋牸
+      this.getSkList()  //褰撳ぉ鏀舵璁板綍
+      this.getStatistics1()   //鎸夌叅绉嶇粺璁�
+      this.getStatistics2()   //鎸夊鎴峰彂杩愮粺璁�
 		},
-		xscarshippingdayplan(allList) { //宸茬粡璁剧疆鐨�
-		console.log(allList,'allList==========')
+    //鐓ょ浠锋牸
+    currentCoalPrice() {
+      this.$reqGet('currentCoalPrice').then(res => {
+        console.log(res.data,'res.data')
+        if (res.code == 0) {
+           this.coalData = res.data || []
+        }
+      })
+    },
+    getSkList() {  //褰撳ぉ鏀舵璁板綍
+      this.$reqGet('getSkList').then(res => {
+        if (res.code == 0) {
+          this.shoukuanJiluTemp = res.data || []
+          if(this.shoukuanJiluTemp && this.shoukuanJiluTemp.length > 0) {
+            this.shoukuanToatl = this.shoukuanJiluTemp[0]?.money2 || 0
+            if(this.shoukuanJiluTemp.length > 0) {
+              this.shoukuanJilu = this.shoukuanJiluTemp.slice(0,2)
+              this.shoukuanIsMore = false
+            }
+          }
+        }
+      })
+    },
+    getStatistics1() {  //鎸夌叅绉嶇粺璁�
+      this.$reqGet('getStatistics1').then(res => {
+        if (res.code == 0) {
+          this.coalTongjiTemp = res.data || []
+          if(this.coalTongjiTemp && this.coalTongjiTemp.length > 0){
+            this.d2Sum = this.coalTongjiTemp[0]?.d2Sum || 0
+            this.d1Sum = this.coalTongjiTemp[0]?.d1Sum || 0
+            this.lyDSumSum = this.coalTongjiTemp[0]?.lyDSumSum || 0
+            this.dsumSum = this.coalTongjiTemp[0]?.dsumSum || 0
+            if(this.coalTongjiTemp.length > 0) {
+              this.coalTongji = this.coalTongjiTemp.slice(0,2)
+              this.coalShowIsMore = false
+            }
+          }
+        }
+      })
+    },
+    getStatistics2() {  //鎸夊鎴峰彂杩愮粺璁�
+      this.$reqGet('getStatistics2').then(res => {
+        if (res.code == 0) {
+          this.kehuTongjiTemp = res.data || []
+          if(this.kehuTongjiTemp && this.kehuTongjiTemp.length > 0){
+            if(this.kehuTongjiTemp.length > 0) {
+              this.kehuTongji = this.kehuTongjiTemp.slice(0,2)
+              this.kehuTongjiShowIsMore = false
+            }
+          }
+        }
+      })
+    },
+    //浠e姙璇︽儏
+    daibanDetail(item) {
+      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.roles = res.data?.roles;
+          console.log(this.roles,'this.roles---111')
+					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 => {
+          console.log('鍙戣繍鏃ヨ鍒�----------------------------------',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 +1180,8 @@
 		},
 		doneList() {
 			uni.showLoading({
-				title:'鍔犺浇涓�...'
-			})
+				title: '鍔犺浇涓�...'
+			});
 			this.$reqGet('doneList', this.haveTodoParams).then(res => {
 				uni.hideLoading();
 				if (res.code === 0) {
@@ -469,33 +1194,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 +1230,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 +1246,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 +1301,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,52 +1411,125 @@
 				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{
+  .uni-table-td,.uni-table-th{
+    color: #000;
+  }
+  .u-popup__content{
+    width: 85%;
+    padding: 40rpx;
+    box-sizing: border-box;
+    border-radius: 10rpx;
+  }
+  .passWord-main-box{
+    .u-icon__icon{
+      font-size: 28rpx!important;
+    }
+  }
+}
 ::v-deep.home {
 	width: 100%;
 	display: flex;
 	flex-direction: column;
-	padding-bottom: vww(20);
+  .marginTop{
+    margin-top: 16rpx;
+  }
+  .small{
+    font-size: 20rpx;
+    margin-left: 6rpx;
+    font-weight: normal;
+  }
+	// 妯悜鑿滃崟鏍�
+	.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;
@@ -721,15 +1537,19 @@
 				width: 50%;
 			}
 		}
+
 		.center-content__three {
 			display: flex;
+
 			view {
 				width: 50%;
 			}
 		}
+
 		.center-content__four {
 		}
 	}
+
 	// 涓棿閮ㄥ垎鏍峰紡
 	.center-margin {
 		margin-bottom: vww(16);
@@ -740,14 +1560,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);
@@ -765,6 +1588,7 @@
 			.u-textarea {
 				width: vww(280);
 				height: vww(90) !important;
+
 				.uni-textarea-wrapper {
 					height: vww(90) !important;
 				}
@@ -777,21 +1601,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;
 				}
 			}
@@ -808,24 +1636,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;
@@ -837,15 +1670,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);
@@ -854,49 +1690,332 @@
 			}
 		}
 	}
-    
+
 	//鏃ュ彂杩愯鍒�
 	.main-block-box {
-		// box-shadow: 0px 0px 8px 0px rgba(216,218,238,0.80); 
+		// 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{
+
+		&: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{
+
+				view {
 					font-size: vww(14);
 					line-height: vww(32);
 				}
+
 				.carNum-box {
 					display: flex;
-	                view {
-	                	font-size: vww(14);
-	                    line-height: vww(32);
-	                }
-					
+
+					view {
+						font-size: vww(14);
+						line-height: vww(32);
+					}
 				}
 			}
 		}
-	
 	}
 }
+.huoshiju-box{
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  .price-group{
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    .price-title{
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      font-size: 32rpx;
+    }
+    .price-box{
+      width: 100%;
+      padding: 0 20rpx 20rpx 20rpx;
+      box-sizing: border-box;
+      .price-box-inside{
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        padding: 30rpx;
+        box-sizing: border-box;
+        border-radius: 18rpx;
+        box-shadow: 0 2rpx 20rpx #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
+      }
+      .price-line{
+        width: 100%;
+        display: flex;
+        justify-content: space-between;
+        height: 60rpx;
+        line-height: 60rpx;
+        .name{
+          font-size: 26rpx;
+          color: #606266;
+        }
+        .price{
+          display: flex;
+          align-items: baseline;
+          .priceNum{
+            font-size: 28rpx;
+          }
+          .priceUnit{
+            font-size: 20rpx;
+            margin-left: 10rpx;
+          }
+        }
+      }
+    }
+  }
+  .shoukuan-group{
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    .currentDay-box{
+      width: 100%;
+      position: relative;
+      .total-box{
+        position: absolute;
+        right: 20rpx;
+        top: 50%;
+        transform: translateY(-50%);
+        display: flex;
+        align-items: baseline;
+        .total1{
+          font-size: 22rpx;
+        }
+        .total2{
+          font-size: 32rpx;
+          margin-top: 6rpx;
+          color: #000;
+          font-weight: 540;
+          display: flex;
+          align-items: baseline;
+        }
+      }
+    }
+    .shoukuan-box{
+      width: 100%;
+      padding: 0 20rpx 20rpx 20rpx;
+      box-sizing: border-box;
+      .coalFayun-total{
+        width: 100%;
+        display: flex;
+        background: #4b6cfa;
+        padding: 20rpx 10rpx;
+        box-sizing: border-box;
+        border-radius: 16rpx;
+        margin-bottom: 20rpx;
+        .total-block{
+          width: 50%;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          .num{
+            font-size: 32rpx;
+            color: #fff;
+            font-weight: 540;
+            display: flex;
+            align-items: baseline;
+            height: 38rpx;
+          }
+          .name{
+            font-size: 22rpx;
+            color: #fff;
+            margin-top: 10rpx;
+          }
+        }
+      }
+      .shoukuan-box-inside{
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        padding: 0 40rpx;
+        box-sizing: border-box;
+        border-radius: 18rpx;
+        box-shadow: 0 2rpx 20rpx #e5e5e5, 0 0 1px #e5e5e5, 0 0 1px #e5e5e5;
+        transition: all 0.3s;
+        .shoukuan-main{
+          width: 100%;
+          display: flex;
+          flex-direction: column;
+          border-bottom: 1px solid #e5e5e5;
+          padding: 20rpx 0;
+          &:nth-last-child(2){
+            border-bottom: none;
+          }
+        }
+        .shoukuan-line{
+          width: 100%;
+          display: flex;
+          align-items: baseline;
+          height: 60rpx;
+          line-height: 60rpx;
+          position: relative;
+          .coal{
+            font-size: 26rpx;
+            color: #3884ff;
+            border: 1px solid #3884ff;
+            margin-right: 26rpx;
+            padding: 0 32rpx;
+            height: 38rpx;
+            line-height: 38rpx;
+            border-radius: 8rpx;
+            letter-spacing: 2px;
+            font-weight: 500;
+          }
+          .name{
+            font-size: 24rpx;
+            color: #606266;
+          }
+          .text1{
+            font-size: 30rpx;
+          }
+          .num{
+            font-size: 32rpx;
+            margin-top: 6rpx;
+            color: #000;
+            font-weight: 540;
+            display: flex;
+            align-items: baseline;
+          }
+        }
+        .coal-line{
+          display: flex;
+          align-items: center;
+        }
+        .kehu-block{
+          width: 33%;
+          .text1{
+            flex: 1;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          &:nth-child(2){
+            width: 67%;
+          }
+        }
+        .shoukuanFirst-line{
+          font-weight: bolder;
+        }
+      }
+      .coalTongji-box{
+        width: 100%;
+        display: flex;
+        align-items: center;
+        .caol-block{
+          width: 33.3%;
+          display: flex;
+          flex-direction: column;
+          .name{
+            font-size: 22rpx;
+            color: #606266;
+          }
+          .num{
+            font-size: 32rpx;
+            margin-top: 6rpx;
+            color: #000;
+            font-weight: 540;
+            display: flex;
+            align-items: baseline;
+          }
+        }
+      }
+    }
+    .shouqiIcon{
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      transition: all 0.3s;
+      image{
+        width: 50rpx;
+        height: 34rpx;
+        margin: 10rpx 0;
+      }
+    }
+  }
+}
+.sumbmit-box{
+  margin-top: 40rpx;
+}
+.editorPass{
+  width: 100%;
+  justify-content: center;
+  display: flex;
+  margin: 20rpx 0;
+  align-items: center;
+  .icon{
+    width: 46rpx;
+    height: 46rpx;
+    margin-right: 10rpx;
+  }
+}
+.huiseBox{
+  width: 100%;
+  height: 12rpx;
+  background: #eeeeee;
+}
+.intensity {
+  width: 100%;
+  margin-top: 10rpx;
+  .psdText {
+    font-size: 14px;
+    margin-right: 10px;
+  }
+
+  .line {
+    display: inline-block;
+    width: 70rpx;
+    height: 8rpx;
+    background: #d8d8d8;
+    border-radius: 6rpx;
+    margin-right: 16rpx;
+
+    &.low {
+      background: #f4664a;
+    }
+
+    &.middle {
+      background: #ffb700;
+    }
+
+    &.high {
+      background: #2cbb79;
+    }
+  }
+
+  .level {
+    margin: 0 32rpx 0 16rpx;
+  }
+
+  .warningtext {
+    color: #5a5a5a;
+    font-size: 24rpx;
+    margin-top: 10rpx;
+  }
+}
 </style>

--
Gitblit v1.9.1