src/common/apis/cabinet/index.ts

@@ -1,6 +1,5 @@
 import { request } from '@/http/axios'
 import type { CabinetDetailResponse } from './type'
-import { OpenCabinetApiData } from '../shop/type'
 
 /** 获取智能柜详情接口 */
 export function getCabinetDetailApi() {
@@ -10,10 +9,9 @@ export function getCabinetDetailApi() {
   })
 }
 
-export function openCabinet(lockControlNo: number, pinNo: number, data: OpenCabinetApiData) {
+export function openCabinet(lockControlNo: number, pinNo: number) {
   return request<ApiResponseData<void>>({
     url: `cabinet/openCabinet/${lockControlNo}/${pinNo}`,
-    method: 'post',
+    method: 'post'
-    data
   })
 }

src/common/apis/shop/index.ts

@@ -1,5 +1,5 @@
 import { request } from "@/http/axios"
-import { GetBalanceResponse, GetOrdersByOpenIdDTO, OpenCabinetApiData, QyLoginDTO, QyLoginRequestParams, ShopGoodsResponseData, SubmitOrderRequestData, SubmitOrderResponseData } from './type'
+import { GetBalanceResponse, GetOrdersByOpenIdDTO, QyLoginDTO, QyLoginRequestParams, ShopGoodsResponseData, SubmitOrderRequestData, SubmitOrderResponseData } from './type'
 import { GetOpenIdRequestParams } from './type'
 
 
@@ -47,11 +47,10 @@ export function getOrdersByOpenIdApi(openid: string) {
 }
 
 /** 打开储物柜接口 */
-export function openCabinetApi(orderId: number, orderGoodsId: number, data: OpenCabinetApiData) {
+export function openCabinetApi(orderId: number, orderGoodsId: number) {
   return request<ApiResponseData<void>>({
     url: `order/openCabinet/${orderId}/${orderGoodsId}`,
-    method: "post",
+    method: "post"
-    data
   })
 }
 

src/common/apis/shop/type.ts

@@ -107,20 +107,4 @@ export interface QyLoginDTO {
   userid: string
   openid: string
   isCabinetAdmin: number
-  name: string
-}
-
-export interface OpenCabinetApiData {
-  // 格口ID
-  cellId?: number
-  // 用户ID
-  userid: string
-  // 是否内部用户（0否 1汇邦云用户 2企业微信用户）
-  isInternal: number
-  // 姓名
-  name: string
-  // 联系电话
-  mobile: string
-  // 操作类型（1用户 2管理员）
-  operationType: number
 }

src/pages/approval/handle.vue

@@ -9,16 +9,12 @@ import { useRoute, useRouter } from 'vue-router'
 import { useApprovalStore } from '@/pinia/stores/approval'
 import { useWxStore } from '@/pinia/stores/wx';
 import Compressor from 'compressorjs';
-import { useAb98UserStore } from '@/pinia/stores/ab98-user'
 
 const { VITE_APP_BASE_API } = import.meta.env;
 const router = useRouter()
 const route = useRoute()
 const approvalStore = useApprovalStore();
 const wxStore = useWxStore();
-const { openid, balance, corpidLogin, userid: qyUserid, name: qyName } = storeToRefs(wxStore);
-const ab98UserStore = useAb98UserStore();
-const { tel, userid: ab98Userid, name } = storeToRefs(ab98UserStore);
 
 const formData = ref<HandleApprovalRequestData>({
     approvalId: approvalStore.currentApproval?.approvalId || 0,
@@ -192,16 +188,9 @@ const handleOpenCabinet = async () => {
 
     isButtonDisabled.value = true
     try {
-        const isInternal = corpidLogin.value ? 2 : ab98Userid.value ? 1 : 0;
         const result = await openCabinetApi(
             approvalStore.currentApproval.orderId,
-            approvalStore.currentApproval.orderGoodsId, {
+            approvalStore.currentApproval.orderGoodsId
-                userid: isInternal === 2 ? qyUserid.value : ab98Userid.value,
-                isInternal: isInternal,
-                name: isInternal === 2 ? qyName.value : name.value,
-                mobile: tel.value,
-                operationType: 2
-            }
         )
         if (result.code !== 0) {
             showFailToast(result.msg || '开启失败')

src/pages/cabinet/index.vue

@@ -56,11 +56,10 @@
 import { ref } from 'vue'
 import { getCabinetDetailApi, openCabinet } from '@/common/apis/cabinet'
 import type { CabinetDetailDTO } from '@/common/apis/cabinet/type'
-import { useWxStore, useWxStoreOutside } from '@/pinia/stores/wx'
+import { useWxStoreOutside } from '@/pinia/stores/wx'
 import { publicPath } from "@/common/utils/path"
 
-const wxStore = useWxStore();
+const wxStore = useWxStoreOutside()
-const { userid: qyUserid, name: qyName } = storeToRefs(wxStore);
 
 const activeCabinet = ref(0)
 const cabinetList = ref<CabinetItem[]>([])
@@ -133,14 +132,7 @@ 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 {

src/pages/me/index.vue

@@ -4,32 +4,15 @@ import { useWxStore } from '@/pinia/stores/wx'
 import { useAb98UserStore } from '@/pinia/stores/ab98-user'
 import { storeToRefs } from 'pinia'
 import { publicPath } from "@/common/utils/path"
-import { showConfirmDialog } from 'vant';
 
 const router = useRouter()
 const wxStore = useWxStore()
 const ab98UserStore = useAb98UserStore()
 
-const { balance, name: qyName } = storeToRefs(wxStore);
+const { balance } = storeToRefs(wxStore)
-const { name: userName, sex: userSex, face_img } = storeToRefs(ab98UserStore);
+const { name: userName, sex: userSex, face_img } = storeToRefs(ab98UserStore)
 
-const name = computed(() => {
+const userAvatar = face_img.value ? face_img.value : `${publicPath}img/1.jpg`
-  return userName.value || qyName.value || '未知用户'
-})
-
-const userAvatar = face_img.value ? face_img.value : `${publicPath}img/1.jpg`;
-
-const handleLogout = () => {
-  showConfirmDialog({
-    title: '退出登录',
-    message: '确定要退出当前账号吗？',
-  }).then(() => {
-    ab98UserStore.clearUserInfo();
-    router.push('/ab98');
-  }).catch(() => {
-    // 取消操作
-  });
-}
 </script>
 
 <template>
@@ -44,10 +27,9 @@ const handleLogout = () => {
               height="80"
               :src="userAvatar"
               class="mr-4"
-              @click="handleLogout"
             />
             <div>
-              <div class="text-lg font-bold mb-2">{{ name }}</div>
+              <div class="text-lg font-bold mb-2">{{ userName }}</div>
               <van-tag type="primary" class="mr-2">{{ userSex }}</van-tag>
             </div>
           </div>

src/pages/order/Success.vue

@@ -2,35 +2,23 @@
 import { useRouter } from 'vue-router'
 import { useRoute } from 'vue-router'
 import { Order, useOrderStore } from '@/pinia/stores/order'
-import { useWxStore, useWxStoreOutside } from '@/pinia/stores/wx'
+import { useWxStoreOutside } from '@/pinia/stores/wx'
 import { openCabinetApi } from '@/common/apis/shop'
 import { showSuccessToast, showFailToast } from 'vant'
 import { ref } from 'vue'
-import { useAb98UserStore } from '@/pinia/stores/ab98-user'
 
 const router = useRouter()
 const route = useRoute()
 const orderStore = useOrderStore()
+const wxStore = useWxStoreOutside()
 const orderId = ref(Number(route.query.orderId))
 const currentOrder = ref<Order>()
 const isButtonDisabled = ref<Record<number, boolean>>({})
 
-const wxStore = useWxStore();
-const { openid, balance, corpidLogin, userid: qyUserid, name: qyName } = storeToRefs(wxStore);
-const ab98UserStore = useAb98UserStore();
-const { tel, userid: ab98Userid, name } = storeToRefs(ab98UserStore);
-
 async function handleOpenCabinet(orderId: number, orderGoodsId: number) {
   isButtonDisabled.value[orderGoodsId] = true
   try {
-    const isInternal = corpidLogin.value ? 2 : ab98Userid.value ? 1 : 0;
+    const result = await openCabinetApi(orderId, orderGoodsId)
-    const result = await openCabinetApi(orderId, orderGoodsId, {
-      userid: isInternal === 2 ? qyUserid.value : ab98Userid.value,
-      isInternal: isInternal,
-      name: isInternal === 2 ? qyName.value : name.value,
-      mobile: tel.value,
-      operationType: 1
-    });
     if (result.code !== 0) {
       showFailToast(result.msg || '开启失败，请稍后重试')
       return

src/pages/order/index.vue

@@ -5,18 +5,11 @@ import { useRoute, useRouter } from 'vue-router'
 import { openCabinetApi } from '@/common/apis/shop'
 import { showSuccessToast, showFailToast } from 'vant'
 import { ref } from 'vue'
-import { useWxStore } from '@/pinia/stores/wx'
-import { useAb98UserStore } from '@/pinia/stores/ab98-user'
 
 const orderStore = useOrderStore()
 const route = useRoute()
 const router = useRouter()
 
-const wxStore = useWxStore();
-const { openid, balance, corpidLogin, userid: qyUserid, name: qyName } = storeToRefs(wxStore);
-const ab98UserStore = useAb98UserStore();
-const { tel, userid: ab98Userid, name } = storeToRefs(ab98UserStore);
-
 const statusMap: Record<number, string> = {
   1: '待付款',
   2: '已付款',
@@ -72,14 +65,7 @@ async function handleOpenCabinet(item: OrderGoods) {
   const orderGoodsId = item.orderGoods.orderGoodsId
   isButtonDisabled.value[orderGoodsId] = true
   try {
-    const isInternal = corpidLogin.value ? 2 : ab98Userid.value ? 1 : 0;
+    const result = await openCabinetApi(orderId.value, orderGoodsId)
-    const result = await openCabinetApi(orderId.value, orderGoodsId, {
-      userid: isInternal === 2 ? qyUserid.value : ab98Userid.value,
-      isInternal: isInternal,
-      name: isInternal === 2 ? qyName.value : name.value,
-      mobile: tel.value,
-      operationType: 1
-    })
     if (result.code !== 0) {
       showFailToast(result.msg || '开启失败，请稍后重试')
       return
@@ -134,7 +120,7 @@ async function handleOpenCabinet(item: OrderGoods) {
             <p>小计: ¥{{ (item.orderGoods.price * item.orderGoods.quantity).toFixed(2) }}</p>
             <div class="button-group">
               <van-button 
-                v-if="[1,5].includes(item.orderGoods.status) && [2,3].includes(order.payStatus)"
+                v-if="[1,5].includes(item.orderGoods.status)"
                 type="primary"
                 size="small"
                 @click="handleOpenCabinet(item)"
@@ -143,7 +129,7 @@ async function handleOpenCabinet(item: OrderGoods) {
                 打开柜子
               </van-button>
               <van-button 
-                v-if="item.orderGoods.status === 1 && [2,3].includes(order.payStatus)"
+                v-if="item.orderGoods.status === 1"
                 type="primary"
                 size="small"
                 @click="handleRefund(item)"

src/pages/product/components/checkout.vue

@@ -14,7 +14,7 @@ const cartStore = useCartStore()
 const { cartItems, totalPrice } = storeToRefs(cartStore)
 
 const wxStore = useWxStore()
-const { openid, balance, corpidLogin, userid: qyUserid, name: qyName } = storeToRefs(wxStore)
+const { openid, balance, corpidLogin, userid: qyUserid } = storeToRefs(wxStore)
 
 const ab98UserStore = useAb98UserStore()
 const { tel, userid: ab98Userid, name } = storeToRefs(ab98UserStore)
@@ -102,7 +102,7 @@ async function handleSubmit() {
       })),
       paymentType: selectedPayment.value,
       mobile: tel.value,
-      name: isInternal === 2 ? qyName.value : name.value,
+      name: name.value,
       qyUserid: isInternal === 2 ? qyUserid.value : ab98Userid.value,
       isInternal: isInternal
     }

src/pinia/stores/wx.ts

@@ -19,8 +19,6 @@ export const useWxStore = defineStore("wx", () => {
   const corpidLogin = ref<boolean>(false);
   // 是否是柜子管理员
   const isCabinetAdmin = ref<boolean>(false);
-  // 企业微信用户姓名
-  const name = ref<string>("");
 
   // 设置 openid
   const setOpenid = (id: string) => {
@@ -59,7 +57,6 @@ export const useWxStore = defineStore("wx", () => {
             userid.value = res.data.userid;
             openid.value = res.data.openid;
             isCabinetAdmin.value = res.data.isCabinetAdmin === 1;
-            name.value = res.data.name;
           }
         }
 
@@ -90,7 +87,7 @@ export const useWxStore = defineStore("wx", () => {
     }
   }
 
-  return { code, state, openid, corpid, userid, balance, isCabinetAdmin, corpidLogin, name,
+  return { code, state, openid, corpid, userid, balance, isCabinetAdmin, corpidLogin, 
     setOpenid, setBalance, handleWxCallback, setIsCabinetAdmin }
 })