Merge branch 'dev' into test

src/views/business/mer_list/index.vue

@@ -128,6 +128,20 @@
           <n-form-item label="手续费比例:" path="scale">
             <n-input-number v-model:value="formValue.scale" placeholder="请输入手续费比例" />
           </n-form-item>
+          <n-form-item label="提现额度:" path="withdraw_amount">
+            <n-input-number
+              v-model:value="formValue.withdraw_amount"
+              :step="1000"
+              placeholder="请输入提现额度"
+            />
+          </n-form-item>
+          <n-form-item label="兑换额度:" path="exchange_amount">
+            <n-input-number
+              v-model:value="formValue.exchange_amount"
+              :step="1000"
+              placeholder="请输入兑换额度"
+            />
+          </n-form-item>
           <!-- <n-form-item label="聚合积分额度:" path="quota">
             <n-input-number v-model:value="formValue.quota" placeholder="请输入聚合积分额度" />
           </n-form-item>
@@ -413,6 +427,8 @@ let formValue = ref({
   ratio: null,
   status: 2,
   sort: 0,
+  withdraw_amount: 0,
+  exchange_amount: 0,
 })
 
 const rules = {
@@ -469,6 +485,18 @@ const rules = {
     message: '请输入手续费比例',
     trigger: 'blur',
   },
+  withdraw_amount: {
+    required: true,
+    type: 'number',
+    message: '请输入提现额度',
+    trigger: 'blur',
+  },
+  exchange_amount: {
+    required: true,
+    type: 'number',
+    message: '请输入兑换额度',
+    trigger: 'blur',
+  },
   status: {
     type: 'number',
     message: '请选择商户状态',