处理端报修bug

interceptor/routeInterceptor.js

@@ -25,7 +25,7 @@ let repaireRouterList = [
 							})
 						}else if(loginType==2){
 							uni.reLaunch({
-								url: "/pages/repair/listHome"
+								url: "/pages/repair/home"
 							})
 						}
 					return false

pages.json

@@ -325,16 +325,16 @@
 			"visible": false
 			},
 			{
-			"pagePath": "pages/repair/listHome",
-			"iconPath": "static/img/icon_index.png",
-			"selectedIconPath": "static/img/icon_index_active.png",
+			"pagePath": "pages/repair/home",
+			"iconPath": "static/img/icon_inspectionExecute.png",
+			"selectedIconPath": "static/img/icon_inspectionExecute_active.png",
 			"text": "首页",
 			"visible": false
 			}, 
 			{
-			"pagePath": "pages/repair/home",
-			"iconPath": "static/img/icon_inspectionExecute.png",
-			"selectedIconPath": "static/img/icon_inspectionExecute_active.png",
+			"pagePath": "pages/repair/listHome",
+			"iconPath": "static/img/icon_index.png",
+			"selectedIconPath": "static/img/icon_index_active.png",
 			"text": "我的报修",
 			"visible": false
 			}, 

pages/incidentDetail/incidentDetail.vue

@@ -34,12 +34,12 @@
               <image class="resourceItem" :src="img.thumbFilePath" mode="aspectFill" v-for="(img, i) in dataInfo.repairImgs" :key="i" @click="previewImg(i, 'repairImgs')"></image>
             </view>
           </view>
-					<view class="deital_item">
+<!-- 					<view class="deital_item">
 					  <text class="name">报修视频：</text>
 					  <view class="value img">
 							<image class="resourceItem" src="/static/img/300.jpg" v-for="(img, i) in dataInfo.repairVideo" :key="i" @click="videoView(img)"></image>
 					  </view>
-					</view>
+					</view> -->
 					<view class="deital_item">
 					  <text class="name">报修录音：</text>
 					  <view class="value img" v-if="dataInfo.repairAudio.length>0">

pages/myRepair/myRepair.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="home">
-		<view class="incidentList" v-if="tabsIndex0==1">
+		<view class="incidentList" v-if="tabsIndex1==1">
 		  <view class="head">
 		    <view class="tab" :class="{active: tab.id === dataInfo.tabActiveId}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.id)">
 		      {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
@@ -76,7 +76,7 @@
 			</uni-popup>
 		</view>
 		
-		<view v-if="tabsIndex1==1">
+		<view v-if="tabsIndex0==1">
 			<view class="home_item" v-if="isDept.valueconfig==1">
 				<view class="title">科室报修</view>
 				<view class="content">
@@ -186,7 +186,7 @@
 			<view class="tabs-list" @click="tabsClick0">
 				<img src="/static/img/icon_index.png" v-if="tabsIndex0==0" alt="">
 				<img src="/static/img/icon_index_active.png" v-if="tabsIndex0==1" alt="">
-				<view class="tabs-title" :class="tabsIndex0==1?'active-class':''">首页</view>
+				<view class="tabs-title" :class="tabsIndex0==1?'active-class':''">首页 </view>
 			</view>
 			<view class="tabs-list" @click="tabsClick1">
 				<img src="/static/img/icon_incidentList.png" v-if="tabsIndex1==0" alt="">
@@ -321,18 +321,19 @@
 	
 	function tabsClick0(){
 		tabsIndex0.value=1
-		tabsIndex2.value=0
 		tabsIndex1.value=0
-		dataInfo.stateValue = 0
-		getTabs();
+		tabsIndex2.value=0
+		getCount()
+		repositorySearchStore.clearRepositoryListSearchData()
 	}
 	
 	function tabsClick1(){
 		tabsIndex0.value=0
-		tabsIndex1.value=1
 		tabsIndex2.value=0
-		getCount()
-		repositorySearchStore.clearRepositoryListSearchData()
+		tabsIndex1.value=1
+		// dataInfo.tabActiveId = 0
+		dataInfo.stateValue = 0
+		getTabs();
 	}
 	
 	function tabsClick2(){
@@ -575,9 +576,14 @@
 	
 	// 报修列表
 	function repairsView(type,value){
-	  uni.navigateTo({
-	    url: `/pages/repair/repairsList?type=${type}&value=${value}`
-	  })
+		tabsIndex0.value = 0
+		tabsIndex1.value = 1
+		tabsIndex2.value = 0
+		dataInfo.tabActiveId = type
+		dataInfo.stateValue = value
+		dataInfo.evtFilter.category = value
+		repositorySearchStore.setRepositoryListSearchData(dataInfo.evtFilter)
+		getTabs()
 	}
 	
 	// 获取报修数量
@@ -907,12 +913,12 @@
 				tabsIndex0.value = 0
 				tabsIndex1.value = 1
 				tabsIndex2.value = 0
-				getCount()
+				getTabs()
 			}else{
 				tabsIndex0.value = 1
 				tabsIndex1.value = 0
 				tabsIndex2.value = 0
-				getTabs()
+				getCount()
 			}
 		})
 	}
@@ -934,7 +940,7 @@
 	})
 	
 	onReachBottom(() => {
-		if(tabsIndex0.value==1){
+		if(tabsIndex1.value==1){
 			dataInfo.idx += 1;
 			if (dataInfo.hasMore) {
 			  getList(); // 当触底时加载更多数据

pages/repair/home.vue

@@ -84,8 +84,13 @@
 	
 	// 报修列表
 	function repairsView(type,value){
-	  uni.navigateTo({
-	    url: `/pages/repair/repairsList?type=${type}&value=${value}`
+		let data = {
+			type:type,
+			value:value
+		}
+		uni.setStorageSync('homeRepairList',JSON.stringify(data))
+	  uni.switchTab({
+	    url: `/pages/repair/listHome`
 	  })
 	}
 	

pages/repair/listHome.vue

@@ -399,8 +399,6 @@
 	}
 	
   onLoad((option) => {
-		dataInfo.stateValue = 0
-		repositorySearchStore.clearRepositoryListSearchData()
 		getConfig();
 		for(let i = 0; i<7; i++){
 			setTabbar(i)
@@ -408,12 +406,22 @@
   })
 	
 	onShow((option) =>{
-		dataInfo.stateValue = 0
-		repositorySearchStore.clearRepositoryListSearchData()
+		let data = uni.getStorageSync('homeRepairList')
+		if(data){
+			data = JSON.parse(data)
+			dataInfo.tabActiveId = Number(data.type)
+			dataInfo.stateValue = data.value
+			dataInfo.evtFilter.category = data.value
+			repositorySearchStore.setRepositoryListSearchData(dataInfo.evtFilter)
+		}else{
+			dataInfo.stateValue = 0
+			repositorySearchStore.clearRepositoryListSearchData()
+		}
 		onLoadFn();
 	})
 	
 	onHide(_=>{
+		uni.setStorageSync('homeRepairList','')
 		repositorySearchStore.clearRepositoryListSearchData()
 	})
 	

pages/repair/rapidRep.vue

@@ -14,13 +14,13 @@
 				<text class="newicon newicon-saoma icon" @click="scanCodes"></text>
 			</view>
 			<view class="form_item">
-				<view class="title">照片录像：</view>
+				<view class="title">照片：</view>
 				<view class="value">
 					<uni-file-picker ref="handlerImgRef" v-model="dataInfo.handlerImgList"
-					 limit="4" @success="handlerImgSuccess" file-mediatype="all" mode="grid"
+					 limit="4" @success="handlerImgSuccess" file-mediatype="image" mode="grid"
 					@fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete">
 					</uni-file-picker>
-					<view class="imgTips">(支持JPG/PNG格式图片，单张大小10M以内，录像支持30秒）</view>
+					<view class="imgTips">(支持JPG/PNG格式图片，单张大小10M以内）</view>
 				</view>
 			</view>
 			<view class="form_item">
@@ -358,7 +358,7 @@
 	
   // 选择上传图片
   function handlerImgSelect(e){
-		console.log(6666,e.tempFiles)
+		console.log(6666,e.tempFiles[0].extname)
 		// 10*1024*1024 //10M
 		if(e.tempFiles[0].extname=='mp4' ||
 			e.tempFiles[0].extname=='avi' || 
@@ -381,23 +381,27 @@
 				}
 			}else{
 				dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
-				
 				if(e.tempFiles[0].extname=='png' || 
 					e.tempFiles[0].extname=='jpg' || 
-					e.tempFiles[0].extname=='gif' ||
-					e.tempFiles[0].extname=='mp4' ||
-					e.tempFiles[0].extname=='avi' || 
-					e.tempFiles[0].extname=='mpeg' || 
-					e.tempFiles[0].extname=='wmv' ||
-					e.tempFiles[0].extname=='mov' ||
-					e.tempFiles[0].extname=='3gp' ||
-					e.tempFiles[0].extname=='flv' ||
-					e.tempFiles[0].extname=='mkv'
+					// e.tempFiles[0].extname=='mp4' ||
+					// e.tempFiles[0].extname=='avi' || 
+					// e.tempFiles[0].extname=='mpeg' || 
+					// e.tempFiles[0].extname=='wmv' ||
+					// e.tempFiles[0].extname=='mov' ||
+					// e.tempFiles[0].extname=='3gp' ||
+					// e.tempFiles[0].extname=='flv' ||
+					// e.tempFiles[0].extname=='mkv' ||
+					e.tempFiles[0].extname=='heic' ||
+					e.tempFiles[0].extname=='‌‌heif' ||
+					e.tempFiles[0].extname=='‌‌‌‌proraw' ||
+					e.tempFiles[0].extname=='gif'
 					){
+					}else if('jpeg' == e.tempFiles[0].extname){
+						
 					}else{
 						uni.showToast({
 							icon: 'none',
-						  title: '不支持此类型文件'
+						  title: `不支持${e.tempFiles[0].extname}文件类型`
 						});
 						let item = dataInfo.handlerImgList.findIndex(i=>i.uuid==e.tempFiles[0].uuid)
 						dataInfo.handlerImgList.splice(item,1);

pages/repair/repairsDetail.vue

@@ -25,11 +25,10 @@
 					  <text class="value">{{dataInfo.incidentData.assetDTO && dataInfo.incidentData.assetDTO.name || '无'}}</text>
 					</view>
           <view class="deital_item">
-            <text class="name">图片视频：</text>
+            <text class="name">报修图片：</text>
             <view class="value img">
               <image class="imgItem" :src="img.thumbFilePath" mode="aspectFill" v-for="(img, i) in dataInfo.repairImgs" :key="i" @click="previewImg(i, 'repairImgs')"></image>
-							<!-- <video class="videoItem" :poster="img.imgF" v-for="(img, i) in dataInfo.repairVideo" :key="i" @click="videoView(i)"></video> -->
-							<image class="imgItem" src="/static/img/300.jpg" v-for="(img, i) in dataInfo.repairVideo" :key="i" @click="videoView(img)"></image>
+							<!-- <image class="imgItem" src="/static/img/300.jpg" v-for="(img, i) in dataInfo.repairVideo" :key="i" @click="videoView(img)"></image> -->
 						</view>
           </view>
 					<view class="deital_item">

pages/repairEntrance/repairEntrance.vue

@@ -20,7 +20,7 @@
    */
   function goToRepair() {
 		uni.reLaunch({
-		  url: '/pages/repair/listHome'
+		  url: '/pages/repair/home'
 		})
   }
 </script>

share/useLoginSuccess.js

@@ -17,7 +17,7 @@ export function useLoginSuccess() {
 				})
 			}else if(loginType==2){
 				uni.reLaunch({
-				  url: "/pages/repair/listHome"
+				  url: "/pages/repair/home"
 				})
 			}
     } else {
@@ -27,7 +27,7 @@ export function useLoginSuccess() {
 				})
 			}else if(loginType==2){
 				uni.reLaunch({
-				  url: "/pages/repair/listHome"
+				  url: "/pages/repair/home"
 				})
 			}
     }

share/useSetTabbar.js

@@ -44,21 +44,21 @@ export function useSetTabbar() {
 				break;
 			case 3:
 			  // 首页
-			  if(loginUserStore.loginUser.user.engineer == 0){
-			    flag = true;
-			  }else{
-			  	if(loginType==1){
-			  		flag = false;
-			  	}else{
-			  		flag = true;
-			  	}
-			  }
+				if(loginUserStore.loginUser.user.engineer == 0){
+					flag = true;
+				}else{
+					if(loginType==1){
+						flag = false;
+					}else{
+						flag = true;
+					}
+				}
 			  break;	
 			case 4:
 			  // 我的报修
-			  if(loginUserStore.loginUser.user.engineer == 0){
-					flag = true;
-			  }else{
+				if(loginUserStore.loginUser.user.engineer == 0){
+				  flag = true;
+				}else{
 					if(loginType==1){
 						flag = false;
 					}else{