Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/common/choiceZhuanti.vue

@@ -4,8 +4,8 @@
         @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55">
         </el-table-column>
-        <el-table-column prop="name" label="名称">
-            <template slot-scope="scope">{{ scope.row.TopicName }}</template>
+        <el-table-column prop="Title" label="名称">
+            <template slot-scope="scope">{{ scope.row.Title }}</template>
         </el-table-column>
     </el-table>
     <el-pagination background @current-change="handleCurrentChange" :page-size="msgFenlei.pageSize"

src/components/sallCenter/plugin/topic.vue

@@ -394,14 +394,14 @@
           let topic_list = [];
           ckedArr.forEach(x=>{
             topic_list.push({
-              title: x.TopicName,
+              title: x.Title,
               cover_pic: x.CoverImg,
               read_count: x.ReadNum,
               // layout: list[i].layout,
               id: x.Id
             });
           })
-        topic_list = JSON.parse(JSON.stringify(topic_list));
+          topic_list = JSON.parse(JSON.stringify(topic_list));
         if(this.isTopicCheck==2){
           if (this.data.list && this.data.list.length > 0) {
             this.data.list[this.cat_index].children = this.data.list[this.cat_index].children.concat(topic_list);