liukang 1 year ago
parent
commit
e2763b7df6

+ 1 - 1
xinxuan/public/index.html

@@ -9,7 +9,7 @@
     <meta name="renderer" content="webkit"/>
     <meta name="force-rendering" content="webkit"/>
     <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"/> 
-    <script src="http://www.bootcdn.cn/html5media"></script>
+    <!-- <script src="http://www.bootcdn.cn/html5media"></script> -->
     
     <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
     <!-- <meta name=”viewport” content="width=device-width, initial-scale=1" /> -->

+ 1 - 1
xinxuan/src/assets/css/index.css

@@ -692,7 +692,7 @@
         display: block !important;
     }
     .one {
-        height: 1920px;
+        height: unset;
         position: relative;
         margin-bottom: 0;
         /* display: none; */

+ 11 - 0
xinxuan/src/components/utils.js

@@ -0,0 +1,11 @@
+export const isElementNotInViewport = function(el) {
+    if (el) {
+        // console.log(el);
+        let rect = el.getBoundingClientRect();
+        return (
+            rect.top >=
+                (window.innerHeight || document.documentElement.clientHeight) ||
+            rect.bottom <= 0
+        );
+    }
+};

+ 1 - 1
xinxuan/src/utils/http.js

@@ -1,3 +1,3 @@
-const baseUrl = 'https://website.hdlkeji.com' //测试环境
+const baseUrl = 'https://www.lvweicaoping.com' //测试环境
 // const baseUrl = '' //正式环境
 export { baseUrl }

+ 121 - 24
xinxuan/src/view/about.vue

@@ -6,27 +6,34 @@
                 <!-- <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false"playsinline preload="auto" crossorigin="anoymous">
                     <source :src="pageData.video" type="video/mp4" />
                 </video> -->
-                <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anoymous" v-if="pageData.type=='video'">
-                    <source :src="pageData.g_pic" type="video/mp4" />
+                <video id="back_video" class="video fillWidth"  :src="pageData.g_pic1" muted :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  crossorigin="anoymous" v-if="!flag">
+                    <!-- <source :src="pageData.g_pic1" type="video/mp4" /> -->
                 </video>
-                <el-image  :src="pageData.g_pic" class="video fillWidth" fit="cover" v-if="pageData.type=='image'"></el-image>
+                <el-image  :src="pageData.g_pic" class="video fillWidth" fit="cover" v-if="flag && pageData.g_pic !== undefined"></el-image>
             </div>    
             <div class="title">关于我们</div>  
             <div class="title">About us</div>  
             <div class="subTitle" v-html="pageData.g_content"></div>  
             <div class="line"></div> 
         </div>
-        <div class="center hflex">
-            <div class="list hflex" id="scroll"  :style="'--div_width:' + div_width + ';' ">
+        <div class="center hflex" id="center" @touchstart="leftSlide" @touchend="rightSlide">
+            <div class="list hflex" id="scroll">
                 <div class="item" v-for="(item,index) in pageList" :key="index">
                     <el-image fit="cover" :src="item.url" alt="" class="item_img" v-if="item.url !== 'undefind'" />
                     <div class="item_text" v-html="item.content"></div>
                 </div>
-                <div class="item" v-for="(itm,inx) in pageList">
-                    <el-image fit="cover" :src="itm.url" alt="" class="item_img" v-if="itm.url !== 'undefind'" />
-                    <div class="item_text" v-html="itm.content"></div>
-                </div>
+                <!-- <div class="item" v-for="(item,index) in pageList">
+                    <el-image fit="cover" :src="item.url" alt="" class="item_img" v-if="item.url !== 'undefind'" />
+                    <div class="item_text" v-html="item.content"></div>
+                </div> -->
             </div>
+            <!-- <div class="list2 hflex" id="scroll2" >
+                <div class="item" v-for="(item,index) in pageList" :key="index">
+                    <el-image fit="cover" :src="item.url" alt="" class="item_img" v-if="item.url !== 'undefind'" />
+                    <div class="item_text" v-html="item.content"></div>
+                </div>
+                
+            </div> -->
         </div>
         <Footer :footer="footer"></Footer>
 
@@ -49,7 +56,18 @@ export default {
             div_width: 0,
             footer: {},
             autoplay: true,
-            flag: true
+            flag: true,
+            touch: {
+                startX: 0,
+                startY: 0,
+                endX:0,
+                endY: 0,
+            },
+            timer: '',
+            box1: '',
+            box2: '',
+            x :0
+
         }
     },
     created() {
@@ -61,8 +79,34 @@ export default {
     },
     mounted() {
         that.getList()
+        setTimeout(() => {
+            that.isScroll()
+        }, 500);
+       
     },
     methods: {
+        isScroll() {
+            // that._box1 = document.getElementById("scroll");
+            // that._box2 = document.getElementById("scroll2");
+            that.box1 = document.getElementById("scroll").offsetWidth
+            that.box2 = document.documentElement.clientWidth - 100  
+            this.timer = setInterval(this.fun, 30);
+        },
+        fun() {
+            // console.log(that.x);
+            
+            document.getElementById("center").scrollLeft = that.x
+
+            // console.log(document.getElementById("scroll").scrollLeft);
+            // that._box2.scrollLeft += that.x + wt
+
+            that.x++;
+            console.log(that.x,that.box1);
+            if((that.x + that.box2 - that.box1) == 0){
+                console.log('完成');
+                clearInterval(this.timer);
+            }
+        },
         isBrow() {
             var ua = navigator.userAgent.toLowerCase();
             if(ua.match(/MicroMessenger/i)=="micromessenger" || ua.match(/QQ/i) == "qq") {
@@ -75,7 +119,7 @@ export default {
             // var clientWidth = document.body.clientWidth
             data = data / 2
             // console.log(data);
-            that.div_width = '-' +data + 'px'
+            that.div_width = data
         },
         // 获取基础配置信息
         getConfig() {
@@ -109,7 +153,20 @@ export default {
                     }, 1000);
                 }
             }) 
+        },
+        leftSlide(e) {
+            // console.log(e);
+            clearInterval(this.timer);
+            // that.touch.startX = e.touches[0].pageX
+        },
+        rightSlide(e) {
+            
         }
+    },
+    destroyed() {
+        console.log(this.timer);
+        clearInterval(this.timer);
+
     }
 }
 </script>
@@ -149,6 +206,7 @@ export default {
     padding: 200px 100px 159px;
     background: #fff;
     overflow: hidden;
+    /* overflow: scroll; */
     position: relative;
 
 }
@@ -157,6 +215,7 @@ export default {
     
     .center {
         min-height: 120vh;
+
     }
 }
 .center .list {
@@ -164,11 +223,22 @@ export default {
     list-style:none;
     position: absolute;
     top: 200px;
-    left: 0;
+    left: 100px;
+    /* margin-bottom: 159px; */
+    /* overflow: auto; */
+    /* left: 0px; */
+    /* animation: move 20s infinite linear; */
+}
+.center .list2 {
+    /* width: 100%; */
+    list-style:none;
+    position: absolute;
+    top: 200px;
+    left: calc(100vw - 50px);
     /* margin-bottom: 159px; */
-    /* overflow-x: hidden; */
+    /* overflow: auto; */
     /* left: 0px; */
-    animation: move 60s infinite linear;
+    /* animation: move 20s infinite linear; */
 }
 @keyframes move {
     from {
@@ -178,22 +248,41 @@ export default {
         transform: translate(var(--div_width),0);
     }
 }
-.center .list .item {
+.pause {
+    animation-play-state: paused !important;
+}
+.restart {
+    animation-play-state: running !important;
+}
+@keyframes move2 {
+    from {
+        transform: translate(0,0);
+    }
+    to {
+        transform: translate(var(--div_width) ,0);
+    }
+}
+.center  .item {
     width: 395px;
     margin-right: 47px;
 }
-.center .list .item .item_img {
+/* .center .list {
+    width: 395px;
+    margin-right: 47px;
+    left: 0;
+} */
+.center  .item .item_img {
     width: 395px;
     height: 570px;
 }
-.center .list:hover {
+.center .list:hover,.list2:hover {
     animation-play-state:paused;
 
 }
-.center .list .item .item_img:hover {
+.center  .item .item_img:hover {
     transfORM: scale(1.1);
 }
-.center .list .item .item_text {
+.center  .item .item_text {
     padding-top: 36px;
     font-size: 38px;
     font-weight: 500;
@@ -203,11 +292,19 @@ export default {
 }
 @media screen and (max-width: 750px) {
     
-.top {
-    box-sizing: border-box;
-    padding: 269px 100px 0;
-    min-height: 1080px;
-}
+    .top {
+        box-sizing: border-box;
+        padding: 269px 100px 0;
+        min-height: 1080px;
+    }
+    .center {
+        overflow-x: auto;
+        scrollbar-width: none;
+        -ms-overflow-style: none;
+    }
+    ::-webkit-scrollbar {
+        display: none; /* Chrome Safari */
+    }
    >>> .footer {
     position: absolute;
    }

+ 7 - 6
xinxuan/src/view/contact.vue

@@ -6,10 +6,10 @@
                 <!-- <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false"playsinline preload="auto" crossorigin="anoymous">
                     <source :src="pageData.video" type="video/mp4" />
                 </video> -->
-                <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anoymous" v-if="pageData.type=='video'">
-                    <source :src="pageData.l_pic" type="video/mp4" />
+                <video id="back_video" class="video fillWidth"  :src="pageData.l_pic1" muted :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  crossorigin="anoymous" v-if="!flag">
+                    <!-- <source :src="pageData.l_pic1" type="video/mp4" /> -->
                 </video>
-                <el-image  :src="pageData.l_pic" class="video fillWidth" fit="cover" v-if="pageData.type=='image'"></el-image>
+                <el-image  :src="pageData.l_pic" class="video fillWidth" fit="cover" v-if="flag && pageData.l_pic !== undefined"></el-image>
             </div>    
             <div class="subTitle" v-html="pageData.l_content"></div>  
             <div class="text">电话:{{ pageData.l_phone }}</div>
@@ -36,14 +36,15 @@ export default {
             pageData: { },
             footer: {},
             autoplay: true,
-
+            flag: true
         }
     },
     created() {
         that = this
         that.getConfig()
         that.isBrow()
-
+        let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
+        that.flag = flag
     },
     mounted() {
     },
@@ -119,6 +120,6 @@ export default {
     width: 1720px;
     height: 4px;
     background: #FFFFFF;
-    margin: 58px 0;
+    margin: 58px 0 0;
 }
 </style>

+ 93 - 74
xinxuan/src/view/index.vue

@@ -50,85 +50,87 @@
             </header>
         </div>
         <div class="shua shua_js" v-if="!show_white && !flag"></div>
-        <div class="one">
-            <div class="videoContainer">
-                <video id="back_video" :poster="pageData.url1_img" class="video fillWidth"  :src="pageData.url1" muted :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  crossorigin="anoymous" v-if="pageData.type1=='video'">
-                    <!-- <source type="video/mp4" /> -->
-                </video>
-                <canvas id="cvback_video" style="display:none;"></canvas>
-                <el-image :src="pageData.url1" class="video fillWidth" fit="cover" v-if="pageData.type1=='image'"></el-image>
-            </div>
-            <div class="subTitle">
-                <div v-html="pageData.subtitle1"></div>
-            </div>
-            <div class="title">
-                <div v-show="scroll_top == 0">
-                    <h1 style="color: #fff;">{{pageData.title}}</h1>
-                    <div class="line" style="background: rgba(255,255,255,.5)"></div>
-                    <div class="hflex jbetween" v-show="show_white">
-                        <div class="text point">{{pageData.home_time}}</div>
-                        <div class="hflex point" @click="scorll_down()">
-                            <img class="down" src="@/assets/images/common/fv-arrow-down.svg" alt="" />
-                            <div class="text">向下滑动</div>
+        <div ref="scrollview" @mousewheel="scrollChange" @DOMMouseScroll="scrollChange" >
+            <div class="one" >
+                <div class="videoContainer">
+                    <video id="back_video" class="video fillWidth"  :src="pageData.url11" muted :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  crossorigin="anoymous" v-if="!flag">
+                        <!-- <source type="video/mp4" /> -->
+                    </video>
+                    <canvas id="cvback_video" style="display:none;"></canvas>
+                    <el-image :src="pageData.url1" class="video fillWidth" v-if="flag && pageData.url1 !== undefined"></el-image>
+                </div>
+                <div class="subTitle">
+                    <div v-html="pageData.subtitle1"></div>
+                </div>
+                <div class="title">
+                    <div v-show="scroll_top == 0">
+                        <h1 style="color: #fff;">{{pageData.title}}</h1>
+                        <div class="line" style="background: rgba(255,255,255,.5)"></div>
+                        <div class="hflex jbetween" v-show="show_white">
+                            <div class="text point">{{pageData.home_time}}</div>
+                            <div class="hflex point" @click="scorll_down()">
+                                <img class="down" src="@/assets/images/common/fv-arrow-down.svg" alt="" />
+                                <div class="text">向下滑动</div>
+                            </div>
                         </div>
                     </div>
+                    <div class="content" v-html="pageData.subtitle2"></div>
+                </div>
+                <div class="icon_down vflex acenter jbetween point" v-if="down_icon" @click="scorll_down2(-1)">
+                    <img src="@/assets/images/common/icon-down-1.png" alt="" />
+                    <img src="@/assets/images/common/icon-down-2.png" alt="" />
                 </div>
-                <div class="content" v-html="pageData.subtitle2"></div>
-            </div>
-            <div class="icon_down vflex acenter jbetween point" v-show="scroll_top > 200 && scroll_top < 1500 && !flag" @click="scorll_down2(-1)">
-                <img src="@/assets/images/common/icon-down-1.png" alt="" />
-                <img src="@/assets/images/common/icon-down-2.png" alt="" />
             </div>
-        </div>
-        <!-- <div class="fullPage"> -->
-            <div class="two_once" id="scroll_once" ref="scrollview" @mousewheel="scrollChange" @DOMMouseScroll="scrollChange" v-if="!flag">
+            <!-- <div class="fullPage"> -->
+            <div class="two_once" id="scroll_once" v-if="!flag">
                 <div class="shua shua_js" v-if="fullpage.current == 1 && !flag"></div>
             </div>
-            <div class="fullPageContainer" ref="fullPageContainer" @mousewheel="mouseWheelHandle" @DOMMouseScroll="mouseWheelHandle">
-                <div v-for="(item,index) in pageList" :key="index" class="two">
-                    <div class="video_bg" :id="'video' + index">
-                        <el-image :src="item.url" fit="cover" class="img" v-if="item.type2=='image'"></el-image>
+        </div>
+        <div class="fullPageContainer" ref="fullPageContainer" @mousewheel="mouseWheelHandle" @DOMMouseScroll="mouseWheelHandle">
+            <div v-for="(item,index) in pageList" :key="index" class="two">
+                <div class="video_bg" :id="'video' + index">
+                    <el-image :src="item.url" fit="cover" class="img" v-if="flag && item.url !== undefined"></el-image>
 
-                        <div class="shua shua_js" v-if="fullpage.current - 2 == index && !flag"></div>
-                        
-                        <video :src="item.url" muted   :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anymous" v-if="item.type2=='video'"></video>
-                        <div class="content hflex jbetween">
-                            <div class="content_left">
-                                <div class="name" :style="!fullpage.isScrolling?'color: #fff':''">{{ item.title }}</div>
-                                <div class="wenan" v-html="item.content" :style="!fullpage.isScrolling?'color: #fff':''"></div>
-                            </div>
-                            <div class="content_right vflex acenter jend">
-                                <div class="vflex acenter">
-                                    <div v-for="(items,indexs) in pageList.length" :key="indexs">
-                                        <div class="circle point" :class="index == indexs?'circle_active':''" @click="jump(indexs)"></div>
-                                    </div>
-                                    <div class="icon_down2 point vflex acenter jbetween" @click="scorll_down2(index + 1)">
-                                        <img src="@/assets/images/common/icon-down-1.png" alt="" />
-                                        <img src="@/assets/images/common/icon-down-2.png" alt="" />
-                                    </div>
+                    <div class="shua shua_js" v-if="fullpage.current - 2 == index && !flag"></div>
+                    
+                    <video :src="item.url1" muted :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anymous" v-if="!flag"></video>
+                    <div class="content hflex jbetween">
+                        <div class="content_left">
+                            <div class="name" :style="!fullpage.isScrolling?'color: #fff':''">{{ item.title }}</div>
+                            <div class="wenan" v-html="item.content" :style="!fullpage.isScrolling?'color: #fff':''"></div>
+                        </div>
+                        <div class="content_right vflex acenter jend">
+                            <div class="vflex acenter">
+                                <div v-for="(items,indexs) in pageList.length" :key="indexs">
+                                    <div class="circle point" :class="index == indexs?'circle_active':''" @click="jump(indexs)"></div>
                                 </div>
-                                <div class="right_index" :style="!fullpage.isScrolling?'color: #fff':''">
-                                    <span class="indexs">{{ index < 10 ? '0' + (index + 1) : index + 1 }}</span>
-                                    <span>/{{ pageList.length < 10 ? '0' + pageList.length : pageList.length }}</span>
+                                <div class="icon_down2 point vflex acenter jbetween" @click="scorll_down2(index + 1)">
+                                    <img src="@/assets/images/common/icon-down-1.png" alt="" />
+                                    <img src="@/assets/images/common/icon-down-2.png" alt="" />
                                 </div>
                             </div>
+                            <div class="right_index" :style="!fullpage.isScrolling?'color: #fff':''">
+                                <span class="indexs">{{ index < 10 ? '0' + (index + 1) : index + 1 }}</span>
+                                <span>/{{ pageList.length < 10 ? '0' + pageList.length : pageList.length }}</span>
+                            </div>
                         </div>
                     </div>
                 </div>
             </div>
+        </div>
         <!-- </div> -->
         <div class="three"  @mousewheel="scrollChange2" @DOMMouseScroll="scrollChange2" ref="videos">
             <div class="video_bg">
                 <div class="shua shua_js" v-if="fullpage.current - 2 == pageList.length && !flag"></div>
-                <video id="videos" :src="pageData.url2" muted   :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anymous" v-if="pageData.type2 == 'video'"></video>
-                <el-image id="videos" class="videos_img" :src="pageData.url2" fit="cover" v-if="pageData.type2 == 'image'"></el-image>
+                <video id="videos" :src="pageData.url22" muted  :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anymous" v-if="!flag"></video>
+                <el-image id="videos" class="videos_img" :src="pageData.url2" fit="cover" v-if="flag && pageData.url2 !== undefined"></el-image>
             </div>
             <div class="three_text" :style="!fullpage.isScrolling?'color: #fff':''" v-html="pageData.subtitle3"></div>
         </div>
         <div class="three">
             <div class="video_bg">
-                <video id="videos2" :src="pageData.url3" muted   :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anymous" v-if="pageData.type3 == 'video'"></video>
-                <el-image class="videos_img" :src="pageData.url3" fit="cover" v-if="pageData.type3 == 'image'"></el-image>
+                <video id="videos2" :src="pageData.url33" muted   :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anymous" v-if="!flag"></video>
+                <el-image class="videos_img" :src="pageData.url3" fit="cover" v-if="flag && pageData.url3 !== undefined"></el-image>
             </div>
         </div>
         <Footer :footer="footer"></Footer>   
@@ -136,7 +138,7 @@
 </template>
 <script>
 import Footer from '@/components/footer.vue'
-
+import { isElementNotInViewport } from "@/components/utils";
 //页面引入swiper
 var that = ''
 export default {
@@ -167,13 +169,22 @@ export default {
             flag: true,
             dialogVisible: false,
             autoplay: true,
-            a: ''
+            a: '',
+            down_icon: false
         }
     },
     created() {
         that = this
+        
         let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
+        
         that.flag = flag
+        if(that.flag === null) {
+            
+            that.flag = false
+
+        }
+
         // this.getVideoStyle()
         // document.addEventListener("WeixinJSBridgeReady", function () {
         //     document.getElementById("back_video").play();
@@ -194,14 +205,13 @@ export default {
                 // firefox
                 document.documentElement.scrollTop = 0
                 window.scrollTo(0,0);
-                console.log('页面刷新',document.documentElement.scrollTop);
 
                 that.scroll_top = 0
             });
             const scrollview = this.$refs['fullPageContainer']
-            scrollview.addEventListener('scroll', this.scrollChange, true)
+            scrollview.addEventListener('scroll', this.mouseWheelHandle, true)
             const scrollview2 = this.$refs['scrollview']
-            scrollview2.addEventListener('scroll', this.mouseWheelHandle, true)
+            scrollview2.addEventListener('scroll', this.scrollChange, true)
             const scrollview3 = this.$refs['videos']
             scrollview3.addEventListener('scroll', this.scrollChange2, true)
         }
@@ -330,6 +340,8 @@ export default {
                 }
                 if(that.windowWidth <= 750) {
                     that.flag = true
+                } else {
+                    that.flag = false
                 }
             }
             window.onresize()
@@ -368,11 +380,17 @@ export default {
             }
         },
         // 监听页面滑动
-        async handleScroll() {
+        handleScroll() {
             that = this
+            that.windowHeight = document.documentElement.clientHeight
             this.scroll_top = document.documentElement.scrollTop
-            that.clientHeight = document.documentElement.clientHeight;
-            
+            console.log(this.scroll_top,that.windowHeight);
+            // that.windowHeight = document.documentElement.clientHeight;
+            if(this.scroll_top > 200 && this.scroll_top < that.windowHeight && !that.flag) {
+                that.down_icon = true
+            } else  {
+                that.down_icon = false
+            }
         },
         // 向下切换
         next() {
@@ -444,7 +462,7 @@ export default {
                 return false
             }
             let e = event.originalEvent || event
-            this.fullpage.deltaY = e.deltaY || e.toDetail
+            this.fullpage.deltaY = e.deltaY || e.detail
             if(this.fullpage.deltaY > 0) {
                 this.next()
             } else if(this.fullpage.deltaY < 0) {
@@ -453,7 +471,7 @@ export default {
         },
        
         scrollChange(event) {
-            console.log('鼠标滑动');
+            // console.log('鼠标滑动');
             let evt = event || window.event
             if(evt.stopPropageation) {
                 evt.stopPropageation()
@@ -464,12 +482,12 @@ export default {
                 return false
             }
             let e = event.originalEvent || event
-            this.fullpage.deltaY = e.deltaY || e.toDetail
+            this.fullpage.deltaY = e.deltaY || e.detail
             const content = document.getElementById('video0');
             const {top, bottom}=content.getBoundingClientRect();
-            
+            console.log(top,bottom,that.windowHeight);
             if(this.fullpage.deltaY > 0) {
-                if(bottom > 0 && top < that.clientHeight + 50) {
+                if(bottom > 0 && top < that.windowHeight + 50) {
                     this.next()
                 } else {
                     document.documentElement.scrollTop += 50    
@@ -490,7 +508,7 @@ export default {
                 return false
             }
             let e = event.originalEvent || event
-            this.fullpage.deltaY = e.deltaY || e.toDetail
+            this.fullpage.deltaY = e.deltaY || e.detail
             var test = this.scroll_top
             const content = document.getElementById('video' + (that.pageList.length - 1));
             const {top, bottom}=content.getBoundingClientRect();
@@ -500,7 +518,7 @@ export default {
                 // this.next()
                 document.documentElement.scrollTop += 50
             } else if(this.fullpage.deltaY < 0) {
-                if(-top < that.clientHeight + 50 && bottom >= 0) {
+                if(-top < that.windowHeight + 50 && bottom >= 0) {
                     this.pre()
                 } else {
                     document.documentElement.scrollTop -= 50
@@ -509,11 +527,12 @@ export default {
         },
         // 点击向下滑动
         scorll_down() {
-            // console.log(value)
+            var width = document.documentElement.clientHeight
+            
             if(that.flag) {
-                document.documentElement.scrollTop = this.scroll_top + that.clientHeight / 8
+                document.documentElement.scrollTop = this.scroll_top + width / 8
             } else {
-                document.documentElement.scrollTop = this.scroll_top + that.clientHeight / 2
+                document.documentElement.scrollTop = this.scroll_top + width / 2
             }
             this.scroll_top = document.documentElement.scrollTop
         },

+ 6 - 5
xinxuan/src/view/news.vue

@@ -6,10 +6,10 @@
                 <!-- <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false"playsinline preload="auto" crossorigin="anoymous">
                     <source :src="pageData.x_url" type="video/mp4" />
                 </video> -->
-                <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anoymous" v-if="pageData.type=='video'">
-                    <source :src="pageData.x_url" type="video/mp4" />
+                <video id="back_video" class="video fillWidth"  :src="pageData.x_url1" muted :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  crossorigin="anoymous" v-if="!flag">
+                    <!-- <source :src="pageData.x_url1" type="video/mp4" /> -->
                 </video>
-                <el-image :src="pageData.x_url" class="video fillWidth" fit="cover" v-if="pageData.type=='image'"></el-image>
+                <el-image :src="pageData.x_url" class="video fillWidth" fit="cover" v-if="flag && pageData.x_url !== undefined"></el-image>
             </div>    
             <div class="title">{{ pageData.x_title }}</div>  
             <div class="subTitle" v-html="pageData.x_subtitle"></div>  
@@ -62,7 +62,7 @@ export default {
             load: true,
             fullscreenLoading: false,
             autoplay: true,
-
+            flag: true
         }
     },
     created() {
@@ -70,7 +70,8 @@ export default {
         that.getConfig()
         that.getList()
         that.isBrow()
-
+        let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
+        that.flag = flag
     },
     mounted() {
         window.addEventListener('scroll', this.handleScroll) // 监听页面滚动

+ 6 - 5
xinxuan/src/view/product.vue

@@ -6,10 +6,10 @@
                 <!-- <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false"playsinline preload="auto" crossorigin="anoymous">
                     <source :src="pageData.video" type="video/mp4" />
                 </video> -->
-                <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anoymous" v-if="pageData.type=='video'">
-                    <source :src="pageData.p_url" type="video/mp4" />
+                <video id="back_video" class="video fillWidth"  :src="pageData.p_url1" muted :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  crossorigin="anoymous" v-if="!flag">
+                    <!-- <source :src="pageData.p_url1" type="video/mp4" /> -->
                 </video>
-                <el-image  :src="pageData.p_url" class="video fillWidth" fit="cover" v-if="pageData.type=='image'"></el-image>
+                <el-image  :src="pageData.p_url" class="video fillWidth" fit="cover" v-if="flag && pageData.p_url !== undefined"></el-image>
             </div>    
             <div class="title">{{ pageData.p_title }}</div>  
             <div class="subTitle" v-html="pageData.p_subtitle"></div>  
@@ -79,7 +79,7 @@ export default {
             footer: {},
             scroll_top: 0,
             autoplay: true,
-
+            flag: true
         }
     },
     created() {
@@ -87,7 +87,8 @@ export default {
         that.getConfig()
         that.getData()
         that.isBrow()
-
+        let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
+        that.flag = flag
     },
     mounted() {
         window.addEventListener('scroll', this.handleScroll) // 监听页面滚动

+ 6 - 5
xinxuan/src/view/trade.vue

@@ -6,10 +6,10 @@
                 <!-- <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false"playsinline preload="auto" crossorigin="anoymous">
                     <source :src="pageData.video" type="video/mp4" />
                 </video> -->
-                <video id="back_video" class="video fillWidth" muted   :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  preload="auto" crossorigin="anoymous" v-if="pageData.type=='video'">
-                    <source :src="pageData.k_url" type="video/mp4" />
+                <video id="back_video" class="video fillWidth"  :src="pageData.k_url1" muted :autoplay="autoplay" loop :controls="false" :webkit-playsinline="true" playsinline x5-playsinline="true" x-webkit-airplay="true"  crossorigin="anoymous" v-if="!flag">
+                    <!-- <source :src="pageData.k_url1" type="video/mp4" /> -->
                 </video>
-                <el-image  :src="pageData.k_url" class="video fillWidth" fit="cover" v-if="pageData.type=='image'"></el-image>
+                <el-image  :src="pageData.k_url" class="video fillWidth" fit="cover" v-if="flag && pageData.k_url !== undefined"></el-image>
             </div>    
             <div class="title">{{ pageData.k_title }}</div>  
             <div class="subTitle" v-html="pageData.x_subtitle"></div>  
@@ -65,7 +65,7 @@ export default {
             footer: {},
             scroll_top: 0,
             autoplay: true,
-
+            flag: true
         }
     },
     created() {
@@ -73,7 +73,8 @@ export default {
         that.getConfig()
         that.getList()
         that.isBrow()
-
+        let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
+        that.flag = flag
     },
     mounted() {
         window.addEventListener('scroll', this.handleScroll) // 监听页面滚动

+ 1 - 1
xinxuan/vue.config.js

@@ -8,7 +8,7 @@ module.exports = {
     // 跨域
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: 'https://website.hdlkeji.com', //要跨域的地址,接口对接使用
+        target: 'https://www.lvweicaoping.com', //要跨域的地址,接口对接使用
         changeOrigin: true, // 允许跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: '',