From 2d17ad0566b8e0efc319f926fd08316c8ab34ead Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 09:37:40 +0800
Subject: [PATCH] Merge tag '0元购商品修复' into develop
---
public/html/freebuy.html | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/public/html/freebuy.html b/public/html/freebuy.html
index 8fe4966..38466e5 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;
@@ -356,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)
@@ -370,13 +371,12 @@
"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:{
- page: 1,
- pageSize:40,
+
}
}).done(function(res){
_this.lists=[].concat(_this.lists,res.data.list);
--
Gitblit v1.9.3