From 9ea0383c303620cd019d0776ecbb47f52bcef805 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 28 六月 2023 14:17:25 +0800
Subject: [PATCH] Merge branch 'feature/1.1.3版本开发' into develop
---
uniapp/pages/active/tmsearch.vue | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/uniapp/pages/active/tmsearch.vue b/uniapp/pages/active/tmsearch.vue
index b35d96a..a95608f 100644
--- a/uniapp/pages/active/tmsearch.vue
+++ b/uniapp/pages/active/tmsearch.vue
@@ -76,15 +76,13 @@
</block>
</scroll-view>
</view>
-
+
<view class="goodsList-container colCen borderBox">
<view class="goods-content rowStaBet">
- <view class="goods-items borderBox colCen">
- <colGoodsImg :popBannerSList="popBannerSList"></colGoodsImg>
- <view v-for="(items,index) in goodsList" :key='index' @click="goDetail(items)">
- <colGoods :items="items"></colGoods>
- </view>
-
+ <view class="goods-items borderBox" v-for="(items,index) in goodsList" :key='index' @click="goDetail(items)">
+ <!-- <colGoodsImg :popBannerSList="popBannerSList"></colGoodsImg> -->
+ <colGoodsImg v-if="index==0&&popBannerSList&&popBannerSList.length>0" :popBannerSList="popBannerSList"></colGoodsImg>
+ <colGoods v-else :items="items"></colGoods>
</view>
<aLoadMore :status="loadstatus" mode="loading3" :showTitle='true' color="#999999"></aLoadMore>
</view>
@@ -98,7 +96,8 @@
import colGoodsImg from '../../components/colGoodsImg.vue'
export default {
components:{
- colGoods
+ colGoods,
+ colGoodsImg
},
data() {
return {
@@ -114,6 +113,7 @@
canloadmore: false,
loadstatus: 'loading',
nowsec:0,
+ isinsert:false,
secrendSearch:[
{
id:0,
@@ -161,11 +161,9 @@
},
mounted() {
uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
- console.log(data.top);
this.fiexdHeight = data.height
}).exec();
uni.createSelectorQuery().in(this).select('.rangeList-container').boundingClientRect(data => {
- console.log(data.top);
this.fiexdtop = data.top - this.fiexdHeight
}).exec();
},
@@ -173,7 +171,6 @@
getNav() {
var that = this;
this.$u.api.getTopCalss({ctype:1,parentId:0}).then(e => {
- console.log(e);
if(e.code != 0)return that.$alert(e.msg)
e.data.list.unshift({cid:"-1",cname:"澶╃尗瓒呭競",ctype:"1"});
e.data.list.unshift({cid:"0",cname:"鍏ㄩ儴",ctype:"1"});
@@ -195,7 +192,6 @@
tchaoshi:tchaoshi,
secrend_search:this.nowsec
}).then(e => {
- console.log(e);
if (e.code != 0) return that.$alert(e.msg)
var res = e.data;
uni.stopPullDownRefresh();
@@ -210,18 +206,27 @@
that.loadstatus = 'loading'
that.pageCurrent ++
}
+ /* if(!that.isinsert&&res&&res.length>0)
+ {
+ that.goodsList.unshift(res[0]);
+ that.isinsert=true;
+ } */
that.goodsList = that.goodsList.concat(res)
}).catch(function(err) {})
},
getPageImg()
{
+ var that=this;
this.$u.api.getBanner({
- type: '12'
+ type: '11,16'
}).then(e => {
- console.log(e)
if (e.code == 1) return that.$alert(e.msg);
var res = e.data.info;
- this.popBannerSList=res.popBannerSList;
+ this.popBannerSList=res.tmImg;
+ if(res.tmImg&&res.tmImg.length>0)
+ {
+ that.goodsList.unshift(res[0]);
+ }
}).catch(function(err) {
console.log(err)
})
@@ -244,9 +249,13 @@
},
goDetail(info) {
- uni.navigateTo({
- url: '../goods/goodsDetail?info=' + encodeURIComponent(JSON.stringify(info))
- })
+ if(info&&info!=undefined)
+ {
+ uni.navigateTo({
+ url: '../goods/goodsDetail?info=' + encodeURIComponent(JSON.stringify(info))
+ })
+ }
+
},
goback() {
--
Gitblit v1.9.3