From 6d66f7362cefb15d4c6966271408d5ff6191d5ec Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 17 Mar 2023 17:22:48 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=AF=B9token=E5=A2=9E=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E7=9A=84h5=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue |  5 -----
 utils/token.js        | 30 +++++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 798ea5f..c70138c 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -47,11 +47,6 @@
 				}
 				console.log(pv,'=',options[pv]);
 			});
-			//if(params){
-				console.log(this.redirect+params)
-			//}
-			
-			
 		},
 		mounted() {
 			//对cookies进行操作，这里是写
diff --git a/utils/token.js b/utils/token.js
index 60f59d7..d2e5ea8 100644
--- a/utils/token.js
+++ b/utils/token.js
@@ -2,19 +2,35 @@
 const TOKEN_KEY = 'token'
 
 export function getToken() {
-	let token=uni.getStorageSync(TOKEN_KEY);
-	if(!token){
-	 	token=uni.getStorageSync('userInfo');
-		if(token){
-			token=JSON.parse(token).token;
+	
+	let token='';
+	// #ifdef H5
+	var ca = document.cookie.split(';');
+	for(var i=0; i<ca.length; i++) 
+	{
+	    var c = ca[i].trim();
+	    if (c.indexOf(TOKEN_KEY)==0){
+			token=c.substring(TOKEN_KEY.length+1,c.length);
+			break;
 		}
 	}
+	// #endif
+	// #ifndef H5
+	token = uni.getStorageSync(TOKEN_KEY);
+	// #endif
 	return token;
-  //return uni.getStorageSync(TOKEN_KEY);
+
 }
 
 export function setToken(token) {
-	return uni.setStorageSync(TOKEN_KEY,token);
+	//如果是h5,token两个小时过期
+	// #ifdef H5
+	var expires = "max-age="+(2*60*60*1000);
+	document.cookie = TOKEN_KEY + "=" + token + ";path=/;" + expires;
+	// #endif
+	// #ifndef H5
+	uni.setStorageSync(TOKEN_KEY,token);
+	// #endif
 }
 
 export function removeToken() {

From d4a5771b308dc9f192773cb175950fdfae0cd946 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 4 Jul 2023 18:14:10 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/exam/qrcode.vue   | 1 -
 pages/login/loading.vue | 1 -
 store/modules/user.js   | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pages/exam/qrcode.vue b/pages/exam/qrcode.vue
index 77f60e6..ae30a14 100644
--- a/pages/exam/qrcode.vue
+++ b/pages/exam/qrcode.vue
@@ -41,7 +41,6 @@
 			}else{
 			  apiLogin.boeLogin(token).then(rs=>{
 				if(rs.status==200){
-				  //setToken(rs.result.access_token);
 				  //加载用户信息
 				  this.$store.dispatch("InitData").then(res => {
 					 //console.log(res)
diff --git a/pages/login/loading.vue b/pages/login/loading.vue
index 12881cf..e81a4c9 100644
--- a/pages/login/loading.vue
+++ b/pages/login/loading.vue
@@ -54,7 +54,6 @@
 			}else{
 			  apiLogin.boeLogin(token).then(rs=>{
 				if(rs.status==200){
-				  //setToken(rs.result.access_token);
 				  //加载用户信息
 				  this.$store.dispatch("InitData").then(res => {
 					 //console.log(res)
diff --git a/store/modules/user.js b/store/modules/user.js
index f5ccd33..bac2144 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -64,7 +64,7 @@ const user = {
             const code = userInfo.code
             return new Promise((resolve, reject) => {
                 apiLogin.login(loginName, password, code).then(res => {
-                    setToken(res.result.access_token);
+                    //setToken(res.result.access_token);
                     resolve(res);
                 }).catch(error => {
                     reject(error)

From 571dbff2cdc252a3a109175cfb66d7796d5d4848 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 4 Jul 2023 19:22:53 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/login.js b/api/login.js
index 104ad1f..970bd31 100644
--- a/api/login.js
+++ b/api/login.js
@@ -32,7 +32,7 @@ const refreshToken = function(token){
 
 // boe登录
 const boeLogin = function(token){
-  return ajax.post('/xboe/account/boelogin',{token:token});
+  return ajax.post('/xboe/account/boenewlogin',{token:token});
 }
 
 export default{

From b115e9b4ce3ae87d823428907528c89b0de2a343 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 4 Jul 2023 19:35:07 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=88=B0=E7=94=A8=E6=88=B7=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/boe/userbasic.js | 14 +++++++++++++-
 pages/my/setting.vue | 12 ++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/api/boe/userbasic.js b/api/boe/userbasic.js
index 8ea0bc4..5a07f8a 100644
--- a/api/boe/userbasic.js
+++ b/api/boe/userbasic.js
@@ -80,6 +80,17 @@ const getInAudienceIds = function(userId) {
    // return ajax.post(baseURL,'/audience/audienceByUser',{});
 }
 
+
+/**
+ * 更新用户信息，当前只是列新三个信息,根据aid来更新
+ * aid
+ * avatar
+ * sign
+ */
+const updateUser = function(data) {
+    return ajax.postJson(baseURL,'/user/updateUserMessage',data);
+}
+
 export default {
     userParentOrg,
     findOrgsByKeyword,
@@ -90,5 +101,6 @@ export default {
     getUserCrowds,
     getOrgHrbpInfo,
     modifyPassword,
-	getInAudienceIds
+	getInAudienceIds,
+	updateUser
 }
diff --git a/pages/my/setting.vue b/pages/my/setting.vue
index 87311ea..c378ebc 100644
--- a/pages/my/setting.vue
+++ b/pages/my/setting.vue
@@ -64,6 +64,7 @@
 </template>
 <script>
 	import userApi from "@/api/system/user";
+	import apiUserbasic from '@/api/boe/userbasic.js'
 	import uploadUtil from '@/utils/upload.js'
 	import accountApi from '@/api/account';
 	import config from '@/config/index.js'
@@ -132,6 +133,17 @@
 											title:'更新成功',
 											image:'../../static/images/icon/ok-icon.png'
 										})
+										//同步保存到用户中心的数据库
+										let upinfo={
+										  aid:this.aid,
+										  sign:'',
+										  avatar:rs.result.filePath
+										}
+										apiUserBasic.updateUser(upinfo).then(rs=>{
+										  if(rs.status!=200){
+										    console.error('更新用户中心用户像头失败');
+										  }
+										})
 									} else {
 										uni.showToast({
 											title:'更新失败'

From 2e51074e69ad4ad74c86d8fbee5f8b47bf64b9f9 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 5 Jul 2023 19:18:31 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/boe/userbasic.js | 10 ++++++++--
 pages/my/setting.vue |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/api/boe/userbasic.js b/api/boe/userbasic.js
index 5a07f8a..15aacba 100644
--- a/api/boe/userbasic.js
+++ b/api/boe/userbasic.js
@@ -88,7 +88,12 @@ const getInAudienceIds = function(userId) {
  * sign
  */
 const updateUser = function(data) {
-    return ajax.postJson(baseURL,'/user/updateUserMessage',data);
+    return ajax.postJson('/user/updateUserMessage',data);
+}
+
+/**退出*/
+const logout = function() {
+    return ajax.postJson('/userbasic/logout',{from:'h5'});
 }
 
 export default {
@@ -102,5 +107,6 @@ export default {
     getOrgHrbpInfo,
     modifyPassword,
 	getInAudienceIds,
-	updateUser
+	updateUser,
+	logout
 }
diff --git a/pages/my/setting.vue b/pages/my/setting.vue
index c378ebc..5a083db 100644
--- a/pages/my/setting.vue
+++ b/pages/my/setting.vue
@@ -102,6 +102,8 @@
 		methods: {
 			logout() {
 				this.clearShow=true;
+				apiUserbasic.logout();
+				
 			},
 			
 			updateHeadImg() {

From 7128c842f32d529caffc734d21bb4b89798b70f3 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 6 Jul 2023 11:41:16 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/boe/userbasic.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/api/boe/userbasic.js b/api/boe/userbasic.js
index 15aacba..8b0ad81 100644
--- a/api/boe/userbasic.js
+++ b/api/boe/userbasic.js
@@ -93,7 +93,12 @@ const updateUser = function(data) {
 
 /**退出*/
 const logout = function() {
-    return ajax.postJson('/userbasic/logout',{from:'h5'});
+	let plat='h5';
+	var ua = navigator.userAgent.toLowerCase();
+	if (ua.match(/MicroMessenger/i) == "micromessenger") {
+	   plat='wechat';
+	}
+    return ajax.postJson('/userbasic/logout',{"from":plat});
 }
 
 export default {

From e5af1fe3852f83dc04e21939c6527333fe574809 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 6 Jul 2023 15:06:50 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/boe/userbasic.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/boe/userbasic.js b/api/boe/userbasic.js
index 8b0ad81..2833269 100644
--- a/api/boe/userbasic.js
+++ b/api/boe/userbasic.js
@@ -98,7 +98,7 @@ const logout = function() {
 	if (ua.match(/MicroMessenger/i) == "micromessenger") {
 	   plat='wechat';
 	}
-    return ajax.postJson('/userbasic/logout',{"from":plat});
+    return ajax.postJson('/logout',{"from":plat});
 }
 
 export default {

From c0148bd724e80bdd6a75e6111d42546b09d9047b Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Thu, 6 Jul 2023 18:28:27 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/boe/userbasic.js  |  2 +-
 pages/my/setting.vue  | 11 +----------
 store/modules/user.js |  6 ++++--
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/api/boe/userbasic.js b/api/boe/userbasic.js
index 2833269..ff1eafc 100644
--- a/api/boe/userbasic.js
+++ b/api/boe/userbasic.js
@@ -95,7 +95,7 @@ const updateUser = function(data) {
 const logout = function() {
 	let plat='h5';
 	var ua = navigator.userAgent.toLowerCase();
-	if (ua.match(/MicroMessenger/i) == "micromessenger") {
+	if(ua.match(/MicroMessenger/i) == "micromessenger") {
 	   plat='wechat';
 	}
     return ajax.postJson('/logout',{"from":plat});
diff --git a/pages/my/setting.vue b/pages/my/setting.vue
index 5a083db..a7d16f4 100644
--- a/pages/my/setting.vue
+++ b/pages/my/setting.vue
@@ -48,9 +48,7 @@
 						<view class="u-demo-block__content">
                             <u-cell-group>
                             	<!-- <u-cell title="语言设置" v-model="userInfoObj.name"></u-cell>
-                           
                             	<u-cell title="位置" v-model="userInfoObj.name"></u-cell> -->
-                         
                             	<u-cell @click="toRouter('next')" title="修改密码" :isLink="true" arrow-direction="left" v-model="userInfoObj.account.passValue"></u-cell>
                             </u-cell-group>
 						</view>
@@ -93,8 +91,6 @@
 				this.imgurl = rs.avatar;
 				this.load();
 			})
-		
-			
 		},
 		onLoad(){
 			//this.load()
@@ -102,10 +98,7 @@
 		methods: {
 			logout() {
 				this.clearShow=true;
-				apiUserbasic.logout();
-				
 			},
-			
 			updateHeadImg() {
 				let self=this;
 				if (this.fSelecting) return;
@@ -159,11 +152,9 @@
 					}
 				})
 			},
-			
-			
 			confirmClear(){
 				let that = this;
-				that.$store.dispatch("LogOut").then(rs => {
+				that.$store.dispatch("LogOut").then(rs =>{
 					that.clearShow=false;
 					if(rs.status==200){
 						let loginPath=this.$config.loginPath;
diff --git a/store/modules/user.js b/store/modules/user.js
index bac2144..5f210a1 100644
--- a/store/modules/user.js
+++ b/store/modules/user.js
@@ -4,6 +4,7 @@ import apiLogin from '@/api/login.js'
 import apiBoeLogin from '@/api/boe/login.js'
 import apiMessage from '@/api/system/message.js'
 import config from '@/config/index.js'
+import apiUserbasic from '@/api/boe/userbasic.js'
 
 const user = {
     state: {
@@ -132,11 +133,12 @@ const user = {
         // 退出系统
         LogOut({ commit, state }) {
             return new Promise((resolve, reject) => {
-				apiBoeLogin.logout();
+				//apiBoeLogin.logout();
                 commit('SET_PERMISSIONS', [])
                 removeToken()
                 //resolve()
-                apiLogin.logout().then((res) => {
+				//apiLogin.logout()
+			    apiUserbasic.logout().then((res) => {
                     resolve(res)
                 }).catch(error => {
                     reject(error)

From 80abbd58552f7c936bafc8da0db9586e022e870e Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 18 Jul 2023 10:35:00 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E4=B8=8A=E7=9A=84SZ?=
 =?UTF-8?q?X-324=E5=92=8CSZX315=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/study/courseStudy.vue | 17 ++++++++++++++---
 pages/study/index.vue       | 31 ++++++++++++++++---------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/pages/study/courseStudy.vue b/pages/study/courseStudy.vue
index 5597bbe..8a81c26 100644
--- a/pages/study/courseStudy.vue
+++ b/pages/study/courseStudy.vue
@@ -88,9 +88,16 @@
 				</div>
 			 	<view v-if="curContent.contentType==52">
 			 		<!--外连接-->
-			 		<view v-if="conLink.url!=''" style="min-height: 400px;position: relative;">
-			 			<web-view :src="conLink.url"></web-view>
-			 		</view>
+					<view v-if="conLink.openType == 1">
+						<view v-if="conLink.url!=''" style="min-height: 400px;position: relative;">
+							<web-view :src="conLink.url"></web-view>
+						</view>
+					</view>
+					<view v-else>
+						<div style="text-align: center;padding: 20px;">{{ curContent.contentName }}</div>
+						<div style="text-align: center;padding: 20px;">{{ conLink.url }}</div>
+					</view>
+			 		
 			 	</view>
 			 	<!--作业-->
 			 	<view v-if="curContent.contentType==60">
@@ -907,6 +914,10 @@
 					   this.conLink.url=con.content;
 					   this.conLink.openType=1;
 					}
+					if (this.conLink.openType == 2) {
+					  //新的窗口直接打开
+					  location.href=this.conLink.url
+					}
 				} else if(con.contentType==10 || con.contentType==20) {
 					
 					if(con.content.startsWith('\{')){
diff --git a/pages/study/index.vue b/pages/study/index.vue
index 29c587c..6057792 100644
--- a/pages/study/index.vue
+++ b/pages/study/index.vue
@@ -262,8 +262,6 @@
 			//document.cookie = "mytest=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
 		},
 		onLoad() {
-			this.loadBoeData(true);
-			
 			let $this = this;
 			uni.getSystemInfo({
 				success: (res) => {
@@ -281,12 +279,18 @@
 			})
 		},
 		mounted() {
-		 window.addEventListener('click',this.reSetList);
-		 apiManage.getTaskNum().then(res => {
-			 if(res.code==200){
-				this.value=res.data.todoTaskCounts;
-			 }
-		  });
+			window.addEventListener('click',this.reSetList);
+			apiManage.getTaskNum().then(res => {
+				if(res.code==200){
+					this.value=res.data.todoTaskCounts;
+					if(this.value>0){
+						this.loadBoeData(true);
+					}else{
+						this.tabIndex = 1;//切换到我报名的
+						this.getLearning(true);
+					}
+				}
+			});
 		},
 		onPullDownRefresh() {
 			this.onReachBottom();
@@ -536,13 +540,10 @@
 							this.taskHasMore = false;
 							this.loadStatus='noMore';
 						}
-						//下面的isOne没有看太明白，后续要去掉
-						if (this.isOne) {
-							//this.value = this.taskCount;
-						}
-						if (this.isOne && res.data.records.length == 0) {
-							this.tabIndex = 1;
-						}
+						//检查是否是第一次加载，这里的控制已经移到 初次加载中了
+						//if (this.isOne && res.data.records.length == 0) {
+							//this.tabIndex = 1;
+						//}
 						this.isOne = false;
 					}else{
 						uni.showToast({

From 8039b1271e33ec2037829ca6f5d975c901a14f10 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 18 Jul 2023 11:57:58 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/manifest.json b/manifest.json
index b5f9da6..3ff84be 100644
--- a/manifest.json
+++ b/manifest.json
@@ -81,22 +81,22 @@
                         "^/systemapi" : ""
                     }
                 },
-				"/userbasic" : {
-				    "target" : "https://u-pre.boe.com",
-				    "changeOrigin" : true,
-				    "secure" : false,
-				    "pathRewrite" : {
-				        "^/userbasic" : "/userbasic"
-				    }
-				},
-				"/manageApi" : {
-				    "target" : "https://u-pre.boe.com",
-				    "changeOrigin" : true,
-				    "secure" : false,
-				    "pathRewrite" : {
-				        "^/manageApi" : "/manageApi"
-				    }
-				},
+                "/userbasic" : {
+                    "target" : "https://u-pre.boe.com",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/userbasic" : "/userbasic"
+                    }
+                },
+                "/manageApi" : {
+                    "target" : "https://u-pre.boe.com",
+                    "changeOrigin" : true,
+                    "secure" : false,
+                    "pathRewrite" : {
+                        "^/manageApi" : "/manageApi"
+                    }
+                },
                 "/uboeApi" : {
                     "target" : "https://u-pre.boe.com",
                     "changeOrigin" : true,