1.登录页面去除注册、忘记密码;2、登录页面去除底部隐私协议,默认选中;3、优化首页政策详情页面样式;4、token失效默认跳转到总集首页

This commit is contained in:
zxy
2024-03-23 14:43:24 +08:00
parent 881ea05ce7
commit 5733a0b299
4 changed files with 36 additions and 29 deletions

View File

@@ -11,10 +11,10 @@
<view v-if="loading" class="btn nocheck" loading="true">登录中</view> <view v-if="loading" class="btn nocheck" loading="true">登录中</view>
<view v-else-if="validate" class="btn" @click="login">立即登录</view> <view v-else-if="validate" class="btn" @click="login">立即登录</view>
<view v-else class="btn nocheck">立即登录</view> <view v-else class="btn nocheck">立即登录</view>
<view class="changeLogintype"> <!-- <view class="changeLogintype">
<view class="" @click="goReg">手机注册</view> <view class="" @click="goReg">手机注册</view>
<view class="" @click="goForget">忘记密码</view> <view class="" @click="goForget">忘记密码</view>
</view> </view> -->
</login-template> </login-template>
</template> </template>
@@ -73,12 +73,14 @@
}, },
login(e) { login(e) {
if (this.validate) { if (this.validate) {
if (!this.userChecked) { this.userChecked = true;
uni.showToast({ console.log(this.userChecked)
title:'请先阅读并同意《服务及隐私协议》', // if (!this.userChecked) {
icon:'none', // uni.showToast({
}) // title:'请先阅读并同意《服务及隐私协议》',
} else { // icon:'none',
// })
// } else {
var that = this var that = this
this.loading = true this.loading = true
this.$store.dispatch("LoginByUsername", { this.$store.dispatch("LoginByUsername", {
@@ -103,8 +105,9 @@
}).catch((err) => { }).catch((err) => {
this.loading = false this.loading = false
// this.$refs.code.refushCode() // this.$refs.code.refushCode()
location.href = "https://dy12333.org.cn/h5/"
}); });
} // }
} }
}, },
// 步骤 // 步骤

View File

@@ -5,11 +5,11 @@
<slot></slot> <slot></slot>
<view v-if="!hideBottom" class="bottomt"> <view v-if="!hideBottom" class="bottomt">
<view class="bottomt-box"> <view class="bottomt-box">
<view class="check-icon" @click="checkChanged"> <!-- <view class="check-icon" @click="checkChanged">
<image v-if="userChecked" src="../../static/img/checkOk.png" style="width: 30rpx;height:30rpx;"></image> <image v-if="userChecked" src="../../static/img/checkOk.png" style="width: 30rpx;height:30rpx;"></image>
<view class="noneCheck" v-else></view> <view class="noneCheck" v-else></view>
</view> </view>
已阅读并同意<text class="bottomtText" @click="goMent">服务及隐私协议</text> 已阅读并同意<text class="bottomtText" @click="goMent">服务及隐私协议</text> -->
</view> </view>

View File

@@ -38,8 +38,11 @@
</script> </script>
<style> <style>
page{ /* page{
padding: 20px 20px 20px 20px; padding: 20px 20px 20px 20px;
overflow: auto; overflow: auto;
} */
.policy-content {
padding: 30rpx;
} }
</style> </style>

View File

@@ -162,23 +162,24 @@ export function Promisify(func) {
export function GoLogin() { export function GoLogin() {
if (showModal) { if (showModal) {
showModal = false showModal = false
uni.showModal({ location.href = "https://dy12333.org.cn/h5/"
title: "提示", // uni.showModal({
content: "您还未登录,点击确认去登录", // title: "提示",
success({ // content: "您还未登录,点击确认去登录",
confirm // success({
}) { // confirm
if (confirm) { // }) {
uni.redirectTo({ // if (confirm) {
url: "/pages/login/login" // uni.redirectTo({
}); // url: "/pages/login/login"
} // });
showModal = true // }
}, // showModal = true
fail() { // },
showModal = true // fail() {
} // showModal = true
}) // }
// })
} }
} }