Merge branch 'lt_yaohaoyou' into Development

# Conflicts:
#	view/15.js

public/index.html

@@ -24,7 +24,7 @@
     <script type="text/javascript">
     <script type="text/javascript">
       var fwtimes = window.fwtime - (Math.floor((new Date().getTime()) / 1000)); //获取服务器时间差
       var fwtimes = window.fwtime - (Math.floor((new Date().getTime()) / 1000)); //获取服务器时间差
     </script>
     </script>
-    <script src="https://res.wx.qq.com/open/js/jweixin-1.4.0.js" type="text/javascript" charset="utf-8"></script>
+    <script src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js" type="text/javascript" charset="utf-8"></script>
     <script src="https://qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js" type="text/javascript" charset="utf-8"></script>
     <script src="https://qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js" type="text/javascript" charset="utf-8"></script>
     <script src="<%= BASE_URL %>static/js/flexible.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="<%= BASE_URL %>static/js/flexible.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="<%= BASE_URL %>static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="<%= BASE_URL %>static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>

src/views/common/wxShare.vue

@@ -73,14 +73,16 @@
           type: "wxShare",
           type: "wxShare",
           current_url: window.location.href
           current_url: window.location.href
         });
         });
-      }
-
+      }else{
       if (util.getCookie("Yo4teW_uid")) {
       if (util.getCookie("Yo4teW_uid")) {
         this.$store.dispatch({
         this.$store.dispatch({
           type: "wxShare",
           type: "wxShare",
           current_url: window.location.href
           current_url: window.location.href
         });
         });
       }
       }
+      }
+
+
     },
     },
     methods: {
     methods: {
       share() {
       share() {
@@ -124,13 +126,13 @@
           if(self.isSbq){
           if(self.isSbq){
             self.shareObj = Object.assign({},self.shareObj,{
             self.shareObj = Object.assign({},self.shareObj,{
               success:function(res){
               success:function(res){
-                alert('垃圾微信模拟器')
+                console.log('分享成功')
                   let {invitedId} = self.$route.query;
                   let {invitedId} = self.$route.query;
                   let userId = util.getCookie("Yo4teW_uid");
                   let userId = util.getCookie("Yo4teW_uid");
                    let data = {"share_num":true};
                    let data = {"share_num":true};
                     invitedId&&(data['invited_uid']=invitedId);
                     invitedId&&(data['invited_uid']=invitedId);
                     userId&&(data['user_id '] = userId);
                     userId&&(data['user_id '] = userId);
-                     统计邀请的人数和页面访问统计
+                     //统计邀请的人数和页面访问统计
                     self.$store.dispatch({
                     self.$store.dispatch({
                       type: "oscilloscopeinvited",
                       type: "oscilloscopeinvited",
                       data: {
                       data: {

src/views/oscilloscope/Index.vue

 <template>
 <template>
   <section class="oscilloscope">
   <section class="oscilloscope">
     <Header :title="title" :meaushow="meaushow" :bgcolor="bgcolor"></Header>
     <Header :title="title" :meaushow="meaushow" :bgcolor="bgcolor"></Header>
-    <wxShare :link="shareUrl" :isSbq="true"></wxShare>
+    <wxShare :link="shareUrl" :isSbq="true" :isLogin="false"></wxShare>
     <div class="top-users">
     <div class="top-users">
       <ul :class="{'animate-ul':animate}">
       <ul :class="{'animate-ul':animate}">
         <li v-for="item in bannerData">{{item}}</li>
         <li v-for="item in bannerData">{{item}}</li>

view/index.html

@@ -24,7 +24,7 @@
     <script type="text/javascript">
     <script type="text/javascript">
       var fwtimes = window.fwtime - (Math.floor((new Date().getTime()) / 1000)); //获取服务器时间差
       var fwtimes = window.fwtime - (Math.floor((new Date().getTime()) / 1000)); //获取服务器时间差
     </script>
     </script>
-    <script src="https://res.wx.qq.com/open/js/jweixin-1.4.0.js" type="text/javascript" charset="utf-8"></script>
+    <script src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js" type="text/javascript" charset="utf-8"></script>
     <script src="https://qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js" type="text/javascript" charset="utf-8"></script>
     <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/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>
     <script src="//szh5static.ichunt.com/static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>