Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mini_own
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
geruidan
mini_own
Commits
1d8ef658
Commit
1d8ef658
authored
Jun 13, 2023
by
小耗子
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改注册流程
parent
c13b30ff
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
282 additions
and
264 deletions
+282
-264
pages.json
pages.json
+18
-17
pages/index/defalutScreen.vue
pages/index/defalutScreen.vue
+12
-8
pages/user/enterprise.vue
pages/user/enterprise.vue
+3
-2
pages/user/register/giftPwdReg.vue
pages/user/register/giftPwdReg.vue
+54
-77
pages/user/register/index.vue
pages/user/register/index.vue
+32
-6
pages/user/register/phCodeEmpnoReg.vue
pages/user/register/phCodeEmpnoReg.vue
+58
-70
pages/user/register/pwdCodeNameEmpnoReg.vue
pages/user/register/pwdCodeNameEmpnoReg.vue
+70
-76
shopro/request/apis.js
shopro/request/apis.js
+6
-0
shopro/store/modules/user.js
shopro/store/modules/user.js
+22
-3
static/style/common.scss
static/style/common.scss
+7
-5
No files found.
pages.json
View file @
1d8ef658
...
@@ -5,14 +5,6 @@
...
@@ -5,14 +5,6 @@
},
},
"pages"
:
[
//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
"pages"
:
[
//pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
{
"path"
:
"pages/user/register/index"
,
"name"
:
"register"
,
"style"
:
{
"navigationBarTitleText"
:
"注册"
,
"enablePullDownRefresh"
:
false
}
},{
"path"
:
"pages/index/defalutScreen"
,
"path"
:
"pages/index/defalutScreen"
,
"name"
:
"defalutScreen"
,
"name"
:
"defalutScreen"
,
"style"
:
"style"
:
...
@@ -114,6 +106,15 @@
...
@@ -114,6 +106,15 @@
"navigationBarTitleText"
:
"选择企业"
,
"navigationBarTitleText"
:
"选择企业"
,
"enablePullDownRefresh"
:
false
"enablePullDownRefresh"
:
false
}
}
},
{
"path"
:
"pages/user/register/index"
,
"name"
:
"register"
,
"style"
:
{
"navigationBarTitleText"
:
"注册"
,
"enablePullDownRefresh"
:
false
}
}
}
],
],
"subPackages"
:[],
"subPackages"
:[],
...
@@ -151,17 +152,17 @@
...
@@ -151,17 +152,17 @@
"condition"
:
{
//模式配置,仅开发期间生效
"condition"
:
{
//模式配置,仅开发期间生效
"current"
:
0
,
//当前激活的模式(list
的索引项)
"current"
:
0
,
//当前激活的模式(list
的索引项)
"list"
:
[
"list"
:
[
//
{
//
"name"
:
"defalutScreen"
,
//模式名称
//
"path"
:
"pages/index/defalutScreen"
,
//启动页面,必选
//
"query"
:
"companyId=999999998"
//
}
{
{
"name"
:
"register"
,
//模式名称
"name"
:
"defalutScreen"
,
//模式名称
"path"
:
"pages/user/register/index"
,
//启动页面,必选
"path"
:
"pages/index/defalutScreen"
,
//启动页面,必选
"query"
:
"reqisterPageType=3"
"query"
:
"companyId=999999998"
}
}
//
{
//
"name"
:
"register"
,
//模式名称
//
"path"
:
"pages/user/register/index"
,
//启动页面,必选
//
"query"
:
"reqisterPageType=1"
//
}
]
]
},
},
"lazyCodeLoading"
:
"requiredComponents"
"lazyCodeLoading"
:
"requiredComponents"
...
...
pages/index/defalutScreen.vue
View file @
1d8ef658
...
@@ -104,10 +104,10 @@
...
@@ -104,10 +104,10 @@
console
.
log
(
"
走吗1
"
)
console
.
log
(
"
走吗1
"
)
// session 不存在,调用login。userInfo 。更新session
// session 不存在,调用login。userInfo 。更新session
uni
.
login
({
uni
.
login
({
success
:
function
(
info
)
{
//调用code
success
:
function
(
info
)
{
//调用code
console
.
log
(
"
code000000000000000000000000==========
"
,
info
.
code
)
console
.
log
(
"
code000000000000000000000000==========
"
,
info
.
code
,
that
.
companyId
)
that
.
$store
.
commit
(
'
wxCode
'
,
info
.
code
);
//按钮切换全选。
that
.
$store
.
commit
(
'
wxCode
'
,
info
.
code
);
//按钮切换全选。
let
userInfo
=
that
.
getUserInfo
(
info
.
code
,
this
.
companyId
);
let
userInfo
=
that
.
getUserInfo
(
info
.
code
);
userInfo
.
then
(
res
=>
{
userInfo
.
then
(
res
=>
{
that
.
authCheck
().
then
(
checkCode
=>
{
that
.
authCheck
().
then
(
checkCode
=>
{
that
.
loading
=
false
;
that
.
loading
=
false
;
...
@@ -161,7 +161,15 @@
...
@@ -161,7 +161,15 @@
// uni.hideTabBar();
// uni.hideTabBar();
},
},
onReady
()
{
onReady
()
{
wx
.
clearStorage
();
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
();
this
.
getAuth
();
},
},
onShareAppMessage
(
res
){
onShareAppMessage
(
res
){
...
@@ -170,11 +178,7 @@
...
@@ -170,11 +178,7 @@
}
}
},
},
onLoad
(
options
){
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 @@
...
@@ -67,9 +67,10 @@
// 4-页面有 手机号验证码+姓名+工号 pwdCodeNameEmpnoReg
// 4-页面有 手机号验证码+姓名+工号 pwdCodeNameEmpnoReg
if
(
item
.
loginType
&&
item
.
mallType
==
0
){
//需要注册页 && 封闭式
if
(
item
.
loginType
&&
item
.
mallType
==
0
){
//需要注册页 && 封闭式
this
.
$Router
.
push
({
path
:
'
/pages/user/register/index
'
,
query
:{
"
reqisterPageType
"
:
item
.
reqisterPageType
}})
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
{
//开放式的代码
else
{
//开放式的代码
let
register
=
await
this
.
registerInfoFn
(
item
.
companyId
)
let
register
=
await
this
.
registerInfoFn
(
item
.
companyId
)
if
(
register
)
{
//注册成功
if
(
register
)
{
//注册成功
...
...
pages/user/register/giftPwdReg.vue
View file @
1d8ef658
<
template
>
<
template
>
<view
class=
"addressCreate-wrap"
>
<view
>
<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
labelPosition=
"left"
:model=
"form"
ref=
"form1"
>
<u-form-item
labelWidth=
"60"
label=
"手机号"
prop=
"params.mobile"
:required=
"true"
borderBottom
ref=
"item1"
>
<u-form-item
labelWidth=
"80"
label=
"手机号"
prop=
"userInfo.name"
borderBottom
ref=
"item1"
>
<u--input
v-model=
"params.mobile"
disabled
border=
"none"
placeholder=
"请填写手机号"
></u--input>
<u--input
v-model=
"params.tel"
border=
"none"
placeholder=
"请填写收货人手机号"
></u--input>
<view
slot=
"right"
v-show=
"!params.mobile"
>
<view
slot=
"right"
>
<u-button
size=
"mini"
type=
"success"
open-type=
"getPhoneNumber"
@
getphonenumber=
"getInfoPhoneNumber"
>
微信一键授权
</u-button>
<u-button
size=
"mini"
type=
"success"
open-type=
"getPhoneNumber"
@
getphonenumber=
"getInfoPhoneNumber"
>
微信一键授权
</u-button>
</view>
</view>
</u-form-item>
</u-form-item>
<u-form-item
labelWidth=
"60"
label=
"卡号"
prop=
"params.giftCardNo"
:required=
"true"
borderBottom
ref=
"item1"
>
<u-form-item
labelWidth=
"80"
label=
"卡号"
prop=
"userInfo.name"
borderBottom
ref=
"item1"
>
<u--input
v-model=
"params.giftCardNo"
border=
"none"
placeholder=
"请填写卡号"
></u--input>
<u--input
v-model=
"params.name"
border=
"none"
placeholder=
"请填写收货人姓名"
></u--input>
</u-form-item>
</u-form-item>
<u-form-item
labelWidth=
"60"
label=
"密码"
prop=
"params.giftCardPwd"
:required=
"true"
borderBottom
ref=
"item1"
>
<u-form-item
labelWidth=
"80"
label=
"密码"
prop=
"userInfo.name"
borderBottom
ref=
"item1"
>
<u--input
v-model=
"params.giftCardPwd"
border=
"none"
placeholder=
"请填写密码"
></u--input>
<u--input
v-model=
"params.tel"
border=
"none"
placeholder=
"请填写收货人手机号"
></u--input>
</u-form-item>
</u-form-item>
</u-form>
</u-form>
<view
class=
"m-t-20"
>
<u-button
type=
"success"
@
click=
"submit"
>
提交
</u-button>
<u-button
type=
"success"
@
tap=
"submit1"
>
提交
</u-button>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -29,50 +28,53 @@
...
@@ -29,50 +28,53 @@
}
from
'
vuex
'
}
from
'
vuex
'
import
http
from
'
@/shopro/request/index
'
;
import
http
from
'
@/shopro/request/index
'
;
export
default
{
export
default
{
comp
onents
:
{
comp
uted
:
{
//
shPickaddress
//
...mapGetters([])
},
},
data
()
{
data
()
{
return
{
return
{
showSex
:
false
,
showSex
:
false
,
params
:
{
params
:
{
name
:
''
,
giftCardNo
:
""
,
//卡密注册
tel
:
''
,
giftCardPwd
:
""
,
region
:
''
,
mobile
:
''
detailRegion
:
''
},
},
// rules: {
rules
:
{
// 'userInfo.name': {
'
params.giftCardNo
'
:
{
// type: 'string',
type
:
'
string
'
,
// required: true,
required
:
true
,
// message: '请填写姓名',
message
:
'
请填写姓名
'
,
// trigger: ['blur', 'change']
trigger
:
[
'
blur
'
,
'
change
'
]
// },
},
// 'userInfo.sex': {
'
params.giftCardPwd
'
:
{
// type: 'string',
type
:
'
string
'
,
// max: 1,
required
:
true
,
// required: true,
message
:
'
请填写姓名
'
,
// message: '请选择男或女',
trigger
:
[
'
blur
'
,
'
change
'
]
// trigger: ['blur', 'change']
},
// },
},
// },
radio
:
''
,
switchVal
:
false
,
filterPopup
:
false
,
//选择地址列表
switchBar
:
true
,
//默认地址开关
}
}
},
},
methods
:
{
methods
:
{
...
mapActions
([
'
getPhoneNumber
'
,
'
editPhone
'
]),
...
mapActions
([
'
getPhoneNumber
'
,
'
editPhone
'
,
'
existPhone
'
]),
async
getInfoPhoneNumber
(
e
)
{
async
getInfoPhoneNumber
(
e
)
{
let
ph
=
await
this
.
getPhoneNumber
(
e
);
let
ph
=
await
this
.
getPhoneNumber
(
e
);
let
res
=
await
this
.
editPhone
(
ph
);
let
res
=
await
this
.
editPhone
(
ph
);
console
.
log
(
res
)
console
.
log
(
ph
)
if
(
res
)
{
//跳转
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 @@
...
@@ -80,39 +82,14 @@
// 判定是否有手机号
// 判定是否有手机号
// 无手机号:显示手机号授权,点击注册,提示请先授权
// 无手机号:显示手机号授权,点击注册,提示请先授权
// 有手机号:不显示手机号授权,直接注册
// 有手机号:不显示手机号授权,直接注册
},
async
onReady
(){
// this.$refs.form1.setRules(this.rules)
this
.
params
.
mobile
=
await
this
.
existPhone
()
// console.log(this.params.mobile)
}
}
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
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
:
14
PX
;
}
</
style
>
</
style
>
pages/user/register/index.vue
View file @
1d8ef658
<
template
>
<
template
>
<view>
<view
class=
"addressCreate-wrap"
>
<ph-code-empno-reg
v-if=
"reqisterPageType == 1"
></ph-code-empno-reg>
<view
class=
"address_info w-bg-color p-l-32 p-r-32 "
>
<gift-pwd-reg
v-if=
"reqisterPageType == 3"
></gift-pwd-reg>
<ph-code-empno-reg
v-if=
"reqisterPageType == 1"
></ph-code-empno-reg>
<pwd-code-name-empnoReg
v-if=
"reqisterPageType == 4"
></pwd-code-name-empnoReg>
<gift-pwd-reg
v-if=
"reqisterPageType == 3"
></gift-pwd-reg>
<!-- 第四种情况待定 -->
<pwd-code-name-empnoReg
v-if=
"reqisterPageType == 4"
></pwd-code-name-empnoReg>
</view>
</view>
</view>
</
template
>
</
template
>
<
script
>
<
script
>
...
@@ -39,6 +42,29 @@
...
@@ -39,6 +42,29 @@
}
}
</
script
>
</
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
:
14
PX
;
}
</
style
>
</
style
>
pages/user/register/phCodeEmpnoReg.vue
View file @
1d8ef658
<
template
>
<
template
>
<view
class=
"addressCreate-wrap"
>
<view>
<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
labelPosition=
"left"
:model=
"form"
ref=
"form1"
>
<u-form-item
labelWidth=
"60"
label=
"手机号"
prop=
"params.mobile"
:required=
"true"
borderBottom
ref=
"item1"
>
<u-form-item
labelWidth=
"80"
label=
"手机号"
prop=
"userInfo.name"
borderBottom
ref=
"item1"
>
<u--input
v-model=
"params.mobile"
disabled
border=
"none"
placeholder=
"请填写手机号"
></u--input>
<u--input
v-model=
"params.tel"
border=
"none"
placeholder=
"请填写收货人手机号"
></u--input>
<view
slot=
"right"
v-show=
"!params.mobile"
>
<view
slot=
"right"
>
<u-button
size=
"mini"
type=
"success"
open-type=
"getPhoneNumber"
@
getphonenumber=
"getInfoPhoneNumber"
>
微信一键授权
</u-button>
<u-button
size=
"mini"
type=
"success"
@
click=
"submit"
>
微信一键授权
</u-button>
</view>
</view>
</u-form-item>
</u-form-item>
<u-form-item
labelWidth=
"60"
label=
"工号"
prop=
"params.empcardno"
:required=
"true"
borderBottom
ref=
"item1"
>
<u-form-item
labelWidth=
"80"
label=
"工号/卡号"
prop=
"userInfo.name"
borderBottom
ref=
"item1"
>
<u--input
v-model=
"params.empcardno"
border=
"none"
placeholder=
"请填写工号"
></u--input>
<u--input
v-model=
"params.name"
border=
"none"
placeholder=
"请填写收货人姓名"
></u--input>
</u-form-item>
</u-form-item>
</u-form>
<u-form-item
labelWidth=
"80"
label=
"姓名"
prop=
"userInfo.name"
borderBottom
ref=
"item1"
>
<view
class=
"m-t-20"
>
<u--input
v-model=
"params.tel"
border=
"none"
placeholder=
"请填写收货人手机号"
></u--input>
<u-button
type=
"success"
@
tap=
"submit1"
>
提交
</u-button>
</u-form-item>
</u-form>
<u-button
type=
"success"
@
click=
"submit"
>
提交
</u-button>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
<
script
>
<
script
>
// import shPickaddress from '@/components/sh-pickAddress/pickAddress.vue';
// import shPickaddress from '@/components/sh-pickAddress/pickAddress.vue';
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
import
http
from
'
@/shopro/request/index
'
;
export
default
{
export
default
{
comp
onents
:
{
comp
uted
:
{
//
shPickaddress
//
...mapGetters([])
},
},
data
()
{
data
()
{
return
{
return
{
showSex
:
false
,
showSex
:
false
,
form
:
{
params
:
{
//手机号+工号
userInfo
:
{
empcardno
:
""
,
name
:
''
,
mobile
:
""
tel
:
''
,
region
:
''
,
detailRegion
:
''
},
},
},
// rules: {
// rules: {
// '
userInfo.name
': {
// '
params.giftCardNo
': {
// type: 'string',
// type: 'string',
// required: true,
// required: true,
// message: '请填写
姓名
',
// message: '请填写
手机号
',
// trigger: ['blur', 'change']
// trigger: ['blur', 'change']
// },
// },
// '
userInfo.sex
': {
// '
params.giftCardPwd
': {
// type: 'string',
// type: 'string',
// max: 1,
// required: true,
// required: true,
// message: '请
选择男或女
',
// message: '请
填写工号
',
// trigger: ['blur', 'change']
// trigger: ['blur', 'change']
// },
// },
// },
// },
radio
:
''
,
switchVal
:
false
,
filterPopup
:
false
,
//选择地址列表
switchBar
:
true
,
//默认地址开关
}
}
},
},
methods
:
{
methods
:
{
selAddress
()
{
...
mapActions
([
'
getPhoneNumber
'
,
'
editPhone
'
,
'
existPhone
'
]),
this
.
filterPopup
=
true
async
getInfoPhoneNumber
(
e
)
{
let
ph
=
await
this
.
getPhoneNumber
(
e
);
let
res
=
await
this
.
editPhone
(
ph
);
if
(
res
)
{
//跳转
this
.
params
.
mobile
=
ph
.
data
}
},
},
// 选择性别
submit1
(){
// sexSelect(e) {
conole
.
log
(
this
.
params
)
// this.model1.userInfo.sex = e.name
// this.$refs.form1.validate().then(res => {
// this.$refs.form1.validateField('userInfo.sex')
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
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
page
{
page
{
background
:
#f2f2f2
;
background
:red
;
}
.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
:
14
PX
;
}
</
style
>
</
style
>
pages/user/register/pwdCodeNameEmpnoReg.vue
View file @
1d8ef658
<
template
>
<
template
>
<view
class=
"addressCreate-wrap"
>
<view>
<
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
labelPosition=
"left"
:model=
"form"
ref=
"for
m1"
>
<u-form
-item
labelWidth=
"60"
label=
"手机号"
prop=
"params.mobile"
:required=
"true"
borderBottom
ref=
"ite
m1"
>
<u-
form-item
labelWidth=
"80"
label=
"手机号"
prop=
"params.name"
borderBottom
ref=
"item1"
>
<u-
-input
v-model=
"params.mobile"
disabled
border=
"none"
placeholder=
"请填写手机号"
></u--input
>
<u--input
v-model=
"params.tel"
border=
"none"
placeholder=
"请填写收货人手机号"
></u--input
>
<view
slot=
"right"
v-show=
"!params.mobile"
>
<view
slot=
"right"
>
<u-button
size=
"mini"
type=
"success"
open-type=
"getPhoneNumber"
@
getphonenumber=
"getInfoPhoneNumber"
>
微信一键授权
</u-button
>
<u-button
size=
"mini"
type=
"success"
@
click=
"submit"
>
微信一键授权
</u-button
>
</view
>
</view
>
</u-form-item
>
</u-form-item
>
<u-form-item
labelWidth=
"60"
label=
"卡号"
prop=
"params.giftCardNo"
:required=
"true"
borderBottom
ref=
"item1"
>
<u-
form-item
labelWidth=
"80"
label=
"工号/卡号"
prop=
"params.name"
borderBottom
ref=
"item1"
>
<u-
-input
v-model=
"params.giftCardNo"
border=
"none"
placeholder=
"请填写卡号"
></u--input
>
<u--input
v-model=
"params.name"
border=
"none"
placeholder=
"请填写收货人姓名"
></u--input
>
</u-form-item
>
</u-form-item
>
<u-form-item
labelWidth=
"60"
label=
"密码"
prop=
"params.giftCardPwd"
:required=
"true"
borderBottom
ref=
"item1"
>
<u-form-item
labelWidth=
"80"
label=
"姓名"
prop=
"params.name"
borderBottom
ref=
"item1"
>
<u--input
v-model=
"params.giftCardPwd"
border=
"none"
placeholder=
"请填写密码"
></u--input
>
<u--input
v-model=
"params.tel"
border=
"none"
placeholder=
"请填写收货人手机号"
></u--input
>
</u-form-item
>
</u-form-ite
m>
</u-for
m>
</u-form
>
<view
class=
"m-t-20"
>
<u-button
type=
"success"
@
click=
"submit
"
>
提交
</u-button>
<u-button
type=
"success"
@
tap=
"submit1
"
>
提交
</u-button>
</view>
</view>
</view>
</view>
</
template
>
</
template
>
<
script
>
<
script
>
// import shPickaddress from '@/components/sh-pickAddress/pickAddress.vue';
// import shPickaddress from '@/components/sh-pickAddress/pickAddress.vue';
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
import
http
from
'
@/shopro/request/index
'
;
export
default
{
export
default
{
comp
onents
:
{
comp
uted
:
{
//
shPickaddress
//
...mapGetters([])
},
},
data
()
{
data
()
{
return
{
return
{
showSex
:
false
,
showSex
:
false
,
params
:
{
params
:
{
name
:
''
,
giftCardNo
:
""
,
//卡密注册
tel
:
''
,
giftCardPwd
:
""
,
region
:
''
,
mobile
:
''
detailRegion
:
''
},
},
// rules: {
rules
:
{
// 'params.name': {
'
params.giftCardNo
'
:
{
// type: 'string',
type
:
'
string
'
,
// required: true,
required
:
true
,
// message: '请填写姓名',
message
:
'
请填写姓名
'
,
// trigger: ['blur', 'change']
trigger
:
[
'
blur
'
,
'
change
'
]
// },
},
// 'params.sex': {
'
params.giftCardPwd
'
:
{
// type: 'string',
type
:
'
string
'
,
// max: 1,
required
:
true
,
// required: true,
message
:
'
请填写姓名
'
,
// message: '请选择男或女',
trigger
:
[
'
blur
'
,
'
change
'
]
// trigger: ['blur', 'change']
},
// },
},
// },
radio
:
''
,
switchVal
:
false
,
filterPopup
:
false
,
//选择地址列表
switchBar
:
true
,
//默认地址开关
}
}
},
},
methods
:
{
methods
:
{
selAddress
()
{
...
mapActions
([
'
getPhoneNumber
'
,
'
editPhone
'
,
'
existPhone
'
]),
this
.
filterPopup
=
true
async
getInfoPhoneNumber
(
e
)
{
let
ph
=
await
this
.
getPhoneNumber
(
e
);
let
res
=
await
this
.
editPhone
(
ph
);
if
(
res
)
{
//跳转
this
.
params
.
mobile
=
ph
.
data
}
},
},
// 选择性别
submit1
(){
// sexSelect(e) {
// this.$refs.form1.validate().then(res => {
// this.model1.params.sex = e.name
if
(
!
this
.
params
.
mobile
){
// this.$refs.form1.validateField('params.sex')
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
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
page
{
page
{
background
:
#f2f2f2
;
background
:red
;
}
.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
:
14
PX
;
}
</
style
>
</
style
>
shopro/request/apis.js
View file @
1d8ef658
...
@@ -55,6 +55,12 @@ export default {
...
@@ -55,6 +55,12 @@ export default {
method
:
"
get
"
,
method
:
"
get
"
,
// desc: '企业列表',
// 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 = {
...
@@ -19,7 +19,9 @@ const state = {
wxCode
:
''
,
wxCode
:
''
,
todayNum
:
0
,
todayNum
:
0
,
sessionStatus
:
false
,
sessionStatus
:
false
,
enterpriseList
:[]
//企业列表
enterpriseList
:[],
//企业列表
ph
:
''
,
//手机号
companyId
:
''
}
}
const
getters
=
{
const
getters
=
{
...
@@ -29,7 +31,9 @@ const getters = {
...
@@ -29,7 +31,9 @@ const getters = {
wxCode
:
state
=>
state
.
wxCode
,
wxCode
:
state
=>
state
.
wxCode
,
sessionStatus
:
state
=>
state
.
sessionStatus
,
sessionStatus
:
state
=>
state
.
sessionStatus
,
mallId
:
state
=>
state
.
mallId
,
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 = {
...
@@ -42,7 +46,8 @@ const actions = {
dispatch
,
dispatch
,
commit
,
commit
,
state
state
},
code
,
companyId
)
{
},
code
)
{
let
companyId
=
uni
.
getStorageSync
(
'
companyId
'
)
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
uni
.
setStorageSync
(
"
mallId
"
,
state
.
mallId
);
uni
.
setStorageSync
(
"
mallId
"
,
state
.
mallId
);
...
@@ -167,6 +172,20 @@ const actions = {
...
@@ -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
){
registerInfoFn
({
commit
,
state
},
companyId
){
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
...
...
static/style/common.scss
View file @
1d8ef658
...
@@ -21,7 +21,9 @@
...
@@ -21,7 +21,9 @@
color
:
#666
color
:
#666
}
}
.brd
{
border-radius
:
20rpx
;
}
::-webkit-scrollbar
{
::-webkit-scrollbar
{
display
:
none
;
display
:
none
;
...
@@ -139,8 +141,8 @@ $bg-color:#f0f0f0;//背景底色
...
@@ -139,8 +141,8 @@ $bg-color:#f0f0f0;//背景底色
}
}
// form表单样式
// form表单样式
.u-form-item
{
.u-form-item
{
padding-left
:
32rpx
;
//
padding-left:32rpx ;
padding-right
:
32rpx
;
//
padding-right:32rpx ;
background
:
#e4e7ed
;
//
background: #e4e7ed;
margin-bottom
:
20rpx
;
//
margin-bottom: 20rpx;
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment