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

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

View File

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

View File

@ -1,47 +1,49 @@
<template>
<view class="page">
<u-navbar
:background="bgc"
:border-bottom="false"
:is-back="false"
:title="titleTxt"
:border-bottom="false"
:background="bgc"
height="36"
title-color="#000"
title-size="36"
height="36"
>
</u-navbar>
<view class="imgbox">
<image
src="https://api.ccttiot.com/e3227491d46d2d7ac1c1c592e44f48bc-1754467412954.jpg"
mode=""
src="https://api.ccttiot.com/e3227491d46d2d7ac1c1c592e44f48bc-1754467412954.jpg"
></image>
</view>
<button class="button" @click="getPhoneNumber">授权登录</button>
<button class="button" @click="goToLogin">授权登录</button>
<view class="tip">
<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>
</view>
</view>
<text>我已同意并阅读</text>
<text class="link-text" @click="showServiceTerms">服务条款</text>
<text class="link-text" @click="showPrivacyPolicy">法律条款及隐私政策</text>
<text class="link-text" @click="showPrivacyPolicy"
>法律条款及隐私政策
</text>
</view>
<!-- 服务条款弹窗 -->
<u-popup
v-model="showServiceTermsPopup"
border-radius="20rpx"
height="800rpx"
mode="center"
width="600rpx"
height="800rpx"
border-radius="20rpx"
>
<view class="popup-content">
<view class="popup-header">
<text class="popup-title">服务条款</text>
<text class="popup-close" @click="closeServiceTermsPopup">×</text>
</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">
<rich-text :nodes="serviceTermsContent"></rich-text>
</view>
@ -56,17 +58,17 @@
<!-- 隐私政策弹窗 -->
<u-popup
v-model="showPrivacyPolicyPopup"
border-radius="20rpx"
height="800rpx"
mode="center"
width="600rpx"
height="800rpx"
border-radius="20rpx"
>
<view class="popup-content">
<view class="popup-header">
<text class="popup-title">法律条款及隐私政策</text>
<text class="popup-close" @click="closePrivacyPolicyPopup">×</text>
</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">
<rich-text :nodes="privacyPolicyContent"></rich-text>
</view>
@ -81,424 +83,402 @@
</template>
<script>
import { navigateToPage } from '@/utils/router.js'
import { wxLogin } from '@/api/auth/auth.js'
import { forceHideLoading, AutoLoadingManager } from '@/utils/request.js'
import { getServiceTerms, getPrivacyPolicy } from '@/api/article/article.js'
import { navigateToPage } from "@/utils/router.js";
import { wxLogin } from "@/api/auth/auth.js";
import { AutoLoadingManager, forceHideLoading } from "@/utils/request.js";
import { getPrivacyPolicy, getServiceTerms } from "@/api/article/article.js";
export default {
data() {
return {
bgc: {
backgroundColor: '#fff',
},
titleTxt: '登录',
chooseType: true,
usertype: '',
login: false,
hasAgreed: false, //
hasReadServiceTerms: false, //
hasReadPrivacyPolicy: false, //
showServiceTermsPopup: false, //
showPrivacyPolicyPopup: false, //
serviceTermsContent: '', //
privacyPolicyContent: '', //
scrollTop: 0, //
export default {
data() {
return {
bgc: {
backgroundColor: "#fff",
},
titleTxt: "登录",
chooseType: true,
usertype: "",
login: false,
hasAgreed: false, //
hasReadServiceTerms: false, //
hasReadPrivacyPolicy: false, //
showServiceTermsPopup: false, //
showPrivacyPolicyPopup: false, //
serviceTermsContent: "", //
privacyPolicyContent: "", //
scrollTop: 0, //
};
},
onLoad() {
// loading
this.pageLoading = new AutoLoadingManager();
},
onUnload() {
// loading
forceHideLoading();
if (this.pageLoading) {
this.pageLoading.destroy();
}
},
methods: {
userType(num) {
this.chooseType = false;
this.login = true;
if (num === 1) {
this.usertype = "01";
} else {
this.usertype = "00";
}
},
onLoad() {
// loading
this.pageLoading = new AutoLoadingManager()
//
toggleAgreement() {
this.hasAgreed = true;
},
onUnload() {
// loading
forceHideLoading()
if (this.pageLoading) {
this.pageLoading.destroy()
//
async showServiceTerms() {
try {
const res = await getServiceTerms();
if (res.code === 200 && res.data) {
//
let content = res.data.content || "暂无服务条款内容";
// HTML
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>`;
this.serviceTermsContent = content;
this.showServiceTermsPopup = true;
//
this.scrollTop = 0;
} else {
uni.showToast({
title: "获取服务条款失败",
icon: "none",
});
}
} catch (error) {
console.error("获取服务条款失败:", error);
uni.showToast({
title: "获取服务条款失败",
icon: "none",
});
}
},
methods: {
userType(num) {
this.chooseType = false
this.login = true
if (num === 1) {
this.usertype = '01'
} else {
this.usertype = '00'
}
},
//
toggleAgreement() {
if (this.hasReadServiceTerms && this.hasReadPrivacyPolicy) {
this.hasAgreed = !this.hasAgreed
//
async showPrivacyPolicy() {
try {
const res = await getPrivacyPolicy();
if (res.code === 200 && res.data) {
//
let content = res.data.content || "暂无隐私政策内容";
// HTML
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>`;
this.privacyPolicyContent = content;
this.showPrivacyPolicyPopup = true;
//
this.scrollTop = 0;
} else {
uni.showToast({
title: '请先阅读服务条款和隐私政策',
icon: 'none',
})
title: "获取隐私政策失败",
icon: "none",
});
}
},
//
async showServiceTerms() {
try {
const res = await getServiceTerms()
if (res.code === 200 && res.data) {
//
let content = res.data.content || '暂无服务条款内容'
// HTML
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>`
this.serviceTermsContent = content
this.showServiceTermsPopup = true
//
this.scrollTop = 0
} else {
uni.showToast({
title: '获取服务条款失败',
icon: 'none',
})
}
} catch (error) {
console.error('获取服务条款失败:', error)
uni.showToast({
title: '获取服务条款失败',
icon: 'none',
})
}
},
//
async showPrivacyPolicy() {
try {
const res = await getPrivacyPolicy()
if (res.code === 200 && res.data) {
//
let content = res.data.content || '暂无隐私政策内容'
// HTML
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>`
this.privacyPolicyContent = content
this.showPrivacyPolicyPopup = true
//
this.scrollTop = 0
} else {
uni.showToast({
title: '获取隐私政策失败',
icon: 'none',
})
}
} catch (error) {
console.error('获取隐私政策失败:', error)
uni.showToast({
title: '获取隐私政策失败',
icon: 'none',
})
}
},
//
closeServiceTermsPopup() {
this.showServiceTermsPopup = false
},
//
closePrivacyPolicyPopup() {
this.showPrivacyPolicyPopup = false
},
//
async agreeServiceTerms() {
this.hasReadServiceTerms = true
this.closeServiceTermsPopup()
this.checkAgreementStatus()
} catch (error) {
console.error("获取隐私政策失败:", error);
uni.showToast({
title: "获取隐私政策失败",
icon: "none",
});
}
},
//
closeServiceTermsPopup() {
this.showServiceTermsPopup = false;
},
//
closePrivacyPolicyPopup() {
this.showPrivacyPolicyPopup = false;
},
//
async agreeServiceTerms() {
this.hasReadServiceTerms = true;
this.closeServiceTermsPopup();
this.checkAgreementStatus();
},
//
async agreePrivacyPolicy() {
this.hasReadPrivacyPolicy = true;
this.closePrivacyPolicyPopup();
this.checkAgreementStatus();
},
//
checkAgreementStatus() {
if (this.hasReadServiceTerms && this.hasReadPrivacyPolicy) {
//
this.hasAgreed = true;
}
},
//
if (!this.hasReadPrivacyPolicy) {
setTimeout(() => {
this.showPrivacyPolicy()
}, 500) // 500ms
}
},
//
async agreePrivacyPolicy() {
this.hasReadPrivacyPolicy = true
this.closePrivacyPolicyPopup()
this.checkAgreementStatus()
goToLogin() {
this.$u.throttle(this.Login, 3000);
},
//
if (!this.hasReadServiceTerms) {
setTimeout(() => {
this.showServiceTerms()
}, 500) // 500ms
}
},
//
checkAgreementStatus() {
if (this.hasReadServiceTerms && this.hasReadPrivacyPolicy) {
//
this.hasAgreed = true
}
},
async Login() {
if (!this.hasAgreed) {
const confirmed = await this.showLoginConfirmation();
if (!confirmed) return;
}
//
async showUnreadTerms() {
//
if (!this.hasReadServiceTerms) {
await this.showServiceTerms()
return
}
uni.login({
success(res) {
if (res.code) {
console.log("登录!", res);
let data = {
loginCode: res.code,
appId: 1,
};
//
if (!this.hasReadPrivacyPolicy) {
await this.showPrivacyPolicy()
return
}
},
getPhoneNumber() {
//
if (!this.hasReadServiceTerms || !this.hasReadPrivacyPolicy) {
uni.showToast({
title: '请先阅读服务条款和隐私政策',
icon: 'none',
duration: 2000,
})
//
this.showUnreadTerms()
return
}
let that = this
uni.login({
success(res) {
if (res.code) {
console.log('登录!', res)
let data = {
loginCode: res.code,
appId: 1,
}
// loading
if (that.pageLoading) {
that.pageLoading.show('登录中...')
}
wxLogin(data)
.then(res => {
// loading
if (that.pageLoading) {
that.pageLoading.hide()
}
forceHideLoading()
if (res.code == 200) {
console.log(res, 'resres')
uni.setStorageSync('token', res.token)
//
uni.showToast({
title: '登录成功',
icon: 'success',
duration: 1500,
})
//
setTimeout(() => {
that.ceshi()
}, 1500)
} else {
//
uni.showToast({
title: res.msg || '登录失败',
icon: 'none',
})
}
})
.catch(error => {
// loading
if (that.pageLoading) {
that.pageLoading.hide()
}
forceHideLoading()
console.error('登录失败:', error)
uni.showToast({
title: '登录失败',
icon: 'none',
})
})
// loading
if (this.pageLoading) {
this.pageLoading.show("登录中...");
}
},
fail(err) {
console.error('微信登录失败:', err)
uni.showToast({
title: '微信登录失败',
icon: 'none',
})
},
})
},
async ceshi() {
// loading
if (this.pageLoading) {
this.pageLoading.hide()
}
forceHideLoading()
// 使
navigateToPage('index')
},
wxLogin(data)
.then((res) => {
// loading
if (this.pageLoading) {
this.pageLoading.hide();
}
forceHideLoading();
if (res.code == 200) {
console.log(res, "resres");
uni.setStorageSync("token", res.token);
//
uni.showToast({
title: "登录成功",
icon: "success",
duration: 1500,
});
//
setTimeout(() => {
if (this.pageLoading) {
this.pageLoading.hide();
}
forceHideLoading();
// 使
navigateToPage("index");
}, 1500);
} else {
//
uni.showToast({
title: res.msg || "登录失败",
icon: "none",
});
}
})
.catch((error) => {
// loading
if (this.pageLoading) {
this.pageLoading.hide();
}
forceHideLoading();
console.error("登录失败:", error);
uni.showToast({
title: "登录失败",
icon: "none",
});
});
}
},
fail(err) {
console.error("微信登录失败:", err);
uni.showToast({
title: "微信登录失败",
icon: "none",
});
},
});
},
}
//
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>
<style lang="scss">
page {
background: #ffffff;
}
.page {
position: relative; /* 添加相对定位 */
}
page {
background: #ffffff;
}
.imgbox {
margin: 102rpx auto;
.page {
position: relative; /* 添加相对定位 */
}
.imgbox {
margin: 102rpx auto;
width: 750rpx;
height: 422rpx;
z-index: 0;
image {
width: 750rpx;
height: 422rpx;
z-index: 0;
}
}
image {
width: 750rpx;
height: 422rpx;
}
}
.button {
margin-top: 200rpx;
width: 586rpx;
height: 90rpx;
background: #4c97e7;
border-radius: 54rpx 54rpx 54rpx 54rpx;
font-weight: 500;
font-size: 40rpx;
color: #ffffff;
}
.button {
margin-top: 200rpx;
width: 586rpx;
height: 90rpx;
background: #4c97e7;
border-radius: 54rpx 54rpx 54rpx 54rpx;
font-weight: 500;
font-size: 40rpx;
color: #ffffff;
}
.tip {
margin-top: 128rpx;
display: flex;
flex-wrap: nowrap;
align-items: center;
justify-content: center;
font-weight: 400;
font-size: 20rpx;
color: #979797;
.link-text {
color: #4c97e7;
text-decoration: underline;
}
}
.tip {
margin-top: 128rpx;
display: flex;
flex-wrap: nowrap;
align-items: center;
justify-content: center;
font-weight: 400;
font-size: 20rpx;
color: #979797;
/* 自定义勾选按钮样式 */
.checkbox-container {
display: flex;
align-items: center;
margin-right: 10rpx;
cursor: pointer;
.link-text {
color: #4c97e7;
text-decoration: underline;
}
}
.checkbox {
width: 26rpx;
height: 26rpx;
border: 2rpx solid #cccccc;
border-radius: 4rpx;
display: flex;
align-items: center;
justify-content: center;
background-color: #ffffff;
transition: all 0.3s ease;
}
/* 自定义勾选按钮样式 */
.checkbox-container {
display: flex;
align-items: center;
margin-right: 10rpx;
cursor: pointer;
}
.checkbox.checked {
background-color: #4c97e7;
border-color: #4c97e7;
}
.checkbox {
width: 26rpx;
height: 26rpx;
border: 2rpx solid #cccccc;
border-radius: 4rpx;
display: flex;
align-items: center;
justify-content: center;
background-color: #ffffff;
transition: all 0.3s ease;
}
.checkmark {
color: #ffffff;
font-size: 16rpx;
font-weight: bold;
line-height: 1;
}
.checkbox.checked {
background-color: #4c97e7;
border-color: #4c97e7;
}
/* 弹窗样式 */
.popup-content {
background: #fff;
border-radius: 20rpx;
overflow: hidden;
display: flex;
flex-direction: column;
height: 100%;
}
.checkmark {
color: #ffffff;
font-size: 16rpx;
font-weight: bold;
line-height: 1;
}
.popup-header {
padding: 30rpx;
border-bottom: 1rpx solid #eee;
display: flex;
justify-content: space-between;
align-items: center;
background: #f8f8f8;
}
/* 弹窗样式 */
.popup-content {
background: #fff;
border-radius: 20rpx;
overflow: hidden;
display: flex;
flex-direction: column;
height: 100%;
}
.popup-title {
font-size: 32rpx;
font-weight: bold;
color: #333;
}
.popup-header {
padding: 30rpx;
border-bottom: 1rpx solid #eee;
display: flex;
justify-content: space-between;
align-items: center;
background: #f8f8f8;
}
.popup-close {
font-size: 40rpx;
color: #999;
cursor: pointer;
padding: 10rpx;
}
.popup-title {
font-size: 32rpx;
font-weight: bold;
color: #333;
}
.popup-body {
flex: 1;
padding: 30rpx;
line-height: 1.6;
font-size: 28rpx;
color: #333;
height: 0; /* 确保scroll-view有固定高度 */
}
.popup-close {
font-size: 40rpx;
color: #999;
cursor: pointer;
padding: 10rpx;
}
.terms-content {
word-wrap: break-word;
word-break: break-all;
line-height: 1.6;
font-size: 28rpx;
color: #333;
padding-bottom: 20rpx; /* 底部留白 */
padding-right: 30rpx; /* 右边距 */
}
.popup-body {
flex: 1;
padding: 30rpx;
line-height: 1.6;
font-size: 28rpx;
color: #333;
height: 0; /* 确保scroll-view有固定高度 */
}
.popup-footer {
padding: 30rpx;
border-top: 1rpx solid #eee;
background: #f8f8f8;
}
.terms-content {
word-wrap: break-word;
word-break: break-all;
line-height: 1.6;
font-size: 28rpx;
color: #333;
padding-bottom: 20rpx; /* 底部留白 */
padding-right: 30rpx; /* 右边距 */
}
.popup-tip {
display: block;
font-size: 24rpx;
color: #666;
text-align: center;
margin-bottom: 20rpx;
line-height: 1.4;
}
.popup-footer {
padding: 30rpx;
border-top: 1rpx solid #eee;
background: #f8f8f8;
}
.popup-btn {
width: 100%;
height: 80rpx;
background: #4c97e7;
color: #fff;
border: none;
border-radius: 40rpx;
font-size: 30rpx;
font-weight: 500;
}
.popup-tip {
display: block;
font-size: 24rpx;
color: #666;
text-align: center;
margin-bottom: 20rpx;
line-height: 1.4;
}
.popup-btn {
width: 100%;
height: 80rpx;
background: #4c97e7;
color: #fff;
border: none;
border-radius: 40rpx;
font-size: 30rpx;
font-weight: 500;
}
</style>

View File

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