From b37d4a7d2a666c6c96d91befbba73ece06e46b85 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 18:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/activityArchive/enclosure.vue   |  2 +-
 .../volunteer/pointsRedemption/add.vue        | 77 +++++++++++--------
 2 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/src/views/modules/volunteer/activityArchive/enclosure.vue b/src/views/modules/volunteer/activityArchive/enclosure.vue
index 52f19f47d..d49c35c9d 100644
--- a/src/views/modules/volunteer/activityArchive/enclosure.vue
+++ b/src/views/modules/volunteer/activityArchive/enclosure.vue
@@ -127,7 +127,7 @@
           async getTableData() {
 
           // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
-          const url =  `/voluntary/activitySignIn/getAttrBySignId/1826208948341354497`;
+          const url =  `/voluntary/activitySignIn/getAttrBySignId/${this.list.activityId}`;
           let params = {
 
         }
diff --git a/src/views/modules/volunteer/pointsRedemption/add.vue b/src/views/modules/volunteer/pointsRedemption/add.vue
index af2fcd039..f5aa02ff9 100644
--- a/src/views/modules/volunteer/pointsRedemption/add.vue
+++ b/src/views/modules/volunteer/pointsRedemption/add.vue
@@ -1,9 +1,7 @@
 <template>
    <div class="g-main">
       <el-form :inline="true" :label-position="labelPosition" :model="formData" :rules="rules"
-         style="height: 500px; overflow: scroll;">
-
-
+         style="overflow: scroll;">
          <el-row>
             <el-col :span="12">
             <el-form-item label="标题" label-width="150px" required>
@@ -26,12 +24,44 @@
                      @change="handleChangeAgency"></el-cascader>
                </el-form-item>
             </el-col>
-            <el-col :span="12">
+           <el-col :span="12">
                <el-form-item required label="兑换积分" label-width="150px">
                   <el-input style="width:300px ;" v-model="formData.points" placeholder="请输入"></el-input>
                </el-form-item>
             </el-col>
+            <el-col :span="12">
+               <el-form-item label="赞助单位" label-width="150px">
+            <el-input v-model="formData.sponsorName" placeholder="请输入"  style="width:300px ;"></el-input>
+         </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item label="联系电话" label-width="150px" prop="sponsorMobile">
+            <el-input style="width:300px ;" v-model="formData.sponsorMobile" placeholder="请输入" ></el-input>
+         </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item label="库存" label-width="150px">
+            <div style="width:195px;height: 40px;" class="flex flex-x  flex-center2">
+               <el-radio v-model="radio" label="1" style="margin-right:20px">不限数目</el-radio>
+               <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" style="width: 125px;"
+                     placeholder="请输入数量"></el-input>
+               </div>
+            </div>
+         </el-form-item>
+            </el-col>
+            <el-col :span="12">
+               <el-form-item label="有效期至" label-width="150px">
+            <el-date-picker style="width:300px ;" v-model="formData.expireTime" type="datetime" placeholder="请选择日期"
+               format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
+            </el-date-picker>
+         </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;">
@@ -52,40 +82,18 @@
             </div>
          </el-form-item>
 
-         <el-form-item label="有效期至" label-width="150px">
-            <el-date-picker style="width:300px ;" v-model="formData.expireTime" type="datetime" placeholder="请选择日期"
-               format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss">
-            </el-date-picker>
-         </el-form-item>
+    
          <el-form-item label="规则说明" label-width="150px">
-            <Tinymce style="width: 560px;" class="tinymce_view" v-model="formData.description" :height="250"
+            <Tinymce style="width: 763px;" class="tinymce_view" v-model="formData.description" :height="250"
                placeholder="请输入活动内容" />
          </el-form-item>
-         <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">
-                  <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>
-               </div>
-            </div>
-
-
-         </el-form-item>
-
-
-         <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-input style="width: 210px;" v-model="formData.sponsorMobile" placeholder="请输入"></el-input>
-         </el-form-item>
-         <el-form-item label="上架" label-width="150px" inline="false">
-            <el-switch style="width: 500px;" v-model="formData.shelveStatus" active-color="#13ce66" inactive-color=""
+         <el-col :span="24">
+               <el-form-item label="上架" label-width="150px" inline="false">
+            <el-switch v-model="formData.shelveStatus" active-color="#13ce66" inactive-color=""
                active-value="1" inactive-value="0">
             </el-switch>
          </el-form-item>
+            </el-col>
       </el-form>
       <div class="flex  flex-center1 flex-center2">
          <el-button type="primary" @click="submitForm()">提交</el-button>
@@ -133,7 +141,7 @@ export default {
       orgOptions:[],
           rules: {
         sponsorMobile: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+          { required: false, message: '联系电话不能为空', trigger: 'blur' },
           { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
         ]
       }
@@ -230,6 +238,9 @@ export default {
 </script>
 <style lang="scss" scoped>
   @import "@/assets/scss/modules/management/volunteet.scss";
+  .g-main{
+    padding: 30px;
+  }
   .item_width_1 {
     width: 300px;