cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

登录修改，增加登录协议等，修复拼团客服等

Browse Source
This commit is contained in:
hupeng
2023-10-18 11:47:09 +08:00
parent f76e2c7519
commit 829fb79e21
13 changed files with 178 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
pages/user/Login/index.vue
View File

@ -1,11 +1,11 @@
<template>
<view class="register absolute">
<view class="whiteBg" v-if="formItem === 1">
<view class="whiteBg">
<view class="title acea-row">
<view class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)" :key="index">{{ item }}</view>
</view>
<!-- 手机号登录 -->
<view class="list" :hidden="current !== 0">
<view class="list">
<form @submit.prevent="submit">
<view class="item getPhoneCode">
<view class="phoneInput acea-row row-between-wrapper">
@ -23,81 +23,19 @@
</view>
</form>
</view>
<!-- 账号密码登录 -->
<view class="list" :hidden="current !== 1">
<view class="item">
<view class="acea-row row-between-wrapper">
<input type="text" placeholder="输入手机号码" v-model="account" />
</view>
</view>
<view class="item">
<view class="acea-row row-between-wrapper">
<input type="password" placeholder="输入密码" v-model="password" />
</view>
</view>
<!-- <view class="item">
<view class="align-left">
<input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
@click="code">{{ text }}</button>
</view>
</view> -->
</view>
<view class="logon" @click="loginMobile" :hidden="current === 1">手机号登录</view>
<view class="logon" @click="submit" :hidden="current !== 1">登录</view>
<view class="logon" @click="loginMobile">手机号登录</view>
<view class="tip">
第一次使用?
<text @click="formItem = 2" class="font-color-red">立即注册</text>
未注册的手机号验证通过后会自动注册
</view>
</view>
<!-- 注册 -->
<view class="whiteBg" v-else>
<view class="title acea-row row-between-wrapper">
<view class="item on">注册账号</view>
</view>
<view class="list">
<view class="item">
<view>
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-phone_" />
</svg>-->
<input name="account" type="text" placeholder="输入手机号码" v-model="account" />
</view>
</view>
<view class="item">
<view class="align-left">
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_1" />
</svg>-->
<input name="verifyCode" type="text" placeholder="填写验证码" class="codeIput" v-model="captcha" />
<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="code">{{ text }}</button>
</view>
</view>
<view class="item">
<view>
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-code_" />
</svg>-->
<input name="password" type="password" placeholder="填写您的登录密码" v-model="password" />
</view>
</view>
<!-- #ifndef H5 -->
<view class="item">
<view>
<!-- <svg class="icon" aria-hidden="true">
<use xlink:href="#icon-phone_" />
</svg>-->
<input name="inviteCode" type="text" placeholder="输入邀请码" v-model="inviteCode" />
</view>
</view>
<!-- #endif -->
</view>
<view class="logon" @click="register">注册</view>
<view class="tip">
已有账号?
<text @click="formItem = 1" class="font-color-red">立即登录</text>
</view>
</view>
</view>
<view class="hint">
<radio :checked="isChecked" @tap.stop="onChange" />
我已经阅读并遵守
<text class="link" @tap="goNewsDetail(50,'用户协议')">《用户协议》</text>与
<text class="link" @tap="goNewsDetail(49,'隐私政策')">《隐私政策》</text>
<!--上面协议是固定的 请添加相应id文章-->
</view>
</view>
</template>
<script>
@ -117,7 +55,7 @@ export default {
mixins: [sendVerifyCode],
data: function() {
return {
navList: ['手机号登录', '密码登录'],
navList: ['手机号登录'],
// navList: ["手机号登录",],
current: 0,
account: '',
@ -128,11 +66,24 @@ export default {
type: 'login',
timer: null,
clock: 60,
clockText: '验证码',
clockText: '验证码',
isChecked: false
}
},
methods: {
async loginMobile() {
methods: {
onChange() {
console.log('isChecked;',this.isChecked)
this.isChecked = !this.isChecked
},
async loginMobile() {
if(!this.isChecked) {
uni.showToast({
title: '请勾选下面协议',
icon: 'none',
duration: 2000,
})
return
}
var that = this
const { account, captcha } = that
try {
@ -324,7 +275,19 @@ export default {
}
</script>
<style lang="scss">
<style lang="scss">
.hint {
display: flex;
align-items: center;
justify-content: center;
padding: 20rpx 40rpx;
font-size: 25rpx;
color: #000;
.link {
color: #ff8e3c;
}
}
.register .whiteBg .title .item {
border-bottom: 2px solid;
}

6
pages/user/PersonalData/index.vue
View File

@ -53,12 +53,12 @@
</view>
</view>
<view class="modifyBnt bg-color-red" @click="submit">保存修改</view>
<!-- #ifndef MP-WEIXIN -->
<view
class="logOut cart-color acea-row row-center-wrapper"
@click="logout"
>退出登录</view>
<!-- #endif -->
</view>
</template>
<script>
@ -162,7 +162,7 @@ export default {
submit: function () {
let userInfo = this.userInfo;
postUserEdit({
nickname: trim(this.userInfo.nickname),
nickname: trim(this.userInfo.nickname ? this.userInfo.nickname : ''),
avatar: this.avatar,
}).then(
(res) => {

13
pages/user/User/index.vue
View File

@ -1,9 +1,9 @@
<template>
<view class="user">
<view v-if="$store.getters.token || userInfo.uid">
<view>
<view
class="getUserBaseData header bg-color-red acea-row row-between-wrapper"
v-if="!userInfo.avatar && !userInfo.nickname"
v-if="!userInfo.uid"
>
<button
class="userDataBtn"
@ -206,10 +206,10 @@
:login_type="userInfo.login_type"
></SwitchWindow>-->
</view>
<Authorization
<!-- <Authorization
v-else
ref="authorization"
/>
/> -->
</view>
</template>
<script>
@ -243,7 +243,7 @@ export default {
this.canIUseGetUserProfile = true
}
if (!this.$store.getters.token && !this.userInfo.uid) {
this.$refs.authorization.getLoginCode()
// this.$refs.authorization.getLoginCode()
}
},
methods: {
@ -482,7 +482,8 @@ export default {
},
},
onShow() {
if (this.$store.getters.token) {
if (this.$store.getters.token) {
console.log('userInfo11:',this.$store.getters.token)
//
uni.showLoading({
title: '加载中',

22
pages/user/content/content.vue Normal file
View File

@ -0,0 +1,22 @@
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>