Skip to content

M
mini_own
Commit 1d8ef658 authored by 小耗子's avatar 小耗子
Browse files
Options

修改注册流程

parent c13b30ff
Hide whitespace changes
Inline Side-by-side
Showing with 282 additions and 264 deletions
pages.json
View file @ 1d8ef658
......@@ -5,14 +5,6 @@
},
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path" : "pages/user/register/index",
"name":"register",
"style" :
{
"navigationBarTitleText": "注册",
"enablePullDownRefresh": false
}
},{
"path" : "pages/index/defalutScreen",
"name":"defalutScreen",
"style" :
......@@ -114,6 +106,15 @@
"navigationBarTitleText": "选择企业",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/user/register/index",
"name":"register",
"style" :
{
"navigationBarTitleText": "注册",
"enablePullDownRefresh": false
}
}
],
"subPackages":[],
......@@ -151,17 +152,17 @@
"condition" : { //模式配置，仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项)
"list": [
// {
// "name": "defalutScreen", //模式名称
// "path": "pages/index/defalutScreen", //启动页面，必选
// "query": "companyId=999999998"
// }
{
"name": "register", //模式名称
"path": "pages/user/register/index", //启动页面，必选
"query": "reqisterPageType=3"
"name": "defalutScreen", //模式名称
"path": "pages/index/defalutScreen", //启动页面，必选
"query": "companyId=999999998"
}
// {
// "name": "register", //模式名称
// "path": "pages/user/register/index", //启动页面，必选
// "query": "reqisterPageType=1"
// }
]
},
"lazyCodeLoading": "requiredComponents"
......
pages/index/defalutScreen.vue
View file @ 1d8ef658
......@@ -104,10 +104,10 @@
console.log("走吗1")
// session 不存在，调用login。userInfo 。更新session
uni.login({
success: function(info) { //调用code
console.log("code000000000000000000000000==========", info.code)
success: function(info) { //调用code
console.log("code000000000000000000000000==========", info.code,that.companyId)
that.$store.commit('wxCode', info.code); //按钮切换全选。
let userInfo = that.getUserInfo(info.code,this.companyId);
let userInfo = that.getUserInfo(info.code);
userInfo.then(res => {
that.authCheck().then(checkCode => {
that.loading = false;
......@@ -161,7 +161,15 @@
// uni.hideTabBar();
},
onReady() {
wx.clearStorage();
if(this.$Route.query.companyId){
this.companyId = this.$Route.query.companyId
}else{
this.companyId = ""
}
console.log(this.companyId);
uni.setStorageSync("companyId",this.companyId )
this.getAuth();
},
onShareAppMessage(res){
......@@ -170,11 +178,7 @@
}
},
onLoad(options){
if(this.$Route.query.companyId){
this.companyId = this.$Route.query.companyId
}else{
this.companyId = ""
}
}
}
......
pages/user/enterprise.vue
View file @ 1d8ef658
......@@ -67,9 +67,10 @@
// 4-页面有 手机号验证码+姓名+工号 pwdCodeNameEmpnoReg
if(item.loginType && item.mallType == 0){ //需要注册页 && 封闭式
this.$Router.push({ path: '/pages/user/register/index',query:{"reqisterPageType":item.reqisterPageType}})
}else if(item.loginType && item.mallType == 1){
this.$Router.push({ path: '/pages/user/register/index',query:{"reqisterPageType":item.reqisterPageType}})
}
// else if(item.loginType && item.mallType == 1){
// this.$Router.push({ path: '/pages/user/register/index',query:{"reqisterPageType":item.reqisterPageType}})
// }
else{//开放式的代码
let register = await this.registerInfoFn(item.companyId)
if (register) { //注册成功
......
pages/user/register/giftPwdReg.vue
View file @ 1d8ef658
<template>
<view class="addressCreate-wrap">
<view class="address_info w-bg-color p-l-32 p-r-32 p-t-32 ">
<u-form labelPosition="left" :model="form" ref="form1">
<u-form-item labelWidth="80" label="手机号" prop="userInfo.name" borderBottom ref="item1">
<u--input v-model="params.tel" border="none" placeholder="请填写收货人手机号"></u--input>
<view slot="right">
<u-button size="mini" type="success" open-type="getPhoneNumber" @getphonenumber="getInfoPhoneNumber" >微信一键授权</u-button>
</view>
</u-form-item>
<u-form-item labelWidth="80" label="卡号" prop="userInfo.name" borderBottom ref="item1">
<u--input v-model="params.name" border="none" placeholder="请填写收货人姓名"></u--input>
</u-form-item>
<u-form-item labelWidth="80" label="密码" prop="userInfo.name" borderBottom ref="item1">
<u--input v-model="params.tel" border="none" placeholder="请填写收货人手机号"></u--input>
</u-form-item>
</u-form>
<u-button type="success" @click="submit">提交</u-button>
<view >
<u-form labelPosition="left" :model="form" ref="form1" >
<u-form-item labelWidth="60" label="手机号" prop="params.mobile" :required="true" borderBottom ref="item1">
<u--input v-model="params.mobile" disabled border="none" placeholder="请填写手机号"></u--input>
<view slot="right" v-show="!params.mobile">
<u-button size="mini" type="success" open-type="getPhoneNumber" @getphonenumber="getInfoPhoneNumber" >微信一键授权</u-button>
</view>
</u-form-item>
<u-form-item labelWidth="60" label="卡号" prop="params.giftCardNo" :required="true" borderBottom ref="item1">
<u--input v-model="params.giftCardNo" border="none" placeholder="请填写卡号"></u--input>
</u-form-item>
<u-form-item labelWidth="60" label="密码" prop="params.giftCardPwd" :required="true" borderBottom ref="item1">
<u--input v-model="params.giftCardPwd" border="none" placeholder="请填写密码"></u--input>
</u-form-item>
</u-form>
<view class="m-t-20">
<u-button type="success" @tap="submit1">提交</u-button>
</view>
</view>
</template>
......@@ -29,50 +28,53 @@
} from 'vuex'
import http from '@/shopro/request/index';
export default {
components: {
// shPickaddress
computed: {
// ...mapGetters([])
},
data() {
return {
showSex: false,
params: {
name: '',
tel:'',
region:'',
detailRegion:''
giftCardNo:"", //卡密注册
giftCardPwd:"",
mobile:''
},
// rules: {
// 'userInfo.name': {
// type: 'string',
// required: true,
// message: '请填写姓名',
// trigger: ['blur', 'change']
// },
// 'userInfo.sex': {
// type: 'string',
// max: 1,
// required: true,
// message: '请选择男或女',
// trigger: ['blur', 'change']
// },
// },
radio: '',
switchVal: false,
filterPopup: false,//选择地址列表
switchBar: true, //默认地址开关
rules: {
'params.giftCardNo': {
type: 'string',
required: true,
message: '请填写姓名',
trigger: ['blur', 'change']
},
'params.giftCardPwd': {
type: 'string',
required: true,
message: '请填写姓名',
trigger: ['blur', 'change']
},
},
}
},
methods: {
...mapActions(['getPhoneNumber','editPhone']),
...mapActions(['getPhoneNumber','editPhone','existPhone']),
async getInfoPhoneNumber(e) {
let ph = await this.getPhoneNumber(e);
let res = await this.editPhone(ph);
console.log(res)
console.log(ph)
if(res) { //跳转
this.params.mobile =ph.data
}
},
submit1(){
// this.$refs.form1.validate().then(res => {
if(!this.params.mobile){
this.$u.toast("先授权手机号");
}
// }).catch(errors => {
// console.log("失败信息:" + JSON.stringify(errors))
// uni.$u.toast('校验失败')
// })
}
},
......@@ -80,39 +82,14 @@
// 判定是否有手机号
// 无手机号：显示手机号授权，点击注册，提示请先授权
// 有手机号：不显示手机号授权，直接注册
},
async onReady(){
// this.$refs.form1.setRules(this.rules)
this.params.mobile = await this.existPhone()
// console.log(this.params.mobile)
}
}
</script>
<style lang="scss" scoped>
page{
background:#f2f2f2;
}
.addressCreate-wrap{
.address_info{
margin: 0 auto;
height: 370rpx;
border-radius:0 0 26rpx 26rpx;
}
.default_address{
height: 160rpx;
border-radius:26rpx;
.tipText{
color: #666;
}
}
.save-btn{
.btn-h{
height: 65rpx;
}
}
}
::v-deep .u-form-item__body__left__content__label,::v-deep .uni-input-placeholder{
font-size: 14PX;
}
</style>
pages/user/register/index.vue
View file @ 1d8ef658
<template>
<view>
<ph-code-empno-reg v-if="reqisterPageType == 1"></ph-code-empno-reg>
<gift-pwd-reg v-if="reqisterPageType == 3"></gift-pwd-reg>
<pwd-code-name-empnoReg v-if="reqisterPageType == 4"></pwd-code-name-empnoReg>
<view class="addressCreate-wrap">
<view class="address_info w-bg-color p-l-32 p-r-32 ">
<ph-code-empno-reg v-if="reqisterPageType == 1"></ph-code-empno-reg>
<gift-pwd-reg v-if="reqisterPageType == 3"></gift-pwd-reg>
<!-- 第四种情况待定 -->
<pwd-code-name-empnoReg v-if="reqisterPageType == 4"></pwd-code-name-empnoReg>
</view>
</view>
</template>
<script>
......@@ -39,6 +42,29 @@
}
</script>
<style>
<style lang="scss" scoped>
.addressCreate-wrap{
.address_info{
margin: 0 auto;
height: 370rpx;
border-radius:0 0 26rpx 26rpx;
}
.default_address{
height: 160rpx;
border-radius:26rpx;
.tipText{
color: #666;
}
}
.save-btn{
.btn-h{
height: 65rpx;
}
}
}
::v-deep .u-form-item__body__left__content__label,::v-deep .uni-input-placeholder{
font-size: 14PX;
}
</style>
pages/user/register/phCodeEmpnoReg.vue
View file @ 1d8ef658
<template>
<view class="addressCreate-wrap">
<view class="address_info w-bg-color p-l-32 p-r-32 p-t-32 ">
<u-form labelPosition="left" :model="form" ref="form1">
<u-form-item labelWidth="80" label="手机号" prop="userInfo.name" borderBottom ref="item1">
<u--input v-model="params.tel" border="none" placeholder="请填写收货人手机号"></u--input>
<view slot="right">
<u-button size="mini" type="success" @click="submit">微信一键授权</u-button>
</view>
</u-form-item>
<u-form-item labelWidth="80" label="工号/卡号" prop="userInfo.name" borderBottom ref="item1">
<u--input v-model="params.name" border="none" placeholder="请填写收货人姓名"></u--input>
</u-form-item>
<u-form-item labelWidth="80" label="姓名" prop="userInfo.name" borderBottom ref="item1">
<u--input v-model="params.tel" border="none" placeholder="请填写收货人手机号"></u--input>
</u-form-item>
</u-form>
<u-button type="success" @click="submit">提交</u-button>
<view>
<u-form labelPosition="left" :model="form" ref="form1" >
<u-form-item labelWidth="60" label="手机号" prop="params.mobile" :required="true" borderBottom ref="item1">
<u--input v-model="params.mobile" disabled border="none" placeholder="请填写手机号"></u--input>
<view slot="right" v-show="!params.mobile">
<u-button size="mini" type="success" open-type="getPhoneNumber" @getphonenumber="getInfoPhoneNumber" >微信一键授权</u-button>
</view>
</u-form-item>
<u-form-item labelWidth="60" label="工号" prop="params.empcardno" :required="true" borderBottom ref="item1">
<u--input v-model="params.empcardno" border="none" placeholder="请填写工号"></u--input>
</u-form-item>
</u-form>
<view class="m-t-20">
<u-button type="success" @tap="submit1">提交</u-button>
</view>
</view>
</template>
<script>
// import shPickaddress from '@/components/sh-pickAddress/pickAddress.vue';
import {
mapActions,
mapGetters
} from 'vuex'
import http from '@/shopro/request/index';
export default {
components: {
// shPickaddress
computed: {
// ...mapGetters([])
},
data() {
return {
showSex: false,
form: {
userInfo: {
name: '',
tel:'',
region:'',
detailRegion:''
},
params: { //手机号+工号
empcardno:"",
mobile:""
},
// rules: {
// 'userInfo.name': {
// 'params.giftCardNo': {
// type: 'string',
// required: true,
// message: '请填写姓名',
// message: '请填写手机号',
// trigger: ['blur', 'change']
// },
// 'userInfo.sex': {
// 'params.giftCardPwd': {
// type: 'string',
// max: 1,
// required: true,
// message: '请选择男或女',
// message: '请填写工号',
// trigger: ['blur', 'change']
// },
// },
radio: '',
switchVal: false,
filterPopup: false,//选择地址列表
switchBar: true, //默认地址开关
}
},
methods: {
selAddress() {
this.filterPopup = true
...mapActions(['getPhoneNumber','editPhone','existPhone']),
async getInfoPhoneNumber(e) {
let ph = await this.getPhoneNumber(e);
let res = await this.editPhone(ph);
if(res) { //跳转
this.params.mobile =ph.data
}
},
// 选择性别
// sexSelect(e) {
// this.model1.userInfo.sex = e.name
// this.$refs.form1.validateField('userInfo.sex')
// },
submit1(){
conole.log(this.params)
// this.$refs.form1.validate().then(res => {
if(!this.params.mobile){
this.$u.toast("先授权手机号");
}
// }).catch(errors => {
// console.log("失败信息:" + JSON.stringify(errors))
// uni.$u.toast('校验失败')
// })
}
},
onLoad() {
// 判定是否有手机号
// 无手机号：显示手机号授权，点击注册，提示请先授权
// 有手机号：不显示手机号授权，直接注册
},
async onReady(){
// this.$refs.form1.setRules(this.rules)
this.params.mobile = await this.existPhone()
// console.log(this.params.mobile)
}
}
</script>
<style lang="scss" scoped>
page{
background:#f2f2f2;
}
.addressCreate-wrap{
.address_info{
margin: 0 auto;
height: 370rpx;
border-radius:0 0 26rpx 26rpx;
}
.default_address{
height: 160rpx;
border-radius:26rpx;
.tipText{
color: #666;
}
}
.save-btn{
.btn-h{
height: 65rpx;
}
background:red;
}
}
::v-deep .u-form-item__body__left__content__label,::v-deep .uni-input-placeholder{
font-size: 14PX;
}
</style>
pages/user/register/pwdCodeNameEmpnoReg.vue
View file @ 1d8ef658
<template>
<view class="addressCreate-wrap">
<view class="address_info w-bg-color p-l-32 p-r-32 p-t-32 ">
<u-form labelPosition="left" :model="form" ref="form1">
<u-form-item labelWidth="80" label="手机号" prop="params.name" borderBottom ref="item1">
<u--input v-model="params.tel" border="none" placeholder="请填写收货人手机号"></u--input>
<view slot="right">
<u-button size="mini" type="success" @click="submit">微信一键授权</u-button>
</view>
</u-form-item>
<u-form-item labelWidth="80" label="工号/卡号" prop="params.name" borderBottom ref="item1">
<u--input v-model="params.name" border="none" placeholder="请填写收货人姓名"></u--input>
</u-form-item>
<u-form-item labelWidth="80" label="姓名" prop="params.name" borderBottom ref="item1">
<u--input v-model="params.tel" border="none" placeholder="请填写收货人手机号"></u--input>
</u-form-item>
</u-form>
<u-button type="success" @click="submit">提交</u-button>
<view>
<u-form labelPosition="left" :model="form" ref="form1" >
<u-form-item labelWidth="60" label="手机号" prop="params.mobile" :required="true" borderBottom ref="item1">
<u--input v-model="params.mobile" disabled border="none" placeholder="请填写手机号"></u--input>
<view slot="right" v-show="!params.mobile">
<u-button size="mini" type="success" open-type="getPhoneNumber" @getphonenumber="getInfoPhoneNumber" >微信一键授权</u-button>
</view>
</u-form-item>
<u-form-item labelWidth="60" label="卡号" prop="params.giftCardNo" :required="true" borderBottom ref="item1">
<u--input v-model="params.giftCardNo" border="none" placeholder="请填写卡号"></u--input>
</u-form-item>
<u-form-item labelWidth="60" label="密码" prop="params.giftCardPwd" :required="true" borderBottom ref="item1">
<u--input v-model="params.giftCardPwd" border="none" placeholder="请填写密码"></u--input>
</u-form-item>
</u-form>
<view class="m-t-20">
<u-button type="success" @tap="submit1">提交</u-button>
</view>
</view>
</template>
<script>
// import shPickaddress from '@/components/sh-pickAddress/pickAddress.vue';
import {
mapActions,
mapGetters
} from 'vuex'
import http from '@/shopro/request/index';
export default {
components: {
// shPickaddress
computed: {
// ...mapGetters([])
},
data() {
return {
showSex: false,
params: {
name: '',
tel:'',
region:'',
detailRegion:''
giftCardNo:"", //卡密注册
giftCardPwd:"",
mobile:''
},
// rules: {
// 'params.name': {
// type: 'string',
// required: true,
// message: '请填写姓名',
// trigger: ['blur', 'change']
// },
// 'params.sex': {
// type: 'string',
// max: 1,
// required: true,
// message: '请选择男或女',
// trigger: ['blur', 'change']
// },
// },
radio: '',
switchVal: false,
filterPopup: false,//选择地址列表
switchBar: true, //默认地址开关
rules: {
'params.giftCardNo': {
type: 'string',
required: true,
message: '请填写姓名',
trigger: ['blur', 'change']
},
'params.giftCardPwd': {
type: 'string',
required: true,
message: '请填写姓名',
trigger: ['blur', 'change']
},
},
}
},
methods: {
selAddress() {
this.filterPopup = true
...mapActions(['getPhoneNumber','editPhone','existPhone']),
async getInfoPhoneNumber(e) {
let ph = await this.getPhoneNumber(e);
let res = await this.editPhone(ph);
if(res) { //跳转
this.params.mobile =ph.data
}
},
// 选择性别
// sexSelect(e) {
// this.model1.params.sex = e.name
// this.$refs.form1.validateField('params.sex')
// },
submit1(){
// this.$refs.form1.validate().then(res => {
if(!this.params.mobile){
this.$u.toast("先授权手机号");
}
// }).catch(errors => {
// console.log("失败信息:" + JSON.stringify(errors))
// uni.$u.toast('校验失败')
// })
}
},
onLoad() {
// 判定是否有手机号
// 无手机号：显示手机号授权，点击注册，提示请先授权
// 有手机号：不显示手机号授权，直接注册
},
async onReady(){
// this.$refs.form1.setRules(this.rules)
this.params.mobile = await this.existPhone()
// console.log(this.params.mobile)
}
}
</script>
<style lang="scss" scoped>
page{
background:#f2f2f2;
}
.addressCreate-wrap{
.address_info{
margin: 0 auto;
height: 370rpx;
border-radius:0 0 26rpx 26rpx;
}
.default_address{
height: 160rpx;
border-radius:26rpx;
.tipText{
color: #666;
}
}
.save-btn{
.btn-h{
height: 65rpx;
}
background:red;
}
}
::v-deep .u-form-item__body__left__content__label,::v-deep .uni-input-placeholder{
font-size: 14PX;
}
</style>
shopro/request/apis.js
View file @ 1d8ef658
......@@ -55,6 +55,12 @@ export default {
method: "get",
// desc: '企业列表',
},
existPhone:{
url: "mall/member/phone",
auth: true,
method: "get",
// desc:查询是否有手机号
}
},
......
shopro/store/modules/user.js
View file @ 1d8ef658
......@@ -19,7 +19,9 @@ const state = {
wxCode:'',
todayNum:0,
sessionStatus:false,
enterpriseList:[]//企业列表
enterpriseList:[],//企业列表
ph:'',//手机号
companyId:''
}
const getters = {
......@@ -29,7 +31,9 @@ const getters = {
wxCode: state=> state.wxCode,
sessionStatus: state=> state.sessionStatus,
mallId: state=>state.mallId,
enterpriseList:state=>state.enterpriseList
enterpriseList:state=>state.enterpriseList,
ph:state=>state.ph,
companyId:state=>state.companyId
}
......@@ -42,7 +46,8 @@ const actions = {
dispatch,
commit,
state
}, code,companyId) {
}, code) {
let companyId = uni.getStorageSync('companyId')
return new Promise((resolve, reject) => {
uni.setStorageSync("mallId", state.mallId);
......@@ -167,6 +172,20 @@ const actions = {
})
})
},
// 是否有手机号
existPhone({commit}){
return new Promise((resolve,reject) => {
http('user.existPhone', {}).then(res => {
if(res.code == 0) {
state.ph = res.data.phone_nmuber
resolve(res.data.phone_nmuber)
}else{
state.ph = ""
resolve(state.ph)
}
})
})
},
// 注册用户
registerInfoFn({commit,state},companyId){
return new Promise((resolve,reject) => {
......
static/style/common.scss
View file @ 1d8ef658
......@@ -21,7 +21,9 @@
color:#666
}
.brd{
border-radius: 20rpx;
}
::-webkit-scrollbar {
display: none;
......@@ -139,8 +141,8 @@ $bg-color:#f0f0f0;//背景底色
}
// form表单样式
.u-form-item{
padding-left:32rpx ;
padding-right:32rpx ;
background: #e4e7ed;
margin-bottom: 20rpx;
// padding-left:32rpx ;
// padding-right:32rpx ;
// background: #e4e7ed;
// margin-bottom: 20rpx;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment