From 1e97cc472f8b156c464ecfd1c91c1e62f53151f0 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期日, 11 八月 2024 18:18:30 +0800
Subject: [PATCH] Merge branch 'main' of https://gitee.com/people_3/hmy_farmer
---
sub_pages/customer/trade/trade.vue | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 79 insertions(+), 26 deletions(-)
diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index 1bfcc37..9419328 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -1,10 +1,20 @@
<template>
<view class="container-trade" :style="{'min-height':hidefooter?'':'calc(100vh - 20rpx)'}">
<view class="search-container m-t-12 flex" v-if="!hidefooter">
+ <view class="flex m-r-20">
+ <view class="m-r-10" style="line-height: 80rpx;" @click="changeSearchType">
+ {{type=='category'?'按分类':'按店铺'}}
+ </view>
+ <u-icon name="arrow-down"></u-icon>
+
+ </view>
<view class="flex1 input">
- <u-input placeholder="请输入分类名称" v-model="query.name" clearable>
+ <u-input :placeholder="type==='category'?'请输入分类名称':'请输入店铺名称'" v-model="query.name" clearable
+ @confirm="buttonSearchFlow" @clear="()=>{
+ $nextTick(()=>{buttonSearchFlow()})
+ }">
<template slot="suffix">
- <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
+ <uni-icons color="#20613D" type="search" size="24" @click="buttonSearchFlow"></uni-icons>
</template>
</u-input>
</view>
@@ -39,14 +49,14 @@
@click.stop="toDetailList(item)">
<view class="m-r-10">
<!-- @click.stop="previewImg(item.imageUrl)" -->
- <image :src="item.imageUrl" mode="scaleToFill" class="cover" :lazy-load="true">
+ <image :src="item.imageUrl" :class="[!item.stock?'':'']" mode="scaleToFill"
+ class="cover" :lazy-load="true">
</image>
</view>
<view class="cateen_infos list">
<view class="title">{{item.name}}</view>
- <view class="price">￥{{minWeightPrice(item)}}-{{maxWeightPrice(item)}}</view>
- <view class="desc">在售 {{item.stock||'-'}} 扎</view>
-
+ <view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+ <view class="desc">在售 {{item.stock||'0'}} 扎</view>
</view>
</view>
@@ -106,10 +116,36 @@
name: '',
categoryId: '',
},
- currentCategory: {}
+ currentCategory: {},
+ type: 'category', //supplier
+
}
},
+ // #ifdef PUB_CUSTOMER
+ onShareAppMessage() {
+ let that = this;
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+ var url =
+ `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ return {
+ title: "花满芫",
+ path: url,
+ }
+ },
+ onShareTimeline() {
+ let that = this;
+ var name = that.currentInfo.customerDTO && that.currentInfo.customerDTO.name || that.currentInfo.supplierDTO &&
+ that.currentInfo.supplierDTO.name || that.currentInfo.partnerDTO && that.currentInfo.partnerDTO.name || ''
+ var url =
+ `/pages/home/home?shareId=${this.currentInfo&&this.currentInfo.id||''}&shareName=${name||''}`; //你的转发页面路径拼接参数
+ return {
+ title: "花满芫",
+ path: url,
+ }
+ },
+ // #endif
onPullDownRefresh() {
this.$http.request('get', '/api/customer/flower/category/tree', {}).then(res => {
var data = res.data
@@ -148,6 +184,15 @@
})
},
methods: {
+ changeSearchType() {
+ if (this.type == 'category') {
+ this.type = 'supplier'
+ this.query.name = ''
+ } else {
+ this.type = 'category'
+ this.query.name = ''
+ }
+ },
maxWeightPrice(item) {
var p = 0
if (item.weightA && item.weightA > p) {
@@ -215,25 +260,33 @@
this.$refs.popup_param.close()
},
buttonSearchFlow() {
- //根据名称查询
- this.$message.showLoading()
- this.$http.request('get', '/api/customer/flower/category/tree', {
- params: {
- name: this.query.name || ''
- }
- }).then(res => {
- var data = res.data
- this.list = data || []
- if (this.list.length > 0) {
- this.query.categoryId = this.list[0].id || ''
- this.currentCategory = this.list[0] || {}
- } else {
- this.query.categoryId = ''
- this.currentCategory = {}
- }
- }).finally(() => {
- this.$message.hideLoading()
- })
+
+ if (this.type == 'category') {
+ //根据分类名称查询
+ this.$message.showLoading()
+ this.$http.request('get', '/api/customer/flower/category/tree', {
+ params: {
+ name: this.query.name || ''
+ }
+ }).then(res => {
+ var data = res.data
+ this.list = data || []
+ if (this.list.length > 0) {
+ this.query.categoryId = this.list[0].id || ''
+ this.currentCategory = this.list[0] || {}
+ } else {
+ this.query.categoryId = ''
+ this.currentCategory = {}
+ }
+ }).finally(() => {
+ this.$message.hideLoading()
+ })
+ } else {
+ uni.navigateTo({
+ url: '/sub_pages/customer/trade/list?' + 'supplierName=' + this.query.name
+ })
+
+ }
},
toDetailList(item) {
//去商品列表页面
--
Gitblit v1.9.3