Merge branch 'master' into 2.0

src/views/setting/rulesManage/index.vue

@@ -121,15 +121,15 @@
         <el-form-item label="平台分账：" prop="platformRate">
            <el-input
             v-model.number="setQuery.platformRate"
-            :maxlength="4"
+            type="number"
             class="item-width-300"
             ></el-input>
         </el-form-item>
          <el-form-item label="店铺分账：" prop="shopRate">
            <el-input
             v-model.number="setQuery.shopRate"
-            :maxlength="3"
-          size="small"
+            size="small"
+            type="number"
             class="item-width-300"
             ></el-input>
         </el-form-item>