From d50b2f10e597b058e9f7f34df014f067cc8b7c6b Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期五, 09 六月 2023 15:01:49 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.2api' of http://60.204.153.149:8081/r/dfgApi into feature/v1.1.2api
---
public/html/freebuy.html | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/public/html/freebuy.html b/public/html/freebuy.html
index b5afca0..4097aaf 100644
--- a/public/html/freebuy.html
+++ b/public/html/freebuy.html
@@ -245,7 +245,7 @@
<div :style="{ height: (twoNav && twoNav.length > 0) ? '2.3rem' : '2.3rem'}"></div>
- <div v-if="!loading" style="min-height: 100vh;" class=" swiper-container swiper-container-initialized swiper-container-horizontal swiper-container-free-mode swiper-container-ios">
+ <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 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)">
@@ -254,9 +254,7 @@
</div>
<div class="productInfo">
<div class="title">
- <div class="shoplabel ">
- <img src="">
- </div>
+
<span>{{data.dtitle}}</span>
</div>
@@ -324,7 +322,10 @@
methods: {
targetItem:function(item){
- if(this.isUniReady)
+ uni.navigateTo({
+ url: '/pages/goods/goodsDetail?id=' + item.goodsId+'&frompage=freebuy'
+ });
+ /* if(this.isUniReady)
{
uni.postMessage({
data: {
@@ -332,7 +333,7 @@
data:item
}
});
- }
+ } */
},
getUrlPar:function(name)
@@ -375,15 +376,8 @@
pageSize:20,
}
}).done(function(res){
- var newlist=[];
- res.data.list.map(function(r,k){
- var buprice=r.actualPrice-r.topFanli;
- if(buprice<=3)
- {
- newlist.push(r);
- }
- })
- _this.lists=[].concat(_this.lists,newlist);
+
+ _this.lists=[].concat(_this.lists,res.data.list);
_this.loading = false;
})
}
--
Gitblit v1.9.3