From f3b589d0f81e96435c812aab29351036b7273263 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: Fri, 30 Aug 2024 17:11:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BD=93=E4=BA=8B=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/activityArchive/index.vue       |  2 +-
 .../volunteer/activityArchive/realselect.vue  |  9 ++-
 .../volunteer/pointsRedemption/add.vue        | 59 +++++++++++++------
 3 files changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/volunteer/activityArchive/index.vue b/src/views/modules/volunteer/activityArchive/index.vue
index 06a24ec87..e0e6e1fb5 100644
--- a/src/views/modules/volunteer/activityArchive/index.vue
+++ b/src/views/modules/volunteer/activityArchive/index.vue
@@ -40,7 +40,7 @@
         <el-table-column label="序号" header-align="center" align="center" type="index"  width="80"></el-table-column>
         <el-table-column prop="title" header-align="center" align="center" label="活动标题"  :show-overflow-tooltip="true">
         </el-table-column>
-        <el-table-column prop="address" header-align="address" align="center" label="活动地点"  :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="address" header-align="center" align="center" label="活动地点"  :show-overflow-tooltip="true"></el-table-column>
         <el-table-column prop="strTime" header-align="center" align="center" label="活动时间"  :show-overflow-tooltip="true">
                     <template slot-scope="scope">
         <span>{{ scope.row.strTime  }}至{{ scope.row.endTime }}</span>
diff --git a/src/views/modules/volunteer/activityArchive/realselect.vue b/src/views/modules/volunteer/activityArchive/realselect.vue
index 61cc3ce6c..41a19dd12 100644
--- a/src/views/modules/volunteer/activityArchive/realselect.vue
+++ b/src/views/modules/volunteer/activityArchive/realselect.vue
@@ -15,7 +15,7 @@
           </el-form-item>
           <el-form-item label="活动详情" prop="content" style="display: block" required>
             <div style="width: 300px;">
-              <span v-html="formData.content"></span>
+              <div class="span1" v-html="formData.content" style="display: block; max-width: 100px; height: 100px; "></div>
             </div>
           </el-form-item>
           <el-form-item label="照片" prop="activityImgs" required>
@@ -626,6 +626,13 @@
   
   </script>
   <style lang="scss" scoped>
+.span1 img {
+    max-width: 100%; /* 图片宽度不超过容器宽度 */
+    max-height: 100px; /* 图片高度最大为 100px */
+    width: auto; /* 自动调整宽度保持比例 */
+    height: auto; /* 自动调整高度保持比例 */
+}
+
   .div_map{
     width: 300px;
     margin-top: 10px;
diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue
index 2c09d10ec..fe5f08f78 100644
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@@ -2,15 +2,41 @@
    <div class="g-main">
       <el-form :inline="true" :label-position="labelPosition" :model="formData" :rules="rules"
          style="height: 500px; overflow: scroll;">
-         <el-form-item label="分类" required label-width="150px">
-            <el-select class="item_width_1" v-model="formData.classKey" placeholder="请选择">
-               <el-option v-for="item in TypeList" :key="item.classKey" :label="item.className" :value="item.classKey">
-               </el-option>
-            </el-select>
-         </el-form-item>
+
          <el-form-item label="标题" label-width="150px" required>
             <el-input class="item_width_1" v-model="formData.awardName" placeholder="请输入内容"></el-input>
          </el-form-item>
+         <el-row>
+            <el-col :span="12">
+               <el-form-item label="分类" required label-width="150px">
+                  <el-select class="item_width_1" v-model="formData.classKey" placeholder="请选择">
+                     <el-option v-for="item in TypeList" :key="item.classKey" :label="item.className"
+                        :value="item.classKey">
+                     </el-option>
+                  </el-select>
+               </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item label="发布范围" label-width="150px" required>
+                  <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small" style="width:210px ;"
+                     v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
+                     @change="handleChangeAgency"></el-cascader>
+               </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+               <el-form-item label="发布范围" label-width="150px" required>
+                  <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small" style="width:210px ;"
+                     v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
+                     @change="handleChangeAgency"></el-cascader>
+               </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item required label="兑换积分" label-width="150px">
+                  <el-input class="item_width_2" v-model="formData.points" placeholder="请输入"></el-input>
+               </el-form-item>
+            </el-col>
+         </el-row>
          <el-form-item v-if="formData.classKey=='mjq' ||formData.classKey=='cxdjq'" required label="金额"
             label-width="150px">
             <div class="item_width_2" style="display: flex;">
@@ -30,9 +56,7 @@
                <el-input v-model="formData.worthAmount" placeholder="请输入内容"></el-input>
             </div>
          </el-form-item>
-         <el-form-item required label="兑换积分" label-width="150px">
-            <el-input class="item_width_2" v-model="formData.points" placeholder="请输入"></el-input>
-         </el-form-item>
+
          <el-form-item label="有效期至" label-width="150px">
             <el-date-picker style="width: 250px;" v-model="formData.expireTime" type="datetime" placeholder="请选择日期"
                format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
@@ -42,27 +66,24 @@
             <Tinymce style="width: 560px;" class="tinymce_view" v-model="formData.description" :height="250"
                placeholder="请输入活动内容" />
          </el-form-item>
-         <el-form-item label="库存" label-width="150px" >
+         <el-form-item label="库存" label-width="150px">
             <div style="width:195px;;">
                <el-radio v-model="radio" label="1" style="margin-right:20px">不限数目</el-radio>
-               <div class="flex flex-x  flex-center2" >
+               <div class="flex flex-x  flex-center2">
                   <el-radio v-model="radio" label="2" style="margin-right: 10px;">自定义</el-radio>
-                  <el-input v-if="radio == '2'" type="number" v-model="formData.stockQty" placeholder="请输入数量"></el-input>
+                  <el-input v-if="radio == '2'" type="number" v-model="formData.stockQty"
+                     placeholder="请输入数量"></el-input>
                </div>
             </div>
 
 
          </el-form-item>
-         <el-form-item label="发布范围" label-width="150px" required>
-            <el-cascader class="list_item_width_1" ref="myCascader" clearable size="small" style="width:210px ;"
-               v-model.trim="formData.redeemerOrgId" :options="orgOptions" :props="orgOptionProps"
-               @change="handleChangeAgency"></el-cascader>
-         </el-form-item>
 
-         <el-form-item label="赞助单位" label-width="150px" >
+
+         <el-form-item label="赞助单位" label-width="150px">
             <el-input v-model="formData.sponsorName" placeholder="请输入"></el-input>
          </el-form-item>
-         <el-form-item label="联系电话" label-width="150px"prop="sponsorMobile" >
+         <el-form-item label="联系电话" label-width="150px" prop="sponsorMobile">
             <el-input style="width: 210px;" v-model="formData.sponsorMobile" placeholder="请输入"></el-input>
          </el-form-item>
          <el-form-item label="上架" label-width="150px" inline="false">