From 891b5db055a1d27c6bda2e9700aa57f8bacd7cd2 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 15 八月 2024 09:58:44 +0800
Subject: [PATCH] add 部分ui

---
 sub_pages/customer/shopping/shopping.vue |  210 ++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 177 insertions(+), 33 deletions(-)

diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index 30d8998..f5a0f50 100644
--- a/sub_pages/customer/shopping/shopping.vue
+++ b/sub_pages/customer/shopping/shopping.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="shopping-container">
-		<view class="top-title"><span class="t-red">*</span> 苏州市一价全含,市区内包邮派送到店
+		<view class="top-title"><span class="t-red">*</span> 花满芫报价已包含打包材料费、交易佣金
 		</view>
 		<view class="top-desc">
 			全程鲜花冷链专线,时效快,损耗小
@@ -17,36 +17,40 @@
 
 
 				<view class="sup-title">
-					<radio :checked="ids.indexOf(item.id)>=0" @click="changeItem(item,'supplier')"></radio>
+					<radio :checked="ids.indexOf('supplier@'+item.supplierId)>=0" @click="changeItem(item,'supplier')">
+					</radio>
 					{{ item.supplierName || '-' }}
 				</view>
 				<u-divider></u-divider>
-				<view v-for="(dto,j) of item.flowerList" :key="j">
+				<view v-for="(dto,j) of item.flowerList" :key="dto.id">
 					<u-divider v-if="j>0"></u-divider>
 					<u-swipe-action>
-						<u-swipe-action-item :options="options1" @click="(e)=>{clickSwipeButton(dto)}">
+						<u-swipe-action-item :options="options1" @click="(e)=>{clickSwipeButton(dto,true)}">
 							<view class="item-each flex">
 								<radio :checked="ids.indexOf(dto.id)>=0" @click="changeItem(dto,'flower')"></radio>
-								<image class="img img100 m-r-6" :src="dto.url||dto.cover"></image>
+								<image class="img img100 m-r-6 br-4" :class="[!dto.stock?'component-stock-zero':'']"
+									:src="dto.url||dto.cover"></image>
 								<view class="flex1">
-									<view class="title"><span class="m-r-5"
-											style="display: inline-block;">{{item.categoryStr||''}}</span><span
-											v-if="item.levelStr" class="m-r-5"
-											style="display: inline-block;">{{ item.levelStr || '' }}</span>{{ dto.name || '-' }}
+									<view class="title" @click.stop="toDetail(dto)"><span class="m-r-5"
+											style="display: inline-block;">{{dto.categoryStr||''}}</span><span
+											v-if="dto.levelStr" class="m-r-5"
+											style="display: inline-block;">{{ dto.levelStr || '' }}</span>{{ dto.name || '-' }}
 									</view>
-									<view class="price">
+									<view class="price" @click.stop="toDetail(dto)">
 										{{ dto.price || '-' }}元/扎
 									</view>
 									<view class="flex">
-										<view class="desc m-t-12 flex">
+										<view class="desc  flex p-t-5" @click.stop="toDetail(dto)">
 											<view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>
 											<view class="m-r-15">颜色:{{ dto.color || '-' }}</view>
 										</view>
 										<view class="button-icons flex m-l-a m-r-0">
 											<uni-icons v-if="dto.num&&dto.num>=1" type="minus" size="32"
-												@click="addnum(dto,-1)"></uni-icons>
-											<view class="curnums" v-if="dto.num&&dto.num>=1">{{ dto.num }}</view>
-											<uni-icons type="plus-filled" size="32" @click="addnum(dto,1)"></uni-icons>
+												@click.stop="addnum(dto,-1)"></uni-icons>
+											<view class="curnums" @click.stop="updateItemNum(dto)"
+												v-if="dto.num&&dto.num>=1">{{ dto.num }}</view>
+											<uni-icons type="plus-filled" size="32"
+												@click.stop="addnum(dto,1)"></uni-icons>
 										</view>
 									</view>
 								</view>
@@ -59,7 +63,7 @@
 			</view>
 
 		</view>
-		<view style="min-height:200rpx">
+		<view style="min-height:140rpx;background-color: #fff;">
 		</view>
 		<view class="bottom-price flex">
 			<view class="m-t-12">
@@ -73,7 +77,7 @@
 				提交订单
 			</view>
 		</view>
-		<view style="min-height:200rpx">
+		<view style="min-height:140rpx">
 		</view>
 		<common-footer flg="2"></common-footer>
 	</view>
@@ -95,12 +99,17 @@
 			}
 		},
 		onShow() {
-			if (this.sign['shopping']) {
-				this.init()
-			}
+			// if (this.sign['shopping']) {
+
+			// }
+			this.init()
 		},
 		mounted() {
-			this.init()
+			// this.init()
+		},
+		async onPullDownRefresh() {
+			await this.init()
+			uni.stopPullDownRefresh()
 		},
 		computed: {
 			totalprice() {
@@ -138,44 +147,59 @@
 				}
 				if (arr.length < 1) {
 					console.log('请选择商品', arr, this.ids)
+					this.$message.showToast('请选择商品')
 					return
 				}
 				this.$message.showLoading()
 				const {
 					code,
 					data
-				} = await http.request('post', '/api/customer/flower/order/confirm/info', {
+				} = await this.$http.request('post', '/api/customer/flower/order/confirm/info', {
 					data: {
 						flowers: arr,
 					}
 				})
-				this.$message.hideLoading()
+				let that = this
 				if (code === 0) {
-					this.$storage.setItem('_cache_shopping_dto', JSON.stringify(data))
+					that.$message.hideLoading()
+					that.$storage.setItem('_cache_shopping_dto', JSON.stringify(data))
 					uni.navigateTo({
 						url: '/sub_pages/customer/shopping/confirm'
 					})
+				} else {
+					//提示消失快
+					setTimeout(() => {
+						that.$message.hideLoading()
+					}, 2000)
 				}
+
 			},
-			async clickSwipeButton(item) {
+			async clickSwipeButton(item, check) {
+				// console.log('clickSwipeButton', e)
 				//删除商品,重新加载数据?
+				if (check) {
+					await this.$message.confirm('是否删除商品')
+
+				}
 
 				this.$message.showLoading()
 				const {
 					code
-				} = await http.request('get', '/api/customer/flower/cart/delete', {
+				} = await this.$http.request('get', '/api/customer/flower/cart/delete', {
 					params: {
 						id: item.id,
 					}
 				})
 				this.$message.hideLoading()
 				if (code === 0) {
+					this.$store.dispatch('sign_add', 'shopnum');
+
 					if (this.ids.indexOf(item.id) >= 0) {
 						this.ids.splice(this.ids.indexOf(item.id), 1)
 					}
 					for (var i = 0; i < this.list.length; i++) {
-						if (this.list[i].id === item.supplierId) {
-							this.list[i].splice(i, 1)
+						if (this.list[i].supplierId === item.supplierId) {
+							// this.list[i].flowerList.splice(i, 1)
 							if (this.list[i].flowerList.length === 1) {
 								if (this.ids.indexOf('supplier@' + this.list[i].supplierId) >= 0) {
 									this.ids.splice(this.ids.indexOf('supplier@' + this.list[i].supplierId), 1)
@@ -186,16 +210,28 @@
 								//只需要清楚这个元素
 								var k = -1
 								for (var j = 0; j < this.list[i].flowerList.length; j++) {
-									if (this.list[i][j].id === item.id) {
+									if (this.list[i].flowerList[j].id === item.id) {
 										k = j;
 										break
 									}
 								}
 								this.list[i].flowerList.splice(k, 1)
 							}
+							this.$forceUpdate()
 							break
 						}
 					}
+					// console.log('this.list', this.list)
+					// 解决滑动的swipe不自动关闭的问题
+					if (check) {
+						let arr = this.list
+						this.list = []
+						this.$nextTick(() => {
+							this.list = arr
+						})
+					}
+
+
 				}
 			},
 
@@ -215,6 +251,9 @@
 								this.ids.push(item.id)
 							}
 						})
+						if (this.ids.indexOf('supplier@' + dto.supplierId) < 0) {
+							this.ids.push('supplier@' + dto.supplierId)
+						}
 					})
 					this.checkall = true
 				}
@@ -230,11 +269,26 @@
 								this.ids.push(item.id)
 							}
 						})
+						//如果所有的话都悬赏了,设置为return true;
+						var tmpSelectAll = true
+						for (var i = 0; i < this.list.length; i++) {
+							for (var j = 0; j < this.list[i].flowerList.length; j++) {
+								if (this.ids.indexOf(this.list[i].flowerList[j].id) < 0) {
+									tmpSelectAll = false
+									break
+								}
+							}
+
+						}
+						this.checkall = tmpSelectAll
+
+
 					} else {
 						this.checkall = false
 						this.ids.splice(this.ids.indexOf('supplier@' + dto.supplierId), 1)
+						console.log('this.ids splice', this.ids)
 						dto.flowerList.forEach(item => {
-							this.ids.splice(this.ids.indexOf('supplier@' + item.supplierId), 1)
+							this.ids.splice(this.ids.indexOf(item.id), 1)
 						})
 					}
 
@@ -242,13 +296,77 @@
 					//更换个人的
 					if (this.ids.indexOf(dto.id) < 0) {
 						this.ids.push(dto.id)
+						var has = true
+
+						//判断如果都有,那么顶部的按钮也勾选上
+						for (var i = 0; i < this.list.length; i++) {
+							if (this.list[i].supplierId === dto.supplierId) {
+								for (var j = 0; j < this.list[i].flowerList.length; j++) {
+									if (this.ids.indexOf(this.list[i].flowerList[j].id) < 0) {
+										has = false
+										break
+									}
+								}
+								break
+							}
+						}
+						if (has) {
+							if (this.ids.indexOf('supplier@' + dto.supplierId) < 0) {
+								this.ids.push('supplier@' + dto.supplierId)
+								this.$forceUpdate()
+							}
+
+						} else {
+							console.log('has', this.ids, dto)
+						}
+						//如果所有的话都悬赏了,设置为return true;
+						var tmpSelectAll = true
+						for (var i = 0; i < this.list.length; i++) {
+							for (var j = 0; j < this.list[i].flowerList.length; j++) {
+								if (this.ids.indexOf(this.list[i].flowerList[j].id) < 0) {
+									tmpSelectAll = false
+									break
+								}
+							}
+						
+						}
+						this.checkall = tmpSelectAll
+
 					} else {
 						this.checkall = false
 
 						if (this.ids.indexOf(dto.id) >= 0) {
 							this.ids.splice(this.ids.indexOf(dto.id), 1)
 						}
+						//还要删除供应商的id
+						if (this.ids.indexOf('supplier@' + dto.supplierId) >= 0) {
+							this.ids.splice(this.ids.indexOf('supplier@' + dto.supplierId), 1)
+						}
+
 					}
+
+				}
+			},
+			async updateItemNum(item) {
+				const res = await this.$message.confirm('', {
+					editable: true,
+					title: '请输入想要购买的数量'
+				})
+				if (res.content && res.confirm) {
+					// 发送请求
+					var t = parseInt(res.content)
+					if (isNaN(t) || t < 0) {
+						this.$message.showToast('数目需要大于等于0')
+
+					} else {
+						if (!item.stock || t > item.stock) {
+							this.$message.showToast('库存不足无法修改')
+							return
+						}
+						this.addnum(item, (t - item.num))
+
+					}
+				} else {
 
 				}
 			},
@@ -256,12 +374,20 @@
 				if (dto.num + addnum >= 0) {
 
 				} else {
+					console.log('addnum', dto, addnum)
+					return
+				}
+				if (!dto.stock) {
+					dto.stock = 0
+				}
+				if (addnum > 0 && dto.num + addnum > dto.stock) {
+					this.$message.showToast('库存不足,无法修改')
 					return
 				}
 				this.$message.showLoading()
 				const {
 					code
-				} = await http.request('post', '/api/customer/flower/cart/change-num', {
+				} = await this.$http.request('post', '/api/customer/flower/cart/change-num', {
 					data: {
 						id: dto.id,
 						num: addnum
@@ -270,9 +396,20 @@
 				this.$message.hideLoading()
 				if (code === 0) {
 					dto.num += addnum
+					if (dto.num < 1) {
+						//id删除清空,并且
+						await this.clickSwipeButton(dto, false)
+						// await this.init()
+					}
+					this.$store.dispatch('sign_add', 'shopnum');
+					this.$forceUpdate()
 				}
 			},
 			async init() {
+
+				this.ids = []
+				this.checkall = false
+
 				if (!this.currentInfo.id) {
 					this.$message.showToast('请先登录')
 					return
@@ -293,6 +430,11 @@
 					this.list = data || []
 
 				}
+			},
+			toDetail(dto) {
+				uni.navigateTo({
+					url: '/sub_pages/customer/trade/detail?id=' + dto.id
+				})
 			}
 		}
 	}
@@ -309,7 +451,9 @@
 			left: 0rpx;
 			padding: 20rpx;
 			right: 0rpx;
-			bottom: 160rpx;
+			// bottom: 160rpx;
+			bottom: 120rpx;
+			z-index: 11;
 		}
 
 		.shopping-item {
@@ -363,8 +507,8 @@
 				line-height: 40rpx;
 
 				.curnums {
-					margin-left: 10rpx;
-					margin-right: 10rpx;
+					padding-left: 20rpx;
+					padding-right: 20rpx;
 				}
 			}
 		}

--
Gitblit v1.9.3