From 9d870dbc006c4e4f5ef32d7290f19ec8947d0a64 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Thu, 29 Aug 2024 11:20:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/YNEduApp/index/index.vue               | 15 +++++++-
 pages/YNEduApp/learnProj/learnProjDetail.vue | 37 +++++++++++++-------
 pages/YNEduApp/user/user.vue                 |  4 +--
 pages/gzt/index.vue                          |  2 +-
 pages/login.vue                              |  2 +-
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/pages/YNEduApp/index/index.vue b/pages/YNEduApp/index/index.vue
index 015ba62..6e1af8d 100644
--- a/pages/YNEduApp/index/index.vue
+++ b/pages/YNEduApp/index/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="page">
-    <u-navbar leftIcon="" title="首页" placeholder />
+    <u-navbar title="首页" placeholder @leftClick="leftClick" />
     <view class="search">
       <uni-icons type="scan" size="24" style="margin-right: 2vw; color: #bababa" @click="toggleScan"></uni-icons>
       <uni-easyinput
@@ -196,6 +196,19 @@ export default {
         url: `/pages/YNEduApp/learnProj/learnProjDetail?id=${id}`
       })
     },
+    // 返回
+    leftClick() {
+      console.log('返回')
+      // 退出登录
+      uni.removeStorageSync('access_token')
+      uni.removeStorageSync('userId')
+      uni.removeStorageSync('userName')
+      uni.removeStorageSync('className')
+      uni.removeStorageSync('facePath')
+      uni.reLaunch({
+        url: '/pages/gzt/index'
+      })
+    }
   },
   onShow() {
     /* getNoticeAnnoByUserId({
diff --git a/pages/YNEduApp/learnProj/learnProjDetail.vue b/pages/YNEduApp/learnProj/learnProjDetail.vue
index 8d4629f..5ccc97e 100644
--- a/pages/YNEduApp/learnProj/learnProjDetail.vue
+++ b/pages/YNEduApp/learnProj/learnProjDetail.vue
@@ -5,33 +5,38 @@
       <h2 style="margin-bottom: 15rpx">{{ name }}</h2>
       <span style="font-size: 12px; color: #b0b0b0">合格标准：{{ eligibility }}</span>
       <view class="user-info">
-        <view class="info-lef">
+        <div style="font-size: 18px">{{ createUserName }}</div>
+        <div class="training-content">
+          <div style="width: 80px">培训内容:</div>
+          <span class="content">{{ listStageContentNum }}</span>
+        </div>
+        <!-- <view class="info-lef">
           <view class="avatar">
-            <!-- <image src="/static/eduImg/avatar.jpg"></image> -->
-            <span style="font-size: 18px">{{ createUserName }}</span>
+            <image src="/static/eduImg/avatar.jpg"></image>
+            <div style="font-size: 18px">{{ createUserName }}</div>
           </view>
-          <!-- <view style="display: flex; align-items: center">
+          <view style="display: flex; align-items: center">
             <l-starRate v-model="starRate" :disabled="true" style="margin-right: 1vw"></l-starRate>
             <span style="color: #ffca3e">{{ starRate }}.0</span>
-          </view> -->
+          </view>
         </view>
         <view class="info-rig">
           <view class="rig-up">
             <view>
               培训内容
-              <span>{{ listStageContentNum }}</span>
+              <span>{{ 'listStageContentNum' }}</span>
             </view>
-            <!-- <view style="margin-left: 2vw">
+            <view style="margin-left: 2vw">
               观看记录
               <span>28</span>
               <uni-icons style="color: #b0b0b0" type="right" size="12"></uni-icons>
-            </view> -->
+            </view>
           </view>
-          <!-- <view class="rig-dn">
+          <view class="rig-dn">
             去评分
             <uni-icons style="color: #b0b0b0" type="right" size="12"></uni-icons>
-          </view> -->
-        </view>
+          </view>
+        </view> -->
       </view>
       <!-- <view class="tip">已开启进度同步，其他途径的学习进度已自动同步</view> -->
       <u-collapse>
@@ -360,16 +365,22 @@ export default {
 
     .user-info {
       width: 100%;
-      height: 8vh;
+      /* height: 8vh; */
       display: flex;
+      flex-direction: column;
       margin-top: 2vh;
+      margin-bottom: 2vh;
+
+      .training-content {
+        word-wrap: break-word; // 允许长单词换行
+        white-space: normal;
+      }
 
       .info-lef {
         width: 35%;
         height: 100%;
         display: flex;
         flex-direction: column;
-        justify-content: space-around;
 
         .avatar {
           width: 100%;
diff --git a/pages/YNEduApp/user/user.vue b/pages/YNEduApp/user/user.vue
index d4f0865..a238905 100644
--- a/pages/YNEduApp/user/user.vue
+++ b/pages/YNEduApp/user/user.vue
@@ -58,10 +58,10 @@ export default {
       allDuration: 0,
       value: 0, //
       secList: [
-        { id: 1, title: '切换门户', src: '/static/eduImg/changeGate.png', path: 'changeGate' },
+        // { id: 1, title: '切换门户', src: '/static/eduImg/changeGate.png', path: 'changeGate' },
         { id: 2, title: '人脸识别', src: '/static/eduImg/faceScan.png', path: 'faceScan' },
         { id: 3, title: '我的消息', src: '/static/eduImg/myMsg.png', path: 'myMsg' },
-        { id: 4, title: '设置', src: '/static/eduImg/settings.png', path: 'settings' }
+        // { id: 4, title: '设置', src: '/static/eduImg/settings.png', path: 'settings' }
       ],
       token: uni.getStorageSync('access_token')
     }
diff --git a/pages/gzt/index.vue b/pages/gzt/index.vue
index f302ba3..484a8a3 100644
--- a/pages/gzt/index.vue
+++ b/pages/gzt/index.vue
@@ -19,7 +19,7 @@
 			<view class="yy-box">
 				<view class="bt">我的应用</view>
 				<view class="yy-list">
-					<view class="yy-one" @click="gotoYy" v-for="(item,index) in myApp" :key="index">
+					<view class="yy-one" @click="gotoYy(item.appName)" v-for="(item,index) in myApp" :key="index">
 						<view class="yy-img">
 							<image :src="item.base64Url"></image>
 						</view>
diff --git a/pages/login.vue b/pages/login.vue
index 787edad..4d9412c 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -165,7 +165,7 @@
 				// globalConfig: getApp().globalData.config,
 				selectTab: 1,
 				loginForm: {
-					phone: 15856165378,
+					phone: '15856165378',
 					pd: 'YNsbd@123456',//YNsbd@123456
 				},
 				loginForm0: {