修改URL解析报错

src/js/illness.js

@@ -17,8 +17,8 @@ const { post,config,getUrlArgObject,openNewWin } = require('./promise.js');
 //   other: getUrlArgObject('otherJson') + getUrlArgObject('pastJson'),
 //   hosCode:getUrlArgObject('hospitalCode') || ''
 // }//推送相关信息
-var msg = JSON.parse(getUrlArgObject('msg')) 
 
+var msg = JSON.parse(getUrlArgObject('msg'))
 window.msg = msg
 window.pushMessage = {}
 

src/js/indexHorizontalDom.js

@@ -316,8 +316,9 @@ function renderRecommendConditTips(icon, className,title,data) {
         openNewWin(infoMsgUrl)
       })
       $(".conditTipsbox").on('click',".more",function(){
-        
-        openNewWin(`illness.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${JSON.stringify(msg.lis)}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}&msg=${JSON.stringify(msg)}`)
+        // openNewWin(`illness.html?age=${msg.age}&sex=${msg.sex}&symptomJson=${msg.symptom}&vitalJson=${msg.vital}&lisJson=${JSON.stringify(msg.lis)}&pacsJson=${msg.pacs}&diagJson=${msg.diag}&otherJson=${msg.other}&hospitalCode=${msg.hosCode}&msg=${JSON.stringify(msg)}`)
+        openNewWin(`illness.html?msg=${encodeURIComponent(JSON.stringify(msg))}`)
+
       })
       bindTipsEvent()
 }

src/js/promise.js

@@ -34,11 +34,33 @@ const config = {
   getMr: '/api/data/mr/getMr'
 }
 const imageUrlPrefix = 'http://192.168.2.241:82';
-const getUrlArgObject = function(parm) {  
-  var query = window.location.search;
-  var args = qs.parse(query.substr(1));
-  return args[parm];//返回对象  
-} 
+// const getUrlArgObject = function(parm) {  
+//   var query = decodeURI(window.location.search);
+//   var args = qs.parse(qs.parse(query.substr(1)));
+//   return args[parm];//返回对象  
+// } 
+
+
+const getUrlArgObject = function getQueryString(name) {
+  var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+  var reg_rewrite = new RegExp("(^|/)" + name + "/([^/]*)(/|$)", "i");
+  var r = window.location.search.substr(1).match(reg);
+  var q = window.location.pathname.substr(1).match(reg_rewrite);
+  if(r != null){
+  return decodeURIComponent(r[2]);
+  }else if(q != null){
+  return decodeURIComponent(q[2]);
+  }else{
+  return null;
+  }
+
+
+
+
+  
+
+  }
+
 const post = function(url,data){
   return new Promise((resolve,reject)=>{
     $.ajax({