提交
This commit is contained in:
parent
9cdee03753
commit
cc9b56c5b4
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,13 @@
|
||||
<view class="mt-12 text-base text-dark">生命全周期健康管理伙伴</view>
|
||||
</view>
|
||||
<view class="login-btn-wrap">
|
||||
<button v-if="checked" class="login-btn" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
|
||||
<button
|
||||
v-if="checked"
|
||||
class="login-btn"
|
||||
type="primary"
|
||||
open-type="getPhoneNumber"
|
||||
@getphonenumber="getPhoneNumber"
|
||||
>
|
||||
手机号快捷登录
|
||||
</button>
|
||||
<!-- <button v-if="checked" class="login-btn" type="primary" @click="getPhoneNumber()">
|
||||
@ -15,7 +21,10 @@
|
||||
手机号快捷登录
|
||||
</button>
|
||||
</view>
|
||||
<view class="flex items-center justify-center mt-12 px-15" @click="checked = !checked">
|
||||
<view
|
||||
class="flex items-center justify-center mt-12 px-15"
|
||||
@click="checked = !checked"
|
||||
>
|
||||
<checkbox :checked="checked" style="transform: scale(0.7)" />
|
||||
<view class="text-sm text-gray">我已阅读并同意</view>
|
||||
<view class="text-sm text-primary">《用户协议》、</view>
|
||||
@ -76,8 +85,8 @@ async function getPhoneNumber(e) {
|
||||
await attempToPage(redirectUrl.value);
|
||||
} else if (res && !(doctorInfo.value && doctorInfo.value.anotherName)) {
|
||||
uni.redirectTo({
|
||||
url: '/pages/work/profile'
|
||||
})
|
||||
url: "/pages/work/profile",
|
||||
});
|
||||
} else if (res) {
|
||||
toHome();
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// SCSS 变量定义
|
||||
$font-size-text: 28rpx;
|
||||
$font-size-tip: 24rpx;
|
||||
$font-size-text: 30rpx;
|
||||
$font-size-tip: 28rpx;
|
||||
$font-size-title: 32rpx;
|
||||
$text-color-sub: #999;
|
||||
$primary-color: #0877F1;
|
||||
@ -331,7 +331,7 @@ $primary-color: #0877F1;
|
||||
}
|
||||
|
||||
.message-text {
|
||||
font-size: $font-size-text;
|
||||
font-size: 30rpx;
|
||||
line-height: 1.4;
|
||||
word-wrap: break-word;
|
||||
word-break: break-all;
|
||||
|
||||
@ -393,13 +393,13 @@ const checkLoginAndInitTIM = async () => {
|
||||
});
|
||||
const success = await initIMAfterLogin();
|
||||
uni.hideLoading();
|
||||
if (!success) {
|
||||
uni.showToast({
|
||||
title: "IM连接失败,请重试",
|
||||
icon: "none",
|
||||
});
|
||||
return;
|
||||
}
|
||||
// if (!success) {
|
||||
// uni.showToast({
|
||||
// title: "IM连接失败,请重试",
|
||||
// icon: "none",
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
} else if (!timChatManager.isLoggedIn) {
|
||||
uni.showLoading({
|
||||
title: "重连中...",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -41,6 +41,7 @@ export default defineStore("accountStore", () => {
|
||||
|
||||
async function loginByCode(phoneCode = '') {
|
||||
try {
|
||||
|
||||
const { code } = await uni.login({
|
||||
appid,
|
||||
provider: "weixin",
|
||||
@ -61,13 +62,12 @@ export default defineStore("accountStore", () => {
|
||||
}
|
||||
account.value = res.data;
|
||||
openid.value = res.data.openid;
|
||||
|
||||
// 持久化账户信息
|
||||
cache.set(CACHE_KEYS.ACCOUNT, res.data);
|
||||
cache.set(CACHE_KEYS.OPENID, res.data.openid);
|
||||
|
||||
// 登录成功后初始化腾讯IM
|
||||
await getDoctorInfo(openid.value);
|
||||
await getDoctorInfo({ openid: openid.value });
|
||||
await initIMAfterLogin();
|
||||
return res.data
|
||||
}
|
||||
@ -120,13 +120,13 @@ export default defineStore("accountStore", () => {
|
||||
throw new Error('无法获取用户ID');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const success = await initGlobalTIM(userID);
|
||||
if (!success) {
|
||||
console.error('initGlobalTIM 返回失败');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
isIMInitialized.value = true;
|
||||
return true;
|
||||
} catch (error) {
|
||||
|
||||
@ -283,7 +283,6 @@ function generateSendLink(survey, answerId, customerId, customerName, sendSurvey
|
||||
const { corpId, userId } = context;
|
||||
const isSystem = survey.createBy === 'system';
|
||||
let url = '';
|
||||
debugger
|
||||
if (isSystem) {
|
||||
// 系统问卷:使用 VITE_SURVEY_URL
|
||||
url = `${env?.MP_SURVEY_URL}?corpId=${corpId}&surveryId=${survey.surveryId}&memberId=${customerId}&sendSurveyId=${sendSurveyId}&userId=${userId}`;
|
||||
|
||||
@ -1030,6 +1030,11 @@ class TimChatManager {
|
||||
// 获取群聊列表
|
||||
getGroupList() {
|
||||
return new Promise((resolve, reject) => {
|
||||
// 检查userId是否存在,不存在则不需要初始化
|
||||
if (!this.currentUserID) {
|
||||
return
|
||||
}
|
||||
|
||||
// 如果 TIM 实例不存在,等待初始化
|
||||
if (!this.tim) {
|
||||
console.log('TIM实例不存在,等待初始化...')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user