Merge branch 'bugfix/常规配置' into dev

src/views/setting/convenSet.vue

@@ -181,7 +181,7 @@ export default {
       });
     },
     handleSubmit (form) {
-      if (!this.form.stockShowAmount) return this.$message.warning('请输入库存提示文案数量限制');
+      if (this.form.stockShow && !this.form.stockShowAmount) return this.$message.warning('请输入库存提示文案数量限制');
       this.$refs[form].validate(valid => {
         console.log(valid);
         if (valid) {