协同办公bug

hybrid/html/a.html

@@ -22,9 +22,8 @@
 			｝
 		</style>
 		<div id="app">
-			<van-nav-bar height='100rpx' @click-left="onClickLeft"
-				style="background-color: rgb(21, 122, 44);color: rgb(255, 255, 255);" :title="title" left-arrow
-				:safe-area-inset-top='true' :placeholder='true' :fixed='true'></van-nav-bar>
+
+			
 			<fm-generate-vant-form style='height: 81vh !important;overflow: auto;background: #a3a6ad1c;' v-if='isFlag' :data="jsonData"
 				:value="form.valueJson" ref="generateForm" :edit='isEdit'>
 			</fm-generate-vant-form>
@@ -74,7 +73,7 @@
 					this.headers = this.getQueryParams('headers');
 					let params = this.getQueryParams('params');
 					this.isEdit = params.isEdit || true
-					this.APIUrl = this.headers.serverInfo || 'http://192.168.1.105:80/api'
+					this.APIUrl = this.headers.serverInfo || 'http://192.168.1.105:18086'
 					console.log(params)
 					axios({
 						method: 'get',

hybrid/html/c.html

@@ -16,8 +16,9 @@
 			}
 		</style>
 		<div id="app">
-			<van-nav-bar height='100rpx' @click-left="onClickLeft" style="background-color: rgb(21, 122, 44);color: rgb(255, 255, 255);"
-				:title="title" left-arrow :safe-area-inset-top='true' :placeholder='true' :fixed='true'></van-nav-bar>
+		<!-- <div style="height:60px;width:100%;"></div> -->
+<!-- 			<van-nav-bar height='100rpx' @click-left="onClickLeft" style="background-color: rgb(21, 122, 44);color: rgb(255, 255, 255);"
+				:title="title" left-arrow :safe-area-inset-top='true' :placeholder='true' :fixed='true'></van-nav-bar> -->
 			<fm-generate-vant-form style='height: 75vh !important;overflow: auto;' v-if='isFlag' :data="jsonData" :value="form.valueJson" ref="generateForm" :edit='false'>
 			</fm-generate-vant-form>
 			<div v-if="type!='view'" style='position: fixed; bottom: 0;background: #f9fafb;width:100%;height:20%'>
@@ -67,7 +68,7 @@
 				created() {
 					this.headers = this.getQueryParams('headers');
 					let params = this.getQueryParams('params');
-					this.APIUrl = this.headers.serverInfo || 'http://192.168.1.105:80/api'
+					this.APIUrl = this.headers.serverInfo || 'http://192.168.1.105:18086'
 					this.title = params.type =='view'?'查看':'审核'
 					this.type = params.type 
 					axios({

pages/home/wt/components/formParser/routerView.vue

@@ -1,10 +1,14 @@
 <template>
 	<view class="blacklog-container">
-			<web-view v-if="isShow" :src="webViewUrl"></web-view>
+		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" :title="title" @clickLeft="back">
+		</uni-nav-bar>
+<!-- 		<div style="height: 88rpx;width: 100%;"></div> -->
+			<web-view style="margin-top: 88rpx;" v-if="isShow" :src="webViewUrl"></web-view>
 	</view>
 </template>
 
 <script>
+	import Vue from "vue";
 	import {
 		getParentIdListByDeptId
 	} from '@/api/common.js'
@@ -12,24 +16,28 @@
 		data(){
 			return{
 				isShow:false,
-				webViewUrl:''
+				webViewUrl:'',
+				title:'申请'
 			}
 		},
 		async onLoad(option = {}) {
 			let headers = {};
 			const value = uni.getStorageSync("token"); //取存本地的token
-			const apiInfo = uni.getStorageSync("apiInfo"); //取存本地的token
+			// const apiInfo = uni.getStorageSync("apiInfo"); //取存本地的token
+			
+			console.log(Vue.prototype.apiUrl,'apiInfo')
 			  headers = {
 			    "content-type": "application/json",
 			    "zoomwin-token": value,
 			    Authorization: value,
 			    "zoomwin-sid": uni.getStorageSync("userInfo").sessionId,
-				serverInfo : apiInfo.protocal? apiInfo.protocal+ apiInfo.hostname+':'+apiInfo.port+'/api' :'',
+				serverInfo : Vue.prototype.apiUrl||'',
 			  };
 			  //http://192.168.1.105:18086
 			  const params =  JSON.parse(option.params)
 			  params.userInfo = uni.getStorageSync("userInfo")
 			  let html = params.type =='add'? 'a.html':'c.html'
+			  this.title= params.type =='add'? '申请':'审批'
 			  try{
 				   params.userInfo.groupIdList = await getParentIdListByDeptId(params.userInfo.groupId)
 			  }catch{

pages/index/index.vue

@@ -5,7 +5,7 @@
 			<CellTip title="协同办公" v-if="internalManagementList.length > 0"></CellTip>
 			<view class="nav">
 				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in internalManagementList" @click="toNav(item.url)">
+					<view class="nav-item" v-for="(item, index) in internalManagementList" @click="toNav(item.path)">
 						<span :class="'iconfont ' + item.icon"></span>
 						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
 						<label>{{ item.name }}</label>
@@ -459,7 +459,12 @@
 								item.name = item.name.replace('员工', '')
 								item.name = item.name.replace('管理员', '')
 							})
+						}else if (f.path == 'internalManagement') {
+							console.log(f,'f')
+							this.internalManagementList = f.children
+							
 						}
+						
 					})
 				}
 			},

pages/internalManagement/apply/index.vue

@@ -188,6 +188,7 @@
 			},
 			async getBaseList() {
 				this.defaultList = await getBpmCustomFormList()
+				console.log(this.defaultList,'this.defaultList')
 				this.baseList = await getByCode('collaborative_type')
 			},
 			handleDetail(item, type, isEdit = true) {