From 8f7ba8ba4e62f1524cc4deb54f6690c3ac50a687 Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Fri, 10 May 2024 18:06:31 +0800
Subject: [PATCH] continue

---
 pages/cloud_warehouse/home/home.vue | 409 ++++++++++++++--------------
 pages/users/order_list/index.vue    |   2 +-
 utils/mixin.js                      |  20 ++
 3 files changed, 221 insertions(+), 210 deletions(-)
 create mode 100644 utils/mixin.js

diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
index 02c91a7..620f484 100644
--- a/pages/cloud_warehouse/home/home.vue
+++ b/pages/cloud_warehouse/home/home.vue
@@ -6,20 +6,18 @@
 	.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;
+			position: fixed;
+			width: 100%;
 			top: 0;
+			left: 0;
+			background-color: #40AE36;
 			z-index: 100;
-			margin-bottom: 20rpx;
 
 			.scrollview {
 				display: flex;
@@ -54,221 +52,200 @@
 			}
 		}
 
+		.wholeSale-category {
+			margin: 0 20rpx 20rpx;
+			background-color: #fff;
+			border-radius: 10rpx;
+			padding: 20rpx 20rpx 1rpx 20rpx;
+
+			.wholeSale-search {
+				display: flex;
+				align-items: center;
+				margin-bottom: 40rpx;
+
+				.icon {
+					margin-right: 20rpx;
+				}
+			}
+
+			.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 {
+				width: 100%;
+				overflow: hidden;
+				margin-bottom: 20rpx;
+				transition: height .8s;
+
+				.category-wrap {
+					display: flex;
+					padding-bottom: 20rpx;
+
+					.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;
+						}
+					}
+				}
+			}
+
+			.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;
+						}
+					}
+				}
+			}
+		}
+
 		.wholeSale-con {
 			margin: 0 20rpx;
 			padding-bottom: 30rpx;
 		}
-
-		.wholeSale-nav {
-			display: flex;
-			align-items: center;
-			margin-bottom: 40rpx;
-
-			.icon {
-				margin-right: 20rpx;
-			}
-		}
-
-		.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 {
-			width: 100%;
-			overflow: auto;
-			margin-bottom: 20rpx;
-
-			.category-wrap {
-				display: flex;
-				padding-bottom: 20rpx;
-
-				.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;
-					}
-				}
-			}
-		}
-
-		.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;
-				}
-			}
-		}
 	}
 </style>
 <template>
 	<view class="wholeSale">
-		<!-- 顶部 -->
+		<!-- 顶部导航栏适配不同机 -->
 		<view class="wholeSale-header">
-			<view class="wholeSale-header-wrap">
-				<!-- 适配不同机 -->
-				<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
-				<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
-					<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;"
-							name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>里海云仓</view>
+			<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
+			<view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
+				<view style="display: flex;font-weight: bold;font-size: 32rpx;"><u-icon style="margin-right: 20rpx;"
+						name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>里海云仓</view>
+			</view>
+		</view>
+
+		<view class="wholeSale-category-wrap" :style="{height:'65px'}"></view>
+
+		<view class="wholeSale-category">
+			<view class="wholeSale-search">
+				<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
+					hover-class="none" class="search_content flex_a_c_j_sb">
+					<view class="flex_a_c search_content_wrap">
+						<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+						<input type="text" placeholder="搜索商品名称" :value="where.keyword"
+							placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
+					</view>
 				</view>
 			</view>
 
-			<view class="wholeSale-header-search-wrap">
-				<view class="wholeSale-nav">
-					<view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
-						hover-class="none" class="search_content flex_a_c_j_sb">
-						<view class="flex_a_c search_content_wrap">
-							<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-							<input type="text" placeholder="搜索商品名称" :value="where.keyword"
-								placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
-						</view>
+			<!-- 商品大分类 -->
+			<view class="category">
+				<scroll-view scroll-x="true">
+					<view class="category-wrap">
+						<block v-for="(item,index) in store_category" :key="index">
+							<view class="category-item" :class="{'category-item-active': index==cate_change}"
+								@click="changeCate(index)">
+								<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx"
+									shape="circle">
+									<template v-slot:loading>
+										<u-loading-icon color="#999" size="15" />
+									</template>
+								</u--image>
+								<text class="category-item-text">{{item.cate_name}}</text>
+							</view>
+						</block>
 					</view>
-				</view>
+				</scroll-view>
+			</view>
 
-				<!-- 商品大分类 -->
-				<view class="category">
-					<scroll-view scroll-x="true">
-						<view class="category-wrap">
-							<block v-for="(item,index) in store_category" :key="index">
-								<view class="category-item" :class="{'category-item-active': index==cate_change}"
-									@click="changeCate(index)">
-									<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx"
-										shape="circle">
-										<template v-slot:loading>
-											<u-loading-icon color="#999" size="15" />
-										</template>
-									</u--image>
-									<text class="category-item-text">{{item.cate_name}}</text>
-								</view>
-							</block>
-						</view>
-					</scroll-view>
-				</view>
-
-				<!-- 商品小分类 -->
-				<view class="cate" v-if="store_category_children.length>1">
-					<scroll-view scroll-x="true">
-						<view class="cate-wrap">
-							<block v-for="(item,index) in store_category_children" :key="index">
-								<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}"
-									@click="changeChildrenCate(index)">
-									<text>{{item.cate_name}}</text>
-								</view>
-							</block>
-						</view>
-					</scroll-view>
-				</view>
+			<!-- 商品小分类 -->
+			<view class="cate" v-if="store_category_children.length>1">
+				<scroll-view scroll-x="true">
+					<view class="cate-wrap">
+						<block v-for="(item,index) in store_category_children" :key="index">
+							<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}"
+								@click="changeChildrenCate(index)">
+								<text>{{item.cate_name}}</text>
+							</view>
+						</block>
+					</view>
+				</scroll-view>
 			</view>
 		</view>
 
@@ -310,7 +287,9 @@
 					keyword: '',
 					deduction_rate: '', //抵扣比例
 					rand: 1
-				}
+				},
+				distance: 20,
+				scrollTop: 0
 			}
 		},
 		onLoad(option) {
@@ -320,8 +299,13 @@
 		onReachBottom() {
 			this.getProductslist();
 		},
-		onPageScroll() {
+		onPageScroll(e) {
 			uni.$emit('scroll');
+
+			this.scrollTop = e.scrollTop;
+
+
+
 		},
 		onPullDownRefresh() {
 			this.getProductslist(true);
@@ -378,6 +362,13 @@
 						store_category_id: ''
 					})
 				})
+
+				// 分类
+				this.$nextTick(() => {
+					this.$util.getDom(this, '.wholeSale-category', (res) => {
+						this.categoryHeight = res.height;
+					})
+				})
 			},
 			getProductslist(reLoad = false) {
 				if (reLoad) {
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 37e377a..ada6121 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -41,7 +41,7 @@
 					</view>
 					<view class='item' :class='orderStatus==4 ? "on": ""' @click="statusClick(4)">
 						<view>退款/售后</view>
-						<view class='num'>{{(sale_type==1?orderData.refund:orderData.mer_refund) || 0}}</view>
+						<view class='num'>{{(sale_type==1?orderData.elseRefund:orderData.mer_elseRefund) || 0}}</view>
 					</view>
 				</view>
 			</view>
diff --git a/utils/mixin.js b/utils/mixin.js
new file mode 100644
index 0000000..f4015f6
--- /dev/null
+++ b/utils/mixin.js
@@ -0,0 +1,20 @@
+const mixins = {
+	data() {
+		return {
+			totalHeight: 0,
+			scrollInfo: undefined,
+			userMoney: undefined
+		}
+	},
+	// 顶部导航栏透明滚动
+	onPageScroll(e) {
+		this.scrollInfo = e;
+	},
+
+	methods: {
+		getPageScroll() {
+			this.$utils.getDom();
+		}
+	}
+}
+export default mixins;
\ No newline at end of file