From f65992f8134ca462868757e675de6aa06200aacb Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 19:01:20 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0
---
pages/home/components/home-search.vue | 27 +++++++++++++++++++++++----
sub_pages/supplier/flower-manage/flower-manage.vue | 2 +-
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/pages/home/components/home-search.vue b/pages/home/components/home-search.vue
index d8a366c..a60ac4f 100644
--- a/pages/home/components/home-search.vue
+++ b/pages/home/components/home-search.vue
@@ -12,7 +12,7 @@
<um-dropdown width="200rpx" @change="fnChange" :defaultIndex="def" rangeKey="label" :optionList="typeList"></um-dropdown>
</view>
<view class="flex1 input">
- <u-input placeholder="请输入花名" v-model="search_flow" clearable @confirm="buttonSearchFlow" @clear="()=>{
+ <u-input :placeholder="search_home_placeholder" v-model="search_flow" clearable @confirm="buttonSearchFlow" @clear="()=>{
$nextTick(()=>{buttonSearchFlow()})
}">
<!-- <u--text text="http://" slot="prefix" margin="0 3px 0 0" type="tips"></u--text> -->
@@ -66,6 +66,7 @@
value: 'supplier',
},
],
+ search_home_placeholder:"请输入花名",
}
},
onShow() {
@@ -86,9 +87,27 @@
}
},
methods: {
- fnChange(e) {
- this.type = e.value
- },
+ fnChange(e) {
+ this.type = e.value
+ if (this.type == 'flower') {
+ this.search_home_placeholder = '请输入花名'
+ uni.setNavigationBarTitle({
+ title: '搜鲜花',
+ success: function() {
+ // console.log('标题搜鲜花修改成功');
+ }
+ });
+
+ } else {
+ this.search_home_placeholder = '请输入店铺名'
+ uni.setNavigationBarTitle({
+ title: '搜店铺',
+ success: function() {
+ // console.log('标题搜店铺修改成功');
+ }
+ });
+ }
+ },
changeType() {
if (this.type == 'flower') {
this.type = 'supplier'
diff --git a/sub_pages/supplier/flower-manage/flower-manage.vue b/sub_pages/supplier/flower-manage/flower-manage.vue
index 701e9f1..99d96f0 100644
--- a/sub_pages/supplier/flower-manage/flower-manage.vue
+++ b/sub_pages/supplier/flower-manage/flower-manage.vue
@@ -158,7 +158,7 @@
async onLoad(options) {
this.type = options.type || 'all'
var title = ''
- this.page.size = 5
+ this.page.size = 20
//todo 根据type切换查询条件
if (this.type === 'delete') {
this.listApi = '/api/supplier/flower/list/rc'
--
Gitblit v1.9.3