feat(custom): 订单列表改版

src/views/business/mer_list/index.vue

@@ -82,9 +82,9 @@
           <n-form-item label="商户地址:" path="address">
             <n-input v-model:value="formValue.address" placeholder="请输入商户地址" />
           </n-form-item>
-          <n-form-item label="经营类目:" path="classId">
+          <n-form-item label="经营类目:" path="store_class_id">
             <n-select
-              v-model:value="formValue.classId"
+              v-model:value="formValue.store_class_id"
               label-field="name"
               value-field="ID"
               clearable
@@ -98,16 +98,16 @@
           <n-form-item v-else label="修改密码:" path="password">
             <n-input v-model:value="formValue.password" placeholder="不修改密码请留空" />
           </n-form-item>
-          <n-form-item label="商户类型:" path="bType">
-            <n-select
-              v-model:value="formValue.bType"
-              label-field="name"
-              value-field="ID"
-              placeholder="请选择商户类型"
-              clearable
-              :options="typeOptions"
-            />
-          </n-form-item>
+          <!--          <n-form-item label="商户类型:" path="bType">-->
+          <!--            <n-select-->
+          <!--              v-model:value="formValue.bType"-->
+          <!--              label-field="name"-->
+          <!--              value-field="ID"-->
+          <!--              placeholder="请选择商户类型"-->
+          <!--              clearable-->
+          <!--              :options="typeOptions"-->
+          <!--            />-->
+          <!--          </n-form-item>-->
           <n-form-item label="手续费收取类型:" path="scaleType">
             <n-select
               v-model:value="formValue.scaleType"
@@ -152,6 +152,7 @@
 import { onMounted, ref, h, withDirectives, resolveDirective } from 'vue'
 import { NButton } from 'naive-ui'
 import api from './api'
+
 const vPerms = resolveDirective('perms')
 
 const isEdit = computed(() => drawerTitle.value === '编辑商户')
@@ -162,18 +163,10 @@ const columns = ref([
     align: 'center',
     key: 'name',
   },
-  {
-    title: '商户类型',
-    align: 'center',
-    key: 'type',
-    render(row) {
-      return h('span', row.bType === 1 ? '供应商' : '兑换商')
-    },
-  },
   {
     title: '状态',
     align: 'center',
-    key: 'status',
+    slot: 'status',
     render(row) {
       return h('span', row.status === 1 ? '正常' : '禁用')
     },
@@ -265,10 +258,9 @@ let formValue = ref({
   phone: '',
   mobile: '',
   address: '',
-  classId: null,
+  store_class_id: null,
   local: '',
   password: '',
-  bType: null,
   scaleType: null,
   scale: null,
   status: 2,
@@ -305,7 +297,7 @@ const rules = {
     message: '请搜索商户经纬度',
     trigger: 'blur',
   },
-  classId: {
+  store_class_id: {
     required: true,
     type: 'number',
     message: '请选择经营类目',
@@ -316,12 +308,6 @@ const rules = {
   //   message: '请输入商户密码',
   //   trigger: 'blur',
   // },
-  bType: {
-    required: true,
-    type: 'number',
-    message: '请选择商户类型',
-    trigger: 'change',
-  },
   scaleType: {
     required: true,
     type: 'number',
@@ -388,8 +374,8 @@ const handleValidateClick = (e) => {
         await api.addMer(formValue.value)
         $message.success('成功')
         handleClearValidateClick()
-        getMertype()
-        getList()
+        await getMertype()
+        await getList()
         showModal.value = false
       } catch (error) {
         $message.error(error.msg)