From badafedccb814258fa54156b558458fa04191f8d Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 30 七月 2024 11:42:48 +0800
Subject: [PATCH] update
---
sub_pages/customer/trade/trade.vue | 117 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 83 insertions(+), 34 deletions(-)
diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index cf1a60b..d32b933 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -1,15 +1,15 @@
<template>
- <view class="container-trade" style="min-height: calc(100vh - 20rpx );">
- <view class="search-container m-t-12 flex" v-if="!(!list||list.length==0)&&true&&!hidefooter">
+ <view class="container-trade" :style="{'min-height':hidefooter?'':'calc(100vh - 20rpx)'}">
+ <view class="search-container m-t-12 flex" v-if="!hidefooter">
<view class="flex1 input">
- <u-input placeholder="请输入分类名称" v-model="query.name">
+ <u-input placeholder="请输入分类名称" v-model="query.name" clearable>
<template slot="suffix">
<uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
</template>
</u-input>
</view>
</view>
- <view class="canteen-items" style="min-height: calc(100vh - 160rpx);">
+ <view class="canteen-items" :style="{'min-height':hidefooter?'':'calc(100vh - 160rpx)'}">
<view v-if="(!list||list.length==0)&&true" style="width: 100%;min-height: 200rpx;">
</view>
@@ -22,18 +22,18 @@
</view>
</view>
<view class="canteen-item-container">
-<!-- <view class="component-filter-container" style="padding-top: 12rpx;">-->
-<!-- <view class="flex1" @click="openParamPop">-->
-<!-- 筛选-->
-<!-- </view>-->
-<!-- <view class="flex1">-->
-<!-- 颜色<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>-->
-<!-- </view>-->
-<!-- <view class="flex1">-->
-<!-- 筛选<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>-->
-<!-- </view>-->
-<!-- </view>-->
-<!-- <u-divider></u-divider>-->
+ <!-- <view class="component-filter-container" style="padding-top: 12rpx;">-->
+ <!-- <view class="flex1" @click="openParamPop">-->
+ <!-- 筛选-->
+ <!-- </view>-->
+ <!-- <view class="flex1">-->
+ <!-- 颜色<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>-->
+ <!-- </view>-->
+ <!-- <view class="flex1">-->
+ <!-- 筛选<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>-->
+ <!-- </view>-->
+ <!-- </view>-->
+ <!-- <u-divider></u-divider>-->
<view class="flex">
<view v-for="(item,index) of listFilter" :key="item.id" class="canteen-item list"
@click.stop="toDetailList(item)">
@@ -44,23 +44,17 @@
</view>
<view class="cateen_infos list">
<view class="title">{{item.name}}</view>
- <view class="price">￥29.01-30.01</view>
+ <view class="price">￥{{minWeightPrice(item)}}-{{maxWeightPrice(item)}}</view>
- <view class="desc">在售14410扎</view>
- <!-- <view class="icons flex">
- <uni-icons v-if="item.shopnum&&item.shopnum>=1" type="minus" size="32"
- @click="mulnum(item)"></uni-icons>
- <view class="curnums" v-if="item.shopnum&&item.shopnum>=1">{{item.shopnum}}</view>
- <uni-icons type="plus-filled" size="32" @click="addnum(item)"></uni-icons>
- </view> -->
+ <view class="desc">在售 {{item.stock||'-'}} 扎</view>
+
</view>
- <view style="padding-bottom:100rpx">
- </view>
+
</view>
-
+ <view style="padding-bottom:100rpx">
+ </view>
</view>
- <footer-msg
- :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
+ <footer-msg v-if="!hidefooter" :more="page.total>0&&page.total>page.current*page.size"></footer-msg>
</view>
</view>
@@ -103,6 +97,7 @@
export default {
props: {
hidefooter: false,
+ catgoryTree: [],
},
data() {
return {
@@ -130,9 +125,9 @@
},
async onLoad() {
- //加载分类
+ //加载分类
this.$message.showLoading()
- this.$http.request('get', '/api/customer/flower/category/tree', {}).then(res => {
+ this.$http.request('get', '/api/customer/flower/category/tree', {}).then(res => {
this.$message.hideLoading()
var data = res.data
this.list = data || []
@@ -143,7 +138,61 @@
})
},
methods: {
- async updateParamsAndSearch(){
+ maxWeightPrice(item) {
+ var p = 0
+ if (item.weightA && item.weightA > p) {
+ p = item.weightA
+ }
+ if (item.weightB && item.weightB > p) {
+ p = item.weightB
+ }
+ if (item.weightC && item.weightC > p) {
+ p = item.weightC
+ }
+ if (item.weightD && item.weightD > p) {
+ p = item.weightD
+ }
+ if (item.weightE && item.weightE > p) {
+ p = item.weightE
+ }
+ if (item.weightO && item.weightO > p) {
+ p = item.weightO
+ }
+ return p
+ },
+ minWeightPrice(item) {
+ var p = -1
+ if (item.weightA && item.weightA < p) {
+ p = item.weightA
+ }
+ if (item.weightB && item.weightB < p) {
+ p = item.weightB
+ }
+ if (item.weightC && item.weightC < p) {
+ p = item.weightC
+ }
+ if (item.weightD && item.weightD < p) {
+ p = item.weightD
+ }
+ if (item.weightE && item.weightE < p) {
+ p = item.weightE
+ }
+ if (item.weightO && item.weightO < p) {
+ p = item.weightO
+ }
+ if (p < 0) {
+ p = 0
+ }
+ return p
+ },
+ refInit(catgoryTree) {
+ this.list = catgoryTree || []
+ if (this.list.length > 0) {
+ this.query.categoryId = this.list[0].id || ''
+ this.currentCategory = this.list[0] || {}
+ }
+ },
+ async updateParamsAndSearch() {
//todo 设置参数并查询
await this.refreshList()
this.$refs.popup_param.close()
@@ -289,7 +338,7 @@
width: 164rpx;
// width: 690rpx;
// max-width: 690rpx;
- height: 266rpx;
+ min-height: 266rpx;
background: #FFFFFF;
margin-bottom: 44rpx;
max-width: 164rpx;
@@ -327,7 +376,7 @@
font-size: 24rpx;
color: #CF0000;
line-height: 34rpx;
- text-align: center;
+ text-align: left;
}
--
Gitblit v1.9.3