From 2a44d85f6e7c11f2932f2fbe5e9f80b38c5bbfa0 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 23 Sep 2024 16:46:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=90=8D=E9=A2=9D?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/volunteer/activityArchive/realselect.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
index 231d7d7cd..44b12bf5e 100644
--- a/src/views/modules/volunteer/activityArchive/realselect.vue
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -43,9 +43,9 @@
           </el-form-item>
           <el-form-item label="活动名额" prop="points" required>
             <div style="display: flex; flex-direction: column;">
-              <el-input-number disabled="false" v-model.trim="formData.quota" label="描述文字" v-if="formData.quota!=0"
+              <el-input-number disabled="false" v-model.trim="formData.quota" label="描述文字" v-if="formData.notQuota!=0"
                 type="number"></el-input-number>
-              <span v-if="formData.quota==0">不限名额</span>
+              <span v-if="formData.notQuota==0">不限名额</span>
             </div>
           </el-form-item>
           <el-form-item label="活动类型" prop="type" required>

From 0180601f99a0bf75c99a0f8af7dd400197f107f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 23 Sep 2024 16:50:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BAorg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/VoluntaryOrganization/add.vue   | 34 +++++++++----------
 .../volunteer/VoluntaryOrganization/info.vue  |  2 +-
 .../VoluntaryOrganization/process.vue         | 15 ++++++--
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/views/modules/volunteer/VoluntaryOrganization/add.vue b/src/views/modules/volunteer/VoluntaryOrganization/add.vue
index d34e46847..054f84b5c 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/add.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/add.vue
@@ -135,24 +135,24 @@
             ],
             formData:    
                 {
-                    orgImage: "",//组织图片
-                 status:"pass",//审核状态
-                numberNum:"",//组织成员数量
-                userId:"",//志愿者id
-                agencyId:"",//组织id
-                orgType:"",
-                brandImg:"",//品牌图片
-                brand:"",//志愿品牌
-                introduction:"",//组织介绍
+                orgImage: "",//组织图片
+                status: "pass",//审核状态
+                numberNum: "",//组织成员数量
+                userId: "",//志愿者id
+                agencyId: "",//组织id
+                orgType: "",
+                brandImg: "",//品牌图片
+                brand: "",//志愿品牌
+                introduction: "",//组织介绍
                 qualification: "",//封面图片
-                idCard:"",//身份证信息
-                mobile:"",//管理员电话
-                operator:"",//管理员姓名
-                Organizationaltype:"",//组织类型
-             //    serviceTypeList:"",//服务类型
-                orgName:"",//组织名称
-                agencyName:"",//所属组织
-                serviceTypeList:[],//服务类型
+                idCard: "",//身份证信息
+                mobile: "",//管理员电话
+                operator: "",//管理员姓名
+                Organizationaltype: "",//组织类型
+                //    serviceTypeList:"",//服务类型
+                orgName: "",//组织名称
+                agencyName: "",//所属组织
+                serviceTypeList: [],//服务类型
                 address: "",//地址
                 longitude: this.$store.state.user.longitude, //经度
                 latitude: this.$store.state.user.latitude,//纬度
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/info.vue b/src/views/modules/volunteer/VoluntaryOrganization/info.vue
index 5caa142df..c13aafefb 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/info.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/info.vue
@@ -75,7 +75,7 @@
                                 <!-- <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"  :file-list="formData.fileList"
                                  @file-removed="removedImg"></upload-image> -->
                                 <div class="demo-image__preview">
-                                    <el-image style="width: 100px; height: 100px" :src="formData.qualification"
+                                    <el-image style="width: 100px; height: 100px" :src="formData.orgImage"
                                         :preview-src-list="srcList">
                                     </el-image>
                                 </div>
diff --git a/src/views/modules/volunteer/VoluntaryOrganization/process.vue b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
index 5ead1c9e3..ee69f1208 100644
--- a/src/views/modules/volunteer/VoluntaryOrganization/process.vue
+++ b/src/views/modules/volunteer/VoluntaryOrganization/process.vue
@@ -9,7 +9,7 @@
           {{ tableData.serviceTypeName }}
         </el-form-item>
         <el-form-item label="组织类型">
-          {{ tableData.Organizationaltype}}
+          {{ tableData.orgTypeName}}
         </el-form-item>
         <el-form-item label="管理员姓名">
           {{ tableData.operator}}
@@ -35,7 +35,7 @@
         </el-form-item>
         <el-form-item label="附件">
           <div class="demo-image__preview">
-            <el-image style="width: 100px; height: 100px" :src="tableData.qualification">
+            <el-image style="width: 100px; height: 100px" :src="tableData.orgImage">
             </el-image>
           </div>
           <!-- {{ tableData.address}} -->
@@ -43,6 +43,16 @@
         <el-form-item label="申请时间">
           {{tableData.updatedTime}}
         </el-form-item>
+        <el-form-item label="志愿品牌">
+          {{tableData.brand}}
+        </el-form-item>
+        <el-form-item label="品牌展示图">
+          <div class="demo-image__preview">
+            <el-image style="width: 100px; height: 100px" :src="tableData.brandImg">
+            </el-image>
+          </div>
+          <!-- {{ tableData.address}} -->
+        </el-form-item>
         <el-form-item label="审核结果" >
           <!-- <div style="display: flex; justify-items:center; align-items: center;">
                 <el-radio v-model="status1" label="pass" style="margin-right:20px">通过</el-radio>
@@ -180,6 +190,7 @@ export default {
         if(res.code===0){
           console.log("列表请求成功！！！！！！！！！！！！！！");
           this.tableData = res.data[0]
+      
           console.log(this.tableData, "this.tableData");
         }
       })