志愿者端请求数据

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
 }

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",
     })
   },

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,
+    })
+  }
 }

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
 -->
 <template>
   <el-dialog
     :visible.sync="dialogVisible"
-    :show-close="false"
     :destroy-on-close="true"
     :close-on-click-modal="false"
     append-to-body
@@ -72,6 +71,16 @@ export default {
 ::v-deep .el-dialog__body {
   padding: 0;
 }
+::v-deep .el-dialog__header {
+  padding: 10px;
+  padding-left: 15px;
+  background: #f7f5f5;
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+}
+::v-deep .el-dialog__headerbtn {
+  top: 12px;
+}
 .dialog-slot {
   padding: 20px 30px;
   .closeClick {

src/views/components/myInput/index.vue

@@ -4,11 +4,11 @@
  * @Author: JC9527
  * @Date: 2023-09-20 11:28:27
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-20 14:03:23
+ * @LastEditTime: 2023-09-22 14:12:58
 -->
 <template>
   <div class="my-inputs">
-    <el-input v-model="input" placeholder="请输入内容"></el-input>
+    <el-input v-model="input" :placeholder="placeholder" clearable @change="changeValue"></el-input>
     <div class="btn" @click="inputValue"><i class="el-icon-search"></i></div>
   </div>
 </template>
@@ -19,10 +19,19 @@ export default {
       input:'',
     }
   },
+  props:{
+    placeholder:{
+      type:String,
+      default:'请输入内容'
+    }
+  },
   methods:{
     inputValue(){
       this.$emit('changeInput',this.input)
     },
+    changeValue(){
+      this.$emit('changeValue',this.input)
+    }
   },
 }
 </script>

src/views/volunteer/activityRecommend/index.vue

@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-18 10:08:30
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-21 09:28:08
+ * @LastEditTime: 2023-09-22 14:36:35
 -->
 <template>
   <div class="plan-management">
@@ -13,10 +13,10 @@
         <el-tab-pane label="活动推荐" name="recommendView"></el-tab-pane>
         <el-tab-pane label="活动邀请" name="inviteView"></el-tab-pane>
       </el-tabs>
-      <my-input @changeInput="changeInput"></my-input>
+      <my-input @changeInput="changeInput" placeholder="请输入活动内容" @changeValue="changeValue"></my-input>
     </div>
     <div class="plan-bottomBox">
-      <component :is="defaultRouter" :value="input"></component>
+      <component :is="defaultRouter" :value="input" ref="myComponents"></component>
     </div>
   </div>
 </template>
@@ -30,13 +30,22 @@ export default {
     return {
       input: '',
       activeName: 'recommendView',
-      defaultRouter:'recommendView'
+      defaultRouter:'recommendView',
+      isClick:false,
     }
   },
   methods:{
     // 输入框的值
     changeInput(value){
       this.input = value;
+      this.isClick = true;
+    },
+    // 监听输入框是否清空
+    changeValue(value){
+      if(this.isClick && value == ''){
+        this.$refs.myComponents.getList('1')
+        this.isClick = false;
+      }
     },
     handleClick() {
       this.defaultRouter = this.activeName

src/views/volunteer/components/recommend.vue

@@ -23,8 +23,8 @@
         >
           <template slot-scope="scope">
             <div class="activity">
-              <div>{{ scope.row.content.split(' ')[0] }}</div>
-              <div>{{ scope.row.content.split(' ')[1] }}</div>
+              <div>{{ scope.row.name }}</div>
+              <div>{{ scope.row.content }}</div>
             </div>
           </template>
         </el-table-column>
@@ -88,8 +88,39 @@
         </div>
       </el-form>
     </my-dialog> -->
-    <my-dialog ref="chakan" title="查看详情">
-      
+    <my-dialog ref="chakan" title="查看活动详情" width="45%">
+      <div class="mainsEvents" v-loading="loadingTwo">
+        <div class="itemE">
+          <div>活动名称:</div>
+          <div>{{ dialogContent.name }}</div>
+        </div>
+        <div class="itemE">
+          <div>活动时间:</div>
+          <div>{{ dialogContent.activityTime.split(' ')[0] }}</div>
+        </div>
+      </div>
+      <div class="mainsEvents">
+        <div class="itemE">
+          <div>活动内容:</div>
+          <div>{{ dialogContent.content }}</div>
+        </div>
+        <div class="itemE">
+          <div>活动地址:</div>
+          <div>{{ dialogContent.address }}</div>
+        </div>
+      </div>
+      <div class="mainsEvents">
+        <div class="itemE">
+          <div>活动举办方:</div>
+          <div>{{ dialogContent.publisher }}</div>
+        </div>
+        <div class="itemE">
+          <div>活动标签:</div>
+          <div class="mainTag">
+            <div v-for="item in dialogContent.label">{{ item.name }}</div>
+          </div>
+        </div>
+      </div>
     </my-dialog>
   </div>
 </template>
@@ -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;
 }

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
 -->
 <template>
   <div class="plan-management">
     <div class="plan-topBox">
-      <my-input @changeInput="changeInput"></my-input>
+      <my-input @changeInput="changeInput" placeholder="请输入活动内容" @changeValue="changeValue"></my-input>
     </div>
     <div class="plan-bottomBox">
       <div class="tables">
@@ -198,13 +198,16 @@ export default {
           time:'2023-08-14'
         },
       ],
-      input: '',
+      input: {
+        name:''
+      },
       pages:{
         pageSize:10,
         pageNum:1
       },
       total:0,
       loading:false,
+      isClick:false,
     }
   },
   methods:{
@@ -215,7 +218,25 @@ export default {
     },
     // 输入框的值
     changeInput(value){
-      this.input = value;
+      this.input.name = value;
+      this.isClick = true;
+      this.pages= {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.getList();
+    },
+    // 监听输入框是否清空
+    changeValue(value){
+      if(this.isClick && value == ''){
+        this.input.name = '';
+        this.pages= {
+          pageNum: 1,
+          pageSize: 10,
+        };
+        this.getList();
+        this.isClick = false;
+      }
     },
     // tabs不同行给不同class
     tableRowClassName({ row, rowIndex }) {
@@ -231,6 +252,9 @@ export default {
       } else {
         return '';
       }
+    },
+    getList(){
+
     },
     // 查看详情
     look(item){

src/views/volunteer/integralConversion/index.vue

@@ -4,12 +4,12 @@
  * @Author: JC9527
  * @Date: 2023-09-18 10:08:30
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-22 09:31:54
+ * @LastEditTime: 2023-09-22 14:15:06
 -->
 <template>
   <div class="mainBox">
     <div class="convert-topBox">
-      <my-input @changeInput="changeInput"></my-input>
+      <my-input @changeInput="changeInput" placeholder="请输入证书名称" @changeValue="changeValue"></my-input>
     </div>
     <div class="convert-content" v-loading="loading">
       <div class="integral-lists">
@@ -35,31 +35,17 @@ export default {
   data() {
     return {
       total:0,
-      certificateList:[
-        {
-          type:2,
-        },{
-          type:1,
-        },{
-          type:0,
-        },{
-          type:2,
-        },{
-          type:1,
-        },{
-          type:0,
-        },{
-          type:2,
-        },{
-          type:1,
-        }
-      ],
+      certificateList:[],
       basicUrl:process.env.VUE_APP_BASE_API,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
       },
       loading:false,
+      value:{
+        name:''
+      },
+      isClick:false,
     };
   },
   components: {
@@ -76,7 +62,25 @@ export default {
     },
     // 点击搜索输入框的值
     changeInput(e){
-
+      this.isClick = true;
+      this.queryParams= {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.value.name = e;
+      this.getList()
+    },
+    // 监听输入框是否清空
+    changeValue(value){
+      if(this.isClick && value == ''){
+        this.value.name = '';
+        this.pages= {
+          pageNum: 1,
+          pageSize: 10,
+        };
+        this.getList();
+        this.isClick = false;
+      }
     },
     // 点击兑换
     conversion(item){
@@ -84,7 +88,8 @@ export default {
     },
     getList(){
       this.loading = true;
-      listCertificates(this.queryParams).then((response) => {
+      let obj = { ...this.queryParams,...this.value }
+      listCertificates(obj).then((response) => {
         this.certificateList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/volunteer/integralGain/index.vue

@@ -4,12 +4,12 @@
  * @Author: JC9527
  * @Date: 2023-09-18 10:08:30
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-21 09:28:45
+ * @LastEditTime: 2023-09-22 15:00:11
 -->
 <template>
   <div class="plan-management">
     <div class="plan-topBox">
-      <my-input @changeInput="changeInput"></my-input>
+      <my-input @changeInput="changeInput" placeholder="请输入活动内容" @changeValue="changeValue"></my-input>
     </div>
     <div class="plan-bottomBox">
       <div class="tables">
@@ -29,31 +29,34 @@
             width="70">
           </el-table-column>
           <el-table-column
-            prop="content"
+            prop="name"
             label="参与活动"
             width="280"
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <div class="activity">
                 <div>{{ scope.row.content.split(' ')[0] }}</div>
                 <div>{{ scope.row.content.split(' ')[1] }}</div>
               </div>
-            </template>
+            </template> -->
           </el-table-column>
           <el-table-column
-            prop="person"
+            prop="uid"
             label="参与人员"
             show-overflow-tooltip
             width="180"
           >
           </el-table-column>
           <el-table-column
-            prop="duration"
+            prop="activityTime"
             label="服务活动时长"
           >
+            <template slot-scope="scope">
+              <div>{{ scope.row.activityTime.split(' ')[0] }}</div>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="time"
+            prop="activityTime"
             label="参与时间"
           >
           </el-table-column>
@@ -67,7 +70,7 @@
                   <img src="@/assets/images/look.png" alt="">
                   <span>查看</span>
                 </div>
-                <div class="score">评估评分：<span class="span" :class="scope.row.score < 60 ? 'pass':''">{{ scope.row.score }}</span></div>
+                <div class="score">评估评分：<span class="span" :class="Number(scope.row.points) < 60 ? 'pass':''">{{ scope.row.points }}</span></div>
               </div>
             </template>
           </el-table-column>
@@ -77,85 +80,41 @@
         <my-pagination :total="total" @pagesChange="pagesChange"></my-pagination>
       </div>
     </div>
+    <my-dialog ref="conversion" width="45%">
+      <el-descriptions class="margin-top" :column="2" border>
+        <el-descriptions-item label="活动名称">{{ descriptions.name }}</el-descriptions-item>
+        <el-descriptions-item label="活动时间">{{ descriptions.activityTime }}</el-descriptions-item>
+        <el-descriptions-item label="活动举办方">{{ descriptions.publisher }}</el-descriptions-item>
+        <el-descriptions-item label="积分">{{ descriptions.points }}</el-descriptions-item>
+      </el-descriptions>
+    </my-dialog>
   </div>
 </template>
 <script>
 import myPagination from "@/views/components/myPagination/index.vue"
 import myInput from "@/views/components/myInput/index.vue"
+import myDialog from "@/views/components/dialog/index.vue"
 export default {
-  components:{myPagination,myInput},
+  components:{myPagination,myInput,myDialog},
   data() {
     return {
-      tableData: [
-        {
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:98,
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:98,
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:98,
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:98,
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:58,
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:98,
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:98,
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:98,
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:48,
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14',
-          score:98,
-        },
-      ],
-      input: '',
+      tableData: [],
+      input: {
+        name:''
+      },
       pages:{
         pageSize:10,
         pageNum:1
       },
       total:0,
       loading:false,
+      isClick:false,
+      descriptions:{
+        name:'',
+        activityTime:'',
+        publisher:'',
+        points:''
+      },
     }
   },
   methods:{
@@ -166,7 +125,25 @@ export default {
     },
     // 输入框的值
     changeInput(value){
-      this.input = value;
+      this.input.name = value;
+      this.isClick = true;
+      this.pages= {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.getList();
+    },
+    // 监听输入框是否清空
+    changeValue(value){
+      if(this.isClick && value == ''){
+        this.input.name = '';
+        this.pages= {
+          pageNum: 1,
+          pageSize: 10,
+        };
+        this.getList();
+        this.isClick = false;
+      }
     },
     // tabs不同行给不同class
     tableRowClassName({ row, rowIndex }) {
@@ -183,9 +160,33 @@ export default {
         return '';
       }
     },
+    // 查看详情页
+    async look(row){
+      this.$refs.conversion.open();
+      let data = await this.$api.jifenhuoqu.selectall({id:row.id});
+      let { name,activityTime,publisher,points } = data.data.list[0];
+      this.descriptions = {
+        name,
+        activityTime,
+        publisher,
+        points
+      };
+      console.log(data)
+    },
+    // 积分获取列表
+    async getList(){
+      this.loading = true;
+      let obj = { ...this.pages,...this.input }
+      let data = await this.$api.jifenhuoqu.selectall(obj);
+      if(data.code == 200) {
+        this.loading = false;
+        this.tableData = data.data.list;
+        this.total = data.data.total;
+      }
+    },
   },
-  async created() {
-
+  mounted(){
+    this.getList();
   },
 }
 </script>