From cfce9a063e5ca4363573c4b30172f687cede3573 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 12 Sep 2023 18:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=95=86?=
=?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=20=E9=A6=96?=
=?UTF-8?q?=E9=A1=B5=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/WaterfallsFlow/WaterfallsFlows.vue | 4 +-
.../WaterfallsFlowItems.vue | 2 +-
pages/goods_details/index.vue | 5 +
pages/index/index.vue | 186 +++++++++++++++--
pages/plantGrass/plant_detail/index.vue | 33 ++-
pages/product/list/index.vue | 4 +-
pages/short_video/appSwiper/index.nvue | 44 ++--
pages/store/merchantDetails/index.vue | 197 +++++-------------
pages/supply_chains/supply_chains.vue | 128 +++++-------
static/images/bg2.png | Bin 24237 -> 44417 bytes
10 files changed, 335 insertions(+), 268 deletions(-)
diff --git a/components/WaterfallsFlow/WaterfallsFlows.vue b/components/WaterfallsFlow/WaterfallsFlows.vue
index a5312c8..faf88dc 100644
--- a/components/WaterfallsFlow/WaterfallsFlows.vue
+++ b/components/WaterfallsFlow/WaterfallsFlows.vue
@@ -7,7 +7,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
index c6ceca1..f6d8ee6 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
@@ -27,7 +27,7 @@
type: Object,
require: true
},
- index: {
+ heightx: {
type: string,
require: true
}
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index cb89aa5..b194bc8 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -658,6 +658,11 @@
that.getConfig();
uni.hideLoading();
},
+
+ onHide(){
+
+ this.CartCount=0
+ },
/**
* 用户点击右上角分享
*/
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3fbc553..841f400 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,15 +2,15 @@
-
+
+ style=" margin-left: 20rpx">
- {{ street }}
+ {{ street }}
-
+
+
+
+
-
+
+
+ -->
+
+
+
+
+
+
+
@@ -55,6 +69,24 @@
-->
+
+
+
+
+
+ 全部分类
+
+
+
+ 点击进入分类
+
+
+
+ {{item.cate_name}}
+
+
+
+
@@ -108,7 +140,7 @@
},
data() {
return {
- isNewRenderDone: false, //锁的作用
+
isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权
activeStyle: {
@@ -149,11 +181,12 @@
streeta_id: '',
street: '',
bgColor: '',
- backColor: 'rgba(252, 252, 252, 0)',
+ backColor: 0,
isFshow: false,
scrollTop: 0,
show: true,
- userid: ''
+ userid: '',
+ current:0
}
},
onShow() {
@@ -211,6 +244,22 @@
})
+ },
+ onHide() {
+ this.getGoods(true)
+
+ uni.pageScrollTo({
+ selector: ".Circle_friends",
+ scrollTop: 0
+ })
+ uni.setTabBarItem({
+ index: 0,
+ text: "泸州",
+ iconPath: '/static/tabbar_icon/a.png',
+ selectedIconPath: '/static/tabbar_icon/a-a.png'
+ });
+ this.isFshow = false
+
},
onReachBottom() {
@@ -218,8 +267,7 @@
if (this.productList.length > 0) {
setTimeout(() => {
this.getGoods(false);
- }, 500)
-
+ }, 1000)
} else {
this.get_host_product();
}
@@ -240,6 +288,7 @@
});
},
+
// #ifdef APP-PLUS
onPageScroll(e) {
@@ -248,7 +297,7 @@
// 导航条颜色透明渐变
if (scrollTop <= 20) {
- this.backColor = 'rgba(252, 252, 252, 0.0)'
+ this.backColor = 0
this.isFshow = false
this.show = true
uni.setTabBarItem({
@@ -258,11 +307,11 @@
selectedIconPath: '/static/tabbar_icon/a-a.png'
});
} else if (20 < scrollTop && scrollTop <= 100) {
- this.backColor = 'rgba(255, 255, 255, 0.5)'
+ this.backColor = 0.5
this.isFshow = true
this.show = false
} else if (scrollTop > 100) {
- this.backColor = 'rgba(252, 252, 252, 1.0)'
+ this.backColor = 1
this.isFshow = true
this.show = false
this.$nextTick(() => {
@@ -283,12 +332,18 @@
this.$bus.$off('value-updated')
},
methods: {
+ //弹出
+ open() {
+ this.$refs.popup.open()
+ },
+ //隐藏
+ cuo() {
+ this.$refs.popup.close()
+ },
// 授权回调
onLoadFun(data) {
this.getUserInfo();
-
this.isShowAuth = false;
-
},
/**
* 获取个人用户信息
@@ -350,7 +405,7 @@
// console.log("header 你已经到底部了");
}
if (scrollTop <= 20) {
- this.backColor = 'rgba(252, 252, 252, 0.0)'
+ this.backColor = 0
this.isFshow = false
uni.setTabBarItem({
index: 0,
@@ -359,10 +414,10 @@
selectedIconPath: '/static/tabbar_icon/a-a.png'
});
} else if (20 < scrollTop && scrollTop <= 100) {
- this.backColor = 'rgba(255, 255, 255, 0.5)'
+ this.backColor = 0.5
this.isFshow = true
} else if (scrollTop > 100) {
- this.backColor = 'rgba(252, 252, 252, 1.0)'
+ this.backColor = 1
this.isFshow = true
uni.setTabBarItem({
@@ -379,6 +434,7 @@
tabsChange1(item) {
+
this.getArticleList(item.article_category_id)
this.streeta_id = item.id
this.tabsData1.tabsActive = item.index
@@ -542,11 +598,12 @@
data
} = await getTopicList()
this.tabsData.list = [{
- cate_name: "推荐",
+ cate_name: "热门推荐",
category_id: 0
}, ...data]
},
tabsChange(item) {
+ console.log(item)
this.productList = []
this.where.category_id = item.category_id
this.emptyShow = false
@@ -555,7 +612,22 @@
this.getGoods(true)
this.street_id = item.id
this.tabsData.tabsActive = item.index
+ this.current = item.index
+ },
+ tabsChange2(item,index) {
+ // console.log(item,index)
+
+ this.productList = []
+ this.where.category_id = item.category_id
+ this.$refs.popup.close()
+ this.emptyShow = false
+ this.loadend = false;
+ this.$set(this.where, 'page', 1)
+ this.getGoods(true)
+ this.tabsData.tabsActive = index
+ this.current = index
+
},
selfLocation() {
@@ -732,6 +804,57 @@
background: linear-gradient(180deg, #ffffff 0%, #f6f6f6 100%);
}
+ .classpage {
+ width: 100%;
+ height: calc(100vh - 50px);
+ background-color: #fff;
+ position: relative;
+ padding-top: 40rpx;
+ padding-left: 40rpx;
+ padding-right: 10rpx;
+
+ .classpage-one {
+
+ text-align: center;
+
+ image {
+ position: absolute;
+ right: 25rpx;
+ width: 42rpx;
+ height: 42rpx;
+ }
+ }
+
+ .classpage-two {
+ font-size: 26rpx;
+ font-family: PingFang SC-Regular, PingFang SC;
+ font-weight: 400;
+ color: #333333;
+ margin-top: 77rpx;
+ }
+
+ .classpage-three {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ margin-top: 35rpx;
+
+ view {
+ margin-right: 20rpx;
+ margin-bottom: 14rpx;
+ width: 210rpx;
+ height: 81rpx;
+ line-height: 81rpx;
+ text-align: center;
+ background: #FFFFFF;
+ border-radius: 11rpx 11rpx 11rpx 11rpx;
+ opacity: 1;
+ border: 2rpx solid #707070;
+ }
+
+ }
+ }
+
// .bg-img {
// position: absolute;
// width: 100%;
@@ -792,6 +915,8 @@
padding-top: 25rpx;
/* #endif */
// background-color: #e5e5e5;
+ background: url('@/static/images/bg2.png') no-repeat;
+ background-size: 100% 100%;
padding-right: 20rpx;
@@ -810,6 +935,7 @@
.iconfont {
opacity: 0;
+ color: #fff;
font-size: 30rpx;
font-size: 35.09rpx;
}
@@ -827,8 +953,9 @@
}
/deep/.u-tabs__wrapper__nav__item {
- padding: 0 0px;
- padding-right: 10rpx;
+ // padding: 0 0px;
+ padding-left: 0rpx;
+ padding-right: 20rpx;
}
.search_wrapper {
@@ -841,6 +968,23 @@
margin: 0 auto;
margin-bottom: 21.05rpx;
// margin-left: -20rpx;
+ position: relative;
+ }
+
+ .tabs_wrapper-img {
+ width: 70rpx;
+ height: 70rpx;
+ position: absolute;
+ z-index: 888;
+ background-color: #fff;
+ right: 0;
+ top: 0;
+
+ image {
+ width: 40rpx;
+ height: 40rpx;
+ margin-top: 10rpx;
+ }
}
.empty_wrapper {
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index d7a6d6f..8059095 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/pages/plantGrass/plant_detail/index.vue
@@ -75,7 +75,7 @@
-
查看TA提到的宝贝({{followDetail.relevance.length}})
@@ -86,7 +86,36 @@
-
+
+
+
+
+
{{followDetail.content}}
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 6dbbe7f..765c3cb 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -103,12 +103,12 @@
@change="menuAction($event, item.attrValue,item)">
. . .
-->
-
...
-