From 28534913afd81c7d4636badb5f5a518f471b02a3 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 29 六月 2023 14:39:18 +0800
Subject: [PATCH] Merge branch 'hotfix/1.1.3修复'
---
public/html/fengqiangbang.html | 99 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 90 insertions(+), 9 deletions(-)
diff --git a/public/html/fengqiangbang.html b/public/html/fengqiangbang.html
index aa3c34d..7b3f9e1 100644
--- a/public/html/fengqiangbang.html
+++ b/public/html/fengqiangbang.html
@@ -59,7 +59,7 @@
a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline;-webkit-tap-highlight-color:transparent;-webkit-tap-highlight-color:rgba(0,0,0,0);tap-highlight-color:transparent;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}html{font-family:Arial,PingFang SC,-apple-system,BlinkMacSystemFont,Segoe UI,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:"";content:none}
.list-container{
position: relative;
- padding-top: 10px;
+ padding-top: 30px;
}
.top-bg{
width: 100%;position: absolute;top:0;
@@ -283,11 +283,36 @@
overflow:scroll;
height: 80vh;
}
+ .box
+ {
+ position:absolute;
+ width: 100%;
+ height: 100%;
+ background: url(https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/h5loading.gif) no-repeat fixed top;
+ background-size: 70px 70px;
+ }
+ .list{
+ position: relative;
+ top: 0;
+ width: 100%;
+ }
+ .reloadbg
+ {
+ display: flex;
+ justify-content: center;
+ height: 1.3rem;
+ }
</style>
</head>
-<body style="padding-top:30px">
-
+<body>
+ <div class="box">
+ <!-- <div class="reloadbg">
+ <image class="reloadbgimg" src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/h5loading.gif"></image>
+ </div>
+ -->
+ <div class="list">
+
<img src="https://jpdy.ffquan.cn/static/header_bg.12963398.png" class="top-bg" alt="">
<div class="list-container" id="fqList">
@@ -406,11 +431,9 @@
</div>
</div>
</div>
-
-
-
</div>
-
+</div>
+</div>
</body>
<script>
@@ -438,8 +461,8 @@
ss:0,
cid:0,
type:1,
- posturl:'http://dfg.shop.com',
- // posturl:'http://dfgapp.ushopvip.com',
+ //posturl:'http://dfg.shop.com',
+ posturl:'http://dfgapp.ushopvip.com',
// posturl:'http://appapitest.ushopvip.com',
platlist:[
{
@@ -489,6 +512,63 @@
}).done(function(res){
_config.jumpGoodsUrl(res.data,_this.platid);
})
+ },
+ touch:function()
+ {
+ const box = document.querySelector('.box')
+ const list = document.querySelector('.list');
+ // 鎸変笅灞忓箷鐨勪綅缃�
+ let touchStartPosition = 0
+
+ // touchstart浜嬩欢
+ box.addEventListener('touchstart', function (e) {
+ let touch = e.touches[0]
+ touchStartPosition = touch.pageY
+ })
+ // touchmove浜嬩欢
+ box.addEventListener('touchmove', function (e) {
+
+ let touch = e.touches[0]
+ // 鍒楄〃鐨則op鍊肩瓑浜庡垪琛ㄧ浉瀵逛簬box鐨勫亸绉婚噺+婊戝姩鐨勮窛绂�
+ let pySize= list.offsetTop + touch.pageY - touchStartPosition;
+ if(pySize<0)
+ {
+ return;
+ }
+ var scroll = document.getElementsByClassName('contscore')
+ var srollPos = $('.contscore').scrollTop(); //婊氬姩鏉¤窛椤堕儴璺濈(椤甸潰瓒呭嚭绐楀彛鐨勯珮搴�)
+ if(srollPos>0)
+ {
+ return;
+ }
+ list.style.top =pySize + 'px';
+ // 瀹炵幇骞虫粦鐨勬粦鍔�
+ touchStartPosition = touch.pageY
+ })
+ // touchend浜嬩欢
+ box.addEventListener('touchend', function (e) {
+ let top = list.offsetTop
+ if (top > 70) {
+ // 鍦ㄦ澶勮皟鐢ㄥ埛鏂板悗鐨勫洖璋�
+ console.log('鍒锋柊');
+ location.reload();
+ }
+ if(top<0)
+ {
+ list.style.top=0;
+ }
+ if (top > 0) {
+ // 閫氳繃瀹氭椂鍣ㄥ钩婊戠殑灏唋ist鐨則op = 0
+ let timer = setInterval(() => {
+ top=top-5;
+ list.style.top = top + 'px'
+ if (top <= 0) {
+ list.style.top=0;
+ clearInterval(timer)
+ }
+ },1)
+ }
+ })
},
scrollLoad: function() {
//
@@ -818,6 +898,7 @@
this.getCateList();
this.cateRender();
this.scrollLoad();
+ this.touch();
// this.getDateNow();
//this.getGoodsList();
// this.getNowTime();
--
Gitblit v1.9.3