From 349bc2a65f1c0e49613e475323957a63c3d94228 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Sat, 12 Apr 2025 16:08:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor(approval):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将审批处理页面的默认状态值从1改为2，以符合业务需求。同时，在结账组件中优化用户类型判断逻辑，使用新增的corpidLogin变量替代corpid.value的判断，提高代码可读性和维护性。
---
 src/pages/approval/handle.vue             | 2 +-
 src/pages/product/components/checkout.vue | 8 ++++----
 src/pinia/stores/wx.ts                    | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/approval/handle.vue b/src/pages/approval/handle.vue
index 49ed9d3..e9ffd7a 100644
--- a/src/pages/approval/handle.vue
+++ b/src/pages/approval/handle.vue
@@ -29,7 +29,7 @@ const approvalStore = useApprovalStore()
 
 const formData = ref<HandleApprovalRequestData>({
     approvalId: approvalStore.currentApproval?.approvalId || 0,
-    status: 1,
+    status: 2,
     returnAmount: 0,
     auditImages: '',
     auditRemark: ''
diff --git a/src/pages/product/components/checkout.vue b/src/pages/product/components/checkout.vue
index c36a50a..2cf86ca 100644
--- a/src/pages/product/components/checkout.vue
+++ b/src/pages/product/components/checkout.vue
@@ -14,7 +14,7 @@ const cartStore = useCartStore()
 const { cartItems, totalPrice } = storeToRefs(cartStore)
 
 const wxStore = useWxStore()
-const { openid, balance, corpid, userid: qyUserid } = storeToRefs(wxStore)
+const { openid, balance, corpid, corpidLogin, userid: qyUserid } = storeToRefs(wxStore)
 
 const ab98UserStore = useAb98UserStore()
 const { tel, userid: ab98Userid } = storeToRefs(ab98UserStore)
@@ -77,10 +77,10 @@ async function handleSubmit() {
   submitting.value = true
   try {
     // 判断用户类型：
-    // 2 - 企业微信用户（corpid存在）
-    // 1 - 汇邦云用户（qyUserid存在）
+    // 2 - 企业微信用户
+    // 1 - 汇邦云用户
     // 0 - 外部用户
-    const isInternal = corpid.value ? 2 : qyUserid.value ? 1 : 0;
+    const isInternal = corpidLogin ? 2 : ab98Userid.value ? 1 : 0;
     const requestData: SubmitOrderRequestData = {
       openid: openid.value,
       userid: wxStore.userid,
diff --git a/src/pinia/stores/wx.ts b/src/pinia/stores/wx.ts
index fa0cc11..57aa911 100644
--- a/src/pinia/stores/wx.ts
+++ b/src/pinia/stores/wx.ts
@@ -15,6 +15,8 @@ export const useWxStore = defineStore("wx", () => {
   const balance = ref<number>(0);
   // 企业id
   const corpid = ref<string>("");
+  // 是否企业微信登录
+  const corpidLogin = ref<boolean>(false);
   // 是否是柜子管理员
   const isCabinetAdmin = ref<boolean>(false);
 
@@ -37,6 +39,7 @@ export const useWxStore = defineStore("wx", () => {
       code.value = params.code
       state.value = params.state || state.value
       corpid.value = params.corpid || corpid.value
+      corpidLogin.value = !!corpid.value;
       
       try {
         if (!corpid.value) {
@@ -82,7 +85,7 @@ export const useWxStore = defineStore("wx", () => {
     }
   }
 
-  return { code, state, openid, corpid, userid, balance, isCabinetAdmin, 
+  return { code, state, openid, corpid, userid, balance, isCabinetAdmin, corpidLogin, 
     setOpenid, setBalance, handleWxCallback, setIsCabinetAdmin }
 })