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/freebuy.html | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/public/html/freebuy.html b/public/html/freebuy.html
index e4ff075..74340be 100644
--- a/public/html/freebuy.html
+++ b/public/html/freebuy.html
@@ -158,7 +158,7 @@
.list-section{
- display: -webkit-flex;display: flex;-webkit-flex-wrap: wrap;flex-wrap: wrap;-webkit-justify-content: space-between;justify-content: space-between;padding: 0 1.87%;
+ display: -webkit-flex;display: flex;-webkit-flex-wrap: wrap;flex-wrap: wrap;-webkit-justify-content: space-between;justify-content: space-between;padding: 0 1.87%;margin-top: 0.6rem;
}
.list-section .listTmp{
width: 49%;background: #fff;border-radius: .08rem;margin-bottom: .14rem;box-sizing: border-box;
@@ -293,9 +293,10 @@
<script src="https://polyfill.io/v2/polyfill.min.js?features=IntersectionObserver"></script>
<script>
(function(){
- var size = (document.body.clientWidth || document.documentElement.clientWidth);
- alert(size);
- size=size<=0?750:size;
+ var size1=document.body.clientWidth;
+ var size2=document.documentElement.clientWidth;
+ var size=size1<=0?size2:size1;
+ size=size<=0?400:size;
document.documentElement.style.fontSize = (size > 750 ? 750 : size) / 7.5 + 'px';
})();
@@ -355,11 +356,12 @@
"token":_this.getUrlPar("token")
},
//url:'http://dfg.shop.com/index.php/api/user/check_isfirst_free',
- //url:'http://dfgapp.ushopvip.com/api/user/check_isfirst_free',
- url:'http://appapitest.ushopvip.com/api/user/check_isfirst_free',
+ url:'http://dfgapp.ushopvip.com/api/user/check_isfirst_free',
+ //url:'http://appapitest.ushopvip.com/api/user/check_isfirst_free',
type:"post",
dataType:"json",
data:{
+
}
}).done(function(res){
if(res.msg.info==1)
@@ -369,8 +371,8 @@
"token":_this.getUrlPar("token")
},
//url:'http://dfg.shop.com/index.php/api/taoke/get_first_free_goods',
- //url:'http://dfgapp.ushopvip.com/api/taoke/get_first_free_goods',
- url:'http://appapitest.ushopvip.com/api/taoke/get_first_free_goods',
+ //url:'http://appapitest.ushopvip.com/api/taoke/get_first_free_goods',
+ url:'http://dfgapp.ushopvip.com/api/taoke/get_first_free_goods',
type:"post",
dataType:"json",
data:{
--
Gitblit v1.9.3