Merge remote-tracking branch 'remotes/origin/master'

# Conflicts:
#	src/pages-process/components/taskDeal.vue

env/.env.development

@@ -4,5 +4,5 @@ NODE_ENV = 'development'
 VITE_DELETE_CONSOLE = false
 # 是否开启sourcemap
 VITE_SHOW_SOURCEMAP = true
-VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot'

src/pages-process/components/taskDeal.vue

@@ -74,6 +74,7 @@
 					<label class="uni-list-cell uni-list-cell-pd uni-label-pointer">
 						<!-- 点击的文字 -->
 						<radio value="1" style="transform: scale(0.7);" :checked="true"></radio>
+						
 <view class="margin-left-sm text-sm">同意</view>
 					</label>
 					<label class="uni-list-cell uni-list-cell-pd uni-label-pointer" v-if="resultObj.histListSize>0">

src/pages-process/myApplyProcess.vue

@@ -11,7 +11,7 @@
 	<PageLayout nav-title="我发起流程">
 		<view class="container">
 			<template v-for="(item, i) in list" :key="i">
-				<wd-card :title="item.bpmBizTitle" title-bold border-radius="8" use-footer-slot>
+				<wd-card :title="item.bpmBizTitle" title-bold border-radius="8" use-footer-slot @click="goToPage(item)">
 					<wd-row class="row">
 						<wd-col :span="6">
 							<text>申请理由:</text>
@@ -91,6 +91,15 @@
 		})
 	}
 	
+	const goToPage = (item) => {
+		uni.navigateTo({
+			url: `/pages-process/taskHandle?data=history`,
+			success: (res) => { //明文数据传输改为加密
+				res.eventChannel.emit('taskData', JSON.stringify(item))
+			}
+		})
+	}
+	
 	/**流程取回*/
 	const callBackProcess = (id) => {
 		console.log('----',id)

src/pages-process/taskHandle.vue

@@ -154,6 +154,7 @@
 			
 			getHisInfo({processInstanceId:useData.processInstanceId}).then((res)=>{
 				if (res.success) {
+					console.log(res)
 				  dataSource.value = res.result.records
 				  //查找最后一个，结束时间
 				  completedNum.value = res.result.records.length