From 7fb2f9d725840abad2ff3a48b6a8b9bb4c017a7d 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: Mon, 19 Aug 2024 18:15:03 +0800 Subject: [PATCH] 123 --- pages/index/directory.vue | 233 +++- pages/index/pizz.vue | 45 +- pages/index/pizz_info.vue | 4 +- pages/index/user.vue | 2 +- pages/packageA/user/apply_in.vue | 1495 +++++++++++-------------- pages/packageA/user/events_my.vue | 10 +- pages/packageA/user/my_card.vue | 2 +- pages/packageA/user/my_collection.vue | 3 +- pages/packageA/user/my_invoice.vue | 239 ++-- pages/packageA/user/my_msg.vue | 504 ++++++--- pages/packageB/paper/paper_info.vue | 3 +- util/api.js | 14 +- 12 files changed, 1385 insertions(+), 1169 deletions(-) diff --git a/pages/index/directory.vue b/pages/index/directory.vue index b451295..805905c 100644 --- a/pages/index/directory.vue +++ b/pages/index/directory.vue @@ -34,15 +34,16 @@ - - + + {{dq_name=='全部'?'地区':dq_name}} - + {{hy_name=='全部'?'行业':hy_name}} @@ -50,27 +51,75 @@ - - 届数 + + + {{zz_name=='全部'?'组织架构':zz_name}} + - - 组织架构 - + + + + + + {{item.name}} + + + + + + + + + + {{item.position_name}} + + + - - - {{item.label}} - + + + + + + {{item.label}} + + + + + + - + + + + + {{item.label}} + + + + + + + @@ -134,7 +183,8 @@ addressList, associationIndex, newIndustryIndex, - getRegion + getRegion, + positionList } from '@/util/api.js'; import store from "@/store"; export default { @@ -163,8 +213,65 @@ hy_name: '全部', openDqShow: false, region_list: [], + region_children_list: [], dq_name: '全部', leftDqId: 0, + zzDqShow: false, + zz_name: '全部', + 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: '第十一届' + } + ], + leftJsId: 0, } }, onLoad(d) { @@ -189,6 +296,7 @@ this.getIndustryList(); this.getAssociationIndex(); this.getRegionList(); + this.getPositionListIndex(); }, confirm(d) { var info = d[0]; @@ -197,6 +305,28 @@ this.getAssociationIndex(); this.getIndustryList(); }, + getPositionListIndex() { + positionList({ + association_id: 1 + }) + .then(res => { + console.log(res); + if (res.code == 1) { + this.zz_list = res.data; + this.zz_list.unshift({ + id: 0, + position_name: '全部' + }); + } + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + }, getAssociationIndex() { associationIndex() .then(res => { @@ -253,8 +383,9 @@ }, getAddressList() { addressList({ - position_id: 0, - region_id:this.leftDqId, + number_of_sessions: this.leftJsId, + position_id: this.leftZzId, + region_id: this.leftDqId, association_id: this.gid, industry_id: this.leftHyId, nikename: this.serach_content @@ -262,7 +393,7 @@ .then(res => { console.log(res); if (res.code == 1) { - this.list = res.data.ret; + this.list = res.data; } else { this.showNo = true; } @@ -285,11 +416,15 @@ .then(res => { if (res.code == 1) { var key = res.data; - const transformedSelectList = key.map(item => ({ - value: item.id, - label: item.region_name - })); - this.region_list = transformedSelectList; + // const transformedSelectList = key.map(item => ({ + // value: item.id, + // label: item.region_name + // })); + key.unshift({ + value: 0, + label: '全部' + }); + this.region_list = key; } }) .catch(error => { @@ -300,6 +435,32 @@ }); }) }, + clickClassifyJs(index) { + 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.list = []; + this.getAddressList(); + }, clickClassifyHy(index) { uni.showLoading({ title: '加载中...' @@ -317,12 +478,24 @@ 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(); + }, + clickClassifyDqChildren(index) { + this.currentTabbarIndex = index; this.isFixed = false; this.showNo = false; this.openDqShow = false; - this.currentTabbarIndex = index; - this.leftDqId = this.region_list[index].value; - this.dq_name = this.region_list[index].label; + //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(); }, @@ -483,4 +656,4 @@ .abc { position: absolute; } - + \ No newline at end of file diff --git a/pages/index/pizz.vue b/pages/index/pizz.vue index cab5904..c69092e 100644 --- a/pages/index/pizz.vue +++ b/pages/index/pizz.vue @@ -24,22 +24,25 @@ - - + + + 暂无图片 + + style="border-radius: 20rpx;width: 185rpx;height: 185rpx;background: rgba(24,24,24,0.6);"> 全部动态 - 我的全部动态中青企协党委书记、秘书长许... + {{item.title}} @@ -224,12 +227,36 @@ sqMode: false, page: 1, none: false, + my_list: [] } }, mounted() { this.getTweetsList(); + this.getMyTweetsList(); }, methods: { + getMyTweetsList() { + tweetsList({ + me: 1, + association_name: 1, + page: this.page, + state: 2, + size: 10 + }) + .then(res => { + console.log(res); + if (res.code == 1) { + this.my_list = res.data; + } + }) + .catch(error => { + uni.showToast({ + title: error, + icon: 'none', + duration: 2000 + }); + }) + }, ReachBottom() { console.log('home'); this.page = this.page + 1; @@ -272,7 +299,7 @@ console.log(res); if (res.code == 1) { this.none = false; - this.list.push(...res.data.data); + this.list.push(...res.data); } else { this.none = true; } @@ -302,6 +329,7 @@ member_id: uid, related_id: info.id, related_type: 'tweets', + member_b_id: info.member_id, }) .then(res => { console.log(res); @@ -324,6 +352,7 @@ member_id: uid, related_id: info.id, related_type: 'tweets', + member_b_id: info.member_id, }) .then(res => { console.log(res); @@ -361,6 +390,7 @@ member_id: uid, related_id: info.id, related_type: 'tweets', + member_b_id: info.member_id, }) .then(res => { console.log(res); @@ -383,6 +413,7 @@ member_id: uid, related_id: info.id, related_type: 'tweets', + member_b_id: info.member_id, }) .then(res => { console.log(res); diff --git a/pages/index/pizz_info.vue b/pages/index/pizz_info.vue index 78ae4e3..514cd5f 100644 --- a/pages/index/pizz_info.vue +++ b/pages/index/pizz_info.vue @@ -17,11 +17,11 @@ - 协会介绍 + 关于我们
- 协会介绍 + 联系方式 联系人： 河南省青年企业家协会 diff --git a/pages/index/user.vue b/pages/index/user.vue index 4b66589..7d6780c 100644 --- a/pages/index/user.vue +++ b/pages/index/user.vue @@ -352,7 +352,7 @@ } - \ No newline at end of file diff --git a/pages/packageA/user/events_my.vue b/pages/packageA/user/events_my.vue index 738b15d..5bd2013 100644 --- a/pages/packageA/user/events_my.vue +++ b/pages/packageA/user/events_my.vue @@ -12,7 +12,7 @@ - @@ -21,20 +21,20 @@ - - 河南省青年企业家协会走进省团校开展党史学... + {{item.activity_name}} - 2024.07.02-2024.07.05 + {{item.activity_start_time}}-{{item.activity_end_time}} - 郑州市中原区世贸中心 + {{item.activity_location}} diff --git a/pages/packageA/user/my_card.vue b/pages/packageA/user/my_card.vue index f271597..54fab88 100644 --- a/pages/packageA/user/my_card.vue +++ b/pages/packageA/user/my_card.vue @@ -67,7 +67,7 @@ - - diff --git a/pages/packageA/user/my_invoice.vue b/pages/packageA/user/my_invoice.vue index aee7f97..fc17470 100644 --- a/pages/packageA/user/my_invoice.vue +++ b/pages/packageA/user/my_invoice.vue @@ -16,32 +16,40 @@ 暂无发票数据 未查找到您的发票信息，赶快去申请～ - 去申请发票 + 去申请发票 - - 好想你健康食品股份有限公司 - + {{item.unit}} + 待审核 + + 被拒绝 + + + + 已开具 + + - 上官绪波 / 2024.07.12 + {{item.name}} / {{item.createtime}} 发票金额： - ¥1385 + ¥{{item.money}} - 查看 @@ -104,43 +112,55 @@ - + - + - + - + - + - + - + - - + + + + + + + + + + 上传凭证 + + - 申请发票 @@ -150,11 +170,11 @@ - + - 发票开取 + 开票信息 @@ -163,129 +183,63 @@ - 好想你健康食品股份有限公司 - 待审核 + {{info.unit}} + + 待审核 + + + 被拒绝 + + + 已开具 + 申请人： - 上官绪波 + {{info.name}} 申请时间： - 2024.07.16 + {{info.createtime}} 单位电话： - 0371-65560130 + {{info.telephone}} 单位地址： - 河南省新郑市中华北路199号 + {{info.unit_address}} 银行基本户账号： - 130701012000564 + {{info.bank_basic_account_number}} 纳税人识别号： - 310227687656440 + {{info.taxpayer_identification_number}} 开户行： - 郑州市金水区建设银行黄河路支行 + {{info.bank}} 发票金额： - ¥680 + ¥{{info.money}} - - 下载发票 - + @@ -302,6 +256,7 @@ data() { return { apiImgUrl: this.$store.state.imgUrl, + apiUpUrl: this.$store.state.apiUrl, addMod: false, infoMod: false, tt_add_show_add: false, @@ -313,8 +268,9 @@ telephone: '', bank_basic_account_number: '', bank: '', - association_id: 0, + association_id: 1, money: '', + voucher: '', }, invoice_type_show: false, actionSheetList: [{ @@ -351,6 +307,10 @@ this.getList(); }, methods: { + openInfoMod(item) { + this.info = item; + this.infoMod = true; + }, radioGroupChange(d) { const item = this.tt_list.find(item => item.id == d); console.log(item); @@ -398,14 +358,6 @@ }, kp_add_do() { - if (this.header_id == 0) { - uni.showToast({ - title: '请选择开票信息', - icon: 'none', - duration: 2000 - }); - return; - } if (this.money == '' || this.money <= 0) { uni.showToast({ title: '请填写金额', @@ -414,12 +366,7 @@ }); return; } - addInvoiceLog({ - association_id: this.addForm.association_id, - header_id: this.header_id, - money: this.money, - invoice_type: this.invoice_type - }) + addInvoiceLog(this.addForm) .then(res => { console.log(res); if (res.code == 1) { @@ -429,11 +376,6 @@ duration: 2000 }); this.addMod = false; - this.header_id = 0; - this.header_id_name = '请选择开票信息'; - this.invoice_type_name = '普票'; - this.invoice_type = 1; - this.money = ''; this.allList = []; this.page = 1; this.getList(); @@ -518,6 +460,33 @@ }); }) }, + upload_img() { + var user_info = uni.getStorageSync('userInfo'); + var that = this; + uni.chooseMedia({ + count: 1, //默认9 + mediaType: ['image'], + sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有 + sourceType: ['album'], //从相册选择 + success: function(res) { + console.log(res); + var url = res.tempFiles[0].tempFilePath; + uni.uploadFile({ + url: that.apiUpUrl + '/common/upload', //仅为示例，非真实的接口地址 + filePath: url, + name: 'file', + formData: { + association_id: 1, + }, + success: (uploadFileRes) => { + var data = JSON.parse(uploadFileRes.data); + console.log(data); + that.addForm.voucher = data.data.url; + } + }); + } + }); + }, goBack() { if (getCurrentPages().length > 1) { uni.navigateBack() diff --git a/pages/packageA/user/my_msg.vue b/pages/packageA/user/my_msg.vue index aa4956a..8dcf56f 100644 --- a/pages/packageA/user/my_msg.vue +++ b/pages/packageA/user/my_msg.vue @@ -13,60 +13,79 @@ - - - - - - 5 + - + @@ -76,41 +95,57 @@ - + + + + - + - + + 李杨 + style="font-size: 32rpx;font-weight: bold;vertical-align: middle;">{{item.member.nikename}} - - 《省青企协团信阳市委新县人民政府 助力大别山干部学院举行》 + + + {{item.tweet.title}} + + {{item.content}} - 2024-07-18 - 09:45 - + {{item.createtime}} + + - + - + @@ -120,45 +155,155 @@ - - - + + + + + + - 管理员审核通过了你发布的动态: + 管理员 + 审核通过 + 拒绝 + 了你发布的动态: - 《省青企协团信阳市委新县人民政府 - 助力大别山干部学院举行》 + {{item.neirong.title}} - 2024-07-18 09:45 - - 拒绝理由: 图片信息不足,请完善图片内容 + {{item.mail_time}} + + + 拒绝理由: {{item.neirong.remark}} - + - 管理员审核通过了你的发票申请 + 管理员 + 审核通过 + 拒绝 + 了你的发票申请 - 好想你健康食品股份有限公司 - 上官绪波 / 2024.07.10 - 发票金额: ¥680 + {{item.neirong.unit}} + {{item.neirong.name}} / {{item.neirong.createtime}} + 发票金额: ¥{{item.neirong.money}} + + {{item.mail_time}} + + + 拒绝理由: {{item.reason}} + + + + + + + + + + + + + 好友验证 + + + + + + + 我申请的 + + + + + 我收到的 + - 2024-07-18 09:45 - - 拒绝理由: 图片信息不足,请完善图片内容 + + + + + + + + + + + + + + + {{current==1?item.member_q_id_name:item.member_nikename}} + + + {{current==1?item.member_q_work_unit:item.member_work_unit}} + + + + + 已同意 + 被拒绝 + 操作 + + + + + + + + + + 操作 + + 点击确定按钮将同意后对方将看到你的个人名片信息。 + + + + + 拒绝 + + + + 同意 + + + + + +