src/App.vue

@@ -5,14 +5,12 @@ import { useDark } from "@@/composables/useDark"
 import { useWxStore } from "@/pinia/stores/wx"
 import { tokenLogin } from '@/common/apis/ab98'
 import { useAb98UserStore } from '@/pinia/stores/ab98-user'
-import { useProductStore } from "./pinia/stores/product"
 
 // const userStore = useUserStore()
-const wxStore = useWxStore();
+const wxStore = useWxStore()
-const route = useRoute();
+const route = useRoute()
-const router = useRouter();
+const router = useRouter()
-const ab98UserStore = useAb98UserStore();
+const ab98UserStore = useAb98UserStore()
-const productStore = useProductStore();
 
 const { isDark, initDark } = useDark()
 

src/common/apis/cabinet/index.ts

@@ -10,9 +10,9 @@ export function getCabinetDetailApi() {
   })
 }
 
-export function openCabinet(cabinetId: number, pinNo: number, data: OpenCabinetApiData) {
+export function openCabinet(lockControlNo: number, pinNo: number, data: OpenCabinetApiData) {
   return request<ApiResponseData<void>>({
-    url: `cabinet/openCabinet/${cabinetId}/${pinNo}`,
+    url: `cabinet/openCabinet/${lockControlNo}/${pinNo}`,
     method: 'post',
     data
   })

src/common/apis/shop/index.ts

@@ -5,13 +5,10 @@ import { GetOpenIdRequestParams } from './type'
 
 
 /** 获取商品列表 */
-export function getShopGoodsApi(shopId: number|null) {
+export function getShopGoodsApi() {
   return request<ShopGoodsResponseData>({
     url: "shop/goods",
-    method: "get",
+    method: "get"
-    params: {
-      shopId: shopId ? shopId : undefined
-    }
   })
 }
 

src/pages/cabinet/index.vue

@@ -133,7 +133,7 @@ const handleOpenLocker = async (locker: LockerItem) => {
     openingLockerId.value = locker.lockerId
     try {
         // 调用打开柜口接口
-        await openCabinet(cabinetList.value[activeCabinet.value].cabinetId, locker.lockerNumber, {
+        await openCabinet(cabinetList.value[activeCabinet.value].lockControlNo, locker.lockerNumber, {
             cellId: locker.lockerId,
             userid: qyUserid.value,
             isInternal: 2,

src/pinia/stores/product.ts

@@ -14,24 +14,12 @@ export interface Product {
 
 export const useProductStore = defineStore("product", () => {
   // 商品数据
-  const labels = ref<Array<{ id: number, name: string }>>([]);
+  const labels = ref<Array<{ id: number, name: string }>>([])
-  const categories = ref<Product[]>([]);
+  const categories = ref<Product[]>([])
-  const shopId = ref<number|null>(null);
-
-  const setShopId = (id: number|string) => {
-    shopId.value = Number(id);
-    getGoods();
-  }
 
   const getGoods = async () => {
-    const urlParams = new URLSearchParams(window.location.search);
-    const shopIdParams = urlParams.get('shopId') || undefined;
-    if (shopIdParams) {
-      shopId.value = Number(shopIdParams);
-    }
-    
     try {
-      const { data } = await getShopGoodsApi(shopId.value);
+      const { data } = await getShopGoodsApi()
 
       // 转换分类标签
       labels.value = data.categoryList.map(c => ({
@@ -54,7 +42,8 @@ export const useProductStore = defineStore("product", () => {
       console.error("获取商品数据失败:", error)
     }
   }
-  return { labels, categories, shopId, getGoods, setShopId }
+  getGoods()
+  return { labels, categories, getGoods }
 })
 
 /**