From 11a036b0f833f8239bc2fa4384bec91f8843332f Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 9 Jul 2024 14:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/learnPath/allPath.vue    | 45 ++++++++++++++++++++--------------
 pages/learnPath/learnPath.vue  |  2 ++
 pages/learnPath/pathSearch.vue | 11 ++++++---
 pages/study/index.vue          |  1 +
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/pages/learnPath/allPath.vue b/pages/learnPath/allPath.vue
index dc7db6a..63d2b9f 100644
--- a/pages/learnPath/allPath.vue
+++ b/pages/learnPath/allPath.vue
@@ -9,11 +9,11 @@
 		</view>
 		<view class="path">
 			<view class="item">
-				<image class="img" src="../../static/images/learnpath/thispath.png" mode=""></image>
+				<image style="width: 40rpx;height: 36rpx;" class="img" src="../../static/images/learnpath/thispath.png" mode=""></image>
 				<text class="text">当前路径</text>
 			</view>
 			<view class="item" style="margin-left: 80rpx;">
-				<image class="img" src="../../static/images/learnpath/otherpath.png" mode=""></image>
+				<image style="width: 40rpx;height: 36rpx;" class="img" src="../../static/images/learnpath/otherpath.png" mode=""></image>
 				<text class="text">其他路径</text>
 			</view>
 			<!-- <view class="item">
@@ -39,11 +39,13 @@
 			               v-if="(t && t.isMajorPosition) "
 			              src="@/static/images/learnpath/thispath.png" 
 			              mode="aspectFit"
+						  style="width: 40rpx;height: 36rpx;"
 			            />
 			            <image 
 			              v-else-if="(t && t.permission)"
 			              src="@/static/images/learnpath/otherpath.png" 
 			              mode="aspectFit"
+						  style="width: 40rpx;height: 36rpx;"
 			            />
 			           <!-- <image 
 			              v-else-if="!(t && t.permission)"
@@ -106,24 +108,29 @@
 				preparedData: [],
 			}
 		},
+		 onShow: function(options) {
+			 console.log('xixi')
+			  const bandCodeList = uni.getStorageSync('bandCodeList');
+			  const positionIdList = uni.getStorageSync('positionIdList');
+				getFullJobPath({
+					positionNameList: positionIdList || '',
+					bandCodeList: bandCodeList || ''
+				}).then(res=>{
+				  if(res.code == 200){
+					this.pathData = res.data
+					this.titleList = this.pathData.allBandCodeList
+					this.preparedData = this.integrateTableData(this.pathData);
+					this.titleList = this.titleList.map(item=>({
+					  title: item,
+					}))
+					// this.titleList.unshift({
+					//   title: ''
+					// })
+					console.log(this.titleList,'titleList')
+				  }
+				})
+		  },
 		onLoad() {
-			getFullJobPath({
-				positionNameList:this.$route.query.positionIdList || '',
-				bandCodeList:this.$route.query.bandCodeList || ''
-			}).then(res=>{
-			  if(res.code == 200){
-				this.pathData = res.data
-				this.titleList = this.pathData.allBandCodeList
-				this.preparedData = this.integrateTableData(this.pathData);
-				this.titleList = this.titleList.map(item=>({
-				  title: item,
-				}))
-				// this.titleList.unshift({
-				//   title: ''
-				// })
-				console.log(this.titleList,'titleList')
-			  }
-			})
 		},
 		methods: {
 			integrateTableData(data) {
diff --git a/pages/learnPath/learnPath.vue b/pages/learnPath/learnPath.vue
index 618eed9..04cb58b 100644
--- a/pages/learnPath/learnPath.vue
+++ b/pages/learnPath/learnPath.vue
@@ -478,6 +478,8 @@
 			  }, 10000);
 			},
 			goAllPath(){
+				uni.setStorageSync('bandCodeList', '');
+				uni.setStorageSync('positionIdList', '');
 				uni.navigateTo({url:'/pages/learnPath/allPath'})
 			},
 			goStudy(item){
diff --git a/pages/learnPath/pathSearch.vue b/pages/learnPath/pathSearch.vue
index c1eaa9c..100136b 100644
--- a/pages/learnPath/pathSearch.vue
+++ b/pages/learnPath/pathSearch.vue
@@ -88,9 +88,14 @@
 			goAllPath(){
 				let bandCodeList = this.bandItem.map(item => item.bandCode).join(',')
 				let positionIdList = this.posiData.map(item => item.positionName).join(',')
-				uni.navigateTo({
-					url: `/pages/learnPath/allPath?bandCodeList=${bandCodeList}&positionIdList=${positionIdList}`,
-				})
+				// uni.navigateTo({
+				// 	url: `/pages/learnPath/allPath?bandCodeList=${bandCodeList}&positionIdList=${positionIdList}`,
+				// })
+				uni.setStorageSync('bandCodeList', bandCodeList);
+				uni.setStorageSync('positionIdList', positionIdList);
+				uni.navigateBack({
+				  delta: 1
+				});
 			},
 			getPosiList(){
 				getAllPosition().then(res=>{
diff --git a/pages/study/index.vue b/pages/study/index.vue
index 423d912..4a464b9 100644
--- a/pages/study/index.vue
+++ b/pages/study/index.vue
@@ -966,6 +966,7 @@
 		}
 	}
 	.learn{
+		height: 80vh;
 		.line{
 			width: 100%;
 			height: 20rpx;