From dd2922d3facbfba5add501f35de5649b80b6cf05 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 九月 2024 18:22:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/v2' into v2
---
sub_pages/customer/trade/trade.vue | 47 ++++++++++++++---------------------------------
1 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index 48e7afa..e706b98 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -1,17 +1,13 @@
<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="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="flex m-r-20">
- <um-dropdown width="200rpx" style="line-height: 80rpx;" @change="fnChange" :defaultIndex="def" rangeKey="label" :optionList="typeList"></um-dropdown>
</view>
-
<view class="flex1 input">
<u-input :placeholder="type==='category'?'请输入分类名称':'请输入店铺名称'" v-model="query.name" clearable
@confirm="buttonSearchFlow" @clear="()=>{
@@ -58,18 +54,18 @@
</image>
</view>
<view class="cateen_infos list">
- <view class="title">{{item.name}}</view>
- <!-- #ifdef PUB_CUSTOMER_DEV -->
-
- <view class="price">
- <view>会员价</view>
- <view>￥{{item.priceLowMember || 0}}-{{item.priceHighMember||0}}</view>
- </view>
- <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
-
- <!-- #endif -->
- <!-- #ifndef PUB_CUSTOMER_DEV -->
- <view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+ <view class="title">{{item.name}}</view>
+ <!-- #ifdef PUB_CUSTOMER_DEV -->
+
+ <view class="price">
+ <view>会员价</view>
+ <view>￥{{item.priceLowMember || 0}}-{{item.priceHighMember||0}}</view>
+ </view>
+ <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+
+ <!-- #endif -->
+ <!-- #ifndef PUB_CUSTOMER_DEV -->
+ <view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
<!-- #endif -->
<view class="desc">在售 {{item.stock||'0'}} 扎</view>
</view>
@@ -134,22 +130,10 @@
},
currentCategory: {},
type: 'category', //supplier
- def: 0,
- typeList:[
- {
- label: '按分类',
- value: 'category',
- },
- {
- label: '按店铺',
- value: 'supplier',
- },
- ],
}
},
-
// #ifdef PUB_CUSTOMER
onShareAppMessage() {
let that = this;
@@ -212,9 +196,6 @@
})
},
methods: {
- fnChange(e) {
- this.type = e.value
- },
changeSearchType() {
if (this.type == 'category') {
this.type = 'supplier'
@@ -320,7 +301,7 @@
}
},
toDetailList(item) {
- //去商品列表页面
+ //去商品列表页面
console.log('toDetailList',this.supplierId)
uni.navigateTo({
url: `/sub_pages/customer/trade/list?categoryId=${item.id}&supplierId=${this.supplierId||''}`
--
Gitblit v1.9.3