Merge branch 'beta' of https://git.cocorobo.cn/jack/PPT into beta

src/views/Student/components/ChoiceWorkModal.vue

@@ -548,7 +548,7 @@ const onDragEnd = () => {
 }
 
 .cq_title {
-  font-size: 35px;
+  font-size: 25px;
   font-weight: bold;
   text-align: center;
   width: 70%;
@@ -602,7 +602,7 @@ const onDragEnd = () => {
 
 .cq_type {
   margin: 20px 0 40px 0;
-  font-size: 22px;
+  font-size: 18px;
   color: #808080;
 }
 
@@ -699,13 +699,15 @@ const onDragEnd = () => {
 
 .cq_ca_t2_item{
   width: 100%;
-  height: 72px;
+  min-height: 72px;
+  height: auto;
   display: flex;
   align-items: center;
   justify-content: flex-start;
   box-sizing: border-box;
-  padding-left: 40px;
-  padding-right: 20px;
+  // padding-left: 40px;
+  // padding-right: 20px;
+  padding:  20px 20px 20px 40px;
   margin-bottom: 20px;
   background: #fff;
   box-shadow: 2px 4px 20px 0px rgba(0, 0, 0, 0.2);
@@ -728,7 +730,7 @@ const onDragEnd = () => {
 .cq_ca_t2_item>span{
   display: flex;
   align-items: center;
-  white-space: nowrap;
+  // white-space: nowrap;
 }
 
 .cq_ca_t2_item>img{

src/views/Student/components/wangEnduit.vue

@@ -8,7 +8,7 @@
     <div v-if="proVisible" class="mask">
       <div class="progressBox">
         <div class="lbox">
-          <img src="../../../../assets/loading.gif" />上传中，请稍后
+          <img src="../../../assets/img/loading.gif" />上传中，请稍后
         </div>
       </div>
     </div>
@@ -203,7 +203,8 @@ export default {
       if (this.editor) {
         if (disabled) {
           this.editor.disable()
-        } else {
+        }
+        else {
           this.editor.enable()
         }
       }