Merge branch 'master' of ssh://193.200.130.186:26488/chenke/hl-web-admin

src/views/article/index.vue

@@ -146,6 +146,11 @@
                 <span>{{ row.label_name | getTagDetail }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="排序" align="center">
+              <template slot-scope="{ row }">
+                <span>{{ row.sort }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="创建时间" align="center">
               <template slot-scope="{ row }">
                 <span>{{ row.create_time }}</span>
@@ -262,6 +267,9 @@
               <el-radio :label="1">下线</el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="排序" prop="sort">
+            <el-input v-model="temp.sort" />
+          </el-form-item>
           <el-form-item label="封面" prop="img" required>
             <img
               v-if="temp.img"