From 8c00bd0245ca4756ca04483a4980ad202714e43e Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 09:40:44 +0800
Subject: [PATCH] Merge branch 'release/v1.1.4发布'
---
public/html/freebuy.html | 132 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 19 deletions(-)
diff --git a/public/html/freebuy.html b/public/html/freebuy.html
index 4754b10..2d49258 100644
--- a/public/html/freebuy.html
+++ b/public/html/freebuy.html
@@ -52,13 +52,13 @@
.act_header{
z-index: 200; width: 100%; background: no-repeat top; background-size: 100% auto;
display: flex; align-items: center; justify-content: space-between;
- background: linear-gradient(90deg, #fbe7e2 0%, #fbe7e2 100%) 0% 0% / 100%;
+ background: linear-gradient(#FF451F, #fbe7e2);
color: #fff;
max-width: 800px;
}
.act_header .centent{
text-align: center;
- background: #FF451F;
+
padding-top: 0.6rem;
}
.act_header .centent img{
@@ -285,20 +285,34 @@
}
.appback
{
- width: 100%;
height: 0.5rem;
position: absolute;
- top: 0.4rem;
+ top: 0.5rem;
left: 0.4rem;
}
.appback-img
{
height: 100%;
}
+.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%;
+ }
</style>
</head>
<body style="background: #fbe7e2;">
+ <div class="box">
+ <div class="list">
<div id="appMain" >
<div class="appback">
<image v-on:click="topBack()" class="appback-img" src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/h5return_backIcon.png"></image>
@@ -306,10 +320,7 @@
<header class="act_header">
<div></div>
<div class="centent"><img src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/xinrengoubanner.png" alt=""></div>
-
</header>
-
-
<div class="sort">
<ul class="sort-list">
<li v-for="item in fristOrderSort" v-bind:class="{'sort-active': item.number == sortNumber}"
@@ -360,6 +371,8 @@
<span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span>
</div>
+</div>
+ </div>
</div>
</body>
@@ -423,7 +436,7 @@
isUniReady:false,
plat:'tb',
//posturl:"http://dfg.shop.com"
- posturl:"http://appapitest.ushopvip.com"
+ //posturl:"http://appapitest.ushopvip.com"
//posturl:"http://dfgapp.ushopvip.com"
},
methods: {
@@ -435,12 +448,73 @@
}
});
},
+ 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>=110)
+ {
+ return;
+ }
+ 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)
+ }
+ })
+ },
Infoformat: function(info){
- let formatObj = info.replace(/\%/g,"%25")
- formatObj = info.replace(/\#/g,"%23")
- formatObj = info.replace(/\&/g,"%26")
- formatObj = info.replace(/\?/g,"%3F")
- return formatObj;
+ info = info.replace(/\%/g,"%25")
+ info = info.replace(/\#/g,"%23")
+ info = info.replace(/\&/g,"%26")
+ info = info.replace(/\?/g,"%3F")
+ return info;
},
targetItem:function(item){
switch(this.plat)
@@ -451,6 +525,7 @@
});
break;
case "dy":
+ case "jd":
var itemsStr=this.Infoformat(JSON.stringify(item));
uni.navigateTo({
url: '/pages/goods/goodsDetail?sourcefrom=freebuy&info=' + itemsStr+'&frompage=freebuy'
@@ -484,6 +559,23 @@
if(r !=null)return unescape(r[2]);
return null;
},
+ //鑾峰彇浜笢鍟嗗搧
+ getJdGoodsList:function(){
+ var _this=this;
+ $.ajax({
+ headers:{
+ "token":_this.getUrlPar("token")
+ },
+ url:'/api/taoke/get_first_free_jd_goods',
+ type:"post",
+ dataType:"json",
+ data:{
+ }
+ }).done(function(res){
+ _this.lists=[].concat([],res.data.list);
+ _this.loading = false;
+ })
+ },
//鑾峰彇鎶栭煶鍟嗗搧
getDyGoodsList:function(){
var _this=this;
@@ -491,12 +583,10 @@
headers:{
"token":_this.getUrlPar("token")
},
- url:_this.posturl+'/api/taoke/get_first_free_dy_goods',
+ url:'/api/taoke/get_first_free_dy_goods',
type:"post",
dataType:"json",
data:{
- page: 1,
- pageSize:40,
}
}).done(function(res){
_this.lists=[].concat([],res.data.list);
@@ -511,7 +601,7 @@
headers:{
"token":_this.getUrlPar("token")
},
- url:_this.posturl+'/api/taoke/get_first_free_goods',
+ url:'/api/taoke/get_first_free_goods',
type:"post",
dataType:"json",
data:{
@@ -527,11 +617,14 @@
{
switch(plat)
{
- case "tb":
+ case "tb":
this.getTbGoodsList();
break;
case "dy":
this.getDyGoodsList();
+ break;
+ case"jd":
+ this.getJdGoodsList();
break;
}
},
@@ -544,7 +637,7 @@
headers:{
"token":_this.getUrlPar("token")
},
- url:_this.posturl+'/api/user/check_isfirst_free',
+ url:'/api/user/check_isfirst_free',
type:"post",
dataType:"json",
data:{
@@ -576,6 +669,7 @@
mounted: function () {
this.getIsSd();
var that=this;
+ this.touch();
document.addEventListener('UniAppJSBridgeReady', function() {
that.isUniReady=true;
});
--
Gitblit v1.9.3