Commit 919693cf authored by beisir's avatar beisir

feat:update

parent 7b024cba
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div id="app"> <div id="app">
<cr-nav-bar v-if="header" :title="title" left-text="" @click-left="backFun" /> <cr-nav-bar v-if="header" :title="title" left-text="" @click-left="backFun" />
<div class="app"> <div class="app">
<Weapp v-if="isWeixinBrowser" jump-url="/pages/groupbuy/webview" /> <Weapp v-if="isWeixinBrowser" jump-url="pages/groupbuy/webview" />
<keep-alive> <keep-alive>
<router-view v-if="$route.meta.keepLive" /> <router-view v-if="$route.meta.keepLive" />
</keep-alive> </keep-alive>
...@@ -25,6 +25,10 @@ import { isApp, isWxMp, isWechat } from '@/service/validation.service'; ...@@ -25,6 +25,10 @@ import { isApp, isWxMp, isWechat } from '@/service/validation.service';
import store from '@/store'; import store from '@/store';
import Weapp from '@/components/weapp'; import Weapp from '@/components/weapp';
import goodsShare from '@/components/groupShare'; import goodsShare from '@/components/groupShare';
// import qs from 'qs';
// console.log(
// `pages/groupbuy/webview?url=${encodeURIComponent(JSON.stringify(window.location.href))}`
// );
export default { export default {
name: 'App', name: 'App',
components: { components: {
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
羊小咩原始ID:gh_a976018bfb9e --> 羊小咩原始ID:gh_a976018bfb9e -->
<wx-open-launch-weapp <wx-open-launch-weapp
class="launch-btn" class="launch-btn"
username="gh_e1d790d67513" username="gh_a976018bfb9e"
:path="jumpUrl" :path="newJumpUrl"
@launch="launch" @launch="launch"
@error="launchError" @error="launchError"
> >
...@@ -33,6 +33,13 @@ export default { ...@@ -33,6 +33,13 @@ export default {
data() { data() {
return {}; return {};
}, },
computed: {
newJumpUrl() {
const jumpUrl = this.jumpUrl;
const linkPath = window.location.href;
return `${jumpUrl}?url=${encodeURIComponent(JSON.stringify(linkPath))}`;
}
},
created() { created() {
this.wxConfig(); this.wxConfig();
}, },
......
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