Merge branch 'dev' into 'master'

Dev

See merge request !40

src/views/home/navMenu.vue

@@ -259,7 +259,7 @@ export default {
             {
             {
               id: 10,
               id: 10,
               path: '',
               path: '',
-              label: '商品值管理',
+              label: '属性值管理',
               icon: 'el-icon-box',
               icon: 'el-icon-box',
               index: '/saas/sku-manage',
               index: '/saas/sku-manage',
               children: []
               children: []

src/views/system/sku-manage.vue

@@ -45,6 +45,7 @@
               placeholder="请选择">
               placeholder="请选择">
               <el-option label="颜色" value="Color"></el-option>
               <el-option label="颜色" value="Color"></el-option>
               <el-option label="尺寸" value="Size"></el-option>
               <el-option label="尺寸" value="Size"></el-option>
+              <el-option label="其他" value="Other"></el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
 
 
@@ -137,6 +138,7 @@
             placeholder="请选择">
             placeholder="请选择">
             <el-option label="颜色" value="Color"></el-option>
             <el-option label="颜色" value="Color"></el-option>
             <el-option label="尺寸" value="Size"></el-option>
             <el-option label="尺寸" value="Size"></el-option>
+            <el-option label="其他" value="Other"></el-option>
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item label="排序序号" prop="sort">
         <el-form-item label="排序序号" prop="sort">
@@ -266,6 +268,21 @@ export default {
 
 
         { label: '排列序号', key: 'sort', width: 80 },
         { label: '排列序号', key: 'sort', width: 80 },
         {
         {
+          label: '是否带电池',
+          key: 'battery',
+          render: (item) => <span>{item.battery ? '是' : '否'}</span>
+        },
+        {
+          label: '是否液体',
+          key: 'liquid',
+          render: (item) => <span>{item.liquid ? '是' : '否'}</span>
+        },
+        {
+          label: '是否刀具',
+          key: 'knife',
+          render: (item) => <span>{item.knife ? '是' : '否'}</span>
+        },
+        {
           label: '文字色',
           label: '文字色',
           key: 'fontColor',
           key: 'fontColor',
           width: 80,
           width: 80,