tangning vor 2 Jahren
Ursprung
Commit
b5b92f5488
5 geänderte Dateien mit 51 neuen und 22 gelöschten Zeilen
  1. 16 3
      src/i18n/en.js
  2. 16 3
      src/i18n/zh.js
  3. 2 1
      src/utils/api.js
  4. 14 12
      src/views/mobile/index.vue
  5. 3 3
      src/views/pc/index.vue

+ 16 - 3
src/i18n/en.js

@@ -1,7 +1,20 @@
 export default {
-    person: {
-      name:'张三',
-      hobby:'唱跳,rap,篮球'
+    payInfo: {
+      payErr: '支付异常',
+      payfail: '支付失败',
+      paySuccess: '支付成功',
+      zyhy:'专业会员',
+      userName: '当前账号',
+      expiration:'有效期{num}年',
+      payTitle: 'Payment Center',
+      membership: 'Purchase Member',
+      payCenter: "Payment Center",
+      wx:'WeChat Pay',
+      zfb:'Alipay Pay',
+      paypal:'paypal',
+      payPrice:'Total Price',
+      priceUnit:'¥',
+      payOrder:'Pay Now'
     },
     mall: {
         buyGoods:"buy goods",

+ 16 - 3
src/i18n/zh.js

@@ -1,7 +1,20 @@
 export default {
-    person: {
-        name: '张三',
-        hobby: '唱跳,rap,篮球'
+    payInfo: {
+        payErr: '支付异常',
+        payfail: '支付失败',
+        paySuccess: '支付成功',
+        payTitle: '支付中心',
+        userName: '当前账号',
+        membership: '购买会员',
+        zyhy:'专业会员',
+        expiration:'有效期{num}年',
+        payCenter: "支付中心",
+        wx:'微信支付',
+        zfb:'支付宝支付',
+        paypal:'paypal',
+        payPrice:'应付金额',
+        priceUnit:'¥',
+        payOrder:'付款'
     },
     mall: {
         buyGoods: '购买商品',

+ 2 - 1
src/utils/api.js

@@ -1,6 +1,6 @@
 import axios from "axios";
 import { ElLoading, ElMessage } from "element-plus";
-import router from "@/router";
+let current = (localStorage && localStorage.getItem('language')) || 'zh'
 let token = (localStorage && localStorage.getItem('token')) || 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxNTkxNTgxNjA0MSIsImxvZ2luVHlwZSI6InVzZXIiLCJ1c2VyTmFtZSI6IjE1OTE1ODE2MDQxIiwiaWF0IjoxNjgxODAzNzY1LCJqdGkiOiJhMDU4M2EwZS01M2EzLTQ1YTUtOTI1ZS1kZDgzYzU5Y2Y5MGMifQ.bdu5jqbSxSlo9LH4w_uPEuP67DUJk6w5Yqnu633OtQI'
 // request是一个axios实例,每一个实例你都可以单独定制它的baseURL,超时时间,请求头和一些其他配置项。
 const baseUrl = import.meta.env.VITE_BASE_URL; //接口统一域名
@@ -12,6 +12,7 @@ const instance = axios.create({
         "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8",
         ".AspNetCore.Culture": "c=zh-Hans|uic=zh-Hans",
         token:token,
+        current,
     },
 });
 

+ 14 - 12
src/views/mobile/index.vue

@@ -5,12 +5,14 @@ import { useUserStore } from '@/stores/user'
 import { openPay, getOrderInfo, wxLogin } from '@/api/api'
 import { useRoute } from 'vue-router'
 import { GetRequest, getWeChatCode } from '@/utils/index'
+import { useI18n } from 'vue-i18n'
 const payType = ref('0')
 const route = useRoute()
 const orderDetal = ref({
   payStatus:0
 })
 const orderSn = ref(route.query.id || GetRequest('id'))
+const { t } = useI18n()
 const userStore = useUserStore();
 const isEur = userStore.isEur
 const openId = computed(() => userStore.getOpenId);
@@ -47,7 +49,7 @@ async function handelPay() {
     window.location.href = res.form || res.h5Url
   } else {
     showConfirm({
-      text: '支付异常',
+      text: t('payInfo.userName'),
       type: 'err',
       callback: (val) => {
         console.log('我的测试计划', val)
@@ -107,7 +109,7 @@ async function handlePayresult(){
     item = orderDetal.value
   }
   showConfirm({
-        text: item.payStatus == 2 ? '支付失败' : '支付成功',
+        text: item.payStatus == 2 ?  t('payInfo.payfail') : t('mall.paySuccessTip'),
         type: item.payStatus == 2 ? 'err' : 'success',
         callback: () => {
         if(item.orderType == 'incrementOrder'){
@@ -145,40 +147,40 @@ async function handleOpenPay() {
 </script>
 <template>
   <div class="mobilePage">
-    <div class="pageTitle">支付中心</div>
+    <div class="pageTitle">{{$t('payInfo.payCenter')}}</div>
     <div class="contentInfo">
       <div class="info">
         <div class="cell">
-          <span>当前账号{{ getOpenId }}</span>
+          <span>{{$t('payInfo.userName')}}{{ getOpenId }}</span>
           <span>{{orderDetal.userName}}</span>
         </div>
         <div class="cell" v-if="orderDetal.orderType == 'incrementOrder'">
-          <span>购买会员</span>
-          <span>专业会员 
+          <span>{{$t('payInfo.membership')}}</span>
+          <span>{{$t('payInfo.zyhy')}}
             <span v-if="orderDetal.goodsInfo && orderDetal.goodsInfo[0]">{{orderDetal.goodsInfo[0].count}}</span>
             <span v-else>1</span>
-             ,有效期1年</span>
+             ,{{ $t(`payInfo.expiration`,{num:1}) }}</span>
         </div>
       </div>
       <div class="payType">
         <div class="cell" @click="handleType('0')">
           <span>
             <img class="payTypeImg" src="@/assets/images/wechat56.png" alt="" />
-            微信支付
+            {{$t('payInfo.wx')}}
           </span>
           <div class="select" :class="{ active: payType == '0' }"></div>
         </div>
         <div class="cell" @click="handleType('4')" v-if="!is_weixn">
           <span>
             <img class="payTypeImg" src="@/assets/images/alipay56.png" alt="" />
-            支付宝支付
+            {{$t('payInfo.zfb')}}
           </span>
           <div class="select" :class="{ active: payType == '4' }"></div>
         </div>
         <div class="cell" @click="handleType('5')" v-if="isEur">
           <span>
             <img class="payTypeImg" src="@/assets/images/paypal.png" alt="" />
-            paypal
+            {{$t('payInfo.paypal')}}
           </span>
           <div class="select" :class="{ active: payType == '5' }"></div>
         </div>
@@ -186,9 +188,9 @@ async function handleOpenPay() {
     </div>
     <div class="bottomInfo">
       <div class="price">
-        应付金额<span>¥{{ orderDetal?.orderMoney || 0.0 }}</span>
+        {{$t('payInfo.payPrice')}}<span>{{$t('payInfo.priceUnit')}}{{ orderDetal?.orderMoney || 0.0 }}</span>
       </div>
-      <div class="payBut" @click="handelPay">付款</div>
+      <div class="payBut" @click="handelPay">{{$t('payInfo.payOrder')}}</div>
     </div>
   </div>
 </template>

+ 3 - 3
src/views/pc/index.vue

@@ -13,7 +13,7 @@ import { GetRequest } from '@/utils/index'
 import { getCurrentInstance } from 'vue'
 
 //得到i18n的locale token, info,
-const { locale: language } = useI18n()
+const { locale: language, t  } = useI18n()
 let t1 = null
 const route = useRoute()
 const { isEur, info } = useUserStore()
@@ -61,7 +61,7 @@ async function handleQueryOrderStatus() {
       t1 = null
       t1 && clearInterval(t1)
       showConfirm({
-        text: response.payStatus === 2 ? '支付失败' : '支付成功',
+        text: response.payStatus === 2 ? t('payInfo.payfail') : t('mall.paySuccessTip'),
         type: response.payStatus === 2 ? 'err' : 'success',
         callback: () => {
           if (response.payStatus === 2) {
@@ -119,7 +119,7 @@ async function getCode() {
                   orderDetal.goodsInfo[0].count
                 }}</span>
                 <span v-else>1</span>
-                ,有效期1年</span
+                ,{{ $t(`payInfo.expiration`,{num:1}) }}</span
               ></span
             >
           </div>