From 004e2c8e98b650529de0bd4e0e9a96207cb1ae6e Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Tue, 29 Oct 2024 15:01:59 +0800
Subject: [PATCH] 10.29

---
 .../activeConsumption/index.vue               |  6 +--
 .../EventMarketing/activeNewlyweds/index.vue  | 35 +++++-------------
 .../EventMarketing/openCardGift/birthday.vue  | 37 +++++--------------
 .../EventMarketing/openCardGift/invite.vue    | 36 +++++-------------
 4 files changed, 33 insertions(+), 81 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 4a0e5df8e..0426f9aff 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -120,11 +120,11 @@
               <div>
                 <el-button type="text" @click="ifWrite = !ifWrite">编辑</el-button>
               </div>
-              <el-input type="textarea" :disabled="ifWrite" v-model="ruleForm.noticeContent"
+              <el-input type="textarea" :rows="8" :disabled="ifWrite" v-model="ruleForm.noticeContent"
                         placeholder="请输入通知内容"></el-input>
             </el-form-item>
-            <el-form-item label="活动详情" prop="activityDetails">
-              <el-input type="textarea" v-model="ruleForm.activityDetails" placeholder="请输入活动详情"></el-input>
+            <el-form-item label="活动详情"  prop="activityDetails">
+              <el-input type="textarea" :rows="8"  v-model="ruleForm.activityDetails" placeholder="请输入活动详情"></el-input>
             </el-form-item>
             <el-form-item label="活动奖品" prop="activeGift">
               <el-checkbox-group v-model="ruleForm.activeGift" @change="changes">
diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
index d9be3959c..6a4448f21 100644
--- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-open">
     <div class="cot-box">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="90px" style="margin: 0 auto;width: 70%">
         <el-form-item label="活动名称" prop="name">
@@ -34,11 +34,11 @@
           <div>
             <el-button type="text" @click="ifWrite = !ifWrite">编辑</el-button>
           </div>
-          <el-input type="textarea" :disabled="ifWrite" v-model="ruleForm.noticeContent"
+          <el-input type="textarea" :rows="6" :disabled="ifWrite" v-model="ruleForm.noticeContent"
                     placeholder="请输入通知内容"></el-input>
         </el-form-item>
         <el-form-item label="活动详情" prop="activityDetails">
-          <el-input type="textarea" v-model="ruleForm.activityDetails" placeholder="请输入活动详情"></el-input>
+          <el-input type="textarea" :rows="6" v-model="ruleForm.activityDetails" placeholder="请输入活动详情"></el-input>
         </el-form-item>
         <el-form-item label="活动奖品" prop="courtesyReward">
           <div style="display: flex">
@@ -679,27 +679,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    // submitForm() {
-    //   // this.form.activeNewlywedsChildList
-    //   this.form.activeNewlywedsChildList = this.form.tableDatas.concat(this.tableDatas);
-    //   this.$refs["form"].validate(valid => {
-    //     if (valid) {
-    //       if (this.form.id != null) {
-    //         updateActiveNewlyweds(this.form).then(response => {
-    //           this.$modal.msgSuccess("修改成功");
-    //           this.open = false;
-    //           this.getList();
-    //         });
-    //       } else {
-    //         addActiveNewlyweds(this.form).then(response => {
-    //           this.$modal.msgSuccess("新增成功");
-    //           this.open = false;
-    //           this.getList();
-    //         });
-    //       }
-    //     }
-    //   });
-    // },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -721,6 +701,11 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.app-open{
+  background: #f9f9f9;
+  box-sizing: border-box;
+  padding: 10px;
+}
 .box-bt {
   width: 100%;
   display: flex;
@@ -739,7 +724,7 @@ export default {
 
 .cot-box {
   width: 100%;
-  height: 89vh;
+  height: 87vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue
index f68a2e3bf..4df6e600e 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/birthday.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-open">
 
     <div class="cot-box">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" style="width: 70%;margin: 0 auto">
@@ -41,11 +41,11 @@
           <div>
             <el-button type="text" @click="ifWrite = !ifWrite">编辑</el-button>
           </div>
-          <el-input type="textarea" :disabled="ifWrite" v-model="ruleForm.noticeContent"
+          <el-input type="textarea" :rows="4" :disabled="ifWrite" v-model="ruleForm.noticeContent"
                     placeholder="请输入通知内容"></el-input>
         </el-form-item>
         <el-form-item label="活动详情" prop="activityDetails">
-          <el-input type="textarea" v-model="ruleForm.activityDetails" placeholder="请输入活动详情"></el-input>
+          <el-input type="textarea" :rows="4" v-model="ruleForm.activityDetails" placeholder="请输入活动详情"></el-input>
         </el-form-item>
         <el-form-item label="适用会员等级" prop="userGradeId">
           <el-select v-model="ruleForm.userGradeId" clearable multiple placeholder="请选择会员等级（多选）" style="width: 100%">
@@ -702,28 +702,7 @@ export default {
 
       });
     },
-    /** 提交按钮 */
-    // submitForm() {
-    //   // this.form.activeNewlywedsChildList
-    //   this.form.activeNewlywedsChildList = this.form.tableDatas.concat(this.tableDatas);
-    //   this.$refs["form"].validate(valid => {
-    //     if (valid) {
-    //       if (this.form.id != null) {
-    //         updateActiveNewlyweds(this.form).then(response => {
-    //           this.$modal.msgSuccess("修改成功");
-    //           this.open = false;
-    //           this.getList();
-    //         });
-    //       } else {
-    //         addActiveNewlyweds(this.form).then(response => {
-    //           this.$modal.msgSuccess("新增成功");
-    //           this.open = false;
-    //           this.getList();
-    //         });
-    //       }
-    //     }
-    //   });
-    // },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -763,7 +742,7 @@ export default {
 
 .cot-box {
   width: 100%;
-  height: 89vh;
+  height: 87vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
@@ -789,5 +768,9 @@ export default {
 .acvtive {
   color: #FF770F !important;
 }
-
+.app-open{
+  background: #f9f9f9;
+  box-sizing: border-box;
+  padding: 10px;
+}
 </style>
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue
index 4e966c51e..74408452b 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/invite.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-open">
 
     <div class="cot-box">
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="90px" style="width: 70%;margin: 0 auto">
@@ -35,11 +35,11 @@
           <div>
             <el-button type="text" @click="ifWrite = !ifWrite">编辑</el-button>
           </div>
-          <el-input type="textarea" :disabled="ifWrite" v-model="ruleForm.noticeContent"
+          <el-input type="textarea" :rows="6" :disabled="ifWrite" v-model="ruleForm.noticeContent"
                     placeholder="请输入通知内容"></el-input>
         </el-form-item>
         <el-form-item label="活动详情" prop="activityDetails">
-          <el-input type="textarea" v-model="ruleForm.activityDetails" placeholder="请输入活动详情"></el-input>
+          <el-input type="textarea" :rows="6" v-model="ruleForm.activityDetails" placeholder="请输入活动详情"></el-input>
         </el-form-item>
         <el-form-item label="活动奖品" prop="rewardDisplay">
           <div style="display: flex">
@@ -683,27 +683,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    // submitForm() {
-    //   // this.form.activeNewlywedsChildList
-    //   this.form.activeNewlywedsChildList = this.form.tableDatas.concat(this.tableDatas);
-    //   this.$refs["form"].validate(valid => {
-    //     if (valid) {
-    //       if (this.form.id != null) {
-    //         updateActiveNewlyweds(this.form).then(response => {
-    //           this.$modal.msgSuccess("修改成功");
-    //           this.open = false;
-    //           this.getList();
-    //         });
-    //       } else {
-    //         addActiveNewlyweds(this.form).then(response => {
-    //           this.$modal.msgSuccess("新增成功");
-    //           this.open = false;
-    //           this.getList();
-    //         });
-    //       }
-    //     }
-    //   });
-    // },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
@@ -743,7 +723,7 @@ export default {
 
 .cot-box {
   width: 100%;
-  height: 89vh;
+  height: 87vh;
   border-radius: 8px;
   background: #fff;
   box-sizing: border-box;
@@ -769,5 +749,9 @@ export default {
 .acvtive {
   color: #FF770F !important;
 }
-
+.app-open{
+  background: #f9f9f9;
+  box-sizing: border-box;
+  padding: 10px;
+}
 </style>