Skip to content

M
mongo-ui
Commit 3ccd4f61 authored by 郭志伟's avatar 郭志伟
Browse files
Options

Merge branch 'fix/goods' into 'master' 

fix: 分享链接异常问题修复

See merge request !180
parents da611f97 d4b909a0
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 35 deletions
public/index.html
View file @ 3ccd4f61
...@@ -30,8 +30,6 @@ ...@@ -30,8 +30,6 @@
}); });
} }
})(); })();
// ! 上线需要删掉
var baseUrl = "";
</script> </script>
<style> <style>
#app .mainload{ #app .mainload{
......
public/share.html 0 → 100644
View file @ 3ccd4f61
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>跳转中...</title>
</head>
<body>
<div>跳转中...</div>
<script>
var _path = getQueryVariable("path");
if (_path) {
_path = decodeURIComponent(_path);
} else {
_path = "/home";
}
var nextPage = document.createElement("a");
nextPage.setAttribute("href", window.location.origin + "/" + decodeURIComponent(_path));
nextPage.click();
function getQueryVariable(variable) {
var query = window.location.search.substring(1);
var vars = query.split("&");
for (var i=0;i<vars.length;i++) {
var pair = vars[i].split("=");
if(pair[0] == variable){return pair[1];}
}
return(false);
}
</script>
</body>
</html>
\ No newline at end of file
src/api/detail.zhongan.yiwai.js
View file @ 3ccd4f61
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Description:众安50万意外险 * @Description:众安50万意外险
* @Date: 2020-07-27 15:46:37 * @Date: 2020-07-27 15:46:37
* @LastEditors: gzw * @LastEditors: gzw
* @LastEditTime: 2020-09-01 16:01:37 * @LastEditTime: 2020-09-01 16:45:02
*/ */
import goodsBg from "@/assets/images/goods/detail/yiwaixian/bg.png"; import goodsBg from "@/assets/images/goods/detail/yiwaixian/bg.png";
import title from "@/assets/images/goods/detail/yiwaixian/title.png"; import title from "@/assets/images/goods/detail/yiwaixian/title.png";
...@@ -124,13 +124,19 @@ export default { ...@@ -124,13 +124,19 @@ export default {
{ title: "投保年龄", value: `18周岁~65周岁` }, { title: "投保年龄", value: `18周岁~65周岁` },
{ title: "保障期限", value: "1年" }, { title: "保障期限", value: "1年" },
{ title: "保费", value: "53元/年起" }, { title: "保费", value: "53元/年起" },
{ title: "职业类别", value: "53元/年起" } { title: "职业类别", value: {
needSlot: true,
tpl: "<strong>1~3类职业可投保<br /><a href='javascript:;'>查看众安职业分类表</a></strong>"
}}
], ],
"100000": [ "100000": [
{ title: "投保年龄", value: `18周岁~65周岁` }, { title: "投保年龄", value: `18周岁~65周岁` },
{ title: "保障期限", value: "1年" }, { title: "保障期限", value: "1年" },
{ title: "保费", value: "53元/年起" }, { title: "保费", value: "53元/年起" },
{ title: "职业类别", value: "53元/年起" } { title: "职业类别", value: {
needSlot: true,
tpl: "<strong>1~3类职业可投保<br /><a href='javascript:;'>查看众安职业分类表</a></strong>"
}}
], ],
}, },
protocolData: [ protocolData: [
......
src/api/shareInfo.js
View file @ 3ccd4f61
import getWxShareInfo from "@/service/wxJsSdk"; import getWxShareInfo from "@/service/wxJsSdk";
const currentOrigin = window.location.origin + "/share?path="; const currentOrigin = window.location.origin + "/share.html?path=";
const logo = currentOrigin + "/shareImg/index.png"; const logo = currentOrigin + "/shareImg/index.png";
const shareList = { const shareList = {
home: { home: {
......
src/router/routes.js
View file @ 3ccd4f61
...@@ -160,12 +160,6 @@ export default [ ...@@ -160,12 +160,6 @@ export default [
component: () => import("../views/Policy/PayWaiting/index.vue"), component: () => import("../views/Policy/PayWaiting/index.vue"),
meta: { title: "支付中" } meta: { title: "支付中" }
}, },
{
path: "/share",
name: "Share",
component: () => import("../views/Home/Share/index.vue"),
meta: { title: "跳转中" }
},
{ {
path: "*", path: "*",
redirect: "/goods" redirect: "/goods"
......
src/service/http.js
View file @ 3ccd4f61
...@@ -59,7 +59,7 @@ axios.interceptors.request.use( ...@@ -59,7 +59,7 @@ axios.interceptors.request.use(
config.cancelToken = new CancelToken(c => (pending[config.url] = c)); config.cancelToken = new CancelToken(c => (pending[config.url] = c));
// ! 上线需要删掉 // ! 上线需要删掉
// eslint-disable-next-line // eslint-disable-next-line
config.baseURL = baseUrl || config.baseURL; // config.baseURL = baseUrl || config.baseURL;
// 添加token // 添加token
const token = localStorage.get("mongoToken"); const token = localStorage.get("mongoToken");
if (token) { if (token) {
......
src/views/Home/Share/index.vue deleted 100644 → 0
View file @ da611f97
<template>
<div>
跳转中...
</div>
</template>
<script>
export default {
name: "Share",
data() {
return {};
},
created() {
let _path = this.$route.query.path;
if (_path) {
_path = decodeURIComponent(_path);
} else {
_path = "/home";
}
this.$router.replace(_path);
}
};
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment