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 @@
-
+
{{xydata.title}}
diff --git a/src/pages/memberCenter/index.vue b/src/pages/memberCenter/index.vue
index 5a2a362..9aed304 100644
--- a/src/pages/memberCenter/index.vue
+++ b/src/pages/memberCenter/index.vue
@@ -4,9 +4,9 @@
title="会员中心"
placeholder="true"
bg-color="#F1F3F9"
- left-icon="man-add-fill"
+ :left-icon="isEmptyObject(userStore.userInfo)?'':'man-add-fill'"
left-icon-size="24"
- left-text="申请入会"
+ :left-text="isEmptyObject(userStore.userInfo)?'':'申请入会'"
@leftClick="leftClick"
>
{
- if (uni.getStorageSync('access_token') === '') {
- uni.showToast({
- title: '请登录',
- icon: 'fail'
- })
- } else {
+
// uni.navigateTo({
// url: '/pages/memberCenter/inpart'
// })
uni.navigateTo({
url: '/pages/memberCenter/memberRegistration'
})
- }
}
// 处理选项卡选择
@@ -192,6 +188,10 @@ const onloadmore = async () => {
})
}
+function isEmptyObject(obj) {
+ return Object.keys(obj).length !== 0;
+ }
+
onLoad(async () => {
// await getbqlist()
await getMemberCenter('', '', page.value, pagesize.value)
diff --git a/src/pages/memberCenter/inpart.vue b/src/pages/memberCenter/inpart.vue
index bed4e3b..4e5394e 100644
--- a/src/pages/memberCenter/inpart.vue
+++ b/src/pages/memberCenter/inpart.vue
@@ -18,7 +18,7 @@
prop="tel">
-
+
-
+
@@ -94,7 +94,8 @@
import {
memberTagList,
memberApply,
- xhMemberImprove
+ xhMemberImprove,
+ xh_memberRegister
} from '@/api/memberCenter'
import {
onShow
@@ -350,18 +351,20 @@
// }
// })
uni.$u.toast('校验通过')
- delete form.value.member_tag_name
+ // delete form.value.member_tag_name
console.log(form.value);
- xhMemberImprove(form.value).then((res) => {
+ xh_memberRegister(form.value).then((res) => {
if (res.code === 1) {
- uni.switchTab({
- url: '/pages/memberCenter/index'
- })
uni.showToast({
- title: '请等待审核',
+ title: '请完善信息',
icon: 'success',
duration: 2000
})
+ setTimeout(()=>{
+ uni.navigateTo({
+ url: '/pages/memberCenter/makemessage?number='+form.value.mobile+'&type='+form.value.identity
+ })
+ },2000)
} else {
uni.showToast({
title: res.msg,
diff --git a/src/pages/memberCenter/jump-login.vue b/src/pages/memberCenter/jump-login.vue
index f8e41c6..04c6ca0 100644
--- a/src/pages/memberCenter/jump-login.vue
+++ b/src/pages/memberCenter/jump-login.vue
@@ -6,7 +6,7 @@
{{codeViewMsg}}
-
+
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 @@
+ 内蒙古自治区个体私营企业协会简介
+ 内蒙古自治区个体私营企业协会(简称内蒙古个私协会,英文名称为Inner MongoliaPrivate-Owned Business Association,缩写IMPBA)是全区个体工商户、私营企业等组织及个人自愿组成的全区联合性非营利性社会团体。协会始终坚持以习近平新时代中国特色社会主义思想为指导,深入贯彻落实习近平总书记致全国个体劳动者第五次代表大会贺信精神,在中国个体劳动者协会、自治区市场监督管理局的正确指导和大力支持下,充分发挥桥梁纽带作用,积极履行“服务政府、服务会员、服务社会”的职能作用,努力当好政策法规的普及者、深化改革的推动者、能力素质的提升者、党的建设的组织者,勠力同心,创变求进,政治引领和服务发展同推进,共同助力内蒙古个体私营经济持续健康发展。
确认注册
diff --git a/src/pages/memberCenter/memberZc.vue b/src/pages/memberCenter/memberZc.vue
index 7f6c77b..22fa5b2 100644
--- a/src/pages/memberCenter/memberZc.vue
+++ b/src/pages/memberCenter/memberZc.vue
@@ -55,16 +55,19 @@
code: e.detail.code
}).then(res => {
if (res.code === 1) {
- uni.showToast({
- title: '注册成功',
- icon: 'none',
- duration: 2000
+ // uni.showToast({
+ // title: '注册成功',
+ // icon: 'none',
+ // duration: 2000
+ // })
+ // setTimeout(() => {
+ // uni.navigateTo({
+ // url: '/pages/memberCenter/inpart?number=' + res.data.mobile
+ // })
+ // }, 2000)
+ uni.navigateTo({
+ url: '/pages/memberCenter/inpart?number=' + res.data.mobile
})
- setTimeout(() => {
- uni.navigateTo({
- url: '/pages/memberCenter/inpart?number=' + res.data.mobile
- })
- }, 2000)
}
})
} else {
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index a9feb84..0a37a42 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -27,7 +27,7 @@
-
+
完善入会信息
@@ -83,7 +83,7 @@
})
} else if (val === '完善入会信息') {
uni.navigateTo({
- url: '/pages/memberCenter/inpart?number='+userStore.userInfo.moblie
+ url: '/pages/memberCenter/makemessage2?number='+userStore.userInfo.moblie
})
} else {
uni.navigateTo({
@@ -96,15 +96,13 @@
userStore.logOut()
logintype.value = !logintype.value
}
- const showwsmsg = ref(false)
+
+ function isEmptyObject(obj) {
+ return Object.keys(obj).length !== 0;
+ }
+
+
onShow(() => {
- myInfo().then(res => {
- if(res.data.id) {
- showwsmsg.value = true
- } else {
- showwsmsg.value = false
- }
- })
logintype.value = uni.getStorageSync('access_token')
if (!logintype.value) {
userStore.userInfo = {}
@@ -115,6 +113,7 @@
// })
// } else {
userStore.getUserInfo()
+ console.log(userStore.userInfo.status);
// }
})
diff --git a/src/static/img/ewmicon.png b/src/static/img/ewmicon.png
new file mode 100644
index 0000000..c3b5f69
Binary files /dev/null and b/src/static/img/ewmicon.png differ
diff --git a/src/static/img/hyewm.jpg b/src/static/img/hyewm.jpg
new file mode 100644
index 0000000..2026e8b
Binary files /dev/null and b/src/static/img/hyewm.jpg differ
diff --git a/src/static/img/hyzcicon.png b/src/static/img/hyzcicon.png
new file mode 100644
index 0000000..f443c54
Binary files /dev/null and b/src/static/img/hyzcicon.png differ
diff --git a/src/static/img/iconhqt.png b/src/static/img/iconhqt.png
index a280eff..e885063 100644
Binary files a/src/static/img/iconhqt.png and b/src/static/img/iconhqt.png differ
diff --git a/src/store/user.ts b/src/store/user.ts
index 9188b9f..329fd6f 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -57,10 +57,7 @@ export default defineStore(
uni.showToast({
icon: 'none',
title: '退出成功',
- mask: true,
- success() {
- setTimeout(() => uni.navigateTo({ url: 'pages/login/login' }), 1000)
- }
+ mask: true
})
}
}