Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

src/api/login.js

@@ -32,9 +32,9 @@ const refreshToken = function(token){
 
 // boe登录
 const boeLogin = function(token){
-  return ajax.post('/xboe/account/boelogin',{token:token});
+  //return ajax.post('/xboe/account/boelogin',{token:token});
   //登录时，新的用户接口调用查询用户信息
-  //return ajax.post('/xboe/account/boenewlogin',{token:token});
+  return ajax.post('/xboe/account/boenewlogin',{token:token});
 }
 
 export default{

src/components/Course/assess.vue

@@ -44,6 +44,7 @@
 <script>
   import apiCourseStudy from '@/api/modules/courseStudy.js';
   export default{
+    name:'comAssess',
     props:{
         studyId: {
           type: String,
@@ -58,7 +59,7 @@
         },
         content:{
           type: Object,
-          default:()=>{}
+          default: ()=>{}
         }
     },
     data(){
@@ -158,7 +159,7 @@
               this.$message.error(res.message);
             }
         })
-      },
+      }
     }
   }
 </script>

src/components/Course/hyperLink.vue

@@ -13,35 +13,30 @@
             <iframe :src="content.content" style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe>
         </div> -->
           <div class="hyper-link" v-if="conLink.openType==2">
-                        <div class="hyper-link-row">{{content.contentName}}</div>
-                        <div class="hyper-link-row">{{conLink.url}}</div>
-                    </div>
-                    <div v-if="conLink.openType==1">
-                        <iframe :src="conLink.url" style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe>
-                    </div>
+              <div class="hyper-link-row">{{content.contentName}}</div>
+              <div class="hyper-link-row">{{conLink.url}}</div>
+          </div>
+          <div v-if="conLink.openType==1">
+              <iframe :src="conLink.url" style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe>
+          </div>
     </div>
   </div>
 </template>
 <script>
-import apiStudy from '@/api/modules/courseStudy.js';
-import apiCourse from '@/api/modules/course.js';
-import {formatDate,formatSeconds} from '@/utils/datetime.js';
-import {testType,correctJudgment,numberToLetter} from '@/utils/tools.js';
 export default {
   props:{
       content: {
         type: Object,
         default:()=>{}
-      },
+      }
   },
   data() {
     return {
       showiframe:false,
-      conLink:{openType:1,url:''},//对于超连接的内容
+      conLink:{openType:1,url:''}
     };
   },
   mounted() {
-    console.log(this.content,'content');
        if(this.content.content.startsWith('\{')){
            this.conLink=JSON.parse(this.content.content);
         }else{
@@ -56,18 +51,21 @@ export default {
   methods: {
     widthOpen(url) {
       window.open(this.webBaseUrl+url,'_blank');
-    },
+    }
   }
 }
 </script>
 
 <style scoped lang="scss">
- .hyper-link{
-  padding-left:20px;
-  text-align: center;
-  padding-top: 100px;
-  .hyper-link-row{
-    padding: 20px;
+  .hyper-index{
+    .hyper-link{
+     padding-left:20px;
+     text-align: center;
+     padding-top: 100px;
+     .hyper-link-row{
+       padding: 20px;
+     }
   }
+
 }
 </style>

vue.config.js

@@ -27,6 +27,11 @@ module.exports = {
     lintOnSave: process.env.NODE_ENV === 'development',
     // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
     productionSourceMap: false,
+    css: {
+        extract: {
+          ignoreOrder: true
+        }
+    },
     configureWebpack: {
         name: name,
         resolve: {
@@ -114,7 +119,7 @@ module.exports = {
         proxy: {
             '/systemapi': {
                 // 目标代理服务器地址
-                target: 'http://192.168.0.11:9090',
+                target: 'http://127.0.0.1:9090',
                 changeOrigin: true,
                 logLevel:'debug',
                 secure: false,
@@ -131,9 +136,18 @@ module.exports = {
                     '^/uboeApi': '/api'
                 }
             },
+            '/userbasic': {
+                // 目标代理服务器地址
+                target: 'https://u-pre.boe.com',
+                changeOrigin: true,
+                secure: false,
+                pathRewrite: {
+                    '^/userbasic': '/userbasic'
+                }
+            },
             '/statApi': {
                 // 目标代理服务器地址
-                target: 'http://192.168.0.11:9080',
+                target: 'http://127.0.0.1:9080',
                 changeOrigin: true,
                 logLevel:'debug',
                 secure: false,
@@ -143,7 +157,7 @@ module.exports = {
               },
               '/socialApi': {
                 // 目标代理服务器地址
-                target: 'http://192.168.0.11:9081',
+                target: 'http://127.0.0.1:9081',
                 changeOrigin: true,
                 logLevel:'debug',
                 secure: false,