Merge branch 'zcwy-dev' into 'master'

修改测试作业上传框定位问题

See merge request !39

src/views/homework/HomeworkPage.vue

@@ -17,7 +17,8 @@
       <div>{{ sName }}</div>
       <div style="margin-left: 6px; margin-right: 6px">/</div>
       <div style="font-weight: 700; font-size: 16px">作业详情</div>
-      <div class="preNext">
+      <!-- 注释掉上一个下一个 -->
+      <!-- <div class="preNext">
 		   <span @click="prevPage" v-if="hasPrev">
           <button class="btn btn01"></button>
           <span class="content" style="margin-left: 6px">上一个</span>
@@ -26,7 +27,7 @@
           <span class="content" style="margin-left: 31px">下一个</span>
           <button class="btn btn02" style="margin-left: 6px"></button>
         </span>
-      </div>
+      </div> -->
       <div class="return">
         <div style="display: flex" @click="returnclick">
           <el-button style="color: #0073fb">
@@ -107,6 +108,7 @@
                 </div>
               </div>
             </div>
+            <div style="display: flex;justify-content: flex-end;">
               <div
                 class="uploadDetail"
                 :style="{
@@ -177,6 +179,7 @@
                   </div>
                 </div>
               </div>
+            </div>
 
             <div class="title">
               <img
@@ -703,7 +706,7 @@ function reUpload(i) {
         }
 
         .uploadDetail {
-          position: absolute;
+          // position: absolute;
           //top: 235px;
           right: 3px;
           z-index: 100;