he2802 hace 4 años
padre
commit
c3cc9c88e9
Se han modificado 3 ficheros con 16 adiciones y 19 borrados
  1. 5 7
      common/request.js
  2. 2 2
      pages2/course/detail.vue
  3. 9 10
      store/index.js

+ 5 - 7
common/request.js

@@ -53,19 +53,17 @@ export const myRequest = (options) => {
 		const res = await myRequest(datas)
 		if (res.data.code === 200) {
 			uni.setStorageSync('token', res.data.data.token)
-
-			var userInfo = {
+			
+			 var userInfo = {
 				url: '/getInfo',
 				method: 'get',
 			}
 			const resUser = await myRequest(userInfo)
 			if (resUser.data.code === 200) {
-				uni.setStorageSync('userInfo', res.data.data)
-				let onset = await myRequest(response)
-				return onset
-			}
+				store.state.userInfo = resUser.data.data
+			} 
 			let onset = await myRequest(response)
-			return onset
+			return onset 
 		} else {
 			uni.navigateTo({
 				url: '/pages/login/login'

+ 2 - 2
pages2/course/detail.vue

@@ -122,7 +122,7 @@
 				<view style="margin: 10rpx;">
 					<view class="tj_box" v-for="(item, index) in commendList" :key="index">
 						<image :src="$method.splitImgHost(item.coverUrl)" style="width: 320rpx;height: 160rpx;"></image>
-						<view style="font-size: 24rpx;color: #666666;d">{{ item.courseName }}</view>
+						<view style="font-size: 24rpx;color: #666666;text-align: left;">{{ item.courseName }}</view>
 						<view>
 							<u-row>
 								<u-col span="6">
@@ -162,7 +162,7 @@
 						<view
 							v-for="(item, index) in boxList"
 							:key="index"
-							style="height: 60rpx;line-height: 60rpx;border-bottom: 1rpx solid #eee;display: flex;align-items: center;justify-content: space-between;"
+							style="line-height: 60rpx;border-bottom: 1rpx solid #eee;display: flex;align-items: center;justify-content: space-between;padding: 15rpx 0;"
 							:style="infoData.sectionId === item.sectionId ? 'color:#1677ff;' : ''"
 							@click="getsec(item)"
 						>

+ 9 - 10
store/index.js

@@ -8,21 +8,14 @@ const store = new Vuex.Store({
         token: '',  
         avatarUrl: '',  
         userName: '',
-		userInfo:{
-			avatar:''
-		}
+		userInfo:null
     },  
 	 getters: {
 		userInfo: state => {
-			if(state.userInfo.avatar==''){
+			if(state.userInfo==null){
 				if(uni.getStorageSync('union_id')){
-					api.getInfo().then(resdata => {
-						if(resdata.data.code == 200){
-							state.userInfo = resdata.data.data;
-						}
-					});
+					getUserInfo(state)
 				}
-				
 			}
 			return state.userInfo
 		}
@@ -34,4 +27,10 @@ const store = new Vuex.Store({
         
     }  
 })  
+async function getUserInfo(state){
+	const resdata = await api.getInfo()
+	if(resdata.data.code == 200){
+		state.userInfo = resdata.data.data;
+	}
+}
 export default store