From 6b408c41d3a656c79f72538fc54763853b6bada0 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 18 Sep 2024 18:11:39 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E5=AF=BB=E8=B6=A3=E5=91=B3?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cloud/haveFun.vue | 58 +++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index be16fe0..ea55bb0 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -1,20 +1,30 @@
 <template>
   <view class="have-fun tabbar-page">
     <view class="top-box">
-      <view class="search-box flex jc-between ai-center">
-        <input
-          v-model="name"
-          type="text"
-          placeholder="搜索店铺"
-          placeholder-style="color:#949494"
-          @confirm="search"
-        >
-        <image
-          class="icon"
-          :src="webUrl+'/20220903142935869059.png'"
-          mode="scaleToFill"
-          @click="search"
-        />
+      <view class="v12-justify-start v12-align-center">
+        <view class="flex jc-end">
+          <view class="city-box" @click="goCity('cloud')">
+            <text style="white-space:nowrap; width: 100rpx" class="v12-primary-text one-t">{{ cityName }}</text>
+            <image :src="webUrl+'/orderIcon/map.png'" mode="scaleToFill"></image>
+          </view>
+        </view>
+        <view class="search-box v12-primary-border flex jc-between ai-center">
+          <input
+            v-model="name"
+            type="text"
+            placeholder="搜索店铺"
+            placeholder-style="color:#949494"
+            @confirm="search"
+          >
+          <view class="search-btn v12-primary v12-white-text v12-radius-60" @click="search">
+            <text class="v12-font-bold">搜索</text>
+            <image
+              class="icon v12-ml-1"
+              :src="webUrl+'/orderIcon/搜索 (1).png'"
+              mode="scaleToFill"
+            />
+          </view>
+        </view>
       </view>
       <scroll-view class="type-box flex" scroll-x enable-flex>
         <view
@@ -62,11 +72,8 @@
       </view>
     </view>
     <view class="body">
-      <view class="flex jc-end">
-        <view class="city-box" @click="goCity('cloud')">
-          <image :src="webUrl+'/20220903142929759087.png'" mode="scaleToFill"></image>
-          <text>{{ cityName }}</text>
-        </view>
+      <view>
+        <text class="v12-font-bold" v-if="currType.carousel">推荐</text>
       </view>
       <view v-if="isLoad">
         <view v-if="hotelList.length > 0">
@@ -235,6 +242,16 @@ export default {
 }
 </script>
 <style scoped lang="less">
+.search-btn{
+  position: absolute;
+    top: 2rpx;
+    bottom: 2rpx;
+    right: 2rpx;
+    padding: 0rpx 20rpx;
+    display: flex;
+    align-items: center;
+    font-size: 28rpx;
+}
 .have-fun {
   //padding-top: 120rpx;
 
@@ -243,7 +260,8 @@ export default {
     background: #fff;
 
     .search-box {
-      width: 686rpx;
+      position: relative;
+      width: 575rpx;
       height: 60rpx;
       box-sizing: border-box;
       margin: 0 auto;