Merge branch 'master' into feature/chenshu/educationalTools

7cf4fa0f · chenshu · 1496d67f · 435c83c7 · 7cf4fa0f · 7cf4fa0f
Commit 7cf4fa0f authored Jun 07, 2021 by chenshu
6 changed files
--- a/src/modules/knowledge-base/modal/AddCourse.jsx
+++ b/src/modules/knowledge-base/modal/AddCourse.jsx
--- a/src/modules/plan-manage/components/BasicInfo.jsx
+++ b/src/modules/plan-manage/components/BasicInfo.jsx
--- a/src/modules/plan-manage/components/PlanList.jsx
+++ b/src/modules/plan-manage/components/PlanList.jsx
--- a/src/modules/plan-manage/components/PlanList.less
+++ b/src/modules/plan-manage/components/PlanList.less
-.plan-list{
+.plan-list {
-    margin-top:12px;
+  margin-top: 12px;
-    .course-number{
+  .course-number {
-      text-align:right;
+    text-align: right;
-      margin-right:45px;
+    margin-right: 45px;
+  }
+  .plan-list-table {
+    thead.ant-table-thead {
+      tr {
+        th {
+          padding: 10px 12px;
+        }
+      }
    }
-    .plan-list-table{
+    tbody {
-      tbody {
+      tr {
-        tr{
+        td.ant-table-cell {
-          &:nth-child(even){
+          padding: 16px 12px;
-            background: transparent !important;
+          color: #333;
-            td{
+        }
-              background:#FFF !important;
+        &:nth-child(even) {
-            }
+          background: transparent;
+          td {
+            background: #fff;
          }
-          &:nth-child(odd){
+        }
-            background: #FAFAFA !important;
+        &:nth-child(odd) {
-            td{
+          background: #fafafa;
-              background: #FAFAFA !important;
+          td {
-            }
+            background: #fafafa;
          }
-          &:hover{
+        }
-            td{
+        &:hover {
-              background:#F3f6fa !important;
+          td {
-            }
+            background: #f3f6fa;
          }
        }
      }
    }
-    .plan-name{
+  }
-      text-overflow: -o-ellipsis-lastline;
+  .plan_name_item {
+    display: flex;
+    align-items: center;
+    .plan-cover {
+      width: 106px;
+      height: 60px;
+      border-radius: 2px;
+      margin-right: 8px;
+    }
+    .plan-name {
+      width: 188px;
      overflow: hidden;
      text-overflow: ellipsis;
      display: -webkit-box;
      -webkit-line-clamp: 2;
-      line-clamp: 2;
      -webkit-box-orient: vertical;
+      height: 40px;
    }
-    .operate-text {
+  }
-      color: #2966FF;
+  .operate-text {
+    color: #2966ff;
+    cursor: pointer;
+  }
+  .operate {
+    display: flex;
+    &__item {
+      color: #2966ff;
      cursor: pointer;
-    }
-    .operate {
+      &.split {
-      display: flex;
+        margin: 0 8px;
+        color: #bfbfbf;
-      &__item {
-        color: #2966FF;
-        cursor: pointer;
-        &.split {
-          margin: 0 8px;
-          color: #BFBFBF;
-        }
      }
    }
-    .join-number{
+  }
-      text-align:right;
+  .join-number {
-      margin-right:12px;
+    text-align: right;
-    }
+    margin-right: 12px;
-    .more-operate{
+  }
-      line-height:20px;
+  .more-operate {
-    }
+    line-height: 20px;
-}
+  }
\ No newline at end of file
+}
--- a/src/modules/plan-manage/modal/relatedCourseModal.less
+++ b/src/modules/plan-manage/modal/relatedCourseModal.less
@@ -2,55 +2,58 @@
  .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
    font-weight: 500;
  }
-    .link-create-course{
+  .ant-modal-footer {
-        color:#666666;
+    display: flex;
-        font-size:14px;
+  }
-        width:638px;
+  .link-create-course {
-        text-align:left;
+    color: #666666;
-        display:inline-block;
+    font-size: 14px;
-        span{
+    width: 638px;
-            color:#2966FF;
+    text-align: left;
-        }
+    display: inline-block;
+    span {
+      color: #2966ff;
    }
-    .search-container{
+  }
-        margin-bottom:16px;
+  .search-container {
+    margin-bottom: 16px;
+  }
+  .select-area {
+    margin-bottom: 12px;
+    display: flex;
+    justify-content: space-between;
+    .select-box {
+      display: inline-box;
+      width: 186px;
+      background: #e9efff;
+      border-radius: 4px;
+      padding: 6px 16px;
+      margin-right: 8px;
+      display: flex;
+      justify-content: space-between;
+      .tip-icon {
+        color: #2966ff;
+        font-size: 14px;
+        margin-right: 4px;
+      }
+      .select-num {
+        color: #666666;
+        font-size: 14px;
+      }
+      .clear-btn {
+        text-align: right;
+        color: #2966ff;
+        font-size: 14px;
+      }
+    }
+    .related-box {
+      padding: 6px 16px;
+      background: #e9efff;
+      border-radius: 4px;
+      flex: 1;
+      color: #666666;
+      font-size: 14px;
    }
-    .select-area{
-        margin-bottom:12px;
-        display:flex;
-        justify-content:space-between;
-        .select-box{
-          display:inline-box;
-          width: 186px;
-          background: #E9EFFF;
-          border-radius: 4px;
-          padding:6px 16px;
-          margin-right:8px;
-          display: flex;
-          justify-content: space-between;
-          .tip-icon{
-            color:#2966FF;
-            font-size:14px;
-            margin-right:4px;
-          }
-          .select-num{
-            color:#666666;
-            font-size:14px;
-          }
-          .clear-btn{
-            text-align:right;
-            color:#2966FF;
-            font-size:14px;
-          }
-        }
-        .related-box{
-          padding:6px 16px;
-          background: #E9EFFF;
-          border-radius: 4px;
-          flex:1;
-          color:#666666;
-          font-size:14px;
-        } 
  }
  .search-container {
    margin-bottom: 16px;

--- a/src/modules/root/Login.jsx
+++ b/src/modules/root/Login.jsx
@@ -54,6 +54,7 @@ function Login(props) {
      User.setUserId(res.result.loginInfo.userId)
      User.setToken(res.result.loginInfo.xmToken)
      User.setEnterpriseId(res.result.enterpriseId)
+      User.setIdentifier(res.result.identifier)
      window.RCHistory.push({
        pathname: `/switch-route`
      })