Merge branch 'master' of git.caimei365.com:git_lijun/caimei-mall-admin-ui

src/router/modules/club.js

@@ -7,6 +7,7 @@ const clubRouter = {
   redirect: '/club/list',
   name: 'Club',
   meta: { title: '会所管理', icon: 'ma-club' },
+  alwaysShow: true,
   children: [
     {
       path: 'list',

src/router/modules/finance.js

@@ -7,6 +7,7 @@ const financeRouter = {
   redirect: '/finance/list',
   name: 'Finance',
   meta: { title: '财务管理', icon: 'ma-finance' },
+  alwaysShow: true,
   children: [
     {
       path: 'list',

src/router/modules/goods.js

@@ -7,6 +7,7 @@ const goodsRouter = {
   redirect: '/goods/list',
   name: 'Goods',
   meta: { title: '商品管理', icon: 'ma-goods' },
+  alwaysShow: true,
   children: [
     {
       path: 'category',

src/router/modules/order.js

@@ -7,6 +7,7 @@ const orderRouter = {
   redirect: '/order/list',
   name: 'Order',
   meta: { title: '订单管理', icon: 'ma-order' },
+  alwaysShow: true,
   children: [
     {
       path: 'list',

src/router/modules/other.js

@@ -7,6 +7,7 @@ const otherRouter = {
   redirect: '/other/about',
   name: 'Other',
   meta: { title: '其他设置', icon: 'ma-other' },
+  alwaysShow: true,
   children: [
     {
       path: 'about',

src/views/goods/category.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="sort">
         <template slot-scope="{row}">
-          <el-input v-model="row.sort" style="width:55px;" size="mini" type="number" maxlength="3" min="1" />
+          <el-input-number v-model="row.sort" controls-position="right" :min="1" :max="999" :maxlength="3" size="mini" style="width:65px;" />
         </template>
       </el-table-column>
       <el-table-column class-name="status-col" label="状态" align="center" prop="status">
@@ -138,6 +138,12 @@ export default {
 }
 
 </script>
+<style>
+.el-input-number.is-controls-right .el-input__inner {
+    padding-left: 5px;
+    padding-right: 30px;
+}
+</style>
 <style lang="scss" scoped>
 .filter-title{
   float: left;

src/views/goods/list-commonly.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="commonlyProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.commonlyProductSort" style="width:55px;" size="small" type="number" min="1" maxlength="3" />
+          <el-input-number v-model="row.commonlyProductSort" controls-position="right" :min="1" :max="999" :maxlength="3" size="mini" style="width:65px;" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -194,7 +194,12 @@ export default {
   }
 }
 </script>
-
+<style>
+.el-input-number.is-controls-right .el-input__inner {
+    padding-left: 5px;
+    padding-right: 30px;
+}
+</style>
 <style scoped>
 
 .filter-container .filter-item,.el-form-item{

src/views/goods/list-preferential.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="preferentialProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.preferentialProductSort" size="mini" type="number" min="1" style="width:55px;" maxlength="3" />
+          <el-input-number v-model="row.preferentialProductSort" controls-position="right" :min="1" :max="999" :maxlength="3" size="mini" style="width:65px;" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -194,9 +194,13 @@ export default {
   }
 }
 </script>
-
+<style>
+.el-input-number.is-controls-right .el-input__inner {
+    padding-left: 5px;
+    padding-right: 30px;
+}
+</style>
 <style scoped>
-
 .filter-container .filter-item,.el-form-item{
   margin-bottom: 0;
 }

src/views/goods/list-preferred.vue

@@ -78,7 +78,7 @@
       </el-table-column>
       <el-table-column label="排序值" align="center" prop="preferredProductSort">
         <template slot-scope="{row}">
-          <el-input v-model="row.preferredProductSort" size="mini" type="number" min="1" style="width:55px;" maxlength="3" />
+          <el-input-number v-model="row.preferredProductSort" controls-position="right" :min="1" :max="999" :maxlength="3" size="mini" style="width:65px;" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -194,9 +194,13 @@ export default {
   }
 }
 </script>
-
+<style>
+.el-input-number.is-controls-right .el-input__inner {
+    padding-left: 5px;
+    padding-right: 30px;
+}
+</style>
 <style lang="scss" scoped>
-
 .filter-container .filter-item,.el-form-item{
   margin-bottom: 0;
 }