bug fix

src/pages/project/h5Page.js

@@ -9,7 +9,7 @@ import { connect } from '@tarojs/redux'
 import { ROLE_CODE } from '@/constants/user'
 import { getQrCodeParams } from '@/utils/qrcode'
 import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
-import { isEmpty } from '@/utils/tools'
+import { isEmpty, parseURL } from '@/utils/tools'
 import { rule as ruleToast } from '@/utils/ruleToast'
 import { share as shareSavePoint } from '@/utils/shareSavePoint'
 import { report as reportCustomer } from '@/utils/customer'
@@ -381,12 +381,14 @@ export default class Index extends Component {
 
     const showH5 = !isEmpty(h5Id) && pageInfo.h5Address && pageInfo.h5Address !== 'about' && pageInfo.h5Address !== 'http://about' && pageInfo.h5Address !== 'https://about'
 
-    // console.log('----web-h5------>', showH5, `${pageInfo.h5Address}?${webUrlParams}`)
+    const originURL = parseURL(pageInfo.h5Address) || {}
+    const queryString = [webUrlParams, originURL.query].join('&')
+    const webURL = [`${originURL.origin}${originURL.host}?${queryString}`, originURL.hash].join('#')
 
     return (
       <Block>
         {this.renderMaskBanner()}
-        {webViewVisible && showH5 && <WebView src={`${pageInfo.h5Address}?${webUrlParams}`} />}
+        {webViewVisible && showH5 && <WebView src={webURL} />}
       </Block>
     )
   }

src/utils/tools.js

@@ -113,6 +113,41 @@ export function transferImage(img) {
   return img
 }
 
+/**
+ * 简易版解析 url
+ * @param {*} url 
+ */
+export function parseURL(url) {
+  if (!url) return undefined;
+
+  let strTmp;
+  let query;
+  let hash;
+
+  const gotHash = url.split('#')
+  strTmp = gotHash[0]
+  if (gotHash.length > 1) {
+    hash = gotHash[1]
+  }
+  
+  const gotQuery = strTmp.split('?')
+  strTmp = gotQuery[0]
+  if (gotQuery.length > 1) {
+    query = gotQuery[1]
+  }
+
+  // 小程序只支持 https 开头
+  const [_, origin, path] = /(https:\/\/[^/]+)(.*)/.exec(strTmp)
+
+  return {
+    origin,
+    path,
+    query,
+    hash
+  }
+}
+
+
 /**
  * 解析 queryString   a=b&c=d  ==> { a:b, c:d }
  * @param {*} queryString