From fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 15:18:06 +0800
Subject: [PATCH] Merge branch 'feature/1.1.4开发' into develop
---
uniapp/components/indexPage.vue | 242 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 199 insertions(+), 43 deletions(-)
diff --git a/uniapp/components/indexPage.vue b/uniapp/components/indexPage.vue
index c239708..b508431 100644
--- a/uniapp/components/indexPage.vue
+++ b/uniapp/components/indexPage.vue
@@ -392,6 +392,7 @@
v-if="bottomGoodsList.length>0">
<block v-for="(items,index) in bottomGoodsList" :key="index">
<view class="goods-items" @click="goDetails(items)">
+ <!-- <colGoodsImg v-if="index==0&&itembannerList&&itembannerList.length>0" :popBannerSList="itembannerList"></colGoodsImg> -->
<colGoods :items="items"></colGoods>
</view>
</block>
@@ -411,6 +412,7 @@
import slideTop from './slideTop.vue'
import colGoods from './colGoods.vue'
import empowerModel from './empowerModel.vue'
+ import colGoodsImg from '@/components/colGoodsImg.vue'
export default {
props: {
recomendType: {
@@ -432,10 +434,12 @@
components: {
slideTop,
colGoods,
- empowerModel
+ empowerModel,
+ colGoodsImg
},
data() {
return {
+ popBannerSList:[],
fallingList: [],
pageHeight: '',
headerColor: '',
@@ -491,9 +495,16 @@
swpidx: 0,
canrefresh: true,
fastenter:[],
- popBannerSList:[],
+ itembannerList:[],
enterTop:[],
- enterDown:[]
+ enterDown:[],
+ tbbanner:[],
+ jdbanner:[],
+ dybanner:[],
+ pddbanner:[],
+ wphbanner:[],
+ haspreference:false,
+ preferData:{},
}
},
watch: {
@@ -521,14 +532,16 @@
},
created() {
this._freshing = false;
- this.changeRecommend();
+ //this.changeRecommend();
+ this.checkPreferenceGoods();
uni.$emit('initpage')
this.getBannerInfo();
this.getHomeMenuList();
this.getrecommendGoods();
- this.getbottomGoodsList(this.bottomType);
+ //this.getbottomGoodsList(this.bottomType);
this.getGOODSfalling();
this.getRQList();
+ //this.getPageImg();
},
mounted() {
this.$emit('scrolltoTop')
@@ -538,6 +551,56 @@
}, 1500)
},
methods: {
+ checkPreferenceGoods()
+ {//鏄惁鏈夋帹鑽�
+ var that = this;
+ var tmp_1 = {
+ mainTitle: '澶╃尗',
+ subTitle: '澶╃尗鐑攢',
+ type: 5
+ };
+ var tmp_2 = {
+ mainTitle: '澶╃尗',
+ subTitle: '涓轰綘鎺ㄨ崘',
+ type: 1
+ };
+ var tmp_3= {
+ mainTitle: '鎺ㄨ崘',
+ subTitle: '鐚滀綘鍠滄',
+ type: 7
+ };
+ var open_like_recommend = uni.getStorageSync('open_like_recommend');
+ if(this.typedataList.length == 5)this.typedataList.shift()
+ if(open_like_recommend == 1){
+ this.typedataList.unshift(tmp_2);
+ this.bottomType = tmp_2.type;
+ }else{
+ this.typedataList.unshift(tmp_1);
+ this.bottomType = tmp_1.type;
+ }
+ this.$u.api.checkPreferenceGoods({
+ }).then(e => {
+ console.log(e);
+ if(e.code != 0)
+ {
+ that.currentPage = 1;
+ that.getbottomGoodsList(that.bottomType);
+ return;
+ };
+ if(e.data&&e.data.p_cids)
+ {//鏈夊亸濂�
+ that.preferData=e.data;
+ that.typedataList.unshift(tmp_3);
+ that.bottomType = tmp_3.type;
+ //鍘婚櫎鍞搧浼�
+ that.typedataList = that.typedataList.filter(function(item) {return item.type !== 4});
+ }
+ that.currentPage = 1;
+ that.getbottomGoodsList(that.bottomType);
+ }).catch(function (err) {
+ this.changeRecommend();
+ })
+ },
changeRecommend(){
var tmp_1 = {
mainTitle: '澶╃尗',
@@ -545,7 +608,7 @@
type: 5
};
var tmp_2 = {
- mainTitle: '鎺ㄨ崘',
+ mainTitle: '澶╃尗',
subTitle: '涓轰綘鎺ㄨ崘',
type: 1
};
@@ -595,7 +658,6 @@
},
onRestore() {
this.swpidx = 0
- console.log('涓嬫媺琚粓姝�');
},
pagescroll(e) {
this.$emit('scrollNum', e.detail.scrollTop)
@@ -626,11 +688,14 @@
this.$u.api.getBanner({
type: '1,3,4,5,11,12,13,14'
}).then(e => {
- console.log(e)
if (e.code == 1) return that.$alert(e.msg);
var res = e.data.info;
- this.topBannerList = res.topBannerList;
- this.headerColor = this.topBannerList[0].colour;
+ if(res.topBannerList&&res.topBannerList.length>0)
+ {
+ this.topBannerList = res.topBannerList;
+ this.headerColor = this.topBannerList[0].colour;
+ }
+
this.singleLineList = res.singleLineList;
this.doubleLineList = res.doubleLineList;
this.bottomBannerList = res.bottomBannerList;
@@ -685,43 +750,81 @@
that.dyList = e.data.dygoods;
}).catch(function(err) {})
},
-
+ getPageImg()
+ {
+ var that=this;
+ this.$u.api.getBanner({
+ type: '11,16,17,18,19,20'
+ }).then(e => {
+ if (e.code == 1) return that.$alert(e.msg);
+ var res = e.data.info;
+ that.tbbanner=res.tmImg;
+ that.jdbanner=res.jdImg;
+ that.dybanner=res.dyImg;
+ that.pddbanner=res.pddImg;
+ that.wphbanner=res.wphImg;
+ that.changeBanner(that.bottomCurrent);
+ }).catch(function(err) {
+ console.log(err)
+ })
+ },
+ changeBanner(type)
+ {
+ switch(type)
+ {
+ case 2://浜笢
+ this.itembannerList=this.jdbanner;
+ break;
+ case 6://鎶栭煶
+ this.itembannerList=this.dybanner;
+ break;
+ case 3://鎷煎澶�
+ this.itembannerList=this.pddbanner;
+ break;
+ case 4://鍞搧浼�
+ this.itembannerList=this.wphbanner;
+ break;
+ default:
+ this.itembannerList=[];
+ break;
+ }
+ if(this.itembannerList&&this.itembannerList>0)
+ {
+ that.bottomGoodsList.unshift(this.itembannerList[0]);
+ }
+ },
getbottomGoodsList(type) {
var that = this;
- this.$u.api.getGoodThing({
- deviceType: getApp().globalData.platform == 'android' ? (getApp().globalData.systemLevel < 10 ?
- 'IMEI' : 'OAID') : 'IDFA',
- deviceValue: getApp().globalData.equipmentNumber,
- pageId: 1,
- pageSize: 10,
- type: type
- }).then(e => {
- console.log(e)
- if (e.code != 0) return that.$alert(e.msg)
- var res = e.data.list;
- if (res.length < 10) {
- that.loadingState = false
- that.loadstatus = 'normal'
- } else {
- that.currentPage++
- that.loadstatus = 'loading'
- that.loadingState = true
- }
- that.bottomGoodsList = res
- }).catch(function(err) {})
- },
-
- getNextPage() {
- if (this.loadingState) {
- this.loadingState = false
- var that = this;
+ if(type==7&&that.preferData)
+ {//鐚滀綘鍠滄
+ this.$u.api.gussessLikeGoods({
+ platefrom:that.preferData.p_platefrom,
+ cids:that.preferData.p_cids,
+ pageId:1,
+ pageSize:10
+ }).then(e=>{
+ console.log(e);
+ var res = e.data.list;
+ if (res.length < 10) {
+ that.loadingState = false
+ that.loadstatus = 'normal'
+ } else {
+ that.currentPage++
+ that.loadstatus = 'loading'
+ that.loadingState = true
+ }
+ that.bottomGoodsList = res
+ })
+ }
+ else
+ {
this.$u.api.getGoodThing({
- deviceType: getApp().globalData.platform == 'android' ? (getApp().globalData.systemLevel <
- 10 ? 'IMEI' : 'OAID') : 'IDFA',
+ deviceType: getApp().globalData.platform == 'android' ? (getApp().globalData.systemLevel < 10 ?
+ 'IMEI' : 'OAID') : 'IDFA',
deviceValue: getApp().globalData.equipmentNumber,
- pageId: this.currentPage,
+ pageId: 1,
pageSize: 10,
- type: this.bottomType
+ type: type
}).then(e => {
if (e.code != 0) return that.$alert(e.msg)
var res = e.data.list;
@@ -733,8 +836,60 @@
that.loadstatus = 'loading'
that.loadingState = true
}
- that.bottomGoodsList = that.bottomGoodsList.concat(res)
+ that.bottomGoodsList = res
}).catch(function(err) {})
+ }
+ },
+
+ getNextPage() {
+ if (this.loadingState) {
+ this.loadingState = false
+ var that = this;
+
+ if(that.bottomType==7&&that.preferData)
+ {//鐚滀綘鍠滄
+ this.$u.api.gussessLikeGoods({
+ platefrom:that.preferData.p_platefrom,
+ cids:that.preferData.p_cids,
+ pageId:this.currentPage,
+ pageSize:10
+ }).then(e=>{
+ console.log(e);
+ if (e.code != 0) return that.$alert(e.msg)
+ var res = e.data.list;
+ if (res.length < 10) {
+ that.loadingState = false
+ that.loadstatus = 'normal'
+ } else {
+ that.currentPage++
+ that.loadstatus = 'loading'
+ that.loadingState = true
+ }
+ that.bottomGoodsList = that.bottomGoodsList.concat(res);
+ })
+ }
+ else{
+ this.$u.api.getGoodThing({
+ deviceType: getApp().globalData.platform == 'android' ? (getApp().globalData.systemLevel <
+ 10 ? 'IMEI' : 'OAID') : 'IDFA',
+ deviceValue: getApp().globalData.equipmentNumber,
+ pageId: this.currentPage,
+ pageSize: 10,
+ type: this.bottomType
+ }).then(e => {
+ if (e.code != 0) return that.$alert(e.msg)
+ var res = e.data.list;
+ if (res.length < 10) {
+ that.loadingState = false
+ that.loadstatus = 'normal'
+ } else {
+ that.currentPage++
+ that.loadstatus = 'loading'
+ that.loadingState = true
+ }
+ that.bottomGoodsList = that.bottomGoodsList.concat(res)
+ }).catch(function(err) {})
+ }
}
},
@@ -742,6 +897,7 @@
if (this.bottomCurrent != idx) {
this.currentPage = 1;
this.bottomType = info.type;
+ this.changeBanner(info.type);
this.getbottomGoodsList(this.bottomType);
this.$nextTick(() => {
this.$emit('scrolltoview')
--
Gitblit v1.9.3