Merge b

src/main.js

@@ -16,7 +16,7 @@ import {
   Image, SwipeItem, Tag, Swipe, Divider, Picker, Popup, Dialog, List, ImagePreview
 } from 'vant';
 import App from './App.vue'
-import { Login, redirect } from './util/initial'
+import { Login, redirect, getQueryPath } from './util/initial'
 
 // import Questionnaire from './views/components/Questionnaire'
 // import Loading from './views/components/Questionnaire/Loading.vue';
@@ -25,6 +25,14 @@ import store from './store';//状态管理
 
 import './global_style.less'
 
+// 如果有 query 分享路径
+const queryPath = getQueryPath()
+if (queryPath) {
+  window.location.href = queryPath
+  return
+}
+
+
 Vue.config.productionTip = false
 
 Vue.use(Popup);

src/util/initial.js

@@ -13,7 +13,7 @@ const jsApiList = [
 ]
 
 function initSDK (url) {
-  request(`https://api.h5.njyunzhi.com/mp/jssdk?url=${encodeURIComponent(url)}`).then((res) => {
+  request(`http://api.h5.njyunzhi.com/mp/jssdk?url=${encodeURIComponent(url)}`).then((res) => {
     window.wx.config({
       debug: process.env.NODE_ENV === 'development', // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
       appId: res.appId, // 必填，公众号的唯一标识
@@ -31,11 +31,11 @@ function initSDK (url) {
  * @param {*} opt
  */
 export function share (opt) {
-  const { origin, pathname, search } = window.location
-  // const defaultLink = origin + pathname
-  const defaultImg = `${origin}${pathname}images/share.png`
+  const { origin, pathname, search, hash } = window.location
+  const defaultImg = `${origin}${pathname}images/share.jpg`
 
-  const link = origin + pathname + search // opt.link || defaultLink
+  // const link = origin + pathname + search
+  const link = encodeHashLocation()
   const imgUrl = opt.imgUrl || defaultImg
 
   initSDK(link)
@@ -54,7 +54,36 @@ export function share (opt) {
   })
 }
 
+/**
+ * hash 路由处理为可分享路由
+ */
+export function encodeHashLocation () {
+  const { origin, pathname, search, hash } = window.location
+
+  const hashRoute = hash.substring(1)
+  const routeParam = btoa(hashRoute)
+
+  const query = search ? `${search}&p=${routeParam}` : `?p=${routeParam}`
+
+  return origin + pathname + query
+}
+
+/**
+ * getQueryPath 获取 query 中的 path 参数
+ * @returns 
+ */
+export function getQueryPath () {
+  const { origin, pathname, search, hash } = window.location
+  if (!search) return undefined
 
+  const queryStr = search.substring(1) // 去掉 ?
+  const pathParam = queryStr.split('&').filter(q => /^p=/.test(q))[0]
+  if (!pathParam) return undefined
+
+  const path = atob(pathParam.substring(2))
+
+  return origin + pathname + search + '#' + path
+}
 
 
 // Vue.use(Vuex)
@@ -102,7 +131,6 @@ export function hideLoading () {
   document.getElementsByClassName('page-loading-wrapper')[0].style = "display: none"
 }
 
-
 /**
  * 获取 code
  * @returns