Merge branch 'master' of http://git.lcpcp.cc/zpj/global-merchant-center

# Conflicts:
#	src/locales/Arab.json
#	src/locales/en.json
#	src/views/Forestage/Tourism/index.vue

src/components/Forestage/Navigation.vue

@@ -45,7 +45,7 @@ export default {
       langShow: false,
       langIndex: 0,
       langText: '繁体中文',
-      langList: [{ name: '繁体中文', type: 'cn' }, { name: 'English', type: 'en' },{ name: 'عرب .', type: 'ar' }],
+      langList: [{ name: '繁体中文', type: 'cn' }, { name: 'English', type: 'en' },{ name: 'عرب', type: 'ar' }],
       userToken:'',
     }
   },

src/locales/zh-CN.json

@@ -77,7 +77,8 @@
 	  "text1":"旅行計畫",
 		"text11":"開始旅行與搶票",
 	  "text2":"恭喜！ 購買成功，訂單結算中…",
-	  "text3":"倒數計時"
+	  "text3":"倒數計時",
+	  "text4":"票务区域：美國、中國、日本、泰國、歐洲和澳洲区域以及部分其他国家"
   },
   "home3":{
   	  "text1":"開啟互聯網模式生意團隊，實現居家創業和自動化收益",

src/utils/http.js

@@ -8,13 +8,7 @@ export const isAdmin = () => {
   // console.log('---------------')
   // console.log(process.env.NODE_ENV)
   // console.log(process.env)
-  if(process.env.NODE_ENV==='production'){
-    return (url!=='www.jhcs888.com' && url!=='www.zhwstlm.com'&& url!=='zhwstlm.com');
-  }else if(process.env.NODE_ENV==='test'){
-    return url!=='testwww.jhcs888.com';
-  }else {
-    return process.env.NODE_ENV==='development-admin'
-  }
+
 
 }
 

src/utils/routerEach.js

@@ -1,24 +1,30 @@
 import router from '../router/index.js'
 import store from '@/store'
+import {hasMobile} from "@/utils/tools";
 
 
 const routeList = ['/Home','/Tourism','/Team','/Recharge','/Draw','/Me']
 router.beforeEach((to, from, next) => {
-  let userToken = window.localStorage.getItem('userToken')
-  let active = routeList.findIndex((item) => item === to.path)
+  if(hasMobile()){
+    document.location.href = 'http://wap.gmcyy.com'
+  }else {
+    let userToken = window.localStorage.getItem('userToken')
+    let active = routeList.findIndex((item) => item === to.path)
 
-  if (active > -1) {
-    active++
-  }
-  if (userToken) {
-    store.commit('user/setNavActive', active)
-    next()
-  } else {
-    store.commit('user/setNavActive', active)
-    if (to.path == '/Home'||to.path == '/Tourism'||to.path == '/Team'||to.path == '/login'||to.path == '/register'||to.path == '/forget-password') {
+    if (active > -1) {
+      active++
+    }
+    if (userToken) {
+      store.commit('user/setNavActive', active)
       next()
     } else {
-      next('/login')
+      store.commit('user/setNavActive', active)
+      if (to.path == '/Home'||to.path == '/Tourism'||to.path == '/Team'||to.path == '/login'||to.path == '/register'||to.path == '/forget-password') {
+        next()
+      } else {
+        next('/login')
+      }
     }
   }
+
 })

src/utils/tools.js

@@ -34,3 +34,15 @@ tools.hasMobile=function() {
 }
 
 export default tools
+
+
+export function hasMobile() {
+  let isMobile = false;
+  if ((navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
+    isMobile = true;
+  }
+  if (document.body.clientWidth < 800) {
+    isMobile = true;
+  }
+  return isMobile
+}

src/views/Forestage/Me/mod/my-money.vue

@@ -15,7 +15,7 @@
 			</div>
 			<div class="box-2 justify-content-space-between bgc-755C82 box-sizing-border-box fw-500 fs-16">
 				<div>{{$t('home6.nav1')}}</div>
-				<div class="fs-14 fc-C1B5C5 fw-400">{{$t('other.time1')}}</div>
+<!--				<div class="fs-14 fc-C1B5C5 fw-400">{{$t('other.time1')}}</div>-->
 			</div>
 			<!-- <div class="box-3 bgc-755C82 box-sizing-border-box">
 				<div class="fs-16 fw-400 mb-16">{{$t('home6.index1.text1')}}（USDT）</div>

vue.config.js

@@ -12,16 +12,16 @@ module.exports = defineConfig({
     allowedHosts: 'all',
     proxy: {
       '/api': {
-        // target: 'http://www.gmcyy.com/api/',
-        target: 'http://api-gmc.localhost.cc/api/',
+        target: 'https://www.gmcyy.com/api/',
+        // target: 'http://api-gmc.localhost.cc/api/',
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''
         }
       },
       '/adminApi': {
-        // target: 'http://www.gmcyy.com/api/',
-        target: 'http://api-gmc.localhost.cc/api/',
+        target: 'https://www.gmcyy.com/api/',
+        // target: 'http://api-gmc.localhost.cc/api/',
         changeOrigin: true,
         pathRewrite: {
           '^/adminApi': ''