From 30026db9cde628f6a3367da45e3906158fb49494 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期六, 10 六月 2023 09:33:24 +0800
Subject: [PATCH] Merge branch 'hotfix/h5接口地址修复'
---
public/html/freebuy.html | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/public/html/freebuy.html b/public/html/freebuy.html
index 2773917..8537da7 100644
--- a/public/html/freebuy.html
+++ b/public/html/freebuy.html
@@ -218,7 +218,7 @@
}
.loading{
- line-height: 1rem; text-align: center; font-size: .3rem; color: #999;
+ line-height: 2rem; text-align: center; font-size: .3rem; color: #999;
}
.sys{
width: 100%;
@@ -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,14 +293,17 @@
<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';
})();
Vue.use(VueLazyload, {
preLoad: 1.3,//
error: 'https://sr.ffquan.cn/cms_pic/20200622/bro7s7f6vrkd3jat4ujg0.png',
- loading: 'https://sr.ffquan.cn/cms_pic/20200612/brhjkf76vrkcrfpi79eg0.png',
+ // loading: 'https://sr.ffquan.cn/cms_pic/20200612/brhjkf76vrkcrfpi79eg0.png',
attempt: 1
})
new Vue({
@@ -317,7 +320,7 @@
active:0,
twoNav:false,
activeTwo:undefined,
- loading:false,
+ loading:true,
isUniReady:false
},
methods: {
@@ -353,8 +356,8 @@
"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:{
--
Gitblit v1.9.3