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 | 211 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 192 insertions(+), 19 deletions(-)
diff --git a/public/html/fengqiangbang.html b/public/html/fengqiangbang.html
index da74431..7b3f9e1 100644
--- a/public/html/fengqiangbang.html
+++ b/public/html/fengqiangbang.html
@@ -29,13 +29,28 @@
var _config = {
appKey: 'bkuibk',//姝ゅ鏇挎崲鎴愮敤鎴穉ppKey
- jumpGoodsUrl: function (items) { //榛樿鐩存帴杞摼
+ jumpGoodsUrl: function (items,sourceType) { //榛樿鐩存帴杞摼
+ var url='';
+ if(sourceType=="jd"||sourceType=="pdd"||sourceType=="dy")
+ {
+ var itemsStr=Infoformat(JSON.stringify(items));
+ url='/pages/goods/goodsDetail?sourcefrom=fqb&info=' + encodeURIComponent(itemsStr)
+ }
+ else{
+ url='/pages/goods/goodsDetail?id=' + items.goodsid
+ }
uni.navigateTo({
- url: '/pages/goods/goodsDetail?id=' + items.goodsid
+ url: url
});
- // return '/pages/goods/goodsDetail?id=' + items.goodsid; //鏇挎崲涓鸿缁嗛〉闈㈢殑鍦板潃
}
};
+ function Infoformat(info){
+ let formatObj = info.replace(/\%/g,"%25")
+ formatObj = info.replace(/\#/g,"%23")
+ formatObj = info.replace(/\&/g,"%26")
+ formatObj = info.replace(/\?/g,"%3F")
+ return formatObj;
+ }
</script>
<style>
body{
@@ -44,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;
@@ -86,7 +101,7 @@
height: .4rem;background: rgba(255,129,70,.9);border-radius: .2rem;display: table;margin: .3rem auto;padding: 0 .2rem;font-size: .22rem;color: #fff;line-height: .4rem;
}
.list-container .topThree{
- display: -webkit-flex;display: flex;-webkit-justify-content: center;justify-content: center;
+ display: -webkit-flex;display: flex;-webkit-justify-content: center;justify-content: center; margin-top: .3rem;
}
.list-container .topThree>div {
width: 2.2rem;height: 3.4rem;background: #fff;border-radius: .14rem;padding: .1rem;position: relative;
@@ -226,7 +241,7 @@
font-weight: 500;color: #fff;line-height: .65rem;text-align: center;
}
.list-container .card-block{
- padding-top: 15px;
+
}
.sys{
width: 100%;
@@ -263,11 +278,41 @@
font-size: .35rem;
color: #333;
}
+ .contscore
+ {
+ 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">
@@ -295,7 +340,7 @@
<div class="swiper-container card-block">
<div class="swiper-wrapper">
- <div class="swiper-slide swiper-no-swiping">
+ <div class="swiper-slide swiper-no-swiping contscore">
<div class="topThree">
<div v-for="(item,index) in goodsList" :key = "index" v-if="index==1" @click="handleCdetailFavorite(item)">
<a>
@@ -386,11 +431,9 @@
</div>
</div>
</div>
-
-
-
</div>
-
+</div>
+</div>
</body>
<script>
@@ -418,9 +461,9 @@
ss:0,
cid:0,
type:1,
- //posturl:'http://dfg.shop.com',
- // posturl:'http://dfgapp.ushopvip.com',
- posturl:'http://appapitest.ushopvip.com',
+ //posturl:'http://dfg.shop.com',
+ posturl:'http://dfgapp.ushopvip.com',
+ // posturl:'http://appapitest.ushopvip.com',
platlist:[
{
id:"tb",
@@ -440,14 +483,129 @@
}
],
platid:'tb',
+ scrollTop: 0,
+ canScroll: false,
+ nowPage:1,
+ loadData:false
},
onload(options){
console.log(options);
},
+ onReachBottom(){
+ console.log("鍒板簳浜�111");
+ },
methods:{
+ getItemDetail:function(items)
+ {
+ var _this = this;
+ $.ajax({
+ headers:{
+ "token":_this.getUrlPar("token")
+ },
+ url:_this.posturl+'/api/Activity/fqb_goods_detail',
+ type:"post",
+ dataType:"json",
+ data:{
+ plat:_this.platid,
+ goodsid:items.goodsid
+ }
+ }).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() {
+ //
+ var _this = this;
+ var range = 800; //璺濅笅杈圭晫闀垮害/鍗曚綅px
+ var totalheight = 0;
+ $('.contscore').scroll(function() {
+ var scroll = document.getElementsByClassName('contscore')
+ var srollPos = $('.contscore').scrollTop(); //婊氬姩鏉¤窛椤堕儴璺濈(椤甸潰瓒呭嚭绐楀彛鐨勯珮搴�)
+ totalheight = parseFloat($('.contscore').height()) + parseFloat(srollPos);
+ _this.scrollTop = srollPos
+ var scrollH = scroll[0].scrollHeight
+ // debugger
+ // console.log('scrollH - range',scrollH - range,'srollPos',srollPos)
+ if (scrollH - range <= srollPos) {
+ if (_this.canScroll&&_this.platid!='tb') {
+ _this.canScroll = false;
+ _this.loadData = true;
+ _this.nowPage++;
+ _this.getGoodsList(_this.cid);
+ }
+ }
+ });
+ },
handleCdetailFavorite: function (items) {
if(_config.jumpGoodsUrl){
- _config.jumpGoodsUrl(items);
+ switch(this.platid)
+ {
+ case "tb":
+ case "pdd":
+ case "dy":
+ _config.jumpGoodsUrl(items,this.platid);
+ break;
+ case "jd":
+ this.getItemDetail(items);
+ break;
+ }
}
return;
var params = {
@@ -509,7 +667,9 @@
})
},
chooseCate:function(index,cid,type){//閫夋嫨鍒嗙被
- mySwiper.slideTo(index-2, 1000, false)
+ mySwiper.slideTo(index-2, 1000, false);
+ this.nowPage=1;
+ this.goodsList=[];
this.actIndex = index;
this.getGoodsList(cid,type)
this.cid = cid;
@@ -518,11 +678,13 @@
choosePlat:function(index,id)
{//閫夋嫨骞冲彴
this.platid = id;
+ this.goodsList=[];
this.getCateList();
},
getCateList:function(){//鑾峰彇鍒嗙被鍒楄〃
var _this = this;
//_this.loading=true;
+ this.nowPage=1;
if(this.platid=='tb')
{
$.ajax({
@@ -641,11 +803,20 @@
cid:cid,
type:type,
app_key: _config.appKey,
+ mainid:_this.nowPage
}
}).done(function(res){
_this.loading=false;
if(res.code == 0){
- _this.goodsList =_this.platid=='tb'? res.data.data.data:res.data;
+ var resdata=_this.platid=='tb'? res.data.data.data:res.data;
+ _this.goodsList=_this.goodsList.concat(resdata);
+ if(resdata&&resdata.length>0)
+ {
+ _this.canScroll=true;
+ }
+ else{
+ _this.canScroll=false;
+ }
// _this.sys = (res.data.data && res.data.data.sys) ? res.data.data.sys : null;
}
else {
@@ -726,6 +897,8 @@
mounted:function(){
this.getCateList();
this.cateRender();
+ this.scrollLoad();
+ this.touch();
// this.getDateNow();
//this.getGoodsList();
// this.getNowTime();
--
Gitblit v1.9.3