From 9417528707dd730ee3dddefe4384f93008b16b4f Mon Sep 17 00:00:00 2001 From: jzp <783183164@qq.com> Date: Thu, 27 Nov 2025 09:38:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20review/write=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 1 + package.json | 1 + pnpm-lock.yaml | 8 ++ src/App.vue | 24 +++- src/api/files.ts | 14 ++ src/api/index.ts | 4 +- src/api/order.ts | 6 + src/api/types/files.ts | 4 + src/api/types/order.ts | 188 ++++++++++++++++++++++++++ src/api/types/shop.ts | 171 ----------------------- src/styles/index.scss | 2 +- src/styles/var.scss | 3 +- src/views/order/index.vue | 269 ++++++++++++++++++++++--------------- src/views/review/write.vue | 93 +++++++++++-- 14 files changed, 495 insertions(+), 293 deletions(-) create mode 100644 src/api/files.ts create mode 100644 src/api/order.ts create mode 100644 src/api/types/files.ts create mode 100644 src/api/types/order.ts diff --git a/components.d.ts b/components.d.ts index 0a95b59..1315b60 100644 --- a/components.d.ts +++ b/components.d.ts @@ -17,6 +17,7 @@ declare module 'vue' { VanButton: typeof import('vant/es')['Button'] VanCell: typeof import('vant/es')['Cell'] VanCellGroup: typeof import('vant/es')['CellGroup'] + VanCheckbox: typeof import('vant/es')['Checkbox'] VanEmpty: typeof import('vant/es')['Empty'] VanField: typeof import('vant/es')['Field'] VanForm: typeof import('vant/es')['Form'] diff --git a/package.json b/package.json index 9299db0..22cefa2 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@vant/area-data": "^2.1.0", "axios": "^1.11.0", "capture-request-log": "^0.0.4", + "es-toolkit": "^1.41.0", "js-base64": "^3.7.8", "lodash": "^4.17.21", "lodash-es": "^4.17.21", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4dcc755..3b12bd8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,9 @@ importers: capture-request-log: specifier: ^0.0.4 version: 0.0.4 + es-toolkit: + specifier: ^1.41.0 + version: 1.41.0 js-base64: specifier: ^3.7.8 version: 3.7.8 @@ -1281,6 +1284,9 @@ packages: resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==} engines: {node: '>= 0.4'} + es-toolkit@1.41.0: + resolution: {integrity: sha512-bDd3oRmbVgqZCJS6WmeQieOrzpl3URcWBUVDXxOELlUW2FuW+0glPOz1n0KnRie+PdyvUZcXz2sOn00c6pPRIA==} + esbuild@0.25.12: resolution: {integrity: sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==} engines: {node: '>=18'} @@ -3445,6 +3451,8 @@ snapshots: has-tostringtag: 1.0.2 hasown: 2.0.2 + es-toolkit@1.41.0: {} + esbuild@0.25.12: optionalDependencies: '@esbuild/aix-ppc64': 0.25.12 diff --git a/src/App.vue b/src/App.vue index 8085bc3..0fa87b8 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,9 +2,27 @@ - + + diff --git a/src/api/files.ts b/src/api/files.ts new file mode 100644 index 0000000..6663be8 --- /dev/null +++ b/src/api/files.ts @@ -0,0 +1,14 @@ +// 商品维度接口 +const file = { + // 上传图片 + addUploadfile: [ + 'https://api.1024api.com/api-interface/mm/upload/file', + { + headers: { + 'Content-Type': 'multipart/form-data', + }, + }, + ], +} + +export default file diff --git a/src/api/index.ts b/src/api/index.ts index e6595f8..b19da54 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -2,8 +2,10 @@ import axios from '@/utils/axios' import user from './user' import shop from './shop' import common from './common' +import files from './files' +import order from './order' -const totalApiConfig = { user, shop, common } +const totalApiConfig = { user, shop, common, files, order } const handleAddArrayPrototype = (obj: Recordable<[string, Recordable]>) => { Object.values(obj).forEach((arr) => { diff --git a/src/api/order.ts b/src/api/order.ts new file mode 100644 index 0000000..e2729d4 --- /dev/null +++ b/src/api/order.ts @@ -0,0 +1,6 @@ +const order = { + addCommentAdd: ["/comment/add"] +} + + +export default order diff --git a/src/api/types/files.ts b/src/api/types/files.ts new file mode 100644 index 0000000..5217f19 --- /dev/null +++ b/src/api/types/files.ts @@ -0,0 +1,4 @@ +export type addUploadfileRepType = { + srcFileName:string + url: string +} diff --git a/src/api/types/order.ts b/src/api/types/order.ts new file mode 100644 index 0000000..14912b5 --- /dev/null +++ b/src/api/types/order.ts @@ -0,0 +1,188 @@ +export type OrderStatus = 'create' | 'wait_pay' | 'wait_shipping' | 'apply_cancel' | 'close' | 'shipping' | 'shipped' | 'delivered' | 'refund' | 'all_refund' | 'part_refund' | 'unknown' + +export type ReverseStatus = 'all_refund' | 'part_refund' | 'close' | 'cancel' | 'refunded' | string + +export type OrderSkuInfoItem = { + propertyName: string + propertyValue: string +} + +export type PackageLogisticsData = { + areaCode?: string + areaName?: string + context?: string + status?: string + time?: string + ftime?: string +} + +export type PackageLogisticsInfo = { + com?: string + nu?: string + state?: string + status?: string + condition?: string + ischeck?: string + data?: PackageLogisticsData[] + routeInfo?: Record + message?: string +} + +export type OrderPackageEntity = { + id: number + isDelete?: number + logisticsCompany?: string + trackNumber?: string + packageImageUrl?: string + packageLogisticsInfo?: string | PackageLogisticsInfo + shippingAmount?: number + shippingFrom?: string + shippingTo?: string + com?: string + status?: string + state?: string + ischeck?: string + shippingType?: string + gmtSignReceipt?: number + gmtShipping?: number + gmtSendMqDelivered?: number + gmtDelivered?: number + deliveredBy?: string +} + +export type TradeOrderLineEntity = { + id: number + tradeOrderId?: number + tradeOrderLineIdList?: number[] + productId?: number + productName?: string + productMainImageUrl?: string + skuId?: number + skuImageUrl?: string + skuInfo?: string | OrderSkuInfoItem[] + salePrice?: number + promotionPrice?: number + num?: number + trackNumber?: string + logisticsCompany?: string + logisticsDesc?: string + status?: OrderStatus | string + payAmount?: number + shippingAmount?: number + refundAmount?: number + refundCount?: number + reverseStatus?: ReverseStatus + activityAwardCount?: number + batchNum?: number + buyerId?: number + province?: string + city?: string + district?: string + shippingFrom?: string + shippingTo?: string + createTime?: number + createTimestamp?: number + modifyTime?: number + modifyTimestamp?: number + gmtPrePay?: number + gmtPay?: number + gmtShipped?: number + gmtDelivered?: number + gmtCancel?: number + gmtClose?: number + gmtToShipping?: number + payType?: string + prepayId?: string + transactionId?: string + deliveredUser?: string + cancelUser?: string + skuDesc?: string + [key: string]: any +} + +export type TradeOrderEntity = { + id: number + isDelete?: number + buyerId?: number + buyerPhone?: string + buyerName?: string + buyerWeixin?: string + buyerDetailAddress?: string + buyerAddressId?: number + province?: string + city?: string + district?: string + contry?: string + appName?: string + channel?: string + promoterId?: string + gmtDownOrder?: number + gmtPay?: number + transactionId?: string + tradeInfo?: string + allPrice?: number + refundAmount?: number + refundCount?: number + num?: number + createTime?: number + modifyTime?: number + createTimestamp?: number + modifyTimestamp?: number +} + +export type OrderListItem = { + tradeOrderEntity: TradeOrderEntity + appTradeOrderLineDTOList: TradeOrderLineEntity[] + vvPackageEntity?: OrderPackageEntity + [key: string]: any +} + +export type OrderListQuery = { + tradeOrderIds?: Array + productName?: string + minCreateTimestamp?: number + maxCreateTimestamp?: number + createTimestampSort?: 'ASC' | 'DESC' + status?: string | number + keyword?: string + pageNum?: number + pageSize?: number + [key: string]: any +} + +export type OrderListResponseMeta = { + code?: string | number + msg?: string + traceId?: string +} + +export type OrderListResponsePayload = { + rows?: OrderListItem[] + list?: OrderListItem[] + data?: OrderListItem[] + [key: string]: any +} + +export type OrderListResponseData = OrderListItem[] | OrderListResponsePayload | null | undefined + +export type OrderListResponse = OrderListResponseMeta & { data?: OrderListResponseData } + +// -----------评论------------------ + +export type CommentMediaItem = { + commentUrl: string + type: 'image' | 'video' +} + +export type CommentAddReqType = { + buyerId: number + skuId: number + tradeOrderId: number + trackNumber?: string + descMatch: number + logisticsService: number + sellerService: number + productComment: string + serviceComment: string + commentDetailList?: CommentMediaItem[] +} diff --git a/src/api/types/shop.ts b/src/api/types/shop.ts index db2ab9d..e018e0c 100644 --- a/src/api/types/shop.ts +++ b/src/api/types/shop.ts @@ -71,174 +71,3 @@ export type ProudictProductPropertyType = { vvProductPropertyValueList?: ProudictProductPropertyType[] } -/** ----------------------------- Orders ------------------------------ */ - -export type OrderStatus = - | 'wait_pay' - | 'wait_shipping' - | 'shipping' - | 'delivered' - | 'all_refund' - | 'part_refund' - | 'close' - | 'unknown' - -export type ReverseStatus = 'all_refund' | 'part_refund' | 'close' | 'cancel' | string - -export type OrderSkuInfoItem = { - propertyName: string - propertyValue: string -} - -export type PackageLogisticsData = { - areaCode?: string - areaName?: string - context?: string - status?: string - time?: string - ftime?: string -} - -export type PackageLogisticsInfo = { - com?: string - nu?: string - state?: string - status?: string - condition?: string - ischeck?: string - data?: PackageLogisticsData[] - routeInfo?: Record - message?: string -} - -export type OrderPackageEntity = { - id: number - logisticsCompany?: string - trackNumber?: string - packageImageUrl?: string - packageLogisticsInfo?: string | PackageLogisticsInfo - shippingAmount?: number - shippingFrom?: string - shippingTo?: string - com?: string - status?: string - state?: string - shippingType?: string -} - -export type TradeOrderLineEntity = { - id: number - isDelete?: number - tradeOrderId?: number - orderNo?: string - productId?: number - productName?: string - productMainImageUrl?: string - skuId?: number - skuImageUrl?: string - skuInfo?: string | OrderSkuInfoItem[] - singlePrice?: number - num?: number - allPrice?: number - trackNumber?: string - logisticsCompany?: string - logisticsDesc?: string - status?: string - payAmount?: number - shippingFrom?: string - shippingTo?: string - createTime?: number - modifyTime?: number - [key: string]: any -} - -export type TradeOrderEntity = { - id: number - buyerId?: number - buyerDetailAddress?: string - province?: string - city?: string - district?: string - contry?: string - gmtDownOrder?: number - transactionId?: string - tradeInfo?: string - allPrice?: number - num?: number - createTime?: number - modifyTime?: number -} - -export type OrderListItem = { - id: number - tradeOrderId?: number - orderNo?: string - tradeOrderEntity?: TradeOrderEntity - vvPackageEntity?: OrderPackageEntity - vvTradeOrderLineEntityList?: TradeOrderLineEntity[] - productId: number - productName: string - productMainImageUrl?: string - skuId?: number - skuInfo?: string | OrderSkuInfoItem[] - num: number - status: OrderStatus | string - reverseStatus?: ReverseStatus - promotionPrice?: number - originPrice?: number - discountAmount?: number - shippingAmount?: number - freightFee?: number - payAmount?: number - profitAmount?: number - activityAwardCount?: number - batchNum?: number - buyerId?: number - buyerDetailAddress?: string - city?: string - province?: string - district?: string - createTime?: number - createTimestamp?: number - modifyTime?: number - modifyTimestamp?: number - gmtPay?: number - gmtPrePay?: number - gmtShipped?: number - gmtDelivered?: number - gmtCancel?: number - gmtClose?: number - gmtToShipping?: number - payType?: string - prepayId?: string - transactionId?: string - trackNumber?: string - shippingFrom?: string - shippingTo?: string - skuDesc?: string - [key: string]: any -} - -export type OrderListQuery = { - keyword?: string - status?: string | number - pageNum?: number - pageSize?: number - [key: string]: any -} - -export type OrderListResponseMeta = { - code?: string | number - msg?: string - traceId?: string -} - -export type OrderListResponsePayload = { - rows?: OrderListItem[] - list?: OrderListItem[] - [key: string]: any -} - -export type OrderListResponseData = OrderListItem[] | OrderListResponsePayload | null | undefined - -export type OrderListResponse = OrderListResponseMeta & { data?: OrderListResponseData } diff --git a/src/styles/index.scss b/src/styles/index.scss index cb84795..8b80349 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1 +1 @@ -@import './var.scss' +@use './var.scss' diff --git a/src/styles/var.scss b/src/styles/var.scss index cf0783f..6ca69d0 100644 --- a/src/styles/var.scss +++ b/src/styles/var.scss @@ -1,4 +1,5 @@ :root{ - --app-footer-bg-height: 40px; + --app-footer-bg-height: 0.4rem; --app-footer-bg-color: #fff; + --app-html-bg-color: #f2f2f2; } diff --git a/src/views/order/index.vue b/src/views/order/index.vue index 248a264..9e008c8 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -26,14 +26,6 @@
- -
-