Bladeren bron

Merge branch 'beta' into HK

lsc 1 jaar geleden
bovenliggende
commit
8f14de4798

+ 4 - 0
dist/index.html

@@ -18,7 +18,11 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
+<<<<<<< HEAD
     }</style><link href=./static/css/app.b52f35b3b7aa744c3f4e4c4df5af76c2.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.e272a0df0fb3ce5b6fea.js></script><script type=text/javascript src=./static/js/app.c0c433d9499f32057ddb.js></script></body></html><script>function stopSafari() {
+=======
+    }</style><link href=./static/css/app.e377c669ed988d0ab1236fe0942faba1.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.515dd63c4fc6170fd155.js></script></body></html><script>function stopSafari() {
+>>>>>>> beta
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/app.515dd63c4fc6170fd155.js.map


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


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


File diff suppressed because it is too large
+ 580 - 228
src/components/easy2/studyStudent.vue


File diff suppressed because it is too large
+ 570 - 225
src/components/easy3/studyStudent.vue


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