合并解决冲突

api/boe/userbasic.js

@@ -75,6 +75,27 @@ const getInAudienceIds = function(userId) {
    // return ajax.post(baseURL,'/audience/audienceByUser',{});
 }
 
+
+/**
+ * 更新用户信息，当前只是列新三个信息,根据aid来更新
+ * aid
+ * avatar
+ * sign
+ */
+const updateUser = function(data) {
+    return ajax.postJson('/user/updateUserMessage',data);
+}
+
+/**退出*/
+const logout = function() {
+	let plat='h5';
+	var ua = navigator.userAgent.toLowerCase();
+	if(ua.match(/MicroMessenger/i) == "micromessenger") {
+	   plat='wechat';
+	}
+    return ajax.postJson('/logout',{"from":plat});
+}
+
 export default {
     userParentOrg,
     findOrgsByKeyword,
@@ -84,5 +105,7 @@ export default {
     getUserCrowds,
     getOrgHrbpInfo,
     modifyPassword,
-	getInAudienceIds
+	getInAudienceIds,
+	updateUser,
+	logout
 }

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{

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)

pages/login/loading.vue

@@ -53,7 +53,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)

pages/login/login.vue

@@ -47,11 +47,6 @@
 				}
 				console.log(pv,'=',options[pv]);
 			});
-			//if(params){
-				console.log(this.redirect+params)
-			//}
-			
-			
 		},
 		mounted() {
 			//对cookies进行操作，这里是写

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>
@@ -64,6 +62,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'
@@ -92,8 +91,6 @@
 				this.imgurl = rs.avatar;
 				this.load();
 			})
-		
-			
 		},
 		onLoad(){
 			//this.load()
@@ -102,7 +99,6 @@
 			logout() {
 				this.clearShow=true;
 			},
-			
 			updateHeadImg() {
 				let self=this;
 				if (this.fSelecting) return;
@@ -132,6 +128,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:'更新失败'
@@ -145,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;

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: {
@@ -64,7 +65,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)
@@ -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)

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() {