Merge remote-tracking branch 'remotes/origin/xie'

# Conflicts:
#	src/components/page/articleAdd.vue

src/components/page/journallist.vue

@@ -10,7 +10,7 @@
 		<div class="container">
 			<div class="handle-box">
 				<el-button type="primary" icon="el-icon-plus" @click="addJournal">Add Journal</el-button>
-			</div>
+			</div>			
 			<el-table :data="tableData" border stripe class="table" ref="multipleTable"
 				header-cell-class-name="table-header" empty-text="New messages (0)">
 				<el-table-column prop="journal_id" label="ID" align="center" width="40"></el-table-column>