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

src/views/setting/convenSet.vue

@@ -155,7 +155,6 @@ export default {
       },
       formRules: {
         cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }],
-        openAutoShelf: [{ required: true, message: '请设置无库存自动下架', trigger: 'change' }],
         showStoreType: [{ required: true, message: '请至少勾选一个门店类型', trigger: 'change' }],
       },
       btnLoading: false,
@@ -182,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) {