bug修复

config/dev.env.ts

@@ -1,13 +1,15 @@
+const domian = 'openpc.openimhailiao.com'
+
 export default {
-	NODE_ENV: 'development',
-	CHAT_URL: 'https://openimadmin.app12345.cn/chat',
-	API_URL: 'https://openimadmin.app12345.cn/api',
-	WS_URL: 'wss://openimadmin.app12345.cn/msg_gateway',
-	//CHAT_URL: "http://120.77.93.35:10008",
-	//API_URL: "http://120.77.93.35:10002",
-	//WS_URL: "ws://120.77.93.35:10001",
-	OBJECT_STORAGE: 'minio',
-	AMAP_KEY: '36e6a7bb847411f06258d03b066ecc67',//jsapi
-	AMAP_SNAP_KEY: '39b41b2a48453d7e66007c6f45d26a12',
-	VERSION: 'HI.CHAT 1.0.50',
-}
+  NODE_ENV: 'development',
+  CHAT_URL: `https://${domian}/chat`,
+  API_URL: `https://${domian}/api`,
+  WS_URL: `wss://${domian}/msg_gateway`,
+  //CHAT_URL: "http://120.77.93.35:10008",
+  //API_URL: "http://120.77.93.35:10002",
+  //WS_URL: "ws://120.77.93.35:10001",
+  OBJECT_STORAGE: 'minio',
+  AMAP_KEY: '36e6a7bb847411f06258d03b066ecc67', //jsapi
+  AMAP_SNAP_KEY: '39b41b2a48453d7e66007c6f45d26a12',
+  VERSION: 'HI.CHAT 1.0.50',
+}

src/pages/login/register/index.vue

@@ -69,15 +69,15 @@
 				</div>
 
 				<!-- 服务协议 -->
-				<div class="tips">
+				<!-- <div class="tips">
 					<van-checkbox v-model="checked"></van-checkbox> 我已阅读并同意 <a
 						href="https://changliaoadmin.app12345.cn/contnent">《软件许可及服务协议》</a> 本页收集的信息仅用于注册账号
-				</div>
+				</div> -->
 
 				<!-- 提交按钮，只有勾选了服务协议才可以提交 -->
 				<van-button :loading="loading" :disabled="!checked || !validateForm()" block type="success"
 					native-type="submit">
-					同意并继续
+					注册
 				</van-button>
 			</van-form>
 
@@ -98,7 +98,8 @@
 	} from 'vant';
 	import {
 		register,
-		sendSms
+		sendSms,
+		login
 	} from '@/api/login';
 	import countryCode from '@/utils/areaCode';
 	import {
@@ -120,7 +121,7 @@
 		isByEmail: boolean
 	} > ()
 	const isByEmail = props.isByEmail; // 是否使用邮箱注册
-	const checked = ref(false); // 是否勾选服务协议
+	const checked = ref(true); // 是否勾选服务协议
 	const loading = ref(false); // 是否显示加载动画
 	const showAreaCode = ref(false); // 是否显示国家/地区选择弹窗
 	const count = ref(0); // 倒计时
@@ -145,6 +146,30 @@
 		birth: 0,
 	});
 
+	const loginHandle = async () => {
+		localStorage.setItem("IMAccount", formData.phoneNumber); // 保存手机号到本地存储
+			const {
+				data: {
+					chatToken,
+					imToken,
+					userID
+				}
+			} = await login({
+				email: formData.email,
+				phoneNumber: formData.phoneNumber,
+				verifyCode: formData.verificationCode,
+				password: formData.password ? md5(formData.password) : '', // 密码MD5加密
+				areaCode: formData.areaCode
+			});
+
+			setIMProfile({
+				chatToken,
+				imToken,
+				userID
+			}); // 保存登录信息
+			router.push('/conversation'); // 跳转到会话页面
+	}
+
 	// 表单提交时的处理逻辑
 	const onSubmit = async () => {
 		loading.value = true;
@@ -183,9 +208,11 @@
 			}); // 设置用户IM资料
 			feedbackToast({
 				message: t("注册成功"),
-				onClose: () => router.push('login'),
+				// onClose: () => router.push('login'),
+				onClose: () => loginHandle()
 			});
-			router.push('login'); // 注册成功后跳转至登录页面
+			// loginHandle()
+			// router.push('login'); // 注册成功后跳转至登录页面
 		} catch (error) {
 
 			const errorMessages: Record < number, string > = {

src/pages/moments/index/components/MomentsHeader.vue

@@ -1,8 +1,8 @@
 <template>
 	<div>
-		<van-nav-bar placeholder fixed left-arrow :clickable="false" :border="false" @click-left="router.back()">
+		<van-nav-bar placeholder fixed left-arrow :clickable="false" :border="false" >
 			<template #left>
-				<img class="h-5 w-3" :src="arrows" alt="" />
+				<!-- <img class="h-5 w-3" :src="arrows" alt="" /> -->
 			</template>
 
 			<template #right>

src/pages/profile/index/index.vue

@@ -84,11 +84,11 @@
 			title: t("profileMenu.accountSetting"),
 			route: 'accountSettings'
 		},
-		{
-			icon: about,
-			title: t("profileMenu.aboutUs"),
-			route: 'about'
-		},
+		// {
+		// 	icon: about,
+		// 	title: t("profileMenu.aboutUs"),
+		// 	route: 'about'
+		// },
 		{
 			icon: logout,
 			title: t("profileMenu.logOut"),
@@ -99,8 +99,8 @@
 	watch(locale, () => {
 		profileMenus1[0].title = t("profileMenu.personalInformation");
 		profileMenus[0].title = t("profileMenu.accountSetting");
-		profileMenus[1].title = t("profileMenu.aboutUs");
-		profileMenus[2].title = t("profileMenu.logOut");
+		// profileMenus[1].title = t("profileMenu.aboutUs");
+		profileMenus[1].title = t("profileMenu.logOut");
 	});
 
 	const router = useRouter()