Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/EducationvideoList.vue

@@ -84,7 +84,7 @@
     title="上传"
     :visible.sync="dialogVisible"
     width="800px">
-    <el-form  v-loading="scLoad" :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
+    <el-form  :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
         <el-form-item style="display:inline-block;" label="标题" prop="Name">
             <el-input style="width:220px" v-model="addMsg.Name"></el-input>
         </el-form-item>
@@ -125,7 +125,10 @@
                 <i class="el-icon-plus avatar-uploader-icon"></i>
                 <div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
             </el-upload>
-            <p style="font-size:12px" v-show="scLoad">上传中，请稍后...</p>
+            <p style="font-size:12px;color:#e95252" v-show="scLoad">
+                <span v-loading="scLoad" style="display:inline-block;width:50px;height:50px"></span>
+                <span style="position: relative;top: -23px;">上传中，请稍后...</span>    
+            </p>
         </el-form-item>
        
 
@@ -467,6 +470,10 @@ export default {
 }
 </script>
 <style>
+.EducationvideoList .el-loading-spinner .circular{
+    width:20px!important;
+    height:20px!important;
+}
 .EducationvideoList .el-loading-mask{
     background-color: rgba(255,255,255,.1)!important;
 }

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2361,14 +2361,17 @@
                   </div>
                 </div>
               </td>
-              <td colspan="4" style="height: 40px;">
+              <td colspan="3" style="height: 40px;">
                 <div class="clearfix RL-MARK" style="width:75%;float:left;">
                   <span class="RL-opremarkTitle">{{$t('Operation.Op_remark')}}:</span>
                   <span class="RL-redType RL-remarkCon"
                     style="width:74%;display:inline-block;">{{childItem.OP_Remarks ? childItem.OP_Remarks : '无'}}</span>
                   <div><span style="display:inline-block;">备注人/时间</span>:{{childItem.OPRemarkUpdateName}}&nbsp;&nbsp;{{childItem.OPRemarkUpdateTimeStr}}</div>
                 </div>
-                <template v-if="isShow==true">
+              
+              </td>
+              <td colspan="3">
+                  <template v-if="isShow==true">
                   <div style="float:right;" v-if="childItem.IsCanClear==0">
                     <input type="button" :value="$t('ground.qrendindan')" class="rgsureBtn"
                       @click="clearSeat(childItem,1)" style="display:block;" />
@@ -2385,7 +2388,7 @@
                   </div>
                 </template>
               </td>
-              <td colspan="4" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
+              <td colspan="2" class="groupTourOrder_SpecialAPP" stysle="height: 40px;">
                 <div>
                   特价申请函: 
                   <template v-if="childItem.OrderspecialofferId === 0">