Refactor: 更新商家和店铺管理相关接口路径，优化店铺管理界面逻辑，完善角色权限支持，调整入驻申请页面交互，新增身份证号输入

shaofan
1 parent 9542b035
Showing 4 changed files with 126 additions and 70 deletions
src/api/index.ts
src/views/merchant/EnterList.vue
src/views/merchant/StoreList.vue
src/views/rider/RiderList.vue
@@ -102,18 +102,18 @@ export const merchantApi = {
   enterList: (params: any) => request.get('/api/platform/merchant/enter/list', { params }),
   handleEnter: (id: number, status: number) =>
     request.post('/api/platform/merchant/enter/handle', null, { params: { id, status } }),
-  storeList: (params: any) => request.get('/api/platform/merchant/store/list', { params }),
-  addStore: (data: any) => request.post('/api/platform/merchant/store/add', data),
-  editStore: (data: any) => request.put('/api/platform/merchant/store/edit', data),
-  storeDetail: (storeId: number) => request.get('/api/platform/merchant/store/detail', { params: { storeId } }),
+  storeList: (params: any) => request.get('/api/admin/merchant/store/list', { params }),
+  addStore: (data: any) => request.post('/api/admin/merchant/store/add', data),
+  editStore: (data: any) => request.put('/api/admin/merchant/store/edit', data),
+  storeDetail: (storeId: number) => request.get('/api/admin/merchant/store/detail', { params: { storeId } }),
   setOperatingState: (storeId: number, state: number) =>
-    request.post('/api/platform/merchant/store/setOperatingState', null, { params: { storeId, state } }),
+    request.post('/api/admin/merchant/store/setOperatingState', null, { params: { storeId, state } }),
   setAutoOrder: (storeId: number, auto: number) =>
-    request.post('/api/platform/merchant/store/setAutoOrder', null, { params: { storeId, auto } }),
+    request.post('/api/admin/merchant/store/setAutoOrder', null, { params: { storeId, auto } }),
   updateFeeConfig: (storeId: number, freeShipping: number, upToSend: number) =>
-    request.post('/api/platform/merchant/store/updateFeeConfig', null,
+    request.post('/api/admin/merchant/store/updateFeeConfig', null,
       { params: { storeId, freeShipping, upToSend } }),
-  delStore: (storeId: number) => request.delete('/api/platform/merchant/store/del', { params: { storeId } }),
+  delStore: (storeId: number) => request.delete('/api/admin/merchant/store/del', { params: { storeId } }),
 }
  
 // 骑手管理
 <template>
   <div>
     <a-card title="入驻申请" :bordered="false" class="list-table-card">
-      <div class="list-toolbar">
-        <div class="list-toolbar-left">
-          <a-select v-model:value="filterStatus" placeholder="状态" allowClear class="list-filter" @change="loadList">
-            <a-select-option :value="0">未处理</a-select-option>
-            <a-select-option :value="1">已通过</a-select-option>
-            <a-select-option :value="-1">已拒绝</a-select-option>
-          </a-select>
-          <a-select v-model:value="filterType" placeholder="类型" allowClear class="list-filter" @change="loadList">
-            <a-select-option :value="1">商家入驻</a-select-option>
-            <a-select-option :value="2">骑手入驻</a-select-option>
-            <a-select-option :value="3">商务合作</a-select-option>
-          </a-select>
+      <div class="soft-page-stack">
+        <div class="soft-note-card">
+          <strong>功能暂未开放</strong>
+          <p>当前页面保留原有布局用于后续开放，暂不提供真实数据查询和审核操作。</p>
         </div>
-      </div>
-      <a-table :dataSource="list" :columns="columns" :loading="loading" rowKey="id" :pagination="false">
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'type'">
-            <a-tag>{{ typeMap[record.type] }}</a-tag>
-          </template>
-          <template v-if="column.key === 'status'">
-            <a-tag :color="record.status === 1 ? 'green' : record.status === -1 ? 'red' : 'orange'">
-              {{ statusMap[record.status] }}
-            </a-tag>
-          </template>
-          <template v-if="column.key === 'action'">
-            <a-space v-if="record.status === 0">
-              <a-popconfirm title="确认通过？" @confirm="handle(record.id, 1)">
-                <a style="color:green">通过</a>
-              </a-popconfirm>
-              <a-popconfirm title="确认拒绝？" @confirm="handle(record.id, -1)">
-                <a style="color:red">拒绝</a>
-              </a-popconfirm>
-            </a-space>
-            <span v-else>-</span>
+
+        <div class="list-toolbar">
+          <div class="list-toolbar-left">
+            <a-select v-model:value="filterStatus" placeholder="状态" allowClear class="list-filter" @change="loadList">
+              <a-select-option :value="0">未处理</a-select-option>
+              <a-select-option :value="1">已通过</a-select-option>
+              <a-select-option :value="-1">已拒绝</a-select-option>
+            </a-select>
+            <a-select v-model:value="filterType" placeholder="类型" allowClear class="list-filter" @change="loadList">
+              <a-select-option :value="1">商家入驻</a-select-option>
+              <a-select-option :value="2">骑手入驻</a-select-option>
+              <a-select-option :value="3">商务合作</a-select-option>
+            </a-select>
+          </div>
+        </div>
+
+        <a-table :dataSource="list" :columns="columns" :loading="loading" rowKey="id" :pagination="false">
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'type'">
+              <a-tag>{{ typeMap[record.type] }}</a-tag>
+            </template>
+            <template v-if="column.key === 'status'">
+              <a-tag :color="record.status === 1 ? 'green' : record.status === -1 ? 'red' : 'orange'">
+                {{ statusMap[record.status] }}
+              </a-tag>
+            </template>
+            <template v-if="column.key === 'action'">
+              <a-space v-if="record.status === 0">
+                <a-popconfirm title="确认通过？" @confirm="handle(record.id, 1)">
+                  <a style="color:#bfbfbf">通过</a>
+                </a-popconfirm>
+                <a-popconfirm title="确认拒绝？" @confirm="handle(record.id, -1)">
+                  <a style="color:#bfbfbf">拒绝</a>
+                </a-popconfirm>
+              </a-space>
+              <span v-else>-</span>
+            </template>
           </template>
-        </template>
-      </a-table>
+        </a-table>
+      </div>
     </a-card>
   </div>
 </template>
@@ -45,7 +53,6 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
 import { message } from 'ant-design-vue'
-import { merchantApi } from '@/api'
  
 const loading = ref(false)
 const list = ref<any[]>([])
@@ -65,19 +72,16 @@ const columns = [
   { title: '操作', key: 'action' },
 ]
  
-async function loadList() {
-  loading.value = true
-  try {
-    const res: any = await merchantApi.enterList({ status: filterStatus.value, type: filterType.value, page: 1 })
-    list.value = res.data
-  } finally { loading.value = false }
+function loadList() {
+  list.value = []
 }
  
-async function handle(id: number, status: number) {
-  await merchantApi.handleEnter(id, status)
-  message.success('操作成功')
-  loadList()
+function handle(_id: number, _status: number) {
+  message.warning('暂未开放')
 }
  
-onMounted(loadList)
+onMounted(() => {
+  message.warning('暂未开放')
+  loadList()
+})
 </script>
@@ -3,7 +3,14 @@
     <a-card title="店铺管理" :bordered="false" class="list-table-card">
       <div class="list-toolbar">
         <div class="list-toolbar-left">
-          <a-select v-model:value="filterCityId" placeholder="选择租户" allowClear class="list-filter" @change="loadList">
+          <a-select
+            v-if="isAdmin"
+            v-model:value="filterCityId"
+            placeholder="选择租户"
+            allowClear
+            class="list-filter"
+            @change="loadList"
+          >
             <a-select-option v-for="c in cityList" :key="c.id" :value="c.id">{{ c.name }}</a-select-option>
           </a-select>
           <a-input-search v-model:value="keyword" placeholder="搜索店铺名" @search="loadList" class="list-search" />
@@ -51,11 +58,14 @@
         </div>
         <a-form :model="form" layout="vertical">
           <a-form-item label="店铺名称"><a-input v-model:value="form.name" /></a-form-item>
-          <a-form-item label="所属租户">
+          <a-form-item v-if="isAdmin" label="所属租户">
             <a-select v-model:value="form.cityId" placeholder="选择租户">
               <a-select-option v-for="c in cityList" :key="c.id" :value="c.id">{{ c.name }}</a-select-option>
             </a-select>
           </a-form-item>
+          <a-form-item v-else label="所属租户">
+            <a-input :value="managedCityName || getCityName(form.cityId)" disabled />
+          </a-form-item>
           <a-form-item label="外部门店编号（选填，接入方对账用）">
             <a-input v-model:value="form.outStoreId" placeholder="接入方自己系统的门店ID" />
           </a-form-item>
@@ -121,7 +131,7 @@ const editingId = ref&lt;number | null&gt;(null)
 const currentStoreId = ref(0)
 const form = reactive<any>({ name: '', cityId: undefined, address: '', lng: '', lat: '', shippingType: 1, automaticOrder: 0, accountMobile: '', about: '', outStoreId: '' })
 const feeForm = reactive({ freeShipping: 0, upToSend: 0 })
-const { cityList, loadCities, getCityName } = useRoleCityList()
+const { isAdmin, managedCityId, managedCityName, cityList, loadCities, getCityName } = useRoleCityList()
  
 const columns = [
   { title: 'ID', dataIndex: 'id', width: 80 },
@@ -138,47 +148,75 @@ const columns = [
 async function loadList() {
   loading.value = true
   try {
-    const res: any = await merchantApi.storeList({ cityId: filterCityId.value, keyword: keyword.value, page: 1 })
+    const params = {
+      cityId: isAdmin.value ? filterCityId.value : managedCityId.value,
+      keyword: keyword.value,
+      page: 1,
+    }
+    const res: any = await merchantApi.storeList(params)
     list.value = res.data
-  } finally { loading.value = false }
+  } finally {
+    loading.value = false
+  }
+}
+
+function resetForm() {
+  Object.assign(form, {
+    name: '',
+    cityId: isAdmin.value ? undefined : managedCityId.value,
+    address: '',
+    lng: '',
+    lat: '',
+    shippingType: 1,
+    automaticOrder: 0,
+    accountMobile: '',
+    about: '',
+    outStoreId: '',
+  })
 }
  
 function openAdd() {
   editingId.value = null
-  Object.assign(form, { name: '', cityId: undefined, address: '', lng: '', lat: '', shippingType: 1, automaticOrder: 0, accountMobile: '', about: '', outStoreId: '' })
+  resetForm()
   modalVisible.value = true
 }
  
 function openEdit(record: any) {
   editingId.value = record.id
   Object.assign(form, record)
+  if (!isAdmin.value) {
+    form.cityId = managedCityId.value
+  }
   modalVisible.value = true
 }
  
 async function handleSave() {
   saving.value = true
   try {
+    const payload = { ...form, cityId: isAdmin.value ? form.cityId : managedCityId.value }
     if (editingId.value) {
-      await merchantApi.editStore({ ...form, id: editingId.value })
+      await merchantApi.editStore({ ...payload, id: editingId.value })
     } else {
-      await merchantApi.addStore(form)
+      await merchantApi.addStore(payload)
     }
     message.success('保存成功')
     modalVisible.value = false
-    loadList()
-  } finally { saving.value = false }
+    await loadList()
+  } finally {
+    saving.value = false
+  }
 }
  
 async function toggleState(record: any) {
   await merchantApi.setOperatingState(record.id, record.operatingState === 1 ? 0 : 1)
   message.success('操作成功')
-  loadList()
+  await loadList()
 }
  
 async function handleDel(id: number) {
   await merchantApi.delStore(id)
   message.success('删除成功')
-  loadList()
+  await loadList()
 }
  
 function openFeeConfig(record: any) {
@@ -194,9 +232,18 @@ async function handleFeeSave() {
     await merchantApi.updateFeeConfig(currentStoreId.value, feeForm.freeShipping, feeForm.upToSend)
     message.success('保存成功')
     feeVisible.value = false
-    loadList()
-  } finally { saving.value = false }
+    await loadList()
+  } finally {
+    saving.value = false
+  }
 }
  
-onMounted(() => { loadList(); loadCities() })
+onMounted(async () => {
+  await loadCities()
+  if (!isAdmin.value) {
+    filterCityId.value = managedCityId.value
+  }
+  resetForm()
+  await loadList()
+})
 </script>
@@ -93,6 +93,9 @@
           <a-form-item label="手机号">
             <a-input v-model:value="form.mobile" placeholder="请输入手机号" />
           </a-form-item>
+          <a-form-item label="身份证号">
+            <a-input v-model:value="form.idNo" placeholder="请输入身份证号（非必填）" />
+          </a-form-item>
           <a-form-item label="密码">
             <a-input-password v-model:value="form.password" placeholder="请输入登录密码" />
           </a-form-item>
@@ -160,6 +163,7 @@ const form = reactive({
   cityId: undefined as number | undefined,
   userNickname: '',
   mobile: '',
+  idNo: '',
   password: '',
 })
 const levelSaving = ref(false)
@@ -217,6 +221,7 @@ function openAdd() {
     cityId: undefined,
     userNickname: '',
     mobile: '',
+    idNo: '',
     password: '',
   })
   modalVisible.value = true