Zory 1 месяц назад
Родитель
Сommit
49409803da
3 измененных файлов с 57 добавлено и 23 удалено
  1. 2 2
      奥莱优品/api/model/auth.js
  2. 43 6
      奥莱优品/pages/user/user.vue
  3. 12 15
      奥莱优品/static/js/request.js

+ 2 - 2
奥莱优品/api/model/auth.js

@@ -14,9 +14,9 @@ export default {
 		}
 	},
 	check: {
-		url: `/auth/check`,
+		url: `/auth/data`,
 		get: async function(data={}) {
-			return await request.request(this.url,"GET",data,false,true,false)
+			return await request.request(this.url,"GET",data,false,true,true)
 		}
 	}
 }

+ 43 - 6
奥莱优品/pages/user/user.vue

@@ -1,16 +1,25 @@
 <template>
 	<view class="content">
-		<view class="user-header">
+		<view class="user-header" v-if="userInfo">
+			<view class="avatar">
+				<image :src="userInfo?userInfo.avatar:'https://washmy.oss-cn-guangzhou.aliyuncs.com/storage/20260511/23627b2cb8f73a8a90b95c31d726e6ecad0cbb9a.png'"></image>
+			</view>
+			<view class="info">
+				<view class="name">{{userInfo.nickname}}</view>
+				<view class="desc">{{userInfo.mobile}}</view>
+			</view>
+		</view>
+		<view class="user-header" @click="toLogin" v-else>
 			<view class="avatar"><image src="/static/logo.jpg"></image></view>
 			<view class="info">
-				<view class="name">启动隆恰</view>
-				<view class="desc">180*******22</view>
+				<view class="name">请先登录</view>
+				<view class="desc"></view>
 			</view>
 		</view>
 		<view class="user-body" scroll-y scroll-with-animation>
 			<view class="user-menu">
 				<view class="title">我的服务</view>
-				<view class="menu-item">
+				<view class="menu-item" @click="toLink">
 					<view class="icon"><image src="/static/image/rule-rule.png"></image></view>
 					<view class="name">我的投诉</view>
 					<view class="right"><image src="/static/image/right.svg"></image></view>
@@ -40,17 +49,45 @@
 </template>
 
 <script>
+var app;
 export default {
 	data() {
 		return {
-
+			userInfo:null,
+			isLogin:null
 		}
+	},
+	onShow() {
+		this.getUser()
+	},
+	onLoad() {
+		app = this;
+		app.isLogin = uni.getStorageSync("user_token");
 	},
 	methods: {
+		async getUser(){
+			var resp = await app.$api.auth.check.get();
+			if (resp.code !== 1) return ;
+			app.userInfo = resp.data;
+		},
+		toLogin(){
+			this.$refs.loginCom.open();
+		},
+		toLink(){
+			if (!app.isLogin) {
+				this.$refs.loginCom.open();
+				return ;
+			}
+		},
 		loginSuccess(token){
-
+			app.getUser()
 		},
 		kfPop(){
+			const isLogin = uni.getStorageSync("user_token");
+			if (!isLogin) {
+				this.$refs.loginCom.open();
+				return ;
+			}
 			const data = uni.getStorageSync("contact");
 			this.$refs.kfService.open(data);
 		}

+ 12 - 15
奥莱优品/static/js/request.js

@@ -166,21 +166,18 @@ const axg = {
 					if (loadding && !hideLoading) {
 						uni.hideLoading()
 					}
-					if (res.data && res.data.code == 401) {
-						uni.showToast({
-							title: res.data.msg,
-							icon: 'none',
-							mask: true,
-							duration: 1500,
-							success() {
-								uni.clearStorageSync();
-								uni.navigateTo({
-									url:"/pages/auth/login"
-								});
-							}
-						});
-						return ;
-					}
+					// if (res.data && res.data.code == 401) {
+					// 	uni.showToast({
+					// 		title: res.data.msg,
+					// 		icon: 'none',
+					// 		mask: true,
+					// 		duration: 1500,
+					// 		success() {
+					// 			uni.clearStorageSync();
+					// 		}
+					// 	});
+					// 	return ;
+					// }
 					if (res.data && res.data.encode) {
 						try
 						{