From 89e71360eb720b5fe15ad5a4c11b1e90100fef82 Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Thu, 11 Sep 2025 19:12:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=B7=E5=BC=8F):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E8=AE=BE=E5=A4=87=E9=BB=98=E8=AE=A4=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AdminCenter.vue          |   4 +
 src/views/Recharge.vue             |  52 ++++++-----
 src/views/RechargeFreightAgent.vue | 144 +++++++++++++++--------------
 src/views/payResult.vue            |   4 +
 4 files changed, 114 insertions(+), 90 deletions(-)

diff --git a/src/views/AdminCenter.vue b/src/views/AdminCenter.vue
index 39010d9..695fc9f 100644
--- a/src/views/AdminCenter.vue
+++ b/src/views/AdminCenter.vue
@@ -351,6 +351,10 @@ const formatPrice = (value) => {
 </script>
 
 <style scoped>
+* {
+  color: black;
+}
+
 /* 添加页面样式 */
 .fullPage {
   width: 100vw;
diff --git a/src/views/Recharge.vue b/src/views/Recharge.vue
index 10b8f29..27c44b9 100644
--- a/src/views/Recharge.vue
+++ b/src/views/Recharge.vue
@@ -137,48 +137,58 @@
 </template>
 
 <script setup>
-import MobileHeader from "../components/MobileHeader.vue";
-import { ref } from "vue";
-import { searchUser } from "@/api/userInfo";
-import { showWarning, } from "@/utils/toast.js";
-import { useRouter } from "vue-router";
-import {usePageInitializationWithConfig} from "@/utils/pageConfig.js";
+import MobileHeader from '../components/MobileHeader.vue'
+import { ref } from 'vue'
+import { searchUser } from '@/api/userInfo'
+import { showWarning } from '@/utils/toast.js'
+import { useRouter } from 'vue-router'
+import { usePageInitializationWithConfig } from '@/utils/pageConfig.js'
 
-const router = useRouter();
+const router = useRouter()
 
-const dialogshow = ref(false);
+const dialogshow = ref(false)
 // 展示弹窗
 const popupHelp = () => {
-  dialogshow.value = true;
-};
+  dialogshow.value = true
+}
 
 // 关闭弹窗
 const closedPopup = () => {
-  dialogshow.value = false;
-};
+  dialogshow.value = false
+}
 
-const targetUserId = ref("");
+const targetUserId = ref('')
 
 const checkUserId = async () => {
-  console.log("充值目标用户id：", targetUserId.value);
+  console.log('充值目标用户id：', targetUserId.value)
 
   try {
-    const targetUserInfo = await searchUser(targetUserId.value);
-    console.log("targetUserInfo:", targetUserInfo);
+    const targetUserInfo = await searchUser(targetUserId.value)
+    console.log('targetUserInfo:', targetUserInfo)
     if (targetUserInfo.status && targetUserInfo.body.id) {
-      router.push({ path: "/recharge-freight-agent", query: { targetUserId: targetUserId.value, isFreightAgent: targetUserInfo.body.isFreightAgent } });
+      router.push({
+        path: '/recharge-freight-agent',
+        query: {
+          targetUserId: targetUserId.value,
+          isFreightAgent: targetUserInfo.body.isFreightAgent,
+        },
+      })
     } else {
       // 信息提示id有误
-      showWarning("User info not found");
+      showWarning('User info not found')
     }
   } catch (error) {
-    console.log("error:", error.response.errorMsg);
-    throw error;
+    console.log('error:', error.response.errorMsg)
+    throw error
   }
-};
+}
 </script>
 
 <style scoped>
+* {
+  color: black;
+}
+
 .fullPage {
   width: 100vw;
   height: 100vh;
diff --git a/src/views/RechargeFreightAgent.vue b/src/views/RechargeFreightAgent.vue
index 5d6628b..e3c5e86 100644
--- a/src/views/RechargeFreightAgent.vue
+++ b/src/views/RechargeFreightAgent.vue
@@ -67,7 +67,7 @@
         <img
           :src="userProfile.userAvatar"
           alt=""
-          style="width: 10%; margin: 10px; border-radius: 50%"
+          style="width: 10%; margin: 10px; border-radius: 50%; aspect-ratio: 1/1; object-fit: cover"
         />
         <div style="">
           <div style="font-weight: 700; display: flex; align-items: center">
@@ -141,72 +141,72 @@
 </template>
 
 <script setup>
-import { onMounted, ref, watch } from "vue";
-import MobileHeader from "../components/MobileHeader.vue";
-import { searchUser, searchPayRechargeUser } from "@/api/userInfo";
+import { onMounted, ref, watch } from 'vue'
+import MobileHeader from '../components/MobileHeader.vue'
+import { searchUser, searchPayRechargeUser } from '@/api/userInfo'
 // import { getUserIdentity } from "@/api/wallet";
-import { getPayAplication, getAppCommodityCard, payPlaceAnOrderRecharge } from "@/api/pay";
-import { goAirwallex } from "@/utils/payment";
-import { showError, showWarning, showInfo, showSuccess } from "@/utils/toast.js";
+import { getPayAplication, getAppCommodityCard, payPlaceAnOrderRecharge } from '@/api/pay'
+import { goAirwallex } from '@/utils/payment'
+import { showError, showWarning, showInfo, showSuccess } from '@/utils/toast.js'
 
-import { useRoute } from "vue-router";
-import router from "@/router";
-import { useCountryStore } from "@/stores/country";
-import { storeToRefs } from "pinia";
+import { useRoute } from 'vue-router'
+import router from '@/router'
+import { useCountryStore } from '@/stores/country'
+import { storeToRefs } from 'pinia'
 
-const countryStore = useCountryStore();
-const route = useRoute();
+const countryStore = useCountryStore()
+const route = useRoute()
 
 const languageList = ref([
   {
-    type: "English",
+    type: 'English',
   },
-]);
+])
 const selectedLanguage = ref({
-  type: "English",
-});
-const visibleList = ref(false);
+  type: 'English',
+})
+const visibleList = ref(false)
 const listBt = () => {
-  visibleList.value = !visibleList.value;
-};
+  visibleList.value = !visibleList.value
+}
 
-const applicationId = ref("1963531459019739137");
-const userProfile = ref({}); //用户信息
-const type = ref(""); //用户身份
+const applicationId = ref('1963531459019739137')
+const userProfile = ref({}) //用户信息
+const type = ref('') //用户身份
 
-const regionId = ref(""); //区域id
+const regionId = ref('') //区域id
 
-const { list: countryList, selectedCountry } = storeToRefs(countryStore); //国家信息
+const { list: countryList, selectedCountry } = storeToRefs(countryStore) //国家信息
 
-const channels = ref([]); //支付渠道
-const selectedChannelName = ref(""); //选中的支付渠道
+const channels = ref([]) //支付渠道
+const selectedChannelName = ref('') //选中的支付渠道
 
-const commodityList = ref([]); //商品列表
-const selectedCommodity = ref({}); //选中的商品
+const commodityList = ref([]) //商品列表
+const selectedCommodity = ref({}) //选中的商品
 
 // 前往地图页
 const goMap = () => {
-  router.push({ path: "/map" });
-};
+  router.push({ path: '/map' })
+}
 
 const goPay = async (item, commodity) => {
-  selectedCommodity.value = commodity;
+  selectedCommodity.value = commodity
   let payData = {
     applicationId: applicationId.value,
     payCountryId: selectedCountry.value.id,
     goodsId: commodity.id,
     userId: userProfile.value.id,
     channelCode: item.channel.channelCode,
-  };
-  console.log("payData:", payData);
-
-  const payRes = await payPlaceAnOrderRecharge(payData);
-  const body = payRes.body;
-  if (!body) {
-    console.log("Payment not available, please contact administrator!!!");
-    return;
   }
-  if (body.factoryCode === "AIRWALLEX") {
+  console.log('payData:', payData)
+
+  const payRes = await payPlaceAnOrderRecharge(payData)
+  const body = payRes.body
+  if (!body) {
+    console.log('Payment not available, please contact administrator!!!')
+    return
+  }
+  if (body.factoryCode === 'AIRWALLEX') {
     goAirwallex({
       result: body,
       props: {
@@ -215,66 +215,70 @@ const goPay = async (item, commodity) => {
         failUrl: `${location.origin}/#/pay-result?redirect=recharge&appType=${type.value}&appId=${applicationId.value}&appStatus=1`,
       },
       callback: (response) => {
-        if (response.code === "FAIL") {
-          showWarning("init fail!!!");
-          return;
+        if (response.code === 'FAIL') {
+          showWarning('init fail!!!')
+          return
         }
       },
-    });
+    })
   }
   if (body.requestUrl) {
-    location.href = decodeURIComponent(body.requestUrl);
+    location.href = decodeURIComponent(body.requestUrl)
   }
-};
+}
 
 // 选中支付渠道
 const setChannelName = (channelName) => {
-  selectedChannelName.value = selectedChannelName.value != channelName ? channelName : "";
-};
+  selectedChannelName.value = selectedChannelName.value != channelName ? channelName : ''
+}
 
 onMounted(async () => {
-  type.value = route.params.type || "GOLD";
+  type.value = route.params.type || 'GOLD'
 
-  const PayAplication = await getPayAplication(applicationId.value);
-  console.log("PayAplication:", PayAplication);
+  const PayAplication = await getPayAplication(applicationId.value)
+  console.log('PayAplication:', PayAplication)
   if (PayAplication.body && PayAplication.body.appCode) {
     let params = {
       sysOrigin: PayAplication.body.appCode,
       account: route.query.targetUserId,
-      type: route.query.isFreightAgent === 'true' ? 'FREIGHT_GOLD' : 'GOLD'
-    };
-    const userInfo = await searchPayRechargeUser(params);
+      type: route.query.isFreightAgent === 'true' ? 'FREIGHT_GOLD' : 'GOLD',
+    }
+    const userInfo = await searchPayRechargeUser(params)
 
     if (userInfo.body && userInfo.body.regionId && userInfo.body.countryList.length != 0) {
-      userProfile.value = { ...userInfo.body.userProfile, type: "GOLD" };
+      userProfile.value = { ...userInfo.body.userProfile, type: 'GOLD' }
 
-      countryStore.setCountryList(userInfo.body.countryList);
-      if (JSON.stringify(selectedCountry.value) == "{}") {
-        countryStore.setCountry(userInfo.body.countryList[0]);
+      countryStore.setCountryList(userInfo.body.countryList)
+      if (JSON.stringify(selectedCountry.value) == '{}') {
+        countryStore.setCountry(userInfo.body.countryList[0])
       }
 
-      regionId.value = userInfo.body.regionId;
+      regionId.value = userInfo.body.regionId
 
       let appCommodityCardParams = {
         applicationId: applicationId.value,
         payCountryId: selectedCountry.value.id,
         regionId: userInfo.body.regionId,
-        type: route.query.isFreightAgent === 'true' ? 'FREIGHT_GOLD' : 'GOLD'
-      };
-      const appCommodityCard = await getAppCommodityCard(appCommodityCardParams);
-      console.log("appCommodityCard:", appCommodityCard);
-      commodityList.value = appCommodityCard.body.commodity;
-      channels.value = appCommodityCard.body.channels;
+        type: route.query.isFreightAgent === 'true' ? 'FREIGHT_GOLD' : 'GOLD',
+      }
+      const appCommodityCard = await getAppCommodityCard(appCommodityCardParams)
+      console.log('appCommodityCard:', appCommodityCard)
+      commodityList.value = appCommodityCard.body.commodity
+      channels.value = appCommodityCard.body.channels
     }
   }
-});
+})
 
 watch(selectedCountry, (New, Old) => {
-  console.log(`新值：${New.id},旧值：${Old.id}`);
-});
+  console.log(`新值：${New.id},旧值：${Old.id}`)
+})
 </script>
 
 <style scoped>
+* {
+  color: black;
+}
+
 .fullPage {
   width: 100vw;
   height: 100vh;
@@ -286,9 +290,11 @@ watch(selectedCountry, (New, Old) => {
 .slide-fade-enter-active {
   transition: all 0.3s ease-out;
 }
+
 .slide-fade-leave-active {
   transition: all 0.2s cubic-bezier(1, 0.5, 0.8, 1);
 }
+
 .slide-fade-enter-from,
 .slide-fade-leave-to {
   transform: translateY(-10px);
diff --git a/src/views/payResult.vue b/src/views/payResult.vue
index 15fcc59..f110ac8 100644
--- a/src/views/payResult.vue
+++ b/src/views/payResult.vue
@@ -59,6 +59,10 @@ onMounted(() => {})
 </script>
 
 <style scoped lang="scss">
+* {
+  color: black;
+}
+
 .pay-result {
   background: #ffffff;
   min-height: 100%;