From dc6cdf2414ee7c453e1bca47898177f7af079945 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期一, 29 七月 2024 00:03:59 +0800
Subject: [PATCH] 1
---
sub_pages/customer/trade/list.vue | 5 +++++
pages/home/home.vue | 2 +-
sub_pages/customer/shopping/confirm.vue | 19 +++++++++++++------
sub_pages/customer/trade/trade.vue | 4 ++--
4 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 25f867a..af3d8c6 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -281,7 +281,7 @@
buttonSearchFlow() {
console.log('buttonSearchFlow')
uni.navigateTo({
- url: '/sub_pages/trade/list?name=' + this.search_flow
+ url: '/sub_pages/customer/trade/list?name=' + this.search_flow
})
},
pop(status) {
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 18ecf6c..e4483f2 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -228,14 +228,15 @@
</view>
</view>
</view>
- <view class="m-t-20" v-if="false">
+ <view class="m-t-20" v-if="true">
<view class="desc-red">
10kg以下的零买订单将收取打包费，花店建议购满20kg， 可选冷链物流
</view>
<view class="desc">
- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)，第一汤下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时，顺丰送货到店。
- 优势:价格便宜，顺丰配送
- 弊端:订单必须是5kg以内
+ <!-- 预计装1Mini件，运费约18.00元(5公斤内18元，不满5公斤按5公斤计费，每件货不能超过5公斤)， -->
+ 第一次下单预计次日凌晨发货，备货高峰期除外，冷链汽车运输，发货后72小时左右到货，三线城市会推迟6-12小时送货到店。
+ <!-- 优势:价格便宜，顺丰配送 -->
+ <!-- 弊端:订单必须是5kg以内 -->
</view>
</view>
</view>
@@ -261,7 +262,7 @@
<view class="label">留言</view>
<view class="m-l-a m-r-0 flex1">
<view class="m-t-12 m-b-12">
- <u-textarea v-model="dto.remarks" placeholder="填写内容需与卖家协商并确认">
+ <u-textarea v-model="dto.remarks" clearable placeholder="填写内容需与卖家协商并确认">
</u-textarea>
</view>
@@ -446,7 +447,13 @@
.transform-list:nth-child(3n+2) {
margin-right: 0;
}
-
+
+ .desc-red{
+
+ }
+ .desc{
+
+ }
}
}
diff --git a/sub_pages/customer/trade/list.vue b/sub_pages/customer/trade/list.vue
index 1806bca..56aa5f0 100644
--- a/sub_pages/customer/trade/list.vue
+++ b/sub_pages/customer/trade/list.vue
@@ -185,6 +185,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', {
diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index 82d0f9a..275455e 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -1,8 +1,8 @@
<template>
<view class="container-trade" :style="{'min-height':hidefooter?'':'calc(100vh - 20rpx)'}">
- <view class="search-container m-t-12 flex" v-if="!(!list||list.length==0)&&true&&!hidefooter">
+ <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>
--
Gitblit v1.9.3