样式优化等

src/components/common/cropper-img.vue

@@ -119,15 +119,16 @@ export default {
 </script>
 <style scoped lang="scss">
 
+// .rc-cropper {
+//   margin-left: 20px;
+// }
 
 .rc-cropper__canvasCrop1 {
-  /* border: 1px solid red; */
   width: 800px;
   height: 540px;
 }
 
 .rc-cropper__canvasCrop2 {
-  /* border: 1px solid red; */
   width: 400px;
   height: 300px;
 }

src/components/common/cropper.two copy.vue

@@ -104,10 +104,10 @@ export default {
 }
 </script>
 <style >
-.rc-cropper {
+/* .rc-cropper {
   position: relative;
   margin-top: 20px;
-}
+} */
 
 /* img {
   width: 100%;

src/components/education/custom-resource/edit-course-dialog.vue

 
 <template>
-  <div class="edit-course-wrapper dialog-title-border">
+  <div class="edit-course-wrapper">
     <el-dialog
+     class="dialog-title-border"
       ref="testDialogRef"
       title="上传课程"
       :visible="dialogVisible"
@@ -317,7 +318,7 @@
         <img class="success-img" src="../../../assets/image/phrase3/icon-audit-success.png" />
         <span class="tips-1">您上传的课程已成功提交，预计在3-5个工作日内完成审核</span>
         <span class="tips-2">审核通过后，您才可以选择课程完成项目配置。如有任何疑问可联系云鹊医400-920-8877</span>
-        <el-button type="primary" icon="el-icon-back" @click="backToOrgCourse">返回机构课程</el-button>
+        <el-button class="back-btn" type="primary" icon="el-icon-back" @click="backToOrgCourse">返回机构课程</el-button>
       </div>
       <div v-show="step == 1" slot="footer" class="dialog-footer">
         <el-button @click="dialogObj.visible=true">取 消</el-button>
@@ -331,6 +332,7 @@
     <DialogComponet :dialogObj="dialogObj" @hide="hideCancleTips" @confirm="dialogObj.visible=false"></DialogComponet>
     <PreviewVideo :dialogVisible="isPreviewVideo" :videoUrl="videoUrl" @close="isPreviewVideo=false"></PreviewVideo>
     <el-dialog
+      class="dialog-title-border-old"
       title="图片裁剪"
       :visible.sync="showCropper"
       :width="currentOption.cropDialogWidth"
@@ -350,8 +352,6 @@
 </template>
 <script>
 import PreviewVideo from "@/components/education/custom-resource/preview-video";
-import PreviewProtocol from "@/components/education/custom-resource/preview-protocol";
-import PreviewEditCourse from "@/components/education/custom-resource/edit-course-dialog";
 import DialogComponet from "@/components/education/template/dialog";
 import CropperImg from '@/components/common/cropper-img.vue'
 import { doUpload, getFilePath } from "@/utils/qiniu-util";
@@ -556,7 +556,6 @@ export default {
   },
   components: {
     PreviewVideo,
-    PreviewEditCourse,
     DialogComponet,
     CropperImg
   },
@@ -1121,18 +1120,25 @@ export default {
           width: 12px;
         }
       }
-      .line-left,
+      .line-left {
+        flex: 1;
+        margin-left: 20px;
+        border-bottom: 1px dashed #e4e7ed;
+      }
       .line-right {
-        // display: inline-block;
-        // width: 100%;
         flex: 1;
+        margin-right: 6px;
         border-bottom: 1px dashed #e4e7ed;
       }
     }
     .tips {
-      width: 100%;
+      // margin-left: -20px;
+      // width: 810px;
+      // width: 100%;
       height: 32px;
       line-height: 32px;
+      margin-left: 20px;;
+      margin-right: 10px;
       padding-left: 12px;
       background: rgba(254, 250, 245, 1);
       border-radius: 3px;
@@ -1234,9 +1240,13 @@ export default {
     text-align: center;
     align-items: center;
     .success-img {
+      margin-top: 80px;
       width: 60px;
       height: 60px;
     }
+    .back-btn {
+      margin-bottom: 70px;
+    }
     .tips-1 {
       margin-top: 30px;
       font-size: 18px;

src/components/education/custom-resource/preview-protocol.vue

@@ -12,7 +12,7 @@
       <div slot="title" style="text-align: left;">
         <span style="font-weight: 700;">用户协议</span>
       </div>
-      <div v-html="protocolContent"></div>
+      <div style="margin: 20px 20px;height: 400px;padding: 10px 0;" v-html="protocolContent"></div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="close(false)">不同意</el-button>
         <el-button type="primary" @click="signProtocol">同意</el-button>

src/components/education/custom-resource/preview-video.vue

 <template>
-  <div class="preview-video-wrapper dialog-title-border">
+  <div class="preview-video-wrapper dialog-title-border-old">
     <el-dialog
       title="预览课程"
       :visible="dialogVisible"

src/components/education/custom/course-list.vue

@@ -436,13 +436,13 @@ export default {
           align-items: center;
           background:rgba(248,249,250,1);
           border-radius:4px;
-          border:1px solid rgba(228,231,237,1);
+          border: 1px dashed rgba(228,231,237,1);
           img {
             width: 16px;
             height: 16px;
           }
           span {
-            margin-top: 10px;
+            margin-top: 8px;
             font-size: 12px;
             color: #979899;
           }    

src/style/global.scss

@@ -172,14 +172,28 @@
   }
   .el-tabs__active-bar {
     background: #449284 !important;
+    height: 3px;
+    border-radius: 2px;
   }
 }
 
 .dialog-title-border {
-  .el-dialog__body {
+  .el-dialog__header {
     margin: 0 20px;
-    padding: 25px 5px 30px;
-    border-top: 1px solid #E4E7ED;
+    padding: 20px 0px;
+    border-bottom: 1px solid #E4E7ED;
+  }
+  .el-dialog--center .el-dialog__body {
+    margin: 0;
+    padding: 0;
+    margin-right: 10px;
+  }
+  .el-dialog__body {
+    max-height: 380px;
+    margin: 0;
+    padding: 0;
+    overflow-y: auto;
+    overflow-x: hidden;
   }
   .dialog {
     .el-dialog__body {
@@ -188,6 +202,29 @@
       border-top: 0px solid #E4E7ED;
     }     
   }
+  .el-dialog__footer {
+      padding-top: 20px;
+  }
+}
+
+.dialog-title-border-old {
+    .el-dialog__header {
+        margin: 0 20px;
+        padding: 15px 0px;
+        border-bottom: 1px solid #E4E7ED;
+    }
+    .el-dialog__body {
+      margin: 0 20px;
+      padding: 25px 5px 30px;
+    //   border-top: 1px solid #E4E7ED;
+    }
+    .dialog {
+      .el-dialog__body {
+        margin: 0;
+        padding: 25px 5px 30px;
+        border-top: 1px solid #E4E7ED;
+      }     
+    }
 }
 .el-cascader .el-input .el-input__inner:focus, .el-cascader .el-input.is-focus .el-input__inner {
   border-color: #449284 !important;

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'FB40194EE277496093448BF696A3D0E4';
+      config.headers['token'] = '01968031113F41F1AF503205C9BAFE50';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/education/edit-custom.vue

@@ -174,7 +174,7 @@ export default {
       isPreviewEditCourse: false,
       courseId: '0',
 
-      isPreviewProtocol: false,
+      isPreviewProtocol: true,
       protocolId: 22,
       protocolContent: '',
       isFirst: true,  // 是否是第一次（不做更新）
@@ -704,8 +704,10 @@ export default {
 
 .edit-custom-wrap {
   ::-webkit-scrollbar {
-    width: 10px;
-    height: 10px;
+    // width: 10px;
+    // height: 10px;
+    width: 5px;
+    height: 5px;
     background-color: #fff;
   }