Pārlūkot izejas kodu

修复 活动样式

魏熙美 6 gadus atpakaļ
vecāks
revīzija
0b6f6f15e5

+ 3
- 3
VUECODE/smart-property-manage/src/views/social/activity/index.vue Parādīt failu

@@ -1,7 +1,7 @@
1 1
 
2 2
 <template>
3 3
   <div id="root">
4
-    <el-form :inline="true" :model="listQuery" label-width="80px" class="form-inline">
4
+    <el-form :inline="true" :model="listQuery" label-width="80px" style="height: 40px;">
5 5
       <el-form-item label="活动编号">
6 6
         <el-input v-model="listQuery.id" placeholder="活动编号"/>
7 7
       </el-form-item>
@@ -16,7 +16,7 @@
16 16
         <el-button type="primary" @click="onSubmit">查询</el-button>
17 17
       </el-form-item>
18 18
     </el-form>
19
-    <div>
19
+    <div style="height: 40px; margin-top: 20px; margin-left: 10px;">
20 20
       <el-button type="primary" @click="addActivity">添加</el-button>
21 21
       <el-button type="warning" @click="ediActivity">修改</el-button>
22 22
       <el-button type="danger" @click="invalidActivity">作废</el-button>
@@ -26,7 +26,7 @@
26 26
       ref="multipleTable"
27 27
       :data="list"
28 28
       tooltip-effect="dark"
29
-      style="width: 100%; margin-top: 20px;"
29
+      style="width: 100%; margin-top: 25px;"
30 30
       border
31 31
       @selection-change="handleSelectionChange">
32 32
       <el-table-column

+ 38
- 37
VUECODE/smart-property-manage/src/views/social/announcement/add.vue Parādīt failu

@@ -1,30 +1,28 @@
1 1
 <template>
2 2
   <div id="root">
3
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="50px" class="ruleForm">
4
-      <el-form-item  prop="announcementTitle">
5
-        <div>公告标题&nbsp;&nbsp;<el-input v-model="ruleForm.announcementTitle" placeholder="20字以内"  style="width: 80%;padding-left:3.5%;"/></div>    
3
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="ruleForm">
4
+      <el-form-item label="公告标题" prop="announcementTitle">
5
+        <el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 704px;"/>
6 6
       </el-form-item>
7
-      <el-form-item  prop="announcementCarouselImg" >
8
-        <div >
9
-          <div style="transform:translateY(250%);">公告轮播图</div>
10
-        <div  style="width: 500px;padding-left:12%;">
11
-        <el-upload 
12
-          :show-file-list="false"
13
-          :on-success="handleAvatarSuccess"
14
-          :before-upload="beforeAvatarUpload"
15
-          class="avatar-uploader"
16
-          name="uploadFiles"
17
-          :action="uploadImgUrl">
18
-          <img v-if="imageUrl" :src="imageUrl" class="avatar">
19
-          <i v-else class="el-icon-plus avatar-uploader-icon"/>
20
-        </el-upload>
7
+      <el-form-item label="公告轮播图" prop="announcementCarouselImg" >
8
+        <span style="color: darkgray;">轮播图为横幅位展示图片,不会显示在公告详情页</span>
9
+        <div>
10
+          <div style="width: 500px;">
11
+            <el-upload
12
+              :show-file-list="false"
13
+              :on-success="handleAvatarSuccess"
14
+              :before-upload="beforeAvatarUpload"
15
+              :action="uploadImgUrl"
16
+              class="avatar-uploader"
17
+              name="uploadFiles">
18
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
19
+              <i v-else class="el-icon-plus avatar-uploader-icon"/>
20
+            </el-upload>
21 21
           </div>
22 22
         </div>
23 23
       </el-form-item>
24
-      <el-form-item label="" prop="announcementContent">     
25
-          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
26
-          <span style="transform:translateY(700%)">公告内容</span>
27
-          <div style="padding-left:12%;transform:translateY(-15%)"><span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>                          
24
+      <el-form-item label="公告内容" prop="announcementContent">
25
+        <div style="transform:translateY(-15%);margin-top: 60px;"><span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>
28 26
       </el-form-item>
29 27
       <!-- <el-form-item label="">
30 28
         <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>
@@ -48,9 +46,9 @@
48 46
           <img :src="dialogImageUrl" width="100%" alt="">
49 47
         </el-dialog>
50 48
       </el-form-item> -->
51
-      <el-form-item  prop="sort">
52
-        <div>权重值&nbsp;&nbsp;<el-input-number  v-model="ruleForm.sort" label="权重值" @change="sortHandleChange" style="margin-left:5%"/></div>
53
-        
49
+      <el-form-item label="权重值" prop="sort">
50
+        <span style="color: darkgray;">权重值越大,在活动列表中排序越靠前,权重相同时按发布时间排序</span>
51
+        <el-input-number v-model="ruleForm.sort" label="权重值" style="margin-left:5%" @change="sortHandleChange"/>
54 52
       </el-form-item>
55 53
       <el-form-item style="margin-left:11.5%">
56 54
         <el-button @click="resetForm('ruleForm','2')">存为草稿</el-button>
@@ -84,13 +82,16 @@ export default {
84 82
           { min: 1, max: 20, message: '长度在 20 个字符以内', trigger: 'blur' }
85 83
         ],
86 84
         announcementContent: [
87
-          { required: false, message: '公告内容描述', trigger: 'blur' }
85
+          { required: true, message: '公告内容描述', trigger: 'blur' }
88 86
         ],
89 87
         sort: [
90 88
           { required: true, message: '请输入权重值', trigger: 'change' }
89
+        ],
90
+        announcementCarouselImg: [
91
+          { required: true, message: '轮播图未上传', trigger: 'blur' }
91 92
         ]
92 93
       },
93
-      uploadImgUrl: process.env.BASE_API + '/uploadimage',
94
+      uploadImgUrl: process.env.BASE_API + '/uploadimage'
94 95
     }
95 96
   },
96 97
   methods: {
@@ -105,26 +106,26 @@ export default {
105 106
       })
106 107
       this.$refs[formName].validate((valid) => {
107 108
         if (valid) {
108
-          if(this.ruleForm.announcementCarouselImg<=0){
109
+          if (this.ruleForm.announcementCarouselImg <= 0) {
109 110
             this.$message.error('轮播图未上传')
110
-            return    
111
+            return
111 112
           }
112 113
           // if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
113 114
           //   this.$message.error('公告内容描述 和 公告配图至少要存在一个!')
114 115
           //   return
115 116
           // }
116 117
           this.ruleForm.status = status // 发布状态
117
-          console.log('this.ruleForm.announcementContent',this.ruleForm.announcementContent)
118
+          console.log('this.ruleForm.announcementContent', this.ruleForm.announcementContent)
118 119
 
119
-          if(this.ruleForm.announcementContent == '<p><br></p>'){
120
-             this.$message.error('公告内容描述不能为空!')
121
-             loading.close()
122
-             return
120
+          if (this.ruleForm.announcementContent === '<p><br></p>') {
121
+            this.$message.error('公告内容描述不能为空!')
122
+            loading.close()
123
+            return
123 124
           }
124
-         if(this.ruleForm.announcementContent == ''){
125
-             this.$message.error('公告内容描述不能为空!')
126
-             loading.close()
127
-             return
125
+          if (this.ruleForm.announcementContent === '') {
126
+            this.$message.error('公告内容描述不能为空!')
127
+            loading.close()
128
+            return
128 129
           }
129 130
           this.$store.dispatch('AddAnnouncement', this.ruleForm).then((res) => {
130 131
             if (res.code === '0') {

+ 33
- 36
VUECODE/smart-property-manage/src/views/social/announcement/edit.vue Parādīt failu

@@ -1,30 +1,26 @@
1 1
 <template>
2 2
   <div id="root">
3
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="50px" class="ruleForm">
4
-      <el-form-item  prop="announcementTitle">
5
-        <div>公告标题&nbsp;&nbsp;<el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 80%;padding-left:3.5%;"/></div>
3
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="ruleForm">
4
+      <el-form-item label="公告标题" prop="announcementTitle">
5
+        <el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 704px;"/>
6 6
       </el-form-item>
7
-      <el-form-item  prop="announcementCarouselImg">
8
-        <div >
9
-          <div style="transform:translateY(250%);">公告轮播图</div>
10
-          <div  style="width: 500px;padding-left:12%;">
11
-        <el-upload
12
-          :show-file-list="false"
13
-          :on-success="handleAvatarSuccess"
14
-          :before-upload="beforeAvatarUpload"
15
-          class="avatar-uploader"
16
-          name="uploadFiles"
17
-          :action="uploadImgUrl">
18
-          <img v-if="Urlimage" :src="Urlimage" class="avatar">
19
-          <i v-else class="el-icon-plus avatar-uploader-icon"/>
20
-        </el-upload>
21
-        </div>
7
+      <el-form-item label="公告轮播图" prop="announcementCarouselImg">
8
+        <span style="color: darkgray;">轮播图为横幅位展示图片,不会显示在公告详情页</span>
9
+        <div>
10
+          <el-upload
11
+            :show-file-list="false"
12
+            :on-success="handleAvatarSuccess"
13
+            :before-upload="beforeAvatarUpload"
14
+            :action="uploadImgUrl"
15
+            class="avatar-uploader"
16
+            name="uploadFiles">
17
+            <img v-if="Urlimage" :src="Urlimage" class="avatar">
18
+            <i v-else class="el-icon-plus avatar-uploader-icon"/>
19
+          </el-upload>
22 20
         </div>
23 21
       </el-form-item>
24
-      <el-form-item label="" prop="announcementContent">     
25
-          <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
26
-          <span style="transform:translateY(700%)">公告内容</span>
27
-          <div style="padding-left:12%;transform:translateY(-15%)"><span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>                          
22
+      <el-form-item label="公告内容" prop="announcementContent">
23
+        <div style="transform:translateY(-15%); margin-top: 60px;"><span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>
28 24
       </el-form-item>
29 25
       <!-- <el-form-item >
30 26
         <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>
@@ -49,8 +45,9 @@
49 45
           <img :src="dialogImageUrl" width="100%" alt="">
50 46
         </el-dialog>
51 47
       </el-form-item> -->
52
-      <el-form-item  prop="sort">
53
-        <div>权重值&nbsp;&nbsp;<el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange" style="margin-left:5%"/></div>
48
+      <el-form-item label="权重值" prop="sort">
49
+        <span style="color: darkgray;">权重值越大,在活动列表中排序越靠前,权重相同时按发布时间排序</span>
50
+        <el-input-number v-model="ruleForm.sort" label="权重值" style="margin-left:5%" @change="sortHandleChange"/>
54 51
       </el-form-item>
55 52
       <el-form-item style="margin-left:12%">
56 53
         <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
@@ -90,7 +87,7 @@ export default {
90 87
           { required: true, message: '请输入权重值', trigger: 'change' }
91 88
         ]
92 89
       },
93
-      uploadImgUrl: process.env.BASE_API + '/uploadimage',
90
+      uploadImgUrl: process.env.BASE_API + '/uploadimage'
94 91
     }
95 92
   },
96 93
   mounted() {
@@ -109,15 +106,15 @@ export default {
109 106
       this.$refs[formName].validate((valid) => {
110 107
         if (valid) {
111 108
           this.ruleForm.status = status // 发布状态
112
-          if(this.ruleForm.announcementContent == '<p><br></p>'){
113
-             this.$message.error('公告内容不能为空!')
114
-             loading.close()
115
-             return
109
+          if (this.ruleForm.announcementContent === '<p><br></p>') {
110
+            this.$message.error('公告内容不能为空!')
111
+            loading.close()
112
+            return
116 113
           }
117
-          if(this.ruleForm.announcementContent == ''){
118
-             this.$message.error('公告内容描述不能为空!')
119
-             loading.close()
120
-             return
114
+          if (this.ruleForm.announcementContent === '') {
115
+            this.$message.error('公告内容描述不能为空!')
116
+            loading.close()
117
+            return
121 118
           }
122 119
           this.$store.dispatch('Updateannouncement', this.ruleForm).then((res) => {
123 120
             if (res.code === '0') {
@@ -181,7 +178,7 @@ export default {
181 178
     getById() { // 页面初始化后调用此方法根据ID获取公告信息
182 179
       this.$store.dispatch('AnnouncementById', this.ruleForm).then((res) => {
183 180
         const resData = res.data
184
-        console.log('resData',res)
181
+        console.log('resData', res)
185 182
         this.ruleForm.announcementTitle = resData.tpAnnouncement.announcementTitle// 标题
186 183
         this.ruleForm.announcementContent = resData.tpAnnouncement.announcementContent// 内容
187 184
         this.Urlimage = resData.tpAnnouncement.announcementCarouselImg // 轮播图
@@ -190,8 +187,8 @@ export default {
190 187
     },
191 188
     // 富文本
192 189
     wangeditorValue(value) {
193
-    this.ruleForm.announcementContent = value // 在这里接受子组件传过来的参数,赋值给data里的参数
194
-    },
190
+      this.ruleForm.announcementContent = value // 在这里接受子组件传过来的参数,赋值给data里的参数
191
+    }
195 192
   }
196 193
 }
197 194
 </script>