tangning 2 часов назад
Родитель
Сommit
1b5cd1bc3e
4 измененных файлов с 6 добавлено и 8 удалено
  1. 1 3
      src/utils/index.ts
  2. 1 1
      src/views/mobile/index.vue
  3. 2 2
      src/views/pc/index.vue
  4. 2 2
      vite.config.ts

+ 1 - 3
src/utils/index.ts

@@ -2,7 +2,6 @@ import type { RouteLocationNormalized, RouteRecordNormalized } from 'vue-router'
 import type { App, Plugin } from 'vue';
 import { useUserStore } from '@/stores/user'
 import { useI18n } from 'vue-i18n'
-
 import { unref } from 'vue';
 import { isObject } from '@/utils/is';
 import type { Component } from 'vue';
@@ -121,9 +120,8 @@ export function GetRequest(value: string) {
 }
 
 //支付备注
-export const getRemark = (list, orderType, t) => {
+export const getRemark = (list, orderType, t, locale) => {
   
-// const { locale, t } = useI18n()
 const { isEur } = useUserStore()
   let str = []
   list.map(item => {

+ 1 - 1
src/views/mobile/index.vue

@@ -51,7 +51,7 @@ async function handelPay() {
     orderSn: orderSn.value,
     payType: is_weixn.value ? '1' : payType.value,
     openId:openId.value,
-    productName: getRemark(orderDetal.value.goodsInfo, orderDetal.value.orderType, t),
+    productName: getRemark(orderDetal.value.goodsInfo, orderDetal.value.orderType, t, locale),
   }
   const res = await openPay(apiData)
 

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

@@ -88,7 +88,7 @@ function handlePay() {
     openPay({
       orderSn: orderSn.value,
       payType: paysidtype[selectedPayType.value],
-      productName: getRemark(orderDetal.value.goodsInfo, orderDetal.value.orderType, t),
+      productName: getRemark(orderDetal.value.goodsInfo, orderDetal.value.orderType, t, language),
       openId: ''
     }).then((res) => {
       qrCodeUrl.value = res.qrCodeUrl || res.redirect
@@ -105,7 +105,7 @@ async function getCode() {
   openPay({
     orderSn: orderSn.value,
     payType: paysidtype[selectedPayType.value],
-    productName: getRemark(orderDetal.value.goodsInfo, orderDetal.value.orderType, t),
+    productName: getRemark(orderDetal.value.goodsInfo, orderDetal.value.orderType, t,language),
     openId: ''
   }).then((res) => {
     qrCodeUrl.value = res.qrCodeUrl || res.redirect

+ 2 - 2
vite.config.ts

@@ -44,12 +44,12 @@ export default defineConfig({
   server: {
     proxy: {
       '/service': {
-        target: 'https://testeur.4dkankan.com/',
+        target: 'https://test.4dkankan.com/',
         changeOrigin: true,
         // rewrite: (path) => path.replace(/^\/api/, '')
       },
       '/ucenter': {
-        target: 'https://testeur.4dkankan.com/',
+        target: 'https://test.4dkankan.com/',
         changeOrigin: true,
         // rewrite: (path) => path.replace(/^\/api/, '')
       }