Merge branch 'main' of http://1.117.67.95:3000/team/tydata-webview-v2

src/App.vue

@@ -7,7 +7,7 @@ import { useDialogStore } from "@/stores/dialogStore";
 import { useAuthStore } from "@/stores/authStore";
 import { useWeixinShare } from "@/composables/useWeixinShare";
 import WechatOverlay from "@/components/WechatOverlay.vue";
-import MaintenanceDialog from "@/components/MaintenanceDialog.vue";
+// import MaintenanceDialog from "@/components/MaintenanceDialog.vue";
 
 const router = useRouter();
 const agentStore = useAgentStore();
@@ -209,7 +209,8 @@ const h5WeixinGetCode = () => {
     <RouterView />
 
     <WechatOverlay />
-   <BindPhoneDialog />
+    <BindPhoneDialog />
+    <!-- <MaintenanceDialog /> -->
 </template>
 
 <style scoped></style>

src/components/Payment.vue

@@ -151,61 +151,76 @@ const router = useRouter();
 const discountPrice = ref(false); // 是否应用折扣
 
 async function getPayment() {
-    const { data, error } = await useApiFetch("/pay/payment")
+    showConfirmDialog({
-        .post({
+        title: "重要安全声明",
-            id: props.id,
+        message: `为保障您的个人信息与资金安全，请您务必知悉以下事项：
-            pay_method: selectedPaymentMethod.value,
-            pay_type: props.type,
-        })
-        .json();
 
-    if (data.value && !error.value) {
+关于平台业务：本平台官方服务仅限于大数据报告查询，不涉及也从未开展"央行征信修复"、"贷款办理"或"征信洗白"等相关业务。请注意，本平台出具的报告仅供决策参考，不可作为任何官方征信凭证或贷款依据。
-        const prepayId = data.value.data.prepay_id;
-        const orderNoFromResp = data.value.data.order_no;
 
-        // 开发环境测试支付：仅当用户选择「开发环境测试支付」时后端才返回 test_payment_success
+关于诈骗警示：任何自称与本平台合作，或以"内部渠道"、"百分百包下款"、"修复征信"等为由，诱导您进行支付的行为，均属欺诈。请您切勿相信，谨慎对待任何支付要求。
-        // 若选择支付宝/微信却收到此值，说明后端异常，不跳转、直接报错
+
-        if (prepayId === "test_payment_success") {
+关于安全提示：请您时刻保持警惕，妥善保管个人敏感信息。如遇任何索款要求或可疑承诺，请务必首先通过我平台官方公布的联系方式进行核实，切勿轻信他人。`,
-            if (selectedPaymentMethod.value === "alipay" || selectedPaymentMethod.value === "wechat") {
+    })
-                showToast({ message: "支付参数异常，请重试", type: "fail" });
+        .then(async () => {
-                return;
+            const { data, error } = await useApiFetch("/pay/payment")
+                .post({
+                    id: props.id,
+                    pay_method: selectedPaymentMethod.value,
+                    pay_type: props.type,
+                })
+                .json();
+
+            if (data.value && !error.value) {
+                const prepayId = data.value.data.prepay_id;
+                const orderNoFromResp = data.value.data.order_no;
+
+                // 开发环境测试支付：仅当用户选择「开发环境测试支付」时后端才返回 test_payment_success
+                // 若选择支付宝/微信却收到此值，说明后端异常，不跳转、直接报错
+                if (prepayId === "test_payment_success") {
+                    if (selectedPaymentMethod.value === "alipay" || selectedPaymentMethod.value === "wechat") {
+                        showToast({ message: "支付参数异常，请重试", type: "fail" });
+                        return;
+                    }
+                    show.value = false;
+                    router.push({
+                        path: "/payment/result",
+                        query: { orderNo: orderNoFromResp },
+                    });
+                    return;
+                }
+
+                if (selectedPaymentMethod.value === "alipay") {
+                    orderNo.value = orderNoFromResp;
+                    // 存储订单ID以便支付宝返回时获取
+                    const prepayUrl = prepayId;
+                    const paymentForm = document.createElement("form");
+                    paymentForm.method = "POST";
+                    paymentForm.action = prepayUrl;
+                    paymentForm.style.display = "none";
+                    document.body.appendChild(paymentForm);
+                    paymentForm.submit();
+                } else {
+                    const payload = data.value.data.prepay_data;
+                    WeixinJSBridge.invoke(
+                        "getBrandWCPayRequest",
+                        payload,
+                        function (res) {
+                            if (res.err_msg == "get_brand_wcpay_request:ok") {
+                                // 支付成功，直接跳转到结果页面
+                                router.push({
+                                    path: "/payment/result",
+                                    query: { orderNo: orderNoFromResp },
+                                });
+                            }
+                        }
+                    );
+                }
             }
             show.value = false;
-            router.push({
+        })
-                path: "/payment/result",
+        .catch(() => {
-                query: { orderNo: orderNoFromResp },
-            });
             return;
-        }
+        });
-
-        if (selectedPaymentMethod.value === "alipay") {
-            orderNo.value = orderNoFromResp;
-            // 存储订单ID以便支付宝返回时获取
-            const prepayUrl = prepayId;
-            const paymentForm = document.createElement("form");
-            paymentForm.method = "POST";
-            paymentForm.action = prepayUrl;
-            paymentForm.style.display = "none";
-            document.body.appendChild(paymentForm);
-            paymentForm.submit();
-        } else {
-            const payload = data.value.data.prepay_data;
-            WeixinJSBridge.invoke(
-                "getBrandWCPayRequest",
-                payload,
-                function (res) {
-                    if (res.err_msg == "get_brand_wcpay_request:ok") {
-                        // 支付成功，直接跳转到结果页面
-                        router.push({
-                            path: "/payment/result",
-                            query: { orderNo: orderNoFromResp },
-                        });
-                    }
-                }
-            );
-        }
-    }
-    show.value = false;
 }
 </script>
 

src/composables/useApiFetch.js

@@ -51,22 +51,34 @@ const useApiFetch = createFetch({
 
             if (data.code !== 200) {
                 if (data.code === 100009) {
-                    // 改进的存储管理
+                    // 用户不存在：清除并刷新
                     localStorage.removeItem('token')
                     localStorage.removeItem('refreshAfter')
                     localStorage.removeItem('accessExpire')
                     localStorage.removeItem('userInfo')
                     localStorage.removeItem('agentInfo')
 
-                    // 重置状态
                     const userStore = useUserStore();
                     const agentStore = useAgentStore();
                     userStore.resetUser()
                     agentStore.resetAgent()
                     location.reload()
-
                 }
-                if (data.code !== 200002 && data.code !== 200003 && data.code !== 200004 && data.code !== 100009) {
+                if (data.code === 100011) {
+                    // 账号已被封禁：提示并跳转登录
+                    showToast({ message: data.msg || "账号已被封禁" });
+                    localStorage.removeItem('token')
+                    localStorage.removeItem('refreshAfter')
+                    localStorage.removeItem('accessExpire')
+                    localStorage.removeItem('userInfo')
+                    localStorage.removeItem('agentInfo')
+                    const userStore = useUserStore();
+                    const agentStore = useAgentStore();
+                    userStore.resetUser()
+                    agentStore.resetAgent()
+                    router.replace("/login");
+                }
+                if (data.code !== 200002 && data.code !== 200003 && data.code !== 200004 && data.code !== 100009 && data.code !== 100011) {
                     showToast({ message: data.msg });
                 }
             }
@@ -75,12 +87,23 @@ const useApiFetch = createFetch({
         async onFetchError({ error, response }) {
             console.log("error", error);
             closeToast();
-            if (response.status === 401) {
+            if (response?.status === 401) {
-                // 清除本地存储的 token
                 localStorage.removeItem("token");
                 localStorage.removeItem('refreshAfter')
                 localStorage.removeItem('accessExpire')
-                // 跳转到登录页
+                router.replace("/login");
+            } else if (response?.status === 403) {
+                // 账号已被封禁
+                showToast({ message: "账号已被封禁" });
+                localStorage.removeItem("token");
+                localStorage.removeItem('refreshAfter')
+                localStorage.removeItem('accessExpire')
+                localStorage.removeItem('userInfo')
+                localStorage.removeItem('agentInfo')
+                const userStore = useUserStore();
+                const agentStore = useAgentStore();
+                userStore.resetUser()
+                agentStore.resetAgent()
                 router.replace("/login");
             } else {
                 if (typeof error === "string") {