From 7f693ebe71d34fd84b3618ff0d5a66f004e46db5 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 11 八月 2024 22:33:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
sub_pages/customer/self/history.vue | 127 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 110 insertions(+), 17 deletions(-)
diff --git a/sub_pages/customer/self/history.vue b/sub_pages/customer/self/history.vue
index 84d81a4..29bd4b1 100644
--- a/sub_pages/customer/self/history.vue
+++ b/sub_pages/customer/self/history.vue
@@ -59,7 +59,7 @@
if (item.status == 'UP') {
} else {
- this.$message.showToast('已失效,无法查看详情')
+ this.$message.showToast('商品已下架,无法查看详情')
return
}
uni.navigateTo({
@@ -68,9 +68,14 @@
},
async submitShopping(dto) {
//提交到购物车中
- this.$message.showLoading()
- await this.$store.dispatch('submitShopping', dto);
- this.$message.hideLoading()
+ // this.$message.showLoading()
+ const res = await this.$store.dispatch('submitShopping', dto);
+ console.log('res', res)
+ if (res && res.code == 0) {
+ dto.shopnum = res.data || 0
+ this.$forceUpdate()
+ }
+ // this.$message.hideLoading()
},
select_level(e) {
this.level_show = false
@@ -85,6 +90,67 @@
this.query.column = e.value[0].value
this.refreshList()
+ },
+ 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.shopnum))
+
+ }
+ } else {
+
+ }
+ },
+ async addnum(item, addnum) {
+ if (!this.currentInfo.id) {
+ await this.$message.confirm('请前往登录')
+ uni.navigateTo({
+ url: '/pages/user/supplier-user'
+ })
+ return
+ }
+ if (!item.shopnum) {
+ item.shopnum = 0
+ }
+ if (!item.stock) {
+ item.stock = 0
+ }
+ if (addnum > 0 & item.shopnum + addnum > item.stock) {
+ this.$message.showToast('库存不足，无法修改')
+ return
+ }
+ if (item.shopnum + addnum >= 0) {
+
+ } else {
+ return
+ }
+ this.$message.showLoading()
+ const {
+ code
+ } = await this.$http.request('post', '/api/customer/flower/cart/change-num', {
+ data: {
+ id: item.id,
+ num: addnum
+ }
+ })
+ this.$message.hideLoading()
+ if (code === 0) {
+ item.shopnum += addnum
+ this.$forceUpdate()
+ }
},
}
}
@@ -123,11 +189,11 @@
@cancel="order_show=false"></u-picker>
<view class="trade-list-container">
- <view class="trade-info-container flex" v-for="(dto,index) of list" :key="index"
- @click.stop="toDetail(dto)">
- <image class="img img100 br-4 m-r-10" :src="dto.url||dto.cover"></image>
+ <view class="trade-info-container flex" :class="[dto.status!=='UP'?'OFF':'']"
+ v-for="(dto,index) of list" :key="index">
+ <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image>
<view class="flex1">
- <view class="flex">
+ <view class="flex" @click.stop="toDetail(dto)">
<view class="title">
<span class="m-r-5" style="display: inline-block;"
v-if="dto.categoryStr">{{dto.categoryStr||''}}</span>
@@ -140,14 +206,25 @@
</view>
</view>
<view class="flex">
- <view class="desc m-t-12 flex">
+ <view class="desc p-t-12 flex" @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 m-t-20" v-if="dto.status=='UP'">
- <view class="m-r-0 gwc" @click.stop="submitShopping(dto)">
+ <view class="m-r-0 gwc" @click.stop="submitShopping(dto)" v-if="!dto.shopnum">
+ 购物车
</view>
+ <view class="m-r-0 flex" v-if="dto.shopnum">
+ <uni-icons v-if="dto.shopnum&&dto.shopnum>=1" type="minus" size="32"
+ @click.stop="addnum(dto,-1)"></uni-icons>
+ <view class="curnums" @click.stop="updateItemNum(dto)"
+ v-if="dto.shopnum&&dto.shopnum>=1">
+ {{ dto.shopnum }}
+ </view>
+ <uni-icons v-if="!dto.shopnum||dto.shopnum<=999" type="plus-filled" size="32"
+ @click.stop="addnum(dto,1)"></uni-icons>
+ </view>
+
</view>
</view>
</view>
@@ -183,13 +260,29 @@
}
}
- .trade-info-container {
- background-color: #fff;
+ .trade-list-container {
+ min-height: calc(100vh - 300rpx);
+ overflow-y: scroll;
border-top-right-radius: 40rpx;
border-top-left-radius: 40rpx;
- padding: 30rpx;
+ padding: 20rpx;
+
+ }
+
+ .trade-info-container.OFF {
+ .title {
+ color: #666;
+
+ }
+ }
+
+ .trade-info-container {
+ background-color: #fff;
+ border-radius: 20rpx;
+ margin-bottom: 20rpx;
+ padding: 20rpx;
overflow: hidden;
- min-height: calc(100vh - 300rpx);
+
overflow-y: scroll;
.img {
@@ -201,7 +294,7 @@
font-weight: 600;
font-size: 28rpx;
- color: #000000;
+ color: #000;
line-height: 40rpx;
.level {
@@ -230,8 +323,8 @@
line-height: 40rpx;
.curnums {
- margin-left: 10rpx;
- margin-right: 10rpx;
+ padding-left: 20rpx;
+ padding-right: 20rpx;
}
}
--
Gitblit v1.9.3