Compare commits

...

3 Commits

Author SHA1 Message Date
dzq 09b346eb80 fix(approval): 修正审批处理页面的返回金额默认值
在审批处理页面中,将返回金额的默认值从0更改为当前审批的商品价格,以确保默认值更符合业务逻辑。同时,在提交审批成功后,更新订单列表以反映最新状态。
2025-04-14 16:53:44 +08:00
dzq 6ad260f05e fix: 修复corpidLogin引用错误并添加调试日志
修复了在`checkout.vue`中错误引用`corpidLogin`的问题,将其从`wxStore`改为直接使用`corpidLogin.value`。同时,在`wx.ts`和`checkout.vue`中添加了调试日志,以便更好地跟踪`corpid`和`corpidLogin`的状态。
2025-04-14 08:10:13 +08:00
dzq 349bc2a65f refactor(approval): 修改审批状态默认值并优化用户类型判断逻辑
将审批处理页面的默认状态值从1改为2,以符合业务需求。同时,在结账组件中优化用户类型判断逻辑,使用新增的corpidLogin变量替代corpid.value的判断,提高代码可读性和维护性。
2025-04-12 16:08:46 +08:00
4 changed files with 22 additions and 9 deletions

View File

@ -29,8 +29,8 @@ const approvalStore = useApprovalStore()
const formData = ref<HandleApprovalRequestData>({
approvalId: approvalStore.currentApproval?.approvalId || 0,
status: 1,
returnAmount: 0,
status: 2,
returnAmount: approvalStore.currentApproval?.goodsPrice || 0,
auditImages: '',
auditRemark: ''
})

View File

@ -5,10 +5,14 @@ import axios from "axios"
import { submitApprovalApi } from '@/common/apis/approval'
import type { SubmitApprovalRequestData } from '@/common/apis/approval/type'
import { useRouter } from 'vue-router'
import { useOrderStore } from '@/pinia/stores/order'
import { useWxStoreOutside } from '@/pinia/stores/wx'
const { VITE_APP_BASE_API } = import.meta.env;
const router = useRouter()
const route = useRoute()
const orderStore = useOrderStore()
const wxStore = useWxStoreOutside()
const formData = ref<SubmitApprovalRequestData>({
orderGoodsId: Number(route.query.orderGoodsId),
@ -95,7 +99,7 @@ const handleSubmit = async () => {
const { code, data } = await submitApprovalApi(formData.value)
if (code === 0) {
showSuccessToast('提交成功')
orderStore.getOrders(wxStore.openid);
try {
await showConfirmDialog({
title: "提交成功",

View File

@ -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, corpidLogin, userid: qyUserid } = storeToRefs(wxStore)
const ab98UserStore = useAb98UserStore()
const { tel, userid: ab98Userid } = storeToRefs(ab98UserStore)
@ -77,10 +77,14 @@ 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.value ? 2 : ab98Userid.value ? 1 : 0;
console.log('corpidLogin', corpidLogin.value)
console.log('qyUserid', qyUserid.value)
console.log("isInternal", isInternal)
const requestData: SubmitOrderRequestData = {
openid: openid.value,
userid: wxStore.userid,
@ -167,7 +171,7 @@ async function handleSubmit() {
<van-field label="支付方式" :model-value="selectedPayment" readonly>
<template #input>
<van-radio-group v-model="selectedPayment" direction="horizontal">
<van-radio name="wechat" v-if="!wxStore.corpid">
<van-radio name="wechat" v-if="!corpidLogin">
<van-icon name="wechat" class="method-icon" />
微信支付
</van-radio>

View File

@ -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,9 @@ 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;
console.log('corpid:', corpid.value)
console.log('corpidLogin:', corpidLogin.value)
try {
if (!corpid.value) {
@ -82,7 +87,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 }
})