From df04614c50d08b7d249bf1ffd6a3ec79b627b0f9 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 8 May 2024 14:37:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7?=
=?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/users/user_address/index.vue | 136 +++++++++++++++++++++--------
vue.config.js | 1 +
2 files changed, 100 insertions(+), 37 deletions(-)
diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index c9f44f9..5a445d0 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -1,8 +1,44 @@
+
+
+
-
-
+
+
+ .addAddress .wechatAddress {
+ width: 690rpx;
+ height: 86rpx;
+ border-radius: 50rpx;
+ text-align: center;
+ line-height: 86rpx;
+ margin: 0 auto;
+ font-size: 32rpx;
+ color: var(--view-theme);
+ border: 1px solid var(--view-theme);
+ }
+
\ No newline at end of file
From 67345721c19973aef7073c76754967b890d9cfa2 Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Wed, 8 May 2024 16:45:36 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=8A=E6=8B=89=E7=BD=AE=E9=A1=B6=20?=
=?UTF-8?q?=E8=8B=B9=E6=9E=9C=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/recommend/index.vue | 19 +-
pages/cloud_warehouse/home/home.vue | 390 ++++----
pages/cloud_warehouse/market/market.vue | 406 ++++-----
pages/cloud_warehouse/specialty/specialty.vue | 590 ++++++------
pages/user/index.vue | 41 +-
pages/users/order_list/index.vue | 145 ++-
pages/whole_sale/index.vue | 843 +++++++++---------
7 files changed, 1240 insertions(+), 1194 deletions(-)
diff --git a/components/recommend/index.vue b/components/recommend/index.vue
index db01500..55a73a6 100644
--- a/components/recommend/index.vue
+++ b/components/recommend/index.vue
@@ -63,7 +63,7 @@
-
+
@@ -166,6 +166,18 @@
},
mounted() {
this.getArticleList();
+
+
+ this.$nextTick(() => {
+ const query = uni.createSelectorQuery().in(this);
+ query
+ .select(".my-main")
+ .boundingClientRect((data) => {
+ console.log("得到布局位置信息" + JSON.stringify(data));
+ console.log("节点离页面顶部的距离为" + data.top);
+ })
+ .exec();
+ })
},
methods: {
changeTab(e) {
@@ -280,6 +292,11 @@
}
.tabs {
+ position: sticky;
+ top: 0;
+ z-index: 900;
+ background: #fff;
+ padding-bottom: 20rpx;
display: flex;
justify-content: space-between;
align-items: center;
diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
index c17c5be..133ff0a 100644
--- a/pages/cloud_warehouse/home/home.vue
+++ b/pages/cloud_warehouse/home/home.vue
@@ -6,9 +6,20 @@
.wholeSale {
background-color: #f8fafb !important;
+ .wholeSale-header-wrap {
+ background-color: #40AE36;
+ }
+
+ .wholeSale-header-search-wrap {
+ padding: 30rpx 20rpx 0;
+ background-color: #fff;
+ }
+
.wholeSale-header {
+ position: sticky;
+ top: 0;
+ z-index: 100;
margin-bottom: 20rpx;
- // background-color: #40AE36;
.scrollview {
display: flex;
@@ -45,239 +56,224 @@
.wholeSale-con {
margin: 0 20rpx;
+ padding-bottom: 30rpx;
+ }
- .wholeSale-nav {
- display: flex;
- align-items: center;
- margin-bottom: 40rpx;
+ .wholeSale-nav {
+ display: flex;
+ align-items: center;
+ margin-bottom: 40rpx;
- .icon {
- margin-right: 20rpx;
- }
+ .icon {
+ margin-right: 20rpx;
}
+ }
- .search_content {
- // margin-bottom: 40rpx;
- flex: 1;
- height: 70rpx;
- padding: 2px 2px 2px 21.05rpx;
- border-radius: 80rpx;
- background: #EDEFF2;
- position: relative;
- box-sizing: border-box;
+ .search_content {
+ flex: 1;
+ height: 70rpx;
+ padding: 2px 2px 2px 21.05rpx;
+ border-radius: 80rpx;
+ background: #EDEFF2;
+ position: relative;
+ box-sizing: border-box;
- .search_content_wrap {
- width: 100%;
-
- .icon-sousuo {
- font-size: 26.32rpx;
- font-weight: bold;
- color: #c8c7c6;
- margin-right: 17.54rpx;
- }
-
- input {
- width: 80%;
- }
- }
-
- .search_btn {
- width: 106rpx;
- height: 60rpx;
- line-height: 60rpx;
- background: #40AE36;
- border-radius: 100px;
- font-size: 28rpx;
- color: #fff;
- }
- }
-
- .category {
+ .search_content_wrap {
width: 100%;
- overflow: auto;
- margin-bottom: 20rpx;
- .category-wrap {
- display: flex;
- padding-bottom: 20rpx;
+ .icon-sousuo {
+ font-size: 26.32rpx;
+ font-weight: bold;
+ color: #c8c7c6;
+ margin-right: 17.54rpx;
+ }
- .category-item {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- margin-right: 38rpx;
-
- text {
- margin-top: 16rpx;
- font-size: 24rpx;
- color: #666666;
- white-space: nowrap;
- }
-
- .category-item-text {
- width: 120rpx;
- text-align: center;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
- }
-
- .category-item-active {
- position: relative;
-
- .category-item-img {
- border: 2px solid #40AE36;
- border-radius: 50%;
- }
-
- text {
- background-color: #40AE36;
- color: #fff;
- padding: 2rpx 10rpx 6rpx 10rpx;
- border-radius: 50rpx;
- }
- }
+ input {
+ width: 80%;
}
}
- .cate {
- width: 100%;
- overflow: auto;
- margin-bottom: 30rpx;
-
- .cate-wrap {
- display: flex;
- padding-bottom: 8rpx;
-
- .cate-item {
-
- text {
- padding: 4rpx 16rpx;
- white-space: nowrap;
- font-size: 30rpx;
- color: #333;
- }
- }
-
- .cate-item-active {
- text {
- color: #40AE36;
- font-weight: bold;
- }
- }
- }
+ .search_btn {
+ width: 106rpx;
+ height: 60rpx;
+ line-height: 60rpx;
+ background: #40AE36;
+ border-radius: 100px;
+ font-size: 28rpx;
+ color: #fff;
}
+ }
- .comprehensive {
+ .category {
+ width: 100%;
+ overflow: auto;
+ margin-bottom: 20rpx;
+
+ .category-wrap {
display: flex;
- justify-content: space-between;
- align-items: center;
- padding: 0 50rpx;
+ padding-bottom: 20rpx;
- [class^=comprehensive-] {
+ .category-item {
display: flex;
+ flex-direction: column;
+ justify-content: center;
align-items: center;
+ margin-right: 38rpx;
text {
- margin-right: 12rpx;
- font-size: 26rpx;
+ margin-top: 16rpx;
+ font-size: 24rpx;
color: #666666;
+ white-space: nowrap;
}
- image {
- width: 28rpx;
- height: 28rpx;
+ .category-item-text {
+ width: 120rpx;
+ text-align: center;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+
+ .category-item-active {
+ position: relative;
+
+ .category-item-img {
+ border: 2px solid #40AE36;
+ border-radius: 50%;
}
- .loudou {
- width: 24rpx;
- height: 24rpx;
+ text {
+ background-color: #40AE36;
+ color: #fff;
+ padding: 2rpx 10rpx 6rpx 10rpx;
+ border-radius: 50rpx;
}
}
}
}
+
+ .cate {
+ width: 100%;
+ overflow: auto;
+ margin-bottom: 30rpx;
+
+ .cate-wrap {
+ display: flex;
+ padding-bottom: 8rpx;
+
+ .cate-item {
+
+ text {
+ padding: 4rpx 16rpx;
+ white-space: nowrap;
+ font-size: 30rpx;
+ color: #333;
+ }
+ }
+
+ .cate-item-active {
+ text {
+ color: #40AE36;
+ font-weight: bold;
+ }
+ }
+ }
+ }
+
+ .comprehensive {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 50rpx;
+
+ [class^=comprehensive-] {
+ display: flex;
+ align-items: center;
+
+ text {
+ margin-right: 12rpx;
+ font-size: 26rpx;
+ color: #666666;
+ }
+
+ image {
+ width: 28rpx;
+ height: 28rpx;
+ }
+
+ .loudou {
+ width: 24rpx;
+ height: 24rpx;
+ }
+ }
+ }
}
-
-