Browse Source

修复 bug 活动/公告页面

魏熙美 6 years ago
parent
commit
f9d091f074

+ 12
- 12
CODE/foreign-service/src/main/java/com/community/huiju/controller/FSController.java View File

@@ -24,10 +24,10 @@ public class FSController extends BaseController {
24 24
     @ApiImplicitParams({
25 25
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
26 26
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
27
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
28
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
29
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
30
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
27
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
28
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
29
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
30
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
31 31
     })
32 32
     public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo,
33 33
                                            @RequestParam(value = "communityId") Integer communityId) {
@@ -41,10 +41,10 @@ public class FSController extends BaseController {
41 41
     @ApiImplicitParams({
42 42
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
43 43
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
44
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
45
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
46
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
47
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
44
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
45
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
46
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
47
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
48 48
     })
49 49
     public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo,
50 50
                                                     @RequestParam(value = "communityId") Integer communityId) {
@@ -58,10 +58,10 @@ public class FSController extends BaseController {
58 58
     @ApiImplicitParams({
59 59
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
60 60
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
61
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
62
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
63
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
64
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
61
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
62
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
63
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
64
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
65 65
     })
66 66
     public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo,
67 67
                                                          @RequestParam(value = "communityId") Integer communityId) {

+ 51
- 47
VUECODE/smart-property-manage/src/views/social/activity/add/index.vue View File

@@ -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="150px" class="ruleForm">
4
-      <el-form-item  prop="activityTitle">
5
-        <div>活动标题&nbsp;&nbsp;<el-input v-model="ruleForm.activityTitle" placeholder="20字以内" style="width: 80%;padding-left:5.5%;"/></div>
3
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="left" label-width="180px" class="ruleForm">
4
+      <el-form-item label="活动标题" prop="activityTitle">
5
+        <el-input v-model="ruleForm.activityTitle" placeholder="20字以内" style="width: 620px;"/>
6 6
       </el-form-item>
7
-      <el-form-item  prop="activityCarouselImg">
7
+      <el-form-item label="活动轮播图" prop="activityCarouselImg">
8 8
         <div >
9
-        <div style="transform:translateY(250%);">活动轮播图</div>
10
-        <div  style="width: 500px;padding-left:14%;">
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>
21
-        </div>
9
+          <el-upload
10
+            :show-file-list="false"
11
+            :on-success="handleAvatarSuccess"
12
+            :before-upload="beforeAvatarUpload"
13
+            :action="uploadImgUrl"
14
+            class="avatar-uploader"
15
+            name="uploadFiles">
16
+            <img v-if="imageUrl" :src="imageUrl" class="avatar">
17
+            <i v-else class="el-icon-plus avatar-uploader-icon"/>
18
+          </el-upload>
22 19
         </div>
23 20
       </el-form-item>
24
-      <el-form-item>
25
-        <span style="transform:translateY(700%)">活动详情描述</span>
26
-       <div style="padding-left:14%;transform:translateY(-15%)"><wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
27
-      </el-form-item> 
21
+      <el-form-item label="活动详情描述" prop="activityContent">
22
+        <div style="transform:translateY(-15%); margin-top: 60px;"><wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
23
+      </el-form-item>
28 24
       <!-- <el-form-item>
29 25
         <div >
30 26
           <div style="transform:translateY(250%);">活动配图</div>
@@ -44,15 +40,13 @@
44 40
           <img :src="dialogImageUrl" width="100%" alt="">
45 41
         </el-dialog>
46 42
       </el-form-item> -->
47
-      <el-form-item prop="signUpMax">
48
-        <div style="display: flex;">
49
-          <span style="width: 140px;">报名人数上限</span>
50
-          <el-input v-model="ruleForm.signUpMax" placeholder="填写0则不限制报名人数"/>
43
+      <el-form-item label="报名人数上限" prop="signUpMax">
44
+        <div style="display: flex; width: 620px; justify-content: flex-end;">
45
+          <el-input v-model="ruleForm.signUpMax" style="width: 220px;" placeholder="填写0则不限制报名人数"/>
51 46
         </div>
52 47
       </el-form-item>
53
-      <el-form-item prop="registrationEndTime">
54
-        <div style="display: flex;">
55
-          <span style="width: 120px;">报名截止时间</span>
48
+      <el-form-item label="报名截止时间" prop="registrationEndTime">
49
+        <div style="display: flex; width: 620px; justify-content: flex-end;">
56 50
           <el-date-picker
57 51
             v-model="ruleForm.registrationEndTime"
58 52
             value-format="timestamp"
@@ -60,20 +54,24 @@
60 54
             placeholder="选择日期"/>
61 55
         </div>
62 56
       </el-form-item>
63
-      <el-form-item>
64
-        <div style="display: flex;">
65
-          <span style="width: 200px;transform:translateY(1%);">是否需要报名人扫码签到</span>
57
+      <el-form-item label="是否需要报名人扫码签到" prop="radio">
58
+        <div style="display: flex; width: 620px; justify-content: flex-end;">
66 59
           <el-radio v-model="ruleForm.radio" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(30%);">需要</el-radio>
67
-          <el-radio v-model="ruleForm.radio" label="2" style="padding-left:6%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio>  
60
+          <el-radio v-model="ruleForm.radio" label="2" style="padding-left:6%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio>
68 61
         </div>
69 62
       </el-form-item>
70
-      <el-form-item prop="sort">
71
-        <div style="display: flex; justify-content: flex-start;">
72
-          <span style="width: 120px;">权重值</span>
63
+      <div style="width: 500px;">
64
+        <span style="color: darkgray;">选择扫码签到,活动发布后点击活动详情可以下载二维码图片,打印图片放置到活动现场,参加活动的用户即可扫码签到,方便统计活动实际参与人数。</span>
65
+      </div>
66
+      <el-form-item label="权重值" prop="sort" style="margin-top: 20px;">
67
+        <div style="display: flex; width: 620px; justify-content: flex-end;">
73 68
           <el-input-number v-model="ruleForm.sort" :min="1" label="权重值" @change="sortHandleChange"/>
74 69
         </div>
75 70
       </el-form-item>
76
-      <el-form-item style="display: flex; justify-content: center;">
71
+      <div style="width: 500px;">
72
+        <span style="color: darkgray;">权重值越大,在活动列表中排序越靠前,权重相同时按发布时间排序</span>
73
+      </div>
74
+      <el-form-item style="display: flex; justify-content: center; margin-top: 20px;">
77 75
         <el-button type="primary" @click="resetForm('ruleForm')">存为草稿</el-button>
78 76
         <el-button type="primary" @click="submitForm('ruleForm')">发布</el-button>
79 77
       </el-form-item>
@@ -97,7 +95,7 @@ export default {
97 95
         registrationEndTime: '', // 报名活动结束时间
98 96
         sort: 1, // 权重
99 97
         status: '', // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
100
-        radio:''
98
+        radio: ''
101 99
       },
102 100
       imageUrl: '', // 轮播图预览
103 101
       dialogVisible: false, // 活动配图, 默认不显示 (以单张为单位)
@@ -118,9 +116,15 @@ export default {
118 116
         ],
119 117
         sort: [
120 118
           { required: true, message: '请输入权重值', trigger: 'change' }
119
+        ],
120
+        activityCarouselImg: [
121
+          { required: true, message: '轮播图未上传', trigger: 'blur' }
122
+        ],
123
+        radio: [
124
+          { required: true, message: '请选择是否需要报名人扫码签到', trigger: 'blur' }
121 125
         ]
122 126
       },
123
-      uploadImgUrl: process.env.BASE_API + '/uploadimage',
127
+      uploadImgUrl: process.env.BASE_API + '/uploadimage'
124 128
     }
125 129
   },
126 130
   methods: {
@@ -194,13 +198,13 @@ export default {
194 198
         loading.close()
195 199
         return
196 200
       }
197
-       console.log('this.ruleForm.activityContent',this.ruleForm.activityContent)
198
-       if(this.ruleForm.activityContent == '<p><br></p>'){
199
-             this.$message.error('活动详情描述不能为空!')
200
-             loading.close()
201
-             return
202
-          }
203
-      if (this.ruleForm.activityContent =='') {
201
+      console.log('this.ruleForm.activityContent', this.ruleForm.activityContent)
202
+      if (this.ruleForm.activityContent === '<p><br></p>') {
203
+        this.$message.error('活动详情描述不能为空!')
204
+        loading.close()
205
+        return
206
+      }
207
+      if (this.ruleForm.activityContent === '') {
204 208
         this.$message.error('活动详情描述不能为空')
205 209
         loading.close()
206 210
         return
@@ -225,8 +229,8 @@ export default {
225 229
     },
226 230
     // 富文本
227 231
     wangeditorValue(value) {
228
-    console.log('value',value)
229
-    this.ruleForm.activityContent = value // 在这里接受子组件传过来的参数,赋值给data里的参数
232
+      console.log('value', value)
233
+      this.ruleForm.activityContent = value // 在这里接受子组件传过来的参数,赋值给data里的参数
230 234
     }
231 235
   }
232 236
 }

+ 54
- 48
VUECODE/smart-property-manage/src/views/social/activity/edi/index.vue View File

@@ -1,29 +1,27 @@
1 1
 <template>
2 2
   <div id="root">
3
-    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
4
-      <el-form-item  prop="activityTitle">
5
-        <div>活动标题&nbsp;&nbsp;<el-input v-model="ruleForm.activityTitle" placeholder="15字以内" style="width: 80%;padding-left:5.8%;"/></div>
3
+    <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="left" label-width="180px" class="ruleForm">
4
+      <el-form-item label="活动标题" prop="activityTitle">
5
+        <el-input v-model="ruleForm.activityTitle" placeholder="15字以内"/>
6 6
       </el-form-item>
7
-      <el-form-item  prop="activityCarouselImg">
7
+      <el-form-item label="活动轮播图" prop="activityCarouselImg">
8 8
         <div >
9
-          <div style="transform:translateY(250%);">活动轮播图</div>
10
-        <div  style="width: 500px;padding-left:15%;">
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>
21
-        </div>
9
+          <div style="width: 500px;">
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="imageUrl" :src="imageUrl" class="avatar">
18
+              <i v-else class="el-icon-plus avatar-uploader-icon"/>
19
+            </el-upload>
20
+          </div>
22 21
         </div>
23 22
       </el-form-item>
24
-      <el-form-item>
25
-       <span style="transform:translateY(700%)">活动详情描述</span>
26
-       <div style="padding-left:15%;transform:translateY(-15%)"><wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
23
+      <el-form-item label="活动详情描述" prop="activityContent">
24
+        <div style="transform:translateY(-15%); margin-top: 60px;"><wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
27 25
       </el-form-item>
28 26
       <!-- <el-form-item >
29 27
         <div >
@@ -45,15 +43,13 @@
45 43
           <img :src="dialogImageUrl" width="100%" alt="">
46 44
         </el-dialog>
47 45
       </el-form-item> -->
48
-      <el-form-item prop="signUpMax">
49
-        <div style="display: flex;">
50
-          <span style="width: 140px;">报名人数上限</span>
51
-          <el-input v-model="ruleForm.signUpMax" placeholder="填写0则不限制报名人数"/>
46
+      <el-form-item label="报名人数上限" prop="signUpMax">
47
+        <div style="display: flex; width: 620px; justify-content: flex-end;">
48
+          <el-input v-model="ruleForm.signUpMax" style="width: 220px;" placeholder="填写0则不限制报名人数"/>
52 49
         </div>
53 50
       </el-form-item>
54
-      <el-form-item prop="registrationEndTime">
55
-        <div style="display: flex;">
56
-          <span style="width: 120px;">报名截止时间</span>
51
+      <el-form-item label="报名截止时间" prop="registrationEndTime">
52
+        <div style="display: flex; width: 620px; justify-content: flex-end;">
57 53
           <el-date-picker
58 54
             v-model="ruleForm.registrationEndTime"
59 55
             value-format="timestamp"
@@ -61,20 +57,24 @@
61 57
             placeholder="选择日期"/>
62 58
         </div>
63 59
       </el-form-item>
64
-      <el-form-item>
65
-      <div style="display: flex;">
66
-          <span style="width: 200px;transform:translateY(-1%);">是否需要报名人扫码签到</span>
60
+      <el-form-item label="是否需要报名人扫码签到" prop="signInCode">
61
+        <div style="display: flex; width: 620px; justify-content: flex-end;">
67 62
           <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(30%);">需要</el-radio>
68
-          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio> 
69
-      </div>
63
+          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio>
64
+        </div>
70 65
       </el-form-item>
71
-      <el-form-item prop="sort">
72
-        <div style="display: flex; justify-content: flex-start;">
73
-          <span style="width: 120px;">权重值</span>
66
+      <div style="width: 500px;">
67
+        <span style="color: darkgray;">选择扫码签到,活动发布后点击活动详情可以下载二维码图片,打印图片放置到活动现场,参加活动的用户即可扫码签到,方便统计活动实际参与人数。</span>
68
+      </div>
69
+      <el-form-item prop="sort" label="权重值" style="margin-top: 20px;">
70
+        <div style="display: flex; width: 620px;  justify-content: flex-end;">
74 71
           <el-input-number v-model="ruleForm.sort" :min="1" label="权重值" @change="sortHandleChange"/>
75 72
         </div>
76 73
       </el-form-item>
77
-      <el-form-item style="display: flex; justify-content: center;">
74
+      <div style="width: 500px;">
75
+        <span style="color: darkgray;">权重值越大,在活动列表中排序越靠前,权重相同时按发布时间排序</span>
76
+      </div>
77
+      <el-form-item style="display: flex; justify-content: center; margin-top: 20px;">
78 78
         <el-button type="primary" @click="submitForm('ruleForm')">发布</el-button>
79 79
       </el-form-item>
80 80
     </el-form>
@@ -121,9 +121,15 @@ export default {
121 121
         ],
122 122
         sort: [
123 123
           { required: true, message: '请输入权重值', trigger: 'change' }
124
+        ],
125
+        activityCarouselImg: [
126
+          { required: true, message: '轮播图未上传', trigger: 'blur' }
127
+        ],
128
+        signInCode: [
129
+          { required: true, message: '请选择是否需要报名人扫码签到', trigger: 'blur' }
124 130
         ]
125 131
       },
126
-      uploadImgUrl: process.env.BASE_API + '/uploadimage',
132
+      uploadImgUrl: process.env.BASE_API + '/uploadimage'
127 133
     }
128 134
   },
129 135
   mounted() {
@@ -141,15 +147,15 @@ export default {
141 147
       })
142 148
       this.$refs[formName].validate((valid) => {
143 149
         if (valid) {
144
-           if (this.ruleForm.activityContent =='<p><br></p>') {
145
-           this.$message.error('活动详情描述不能为空')
146
-           loading.close()
147
-           return
150
+          if (this.ruleForm.activityContent === '<p><br></p>') {
151
+            this.$message.error('活动详情描述不能为空')
152
+            loading.close()
153
+            return
148 154
           }
149
-          if(this.ruleForm.activityContent == ''){
150
-             this.$message.error('活动详情描述不能为空!')
151
-             loading.close()
152
-             return
155
+          if (this.ruleForm.activityContent === '') {
156
+            this.$message.error('活动详情描述不能为空!')
157
+            loading.close()
158
+            return
153 159
           }
154 160
           this.ruleForm.status = 1 // 发布状态
155 161
           this.$store.dispatch('UpdateActivity', this.ruleForm).then((res) => {
@@ -207,7 +213,7 @@ export default {
207 213
     //   this.ruleForm.contentImg.push(resImg)
208 214
     //   console.log('上传活动配图成功时回调!')
209 215
     // },
210
-    
216
+
211 217
     sortHandleChange(value) { // 权重值
212 218
       this.ruleForm.sort = value
213 219
       console.log(value)
@@ -227,8 +233,8 @@ export default {
227 233
     },
228 234
     // 富文本
229 235
     wangeditorValue(value) {
230
-    this.ruleForm.activityContent = value // 在这里接受子组件传过来的参数,赋值给data里的参数
231
-    },
236
+      this.ruleForm.activityContent = value // 在这里接受子组件传过来的参数,赋值给data里的参数
237
+    }
232 238
   }
233 239
 }
234 240
 </script>

+ 14
- 14
VUECODE/smart-property-manage/src/views/social/announcement/add.vue View File

@@ -2,23 +2,23 @@
2 2
   <div id="root">
3 3
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="150px" class="ruleForm">
4 4
       <el-form-item label="公告标题" prop="announcementTitle">
5
-        <el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 704px;"/>
5
+        <el-input v-model="ruleForm.announcementTitle" placeholder="20字以内" style="width: 650px;"/>
6 6
       </el-form-item>
7 7
       <el-form-item label="公告轮播图" prop="announcementCarouselImg" >
8 8
         <span style="color: darkgray;">轮播图为横幅位展示图片,不会显示在公告详情页</span>
9 9
         <div>
10
-          <x-uploader v-model="ruleForm.announcementCarouselImg"></x-uploader>
10
+          <x-uploader v-model="ruleForm.announcementCarouselImg"/>
11 11
           <!--<div style="width: 500px;">-->
12
-            <!--<el-upload-->
13
-              <!--:show-file-list="false"-->
14
-              <!--:on-success="handleAvatarSuccess"-->
15
-              <!--:before-upload="beforeAvatarUpload"-->
16
-              <!--:action="uploadImgUrl"-->
17
-              <!--class="avatar-uploader"-->
18
-              <!--name="uploadFiles">-->
19
-              <!--<img v-if="imageUrl" :src="imageUrl" class="avatar">-->
20
-              <!--<i v-else class="el-icon-plus avatar-uploader-icon"/>-->
21
-            <!--</el-upload>-->
12
+          <!--<el-upload-->
13
+          <!--:show-file-list="false"-->
14
+          <!--:on-success="handleAvatarSuccess"-->
15
+          <!--:before-upload="beforeAvatarUpload"-->
16
+          <!--:action="uploadImgUrl"-->
17
+          <!--class="avatar-uploader"-->
18
+          <!--name="uploadFiles">-->
19
+          <!--<img v-if="imageUrl" :src="imageUrl" class="avatar">-->
20
+          <!--<i v-else class="el-icon-plus avatar-uploader-icon"/>-->
21
+          <!--</el-upload>-->
22 22
           <!--</div>-->
23 23
         </div>
24 24
       </el-form-item>
@@ -49,7 +49,7 @@
49 49
       </el-form-item> -->
50 50
       <el-form-item label="权重值" prop="sort">
51 51
         <span style="color: darkgray;">权重值越大,在活动列表中排序越靠前,权重相同时按发布时间排序</span>
52
-        <el-input-number v-model="ruleForm.sort" label="权重值" style="margin-left:5%" @change="sortHandleChange"/>
52
+        <el-input-number v-model="ruleForm.sort" label="权重值" style="margin-left:7%" @change="sortHandleChange"/>
53 53
       </el-form-item>
54 54
       <el-form-item style="margin-left:11.5%">
55 55
         <el-button @click="resetForm('ruleForm','2')">存为草稿</el-button>
@@ -200,7 +200,7 @@ export default {
200 200
 }
201 201
 </script>
202 202
 
203
-<style>
203
+<style scoped>
204 204
 #root {
205 205
   display: flex;
206 206
 }

+ 6
- 2
VUECODE/smart-property-manage/src/views/social/announcement/edit.vue View File

@@ -47,7 +47,7 @@
47 47
       </el-form-item> -->
48 48
       <el-form-item label="权重值" prop="sort">
49 49
         <span style="color: darkgray;">权重值越大,在活动列表中排序越靠前,权重相同时按发布时间排序</span>
50
-        <el-input-number v-model="ruleForm.sort" label="权重值" style="margin-left:5%" @change="sortHandleChange"/>
50
+        <el-input-number v-model="ruleForm.sort" label="权重值" style="margin-left:13%" @change="sortHandleChange"/>
51 51
       </el-form-item>
52 52
       <el-form-item style="margin-left:12%">
53 53
         <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
@@ -85,6 +85,9 @@ export default {
85 85
         ],
86 86
         sort: [
87 87
           { required: true, message: '请输入权重值', trigger: 'change' }
88
+        ],
89
+        announcementCarouselImg: [
90
+          { required: true, message: '轮播图未上传', trigger: 'blur' }
88 91
         ]
89 92
       },
90 93
       uploadImgUrl: process.env.BASE_API + '/uploadimage'
@@ -181,7 +184,8 @@ export default {
181 184
         console.log('resData', res)
182 185
         this.ruleForm.announcementTitle = resData.tpAnnouncement.announcementTitle// 标题
183 186
         this.ruleForm.announcementContent = resData.tpAnnouncement.announcementContent// 内容
184
-        this.Urlimage = resData.tpAnnouncement.announcementCarouselImg // 轮播图
187
+        this.Urlimage = resData.tpAnnouncement.announcementCarouselImg // 轮播图预览
188
+        this.ruleForm.announcementCarouselImg = resData.tpAnnouncement.announcementCarouselImg // 轮播图
185 189
         this.ruleForm.sort = resData.tpAnnouncement.sort// 权重
186 190
       })
187 191
     },