Browse Source

feat(config): 更新运费配置接口及字段映射

- 修改 `.env.test` 中的后端服务地址为新的测试环境地址
- 调整 `fetchChannelList` 方法支持传入参数,并更新调用处逻辑
- 更新运费配置页面中字段名称 `id` 为 `transportId`
- 优化数据回显逻辑,增加字段映射与选项禁用控制
- 表格保存方法调整,传递正确数据结构并添加成功提示

refactor(types): 移除自动生成的组件类型声明文件

- 删除 `src/typings/components.d.ts` 文件以避免冲突和冗余

fix(after-sales): 修正售后状态标签与枚举值对应关系

- 调整售后订单状态文案与实际枚举值匹配
- 更新统计数量字段名以保证准确性
- 添加调试日志便于问题追踪
zhangtao 1 month ago
parent
commit
94ceb9479b

+ 2 - 2
.env.test

@@ -1,10 +1,10 @@
 # backend service base url, test environment
 # backend service base url, test environment
 # VITE_SERVICE_BASE_URL=http://74949mkfh190.vicp.fun
 # VITE_SERVICE_BASE_URL=http://74949mkfh190.vicp.fun
-# VITE_SERVICE_BASE_URL=http://192.168.1.206:8114 #付
+VITE_SERVICE_BASE_URL=http://192.168.1.253:8114 #付
 # VITE_SERVICE_BASE_URL=http://192.168.0.157:8114 #王
 # VITE_SERVICE_BASE_URL=http://192.168.0.157:8114 #王
 # VITE_SERVICE_BASE_URL=http://192.168.1.166:8114 #张
 # VITE_SERVICE_BASE_URL=http://192.168.1.166:8114 #张
 # VITE_SERVICE_BASE_URL=https://mock.apifox.cn/m1/3109515-0-default
 # VITE_SERVICE_BASE_URL=https://mock.apifox.cn/m1/3109515-0-default
-VITE_SERVICE_BASE_URL=https://shop.platform.zswlgz.com #服务器
+# VITE_SERVICE_BASE_URL=https://shop.platform.zswlgz.com #服务器
 
 
 
 
 # other backend service base url, test environment
 # other backend service base url, test environment

+ 3 - 2
src/service/api/common.ts

@@ -49,9 +49,10 @@ export function fetchGetAddOrEditTransport(data: any) {
  * @returns
  * @returns
  */
  */
 
 
-export function fetchChannelList() {
+export function fetchChannelList(data: any) {
   return request<{ records: Api.delivery.Transport2[] }>({
   return request<{ records: Api.delivery.Transport2[] }>({
     url: '/platform/transport2/transport2List',
     url: '/platform/transport2/transport2List',
-    method: 'get'
+    method: 'get',
+    params: data
   });
   });
 }
 }

+ 22 - 4
src/views/config/fright-config/index.vue

@@ -15,7 +15,7 @@ const ChannelOptions = ref<Api.goods.Channel[]>([]);
 const [registerForm, { getFieldsValue, validate, setFieldsValue }] = useForm({
 const [registerForm, { getFieldsValue, validate, setFieldsValue }] = useForm({
   schemas: [
   schemas: [
     {
     {
-      field: 'id',
+      field: 'transportId',
       component: 'NInput',
       component: 'NInput',
       label: 'false',
       label: 'false',
       show: false
       show: false
@@ -133,9 +133,26 @@ async function getChannelList() {
 getChannelList();
 getChannelList();
 
 
 async function getData() {
 async function getData() {
-  const { data } = await fetchChannelList();
+  const { data } = await fetchChannelList({ current: 1, size: 100 });
   if (data) {
   if (data) {
-    setFieldsValue({ name: data.records });
+    setFieldsValue({
+      name: data.records.map(it => {
+        return {
+          transportId: it.transportId,
+          channelId: it.channelId,
+          freightFee: it.freightFee,
+          distance: it.distance,
+          weight: it.weight
+        };
+      })
+    });
+    const dataKey = data.records.map(it => it.channelId);
+    ChannelOptions.value.map(it => {
+      if (dataKey.includes(Number(it.id))) {
+        it.disabled = true;
+      }
+      return it;
+    });
   }
   }
 }
 }
 getData();
 getData();
@@ -152,8 +169,9 @@ async function save() {
   await validate();
   await validate();
   isSubmit.value = true;
   isSubmit.value = true;
   const form = getFieldsValue();
   const form = getFieldsValue();
-  await fetchGetAddOrEditTransport(form);
+  await fetchGetAddOrEditTransport(form.name);
   isSubmit.value = false;
   isSubmit.value = false;
+  window.$message?.success('保存成功');
   getData();
   getData();
 }
 }
 function handleRemove(idx: number) {
 function handleRemove(idx: number) {

+ 1 - 1
src/views/delivery/after-sales-order/after-sales-order.ts

@@ -120,7 +120,7 @@ export enum refundEnum {
 
 
 export const refundStatus = {
 export const refundStatus = {
   [refundEnum.BUYER_APPLY]: '买家申请',
   [refundEnum.BUYER_APPLY]: '买家申请',
-  [refundEnum.SELLER_AGREE]: '卖家同意',
+  [refundEnum.SELLER_AGREE]: '买家发货',
   [refundEnum.SELLER_REFUSE]: '卖家拒绝',
   [refundEnum.SELLER_REFUSE]: '卖家拒绝',
   [refundEnum.REFUND_SUCCESS]: '退款成功',
   [refundEnum.REFUND_SUCCESS]: '退款成功',
   [refundEnum.BUYER_DELIVERY]: '买家发货',
   [refundEnum.BUYER_DELIVERY]: '买家发货',

+ 4 - 4
src/views/delivery/after-sales-order/index.vue

@@ -235,16 +235,16 @@ async function getNums() {
     {
     {
       label: '卖家拒绝',
       label: '卖家拒绝',
       value: refundEnum.SELLER_REFUSE,
       value: refundEnum.SELLER_REFUSE,
-      key: 'sellerAcceptCount'
+      key: 'sellerRejectCount'
     },
     },
     {
     {
       label: '买家发货',
       label: '买家发货',
-      value: refundEnum.BUYER_DELIVERY,
+      value: refundEnum.SELLER_AGREE,
       key: 'sellerAcceptCount'
       key: 'sellerAcceptCount'
     },
     },
     {
     {
-      label: '卖家接受',
-      value: refundEnum.SELLER_AGREE,
+      label: '卖家收货',
+      value: refundEnum.BUYER_DELIVERY,
       key: 'buyerDeliveryCount'
       key: 'buyerDeliveryCount'
     },
     },
     {
     {