From 8c82102ab7bb34e29a73f56b829cd622ab34604c Mon Sep 17 00:00:00 2001
From: zhangxiaoxu <819527061@qq.com>
Date: 星期二, 25 十一月 2025 11:30:23 +0800
Subject: [PATCH] 解决运输方式显示不对得问题

---
 pages/home/home.vue |  469 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 284 insertions(+), 185 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index f52e647..5950805 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -2,16 +2,12 @@
 	<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"
-			        icon="http://cdn.uviewui.com/uview/empty/data.png"
-							v-if="uchartsData.length == 0" 
-			>
-			</u-empty>
+			<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" v-if="shenqingMenu"></combined-title>
@@ -29,7 +25,7 @@
 								<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
 							</view>
 							<view class="">
-								<text>瀹℃壒鐜妭锛歿{ item.currTaskName }}</text>
+								<text>瀹℃壒鐜妭锛歿{ item.currTaskName || '' }}</text>
 							</view>
 						</view>
 						<view class="center-content__two center-margin">
@@ -54,30 +50,34 @@
 					<view class="bottom-container">
 						<!-- 鎸夐挳鍖哄煙 -->
 						<view class="bottom-content__chulizhong bottom-content__item">
-							<view @click="withDrawClick(item.id)" v-if="item.status == 1">
+							<!-- <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">
+							</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">
+							<view @click="() => shenqingDetail(item)" v-if="item.actType == 'Offsetting' || item.actType == 'XsWaybill'">
 								<image src="@/static/home/biaodan.png" mode=""></image>
-								<view>琛ㄥ崟鏁版嵁</view>
+								<view>鐢宠璇︽儏</view>
 							</view>
-							<view @click="apply(item)" v-if="item.status == 3">
+							<!-- <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">
+							</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="approvalHistoryClick(item.procInstId)" v-if="item.status == 2 || item.status == 3">
+							</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="bottom-content__chulizhong bottom-content__item" v-if="item.status == 2">
@@ -96,19 +96,19 @@
 		<combined-title title="鎴戠殑寰呭姙" detailsPath="/pages/my-todo/my-todo"></combined-title>
 		<view class="card-group">
 			<combination-card class="card" v-for="(item, index) in daibanData" index="index">
-				<template v-slot:top>
+				<template slot="top">
 					<view>
 						<text>{{ item.actBusiness.title }}</text>
 					</view>
 				</template>
-				<template v-slot:center>
+				<template slot="center">
 					<view class="center-container">
 						<view class="center-content__one center-margin">
 							<view class="">
-								<text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
+								<text>浠诲姟鍚嶇О锛歿{ item.name || '' }}</text>
 							</view>
 							<view class="">
-								<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
+								<text>鎵�灞炴祦绋嬶細{{ item.processName || '' }}</text>
 							</view>
 						</view>
 						<view class="center-content__two center-margin">
@@ -120,23 +120,23 @@
 						</view>
 					</view>
 				</template>
-				<template v-slot:bottom>
+				<template 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)">
+							<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)">
+							<view @click="() => rejectClick(item)">
 								<image src="@/static/home/bohui.png" mode=""></image>
 								<view>椹冲洖</view>
 							</view>
-							<view @click="approvalHistoryClick(item.procInstId)">
+							<view @click="() => checkTheScheduleClick(item.procInstId)">
 								<image src="@/static/home/history.png" mode=""></image>
 								<view>鍘嗗彶</view>
 							</view>
@@ -156,18 +156,18 @@
 					</view>
 				</template>
 				<template v-slot:center>
-					<view class="center-container">
+					<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>
+								<text>鎵�灞炴祦绋嬶細{{ item.processName || '' }}</text>
 							</view>
 						</view>
 						<view class="center-content__two center-margin">
 							<view>
-								<text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
+								<text>鍙戣捣浜猴細{{ item.actBusiness.createByName || '' }}</text>
 							</view>
 							<view>
 								<text>瀹℃壒鎿嶄綔锛歿{ item.deleteReason }}</text>
@@ -175,7 +175,7 @@
 						</view>
 						<view class="center-content__three center-margin">
 							<view class="">
-								<text>瀹℃壒鎰忚锛歿{ item.comment }}</text>
+								<text>瀹℃壒鎰忚锛歿{ item.comment == 'undefined' ? '鏈～鍐�' : item.comment || '鏈～鍐�' }}</text>
 							</view>
 							<view class="">
 								<text>
@@ -198,11 +198,15 @@
 					<view class="bottom-container">
 						<!-- 宸插姙鎸夐挳 -->
 						<view class="bottom-content__item">
-							<view @click="theFormDataClick(item.tableId)">
+							<view @click="() => shenqingDetail(item)" v-if="item.processName == '鍙戣繍閫氱煡鍗�'">
 								<image src="@/static/home/biaodan.png" mode=""></image>
 								<view>琛ㄥ崟鏁版嵁</view>
 							</view>
-							<view @click="approvalHistoryClick(item.procInstId)">
+              <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>
@@ -217,9 +221,9 @@
 		</view>
 
 		<!-- 鏃ヨ鍒� -->
-		<combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua" v-if="rijihuaMenu"></combined-title>
-		<view class="card-group">
-			<combination-card class="card" :showTop="false" v-for="(item, index) in fyData.slice(0, 2)" :key="item.id" v-if="rijihuaMenu">
+		<combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua"></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">
 				<template v-slot:top></template>
 				<template v-slot:center>
 					<view class="main-block-box">
@@ -249,8 +253,11 @@
 
 		<!-- 鎾ゅ洖妯℃�佹 -->
 		<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>
 
@@ -306,6 +313,20 @@
 
 		<!-- 鑿滃崟鏍� -->
 		<!-- <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>
 
@@ -315,12 +336,23 @@
 // 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() {
+      console.log(this.$store.state.rijihuaMenu,'this.$store.state.rijihuaMenu==============',this.$store.state)
 			return this.$store.state.rijihuaMenu;
 		},
 		shenqingMenu() {
@@ -358,8 +390,8 @@
 			withDrawShow: false,
 			fyData: [],
 			withDrawData: {
-				reason: '',
-				id: '', // 鎾ゅ洖鐢宠ID
+				// reason: '',
+				// id: '', // 鎾ゅ洖鐢宠ID
 				procInstId: ''
 			},
 			withDrawContent: '',
@@ -389,8 +421,14 @@
 			// dataSeletText: '璇烽�夋嫨鐘舵��',
 			// 椹冲洖璇锋眰
 			rejectForm: {
-				procInstIds: '',
-				comment: ''
+        id: "",
+        procInstId: "",
+        comment: "",
+        type: 0,
+        backTaskKey: "-1",
+        sendMessage: true,
+        sendSms: true,
+        sendEmail: true,
 			},
 			modalType: 0,
 			// 鍒犻櫎鐢宠妯℃�佹
@@ -421,8 +459,8 @@
 			haveTodoParams: {
 				pageNumber: 1,
 				pageSize: 2,
-				sort: 'createTime',
-				order: 'desc'
+				// sort: 'createTime',
+				// order: 'desc'
 			}
 		};
 	},
@@ -432,27 +470,14 @@
 	// },
 	// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
 	onNavigationBarButtonTap(e) {
-		console.log('閫�鍑哄鑸爮鎸夐挳浜嬩欢',e);
+		console.log('閫�鍑哄鑸爮鎸夐挳浜嬩欢', e);
 		// this.$refs.menuRef.menuClick();
 	},
 	// 鐩戝惉宸︿笂瑙掔殑鍥為��浜嬩欢
-	onUnload(event){ //澶氬眰绾ц烦杞箣鍚庯紝鐩戝惉宸︿笂瑙掕繑鍥炰簨浠讹紝鐩存帴閫�鍥炲埌index
-		console.log('鐩戝惉宸︿笂瑙�',event);
-		uni.request({
-		  url: `${BaseUrl}/auth/token/logout`,
-		  method: 'DELETE',
-		  header: {
-		    'TENANT-ID': 5,
-		    Authorization: 'Bearer ' + uni.getStorageSync('access_token'),
-		    VERSION: 'zzl'
-		  }
-		}).then(res=>{
-			console.log('缂撳瓨娓呯悊鎴愬姛');
-		}).catch(err => {
-		  uni.showToast({
-		    title: '缂撳瓨娓呯悊澶辫触锛�',
-		  })
-		})
+	onUnload(event) {
+		//澶氬眰绾ц烦杞箣鍚庯紝鐩戝惉宸︿笂瑙掕繑鍥炰簨浠讹紝鐩存帴閫�鍥炲埌index
+		console.log('鐩戝惉宸︿笂瑙�', event);
+		this.logout();
 	},
 	onShow() {
 		// 鑿滃崟娉ㄩ噴锛坅pp寰呯敤锛�
@@ -467,6 +492,9 @@
 		// popupMenu
 	},
 	methods: {
+		watchRouter() {
+			console.log('璺敱璺宠浆');
+		},
 		init() {
 			this.getUserInfo(); // 鐢ㄦ埛淇℃伅
 			this.getProcessDataList(); // 鐢宠鍒楄〃
@@ -474,10 +502,41 @@
 			this.doneList(); // 鎴戠殑宸插姙
 			this.xscarshippingdayplan(); // 鏃ヨ鍒�
 		},
+    //浠ｅ姙璇︽儏
+    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}`
+        })
+      }
+    },
+    //浠ｅ姙璇︽儏
+    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();
@@ -486,7 +545,7 @@
 			});
 		},
 		getServerData() {
-			console.log('鍔犺浇鍥捐〃',this.uchartsData);
+			console.log('鍔犺浇鍥捐〃', this.uchartsData);
 			//妯℃嫙浠庢湇鍔″櫒鑾峰彇鏁版嵁鏃剁殑寤舵椂
 			setTimeout(() => {
 				//妯℃嫙鏈嶅姟鍣ㄨ繑鍥炴暟鎹紝濡傛灉鏁版嵁鏍煎紡鍜屾爣鍑嗘牸寮忎笉鍚岋紝闇�鑷鎸変笅闈㈢殑鏍煎紡鎷兼帴
@@ -527,6 +586,7 @@
 			};
 			this.$reqGet('xscarshippingdayplan', params)
 				.then(res => {
+          console.log('鍙戣繍鏃ヨ鍒�----------------------------------',res)
 					if (res.code == 0) {
 						this.fyData = res.data.records;
 						uni.hideLoading();
@@ -580,33 +640,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) {
@@ -622,14 +676,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() {
@@ -637,28 +692,37 @@
 		},
 		// 椹冲洖
 		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() {
@@ -683,88 +747,103 @@
 			});
 		},
 		// 琛ㄥ崟鏁版嵁
-		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);
-			});
+		// 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;
-		},
+		// 	this.modalVisible = true;
+		// },
 		// 淇敼
 		editMyApplication(v) {
 			console.log('淇敼鐢宠');
@@ -778,22 +857,39 @@
 				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 {
 	width: 100%;
 	display: flex;
 	flex-direction: column;
-	padding-bottom: vww(20);
+
+	// 妯悜鑿滃崟鏍�
+	.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%;
@@ -818,10 +914,10 @@
 	// echarts鍥捐〃
 	.charts-box {
 		width: 91%;
-		height: vww(330);
+		height: vww(270);
 		margin: 0 auto;
-		.u-empty{
-			height:100%;
+		.u-empty {
+			height: 100%;
 		}
 	}
 
@@ -839,6 +935,9 @@
 				}
 			}
 		}
+	}
+	.bottomChild {
+		margin-bottom: vww(20);
 	}
 
 	// 鍗＄墖涓棿
@@ -925,7 +1024,7 @@
 		// width:100%;
 		// height:vww(244);
 		.slot-content {
-      width:vww(330);
+			width: vww(330);
 			.rejectMesaage {
 				display: flex;
 				padding: vww(3);

--
Gitblit v1.9.1