From 96788b8e5443f2cbf983929dde0da8134b192a92 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Fri, 22 Sep 2023 15:01:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=AB=AF=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 6 +- .../jifenduihuan/huodongtuijian/index.js | 4 +- .../jifenduihuan/jifenhuoqu/index.js | 10 +- src/views/components/dialog/index.vue | 13 +- src/views/components/myInput/index.vue | 13 +- .../volunteer/activityRecommend/index.vue | 17 +- src/views/volunteer/components/recommend.vue | 129 +++++++++++++-- .../volunteer/conversionRecord/index.vue | 32 +++- .../volunteer/integralConversion/index.vue | 51 +++--- src/views/volunteer/integralGain/index.vue | 155 +++++++++--------- 10 files changed, 300 insertions(+), 130 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 356f010..cf5f545 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -4,11 +4,13 @@ * @Author: JC9527 * @Date: 2023-09-21 10:39:35 * @LastEditors: JC9527 - * @LastEditTime: 2023-09-21 10:41:22 + * @LastEditTime: 2023-09-22 10:23:55 */ import huodongtuijian from "./volunteer/jifenduihuan/huodongtuijian"; +import jifenhuoqu from "./volunteer/jifenduihuan/jifenhuoqu"; export default { - huodongtuijian + huodongtuijian, + jifenhuoqu } \ No newline at end of file diff --git a/src/api/volunteer/jifenduihuan/huodongtuijian/index.js b/src/api/volunteer/jifenduihuan/huodongtuijian/index.js index 571c257..6e19def 100644 --- a/src/api/volunteer/jifenduihuan/huodongtuijian/index.js +++ b/src/api/volunteer/jifenduihuan/huodongtuijian/index.js @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2023-09-21 10:36:32 * @LastEditors: JC9527 - * @LastEditTime: 2023-09-21 10:57:12 + * @LastEditTime: 2023-09-22 11:25:39 */ import request from "@/utils/request"; @@ -19,7 +19,7 @@ export default { // 查看详情 activity(id){ return request({ - url:'/zhiyuanzhe/activity' + id, + url:'/zhiyuanzhe/activity/' + id, method:"get", }) }, diff --git a/src/api/volunteer/jifenduihuan/jifenhuoqu/index.js b/src/api/volunteer/jifenduihuan/jifenhuoqu/index.js index 90ac56a..4582a1f 100644 --- a/src/api/volunteer/jifenduihuan/jifenhuoqu/index.js +++ b/src/api/volunteer/jifenduihuan/jifenhuoqu/index.js @@ -4,10 +4,16 @@ * @Author: JC9527 * @Date: 2023-09-21 09:46:16 * @LastEditors: JC9527 - * @LastEditTime: 2023-09-21 11:02:10 + * @LastEditTime: 2023-09-22 10:23:24 */ import request from "@/utils/request"; export default { - + selectall(params){ + return request({ + url:'/zhiyuanzhe/points/selectall', + method:"get", + params, + }) + } } \ No newline at end of file diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index 2f31987..98480a4 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -4,12 +4,11 @@ * @Author: JC9527 * @Date: 2023-09-20 14:14:24 * @LastEditors: JC9527 - * @LastEditTime: 2023-09-21 10:13:28 + * @LastEditTime: 2023-09-22 11:04:22 --> @@ -109,6 +140,18 @@ export default { }, total:0, loading:false, + input:{ + name:"" + }, + loadingTwo:false, + dialogContent:{ + name:'', + content:'', + publisher:'', + activityTime:'', + address:'', + label:[] + } } }, props:{ @@ -117,23 +160,33 @@ export default { default:'' } }, - computed: { - ...mapState({ - dept: (state) => state.user.dept, - }), - }, watch:{ value:{ handler(newInput,oldInput) { // 搜索值 + this.input.name = newInput; + this.pages= { + pageNum: 1, + pageSize: 10, + }; + this.getList() }, + immediate:true, } }, methods:{ // 获取活动推荐列表 - async getList(){ + async getList(params){ this.loading = true; - let data = await this.$api.huodongtuijian.list(this.pages); + if(params == '1') { + this.pages= { + pageNum: 1, + pageSize: 10, + }; + this.input.name = ''; + } + let obj = { ...this.pages,...this.input } + let data = await this.$api.huodongtuijian.list(obj); if(data.code == 200) { this.loading = false; this.tableData = data.rows; @@ -161,8 +214,26 @@ export default { } }, // 查看详情 - look(row){ + async look(row){ this.$refs.chakan.open(); + this.loadingTwo = true; + let data = await this.$api.huodongtuijian.activity(row.id); + if(data.code == 200){ + this.loadingTwo = false; + let {name,content,publisher,activityTime,address,ageRange,sexRange,politicalRange,educationRange,housingRange,industryRange,interestRange,professionalRange,schoolRange} = data.data; + let arr = []; + arr.push(ageRange,sexRange,politicalRange,educationRange,housingRange,industryRange,interestRange,professionalRange,schoolRange) + let arrtwo = [] + arr.forEach((item)=>{ + let obj = {} + if(item) { + obj['name'] = item + arrtwo.push(obj) + } + }) + console.log(arrtwo) + this.dialogContent = {name,content,publisher,activityTime,address,label:arrtwo}; + } }, // 参与按钮 participation(row){ @@ -291,6 +362,40 @@ export default { ::v-deep .el-textarea__inner { height: 80px !important; } +::v-deep .mainsEvents { + // height: 35px; + display: flex; + align-items: center; + font-family: "Alibaba-PuHuiTi-Regular"; + margin-bottom: 12px; + .itemE { + width: 50%; + display: flex; + & > div:nth-of-type(1) { + display: flex; + align-items: center; + color: #4c4949; + width: 26%; + } + & > div:nth-last-of-type(2) { + color: #807a7a; + } + .mainTag { + display: flex; + flex-wrap: wrap; + flex: 1; + font-family: "Alibaba-PuHuiTi-Regular"; + & > div { + margin-right: 5px; + margin-top: 5px; + background-color: rgba(248, 65, 77, 0.06); + padding: 3px 5px; + color: #e16a70; + border-radius: 4px; + } + } + } +} .form-btns { text-align: right; } diff --git a/src/views/volunteer/conversionRecord/index.vue b/src/views/volunteer/conversionRecord/index.vue index 72860dd..c6c5849 100644 --- a/src/views/volunteer/conversionRecord/index.vue +++ b/src/views/volunteer/conversionRecord/index.vue @@ -4,12 +4,12 @@ * @Author: JC9527 * @Date: 2023-09-18 10:08:30 * @LastEditors: JC9527 - * @LastEditTime: 2023-09-21 09:39:41 + * @LastEditTime: 2023-09-22 14:18:25 -->