1 year ago · d410e5ff35
--- a/dist/index.html
+++ b/dist/index.html
@@ -25,7 +25,11 @@
 
				       height: 100%;
			
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				+<<<<<<< HEAD
			
 
				     }</style><link href=./static/css/app.f62149631831ac022773f86b3b2c6212.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f583576dfec9dfc9a295.js></script><script type=text/javascript src=./static/js/vendor.47326b7cf726c651fd28.js></script><script type=text/javascript src=./static/js/app.96c9dc4db994e357bb87.js></script></body></html><script>function stopSafari() {
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.aeb09178dfbffda55d448a428a4fade3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.9897edcd03767d5061b6.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.aeb09178dfbffda55d448a428a4fade3.css
+++ b/dist/static/css/app.aeb09178dfbffda55d448a428a4fade3.css
--- a/dist/static/css/app.aeb09178dfbffda55d448a428a4fade3.css.map
+++ b/dist/static/css/app.aeb09178dfbffda55d448a428a4fade3.css.map
--- a/dist/static/css/app.f62149631831ac022773f86b3b2c6212.css
+++ b/dist/static/css/app.f62149631831ac022773f86b3b2c6212.css
--- a/dist/static/css/app.f62149631831ac022773f86b3b2c6212.css.map
+++ b/dist/static/css/app.f62149631831ac022773f86b3b2c6212.css.map
--- a/dist/static/js/app.96c9dc4db994e357bb87.js.map
+++ b/dist/static/js/app.96c9dc4db994e357bb87.js.map
--- a/dist/static/js/app.9897edcd03767d5061b6.js.map
+++ b/dist/static/js/app.9897edcd03767d5061b6.js.map
--- a/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
+++ b/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
--- a/src/components/pages/easy/addCourse.vue
+++ b/src/components/pages/easy/addCourse.vue
@@ -267,7 +267,7 @@
 
				             <div class="whiteBg" style="border-radius: 0; margin-top: 15px">
			
 
				               <div class="right_title">
			
 
				                 <span>上传课程内容</span>
			
 
				-                <el-button type="primary" @click="pasteTask" size="small"
			
 
				+                <el-button type="primary" @click="pasteTask" size="mini" style="margin-left:10px"
			
 
				                   >智能粘贴</el-button
			
 
				                 >
			
 
				               </div>
			
@@ -12041,7 +12041,8 @@ export default {
 
				   color: #0f7eff;
			
 
				   margin: 0 auto;
			
 
				   display: flex;
			
 
				-  justify-content: space-between;
			
 
				+  /* justify-content: space-between; */
			
 
				+  align-items: flex-end;
			
 
				 }
			
 
				 
			
 
				 .people {
			
--- a/src/components/pages/task/addCourse.vue
+++ b/src/components/pages/task/addCourse.vue
@@ -267,7 +267,7 @@
 
				             <div class="whiteBg" style="border-radius: 0; margin-top: 15px">
			
 
				               <div class="right_title">
			
 
				                 <span>上传课程内容</span>
			
 
				-                <el-button type="primary" @click="pasteTask" size="small"
			
 
				+                <el-button type="primary" @click="pasteTask" size="mini" style="margin-left:10px"
			
 
				                   >智能粘贴</el-button
			
 
				                 >
			
 
				               </div>
			
@@ -12007,7 +12007,8 @@ export default {
 
				   color: #0f7eff;
			
 
				   margin: 0 auto;
			
 
				   display: flex;
			
 
				-  justify-content: space-between;
			
 
				+  /* justify-content: space-between; */
			
 
				+  align-items: flex-end;
			
 
				 }
			
 
				 
			
 
				 .people {