DESKTOP-70VPDLK\Administrator 9 miesięcy temu
rodzic
commit
114ec710ab

+ 1 - 1
src/components/Forestage/Navigation.vue

@@ -64,7 +64,7 @@ export default {
   created () {
     this.userToken = window.localStorage.getItem('userToken')
 
-    const lang = localStorage.getItem('lang') || 'cn'
+    const lang = localStorage.getItem('lang') || 'en'
     if (lang === 'cn') {
       this.langText = '繁体中文'
     } else {

+ 1 - 1
src/components/Forestage/PageFoot.vue

@@ -12,7 +12,7 @@ export default {
   name: 'Footer',
   data() {
     return {
-      lang:'cn',
+      lang:'en',
     }
   },
   computed: {

+ 2 - 2
src/i18n.js

@@ -17,8 +17,8 @@ const messages = {
   }
 }
 const i18n = new VueI18n({
-  locale: localStorage.getItem('lang') || 'cn',
+  locale: localStorage.getItem('lang') || 'en',
   messages
 })
 locale.i18n((key, value) => i18n.t(key, value))
-export default i18n
+export default i18n

+ 3 - 1
src/locales/en.json

@@ -154,7 +154,9 @@
 			"text3":"Order number",
 			"text4":"Order amount",
 			"text5":"Order income",
-			"text6":"Time"
+			"text6":"Time",
+			"text7":"State",
+			"text8":"Done"
 		},
 		"index3":{
 			"text1":"Send"

+ 3 - 1
src/locales/zh-CN.json

@@ -154,7 +154,9 @@
 		"text3":"訂單單號",
 		"text4":"訂單金額",
 		"text5":"訂單收益",
-		"text6":"創建時間"
+		"text6":"創建時間",
+		"text7":"狀態",
+		"text8":"已完成",
 	},
 	"index3":{
 		"text1":"發送"

+ 1 - 1
src/utils/http.js

@@ -17,7 +17,7 @@ export const isAdmin = () => {
 }
 
 export const langFilter = (data) => {
-  const lang = localStorage.getItem('lang') || 'cn'
+  const lang = localStorage.getItem('lang') || 'en'
   if (lang === 'cn') {
     return { ...data, ...data.cn }
   } else {

+ 2 - 2
src/utils/request.js

@@ -6,7 +6,7 @@ import { isAdmin, langFilter } from '@/utils/http.js'
 const service = axios.create({
   timeout: 5000
 })
-const lang = localStorage.getItem('lang') || 'cn'
+const lang = localStorage.getItem('lang') || 'en'
 service.interceptors.request.use(
   config => {
     if (config.isLoading) {
@@ -90,7 +90,7 @@ const request = (url, method = 'get', data, isLoading = false) => {
   if (!data){
     data={}
   }
-  let lang = localStorage.getItem('lang') || 'cn'
+  let lang = localStorage.getItem('lang') || 'en'
   data.lang=lang==='cn'?'zh-Hant':'en';
   let date = new Date();
   data.timezoneNum = date.getTimezoneOffset() / -60

+ 6 - 5
src/views/Forestage/Me/mod/my-order.vue

@@ -11,14 +11,15 @@
 				<div class="fs-12 fw-400 w150 ">{{$t('home6.index2.text3')}}</div>
 				<div class="fs-12 fw-400 w150 ">{{$t('home6.index2.text4')}}</div>
 				<div class="fs-12 fw-400 w150 ">{{$t('home6.index2.text5')}}</div>
-				<div class="fs-12 fw-400 w150 text-align-right">{{$t('home6.index2.text6')}}</div>
+				<div class="fs-12 fw-400 w150 text-align-right">{{$t('home6.index2.text7')}}</div>
 			 </div>
 			 <div class="justify-content-space-between box-8 align-items-center" v-for="(item,i) in list" :key="i">
 			 	<div class="fs-12 fw-400 w150">{{lang == 'cn'?item.goods_name:item.goods_name_en}}</div>
 			 	<div class="fs-12 fw-400 w150 ">{{item.order_sn}}</div>
 				<div class="fs-12 fw-400 w150 ">{{item.price}}</div>
 				<div class="fs-12 fw-400 w150 ">{{item.yield_money}}</div>
-			 	<div class="fs-12 fw-400 w150 text-align-right">{{item.created_at}}</div>
+				<div class="fs-12 fw-400 w150 ">{{$t('home6.index2.text8')}}</div>
+<!--			 	<div class="fs-12 fw-400 w150 text-align-right">{{item.created_at}}</div>-->
 			 </div>
 			 <div class="justify-right mt-16">
 			 	<div class="box-page fs-12 fw-400 fc-12 hand-cursor" @click="upPage()">{{$t('syy')}}</div>
@@ -38,14 +39,14 @@
 				page:1,
 				list:[],
 				total:0,
-        lang:'cn',
+        lang:'en',
 			}
 		},
 		mounted() {
-      this.lang = localStorage.getItem('lang')||'cn'
+      this.lang = localStorage.getItem('lang')||'en'
 
       setInterval(() => {
-        this.lang = localStorage.getItem('lang')||'cn'
+        this.lang = localStorage.getItem('lang')||'en'
 
       }, 500); // 每隔1秒检查一次
 			this.getList();

+ 3 - 3
src/views/Forestage/Tourism/index.vue

@@ -47,17 +47,17 @@
 				classList: [],
 				goodsList: [],
 				isAJAX: false,
-				lang:'cn',
+				lang:'en',
 			}
 		},
 		created() {
 
 		},
 		mounted() {
-      this.lang = localStorage.getItem('lang')||'cn'
+      this.lang = localStorage.getItem('lang')||'en'
 
       setInterval(() => {
-        this.lang = localStorage.getItem('lang')||'cn'
+        this.lang = localStorage.getItem('lang')||'en'
 
       }, 500); // 每隔1秒检查一次
 			this.getClass();