src/pages/approval/handle.vue

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

src/pages/approval/submit.vue

@@ -5,14 +5,10 @@ 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),
@@ -99,7 +95,7 @@ const handleSubmit = async () => {
         const { code, data } = await submitApprovalApi(formData.value)
 
         if (code === 0) {
-            orderStore.getOrders(wxStore.openid);
+            showSuccessToast('提交成功')
             try {
                 await showConfirmDialog({
                     title: "提交成功",

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 } = storeToRefs(wxStore)
+const { openid, balance, corpid, userid: qyUserid } = storeToRefs(wxStore)
 
 const ab98UserStore = useAb98UserStore()
 const { tel, userid: ab98Userid } = storeToRefs(ab98UserStore)
@@ -77,14 +77,10 @@ async function handleSubmit() {
   submitting.value = true
   try {
     // 判断用户类型：
-    // 2 - 企业微信用户
+    // 2 - 企业微信用户（corpid存在）
-    // 1 - 汇邦云用户
+    // 1 - 汇邦云用户（qyUserid存在）
     // 0 - 外部用户
-    const isInternal = corpidLogin.value ? 2 : ab98Userid.value ? 1 : 0;
+    const isInternal = corpid.value ? 2 : qyUserid.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,
@@ -171,7 +167,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="!corpidLogin">
+              <van-radio name="wechat" v-if="!wxStore.corpid">
                 <van-icon name="wechat" class="method-icon" />
                 微信支付
               </van-radio>

src/pinia/stores/wx.ts

@@ -15,8 +15,6 @@ 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);
 
@@ -39,9 +37,6 @@ 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) {
@@ -87,7 +82,7 @@ export const useWxStore = defineStore("wx", () => {
     }
   }
 
-  return { code, state, openid, corpid, userid, balance, isCabinetAdmin, corpidLogin, 
+  return { code, state, openid, corpid, userid, balance, isCabinetAdmin, 
     setOpenid, setBalance, handleWxCallback, setIsCabinetAdmin }
 })