WindowBird/buddhism
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化登录逻辑，提交登录请求的节流

Browse Source
This commit is contained in:
WindowBird 2025-09-05 09:09:25 +08:00
parent 33352da106
commit 802bb504d0
3 changed files with 379 additions and 398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main.js
View File

@ -25,6 +25,7 @@ import PageScrollMixin from "./mixins/page-scroll-mixin.js";
Vue.use("tab-bar", tabbar); Vue.use("tab-bar", tabbar);
Vue.use(uView); Vue.use(uView);
uni.$u.config.unit = "rpx"; uni.$u.config.unit = "rpx";
Vue.use(cookies); Vue.use(cookies);
Vue.config.productionTip = false; Vue.config.productionTip = false;

370
pages/login/login.vue
View File

@ -1,47 +1,49 @@
<template> <template>
<view class="page"> <view class="page">
<u-navbar <u-navbar
:background="bgc"
:border-bottom="false"
:is-back="false" :is-back="false"
:title="titleTxt" :title="titleTxt"
:border-bottom="false" height="36"
:background="bgc"
title-color="#000" title-color="#000"
title-size="36" title-size="36"
height="36"
> >
</u-navbar> </u-navbar>
<view class="imgbox"> <view class="imgbox">
<image <image
src="https://api.ccttiot.com/e3227491d46d2d7ac1c1c592e44f48bc-1754467412954.jpg"
mode="" mode=""
src="https://api.ccttiot.com/e3227491d46d2d7ac1c1c592e44f48bc-1754467412954.jpg"
></image> ></image>
</view> </view>
<button class="button" @click="getPhoneNumber">授权登录</button> <button class="button" @click="goToLogin">授权登录</button>
<view class="tip"> <view class="tip">
<view class="checkbox-container" @click="toggleAgreement"> <view class="checkbox-container" @click="toggleAgreement">
<view class="checkbox" :class="{ checked: hasAgreed }"> <view :class="{ checked: hasAgreed }" class="checkbox">
<text v-if="hasAgreed" class="checkmark">✓</text> <text v-if="hasAgreed" class="checkmark">✓</text>
</view> </view>
</view> </view>
<text>我已同意并阅读</text> <text>我已同意并阅读</text>
<text class="link-text" @click="showServiceTerms">《服务条款》</text> <text class="link-text" @click="showServiceTerms">《服务条款》</text>
<text class="link-text" @click="showPrivacyPolicy">《法律条款及隐私政策》</text> <text class="link-text" @click="showPrivacyPolicy"
>《法律条款及隐私政策》
</text>
</view> </view>
<!-- 服务条款弹窗 --> <!-- 服务条款弹窗 -->
<u-popup <u-popup
v-model="showServiceTermsPopup" v-model="showServiceTermsPopup"
border-radius="20rpx"
height="800rpx"
mode="center" mode="center"
width="600rpx" width="600rpx"
height="800rpx"
border-radius="20rpx"
> >
<view class="popup-content"> <view class="popup-content">
<view class="popup-header"> <view class="popup-header">
<text class="popup-title">服务条款</text> <text class="popup-title">服务条款</text>
<text class="popup-close" @click="closeServiceTermsPopup">×</text> <text class="popup-close" @click="closeServiceTermsPopup">×</text>
</view> </view>
<scroll-view class="popup-body" scroll-y="true" :scroll-top="scrollTop"> <scroll-view :scroll-top="scrollTop" class="popup-body" scroll-y="true">
<view class="terms-content"> <view class="terms-content">
<rich-text :nodes="serviceTermsContent"></rich-text> <rich-text :nodes="serviceTermsContent"></rich-text>
</view> </view>
@ -56,17 +58,17 @@
<!-- 隐私政策弹窗 --> <!-- 隐私政策弹窗 -->
<u-popup <u-popup
v-model="showPrivacyPolicyPopup" v-model="showPrivacyPolicyPopup"
border-radius="20rpx"
height="800rpx"
mode="center" mode="center"
width="600rpx" width="600rpx"
height="800rpx"
border-radius="20rpx"
> >
<view class="popup-content"> <view class="popup-content">
<view class="popup-header"> <view class="popup-header">
<text class="popup-title">法律条款及隐私政策</text> <text class="popup-title">法律条款及隐私政策</text>
<text class="popup-close" @click="closePrivacyPolicyPopup">×</text> <text class="popup-close" @click="closePrivacyPolicyPopup">×</text>
</view> </view>
<scroll-view class="popup-body" scroll-y="true" :scroll-top="scrollTop"> <scroll-view :scroll-top="scrollTop" class="popup-body" scroll-y="true">
<view class="terms-content"> <view class="terms-content">
<rich-text :nodes="privacyPolicyContent"></rich-text> <rich-text :nodes="privacyPolicyContent"></rich-text>
</view> </view>
@ -81,282 +83,258 @@
</template> </template>
<script> <script>
import { navigateToPage } from '@/utils/router.js' import { navigateToPage } from "@/utils/router.js";
import { wxLogin } from '@/api/auth/auth.js' import { wxLogin } from "@/api/auth/auth.js";
import { forceHideLoading, AutoLoadingManager } from '@/utils/request.js' import { AutoLoadingManager, forceHideLoading } from "@/utils/request.js";
import { getServiceTerms, getPrivacyPolicy } from '@/api/article/article.js' import { getPrivacyPolicy, getServiceTerms } from "@/api/article/article.js";
export default { export default {
data() { data() {
return { return {
bgc: { bgc: {
backgroundColor: '#fff', backgroundColor: "#fff",
}, },
titleTxt: '登录', titleTxt: "登录",
chooseType: true, chooseType: true,
usertype: '', usertype: "",
login: false, login: false,
hasAgreed: false, // 是否同意条款 hasAgreed: false, // 是否同意条款
hasReadServiceTerms: false, // 是否已读服务条款 hasReadServiceTerms: false, // 是否已读服务条款
hasReadPrivacyPolicy: false, // 是否已读隐私政策 hasReadPrivacyPolicy: false, // 是否已读隐私政策
showServiceTermsPopup: false, // 服务条款弹窗 showServiceTermsPopup: false, // 服务条款弹窗
showPrivacyPolicyPopup: false, // 隐私政策弹窗 showPrivacyPolicyPopup: false, // 隐私政策弹窗
serviceTermsContent: '', // 服务条款内容 serviceTermsContent: "", // 服务条款内容
privacyPolicyContent: '', // 隐私政策内容 privacyPolicyContent: "", // 隐私政策内容
scrollTop: 0, // 滚动位置 scrollTop: 0, // 滚动位置
} };
}, },
onLoad() { onLoad() {
// 初始化页面loading管理器 // 初始化页面loading管理器
this.pageLoading = new AutoLoadingManager() this.pageLoading = new AutoLoadingManager();
}, },
onUnload() { onUnload() {
// 页面卸载时清除loading // 页面卸载时清除loading
forceHideLoading() forceHideLoading();
if (this.pageLoading) { if (this.pageLoading) {
this.pageLoading.destroy() this.pageLoading.destroy();
} }
}, },
methods: { methods: {
userType(num) { userType(num) {
this.chooseType = false this.chooseType = false;
this.login = true this.login = true;
if (num === 1) { if (num === 1) {
this.usertype = '01' this.usertype = "01";
} else { } else {
this.usertype = '00' this.usertype = "00";
} }
}, },
// 切换同意状态 // 切换同意状态
toggleAgreement() { toggleAgreement() {
if (this.hasReadServiceTerms && this.hasReadPrivacyPolicy) { this.hasAgreed = true;
this.hasAgreed = !this.hasAgreed
} else {
uni.showToast({
title: '请先阅读服务条款和隐私政策',
icon: 'none',
})
}
}, },
// 显示服务条款 // 显示服务条款
async showServiceTerms() { async showServiceTerms() {
try { try {
const res = await getServiceTerms() const res = await getServiceTerms();
if (res.code === 200 && res.data) { if (res.code === 200 && res.data) {
// 处理文本内容，确保正确换行和样式 // 处理文本内容，确保正确换行和样式
let content = res.data.content || '暂无服务条款内容' let content = res.data.content || "暂无服务条款内容";
// 将换行符转换为HTML换行标签 // 将换行符转换为HTML换行标签
content = content.replace(/\n/g, '<br/>') content = content.replace(/\n/g, "<br/>");
// 添加基本样式 // 添加基本样式
content = `<div style="word-wrap: break-word; word-break: break-all; line-height: 1.6; font-size: 28rpx; color: #333;">${content}</div>` content = `<div style="word-wrap: break-word; word-break: break-all; line-height: 1.6; font-size: 28rpx; color: #333;">${content}</div>`;
this.serviceTermsContent = content this.serviceTermsContent = content;
this.showServiceTermsPopup = true this.showServiceTermsPopup = true;
// 重置滚动位置 // 重置滚动位置
this.scrollTop = 0 this.scrollTop = 0;
} else { } else {
uni.showToast({ uni.showToast({
title: '获取服务条款失败', title: "获取服务条款失败",
icon: 'none', icon: "none",
}) });
} }
} catch (error) { } catch (error) {
console.error('获取服务条款失败:', error) console.error("获取服务条款失败:", error);
uni.showToast({ uni.showToast({
title: '获取服务条款失败', title: "获取服务条款失败",
icon: 'none', icon: "none",
}) });
} }
}, },
// 显示隐私政策 // 显示隐私政策
async showPrivacyPolicy() { async showPrivacyPolicy() {
try { try {
const res = await getPrivacyPolicy() const res = await getPrivacyPolicy();
if (res.code === 200 && res.data) { if (res.code === 200 && res.data) {
// 处理文本内容，确保正确换行和样式 // 处理文本内容，确保正确换行和样式
let content = res.data.content || '暂无隐私政策内容' let content = res.data.content || "暂无隐私政策内容";
// 将换行符转换为HTML换行标签 // 将换行符转换为HTML换行标签
content = content.replace(/\n/g, '<br/>') content = content.replace(/\n/g, "<br/>");
// 添加基本样式 // 添加基本样式
content = `<div style="word-wrap: break-word; word-break: break-all; line-height: 1.6; font-size: 28rpx; color: #333;">${content}</div>` content = `<div style="word-wrap: break-word; word-break: break-all; line-height: 1.6; font-size: 28rpx; color: #333;">${content}</div>`;
this.privacyPolicyContent = content this.privacyPolicyContent = content;
this.showPrivacyPolicyPopup = true this.showPrivacyPolicyPopup = true;
// 重置滚动位置 // 重置滚动位置
this.scrollTop = 0 this.scrollTop = 0;
} else { } else {
uni.showToast({ uni.showToast({
title: '获取隐私政策失败', title: "获取隐私政策失败",
icon: 'none', icon: "none",
}) });
} }
} catch (error) { } catch (error) {
console.error('获取隐私政策失败:', error) console.error("获取隐私政策失败:", error);
uni.showToast({ uni.showToast({
title: '获取隐私政策失败', title: "获取隐私政策失败",
icon: 'none', icon: "none",
}) });
} }
}, },
// 关闭服务条款弹窗 // 关闭服务条款弹窗
closeServiceTermsPopup() { closeServiceTermsPopup() {
this.showServiceTermsPopup = false this.showServiceTermsPopup = false;
}, },
// 关闭隐私政策弹窗 // 关闭隐私政策弹窗
closePrivacyPolicyPopup() { closePrivacyPolicyPopup() {
this.showPrivacyPolicyPopup = false this.showPrivacyPolicyPopup = false;
}, },
// 同意服务条款 // 同意服务条款
async agreeServiceTerms() { async agreeServiceTerms() {
this.hasReadServiceTerms = true this.hasReadServiceTerms = true;
this.closeServiceTermsPopup() this.closeServiceTermsPopup();
this.checkAgreementStatus() this.checkAgreementStatus();
// 如果隐私政策还未阅读，自动显示隐私政策
if (!this.hasReadPrivacyPolicy) {
setTimeout(() => {
this.showPrivacyPolicy()
}, 500) // 延迟500ms，让用户看到服务条款已同意
}
}, },
// 同意隐私政策 // 同意隐私政策
async agreePrivacyPolicy() { async agreePrivacyPolicy() {
this.hasReadPrivacyPolicy = true this.hasReadPrivacyPolicy = true;
this.closePrivacyPolicyPopup() this.closePrivacyPolicyPopup();
this.checkAgreementStatus() this.checkAgreementStatus();
// 如果服务条款还未阅读，自动显示服务条款
if (!this.hasReadServiceTerms) {
setTimeout(() => {
this.showServiceTerms()
}, 500) // 延迟500ms，让用户看到隐私政策已同意
}
}, },
// 检查同意状态 // 检查同意状态
checkAgreementStatus() { checkAgreementStatus() {
if (this.hasReadServiceTerms && this.hasReadPrivacyPolicy) { if (this.hasReadServiceTerms && this.hasReadPrivacyPolicy) {
// 如果都读完了，自动勾选同意 // 如果都读完了，自动勾选同意
this.hasAgreed = true this.hasAgreed = true;
} }
}, },
// 显示未阅读的条款 goToLogin() {
async showUnreadTerms() { this.$u.throttle(this.Login, 3000);
// 如果服务条款未阅读，先显示服务条款
if (!this.hasReadServiceTerms) {
await this.showServiceTerms()
return
}
// 如果隐私政策未阅读，显示隐私政策
if (!this.hasReadPrivacyPolicy) {
await this.showPrivacyPolicy()
return
}
}, },
getPhoneNumber() {
// 检查是否已阅读条款
if (!this.hasReadServiceTerms || !this.hasReadPrivacyPolicy) {
uni.showToast({
title: '请先阅读服务条款和隐私政策',
icon: 'none',
duration: 2000,
})
// 自动弹出未阅读的条款 async Login() {
this.showUnreadTerms() if (!this.hasAgreed) {
return const confirmed = await this.showLoginConfirmation();
if (!confirmed) return;
} }
let that = this
uni.login({ uni.login({
success(res) { success(res) {
if (res.code) { if (res.code) {
console.log('登录！', res) console.log("登录！", res);
let data = { let data = {
loginCode: res.code, loginCode: res.code,
appId: 1, appId: 1,
} };
// 显示页面loading // 显示页面loading
if (that.pageLoading) { if (this.pageLoading) {
that.pageLoading.show('登录中...') this.pageLoading.show("登录中...");
} }
wxLogin(data) wxLogin(data)
.then(res => { .then((res) => {
// 确保清除loading // 确保清除loading
if (that.pageLoading) { if (this.pageLoading) {
that.pageLoading.hide() this.pageLoading.hide();
} }
forceHideLoading() forceHideLoading();
if (res.code == 200) { if (res.code == 200) {
console.log(res, 'resres') console.log(res, "resres");
uni.setStorageSync('token', res.token) uni.setStorageSync("token", res.token);
// 显示成功提示 // 显示成功提示
uni.showToast({ uni.showToast({
title: '登录成功', title: "登录成功",
icon: 'success', icon: "success",
duration: 1500, duration: 1500,
}) });
// 延迟跳转，让用户看到成功提示 // 延迟跳转，让用户看到成功提示
setTimeout(() => { setTimeout(() => {
that.ceshi() if (this.pageLoading) {
}, 1500) this.pageLoading.hide();
}
forceHideLoading();
// 使用路由仓库跳转到首页
navigateToPage("index");
}, 1500);
} else { } else {
// 处理业务逻辑错误 // 处理业务逻辑错误
uni.showToast({ uni.showToast({
title: res.msg || '登录失败', title: res.msg || "登录失败",
icon: 'none', icon: "none",
}) });
} }
}) })
.catch(error => { .catch((error) => {
// 确保清除loading // 确保清除loading
if (that.pageLoading) { if (this.pageLoading) {
that.pageLoading.hide() this.pageLoading.hide();
} }
forceHideLoading() forceHideLoading();
console.error('登录失败:', error) console.error("登录失败:", error);
uni.showToast({ uni.showToast({
title: '登录失败', title: "登录失败",
icon: 'none', icon: "none",
}) });
}) });
} }
}, },
fail(err) { fail(err) {
console.error('微信登录失败:', err) console.error("微信登录失败:", err);
uni.showToast({ uni.showToast({
title: '微信登录失败', title: "微信登录失败",
icon: 'none', icon: "none",
}) });
}, },
}) });
}, },
async ceshi() {
// 确保清除loading状态
if (this.pageLoading) {
this.pageLoading.hide()
}
forceHideLoading()
// 使用路由仓库跳转到首页 // 显示登录确认弹窗
navigateToPage('index') showLoginConfirmation() {
return new Promise((resolve) => {
uni.showModal({
title: "确认登录",
content: "我已阅读并同意服务协议和隐私政策",
confirmText: "确定登录",
cancelText: "取消",
success: (res) => {
this.hasAgreed = res.confirm;
resolve(res.confirm);
},
fail: (err) => {
console.error("弹窗操作失败:", err);
resolve(false);
},
});
});
}, },
}, },
} };
</script> </script>
<style lang="scss"> <style lang="scss">
page { page {
background: #ffffff; background: #ffffff;
} }
.page {
position: relative; /* 添加相对定位 */
}
.imgbox { .page {
position: relative; /* 添加相对定位 */
}
.imgbox {
margin: 102rpx auto; margin: 102rpx auto;
width: 750rpx; width: 750rpx;
height: 422rpx; height: 422rpx;
@ -366,8 +344,9 @@
width: 750rpx; width: 750rpx;
height: 422rpx; height: 422rpx;
} }
} }
.button {
.button {
margin-top: 200rpx; margin-top: 200rpx;
width: 586rpx; width: 586rpx;
height: 90rpx; height: 90rpx;
@ -376,9 +355,9 @@
font-weight: 500; font-weight: 500;
font-size: 40rpx; font-size: 40rpx;
color: #ffffff; color: #ffffff;
} }
.tip { .tip {
margin-top: 128rpx; margin-top: 128rpx;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
@ -387,21 +366,22 @@
font-weight: 400; font-weight: 400;
font-size: 20rpx; font-size: 20rpx;
color: #979797; color: #979797;
.link-text { .link-text {
color: #4c97e7; color: #4c97e7;
text-decoration: underline; text-decoration: underline;
} }
} }
/* 自定义勾选按钮样式 */ /* 自定义勾选按钮样式 */
.checkbox-container { .checkbox-container {
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: 10rpx; margin-right: 10rpx;
cursor: pointer; cursor: pointer;
} }
.checkbox { .checkbox {
width: 26rpx; width: 26rpx;
height: 26rpx; height: 26rpx;
border: 2rpx solid #cccccc; border: 2rpx solid #cccccc;
@ -411,62 +391,62 @@
justify-content: center; justify-content: center;
background-color: #ffffff; background-color: #ffffff;
transition: all 0.3s ease; transition: all 0.3s ease;
} }
.checkbox.checked { .checkbox.checked {
background-color: #4c97e7; background-color: #4c97e7;
border-color: #4c97e7; border-color: #4c97e7;
} }
.checkmark { .checkmark {
color: #ffffff; color: #ffffff;
font-size: 16rpx; font-size: 16rpx;
font-weight: bold; font-weight: bold;
line-height: 1; line-height: 1;
} }
/* 弹窗样式 */ /* 弹窗样式 */
.popup-content { .popup-content {
background: #fff; background: #fff;
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
} }
.popup-header { .popup-header {
padding: 30rpx; padding: 30rpx;
border-bottom: 1rpx solid #eee; border-bottom: 1rpx solid #eee;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
background: #f8f8f8; background: #f8f8f8;
} }
.popup-title { .popup-title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
} }
.popup-close { .popup-close {
font-size: 40rpx; font-size: 40rpx;
color: #999; color: #999;
cursor: pointer; cursor: pointer;
padding: 10rpx; padding: 10rpx;
} }
.popup-body { .popup-body {
flex: 1; flex: 1;
padding: 30rpx; padding: 30rpx;
line-height: 1.6; line-height: 1.6;
font-size: 28rpx; font-size: 28rpx;
color: #333; color: #333;
height: 0; /* 确保scroll-view有固定高度 */ height: 0; /* 确保scroll-view有固定高度 */
} }
.terms-content { .terms-content {
word-wrap: break-word; word-wrap: break-word;
word-break: break-all; word-break: break-all;
line-height: 1.6; line-height: 1.6;
@ -474,24 +454,24 @@
color: #333; color: #333;
padding-bottom: 20rpx; /* 底部留白 */ padding-bottom: 20rpx; /* 底部留白 */
padding-right: 30rpx; /* 右边距 */ padding-right: 30rpx; /* 右边距 */
} }
.popup-footer { .popup-footer {
padding: 30rpx; padding: 30rpx;
border-top: 1rpx solid #eee; border-top: 1rpx solid #eee;
background: #f8f8f8; background: #f8f8f8;
} }
.popup-tip { .popup-tip {
display: block; display: block;
font-size: 24rpx; font-size: 24rpx;
color: #666; color: #666;
text-align: center; text-align: center;
margin-bottom: 20rpx; margin-bottom: 20rpx;
line-height: 1.4; line-height: 1.4;
} }
.popup-btn { .popup-btn {
width: 100%; width: 100%;
height: 80rpx; height: 80rpx;
background: #4c97e7; background: #4c97e7;
@ -500,5 +480,5 @@
border-radius: 40rpx; border-radius: 40rpx;
font-size: 30rpx; font-size: 30rpx;
font-weight: 500; font-weight: 500;
} }
</style> </style>

6
utils/request.js
View File

@ -17,18 +17,18 @@ import {
const ENV_CONFIG = { const ENV_CONFIG = {
develop: { develop: {
// 开发环境 // 开发环境
baseUrl: "http://192.168.2.244:4501", baseUrl: "http://192.168.2.58:4501",
//baseUrl: "https://testlu.chuangtewl.com/prod-api", //baseUrl: "https://testlu.chuangtewl.com/prod-api",
appId: 1, appId: 1,
}, },
trial: { trial: {
// 体验版 // 体验版
baseUrl: "http://192.168.2.244:4501", baseUrl: "http://192.168.2.58:4501",
appId: 1, appId: 1,
}, },
release: { release: {
// 正式版 // 正式版
baseUrl: "http://192.168.2.244:4501", baseUrl: "http://192.168.2.58:4501",
appId: 1, appId: 1,
}, },
}; };