From e4233b5c4e123c4b79a38d0a9b0c8b60631e1683 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 30 七月 2024 10:40:24 +0800
Subject: [PATCH] update
---
sub_pages/customer/trade/list.vue | 91 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index fe3f11d..74f6d23 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -4,42 +4,42 @@
<view class="category-detail flex" v-if="query.category">
<view class="flex1 info">
<view class="title flex">
- <view>{{categoryInfo.name||'-'}}</view>
- <view>
- <image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
-
- </view>
+ {{categoryInfo.name||'-'}}
+ <image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>
</view>
<view class="desc">
- 规格：{{categoryInfo.unit}}
+ 规格：{{categoryInfo.unit || '暂无'}}
</view>
<view class="desc">
- 颜色：{{categoryInfo.color}}
+ 颜色：{{categoryInfo.color || '暂无'}}
</view>
- <!-- <view class="desc">
+ <!-- <view class="desc">
包袋：棉袋
</view> -->
</view>
<view class="info-price">
<view class="title">当日均价</view>
- <view class="price">19.66</view>
+ <view class="price">{{categoryInfo.avePrice||'暂无'}}</view>
<view class="flex desc">
- <view class="m-l-a m-r-5">+0.76</view>
- <view class="m-r-a m-l-5">+4.02%</view>
+ <view class="m-l-a m-r-5">
+ {{categoryInfo.avePriceDifference&&categoryInfo.avePriceDifference>=0?'+':''}}{{categoryInfo.avePriceDifference||0}}
+ </view>
+ <view class="m-r-a m-l-5">
+ {{categoryInfo.avePriceDifferenceRate&&categoryInfo.avePriceDifferenceRate>=0?'+':''}}{{categoryInfo.avePriceDifferenceRate||0}}%
+ </view>
</view>
</view>
</view>
<view class="" style="min-height: calc(100vh - 260rpx);">
- <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>
- <view v-else>
+ <view>
<!-- 查询条件 -->
<view class="component-filter-container">
<view class="flex1" @click.stop="order_show=true">
- {{ this.query.columnStr || '排序' }}
+ {{ query.columnStr || '排序' }}
<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
</view>
<view class="flex1" @click.stop="level_show=true">
- {{ this.query.levelStr || '级别' }}
+ {{ query.levelStr || '级别' }}
<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
</view>
@@ -55,14 +55,14 @@
</view>
</view>
</view>
+ <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>
<view class="component-shop-item flex" v-for="(item,index) of list" :key="index">
<view class="img" @click.stop="toDetail(item)">
- <image class="img img100"
- src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ff/fff3027bd0a146478fd1f0aae816a028%E5%BE%AE%E4%BF%A1%E6%88%AA%E5%9B%BE_20240710224139.png">
+ <image class="img img100" :src="item.cover">
</image>
<view class="level">
- {{levelStr||''}}
+ {{item.levelStr||''}}
</view>
</view>
@@ -79,10 +79,10 @@
</view>
<view class="other-info flex">
<view class="m-r-15">
- 已售:{{item.sales}}
+ 已售:{{item.sales||0}}
</view>
<view class="m-r-15">
- 剩余:{{item.stock}}
+ 剩余:{{item.stock||0}}
</view>
<view class="m-r-15">
{{item.unit}}
@@ -136,13 +136,16 @@
</view>
</view>
<view class="button-space"></view>
- <view class="button-space"></view>
- <view class="button-green" style="background-color: #fff;bottom: 160rpx;color: #000"
- @click="closeParamPopAndQuery">
- 查询
- </view>
+ <view>
+ <view class="button-green"
+ style="background-color: #fff;border: 2rpx solid #666; color: #666;width: 200rpx;left: 40rpx;right: unset;"
+ @click="closeParamPopAndQuery">
+ 查询
+ </view>
- <view class="button-green" @click="closeParamPop">关闭</view>
+ <view class="button-green" style="width: 200rpx;right: 40rpx;left: unset;" @click="closeParamPop">关闭
+ </view>
+ </view>
</view>
</uni-popup>
@@ -187,6 +190,11 @@
this.query.category = options.categoryId || ''
this.query.zoneId = options.zoneId || ''
this.query.name = options.name || ''
+ if (this.query.name) {
+ uni.setNavigationBarTitle({
+ title: '商品列表-' + this.query.name
+ })
+ }
this.listApi = '/api/customer/flower/list'
this.getList('post')
this.$http.request('get', '/api/code/value', {
@@ -196,7 +204,7 @@
}).then(res => {
var data = res.data
this.level_columns = [data || []]
- this.columns_levels[0].unshift({
+ this.level_columns[0].unshift({
label: '全部',
value: ''
})
@@ -256,13 +264,13 @@
},
closeParamPopAndQuery() {
this.$refs.popup_param.close()
- //设置参数
- this.dto.params = []
- for (var params of this.params) {
- if (params.value) {
- this.dto.params.push({
- id: params.id,
- value: params.value
+ //设置参数
+ this.query.params = []
+ for (var param of this.params) {
+ if (param.value) {
+ this.query.params.push({
+ id: param.id,
+ value: param.value
})
}
}
@@ -286,6 +294,7 @@
},
select_level(e) {
this.level_show = false
+ console.log('select_level', e)
this.query.levelStr = e.value[0].label
this.query.level = e.value[0].value
this.refreshList('post')
@@ -319,9 +328,17 @@
})
return
}
- if (!item.shopnum) {
- item.shopnum = 0
+ if (!item.stock) {
+ item.stock = 0
+ }
+ if (!item.shopnum) {
+ item.shopnum = 0
}
+ if (item.shopnum + addnum > item.stock) {
+ this.$message.showToast('库存不足，无法添加')
+ return
+ }
+
if (item.shopnum + addnum >= 0) {
} else {
@@ -361,7 +378,7 @@
font-weight: 600;
font-size: 36rpx;
color: #000000;
- line-height: 50rpx;
+ line-height: 44rpx;
}
.icon-kf {
--
Gitblit v1.9.3