diff --git a/src/api/login.ts b/src/api/login.ts index 60af2c7..da58bd4 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -1,5 +1,6 @@ import { request } from '@/utils/http' +//获取用户openid export function getOpenid(data: { code: string }) { return request.http({ url: '/api/huiqitong/get_openid', @@ -7,9 +8,26 @@ export function getOpenid(data: { code: string }) { }) } +//手机号授权登录 export function mobileAuth(data: { code: string; openid: string }) { return request.http({ url: '/api/huiqitong/mobile_auth', data }) } + +//发送登录验证码 +export function loginYzm(data: { mobile: string }) { + return request.http({ + url: '/api/send/mobile/login', + data + }) +} + +//手机号验证码登录 +export function mobileLogin(data: { mobile: string; mobile_key: string; mobile_code: string }) { + return request.http({ + url: '/api/huiqitong/mobile_login', + data + }) +} diff --git a/src/api/memberCenter.ts b/src/api/memberCenter.ts index 0d4fcf2..159bef1 100644 --- a/src/api/memberCenter.ts +++ b/src/api/memberCenter.ts @@ -42,6 +42,15 @@ export function myMemberApply() { }) } +//注册会员 +export function xh_memberRegister(data: any) { + return request.http({ + url: '/api/huiqitong/xh_member/register', + method: 'POST', + data + }) +} + //协会会员列表 export function xhMember(data: any) { return request.http({ @@ -62,7 +71,7 @@ export function xhMemberInfo(id: string) { //获取授权手机号注册协会会员 export function authRegister(data: any) { return request.http({ - url: '/api/huiqitong/xh_member/auth_register', + url: '/api/huiqitong/xh_member/get_auth_mobile', method: 'POST', data }) @@ -77,17 +86,26 @@ export function register(data: any) { }) } -//手机号验证码注册协会会员 +//手机号验证码验证 export function smsRegister(data: any) { return request.http({ - url: '/api/huiqitong/xh_member/sms_register', + url: '/api/huiqitong/xh_member/sms_verify', method: 'POST', data }) } -//完善会员信息 +//注册会员信息 export function xhMemberImprove(data: any) { + return request.http({ + url: '/api/huiqitong/xh_member/sms_verify', + method: 'POST', + data + }) +} + +//完善会员信息 +export function xhMemprove(data: any) { return request.http({ url: '/api/huiqitong/xh_member/improve', method: 'POST', diff --git a/src/pages.json b/src/pages.json index c5d489c..ca5c2be 100644 --- a/src/pages.json +++ b/src/pages.json @@ -30,6 +30,20 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/memberCenter/makemessage", + "style": { + "navigationBarTitleText": "完善信息", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/memberCenter/makemessage2", + "style": { + "navigationBarTitleText": "完善信息", + "enablePullDownRefresh": false + } + }, { "path": "pages/memberCenter/memberRegistration", "style": { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index e86dc38..26064ec 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -2,8 +2,7 @@ - + @@ -169,6 +177,10 @@ 取消 --> + + + + + .login { + width: 100%; + height: 100vh; + overflow: hidden; + position: relative; + text-align: center; + box-sizing: border-box; + padding: 500rpx 30rpx 0; + background-color: #fff; + + .logo-img { + width: 220rpx; + margin-bottom: 60rpx; + } + } + + .btn_box { + margin-top: 60rpx; + } + + .backindex { + margin-top: 20px; + } + + .container { + background: linear-gradient(0deg, #f1f3f9 72%, rgba(129, 179, 222, 0.5) 88%); + height: 100vh; + width: 100%; + display: grid; + align-content: center; + justify-items: center; + + .butp { + /* 标签栏投影 */ + display: grid; + align-items: center; + justify-content: center; + + .but { + margin-top: 22rpx; + padding: 24rpx 224rpx; + border-radius: 16rpx; + background: linear-gradient(90deg, #007FFF 0%, #99CCFF 100%); + display: flex; + align-items: center; + justify-content: center; + font-family: Source Han Sans; + font-size: 36rpx; + font-weight: 350; + color: #FFFFFF; + } + + :deep(.u-button) { + padding: 24rpx 224rpx; + border-radius: 16rpx; + height: 96rpx; + } + + :deep(.u-button__text) { + font-family: Source Han Sans; + font-size: 36rpx !important; + font-weight: 350; + color: #FFFFFF; + } + } + + .radiotxt { + margin-top: 296rpx; + display: flex; + align-items: center; + justify-content: center; + + .txt1 { + font-family: Source Han Sans; + font-size: 28rpx; + font-weight: 350; + color: #969696; + } + + .txt2 { + margin-left: 10rpx; + font-family: Source Han Sans; + font-size: 28rpx; + font-weight: 350; + color: #2563EB + } + } + } + + .hyzc { + width: 100%; + display: flex; + justify-content: flex-end; + color: #2563EB; + margin-top: 15px; + padding-right: 12px; + } + \ No newline at end of file diff --git a/src/pages/memberCenter/agreement.vue b/src/pages/memberCenter/agreement.vue index f898e02..c695576 100644 --- a/src/pages/memberCenter/agreement.vue +++ b/src/pages/memberCenter/agreement.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/memberCenter/makemessage.vue b/src/pages/memberCenter/makemessage.vue new file mode 100644 index 0000000..ffd8840 --- /dev/null +++ b/src/pages/memberCenter/makemessage.vue @@ -0,0 +1,597 @@ + + + + + + \ No newline at end of file diff --git a/src/pages/memberCenter/makemessage2.vue b/src/pages/memberCenter/makemessage2.vue new file mode 100644 index 0000000..c9f223d --- /dev/null +++ b/src/pages/memberCenter/makemessage2.vue @@ -0,0 +1,590 @@ + + + + + + \ No newline at end of file diff --git a/src/pages/memberCenter/memberRegistration.vue b/src/pages/memberCenter/memberRegistration.vue index aa68685..6ca8d28 100644 --- a/src/pages/memberCenter/memberRegistration.vue +++ b/src/pages/memberCenter/memberRegistration.vue @@ -1,6 +1,8 @@