Merge branch 'lt_yaohaoyou' into Development

public/index.html

@@ -24,7 +24,7 @@
     <script type="text/javascript">
       var fwtimes = window.fwtime - (Math.floor((new Date().getTime()) / 1000)); //获取服务器时间差
     </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://res.wx.qq.com/open/js/jweixin-1.3.2.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/shence.min.js" type="text/javascript" charset="utf-8"></script>

src/assets/css/oscilloscope/oscilloscope.css

@@ -31,7 +31,10 @@
 }
 .oscilloscope .oscilloscope-wrapper .banner-div {
   height: 5.333rem;
-  background-color: #b0c2d4;
+}
+.oscilloscope .oscilloscope-wrapper .banner-div .my-swipe .swiper-img {
+  height: 5.333rem;
+  width: 100%;
 }
 .oscilloscope .oscilloscope-wrapper .prize-div {
   padding: 0.667rem 0.4rem 0;

src/assets/css/oscilloscope/oscilloscope.less

@@ -33,7 +33,13 @@
     .oscilloscope-wrapper {
         .banner-div {
             height: 5.333rem;
-            background-color: #b0c2d4;
+            .my-swipe {
+                .swiper-img{
+                    height: 5.333rem;
+                    width:100%;
+
+                }
+            }
         }
 
         .prize-div {

src/views/oscilloscope/Index.vue

 <template>
   <section class="oscilloscope">
     <Header :title="title" :meaushow="meaushow" :bgcolor="bgcolor"></Header>
-    <wxShare :link="shareUrl" :isSbq="true" :isLogin="false"></wxShare>
+    <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>
     <div class="top-users">
       <ul :class="{'animate-ul':animate}">
         <li v-for="item in bannerData">{{item}}</li>
       </ul>
     </div>
     <div class="oscilloscope-wrapper">
-      <div class="banner-div"></div>
+      <div class="banner-div">
+        <van-swipe class="my-swipe" :autoplay="3000" :show-indicators="false">
+        <van-swipe-item>
+            <img src="../../assets/images/oscilloscope/banner1.jpg" alt="" class="swiper-img">
+        </van-swipe-item>
+       <van-swipe-item>
+            <img src="../../assets/images/oscilloscope/banner1.jpg" alt=""  class="swiper-img">
+        </van-swipe-item>
+      </van-swipe>
+      </div>
       <div class="prize-div">
         <h3 class="title1 title"></h3>
         <div class="prize-items-wrapper">
@@ -97,6 +106,9 @@ import Header from "@/views/common/Header.vue";
 import util from "../../util/index";
 import {mapState,mapMutations } from "vuex";
 import wxShare from "@/views/common/wxShare.vue";
+import Vue from 'vue';
+import {Swipe, SwipeItem} from 'vant';
+ Vue.use(Swipe).use(SwipeItem)
 export default {
   name: "oscilloscope",
   data() {

view/index.html

@@ -24,7 +24,7 @@
     <script type="text/javascript">
       var fwtimes = window.fwtime - (Math.floor((new Date().getTime()) / 1000)); //获取服务器时间差
     </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://res.wx.qq.com/open/js/jweixin-1.3.2.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/shence.min.js" type="text/javascript" charset="utf-8"></script>