Skip to content

梁建民 / h5

Go to a project
Commit b6125f72 by 施宇
Options

Merge branch 'lt_yaohaoyou' into Development 

# Conflicts:
#	view/11.js
parents 5f27ba4e 718fb0de
Expand all
Inline Side-by-side
Showing with 1 additions and 1 deletions
src/views/oscilloscope/Index.vue
...@@ -117,7 +117,7 @@ export default { ...@@ -117,7 +117,7 @@ export default {
meaushow: true, meaushow: true,
bgcolor: "#fafafa", bgcolor: "#fafafa",
animate:false, animate:false,
shareUrl: window.location.origin + window.location.pathname + ((util.getCookie("Yo4teW_uid"))?('#/?invitedId='+util.getCookie("Yo4teW_uid")):"#/") shareUrl: window.location.origin + window.location.pathname + ((util.getCookie("Yo4teW_uid"))?('#/oscilloscope?invitedId='+util.getCookie("Yo4teW_uid")):"#/oscilloscope")
}; };
}, },
created(){ created(){
......
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 sign in to comment