yxt_group
/
mallplus
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-2-25 

功能完善
master
guoxing 2 years ago
parent
0f4896f20e
commit
66d86ac0b9
3 changed files with 245 additions and 232 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      mallplusui-uniapp-app/common/api.js
  2. 12
      mallplusui-uniapp-app/pages/public/reg.vue
  3. 462
      mallplusui-uniapp-app/pagesU/user/forget.vue

3
mallplusui-uniapp-app/common/api.js
View File

@ -1,7 +1,8 @@
import store from '../store/index'; import store from '../store/index';
export default { export default {
// qq 237524947 wx15d4269d3210863d // qq 237524947 wx15d4269d3210863d
BASEURI: 'http://mall.yyundong.com/portalapi/api/', BASEURI: 'http://2xpk7t.natappfree.cc/api/',
// BASEURI: 'http://mall.yyundong.com/portalapi/api/',
// BASEURI: 'http://www.yyundong.com:8083/api/', // BASEURI: 'http://www.yyundong.com:8083/api/',
ADMINURI: 'http://mall.yyundong.com/adminapi/', ADMINURI: 'http://mall.yyundong.com/adminapi/',
ESURI: 'http://www.yyundong.com:8081/', ESURI: 'http://www.yyundong.com:8081/',

12
mallplusui-uniapp-app/pages/public/reg.vue
View File

@ -5,8 +5,8 @@
<view class="right-top-sign"></view> <view class="right-top-sign"></view>
<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 --> <!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
<view class="wrapper"> <view class="wrapper">
<view class="left-top-sign">注册</view> <!-- <view class="left-top-sign">注册</view> -->
<view class="welcome">欢迎回来！</view> <view class="welcome">注册</view>
<view class="input-content"> <view class="input-content">
<view class="input-item"> <view class="input-item">
<text class="tit">手机号码</text> <text class="tit">手机号码</text>
@ -196,7 +196,7 @@
} }
.container { .container {
padding-top: 115px; padding-top: 105px;
position: relative; position: relative;
width: 100vw; width: 100vw;
height: 120vh; height: 120vh;
@ -270,7 +270,7 @@
.welcome { .welcome {
position: relative; position: relative;
left: 50upx; left: 50upx;
top: -90upx; top: -20upx;
font-size: 46upx; font-size: 46upx;
color: #555; color: #555;
text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3); text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
@ -329,11 +329,11 @@
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-spec; color: $font-color-spec;
text-align: center; text-align: center;
margin-top: 40upx; margin-top: 20upx;
} }
.register-section { .register-section {
margin-top: 40upx; margin-top: 20upx;
width: 100%; width: 100%;
font-size: $font-sm + 2upx; font-size: $font-sm + 2upx;
color: $font-color-base; color: $font-color-base;

462
mallplusui-uniapp-app/pagesU/user/forget.vue
View File

@ -5,54 +5,34 @@
<view class="right-top-sign"></view> <view class="right-top-sign"></view>
<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 --> <!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
<view class="wrapper"> <view class="wrapper">
<view class="left-top-sign">LOGIN</view> <!-- <view class="left-top-sign">LOGIN</view> -->
<view class="welcome"> <view class="welcome">
忘记密码！ 忘记密码！
</view> </view>
<view class="input-content"> <view class="input-content">
<view class="input-item"> <view class="input-item">
<text class="tit">手机号码</text> <text class="tit">手机号码</text>
<input <input type="number" :value="phone" placeholder="请输入手机号码" maxlength="11" data-key="phone"
type="number" @input="onKeyInput" />
:value="phone"
placeholder="请输入手机号码"
maxlength="11"
data-key="phone"
@input="onKeyInput"
/>
</view> </view>
<view class="input-item"> <view class="input-item">
<text class="tit">密码</text> <text class="tit">密码</text>
<input <input type="mobile" value="" placeholder="6~12位大小写字母和数字组成" placeholder-class="input-empty"
type="mobile" maxlength="12" password data-key="password" @input="inputChange" />
value=""
placeholder="8~24位不含特殊字符的数字、字母组合"
placeholder-class="input-empty"
maxlength="20"
password
data-key="password"
@input="inputChange"
/>
</view> </view>
<view class="input-item"> <view class="input-item">
<text class="tit">密码</text> <text class="tit">确认密码</text>
<input <input type="mobile" value="" placeholder="6~12位大小写字母和数字组成" placeholder-class="input-empty"
type="mobile" maxlength="12" password data-key="confimpassword" @input="inputChange" />
value=""
placeholder="8~24位不含特殊字符的数字、字母组合"
placeholder-class="input-empty"
maxlength="20"
password
data-key="confimpassword"
@input="inputChange"
/>
</view> </view>
<view class="verificationBox" > <view class="verificationBox">
<view class="verificationCon"> <view class="verificationCon">
<text class="verificationLeft">验证码</text> <text class="verificationLeft">验证码</text>
<input type="text" value="" @input="onKeyverification" placeholder="请输入验证码" placeholder-style="font-size:26upx;color:#444444" class="verificationInput" /> <input type="text" value="" @input="onKeyverification" placeholder="请输入验证码"
placeholder-style="font-size:26upx;color:#444444" class="verificationInput" />
</view> </view>
<button type="primary" :disabled="getverifSwitch" class="button" @click="getverification">{{getConfirms}}</button> <button type="primary" :disabled="getverifSwitch" class="button"
@click="getverification">{{getConfirms}}</button>
</view> </view>
@ -60,115 +40,122 @@
<button class="confirm-btn" @click="toRegister" :disabled="logining">重置密码</button> <button class="confirm-btn" @click="toRegister" :disabled="logining">重置密码</button>
</view> </view>
<view class="register-section"> <!-- <view class="register-section">
已有账号? 已有账号?
<text @click="toLogin">返回登录</text> <text @click="toLogin">返回登录</text>
</view> </view> -->
</view> </view>
</template> </template>
<script> <script>
import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue'; import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
import Api from '@/common/api'; import Api from '@/common/api';
import { import {
mapMutations mapMutations
} from 'vuex'; } from 'vuex';
import eonfox from '@/components/eonfox/eonfox.js'; import eonfox from '@/components/eonfox/eonfox.js';
import fns from '@/components/eonfox/fns.js'; import fns from '@/components/eonfox/fns.js';
var ef = new eonfox(); var ef = new eonfox();
export default{ export default {
data(){ data() {
return { return {
phone: '', phone: '',
password: '', password: '',
confimpassword:'',//第二次输入密码 confimpassword: '', //第二次输入密码
logining: false, logining: false,
verifTime:0,//验证码时长 verifTime: 0, //验证码时长
getConfirms: '获取验证码', getConfirms: '获取验证码',
confirm:'', confirm: '',
getverifSwitch:false, getverifSwitch: false,
oauthid:'' oauthid: ''
} }
}, },
onLoad(){ onLoad() {
this.getStroges(); this.getStroges();
}, },
methods: { methods: {
...mapMutations(['login']), ...mapMutations(['login']),
getStroges(){ getStroges() {
try { try {
const value = uni.getStorageSync('oauth_id'); const value = uni.getStorageSync('oauth_id');
if (value) { if (value) {
console.log(value); console.log(value);
this.oauthid = value this.oauthid = value
} }
} catch (e) { } catch (e) {
console.log(e) console.log(e)
} }
}, },
inputChange(e){ inputChange(e) {
const key = e.currentTarget.dataset.key; const key = e.currentTarget.dataset.key;
this[key] = e.detail.value; this[key] = e.detail.value;
}, },
navBack(){ navBack() {
uni.switchTab({ uni.switchTab({
url: '/pages/index/index' url: '/pages/index/index'
}); });
}, },
toLogin(){ toLogin() {
uni.redirectTo({ uni.redirectTo({
url:'/pages/public/login' url: '/pages/public/login'
}) })
}, },
async toRegister(){ async toRegister() {
var _this=this var _this = this
var phone=this.phone,password=this.password,confimpassword=this.confimpassword; var reg = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,12}$/;
if (!/^1\d{10}$/.test(phone)){ var phone = this.phone;
var password = this.password;
var confimpassword = this.confimpassword;
if (!/^1[3456789]\d{9}$/.test(phone)) {
uni.showToast({ uni.showToast({
title:'手机号有误', title: '手机号有误',
icon:'none' icon: 'none'
}) })
}else if (password.length < 8 ||password.length > 24||confimpassword.length < 8 ||confimpassword.length > 24) { } else if (!reg.test(password) || password.length < 6 || password.length > 12) {
uni.showToast({ uni.showToast({
title:'密码长度为8~24个字符', title: '密码格式错误',
icon:'none' icon: 'none'
}) })
} } else if (!reg.test(confimpassword) || confimpassword.length < 6 || confimpassword.length > 12) {
else if(password!=confimpassword){
uni.showToast({ uni.showToast({
title:'两次输入的密码不一致，请检查修改', title: '确认密码格式错误',
icon:'none' icon: 'none'
}) })
} } else if (password != confimpassword) {
else if(_this.confirm==''){ uni.showToast({
title: '两次输入的密码不一致，请检查修改',
icon: 'none'
})
} else if (_this.confirm == '') {
uni.showToast({ uni.showToast({
title: '验证码不能为空', title: '验证码不能为空',
icon: 'none' icon: 'none'
}); });
} } else {
else{ var req = {};
var req={};
req = { req = {
phone: this.phone, phone: this.phone,
password:this.password, password: this.password,
confimpassword:this.confimpassword, confimpassword: this.confimpassword,
authCode: this.confirm, authCode: this.confirm,
}; };
let data = await Api.apiCall('post', Api.member.resetPassword, req); let data = await Api.apiCall('post', Api.member.resetPassword, req);
console.log("data>>>>",data)
if(data=="操作成功")
uni.showToast({ uni.showToast({
title: '重置成功', title: '重置成功',
success() { success() {
_this.bind() _this.bind()
setTimeout(function(){ setTimeout(function() {
uni.reLaunch({ uni.reLaunch({
url:'/pages/public/login' url: '/pages/public/login'
}); });
},1000) }, 1000)
} }
}); });
} }
}, },
@ -177,11 +164,11 @@ import Api from '@/common/api';
this[key] = e.detail.value; this[key] = e.detail.value;
}, },
async getverification(){ async getverification() {
let _this = this; let _this = this;
// 验证是否已进行验证码操作 // 验证是否已进行验证码操作
if(this.verifTime==0){ if (this.verifTime == 0) {
if (!/^1[1234567890]\d{9}$/.test(this.phone)) { if (!/^1[1234567890]\d{9}$/.test(this.phone)) {
uni.showToast({ uni.showToast({
title: '电话号码有误，请重新输入', title: '电话号码有误，请重新输入',
@ -190,27 +177,29 @@ import Api from '@/common/api';
this.phone = ''; this.phone = '';
return; return;
} else { } else {
_this.getverifSwitch=true _this.getverifSwitch = true
this.verifTime=60; this.verifTime = 60;
_this.getConfirms=this.verifTime _this.getConfirms = this.verifTime
//倒计时 //倒计时
var timeInterval=setInterval(function(){ var timeInterval = setInterval(function() {
_this.verifTime -- ; _this.verifTime--;
if(_this.verifTime<=0){ if (_this.verifTime <= 0) {
//倒计时结束清除定时器 //倒计时结束清除定时器
clearInterval(timeInterval) clearInterval(timeInterval)
_this.getConfirms='重新发送' _this.getConfirms = '重新发送'
_this.getverifSwitch=false _this.getverifSwitch = false
return; return;
} }
_this.getConfirms=_this.verifTime _this.getConfirms = _this.verifTime
},1000) }, 1000)
let params = { phone: this.phone, let params = {
type:2}; phone: this.phone,
let data = await Api.apiCall('post', Api.index.sendCodes, params); type: 2
};
let data = await Api.apiCall('post', Api.index.sendCodes, params);
} }
}else{ } else {
uni.showToast({ uni.showToast({
title: "请勿重复操作", title: "请勿重复操作",
icon: 'none' icon: 'none'
@ -222,95 +211,101 @@ import Api from '@/common/api';
this.confirm = event.target.value; this.confirm = event.target.value;
}, },
//绑定 //绑定
bind(){ bind() {
var _this=this var _this = this
console.log('oauth'); console.log('oauth');
uni.getStorage({ uni.getStorage({
key:'oauth', key: 'oauth',
success(re) { success(re) {
if(re.data){ if (re.data) {
_this.bind_() _this.bind_()
} }
} }
}) })
}, },
bind_(){ bind_() {
console.log('bind'); console.log('bind');
var _this=this var _this = this
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
wx.login({ wx.login({
success(res) { success(res) {
wx.getUserInfo({ wx.getUserInfo({
success(re) { success(re) {
re.code=res.code; re.code = res.code;
console.log('re:',re); console.log('re:', re);
ef.submit({ ef.submit({
request:{s:['USERSELFBINDWEIXIN',['applet',re]]}, request: {
callback(data){ s: ['USERSELFBINDWEIXIN', ['applet', re]]
console.log(data); },
fns.unionid() callback(data) {
return console.log(data);
}, fns.unionid()
error(err){ return
fns.err('err',err) },
} error(err) {
}) fns.err('err', err)
} }
}) })
} }
}) })
// #endif }
// #ifdef APP-PLUS })
// #endif
// #ifdef APP-PLUS
uni.showToast({
title: '正在绑定',
icon: 'loading'
})
console.log('oauto star');
uni.login({
provider: 'weixin',
success: function(loginRes) {
console.log('loginres:', typeof loginRes);
if (loginRes.errMsg == 'login:ok') {
// 获取用户信息
uni.showToast({ uni.showToast({
title:'正在绑定', title: '获取信息',
icon:'loading' icon: 'loading'
}) })
console.log('oauto star'); uni.getUserInfo({
uni.login({ provider: 'weixin',
provider: 'weixin', success: function(infoRes) {
success: function (loginRes) { uni.showToast({
console.log('loginres:',typeof loginRes); title: '获取成功',
if (loginRes.errMsg=='login:ok') { icon: 'loading'
// 获取用户信息 })
uni.showToast({ ef.submit({
title:'获取信息', request: {
icon:'loading' s: ['USERSELFBINDWEIXIN', ['app', infoRes
}) .userInfo
uni.getUserInfo({ ]]
provider: 'weixin', },
success: function (infoRes) { callback(data) {
uni.showToast({ console.log(data);
title:'获取成功', console.log(JSON.stringify(data));
icon:'loading' fns.unionid()
}) },
ef.submit({ error(err) {
request:{s:['USERSELFBINDWEIXIN',['app',infoRes.userInfo]]}, console.log(err);
callback(data){ }
console.log(data); })
console.log(JSON.stringify(data));
fns.unionid()
},
error(err){
console.log(err);
}
})
},
fail(err){
console.log(err);
}
});
}else{
console.log(err);
}
},
fail(err) {
console.log(err);
}
},
fail(err) {
console.log(err);
}
}); });
// #endif } else {
console.log(err);
}
},
fail(err) {
console.log(err);
}
});
// #endif
} }
}, },
@ -318,25 +313,28 @@ import Api from '@/common/api';
</script> </script>
<style lang='scss'> <style lang='scss'>
page{ page {
background: #fff; background: #fff;
} }
.container{
padding-top: 55px; .container {
position:relative; padding-top: 105px;
position: relative;
width: 100vw; width: 100vw;
height: 100vh; height: 120vh;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
} }
.wrapper{
position:relative; .wrapper {
position: relative;
z-index: 90; z-index: 90;
background: #fff; background: #fff;
padding-bottom: 40upx; padding-bottom: 30upx;
} }
.back-btn{
position:absolute; .back-btn {
position: absolute;
left: 40upx; left: 40upx;
z-index: 9999; z-index: 9999;
padding-top: var(--status-bar-height); padding-top: var(--status-bar-height);
@ -344,29 +342,35 @@ import Api from '@/common/api';
font-size: 40upx; font-size: 40upx;
color: $font-color-dark; color: $font-color-dark;
} }
.left-top-sign{
.left-top-sign {
font-size: 120upx; font-size: 120upx;
color: $page-color-base; color: $page-color-base;
position:relative; position: relative;
left: -16upx; left: -16upx;
} }
.right-top-sign{
position:absolute; .right-top-sign {
position: absolute;
top: 80upx; top: 80upx;
right: -30upx; right: -30upx;
z-index: 95; z-index: 95;
&:before, &:after{
display:block; &:before,
content:""; &:after {
display: block;
content: '';
width: 400upx; width: 400upx;
height: 80upx; height: 80upx;
background: #b4f3e2; background: #b4f3e2;
} }
&:before{
&:before {
transform: rotate(50deg); transform: rotate(50deg);
border-radius: 0 50px 0 0; border-radius: 0 50px 0 0;
} }
&:after{
&:after {
position: absolute; position: absolute;
right: -198upx; right: -198upx;
top: 0; top: 0;
@ -375,45 +379,52 @@ import Api from '@/common/api';
/* background: pink; */ /* background: pink; */
} }
} }
.left-bottom-sign{
position:absolute; .left-bottom-sign {
position: absolute;
left: -270upx; left: -270upx;
bottom: -320upx; bottom: -320upx;
border: 100upx solid #d0d1fd; border: 100upx solid #d0d1fd;
border-radius: 50%; border-radius: 50%;
padding: 180upx; padding: 180upx;
} }
.welcome{
position:relative; .welcome {
position: relative;
left: 50upx; left: 50upx;
top: -90upx; top: -20upx;
font-size: 46upx; font-size: 46upx;
color: #555; color: #555;
text-shadow: 1px 0px 1px rgba(0,0,0,.3); text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
} }
.input-content{
.input-content {
padding: 0 60upx; padding: 0 60upx;
} }
.input-item{
display:flex; .input-item {
display: flex;
flex-direction: column; flex-direction: column;
align-items:flex-start; align-items: flex-start;
justify-content: center; justify-content: center;
padding: 0 30upx; padding: 0 30upx;
background:$page-color-light; background: $page-color-light;
height: 120upx; height: 120upx;
border-radius: 4px; border-radius: 4px;
margin-bottom: 50upx; margin-bottom: 50upx;
&:last-child{
&:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.tit{
.tit {
height: 50upx; height: 50upx;
line-height: 56upx; line-height: 56upx;
font-size: $font-sm+2upx; font-size: $font-sm+2upx;
color: $font-color-base; color: $font-color-base;
} }
input{
input {
height: 60upx; height: 60upx;
font-size: $font-base + 2upx; font-size: $font-base + 2upx;
color: $font-color-dark; color: $font-color-dark;
@ -421,7 +432,7 @@ import Api from '@/common/api';
} }
} }
.confirm-btn{ .confirm-btn {
width: 630upx; width: 630upx;
height: 76upx; height: 76upx;
line-height: 76upx; line-height: 76upx;
@ -430,31 +441,32 @@ import Api from '@/common/api';
background: $uni-color-primary; background: $uni-color-primary;
color: #fff; color: #fff;
font-size: $font-lg; font-size: $font-lg;
&:after{
&:after {
border-radius: 100px; border-radius: 100px;
} }
} }
.forget-section{
.forget-section {
font-size: $font-sm+2upx; font-size: $font-sm+2upx;
color: $font-color-spec; color: $font-color-spec;
text-align: center; text-align: center;
margin-top: 40upx; margin-top: 40upx;
} }
.register-section{
position:absolute; .register-section {
position: absolute;
left: 0; left: 0;
bottom: 50upx;
width: 100%; width: 100%;
font-size: $font-sm+2upx; font-size: $font-sm+2upx;
color: $font-color-base; color: $font-color-base;
text-align: center; text-align: center;
text{
text {
color: $font-color-spec; color: $font-color-spec;
margin-left: 10upx; margin-left: 10upx;
} }
} }
</style> </style>
<style lang="stylus" ref="stylesheet/stylus"> <style lang="stylus" ref="stylesheet/stylus">
.verificationBox .verificationBox

Write Preview
Loading…
Cancel
Save