Merge branch 'lt_yaohaoyou' into Development

# Conflicts:
#	view/10.js
#	view/11.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/19.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/3.js
#	view/42.js
#	view/43.js
#	view/52.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js

src/views/common/wxShare.vue

@@ -20,6 +20,10 @@
         type: String,
         default: window.location.href
       },
+      currentUrl: {
+        type: String,
+        default:window.location.href
+      },
       title: {
         type: String,
         default: '好物分享给你，帮我助力，我们一起免费拿样品'
@@ -68,16 +72,18 @@
     },
     created() {
       //无需登录的情况下
+      let me = this;
       if (!this.isLogin) {
         this.$store.dispatch({
           type: "wxShare",
-          current_url: window.location.href
+          current_url:me.currentUrl
         });
-      }else{
+      }
+      else{
       if (util.getCookie("Yo4teW_uid")) {
         this.$store.dispatch({
           type: "wxShare",
-          current_url: window.location.href
+          current_url: me.currentUrl
         });
       }
       }

src/views/oscilloscope/Index.vue

 <template>
   <section class="oscilloscope">
     <Header :title="title" :meaushow="meaushow" :bgcolor="bgcolor"></Header>
-    <wxShare :link="shareUrl" :isSbq="true" :isLogin="false" title="DS1104示波器年中惊爆价3299，速抢！" desc="示波器年中狂欢，ZDS1104仅需3299，邀请好友还能拿奖励〜" imgUrl="http://img.ichunt.com/images/ichunt/self_sample/sbq-icon.jpg"></wxShare>
+    <wxShare :link="shareUrl" :isSbq="true" :isLogin="false" :currentUrl="currentUrl" title="DS1104示波器年中惊爆价3299，速抢！" desc="示波器年中狂欢，ZDS1104仅需3299，邀请好友还能拿奖励〜" imgUrl="http://img.ichunt.com/images/ichunt/self_sample/sbq-icon.jpg"></wxShare>
     <div class="top-users">
       <ul :class="{'animate-ul':animate}">
         <li v-for="item in bannerData">{{item}}</li>
@@ -118,8 +118,9 @@ export default {
       meaushow: true,
       bgcolor: "#fafafa",
       animate:false,
-      shareUrl: window.location.origin + window.location.pathname + ((util.getCookie("Yo4teW_uid"))?('#/oscilloscope?invitedId='+util.getCookie("Yo4teW_uid")):"#/oscilloscope")
-    };
+      shareUrl: window.location.origin + window.location.pathname + ((util.getCookie("Yo4teW_uid"))?('#/oscilloscope?invitedId='+util.getCookie("Yo4teW_uid")):"#/oscilloscope"),
+      currentUrl:window.location.origin+window.location.pathname
+   };
   },
   created(){
     let {invitedId} = this.$route.query;

view/index.html

@@ -28,7 +28,7 @@
     <script src="https://qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js" type="text/javascript" charset="utf-8"></script>
     <script src="//szh5static.ichunt.com/static/js/flexible.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="//szh5static.ichunt.com/static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>
-<link href="//szh5static.ichunt.com/0.js" rel="prefetch"><link href="//szh5static.ichunt.com/1.js" rel="prefetch"><link href="//szh5static.ichunt.com/10.js" rel="prefetch"><link href="//szh5static.ichunt.com/11.js" rel="prefetch"><link href="//szh5static.ichunt.com/12.js" rel="prefetch"><link href="//szh5static.ichunt.com/13.js" rel="prefetch"><link href="//szh5static.ichunt.com/14.js" rel="prefetch"><link href="//szh5static.ichunt.com/15.js" rel="prefetch"><link href="//szh5static.ichunt.com/16.js" rel="prefetch"><link href="//szh5static.ichunt.com/17.js" rel="prefetch"><link href="//szh5static.ichunt.com/18.js" rel="prefetch"><link href="//szh5static.ichunt.com/19.js" rel="prefetch"><link href="//szh5static.ichunt.com/2.js" rel="prefetch"><link href="//szh5static.ichunt.com/20.js" rel="prefetch"><link href="//szh5static.ichunt.com/21.js" rel="prefetch"><link href="//szh5static.ichunt.com/22.js" rel="prefetch"><link href="//szh5static.ichunt.com/23.js" rel="prefetch"><link href="//szh5static.ichunt.com/24.js" rel="prefetch"><link href="//szh5static.ichunt.com/25.js" rel="prefetch"><link href="//szh5static.ichunt.com/26.js" rel="prefetch"><link href="//szh5static.ichunt.com/27.js" rel="prefetch"><link href="//szh5static.ichunt.com/28.js" rel="prefetch"><link href="//szh5static.ichunt.com/29.js" rel="prefetch"><link href="//szh5static.ichunt.com/3.js" rel="prefetch"><link href="//szh5static.ichunt.com/30.js" rel="prefetch"><link href="//szh5static.ichunt.com/31.js" rel="prefetch"><link href="//szh5static.ichunt.com/32.js" rel="prefetch"><link href="//szh5static.ichunt.com/33.js" rel="prefetch"><link href="//szh5static.ichunt.com/34.js" rel="prefetch"><link href="//szh5static.ichunt.com/35.js" rel="prefetch"><link href="//szh5static.ichunt.com/36.js" rel="prefetch"><link href="//szh5static.ichunt.com/37.js" rel="prefetch"><link href="//szh5static.ichunt.com/38.js" rel="prefetch"><link href="//szh5static.ichunt.com/39.js" rel="prefetch"><link href="//szh5static.ichunt.com/4.js" rel="prefetch"><link href="//szh5static.ichunt.com/40.js" rel="prefetch"><link href="//szh5static.ichunt.com/41.js" rel="prefetch"><link href="//szh5static.ichunt.com/42.js" rel="prefetch"><link href="//szh5static.ichunt.com/43.js" rel="prefetch"><link href="//szh5static.ichunt.com/44.js" rel="prefetch"><link href="//szh5static.ichunt.com/45.js" rel="prefetch"><link href="//szh5static.ichunt.com/46.js" rel="prefetch"><link href="//szh5static.ichunt.com/47.js" rel="prefetch"><link href="//szh5static.ichunt.com/48.js" rel="prefetch"><link href="//szh5static.ichunt.com/49.js" rel="prefetch"><link href="//szh5static.ichunt.com/5.js" rel="prefetch"><link href="//szh5static.ichunt.com/50.js" rel="prefetch"><link href="//szh5static.ichunt.com/51.js" rel="prefetch"><link href="//szh5static.ichunt.com/52.js" rel="prefetch"><link href="//szh5static.ichunt.com/6.js" rel="prefetch"><link href="//szh5static.ichunt.com/7.js" rel="prefetch"><link href="//szh5static.ichunt.com/8.js" rel="prefetch"><link href="//szh5static.ichunt.com/9.js" rel="prefetch"><link href="//szh5static.ichunt.com/app.js" rel="preload" as="script"></head>
+<link href="//szh5static.ichunt.com/0.js" rel="prefetch"><link href="//szh5static.ichunt.com/1.js" rel="prefetch"><link href="//szh5static.ichunt.com/10.js" rel="prefetch"><link href="//szh5static.ichunt.com/11.js" rel="prefetch"><link href="//szh5static.ichunt.com/12.js" rel="prefetch"><link href="//szh5static.ichunt.com/13.js" rel="prefetch"><link href="//szh5static.ichunt.com/14.js" rel="prefetch"><link href="//szh5static.ichunt.com/15.js" rel="prefetch"><link href="//szh5static.ichunt.com/16.js" rel="prefetch"><link href="//szh5static.ichunt.com/17.js" rel="prefetch"><link href="//szh5static.ichunt.com/18.js" rel="prefetch"><link href="//szh5static.ichunt.com/19.js" rel="prefetch"><link href="//szh5static.ichunt.com/2.js" rel="prefetch"><link href="//szh5static.ichunt.com/20.js" rel="prefetch"><link href="//szh5static.ichunt.com/21.js" rel="prefetch"><link href="//szh5static.ichunt.com/22.js" rel="prefetch"><link href="//szh5static.ichunt.com/23.js" rel="prefetch"><link href="//szh5static.ichunt.com/24.js" rel="prefetch"><link href="//szh5static.ichunt.com/25.js" rel="prefetch"><link href="//szh5static.ichunt.com/26.js" rel="prefetch"><link href="//szh5static.ichunt.com/27.js" rel="prefetch"><link href="//szh5static.ichunt.com/28.js" rel="prefetch"><link href="//szh5static.ichunt.com/29.js" rel="prefetch"><link href="//szh5static.ichunt.com/3.js" rel="prefetch"><link href="//szh5static.ichunt.com/30.js" rel="prefetch"><link href="//szh5static.ichunt.com/31.js" rel="prefetch"><link href="//szh5static.ichunt.com/32.js" rel="prefetch"><link href="//szh5static.ichunt.com/33.js" rel="prefetch"><link href="//szh5static.ichunt.com/34.js" rel="prefetch"><link href="//szh5static.ichunt.com/35.js" rel="prefetch"><link href="//szh5static.ichunt.com/36.js" rel="prefetch"><link href="//szh5static.ichunt.com/37.js" rel="prefetch"><link href="//szh5static.ichunt.com/38.js" rel="prefetch"><link href="//szh5static.ichunt.com/39.js" rel="prefetch"><link href="//szh5static.ichunt.com/4.js" rel="prefetch"><link href="//szh5static.ichunt.com/40.js" rel="prefetch"><link href="//szh5static.ichunt.com/41.js" rel="prefetch"><link href="//szh5static.ichunt.com/42.js" rel="prefetch"><link href="//szh5static.ichunt.com/43.js" rel="prefetch"><link href="//szh5static.ichunt.com/44.js" rel="prefetch"><link href="//szh5static.ichunt.com/45.js" rel="prefetch"><link href="//szh5static.ichunt.com/46.js" rel="prefetch"><link href="//szh5static.ichunt.com/47.js" rel="prefetch"><link href="//szh5static.ichunt.com/48.js" rel="prefetch"><link href="//szh5static.ichunt.com/49.js" rel="prefetch"><link href="//szh5static.ichunt.com/5.js" rel="prefetch"><link href="//szh5static.ichunt.com/50.js" rel="prefetch"><link href="//szh5static.ichunt.com/51.js" rel="prefetch"><link href="//szh5static.ichunt.com/52.js" rel="prefetch"><link href="//szh5static.ichunt.com/53.js" rel="prefetch"><link href="//szh5static.ichunt.com/6.js" rel="prefetch"><link href="//szh5static.ichunt.com/7.js" rel="prefetch"><link href="//szh5static.ichunt.com/8.js" rel="prefetch"><link href="//szh5static.ichunt.com/9.js" rel="prefetch"><link href="//szh5static.ichunt.com/app.js" rel="preload" as="script"></head>
 <body class="boxsiz">
 <noscript>
     <strong>网站出现了一点小问题，正在紧急修复中.......</strong>