Merge branch 'develop/3.1.2' into test

src/views/device/category/index.vue

@@ -14,8 +14,9 @@
       <el-table-column label="分类名称" prop="name" align="center" />
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.status === 1 ? '' : 'danger'">{{ selectDictLabel(statusOptions, scope.row.status)
-          }}</el-tag>
+          <el-tag :type="scope.row.status === 1 ? '' : 'danger'">
+            {{ selectDictLabel(statusOptions, scope.row.status) }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center">

src/views/device/class/detail.vue

@@ -85,7 +85,7 @@
           </el-col>
         </el-row>
         <el-form-item v-if="[1, 3].includes(i.type)" label="引导页：">
-          <Editor v-model="i.guidePageContent" :min-height="250" :readonly="disabled" />
+          <Editor v-model="i.guidePageContent" :min-height="250" :readOnly="disabled" />
         </el-form-item>
         <el-link class="el-icon-close" v-if="form.typeList.length > 1" :underline="false"
           @click="getDelete(i.type, index)" :disabled="disabled" />