Merge branch 'dev-Iteration3-0513' into release

src/views/discuss/add-edit.vue

@@ -66,7 +66,12 @@
 						</div>
 						
 					</el-form-item>
-						<el-form-item label="话题详情页评论文案" required label-width="140px">
+					<el-form-item label="话题列表页标题文案"  label-width="140px">
+						<div>
+							<el-input v-model="form.commentListDetails" size="mini" style="width: 100px;"  :maxLength="maxBtn"></el-input>
+						</div>
+					</el-form-item>
+					<el-form-item label="话题详情页话题文案"  label-width="140px">
 						<div>
 							<el-input v-model="form.commentDetails" size="mini" style="width: 100px;"  :maxLength="maxBtn"></el-input>
 						</div>
@@ -125,6 +130,7 @@ export default {
 				topicBtnText:'发布话题',
 				commentBtnText:'发布评论',
 				commentDetails:'全部评论',
+				commentListDetails: '热门话题',
 				displayTopicBtn:true,//是否显示发布话题按钮
 				dispalyCommentBtn:true,//是否显示评论按钮
 				remark:'',
@@ -199,11 +205,6 @@ export default {
 					this.showError('请输入二级页按钮文字');
 					return;
 			}
-
-			if(this.form.commentDetails == ''){
-					this.showError('话题详情页评论文案');
-					return;
-			}
 			
 			auditRules = Number(this.form.wz) + Number(this.form.tp)
 
@@ -212,6 +213,7 @@ export default {
 				"auditrules": auditRules,
 				"commentbtntext": this.form.commentBtnText,
 				"commentDetails": this.form.commentDetails,
+				'commentListDetails': this.form.commentListDetails,
 				//"deleteflag": 0,
 				//"derivedid": 0,
 				"category": this.form.deriverName,
@@ -268,6 +270,7 @@ export default {
 			        this.form.topicBtnText = res.data.topicbtntext == null ? '' : res.data.topicbtntext
 							this.form.commentBtnText = res.data.commentbtntext
 							this.form.commentDetails = res.data.commentDetails
+							this.form.commentListDetails = res.data.commentListDetails
 							this.form.remark = res.data.remark
 							
 							//开放客群