2023-2-22

完善功能
This commit is contained in:
2023-02-22 22:33:30 +08:00
parent c64e72109e
commit f9a709e149
4 changed files with 73 additions and 42 deletions

View File

@@ -785,25 +785,25 @@
url: '/pages/search/search'
});
},
//点击导航栏 buttons 时触发
onNavigationBarButtonTap(e) {
const index = e.index;
if (index === 0) {
this.$api.msg('点击了扫描');
} else if (index === 1) {
// #ifdef APP-PLUS
const pages = getCurrentPages();
const page = pages[pages.length - 1];
const currentWebview = page.$getAppWebview();
currentWebview.hideTitleNViewButtonRedDot({
index
});
// #endif
uni.navigateTo({
url: '../../pagesU/notice/notice'
});
}
}
// //点击导航栏 buttons 时触发
// onNavigationBarButtonTap(e) {
// const index = e.index;
// if (index === 0) {
// this.$api.msg('点击了扫描');
// } else if (index === 1) {
// // #ifdef APP-PLUS
// const pages = getCurrentPages();
// const page = pages[pages.length - 1];
// const currentWebview = page.$getAppWebview();
// currentWebview.hideTitleNViewButtonRedDot({
// index
// });
// // #endif
// uni.navigateTo({
// url: '../../pagesU/notice/notice'
// });
// }
// }
};
</script>

View File

@@ -785,7 +785,7 @@
line-height: 76upx;
border-radius: 50px;
margin-top: 70upx;
background: $uni-color-primary;
background: $uni-color-warning;
color: #fff;
font-size: $font-lg;
@@ -797,13 +797,12 @@
.login_bot {
display: flex;
margin-top: 25upx;
margin-left: 70upx;
margin-right: 70upx;
flex-direction: row;
justify-content: space-between;
align-items: center;
flex-direction: column;
}
.forget-section {
margin-top: 30px;
font-size: $font-sm + 2upx;
color: $font-color-spec;
text-align: center;
@@ -811,6 +810,7 @@
.register-section {
bottom: 50upx;
margin-top: 20px;
font-size: $font-sm + 2upx;
color: $font-color-base;
text-align: center;

View File

@@ -21,13 +21,13 @@
<input type="password" placeholder="请输入确认密码" v-model="confimpassword" @confirm="reg" />
</view>
<view class="input-item">
<text class="tit">邀请码</text>
<input type="number" v-model="invitecode" placeholder="请输入邀请码" />
<text class="tit">汇融乡村振兴卡号</text>
<input type="number" v-model="invitecode" maxlength="19" placeholder="请输入汇融乡村振兴卡号" />
</view>
</view>
<button class="confirm-btn" @click="reg" :disabled="logining">注册</button>
<view class="forget-section" @click="toForget">忘记密码?</view>
<!-- <view class="forget-section" @click="toForget">忘记密码?</view> -->
</view>
<view class="register-section">
已经有账号?
@@ -88,7 +88,7 @@
},
async reg() {
var that = this;
let phoneReg = /^1[1-9][0-9]\d{8}$/;
let phoneReg = /^1[3456789]\d{9}$/;
try {
if (this.phone == '') {
throw '请填写手机号';
@@ -99,11 +99,37 @@
if (this.password == '') {
throw '请填写密码';
}
if (this.confimpassword == '') {
throw '请填写确认密码';
}
if (this.password != this.confimpassword) {
throw '俩次密码不一致';
}
} catch (err) {
this.$api.msg(err);
return;
}
if (!this.invitecode.includes("62350109317")) {
uni.showModal({
title: '提示',
content: '汇融乡村振兴卡号输入有误,将无法享受惠农价。是否继续注册?',
success: function(res) {
if (res.confirm) {
that.aaa(false);
} else if (res.cancel) {
return;
}
}
});
} else {
that.aaa(true);
}
},
async aaa(vel) {
let that = this
let params;
//有推荐码的话,带上
var invitecode = this.$db.get('invitecode')
@@ -127,12 +153,19 @@
}
let data = await Api.apiCall('post', Api.index.simpleReg, params);
uni.showToast({
icon: 'none',
mask: true,
title: vel ? "恭喜您注册成功,并成为惠农会员。" : "恭喜您注册成功。",
duration: 2000
// uni.navigateTo({
// url: '/pages/public/login'
// });
// 注册成功 直接默认登录
});
setTimeout(function() {
that.request();
}, 3000);
},
async request() {
var that = this;
let params2 = {
phone: this.phone,
@@ -151,7 +184,6 @@
uni.navigateBack({
delta: 2
});
}
}
}
@@ -301,9 +333,7 @@
}
.register-section {
position: absolute;
left: 0;
bottom: 40upx;
margin-top: 40upx;
width: 100%;
font-size: $font-sm + 2upx;
color: $font-color-base;