Merge remote-tracking branch 'origin/master'

src/pages/station/preview/index.vue

@@ -288,13 +288,13 @@ export default {
             let id = this.assessmentList[0].systemId;
             let host = Setting.systemPath;
             let href = "";
-
+            let token = util.local.get(Setting.tokenKey);
             let roleId = this.roleId == 4 ? 0 : 1;
             let userName = window.btoa(encodeURIComponent(this.userName));
 
             if (id == 1) {
                 // href = `${host}pyTrials/#/`;
-                if(process.env.NODE_ENV === 'development') href = 'http://192.168.31.154:8080/#/'
+                if(process.env.NODE_ENV === 'development') href = 'http://192.168.31.125:8080/#/'
             } else if (id == 4) {
                 href = `${host}pyFinance/#/`;
             } else if (id == 5) {
@@ -312,7 +312,6 @@ export default {
             } else if (id == 11) {
                 console.log(host)
                 // href = `${host}bank/#/`;
-                let token = util.local.get(Setting.tokenKey);
                 //线上
                 // href = "http://www.huorantech.cn/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime=";
                 //测试与本地
@@ -334,6 +333,8 @@ export default {
                 util.cookies.set("projectId", "", -1);
                 util.cookies.set("startTime", "", -1);
                 util.cookies.set("stopTime", "", -1);
+                util.cookies.set("token", token);
+                util.cookies.set("courseId", this.courseId);
                 location.href = href;
             }
         }