Merge branch 'dev-phase2-0512' into 'release'

教培二期需求  code reviewer: 张平

教培二期需求  code reviewer: 张平

See merge request !9

src/components/cme/basic-info.vue

@@ -7,7 +7,12 @@
     </div>
     <div class="content">
       <span>学习收获</span>
-            <span>{{level}} {{projectCredit}}</span>
+      <span>
+        {{level}}
+        <b class="split"></b>
+        {{projectCredit}}
+      </span>
+      <!-- <span>{{level}} | {{projectCredit}}</span> -->
     </div>
     <div class="content">
       <span>申请范围</span>
@@ -66,14 +71,14 @@ export default {
       default: ""
     }
   }
-}
+};
 </script>
 <style lang="scss" scoped>
 @import "../../style/mixin";
 .basic-container {
   padding-bottom: px2rem(20px);
   margin: px2rem(30px) px2rem(15px) 0px;
-    border-bottom: px2rem(1px) solid #E7E8E9;
+  border-bottom: px2rem(1px) solid #e7e8e9;
   .basic-title {
     font-size: px2rem(18px);
     line-height: px2rem(18px);
@@ -87,6 +92,17 @@ export default {
     span {
       display: inline-block;
       font-size: px2rem(14px);
+      .split {
+        display: inline-block;
+        position: relative;
+        top: px2rem(2px);
+        left: 0;
+        width: px2rem(1px);
+        height: px2rem(13px);
+        margin: 0 px2rem(2px);
+        // line-height: px2rem(20px);
+        background: #676869;
+      }
     }
     span:first-child {
       color: #979899;
@@ -105,8 +121,8 @@ export default {
       padding: px2rem(5px) px2rem(10px);
       margin-left: px2rem(78px);
       font-size: px2rem(14px);
-            color: #FB5B52;
-            background: #FCEEED;
+      color: #fb5b52;
+      background: #fceeed;
       border-radius: px2rem(4px);
     }
     span:after {
@@ -118,7 +134,7 @@ export default {
       height: 0;
       border-width: 0 px2rem(8px) px2rem(8px);
       border-style: solid;
-            border-color: transparent transparent #FCEEED;
+      border-color: transparent transparent #fceeed;
     }
   }
 }

src/components/cme/exjumper-button.vue

@@ -36,7 +36,8 @@ export default {
     right: 0;
     z-index: 1000;
     font-size: px2rem(14px);
-    margin: px2rem(20px) px2rem(15px);
+    padding: px2rem(20px) px2rem(15px);
+    background: linear-gradient(180deg,rgba(255,255,255,0) 0%,rgba(255,255,255,1) 100%);
     text-align: center;
     &.button-default {
       span {

src/utils/fetch.js

@@ -17,7 +17,7 @@ service.interceptors.request.use(config => {
     if(config.data.token){
        config.headers['token'] = config.data.token || '0F32D60C3D7042158BCF1FB574E482BE'
        if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
-        config.headers['token'] = config.data.token || '7A15D95AC2AF4C7C8FEEE23E7FF6EF34';
+        config.headers['token'] = config.data.token || '68659175C0D94E9998CE2C9E3F5C6533';
        }
       //  delete config.data.token;
     }

src/utils/mixins.js

@@ -13,7 +13,7 @@ module.exports = {
             query = this.$route.query
         }
         // alert('this.token' + this.token)
-        this.token = this.getUrlKey('token') || (query && query.token) || '413649EAAF9D4C719DA183FB49E1911F'
+        this.token = this.getUrlKey('token') || (query && query.token) || '68659175C0D94E9998CE2C9E3F5C6533'
     },
     mounted() {