Przeglądaj źródła

update---------hk

lsc 8 miesięcy temu
rodzic
commit
1f4ad3c1a4

+ 1 - 5
dist/index.html

@@ -27,11 +27,7 @@
     html,
     body{
       font-family: '黑体';
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.8aad9ff5a5a29247b3642dcb691f1549.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.264e3d6e7c524117db80.js></script><script type=text/javascript src=./static/js/app.c85f8b424404082f677c.js></script></body></html><script>function stopSafari() {
-=======
-    }</style><link href=./static/css/app.ac77c92329c3cb0b60389f87d10ac2c0.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.264e3d6e7c524117db80.js></script><script type=text/javascript src=./static/js/app.095c9c1bd413efdf8eda.js></script></body></html><script>function stopSafari() {
->>>>>>> beta
+    }</style><link href=./static/css/app.67d36607a43a87950eb9bef3a28e95a0.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.264e3d6e7c524117db80.js></script><script type=text/javascript src=./static/js/app.8df2d6bd35e23667da1d.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Plik diff jest za duży
+ 0 - 0
dist/static/css/app.67d36607a43a87950eb9bef3a28e95a0.css


Plik diff jest za duży
+ 0 - 0
dist/static/css/app.67d36607a43a87950eb9bef3a28e95a0.css.map


Plik diff jest za duży
+ 0 - 1
dist/static/css/app.8aad9ff5a5a29247b3642dcb691f1549.css


Plik diff jest za duży
+ 0 - 1
dist/static/css/app.ac77c92329c3cb0b60389f87d10ac2c0.css


Plik diff jest za duży
+ 0 - 1
dist/static/js/app.095c9c1bd413efdf8eda.js


Plik diff jest za duży
+ 0 - 1
dist/static/js/app.095c9c1bd413efdf8eda.js.map


Plik diff jest za duży
+ 0 - 0
dist/static/js/app.8df2d6bd35e23667da1d.js


Plik diff jest za duży
+ 0 - 0
dist/static/js/app.8df2d6bd35e23667da1d.js.map


Plik diff jest za duży
+ 0 - 1
dist/static/js/app.c85f8b424404082f677c.js


Plik diff jest za duży
+ 0 - 1
dist/static/js/app.c85f8b424404082f677c.js.map


Plik diff jest za duży
+ 0 - 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 1 - 1
src/components/index.vue

@@ -711,7 +711,7 @@ export default {
       let params = {
         org: this.org && this.org != "" ? this.org : "",
         oid: this.oid && this.oid != "" ? this.oid : "",
-        stand: "cn"
+        stand: "hk"
       };
       this.ajax
         .get(this.$store.state.api + "selectAllTypeStand", params)

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików