Merge branch 'dev' into 'master'

Dev

See merge request !34

components.d.ts

@@ -32,6 +32,7 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -52,6 +53,7 @@ declare module 'vue' {
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTree: typeof import('element-plus/es')['ElTree']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     Icon: typeof import('./src/components/Icon.vue')['default']
     Icon: typeof import('./src/components/Icon.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']

src/api/podUsOrder.ts

@@ -324,6 +324,28 @@ export function createLogisticsOrderApi(params: {
   )
   )
 }
 }
 
 
+// 创建物流
+export function uploadExpressSheet(params: {
+  trackingNumber:string
+  file: File
+}) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/uploadExpressSheet',
+    params,
+  )
+}// 创建物流
+export function updateSelfLogistics(params: {
+  trackingNumber:string
+  expressSheet: string
+  processNumber: string
+  id?: string
+}) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/updateSelfLogistics',
+    params,
+  )
+}
+
 // 更改物流
 // 更改物流
 export function composingDesignImages(data: number[]) {
 export function composingDesignImages(data: number[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(

src/types/api/podUsOrder.ts

@@ -171,3 +171,9 @@ export interface AddressInfo {
   receiverAddress2: string
   receiverAddress2: string
   receiverPostCode: string
   receiverPostCode: string
 }
 }
+export interface LogisticsFormData {
+  processNumber: string
+  trackingNumber: string
+  expressSheetUrl: string
+  expressSheet: File | null
+}