From fe97f78b9a343ee9fa45a3531d03d73dcd1df31b Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期三, 06 八月 2025 10:15:12 +0800 Subject: [PATCH] :测试提交“ --- pages/fg/fg.vue | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/pages/fg/fg.vue b/pages/fg/fg.vue index b644ace..79836b0 100644 --- a/pages/fg/fg.vue +++ b/pages/fg/fg.vue @@ -16,8 +16,13 @@ <view class="header"> <view class="search-bar"> <uni-icons class="search-icon" type="search" size="18" color="#999"></uni-icons> +<<<<<<< HEAD <input type="text" placeholder="鎼滅储鍖婚櫌" placeholder-class="placeholder" v-model="name"/> <view class="search-btn" @click="search">鎼滅储</view> +======= + <input type="text" placeholder="鎼滅储鍖婚櫌" placeholder-class="placeholder" /> + <view class="search-btn">鎼滅储</view> +>>>>>>> master </view> <!-- <view class="filter-bar"> <view class="filter-item"> @@ -142,7 +147,10 @@ value: 'other' } ], +<<<<<<< HEAD name: '', +======= +>>>>>>> master timeOptions: [ '褰撴棩鍙害', '娆℃棩鍙害', @@ -166,6 +174,7 @@ this.getList(); }, methods: { +<<<<<<< HEAD search(){ getHospList({ hospName:this.name @@ -174,6 +183,8 @@ }); }, +======= +>>>>>>> master /** 鏌ヨ闄㈠尯淇℃伅鍒楄〃 */ getList() { getHospList(this.queryParams).then((response) => { -- Gitblit v1.8.0