From 6e12337e17704d873d8954d80e4567a94e23d92d Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 09 八月 2024 19:02:14 +0800
Subject: [PATCH] 1
---
sub_pages/customer/shopping/shopping.vue | 159 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 127 insertions(+), 32 deletions(-)
diff --git a/sub_pages/customer/shopping/shopping.vue b/sub_pages/customer/shopping/shopping.vue
index 3ff5488..2723829 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 br-4" :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"
+ <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>
@@ -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() {
@@ -144,32 +153,41 @@
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()
- if (code === 0) {
- this.$storage.setItem('_cache_shopping_dto', JSON.stringify(data))
- uni.navigateTo({
- url: '/sub_pages/customer/shopping/confirm'
- })
- }
+ let that = this
+ setTimeout(() => {
+ that.$message.hideLoading()
+ if (code === 0) {
+ that.$storage.setItem('_cache_shopping_dto', JSON.stringify(data))
+ uni.navigateTo({
+ url: '/sub_pages/customer/shopping/confirm'
+ })
+ }
+ }, 300)
},
- async clickSwipeButton(item) {
+ async clickSwipeButton(item, check) {
//删除商品，重新加载数据？
+ 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)
}
@@ -197,7 +215,7 @@
break
}
}
- console.log('this.list',this.list)
+ console.log('this.list', this.list)
}
},
@@ -217,6 +235,9 @@
this.ids.push(item.id)
}
})
+ if (this.ids.indexOf('supplier@' + dto.supplierId) < 0) {
+ this.ids.push('supplier@' + dto.supplierId)
+ }
})
this.checkall = true
}
@@ -235,8 +256,9 @@
} 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)
})
}
@@ -244,13 +266,65 @@
//更换个人的
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)
+ }
+
} 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 {
}
},
@@ -258,12 +332,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
@@ -274,12 +356,18 @@
dto.num += addnum
if (dto.num < 1) {
//id删除清空，并且
- await this.clickSwipeButton(dto)
+ 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
@@ -300,6 +388,11 @@
this.list = data || []
}
+ },
+ toDetail(dto) {
+ uni.navigateTo({
+ url: '/sub_pages/customer/trade/detail?id=' + dto.id
+ })
}
}
}
@@ -316,7 +409,9 @@
left: 0rpx;
padding: 20rpx;
right: 0rpx;
- bottom: 160rpx;
+ // bottom: 160rpx;
+ bottom: 140rpx;
+ z-index: 11;
}
.shopping-item {
@@ -370,8 +465,8 @@
line-height: 40rpx;
.curnums {
- margin-left: 10rpx;
- margin-right: 10rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
}
}
}
--
Gitblit v1.9.3