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({ 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(0); // 企业id const corpid = ref(""); + // 是否企业微信登录 + const corpidLogin = ref(false); // 是否是柜子管理员 const isCabinetAdmin = ref(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 } })