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 0000000..b9f84dd Binary files /dev/null and b/static/make.png differ diff --git a/static/map.png b/static/map.png new file mode 100644 index 0000000..2925017 Binary files /dev/null and b/static/map.png differ 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