修复刷新页面返回失效

pages/buildIncident/buildIncident.vue

@@ -320,7 +320,7 @@
   function handlerOrderImg(imgObj){
     return uploadFile(imgObj, 'incident', dataInfo.incidentId)
   }
-
+	
   // 提交
   function submit(){
     isSubmit.value = true;
@@ -420,9 +420,11 @@
       );
       // 修改报修科室,则回显楼栋,楼层,详细地址,联系电话
       if(incidentBuildStore.incidentBuild.sign === 'department'){
-        incidentData.place = incidentData.department.place || undefined;
-        incidentData.houseNumber = incidentData.department.address || '';
-        incidentData.contactsInformation = incidentData.department.phone ? incidentData.department.phone.split(',')[0] : '';
+				if(incidentData.department){
+					incidentData.place = incidentData.department.place || undefined;
+					incidentData.houseNumber = incidentData.department.address || '';
+					incidentData.contactsInformation = incidentData.department.phone ? incidentData.department.phone.split(',')[0] : '';
+				}
       }
     }
     getBranchs();

share/useGoback.js

@@ -1,9 +1,14 @@
+const canNavBack = getCurrentPages()
 export function useGoBack() {
   /**
    * 返回
    */
   const goBack = () => {
-    uni.navigateBack();
+		if( canNavBack && canNavBack.length>1) {  
+				uni.navigateBack() 
+		} else {  
+				history.back();  
+		}
   }
   
   return {

uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="uni-data-tree" @touchmove.stop.prevent>
+  <view class="uni-data-tree">
     <view class="uni-data-tree-input" @click="handleInput">
       <slot :options="options" :data="inputSelected" :error="errorMessage">
         <view class="input-value" :class="{'input-value-border': border}">
@@ -25,8 +25,8 @@
         </view>
       </slot>
     </view>
-    <view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose"></view>
-    <view class="uni-data-tree-dialog" v-if="isOpened">
+    <view class="uni-data-tree-cover" v-if="isOpened" @click="handleClose" @touchmove.stop.prevent></view>
+    <view class="uni-data-tree-dialog" v-if="isOpened" @touchmove.stop.prevent>
       <view class="uni-popper__arrow"></view>
       <view class="dialog-caption">
         <view class="title-area">