Browse Source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table into beta

lsc 2 months ago
parent
commit
9d975b4dbb

+ 1 - 1
dist/index.html

@@ -27,7 +27,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.8f87c0610a5a7234cb37e8db3decb58f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.0178b84037bb383b90f6.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.56d641f39efd9b1861d9b4b522d2f7e9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.becc9317549795ada446.js></script><script type=text/javascript src=./static/js/app.57ea1c5c854b6de31a40.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.56d641f39efd9b1861d9b4b522d2f7e9.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.56d641f39efd9b1861d9b4b522d2f7e9.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.57ea1c5c854b6de31a40.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.57ea1c5c854b6de31a40.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 15 - 3
src/router/index.js

@@ -51,20 +51,32 @@ Vue.use(Router)
 let lang = new Object();
 let domain_name = "";
 
-if (window.location.href.includes("cocorobo.cn")) {
+
+let region = 'cn'
+
+if (window.location.href.includes('beta') || window.location.href.includes('localhost')) {
   domain_name="cn";
+  region = 'beta'
+  lang = cn;
+}else if (window.location.href.includes("cocorobo.cn")) {
+  domain_name="cn";
+  region = 'cn'
   lang = cn;
 } else if (window.location.href.includes("cocorobo.hk")) {
   domain_name="hk";
+   region = 'hk'
   lang = hk;
 } else if (window.location.href.includes("cocorobo.com")) {
   domain_name="com";
+   region = 'com'
   lang=en;
 }else{
-  domain_name="cn";
-  lang=cn;
+   region = 'cn'
+   domain_name="cn";
+   lang=cn;
 }
 Vue.prototype.lang =lang;
+Vue.prototype.$region = region
 if(domain_name==='com'){//英文版
 	Vue.use(ElementUI,{locale})
 }else{

Some files were not shown because too many files changed in this diff