From 9a097039139558d1f94c660563ed6b1db869d9a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Fri, 6 Oct 2023 17:17:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hdtj/components/detailDialog.vue          |  2 +-
 src/views/volunteer/hdtj/hdGl/index.vue       | 26 ++++++++++++++-----
 src/views/volunteer/hdtj/hdtjChild/index.vue  |  2 +-
 src/views/volunteer/userbq/bqhsj/index.vue    |  7 +++--
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/views/volunteer/hdtj/components/detailDialog.vue b/src/views/volunteer/hdtj/components/detailDialog.vue
index fa33ae6..89879a0 100644
--- a/src/views/volunteer/hdtj/components/detailDialog.vue
+++ b/src/views/volunteer/hdtj/components/detailDialog.vue
@@ -169,7 +169,7 @@
       :destroy-on-close="true"
     >
       <div slot="title">
-        <div class="titleText">查看人员详情</div>
+        <div class="titleText">查看人员详情12</div>
       </div>
       <div class="center-content">
         <el-descriptions class="margin-top" :column="2" border>
diff --git a/src/views/volunteer/hdtj/hdGl/index.vue b/src/views/volunteer/hdtj/hdGl/index.vue
index 9da2d52..9a9b51e 100644
--- a/src/views/volunteer/hdtj/hdGl/index.vue
+++ b/src/views/volunteer/hdtj/hdGl/index.vue
@@ -178,7 +178,7 @@
                 multiples
               >
                 <el-option
-                  v-for="dict in dict.type.education_range"
+                  v-for="dict in dict.type.xioaqu_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.label"
@@ -210,7 +210,7 @@
                 multiples
               >
                 <el-option
-                  v-for="dict in dict.type.education_range"
+                  v-for="dict in dict.type.hobby_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.label"
@@ -274,7 +274,7 @@
                 placeholder="请选择专业类型"
               >
                 <el-option
-                  v-for="dict in dict.type.age_range"
+                  v-for="dict in dict.type.speciality_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.label"
@@ -289,7 +289,7 @@
                 placeholder="请选择行业类型"
               >
                 <el-option
-                  v-for="dict in dict.type.age_range"
+                  v-for="dict in dict.type.industry_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.label"
@@ -307,7 +307,7 @@
                 placeholder="请选择院校"
               >
                 <el-option
-                  v-for="dict in dict.type.age_range"
+                  v-for="dict in dict.type.yuanxiao_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.label"
@@ -322,7 +322,7 @@
                 placeholder="请选择国籍"
               >
                 <el-option
-                  v-for="dict in dict.type.age_range"
+                  v-for="dict in dict.type.nationality_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.label"
@@ -352,7 +352,19 @@ import {
 import detailDialog from "../components/detailDialog.vue";
 export default {
   components: { myPagination, detailDialog },
-  dicts: ["education_range", "political_range", "sex_range", "age_range"],
+  dicts: [
+    "education_range",
+    "political_range",
+    "sex_range",
+    "age_range",
+    "xioaqu_type",
+    "hobby_type",
+    "speciality_type",
+    "industry_type",
+    "yuanxiao_type",
+    "nationality_type"
+
+  ],
   data() {
     return {
       form: {
diff --git a/src/views/volunteer/hdtj/hdtjChild/index.vue b/src/views/volunteer/hdtj/hdtjChild/index.vue
index 4761d32..55f9c14 100644
--- a/src/views/volunteer/hdtj/hdtjChild/index.vue
+++ b/src/views/volunteer/hdtj/hdtjChild/index.vue
@@ -44,7 +44,7 @@ export default {
     }
   },
   async created() {
-
+    console.log(this.$store.getters.userId);
   },
 }
 </script>
diff --git a/src/views/volunteer/userbq/bqhsj/index.vue b/src/views/volunteer/userbq/bqhsj/index.vue
index 97a13a2..c0a8956 100644
--- a/src/views/volunteer/userbq/bqhsj/index.vue
+++ b/src/views/volunteer/userbq/bqhsj/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container" ref="apps">
     <div class="titleInput" ref="titleInput">
       <el-input
-        placeholder="请输入姓名"
+        placeholder="请输入国籍"
         v-model="afterParams.nationalityRange"
         class="input-with-select"
       >
@@ -22,7 +22,7 @@
               :style="`background-image:url('${require('../../../../assets/images/profile.jpg')}')`"
             ></div>
             <div class="leftName">
-              <div>周爱</div>
+              <div>{{item.nationalityRange}}</div>
               <div class="mainTag">
                 <!-- <div>{{ item.ageRange }}</div>
                 <div>
@@ -182,6 +182,8 @@ export default {
     search() {
       this.form = { ...this.form, ...this.afterParams };
       this.getList();
+      this.afterParams.nationalityRange = ""
+
     },
     //标签生成
     labelgenerate(data = {}) {
@@ -200,6 +202,7 @@ export default {
       this.loads = true;
       peopleList(this.form).then((res) => {
         this.arrList = res.rows;
+        console.log(this.arrList);
         if (this.arrList.length > 0) {
           this.arrList.forEach((item) => {
             item.arrlist = this.labelgenerate(item);