From 3d08c0607db98a0481ca1554c94cb5863ee391e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?= =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com> Date: Wed, 20 Nov 2024 17:33:13 +0800 Subject: [PATCH] 123 --- manifest.json | 198 +++---- pages.json | 7 + pages/index/directory.vue | 868 +++++++++++++++++++------------ pages/index/home.vue | 56 +- pages/index/index.vue | 21 +- pages/index/pizz_info.vue | 2 +- pages/index/user.vue | 49 +- pages/index/user_map.vue | 275 ++++++++++ pages/packageA/user/apply_in.vue | 655 +++++++++++++++++++---- pages/packageA/user/my_card.vue | 58 ++- pages/packageA/user/my_msg.vue | 14 + pages/packageB/paper/add.vue | 8 + static/make.png | Bin 0 -> 6239 bytes static/map.png | Bin 0 -> 7819 bytes util/api.js | 8 +- 15 files changed, 1643 insertions(+), 576 deletions(-) create mode 100644 pages/index/user_map.vue create mode 100644 static/make.png create mode 100644 static/map.png diff --git a/manifest.json b/manifest.json index 0f15254..2129509 100644 --- a/manifest.json +++ b/manifest.json @@ -1,97 +1,103 @@ { - "name" : "智慧云商协", - "appid" : "__UNI__F702B81", - "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - /* 5+App特有相关 */ - "app-plus" : { - "usingComponents" : true, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - /* 模块配置 */ - "modules" : {}, - /* 应用发布信息 */ - "distribute" : { - /* android打包配置 */ - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios" : {}, - /* SDK配置 */ - "sdkConfigs" : { - "share" : {} - } - } - }, - /* 快应用特有相关 */ - "quickapp" : {}, - /* 小程序特有相关 */ - "mp-weixin" : { - "appid" : "wxd01d4f0be53a283a", - "setting" : { - "urlCheck" : true, - "minified" : true, - "postcss" : true - }, - "usingComponents" : true - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "vueVersion" : "2", - "h5" : { - "router" : { - "base" : "" - }, - "template" : "", - "devServer" : { - "port" : 80, - "https" : false, - "disableHostCheck" : true, - "proxy" : { - "/api" : { - "target" : "http://192.168.3.130", //域名 - "changeOrigin" : true, - "secure" : false, - "pathRewrite" : { - "^/api" : "/api" - } - } - } - } - } -} + "name": "智慧云商协", + "appid": "__UNI__F702B81", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + /* 5+App特有相关 */ + "app-plus": { + "usingComponents": true, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + /* 模块配置 */ + "modules": {}, + /* 应用发布信息 */ + "distribute": { + /* android打包配置 */ + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios": {}, + /* SDK配置 */ + "sdkConfigs": { + "share": {} + } + } + }, + /* 快应用特有相关 */ + "quickapp": {}, + /* 小程序特有相关 */ + "mp-weixin": { + "appid": "wxd01d4f0be53a283a", + "requiredPrivateInfos": ["chooseLocation"], + "setting": { + "urlCheck": true, + "minified": true, + "postcss": true + }, + "usingComponents": true, + "permission": { + "scope.userLocation": { + "desc": "用户选择公司地址" + } + } + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "vueVersion": "2", + "h5": { + "router": { + "base": "" + }, + "template": "", + "devServer": { + "port": 80, + "https": false, + "disableHostCheck": true, + "proxy": { + "/api": { + "target": "http://192.168.3.130", //域名 + "changeOrigin": true, + "secure": false, + "pathRewrite": { + "^/api": "/api" + } + } + } + } + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index 314b02a..06809b7 100644 --- a/pages.json +++ b/pages.json @@ -61,6 +61,13 @@ "style": { "navigationBarTitleText": "河南省青年企业家协会" } + }, + { + "path" : "pages/index/user_map", + "style" : + { + "navigationBarTitleText" : "会员地图" + } } ], "subPackages": [{ diff --git a/pages/index/directory.vue b/pages/index/directory.vue index 805905c..4cfa76e 100644 --- a/pages/index/directory.vue +++ b/pages/index/directory.vue @@ -1,180 +1,222 @@ @@ -183,127 +225,241 @@ addressList, associationIndex, newIndustryIndex, + huiYuanList, getRegion, - positionList + positionList, + latitudeAndLongitude } from '@/util/api.js'; import store from "@/store"; export default { data() { return { - showNo: false, - isFixed: false, serach_content: '', list: [], topCurrent: 0, tabbarIndex: 0, // 分类菜单item的信息 tabbarItemInfo: [], + // scrollView的top值 + scrollViewBasicTop: 0, + // scrollView的高度 + scrollViewHeight: 0, + // 左边scrollView的滚动高度 + leftScrollViewTop: 0, + // 右边scrollView的滚动高度 + rightScrollViewTop: 0, // 当前选中的tabbar序号 currentTabbarIndex: 0, apiImgUrl: this.$store.state.imgUrl, industry_list: [], - leftHyId: 0, + leftId: 0, selectShow: false, HomeTitle: '', selectList: [], - gid: store.state.Gid, - top: 0, - openHyShow: false, - selectTopNumber: 220, - hy_name: '全部', - openDqShow: false, - region_list: [], - region_children_list: [], - dq_name: '全部', - leftDqId: 0, - zzDqShow: false, - zz_name: '全部', + member_list: [], zz_list: [], - leftZzId: 0, - - jsDqShow: false, - js_name: '全部', - js_list: [{ - id: 0, - name: '全部' - }, { - id: 1, - name: '第一届' - }, - { - id: 2, - name: '第二届' - }, - { - id: 3, - name: '第三届' - }, - { - id: 4, - name: '第四届' - }, - { - id: 5, - name: '第五届' - }, - { - id: 6, - name: '第六届' - }, - { - id: 7, - name: '第七届' - }, - { - id: 8, - name: '第八届' - }, - { - id: 9, - name: '第九届' - }, - { - id: 10, - name: '第十届' - }, - { - id: 11, - name: '第十一届' + page: 1, + gid: store.state.Gid, + gname: '', + top: 0, + my_page: 0, + pickerShow: false, + pickerIndex: 0, + pickerList: [{ + name: '按行业', + id: 1 + }, { + name: '按职位', + id: 2 + }, { + name: '按区域', + id: 3 + }], + serach_do: false, + covers: [], + coversShow: false, + region_show: false, + region_name: '全部', + region_list: [], + region_id: 0, + scale: 5, + latitude: 34.776787, + longitude: 113.733079 + } + }, + computed: { + tabbarItemClass() { + return index => { + if (index === this.currentTabbarIndex) { + return 'tn-classify__tabbar__item--active tn-bg-my-ccc' + } else { + let clazz = '' + if (this.currentTabbarIndex > 0 && index === this.currentTabbarIndex - 1) { + clazz += ' tn-classify__tabbar__item--active--prev' + } + if (this.currentTabbarIndex < this.industry_list.length && index === this.currentTabbarIndex + + 1) { + clazz += ' tn-classify__tabbar__item--active--next' + } + return clazz } - ], - leftJsId: 0, + } } }, - onLoad(d) { - console.log(d.id); - if (typeof(d.id) != 'undefined') { - this.gid = d.id; - } - this.getIndustryList(); - this.getAssociationIndex(); - this.getRegionList(); - }, + // onLoad(d) { + // console.log(d.id); + // if (typeof(d.id) != 'undefined') { + // this.gid = d.id; + // } + // this.getIndustryList(); + // this.getAssociationIndex(); + // this.getRegionList(); + + // }, methods: { - serach_do() { + getDqId(d) { + var city = d[0]; + var area = d[1]; + // var area = d.area; + // var city = d.city; + // var province = d.province; + if (city.value == 0) { + this.region_name = '全部'; + } else { + this.region_name = city.label + '/' + area.label; + } + + this.region_id = area.value; + this.scale = 5; + this.latitude = 34.776787; + this.longitude = 113.733079; + this.coversShow = false; + this.getLatitudeAndLongitude(); + }, + openMark(d) { + console.log(d); + this.scale = 15; + this.latitude = d.latitude; + this.longitude = d.longitude; + this.coversShow = false; + }, + openLock(d) { + console.log(d); + var id = d.detail.markerId; + const cover = this.covers.find(item => item.id == id); + uni.showModal({ + title: '导航提醒', + content: '确定要开启导航吗？', + success: function(res) { + if (res.confirm) { + uni.openLocation({ + latitude: cover.latitude, + longitude: cover.longitude, + name: cover.title, + success() { + console.log('导航成功'); + }, + fail(error) { + console.error('导航失败', error); + } + }); + } + } + }); + }, + getLatitudeAndLongitude() { + latitudeAndLongitude({ + region_id: this.region_id, + enterprise_name: this.serach_content, + nikename: this.serach_content, + }) + .then(res => { + console.log(res); + var list = res.data; + const transformedSelectList = list.map(item => ({ + latitude: parseFloat(item.dimension), + longitude: parseFloat(item.longitude), + id: item.id, + iconPath: '/static/make.png', + width: 30, + height: 30, + company_image: item.company_image, + nikename: item.nikename, + title: item.enterprise_name, + callout: { + content: item.enterprise_name, + textAlign: 'center', + fontSize: 16, + borderRadius: 5, + color: "#3056D3" + } + })); + console.log(transformedSelectList); + this.covers = transformedSelectList; + + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + }, + inPickerList(d) { + this.top = 0; + this.currentTabbarIndex = 0; + this.pickerIndex = d[0]; + this.leftHyId = 0; + this.member_list = []; this.list = []; + this.page = 1; this.getAddressList(); + this.getMemberList(); + this.scale = 5; + this.latitude = 34.776787; + this.longitude = 113.733079; + this.getLatitudeAndLongitude(); + }, + preventTouchMove() { + + }, + rightBottom() { + if (this.leftZzId == 15 || this.pickerIndex == 0) { + uni.showLoading({ + title: '加载中...' + }); + console.log(1); + this.page = this.page + 1; + //this.getAddressList(); + this.getMemberList(); + } }, getScroll(d) { this.top = d.scrollTop; }, onload() { + console.log(this.gid); + console.log(store.state.Gid); + if (this.gid == store.state.Gid && this.list.length > 0) { + return; + } + this.currentTabbarIndex = 0; this.gid = store.state.Gid; + this.gname = store.state.Gname; this.getIndustryList(); this.getAssociationIndex(); - this.getRegionList(); this.getPositionListIndex(); - }, - confirm(d) { - var info = d[0]; - this.list = []; - this.gid = info.value; - this.getAssociationIndex(); - this.getIndustryList(); + this.getLatitudeAndLongitude(); + this.getRegionList(); + const key = uni.getSystemInfoSync(); + const kk = uni.getWindowInfo(); + console.log(kk); + var c = this.sizeDeal(120); + var s = this.sizeDeal(140); + this.my_page = parseInt(key.windowHeight) - parseInt(store.state.vuex_custom_bar_height) - parseInt(s) - + parseInt(c) - parseInt(key.safeAreaInsets.bottom); + //console.log(key); }, getPositionListIndex() { positionList({ @@ -327,6 +483,43 @@ }); }) }, + getRegionList() { + getRegion({ + association_id: 1, + }) + .then(res => { + if (res.code == 1) { + var key = res.data; + // const transformedSelectList = key.map(item => ({ + // value: item.id, + // label: item.region_name + // })); + key.unshift({ + value: 0, + label: '全部', + children: [{ + value: 0, + label: '全部', + }], + }); + this.region_list = key; + } + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + }, + // confirm(d) { + // var info = d[0]; + // this.list = []; + // this.gid = info.value; + // this.getAssociationIndex(); + // this.getIndustryList(); + // }, getAssociationIndex() { associationIndex() .then(res => { @@ -366,11 +559,12 @@ id: 0, industry_name: '全部' }); - this.leftHyId = res.data[0].id; + this.leftHyId = 0; uni.showLoading({ title: '加载中...' }); this.getAddressList(); + this.getMemberList(); } }) .catch(error => { @@ -381,6 +575,57 @@ }); }) }, + reset() { + this.serach_content = ''; + this.coversShow = true; + this.serach_do = false; + this.member_list = []; + this.list = []; + this.page = 1; + this.getAddressList(); + this.getMemberList(); + this.getLatitudeAndLongitude(); + }, + serach() { + if (this.serach_content == '') { + this.serach_do = false; + } else { + this.serach_do = true; + } + this.coversShow = true; + this.member_list = []; + this.list = []; + this.page = 1; + this.getAddressList(); + this.getMemberList(); + this.getLatitudeAndLongitude(); + }, + getMemberList() { + huiYuanList({ + region_id: this.leftDqId, + association_id: this.gid, + industry_id: this.leftHyId, + nikename: this.serach_content, + page: this.page, + size: 15, + }) + .then(res => { + console.log(res); + if (res.code == 1) { + this.member_list.push(...res.data[0].neirong); + } + setTimeout(function() { + uni.hideLoading(); + }, 2000); + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + }, getAddressList() { addressList({ number_of_sessions: this.leftJsId, @@ -388,12 +633,12 @@ region_id: this.leftDqId, association_id: this.gid, industry_id: this.leftHyId, - nikename: this.serach_content + nikename: this.serach_content, }) .then(res => { console.log(res); if (res.code == 1) { - this.list = res.data; + this.list.push(...res.data); } else { this.showNo = true; } @@ -409,109 +654,73 @@ }); }) }, - getRegionList() { - getRegion({ - association_id: 1, - }) - .then(res => { - if (res.code == 1) { - var key = res.data; - // const transformedSelectList = key.map(item => ({ - // value: item.id, - // label: item.region_name - // })); - key.unshift({ - value: 0, - label: '全部' - }); - this.region_list = key; - } - }) - .catch(error => { - uni.showToast({ - title: error, - icon: 'none', - duration: 2000 - }); - }) - }, - clickClassifyJs(index) { + clickClassifyNavZZ(index) { + this.top = 0; uni.showLoading({ title: '加载中...' }); - this.isFixed = false; - this.showNo = false; - this.jsDqShow = false; - this.currentTabbarIndex = index; - this.leftJsId = this.js_list[index].id; - this.js_name = this.js_list[index].name; - this.list = []; - this.getAddressList(); - }, - clickClassifyZz(index) { - uni.showLoading({ - title: '加载中...' - }); - this.isFixed = false; - this.showNo = false; - this.zzDqShow = false; this.currentTabbarIndex = index; this.leftZzId = this.zz_list[index].id; - this.zz_name = this.zz_list[index].position_name; + this.member_list = []; this.list = []; + this.top = this.randomBetween(); + this.page = 1; this.getAddressList(); + //this.getMemberList(); }, - clickClassifyHy(index) { + clickClassifyNav(index) { + this.top = 0; + console.log(index); + console.log(this.industry_list[index].id); uni.showLoading({ title: '加载中...' }); - this.isFixed = false; - this.showNo = false; - this.openHyShow = false; this.currentTabbarIndex = index; this.leftHyId = this.industry_list[index].id; - this.hy_name = this.industry_list[index].industry_name; + this.member_list = []; this.list = []; + this.top = this.randomBetween(); + this.page = 1; this.getAddressList(); + this.getMemberList(); + //this.getAddressList(); + //this.handleLeftScrollView(index) + //this.switchClassifyContent(); }, - clickClassifyDq(index) { - uni.showLoading({ - title: '加载中...' - }); - // this.isFixed = false; - // this.showNo = false; - // this.openDqShow = false; - this.currentTabbarIndex = index; - this.region_children_list = this.region_list[index].children; - this.leftDqId = this.region_list[index].value; - this.dq_name = this.region_list[index].label; - this.list = []; - this.getAddressList(); + randomBetween() { + let baseRandom = Math.random() * (0.99999 - 0.00001) + 0.00001; + return baseRandom.toFixed(5); // }, - clickClassifyDqChildren(index) { - this.currentTabbarIndex = index; - this.isFixed = false; - this.showNo = false; - this.openDqShow = false; - //this.region_children_list = this.region_list[index].children; - this.leftDqId = this.region_children_list[index].value; - this.dq_name = this.region_children_list[index].label; - this.list = []; - this.getAddressList(); - }, - ReachScroll(e) { - //当距离大于20的时候吸顶 - if (e.detail.scrollTop > 100) { - this.isFixed = true; + // 点击分类后，处理scrollView滚动到居中位置 + handleLeftScrollView(index) { + const tabbarItemTop = this.tabbarItemInfo[index].top - this.scrollViewBasicTop + if (tabbarItemTop > this.scrollViewHeight / 2) { + this.leftScrollViewTop = tabbarItemTop - (this.scrollViewHeight / 2) + this.tabbarItemInfo[index] + .height } else { - this.isFixed = false; + this.leftScrollViewTop = 0 } }, + // 切换对应分类的数据 + switchClassifyContent() { + this.rightScrollViewTop = 1 + this.$nextTick(() => { + this.rightScrollViewTop = 0 + }) + //this.classifyContent.subClassify[0].title = this.tabbar[this.currentTabbarIndex] + }, tn(url) { uni.navigateTo({ url: url }) }, + sizeDeal(size) { + + // 使用uni.upx2px进行转换 + const pxValue = uni.upx2px(size); + + return pxValue; + }, goBack() { if (getCurrentPages().length > 1) { uni.navigateBack() @@ -560,7 +769,7 @@ &__left-box {} &__right-box { - background-color: #FFFFFF; + background-color: #F1F2F8; } /* 分类列表和内容 end */ @@ -568,8 +777,6 @@ /* 侧边导航 start */ &__tabbar { &__item { - height: 90rpx; - &:first-child { border-top-right-radius: 0rpx; } @@ -579,10 +786,10 @@ } &--active { - background-color: #FFFFFF; + background-color: #F1F2F8; position: relative; - // font-weight: bold; - color: #4AA2EF; + font-weight: bold; + color: #3056D3; &--prev { border-bottom-right-radius: 26rpx; @@ -625,6 +832,7 @@ &__item { padding: 20rpx; + background-color: #FFFFFF; } } } @@ -635,25 +843,7 @@ /* 分类内容 end */ } - .my-page { - height: calc(100vh - 286rpx); - padding-bottom: 100rpx; - } - - .textThis { - color: #3056D3; - font-weight: bold; - } - - .textNo { - color: #000000; - } - - .fixed { - position: fixed; - } - - .abc { - position: absolute; + .tn-bg-my-ccc { + background-color: #F1F2F8; } \ No newline at end of file diff --git a/pages/index/home.vue b/pages/index/home.vue index 25857f1..8c40468 100644 --- a/pages/index/home.vue +++ b/pages/index/home.vue @@ -107,6 +107,19 @@ + - - + + + + + + + + + + + + + + + {{formData.recommended_cities}} + + + + + + + + + + + + {{formData.source_channel}} + + + + + + + + + + {{formData.intentional_association_position}} + + + + @@ -95,48 +134,102 @@ - - - - - + + + + - - - - - - - - + + + {{formData.political}} + + + + - - + + - - - - - + + + + + + + + + + + + + + + {{formData.education}} + + + + + + + + + + + + + + + + + + + + + + + + + + + {{formData.region_name}} + + + + + + 证件照 @@ -191,10 +284,21 @@ 学习工作经历 + + + - + + + + + + + + {{formData.location_name}} + + + + + + + @@ -312,15 +429,22 @@ @confirm="getindustryId"> - + + + {{formData.enterprise_nature}} + + + + - @@ -329,7 +453,7 @@ + :customStyle="{width: '330rpx'}" v-model="formData.previous_donation" /> @@ -382,32 +506,37 @@ placeholder="填写其他企业任职情况" :clearable="false" :height="300" type="textarea" :customStyle="{lineHeight:'42rpx',color:'#777777'}" /> + + + 企业履行社会责任情况 + + 4.建团信息 - + 否 是 - + - - - + :customStyle="{width: '440rpx'}" v-model="formData.nature" /> + - + @@ -416,13 +545,9 @@ - + - - - + :customStyle="{width: '440rpx'}" v-model="formData.superior_nature" /> @@ -439,6 +564,42 @@ + + + 团委负责人 + + + + + + + + + + + + + + + + + + 移除 + + + + 添加 + + + 联系邮箱: hnqqx@126.com - - 前往电脑端完善资料并下载资料 + + 如需修改资料请复制链接在电脑端打开 复制链接 @@ -614,7 +775,8 @@ MemberList, applyInAdd, getApplyToken, - examineType + examineType, + getRegion } from '@/util/api.js'; import store from "@/store"; import string from "@/tuniao-ui/libs/function/string"; @@ -640,18 +802,18 @@ }], tuijianTypeList: [{ text: '组织推荐', - value: 0 - }, { - text: '会员推荐', value: 1 }, { - text: '个人自荐', + text: '会员推荐', value: 2 + }, { + text: '个人自荐', + value: 3 }], birth_time_show: false, checked1: false, topCurrent: 0, - current: 0, + current: 1, info: {}, tab_list: [{ name: '入会须知' @@ -664,16 +826,11 @@ }, { name: '入会成功' }], - new_info: { - recommendation_id: 0, - recommendation_name: '', - phone: '', - nikename: '', - enterprise_name: '', - gender_name: '', - gender: 0, - }, + region_list: [], + tuijian_region_show: false, workList: [{ + star_time: '', + end_time: '', time: '', address: '', book: '', @@ -686,19 +843,30 @@ social_duties: [], ssShow: false, tuijian_type_show: false, + tuijian_laiyuan_show: false, + tuijian_yixiang_show: false, + zz_show: false, formData: { - recommendation_id: 0, + enterprise_lvxingzeren: '', + registered_capital: '', + region_id: 0, + region_name: '', + zip_code: '', + mail_address: '', + intentional_association_position: '', + source_channel: '', + recommended_cities: '', + recommendation_id: '', recommendation_name: '', - position_name: '请选择', + position_name: '', position_id: 0, industry_id: '', - industry_id_name: '请选择', + industry_id_name: '', phone: '', password: '', nikename: '', - gender_name: '请选择', + gender_name: '', gender: 0, - birth_time_name: '请选择', birth_time: '', nation: '', political: '', @@ -725,7 +893,7 @@ enterprise_nature: '', enterprise_website: '', if_list: 1, - if_list_name: '请选择', + if_list_name: '', employee: '', previous_revenue: '', previous_tax: '', @@ -738,7 +906,6 @@ if_organization: '1', nature: '', jiantuan_time: '', - jiantuan_time_name: '请选择', jiantuan_number: '', youth_number: '', superior_nature: '', @@ -747,10 +914,30 @@ documents_file_show: [], enterprise_location: '', main_social_positions: '', - reporting_method: 3, - tuijian_type_name: '请选择', + reporting_method: 0, + tuijian_type_name: '', recommendation_content: '', + location_name: '', + longitude: '', + dimension: '', }, + star_time_show: false, + laiyuanList: [{ + text: '网络来源' + }, { + text: '微信公众号来源' + }, { + text: '朋友推荐' + }, { + text: '其他渠道' + }], + yixiangList: [{ + text: '会员' + }, { + text: '理事' + }, { + text: '常务理事' + }], ssSheetList: [{ text: '是', id: 0 @@ -760,8 +947,69 @@ id: 1 } ], + zz_list: [{ + label: '中共党员' + }, { + label: '中共预备党员' + }, { + label: '共青团员' + }, { + label: '民革党员' + }, { + label: '民盟盟员' + }, { + label: '民建会员' + }, { + label: '民进会员' + }, { + label: '农工党党员' + }, { + label: '致公党党员' + }, { + label: '九三学社社员' + }, { + label: '台盟盟员' + }, { + label: '无党派人士' + }, { + label: '无党派人士' + }], + xl_show: false, + xl_list: [{ + label: '博士研究生' + }, { + label: '硕士研究生' + }, { + label: '本科' + }, { + label: '专科' + }, { + label: '其他' + }], + qyxz_show: false, + qyxz_list: [{ + label: '国有' + }, { + label: '私营' + }, { + label: '混合所有制' + }, { + label: '集体' + }, { + label: '外贸' + }, { + label: '其他' + }], tuijian_show: false, + dq_show: false, member_list: [], + tuan_list: [{ + name: '', + sex: '', + job: '', + tun_job: '', + phone: '', + }], checkInfo: {}, checkList: [], checkListTab: [{ @@ -770,7 +1018,9 @@ content: '已按要求提交资料', time: '', desc: '', - }] + }], + workIndex: 0, + workType: 0, } }, onLoad(d) { @@ -780,10 +1030,6 @@ var searchParams = this.parseQuery(decodedParams); d = searchParams; } - if (typeof(d.id) != 'undefined') { - uni.setStorageSync('apply_id', d.id); - this.new_info.recommendation_id = d.id; - } if (typeof(d.association_id) != 'undefined') { store.commit('$tStore', { name: 'Gid', @@ -801,11 +1047,56 @@ this.getAssociationInfo(); this.getPlan(); this.getIndustry(); - this.getMemberList(); + this.getRegionList(); this.getExamineType(); this.getToken(); }, methods: { + + openLocation() { + var that = this; + uni.chooseLocation({ + success(res) { + console.log('位置名称：' + res.name); + console.log('详细地址：' + res.address); + console.log('纬度：' + res.latitude); + console.log('经度：' + res.longitude); + that.formData.longitude = res.longitude; + that.formData.dimension = res.latitude; + }, + fail(res) { + console.log(res); + } + }); + }, + work_time_chick(d) { + if (this.workType == 1) { + this.workList[this.workIndex].star_time = d.year + '-' + d.month; + } else { + this.workList[this.workIndex].end_time = d.year + '-' + d.month; + } + }, + jiantuan_time_chick(d) { + console.log(d); + this.formData.jiantuan_time = d.year + '-' + d.month + '-' + d.day; + }, + openStarTime(index, type) { + this.workIndex = index; + this.workType = type; + this.star_time_show = true; + }, + addTuanWei() { + this.tuan_list.push({ + name: '', + sex: '', + job: '', + tun_job: '', + phone: '', + }); + }, + delTuanWei(index) { + this.tuan_list.splice(index, 1); + }, addWork() { this.workList.push({ time: '', @@ -898,9 +1189,10 @@ }) }, copy() { - var openid = uni.getStorageSync('openid'); + var info = uni.getStorageSync('userInfo'); uni.setClipboardData({ - data: 'https://hnyea.0rui.cn/dist/#/register?token=' + this.applyToken + '&openid=' + openid, + data: 'https://hnyea.0rui.cn/dist/#/register?token=' + this.applyToken + '&openid=' + info + .openid, success: function() { console.log('success'); } @@ -933,6 +1225,23 @@ }); }) }, + getRegionList() { + getRegion({ + association_id: store.state.Gid, + }) + .then(res => { + if (res.code == 1) { + this.region_list = res.data; + } + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + }, getIndustry() { IndustryList({ association_id: store.state.Gid, @@ -955,6 +1264,31 @@ }); }) }, + getQyxzId(d) { + this.formData.enterprise_nature = d[0].label; + }, + getDqId(d) { + this.formData.region_name = d[0].label + '/' + d[1].label; + this.formData.region_id = d[1].value; + }, + getXlId(d) { + this.formData.education = d[0].label; + }, + getZzId(d) { + this.formData.political = d[0].label; + }, + getYixiang(d) { + var info = this.yixiangList[d]; + this.formData.intentional_association_position = info.text; + }, + getLaiyuan(d) { + var info = this.laiyuanList[d]; + this.formData.source_channel = info.text; + }, + getTuiJianRegion(d) { + console.log(d); + this.formData.recommended_cities = d[0].label; + }, getTuiJianTypeId(d) { var info = this.tuijianTypeList[d]; this.formData.tuijian_type_name = info.text; @@ -989,12 +1323,8 @@ }, birth_time_chick(d) { console.log(d); - this.formData.birth_time = d.date; - this.formData.birth_time_name = d.date; - }, - jiantuan_time_chick(d) { - this.formData.jiantuan_time_name = d.date; - this.formData.jiantuan_time = d.date; + this.formData.birth_time = d.year + '-' + d.month + '-' + d.day; + //this.formData.birth_time_name = d.date; }, one_next() { if (!this.checked1) { @@ -1006,6 +1336,12 @@ return; } this.current = 1; + setTimeout(() => { + uni.pageScrollTo({ + scrollTop: 0, + duration: 0 + }) + }, 100) }, getPlan() { positionList({ @@ -1124,16 +1460,133 @@ }); return; } + if (this.workList.length > 0) { + if (this.workList[0].star_time == '') { + uni.showToast({ + title: '请填写起止日期！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.workList[0].end_time == '') { + uni.showToast({ + title: '请填写起止日期！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.workList[0].address == '') { + uni.showToast({ + title: '请输入地区单位！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.workList[0].book == '') { + uni.showToast({ + title: '请输入担任职务！', + icon: 'none', + duration: 2000 + }); + return; + } + this.workList.map(item => ({ + time: `${item.star_time} 至 ${item.end_time}`, + address: item.address, + book: item.book + })); this.formData.work_experience = JSON.stringify(this.workList); } if (this.contactsList.length > 0) { + if (this.contactsList[0].name == '') { + uni.showToast({ + title: '请输入姓名-1！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.contactsList[0].post == '') { + uni.showToast({ + title: '请输入职务！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.contactsList[0].phone == '') { + uni.showToast({ + title: '请输入电话！', + icon: 'none', + duration: 2000 + }); + return; + } this.formData.other_contacts = JSON.stringify(this.contactsList); } if (this.social_duties.length > 0) { - const splitAndJoin = this.social_duties.map(item => item.split(',')).flat().join(','); + const splitAndJoin = this.social_duties + .map(item => item.split(',')) + .flat() + .filter(item => item.trim() !== '') // 过滤掉空字符串和仅含空格的字符串 + .join(','); this.formData.main_social_positions = splitAndJoin; } + if (this.formData.longitude == '' || this.formData.dimension == '') { + uni.showToast({ + title: '请选择企业地址！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.tuan_list.length > 0 && this.formData.if_organization == 0) { + if (this.tuan_list[0].name == '') { + uni.showToast({ + title: '请输入姓名！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.tuan_list[0].sex == '') { + uni.showToast({ + title: '请输入性别！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.tuan_list[0].job == '') { + uni.showToast({ + title: '请输入单位职务！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.tuan_list[0].tun_job == '') { + uni.showToast({ + title: '请输入团委职务！', + icon: 'none', + duration: 2000 + }); + return; + } + if (this.tuan_list[0].phone == '') { + uni.showToast({ + title: '请输入电话！', + icon: 'none', + duration: 2000 + }); + return; + } + this.formData.tuanweifuzerenxinxi = JSON.stringify(this.tuan_list); + } this.formData.association_id = 1; this.formData.openid = uni.getStorageSync('openid'); applyInAdd(this.formData) diff --git a/pages/packageA/user/my_card.vue b/pages/packageA/user/my_card.vue index 54fab88..e1648e4 100644 --- a/pages/packageA/user/my_card.vue +++ b/pages/packageA/user/my_card.vue @@ -12,14 +12,16 @@ - + - - + @@ -27,13 +29,15 @@ {{userThisInfo.nikename}} {{userThisInfo.position_name==null||userThisInfo.position_name==''?'无':userThisInfo.position_name}} + backgroundColor="#82B2FF" + fontColor="#ffffff">{{userThisInfo.position_name==null||userThisInfo.position_name==''?'无':userThisInfo.position_name}} {{userThisInfo.phone}} + backgroundColor="#13C296" + fontColor="#ffffff">{{userThisInfo.if_tongyi==0?userThisInfo.phone:'***********'}} - {{userThisInfo.enterprise_name==null||userThisInfo.enterprise_name==''?'未填写':userThisInfo.enterprise_name}} + {{userThisInfo.enterprise_name==null||userThisInfo.enterprise_name==''?'未填写':userThisInfo.enterprise_name}} + {{userThisInfo.unit_position}} @@ -42,17 +46,19 @@ style="margin-top: 30rpx;background: #FFFFFF;box-shadow: 0rpx 4rpx 25rpx 0rpx rgba(175,189,236,0.5);border-radius: 30rpx;"> - - + + {{userThisInfo.enterprise_name==null||userThisInfo.enterprise_name==''?'未填写':userThisInfo.enterprise_name}} - + {{userThisInfo.enterprise_location==null||userThisInfo.enterprise_location==''?'无':userThisInfo.enterprise_location}} @@ -61,9 +67,16 @@ 企业介绍 - - {{userThisInfo.enterprise_Introduction==null||userThisInfo.enterprise_Introduction==''?'无':userThisInfo.enterprise_Introduction}} - + + + + + 主营业务 + @@ -77,10 +90,14 @@ 分享 - 申请查看联系方式 + + 立刻联系 + @@ -94,7 +111,7 @@ - @@ -102,7 +119,8 @@ {{userThisInfo.nikename}} {{userThisInfo.phone}} + backgroundColor="#F1F2F8" + fontColor="#888888">{{userThisInfo.if_tongyi==0?userThisInfo.phone:'***********'}} { diff --git a/pages/packageA/user/my_msg.vue b/pages/packageA/user/my_msg.vue index 8dcf56f..50f1008 100644 --- a/pages/packageA/user/my_msg.vue +++ b/pages/packageA/user/my_msg.vue @@ -198,6 +198,20 @@ 拒绝理由: {{item.reason}} + + + 管理员 + 审核通过 + 拒绝 + 了你的入会申请 + + {{item.mail_time}} + + + 拒绝理由: {{item.content}} + diff --git a/pages/packageB/paper/add.vue b/pages/packageB/paper/add.vue index 23088ea..44e822d 100644 --- a/pages/packageB/paper/add.vue +++ b/pages/packageB/paper/add.vue @@ -102,6 +102,14 @@ uni.navigateBack() } }); + } else { + uni.showModal({ + title: '提示', + content: res.msg, + success: function(res) { + uni.navigateBack() + } + }); } }) .catch(error => { diff --git a/static/make.png b/static/make.png new file mode 100644 index 0000000000000000000000000000000000000000..b9f84dd9da476411e43b133ac58a3c3eb73246d6 GIT binary patch literal 6239 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 Jl@ccK{{zHm-D3a% literal 0 HcmV?d00001 diff --git a/util/api.js b/util/api.js index aa13005..1d1c3d4 100644 --- a/util/api.js +++ b/util/api.js @@ -38,6 +38,10 @@ export const questionnaireAdd = data => request.post('/move/questionnaire/appAdd export const moneyLogAdd = data => request.post('/move/money_log/add', data, false); export const Mailcoent = data => request.post('/move/Maillog/mailcoent', data, false); export const MemberList = data => request.post('/move/association/memberList', data, false); + +export const huiYuanList = data => request.post('/move/address/memberList', data, false); + + export const getQrcode = data => request.post('/move/login/getUnlimitedQRCode', data, false); //getSerachIndex export const getSerachIndex = data => request.post('/move/index/index', data, false); @@ -128,4 +132,6 @@ export const interactionlIndex = data => request.post('/move/Maillog/interaction export const mailMyMemberPost = data => request.post('/move/Maillog/mailMyMemberPost', data, false); -export const getApplyToken = data => request.post('/move/temporary_token/token', data, false); \ No newline at end of file +export const getApplyToken = data => request.post('/move/temporary_token/token', data, false); + +export const latitudeAndLongitude = data => request.post('/move/member/latitudeAndLongitude', data, false); \ No newline at end of file