From 5ce7f37d8f2a160ac17a34a7777a0382ca1b3da8 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 29 六月 2023 14:39:19 +0800
Subject: [PATCH] Merge tag '1.1.3修复' into develop
---
public/html/freebuy.html | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/public/html/freebuy.html b/public/html/freebuy.html
index 14924fa..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;
@@ -244,8 +244,9 @@
</header>
<div :style="{ height: (twoNav && twoNav.length > 0) ? '2.3rem' : '2.3rem'}"></div>
-
- <div v-if="!loading" style="min-height: 100vh; background: #fbe7e2;" class=" swiper-container swiper-container-initialized swiper-container-horizontal swiper-container-free-mode swiper-container-ios">
+ <div v-if="loading" v-else class="loading">鍔犺浇涓�...</div>
+
+ <div v-else style="min-height: 100vh; background: #fbe7e2;" class=" swiper-container swiper-container-initialized swiper-container-horizontal swiper-container-free-mode swiper-container-ios">
<div class="swiper-wrapper" style="transform: translate3d(0px, 0px, 0px);">
<div class="swiper-slide list-section">
<div class="listTmp " v-for="(data,key) in lists" :key="key" v-on:click="targetItem(data)">
@@ -284,8 +285,7 @@
<div class="swiper-pagination"></div>
<span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span>
</div>
- <div v-else class="loading">鍔犺浇涓�...</div>
-
+
</div>
</body>
@@ -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';
})();
@@ -353,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)
@@ -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