DESKTOP-70VPDLK\Administrator 1 an în urmă
părinte
comite
0c68dfebcd
3 a modificat fișierele cu 8 adăugiri și 4 ștergeri
  1. 5 1
      page_task/task_details/task_details.vue
  2. 2 2
      pages.json
  3. 1 1
      service/router.js

+ 5 - 1
page_task/task_details/task_details.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="total-page page-env-20 page-box">
-		<Nav :title="'任务详情'" :genre="2" :fixedHeight="fixedHeight">
+		<Nav :back="isReturn!==1" :title="'任务详情'" :genre="2" :fixedHeight="fixedHeight">
 			<view class="task-tabs m-b20" :style=" {top:`${$tools.topHeight()}px`}">
 				<view class="detail-bg m-lr20 m-b10 m-t10">
 					<image class="detail-img" src="/page_task/static/img/task-details/top-bg.png" mode="aspectFill">
@@ -223,12 +223,16 @@
 				creditHeight: '100%',
         basicType:['1'],
         restType:['2'],
+        isReturn:0
 			}
 		},
 		onLoad(data) {
       console.log('-----------aaaaa-----------')
 			if (data.taskId !== undefined) {
 				this.businessId = data.taskId
+        if(data.isReturn!==undefined){
+          this.isReturn=data.isReturn*1
+        }
 			} else {
 				tools.leftClick()
 			}

+ 2 - 2
pages.json

@@ -273,8 +273,8 @@
       {
         "name": "任务详情",
         "path": "/page_task/task_details/task_details",
-        "query": "taskId=4290"
+        "query": "taskId=4290&isReturn=1"
       }
     ]
   }
-}
+}

+ 1 - 1
service/router.js

@@ -21,7 +21,7 @@ router.beforeEach(async (to, from, next) => {
     // tools.showLoading()
     console.log(to)
     console.log(from)
-    if(to.path==='/pages/login/index'){
+    if(to.path==='/pages/login/index' && from.path!=='/pages/login/index'){
         uni.setStorageSync('pageFullPath',from.fullPath)
     }else if(from.path==='/pages/login/index'){
         let oldFullPath= uni.getStorageSync('pageFullPath')