diff --git a/src/api/login.ts b/src/api/login.ts index 7cbc236..a98c560 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -28,3 +28,12 @@ export function getSign(data: { meetId: string; openid: string }) { data }) } + +//扫码时手机号获取用户信息 +export function getmemberMobileGet(data: { meetId: string; openid: string; mobile: string }) { + return request.http({ + url: '/api/member_mobile_get', + method: 'GET', + data + }) +} \ No newline at end of file diff --git a/src/api/user.ts b/src/api/user.ts index 5c4a200..81ce8ce 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -14,7 +14,7 @@ export interface dateListtype extends listType { id: number } -export function infoForOpenid(data: { openid: string; mobile: string; meetId: string }) { +export function infoForOpenid(data: { openid: string; mobile: string ; meetId: string }) { return request.http({ url: '/api/member_mobile_get', method: 'GET', @@ -22,7 +22,16 @@ export function infoForOpenid(data: { openid: string; mobile: string; meetId: st }) } -export function list(data: { name: string }) { +// 手机号获取用户信息 +export function getMember_mobile(data: any) { + return request.http({ + url: '/api/member_mobile', + method: 'GET', + data + }) +} + +export function list(data: { name: string, meetId: string }) { return request.http({ url: '/api/member_name', method: 'GET', diff --git a/src/api/votingElection.ts b/src/api/votingElection.ts index c6668f6..9fb86e6 100644 --- a/src/api/votingElection.ts +++ b/src/api/votingElection.ts @@ -28,7 +28,7 @@ export function getMyvote(data: any) { // 手机号获取用户信息 export function getMember_mobile(data: any) { return request.http({ - url: '/api/member_mobile_get', + url: '/api/member_mobile', method: 'GET', data }) diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index eecc0d6..5ae326c 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -1,123 +1,118 @@ + .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; + } + } + \ No newline at end of file diff --git a/src/pages/mine/add.vue b/src/pages/mine/add.vue index f17eb72..abe8bb2 100644 --- a/src/pages/mine/add.vue +++ b/src/pages/mine/add.vue @@ -1,22 +1,9 @@ diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index a991d9a..6228e2f 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -1,6 +1,6 @@