diff --git a/package-lock.json b/package-lock.json index d329c90..dac4822 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "pinia": "2.0.36", "pnpm": "^10.14.0", "sass": "^1.63.2", - "uview-plus": "^3.4.9", + "uview-plus": "^3.5.52", "vue": "^3.2.45", "vue-i18n": "^9.1.9" }, @@ -12075,13 +12075,17 @@ } }, "node_modules/uview-plus": { - "version": "3.4.9", + "version": "3.5.52", + "resolved": "https://registry.npmjs.org/uview-plus/-/uview-plus-3.5.52.tgz", + "integrity": "sha512-cyZv0Pz+rZ4vohbtZXAlnvCHwzkLudrvFXZVPr+NlUHuTJwAjZ6vSb6jmcZeozmz4HOyGfSf+USjdswdUG9OIQ==", "dependencies": { "clipboard": "^2.0.11", "dayjs": "^1.11.3" }, "engines": { - "HBuilderX": "^3.1.0" + "HBuilderX": "^3.1.0", + "uni-app": "^4.66", + "uni-app-x": "" } }, "node_modules/v8-to-istanbul": { @@ -20513,7 +20517,9 @@ "dev": true }, "uview-plus": { - "version": "3.4.9", + "version": "3.5.52", + "resolved": "https://registry.npmjs.org/uview-plus/-/uview-plus-3.5.52.tgz", + "integrity": "sha512-cyZv0Pz+rZ4vohbtZXAlnvCHwzkLudrvFXZVPr+NlUHuTJwAjZ6vSb6jmcZeozmz4HOyGfSf+USjdswdUG9OIQ==", "requires": { "clipboard": "^2.0.11", "dayjs": "^1.11.3" diff --git a/package.json b/package.json index ba871c5..bc455ed 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "pinia": "2.0.36", "pnpm": "^10.14.0", "sass": "^1.63.2", - "uview-plus": "^3.4.9", + "uview-plus": "^3.5.52", "vue": "^3.2.45", "vue-i18n": "^9.1.9" }, diff --git a/src/api/memberCenter.ts b/src/api/memberCenter.ts index 4b1004c..0d4fcf2 100644 --- a/src/api/memberCenter.ts +++ b/src/api/memberCenter.ts @@ -41,3 +41,74 @@ export function myMemberApply() { method: 'POST' }) } + +//协会会员列表 +export function xhMember(data: any) { + return request.http({ + url: '/api/huiqitong/xh_member', + method: 'GET', + data + }) +} + +//协会会员详情 +export function xhMemberInfo(id: string) { + return request.http({ + url: '/api/huiqitong/xh_member/info/'+id, + method: 'GET' + }) +} + +//获取授权手机号注册协会会员 +export function authRegister(data: any) { + return request.http({ + url: '/api/huiqitong/xh_member/auth_register', + method: 'POST', + data + }) +} + +//发送手机号验证码 +export function register(data: any) { + return request.http({ + url: '/api/send/mobile/register', + method: 'POST', + data + }) +} + +//手机号验证码注册协会会员 +export function smsRegister(data: any) { + return request.http({ + url: '/api/huiqitong/xh_member/sms_register', + method: 'POST', + data + }) +} + +//完善会员信息 +export function xhMemberImprove(data: any) { + return request.http({ + url: '/api/huiqitong/xh_member/improve', + method: 'POST', + data + }) +} + +//入会协议 +export function agreement() { + return request.http({ + url: '/api/huiqitong/xh_member/agreement', + method: 'GET' + }) +} + +//获取我的待审核的入会信息 +export function myInfo() { + return request.http({ + url: '/api/huiqitong/xh_member/my_info', + method: 'GET' + }) +} + + diff --git a/src/pages.json b/src/pages.json index bca1116..c5d489c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -30,6 +30,30 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/memberCenter/memberRegistration", + "style": { + "navigationBarTitleText": "会员注册", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/memberCenter/memberZc", + "style": { + "navigationBarTitleText": "会员注册", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/memberCenter/agreement", + "style": { + "navigationBarTitleText": "入会协议", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, { "path": "pages/learningCenter/index", "style": { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index bfe4a93..9456522 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -106,28 +106,32 @@ 活跃会员 + + 会员注册 + 更多会员 > - + + > + - + - {{ item.name }} - - {{ item.member_tag_title }} + {{ item.contact }} + + {{ item.industry }} - {{ item.enterprise ? item.enterprise[0].title : '无' }} + {{ item.title || '无' }} - + @@ -172,7 +176,7 @@ } from '@/api/index' import chatdialog from '@/pages/index/ChatDialog.vue' import { - memberTagList, + xhMember, memberCenter } from '@/api/memberCenter' @@ -309,6 +313,12 @@ }) } + const gohyzc = () => { + uni.navigateTo({ + url: '/pages/memberCenter/memberRegistration' + }) + } + const gohdList = () => { uni.navigateTo({ url: '/pages/index/active/activelist' @@ -347,22 +357,47 @@ } const getbqlist = async () => { - filterTabs.value = [] - await memberTagList().then((res) => { - res.data.forEach((ele) => { - filterTabs.value.push(ele) - }) - }) + filterTabs.value = [ + { + id: 1, + title: '个体私营企业' + }, + { + id: 2, + title: '个体工商户' + }, + { + id: 3, + title: '理事单位' + }, + { + id: 4, + title: '商协会' + }, + { + id: 5, + title: '自然人' + }, + { + id: 6, + title: '其他单位' + } + ] + // await memberTagList().then((res) => { + // res.data.forEach((ele) => { + // filterTabs.value.push(ele) + // }) + // }) } const getMemberCenter = async (id) => { let params = { - member_tag_id: id, - name: '', + identity: id, + keyword: '', page: 1, limit: 120 } - await memberCenter(params).then((res) => { + await xhMember(params).then((res) => { hyList.value = res.data.data }) } @@ -711,7 +746,6 @@ .hylist { width: 100%; display: grid; - justify-content: center; .hyCard { border: 2rpx solid #f1f3f9; diff --git a/src/pages/index/shoppage/financialAssistance.vue b/src/pages/index/shoppage/financialAssistance.vue index ab4ffa3..d4012f9 100644 --- a/src/pages/index/shoppage/financialAssistance.vue +++ b/src/pages/index/shoppage/financialAssistance.vue @@ -4,7 +4,7 @@ - + @@ -168,7 +168,8 @@ const handleTabSelect = async (tab) => { currentTab.value = tab if (tab === 'all') { - // await getMemberCenter('') + currentTab.value = '' + await getfinanceList('', 1, 6) } else { await getfinanceList('', 1, 6) } diff --git a/src/pages/index/shoppage/mediaDetail.vue b/src/pages/index/shoppage/mediaDetail.vue index 76069ef..4bd291d 100644 --- a/src/pages/index/shoppage/mediaDetail.vue +++ b/src/pages/index/shoppage/mediaDetail.vue @@ -4,9 +4,9 @@ - - {{ userData.name }} - {{ userData.member_tag_title || userData.tag_name }} + + {{ userData.name || userData.contact }} + {{ userData.member_tag_title || userData.title }} @@ -20,9 +20,9 @@ 联系方式 - {{ userData.moblie || userData.tel }} + {{ userData.moblie }} - + 微信二维码 @@ -46,7 +46,7 @@ diff --git a/src/pages/memberCenter/inpart.vue b/src/pages/memberCenter/inpart.vue index 6140f60..55535e3 100644 --- a/src/pages/memberCenter/inpart.vue +++ b/src/pages/memberCenter/inpart.vue @@ -1,521 +1,570 @@ + .u-input { + background-color: #ffffff; + height: 100rpx !important; + } + + .u-form-item__body__left__content__label { + white-space: nowrap; + } + \ No newline at end of file diff --git a/src/pages/memberCenter/jump-login.vue b/src/pages/memberCenter/jump-login.vue new file mode 100644 index 0000000..f8e41c6 --- /dev/null +++ b/src/pages/memberCenter/jump-login.vue @@ -0,0 +1,155 @@ + + + + + \ No newline at end of file diff --git a/src/pages/memberCenter/memberRegistration.vue b/src/pages/memberCenter/memberRegistration.vue new file mode 100644 index 0000000..aa68685 --- /dev/null +++ b/src/pages/memberCenter/memberRegistration.vue @@ -0,0 +1,63 @@ + + + + + \ No newline at end of file diff --git a/src/pages/memberCenter/memberZc.vue b/src/pages/memberCenter/memberZc.vue new file mode 100644 index 0000000..e9f8d13 --- /dev/null +++ b/src/pages/memberCenter/memberZc.vue @@ -0,0 +1,201 @@ + + + + + \ No newline at end of file diff --git a/src/pages/memberCenter/slpace.json b/src/pages/memberCenter/slpace.json new file mode 100644 index 0000000..fb14d62 --- /dev/null +++ b/src/pages/memberCenter/slpace.json @@ -0,0 +1,467 @@ +{ + "label": "内蒙古自治区", + "value": "内蒙古自治区", + "children": [ + { + "label": "呼和浩特市", + "value": "呼和浩特市", + "children": [{ + "label": "新城区", + "value": "新城区" + }, + { + "label": "回民区", + "value": "回民区" + }, + { + "label": "玉泉区", + "value": "玉泉区" + }, + { + "label": "赛罕区", + "value": "赛罕区" + }, + { + "label": "土默特左旗", + "value": "土默特左旗" + }, + { + "label": "托克托县", + "value": "托克托县" + }, + { + "label": "和林格尔县", + "value": "和林格尔县" + }, + { + "label": "清水河县", + "value": "清水河县" + }, + { + "label": "武川县", + "value": "武川县" + } + ] + }, { + "label": "包头市", + "value": "包头市", + "children": [{ + "label": "东河区", + "value": "东河区" + }, + { + "label": "昆都仑区", + "value": "昆都仑区" + }, + { + "label": "青山区", + "value": "青山区" + }, + { + "label": "石拐区", + "value": "石拐区" + }, + { + "label": "白云鄂博矿区", + "value": "白云鄂博矿区" + }, + { + "label": "九原区", + "value": "九原区" + }, + { + "label": "土默特右旗", + "value": "土默特右旗" + }, + { + "label": "固阳县", + "value": "固阳县" + }, + { + "label": "达尔罕茂明安联合旗", + "value": "达尔罕茂明安联合旗" + } + ] + }, { + "label": "乌海市", + "value": "乌海市", + "children": [{ + "label": "海勃湾区", + "value": "海勃湾区" + }, + { + "label": "海南区", + "value": "海南区" + }, + { + "label": "乌达区", + "value": "乌达区" + } + ] + }, { + "label": "赤峰市", + "value": "赤峰市", + "children": [{ + "label": "红山区", + "value": "红山区" + }, + { + "label": "元宝山区", + "value": "元宝山区" + }, + { + "label": "松山区", + "value": "松山区" + }, + { + "label": "阿鲁科尔沁旗", + "value": "阿鲁科尔沁旗" + }, + { + "label": "巴林左旗", + "value": "巴林左旗" + }, + { + "label": "巴林右旗", + "value": "巴林右旗" + }, + { + "label": "林西县", + "value": "林西县" + }, + { + "label": "克什克腾旗", + "value": "克什克腾旗" + }, + { + "label": "翁牛特旗", + "value": "翁牛特旗" + }, + { + "label": "喀喇沁旗", + "value": "喀喇沁旗" + }, + { + "label": "宁城县", + "value": "宁城县" + }, + { + "label": "敖汉旗", + "value": "敖汉旗" + } + ] + }, { + "label": "通辽市", + "value": "通辽市", + "children": [{ + "label": "科尔沁区", + "value": "科尔沁区" + }, + { + "label": "科尔沁左翼中旗", + "value": "科尔沁左翼中旗" + }, + { + "label": "科尔沁左翼后旗", + "value": "科尔沁左翼后旗" + }, + { + "label": "开鲁县", + "value": "开鲁县" + }, + { + "label": "库伦旗", + "value": "库伦旗" + }, + { + "label": "奈曼旗", + "value": "奈曼旗" + }, + { + "label": "扎鲁特旗", + "value": "扎鲁特旗" + }, + { + "label": "霍林郭勒市", + "value": "霍林郭勒市" + } + ] + }, { + "label": "鄂尔多斯市", + "value": "鄂尔多斯市", + "children": [{ + "label": "东胜区", + "value": "东胜区" + }, + { + "label": "康巴什区", + "value": "康巴什区" + }, + { + "label": "达拉特旗", + "value": "达拉特旗" + }, + { + "label": "准格尔旗", + "value": "准格尔旗" + }, + { + "label": "鄂托克前旗", + "value": "鄂托克前旗" + }, + { + "label": "鄂托克旗", + "value": "鄂托克旗" + }, + { + "label": "杭锦旗", + "value": "杭锦旗" + }, + { + "label": "乌审旗", + "value": "乌审旗" + }, + { + "label": "伊金霍洛旗", + "value": "伊金霍洛旗" + } + ] + }, { + "label": "呼伦贝尔市", + "value": "呼伦贝尔市", + "children": [{ + "label": "海拉尔区", + "value": "海拉尔区" + }, + { + "label": "扎赉诺尔区", + "value": "扎赉诺尔区" + }, + { + "label": "阿荣旗", + "value": "阿荣旗" + }, + { + "label": "莫力达瓦达斡尔族自治旗", + "value": "莫力达瓦达斡尔族自治旗" + }, + { + "label": "鄂伦春自治旗", + "value": "鄂伦春自治旗" + }, + { + "label": "鄂温克族自治旗", + "value": "鄂温克族自治旗" + }, + { + "label": "陈巴尔虎旗", + "value": "陈巴尔虎旗" + }, + { + "label": "新巴尔虎左旗", + "value": "新巴尔虎左旗" + }, + { + "label": "新巴尔虎右旗", + "value": "新巴尔虎右旗" + }, + { + "label": "满洲里市", + "value": "满洲里市" + }, + { + "label": "牙克石市", + "value": "牙克石市" + }, + { + "label": "扎兰屯市", + "value": "扎兰屯市" + }, + { + "label": "额尔古纳市", + "value": "额尔古纳市" + }, + { + "label": "根河市", + "value": "根河市" + } + ] + }, { + "label": "巴彦淖尔市", + "value": "巴彦淖尔市", + "children": [{ + "label": "临河区", + "value": "临河区" + }, + { + "label": "五原县", + "value": "五原县" + }, + { + "label": "磴口县", + "value": "磴口县" + }, + { + "label": "乌拉特前旗", + "value": "乌拉特前旗" + }, + { + "label": "乌拉特中旗", + "value": "乌拉特中旗" + }, + { + "label": "乌拉特后旗", + "value": "乌拉特后旗" + }, + { + "label": "杭锦后旗", + "value": "杭锦后旗" + } + ] + }, { + "label": "乌兰察布市", + "value": "乌兰察布市", + "children": [{ + "label": "集宁区", + "value": "集宁区" + }, + { + "label": "卓资县", + "value": "卓资县" + }, + { + "label": "化德县", + "value": "化德县" + }, + { + "label": "商都县", + "value": "商都县" + }, + { + "label": "兴和县", + "value": "兴和县" + }, + { + "label": "凉城县", + "value": "凉城县" + }, + { + "label": "察哈尔右翼前旗", + "value": "察哈尔右翼前旗" + }, + { + "label": "察哈尔右翼中旗", + "value": "察哈尔右翼中旗" + }, + { + "label": "察哈尔右翼后旗", + "value": "察哈尔右翼后旗" + }, + { + "label": "四子王旗", + "value": "四子王旗" + }, + { + "label": "丰镇市", + "value": "丰镇市" + } + ] + }, { + "label": "兴安盟", + "value": "兴安盟", + "children": [{ + "label": "乌兰浩特市", + "value": "乌兰浩特市" + }, + { + "label": "阿尔山市", + "value": "阿尔山市" + }, + { + "label": "科尔沁右翼前旗", + "value": "科尔沁右翼前旗" + }, + { + "label": "科尔沁右翼中旗", + "value": "科尔沁右翼中旗" + }, + { + "label": "扎赉特旗", + "value": "扎赉特旗" + }, + { + "label": "突泉县", + "value": "突泉县" + } + ] + }, { + "label": "锡林郭勒盟", + "value": "锡林郭勒盟", + "children": [{ + "label": "二连浩特市", + "value": "二连浩特市" + }, + { + "label": "锡林浩特市", + "value": "锡林浩特市" + }, + { + "label": "阿巴嘎旗", + "value": "阿巴嘎旗" + }, + { + "label": "苏尼特左旗", + "value": "苏尼特左旗" + }, + { + "label": "苏尼特右旗", + "value": "苏尼特右旗" + }, + { + "label": "东乌珠穆沁旗", + "value": "东乌珠穆沁旗" + }, + { + "label": "西乌珠穆沁旗", + "value": "西乌珠穆沁旗" + }, + { + "label": "太仆寺旗", + "value": "太仆寺旗" + }, + { + "label": "镶黄旗", + "value": "镶黄旗" + }, + { + "label": "正镶白旗", + "value": "正镶白旗" + }, + { + "label": "正蓝旗", + "value": "正蓝旗" + }, + { + "label": "多伦县", + "value": "多伦县" + } + ] + }, { + "label": "阿拉善盟", + "value": "阿拉善盟", + "children": [{ + "label": "阿拉善左旗", + "value": "阿拉善左旗" + }, + { + "label": "阿拉善右旗", + "value": "阿拉善右旗" + }, + { + "label": "额济纳旗", + "value": "额济纳旗" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue index 776b9de..a9feb84 100644 --- a/src/pages/mine/index.vue +++ b/src/pages/mine/index.vue @@ -1,194 +1,217 @@ + .container { + background-color: #ffffff; + height: 100vh; + width: 100%; + display: grid; + + .main { + border-radius: 60rpx 60rpx 0rpx 0rpx; + background: #ffffff; + margin-top: -350rpx; + height: calc(100vh - 350rpx); + padding: 0 40rpx; + box-sizing: border-box; + + .head { + display: flex; + align-items: center; + justify-content: space-between; + + .left { + display: flex; + align-items: center; + margin-top: -50rpx; + + .name { + margin-top: 50rpx; + font-family: Source Han Sans; + font-size: 40rpx; + font-weight: 350; + text-align: center; + letter-spacing: normal; + /* 文本/正文 */ + color: #1a1a1a; + margin-left: 30rpx; + } + } + } + + .editlist { + margin-top: 24rpx; + + .editone { + width: 100%; + height: 120rpx; + background: #ffffff; + border-bottom: 2rpx solid #f3f3f3; + display: flex; + align-items: center; + justify-content: space-between; + + .left { + display: flex; + align-items: center; + + .txt { + margin-left: 36rpx; + font-family: Source Han Sans; + font-size: 28rpx; + font-weight: 350; + text-align: right; + letter-spacing: normal; + color: #333333; + } + } + } + } + + .buts { + width: 100%; + display: flex; + justify-content: center; + + .but { + margin-top: 160rpx; + width: 574rpx; + height: 96rpx; + border-radius: 248rpx; + 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: 500; + text-align: justify; + /* 浏览器可能不支持 */ + display: flex; + align-items: center; + letter-spacing: normal; + color: #ffffff; + } + } + } + } + \ No newline at end of file