diff --git a/src/common/apis/cabinet/index.ts b/src/common/apis/cabinet/index.ts index 829b053..4a10a34 100644 --- a/src/common/apis/cabinet/index.ts +++ b/src/common/apis/cabinet/index.ts @@ -1,5 +1,6 @@ import { request } from '@/http/axios' import type { CabinetDetailResponse } from './type' +import { OpenCabinetApiData } from '../shop/type' /** 获取智能柜详情接口 */ export function getCabinetDetailApi() { @@ -9,9 +10,10 @@ export function getCabinetDetailApi() { }) } -export function openCabinet(lockControlNo: number, pinNo: number) { +export function openCabinet(lockControlNo: number, pinNo: number, data: OpenCabinetApiData) { return request>({ url: `cabinet/openCabinet/${lockControlNo}/${pinNo}`, - method: 'post' + method: 'post', + data }) } \ No newline at end of file diff --git a/src/common/apis/shop/type.ts b/src/common/apis/shop/type.ts index bf49b59..0803c5f 100644 --- a/src/common/apis/shop/type.ts +++ b/src/common/apis/shop/type.ts @@ -111,6 +111,8 @@ export interface QyLoginDTO { } export interface OpenCabinetApiData { + // 格口ID + cellId?: number // 用户ID userid: string // 是否内部用户(0否 1汇邦云用户 2企业微信用户) diff --git a/src/pages/approval/handle.vue b/src/pages/approval/handle.vue index c137c8c..8f619ad 100644 --- a/src/pages/approval/handle.vue +++ b/src/pages/approval/handle.vue @@ -200,7 +200,7 @@ const handleOpenCabinet = async () => { isInternal: isInternal, name: isInternal === 2 ? qyName.value : name.value, mobile: tel.value, - operationType: 0 + operationType: 2 } ) if (result.code !== 0) { diff --git a/src/pages/cabinet/index.vue b/src/pages/cabinet/index.vue index 634cb1c..99cb2e3 100644 --- a/src/pages/cabinet/index.vue +++ b/src/pages/cabinet/index.vue @@ -56,10 +56,11 @@ import { ref } from 'vue' import { getCabinetDetailApi, openCabinet } from '@/common/apis/cabinet' import type { CabinetDetailDTO } from '@/common/apis/cabinet/type' -import { useWxStoreOutside } from '@/pinia/stores/wx' +import { useWxStore, useWxStoreOutside } from '@/pinia/stores/wx' import { publicPath } from "@/common/utils/path" -const wxStore = useWxStoreOutside() +const wxStore = useWxStore(); +const { userid: qyUserid, name: qyName } = storeToRefs(wxStore); const activeCabinet = ref(0) const cabinetList = ref([]) @@ -132,7 +133,14 @@ const handleOpenLocker = async (locker: LockerItem) => { openingLockerId.value = locker.lockerId try { // 调用打开柜口接口 - await openCabinet(cabinetList.value[activeCabinet.value].lockControlNo, locker.lockerNumber) + await openCabinet(cabinetList.value[activeCabinet.value].lockControlNo, locker.lockerNumber, { + cellId: locker.lockerId, + userid: qyUserid.value, + isInternal: 2, + name: qyName.value, + mobile: '', + operationType: 2 + }) } catch (error) { console.error('打开柜口失败:', error) } finally { diff --git a/src/pages/order/Success.vue b/src/pages/order/Success.vue index 5f4093e..52d9d59 100644 --- a/src/pages/order/Success.vue +++ b/src/pages/order/Success.vue @@ -29,7 +29,7 @@ async function handleOpenCabinet(orderId: number, orderGoodsId: number) { isInternal: isInternal, name: isInternal === 2 ? qyName.value : name.value, mobile: tel.value, - operationType: 0 + operationType: 1 }); if (result.code !== 0) { showFailToast(result.msg || '开启失败,请稍后重试') diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue index 5866633..2d2bac1 100644 --- a/src/pages/order/index.vue +++ b/src/pages/order/index.vue @@ -78,7 +78,7 @@ async function handleOpenCabinet(item: OrderGoods) { isInternal: isInternal, name: isInternal === 2 ? qyName.value : name.value, mobile: tel.value, - operationType: 0 + operationType: 1 }) if (result.code !== 0) { showFailToast(result.msg || '开启失败,请稍后重试')