From 8fff33bfb213fde9a8948fae94c42e8eacefbe56 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 27 Dec 2023 14:40:54 +0800
Subject: [PATCH] fix

---
 config/request.js                       |  4 ++--
 other/activityDetail/activityDetail.vue |  6 ++++--
 pages/index/index.vue                   |  3 ++-
 pages/login/login.vue                   |  3 ++-
 pages/person/person.vue                 | 27 ++++++++++++++++---------
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/config/request.js b/config/request.js
index c7a55e0..08ed423 100644
--- a/config/request.js
+++ b/config/request.js
@@ -6,8 +6,8 @@
 
 export default {
   // baseURL: 'https://huorantech.cn/',
-  // baseURL: 'http://192.168.31.217:10010/',
-  baseURL: 'http://124.71.79.122/',
+  baseURL: 'http://192.168.31.51:10010/',
+  // baseURL: 'http://124.71.79.122/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },
diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue
index 5159bf1..764b477 100644
--- a/other/activityDetail/activityDetail.vue
+++ b/other/activityDetail/activityDetail.vue
@@ -47,12 +47,12 @@
 		<view v-else class="list">
 			<view v-for="(item, i) in list" :key="i" class="item" @click="toDetail(item)">
 				<view class="top">
-					<image class="avatar" :src="item.userAvatars"></image>
+					<image class="avatar" :src="item.userAvatars || Common.avatar"></image>
 					<view class="name">{{ item.username }}</view>
 				</view>
 				
 				<view class="meta">组织名称：</view>
-				<view class="meta">手机号：</view>
+				<view class="meta">手机号：{{ item.phone }}</view>
 			</view>
 		</view>
 		
@@ -70,9 +70,11 @@
 <script>
 	import { getCompetition, individualEventRegistration, queryRegistrationByCondition } from '@/apis/modules/activity.js'
 	import Util from '@/libs/util'
+	import Common from '@/config/common'
 	export default {
 		data() {
 			return {
+				Common,
 				id: '',
 				curTab: 0,
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0e5e55b..825140f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -114,7 +114,8 @@
 			}
 		},
 		onShow() {
-			// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzAyMjg4MDEzLCJleHAiOjE3MDMxNTIwMTMsImFjY291bnRJZCI6IjEifQ.3dZSZAG7w8tSPU9DBL0VdULgkQmiZpYVzjf1qfxx5HY')
+			// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzAzNDk1ODY2LCJleHAiOjE3MDQzNTk4NjYsImFjY291bnRJZCI6IjQ5MzEifQ.A5tQewZlfVz3yiQCjPscWXvyXjOJmWzheG5b82siZl4')
+			// uni.setStorageSync('openId', 'o3hKk686kGjgMygKdPTJd5KQQ7CA')
 			this.keyword = ''
 			this.per = true
 			this.initList()
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 650ad69..4678c56 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -78,7 +78,8 @@
 			}
 		},
 		onShow() {
-				// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzAyMjg4MDEzLCJleHAiOjE3MDMxNTIwMTMsImFjY291bnRJZCI6IjEifQ.3dZSZAG7w8tSPU9DBL0VdULgkQmiZpYVzjf1qfxx5HY')
+			// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzAzNDk1ODY2LCJleHAiOjE3MDQzNTk4NjYsImFjY291bnRJZCI6IjQ5MzEifQ.A5tQewZlfVz3yiQCjPscWXvyXjOJmWzheG5b82siZl4')
+			// uni.setStorageSync('openId', 'o3hKk686kGjgMygKdPTJd5KQQ7CA')
 			// 先授权用户信息，再授权手机号
 			this.checkLogin()
 		},
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 868e124..46d7c5f 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -82,8 +82,10 @@
 			
 			<view v-else class="block" style="padding-bottom: 0;">
 				<view class="identity">
-					<view class="title">我是{{ platformName }}</view>
-					<view v-if="!isMember" class="badge">{{ platformName }}负责人</view>
+					<view class="left">
+						<view class="title">我是{{ platformName }}</view>
+						<view v-if="!isMember" class="badge">{{ platformName }}负责人</view>
+					</view>
 					<view class="auth">{{ auditStatus }}</view>
 				</view>
 				<view class="identity-bg">
@@ -213,14 +215,14 @@
 					openId: this.openId
 				})
 				// status为false，说明用户被删除了，则退出登录
-				if (result.status === false) {
-					this.$util.errMsg(result.message)
-					setTimeout(() => {
-						uni.clearStorageSync()
-						this.$util.to('/pages/login/login')
-					}, 1500)
-					return false
-				}
+				// if (result.status === false) {
+				// 	this.$util.errMsg(result.message)
+				// 	setTimeout(() => {
+				// 		uni.clearStorageSync()
+				// 		this.$util.to('/pages/login/login')
+				// 	}, 1500)
+				// 	return false
+				// }
 				
 				if (result.hrUserInfo) {
 					if (!result.hrUserInfo.userAvatars) result.hrUserInfo.userAvatars = Common.avatar // 没有头像则显示默认头像
@@ -435,11 +437,16 @@
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
+	.left {
+		display: inline-flex;
+		align-items: center;
+	}
 	.title {
 		margin-bottom: 0;
 	}
 	.badge {
 		padding: 8rpx 16rpx;
+		margin-left: 20rpx;
 		font-size: 24rpx;
 		color: #fff;
 		background-color: #37cc07;