Merge remote-tracking branch 'remotes/old/zmj' into old

pages.json

@@ -309,6 +309,14 @@
 						"enablePullDownRefresh": true
 					}
 
+				}, {
+					"path": "cloud_entrepot/indexa",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "里海云仓",
+						"enablePullDownRefresh": true
+					}
+
 				}, {
 					"path": "teach_video/teach_video",
 					"style": {

pages/nongKe/cloud_entrepot/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<!-- 	<view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
+		<!-- <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
 			<view class="head-wrapper"></view>
 			<view class="town-title">{{town}}里海云仓</view>
 			<view class="body-wrapper">
@@ -102,9 +102,15 @@
 					<transition name="fade">
 						<view class="content">
 							<view class="content_sift" :style="{position:pocls,top:(headtop)+'px'}" v-if="!showtit">
-								<view :class="{act:item.act}" v-for="item,index in actList" :key="index"
+								<view :class="{act:item.act,price_sift:true}" v-for="item,index in actList" :key="index"
 									@click="screenGoods(item.screen,index)">
 									{{item.tit}}
+									<view class="" v-if="index==2" style="margin-left: 10rpx;">
+										<u-icon name="arrow-up" :color="item.price&&item.act?'#FF6D20':'black'"
+											size="10"></u-icon>
+										<u-icon name="arrow-down" :color="!item.price&&item.act?'#FF6D20':'black'"
+											size="10"></u-icon>
+									</view>
 								</view>
 							</view>
 							<view class="goods_list" v-if="goodsList.length>0">
@@ -160,7 +166,7 @@
 									</view>
 								</view>
 								<view style="height: 100rpx;">
-									<!-- <u-loadmore :status="status" /> -->
+									<u-loadmore :status="status" />
 								</view>
 							</view>
 							<!-- 空 -->
@@ -291,6 +297,7 @@
 				current: 1,
 				goodsNum: 0,
 				goodsList: [],
+				isEmpty: false,
 				winHeight: 0,
 				cloudList: [],
 				street_code: '',
@@ -319,7 +326,8 @@
 				}, {
 					tit: '价格',
 					act: "",
-					screen: "price_asc"
+					screen: "price_asc",
+					price: true,
 				}],
 				status: "loadmore",
 				flag: false,
@@ -339,21 +347,36 @@
 			this.cartFn()
 		},
 		// 分页
-		// onReachBottom() {
+		onReachBottom() {
-		// 	if (this.flag) return
+			if (this.flag || !this.goodsList.length) return
-		// 	this.status = "loading"
+			this.status = "loading"
-		// 	this.page_num += 1
+			this.page_num += 1
-		// 	this.flag = true
+			this.flag = true
-		// 	this.getList().then(res => {
+			cloudWarehouse({
-		// 		return
+				street_code: this.street_code,
-		// 		this.goodsList = this.goodsList.concat(res.data.data)
+				category_id: this.cloudList[this.current].category_id,
-		// 		this.flag = false
+				order: this.type,
-		// 		if (!res.data.data.length) {
+				keyword: this.keyword,
-		// 			this.status = "nomore"
+				page_num: this.page_num
-		// 			this.flag = true
+
-		// 		}
+			}).then(res => {
-		// 	})
+				// console.log(res.data.list[0].product_id, this.goodsList[0].product_id)
-		// },
+				if (res.data.list[0].product_id == this.goodsList[0].product_id) {
+					this.status = "nomore"
+					this.flag = false
+				}
+			})
+			// this.getList().then(res => {
+			// 	// console.log(res)
+			// 	return
+			// 	this.goodsList = this.goodsList.concat(res.data.data)
+			// 	this.flag = false
+			// 	if (!res.data.data.length) {
+			// 		this.status = "nomore"
+			// 		this.flag = true
+			// 	}
+			// })
+		},
 
 
 		onPageScroll(e) {
@@ -461,6 +484,10 @@
 				})
 				this.actList[i].act = true
 				this.type = type
+				if (i == 2) {
+					this.actList[i].price = !this.actList[i].price
+					this.type = this.actList[i].price ? 'price_asc' : ''
+				}
 				this.getList()
 
 				// console.log(this.type)
@@ -473,12 +500,13 @@
 			},
 			getList() {
 				this.showLoading = true
+				this.status = "loading"
 				cloudWarehouse({
 					street_code: this.street_code,
 					category_id: this.cloudList[this.current].category_id,
 					order: this.type,
 					keyword: this.keyword,
-					// page_num: this.page_num
+					page_num: this.page_num
 
 				}).then(res => {
 					this.goodsList = res.data.list
@@ -513,12 +541,15 @@
 					let timer = setTimeout(() => {
 						that.trnList[i].left = 0
 						that.trnList[i].bottom = 0
+						that.act_cart = true
+						setTimeout(() => {
+							that.act_cart = false
+						}, 500)
 					}, 1000)
 				}).exec();
 				let res = postCartAdd({
 					...data
 				}).then((res, err) => {
-					this.act_cart = true
 					this.cartFn()
 					uni.showToast({
 						title: "加入成功",
@@ -1097,4 +1128,9 @@
 		/* 设置为1 */
 		// transition: 1s cubic-bezier(0.5, -0.5, 1, 1);
 	}
+
+	.price_sift {
+		display: flex;
+		align-items: center;
+	}
 </style>