Browse Source

兼容苹果浏览器scrollTop

jinsy 7 years ago
parent
commit
b4d5c6941f

+ 3 - 6
frontend/saas-portal-web/src/components/conenter/addenterprise.vue

@@ -186,8 +186,7 @@ import { setTimeout, clearTimeout } from 'timers';
             },
             //取消添加企业
             tjquxiao(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 this.$router.push({name:'company',}); 
             },
             //检测企业名称1
@@ -401,8 +400,7 @@ import { setTimeout, clearTimeout } from 'timers';
                             // this.$store.state.ishongdian = true;//显示红点
                             setTimeout(()=>{
                                 this.$router.push({name:'company'});
-                                document.documentElement.scrollTop = 0;
-                                window.pageYOffset = 0;
+                                $(document).scrollTop(0);
                             },3000)
                         } else {
                             this.$message.error(res.data.message);
@@ -495,8 +493,7 @@ import { setTimeout, clearTimeout } from 'timers';
                             .then(res=>{
                                 this.isadd = true;//添加成功弹窗
                                 setTimeout(()=>{
-                                    document.documentElement.scrollTop = 0;
-                                    window.pageYOffset = 0;
+                                    $(document).scrollTop(0);
                                     let session = Session.get();
                                     session.account.realname = name;
                                     session.account.email = email;

+ 3 - 6
frontend/saas-portal-web/src/components/conenter/company.vue

@@ -219,8 +219,7 @@
         methods: {
             //分页
             handleCurrentChange(val){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 this.pagingtion(val,this.size);
             },
             //分页函数
@@ -383,15 +382,13 @@
             },
             //查看企业详情
             getEnterpriseInfo(d){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 window.sessionStorage.setItem('content',JSON.stringify(d))
                 this.$router.push({path:'/details'});
             },
              //添加企业
             addEnterprise(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
             },
             //关闭弹窗
             guanbitc(){

+ 3 - 6
frontend/saas-portal-web/src/components/conenter/details.vue

@@ -140,8 +140,7 @@ import Session from '@/utils/session'
             },
             //修改企业信息
             xiugaiqiye(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 this.modify = false;
                 setTimeout(()=>{
                     this.selects()
@@ -170,8 +169,7 @@ import Session from '@/utils/session'
             },
             // 取消修改
             quxiaoxiugai(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
+                $(document).scrollTop(0);
                 this.modify = true;
             },
             // 保存修改
@@ -200,8 +198,7 @@ import Session from '@/utils/session'
                     })
                     .then(res=>{
                         if (res.data.success) {
-                            document.documentElement.scrollTop = 0;
-                            window.pageYOffset = 0;
+                            $(document).scrollTop(0);
                             this.modify = true;
                             let session = Session.get();
                             session.account.email = email;

+ 1 - 22
frontend/saas-portal-web/src/components/conenter/enterprise.vue

@@ -153,15 +153,6 @@
                     <div class="gs-news" ref="qiyebox" :class="isheigh ? 'heigh' : ''">
                         <ul>
                             <li>
-                                <!-- <span>消息类型</span>
-                                <span>时间</span>
-                                <span class="newscentent" style="position: relative;top: 7px;">
-                                    <span>消息内容</span>
-                                    <span>管理员</span>
-                                    <span>联系方式</span>
-                                </span>
-                                <span>状态</span>
-                                <span>操作</span> -->
                                 <span>内容</span>
                                 <span>状态</span>
                                 <span>时间</span>
@@ -177,16 +168,6 @@
                                 <span v-else-if='d.status == 1' style="color: #3CC600;">已通过</span>
                                 <span v-else-if='d.status == 2' style="color: #1E88F5;">待批准</span>
                                 <span>{{d.createTime}}</span>
-                                <!-- <span>{{d.createTime}}</span>
-                                <span class="newscentent" style="position:relative;top:9px">
-                                    <span>{{d.companyName}}</span>
-                                    <span>{{d.admin}}</span>
-                                    <span>{{d.adminMobile}}</span>
-                                </span>
-                                <span v-if='d.status == 0' style="color: #FF3900;">未通过</span>
-                                <span v-else-if='d.status == 1' style="color: #3CC600;">已通过</span>
-                                <span v-else-if='d.status == 2' style="color: #1E88F5;">待批准</span>
-                                <span><button v-if="d.status == 0" @click="Rejoin(i)" class="news-btn">重新加入</button></span> -->
                             </li>
                             <li v-if="!isnews" class="wushuju">
                                 <img src="/static/img/zanwushuju2x.png" alt="">
@@ -473,9 +454,7 @@ import { setTimeout } from 'timers';
                 this.$store.commit('problemtrue')
             },
             scrollout(){
-                document.documentElement.scrollTop = 0;
-                window.pageYOffset = 0;
-                document.body.scrollTop = 0;
+                $(document).scrollTop(0)
             },
             //内容不足500固定高度
             boxheight(){

+ 9 - 9
frontend/saas-portal-web/src/components/conenter/home.vue

@@ -395,7 +395,7 @@
     },
     methods: {
       handleFun(){
-        let top = $(window).scrollTop();
+        let top = $(document).scrollTop();
         let Y = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop;
         if ($('#feature').offset()) {
           // var scrollH = Math.floor($('#feature').offset().top) - 260;//500
@@ -611,6 +611,7 @@
           let featH = Math.floor($('#feature').offset().top) - 70;
           this.animate(featH);//690
         },10);
+        // console.log($(document).scrollTop())
       },
       //功能
       service2(){
@@ -642,14 +643,13 @@
             var step = (target - leader) / 10;
             step = step > 0 ? Math.ceil(step) : Math.floor(step);
             leader = leader + step;
-            document.documentElement.scrollTop++;
-            if(document.documentElement.scrollTop ){
-              document.documentElement.scrollTop = leader;
-          }else if(window.pageYOffset){
-              window.pageYOffset = leader;
-          }else if(document.body.scrolltop){
-              document.body.scrolltop = leader;
-          }
+            $(document).scrollTop(leader);
+        //     document.documentElement.scrollTop++;
+        //     if(document.documentElement.scrollTop ){
+        //       document.documentElement.scrollTop = leader;
+        //   }else if(document.body.scrolltop){
+        //       document.body.scrolltop = leader;
+        //   }
             if (leader == target) {
                 clearInterval(this.timer);
             }

+ 1 - 1
frontend/saas-portal-web/src/components/footer/footer.vue

@@ -66,7 +66,7 @@
 			problem(){
 				this.$router.push({name: 'Home', params: {isporblem: false}})
 				this.$store.commit("problemfalse")
-				document.documentElement.scrollTop = 0;
+				$(document).scrollTop(0)
 			},
 			gohome(){
 				this.$store.commit("problemtrue")