Merge branch 'feature/dxp' into 'release'

Feature/dxp

See merge request !8

package-lock.json

@@ -1897,9 +1897,9 @@
       }
     },
     "@pica-core/web-buried-point": {
-      "version": "1.0.9",
-      "resolved": "http://192.168.110.93:4873/@pica-core%2fweb-buried-point/-/web-buried-point-1.0.9.tgz",
-      "integrity": "sha512-c2hHjLqKTXWXpgN3o7BngGvWTF3g9s7pZb8UiNiC8foEbkwcwWkK7Uo3YuIn1pzR48fYReQkYRRHFm3PHdwoQw==",
+      "version": "1.0.13",
+      "resolved": "http://192.168.110.93:4873/@pica-core%2fweb-buried-point/-/web-buried-point-1.0.13.tgz",
+      "integrity": "sha512-uoQyEHJwfRns6aWIqwLSdTr2+CxoRxmv/jXIclTqlOtg+hfZBcX4adhKHQrlfvBzW0BCfElNDhroP1qQsAPMrQ==",
       "requires": {
         "axios": "^0.18.0",
         "vue": "^2.5.17"

package.json

@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.10.4",
-    "@pica-core/web-buried-point": "^1.0.9",
+    "@pica-core/web-buried-point": "^1.0.13",
     "axios": "0.16.2",
     "clipboard": "^2.0.6",
     "pdfjs-dist": "^2.4.456",

src/main.js

@@ -133,7 +133,7 @@ Vue.prototype.$sendBuriedData = sendBuriedData;
 Vue.use(Vant);
 if(process.env.NODE_ENV!="production" || process.env.NODE_ENV!="prod"){
   let objParms={
-     projectName:"consultation",
+     projectName:"web_app_professional_exam",
      mode:"hash",
      baseUrl:'/profexam/',
      routerConfig:routes

src/menu_code.json

-[{"id":236,"url":"/","fullPath":"https://phome.yunqueyi.com/profexam/#/","host":"https://phome.yunqueyi.com","menuCode":"7800248"},{"id":237,"url":"/index","fullPath":"https://phome.yunqueyi.com/profexam/#/index","host":"https://phome.yunqueyi.com","menuCode":"7800249"},{"id":238,"url":"/index-old","fullPath":"https://phome.yunqueyi.com/profexam/#/index-old","host":"https://phome.yunqueyi.com","menuCode":"7800250"},{"id":239,"url":"/home","fullPath":"https://phome.yunqueyi.com/profexam/#/home","host":"https://phome.yunqueyi.com","menuCode":"7800251"},{"id":240,"url":"/coop","fullPath":"https://phome.yunqueyi.com/profexam/#/coop","host":"https://phome.yunqueyi.com","menuCode":"7800252"}]
\ No newline at end of file
+[{"id":527,"url":"/","fullPath":"https://phome.yunqueyi.com/profexam/#/","host":"https://phome.yunqueyi.com","menuCode":"7800549"},{"id":530,"url":"/index","fullPath":"https://phome.yunqueyi.com/profexam/#/index","host":"https://phome.yunqueyi.com","menuCode":"7800551"},{"id":532,"url":"/index-old","fullPath":"https://phome.yunqueyi.com/profexam/#/index-old","host":"https://phome.yunqueyi.com","menuCode":"7800553"},{"id":534,"url":"/home","fullPath":"https://phome.yunqueyi.com/profexam/#/home","host":"https://phome.yunqueyi.com","menuCode":"7800555"},{"id":537,"url":"/coop","fullPath":"https://phome.yunqueyi.com/profexam/#/coop","host":"https://phome.yunqueyi.com","menuCode":"7800557"},{"id":539,"url":"/sharecoop","fullPath":"https://phome.yunqueyi.com/profexam/#/sharecoop","host":"https://phome.yunqueyi.com","menuCode":"7800560"},{"id":540,"url":"/test","fullPath":"https://phome.yunqueyi.com/profexam/#/test","host":"https://phome.yunqueyi.com","menuCode":"7800561"},{"id":541,"url":"/course-detail","fullPath":"https://phome.yunqueyi.com/profexam/#/course-detail","host":"https://phome.yunqueyi.com","menuCode":"7800562"},{"id":542,"url":"/not-found","fullPath":"https://phome.yunqueyi.com/profexam/#/not-found","host":"https://phome.yunqueyi.com","menuCode":"7800563"},{"id":543,"url":"/goods-detail","fullPath":"https://phome.yunqueyi.com/profexam/#/goods-detail","host":"https://phome.yunqueyi.com","menuCode":"7800564"},{"id":544,"url":"/prezult","fullPath":"https://phome.yunqueyi.com/profexam/#/prezult","host":"https://phome.yunqueyi.com","menuCode":"7800565"},{"id":545,"url":"/question-bank","fullPath":"https://phome.yunqueyi.com/profexam/#/question-bank","host":"https://phome.yunqueyi.com","menuCode":"7800566"},{"id":546,"url":"/question-detail","fullPath":"https://phome.yunqueyi.com/profexam/#/question-detail","host":"https://phome.yunqueyi.com","menuCode":"7800567"},{"id":547,"url":"/coupon-list","fullPath":"https://phome.yunqueyi.com/profexam/#/coupon-list","host":"https://phome.yunqueyi.com","menuCode":"7800568"}]
\ No newline at end of file

src/public_uat.js

@@ -5,7 +5,13 @@ const routerObj={};
 let baseUrl=process.env.VUE_APP_BASE_ROUTE_URL || process.env.BASE_URL || "";
 let fullHost=location.host;
 let rMode="history";
-let projectName="";
+let projectName='';
+if(fullHost.indexOf('uat-') != -1) {
+  fullHost = fullHost.replace('uat-', '');
+}
+if(fullHost.indexOf('http') == -1) {
+  fullHost = (window.location.protocol || 'https:') + "//"+ fullHost;
+}
 // 处理路由children
 function allRouter(ele,spath){
   for(var i=0;i< ele.length;i++){
@@ -49,7 +55,9 @@ function handleAllRouter(parmsObj){
 // 发送请求
 function sendAllRouterInfo(data){
   let url="https://dev-sc.yunqueyi.com/basic-data/menuCode/upload";
-  if(process.env.NODE_ENV!="development"){
+  if(process.env.NODE_ENV=="development"){
+    url="https://dev-sc.yunqueyi.com/basic-data/menuCode/upload"
+  }else if(process.env.NODE_ENV=="uat"){
     url="https://sc.yunqueyi.com/basic-data/menuCode/upload";
   }
   let obj={