From c6aed7b39a4e95a25e5bcac47a55ac98cb222b49 Mon Sep 17 00:00:00 2001 From: zhaojs <349234519@qq.com> Date: 星期四, 29 六月 2023 14:34:32 +0800 Subject: [PATCH] Merge branch 'release/v1.1.3api发布' --- public/html/freebuy.html | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/public/html/freebuy.html b/public/html/freebuy.html index 5461f60..97d2b72 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,7 +293,10 @@ <script src="https://polyfill.io/v2/polyfill.min.js?features=IntersectionObserver"></script> <script> (function(){ - var size = (document.body.clientWidth || document.documentElement.clientWidth); + 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'; })(); @@ -358,6 +361,7 @@ type:"post", dataType:"json", data:{ + } }).done(function(res){ if(res.msg.info==1) @@ -367,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