Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/SearchBar/index.jsx

@@ -0,0 +1,21 @@
+import Taro, { View } from "@tarojs/components"
+
+import './style.less'
+
+export default (props) => {
+
+  const { placeholder, onBlur } = props
+
+
+
+
+  return (
+    <View className='search'>
+      <mp-searchbar
+        placeholder={placeholder}
+        onBlur={onBlur}
+      >
+      </mp-searchbar>
+    </View>
+  )
+}

src/components/SearchBar/style.less

@@ -0,0 +1,41 @@
+
+.search{
+  margin: 35px 0;
+  .weui-search-bar{
+    padding: 0px;
+    border-radius: 45px;
+    background: #F8F8F8;
+
+    .weui-search-bar__label{
+      background: #F8F8F8;
+    }
+    .weui-search-bar__form{
+      border-radius: 45px;
+      background: #F8F8F8;
+      
+
+    }
+
+    .weui-search-bar__label{
+      border-radius: 45px;
+      background: #F8F8F8;
+
+
+    }
+    .weui-search-bar__input{
+      text-align: center;
+      background: #F8F8F8;
+
+    }
+  
+    .weui-search-bar__cancel-btn{
+      position: relative;
+      left: -10px;
+      font-size: 31px;
+      padding-left: 5px;
+      background: #F8F8F8;
+
+
+    }
+  }
+}

src/pages/RoomOrder/index.jsx

@@ -9,7 +9,6 @@ import './style.less'
 
 
 
-
 export default withLayout((props) => {
   const { router, person } = props
   const { roomId, roomOrderId, status } = router.params

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -5,6 +5,7 @@ import Picker from '@/components/Picker'
 import Popup from '@/components/Popup'
 import ShopUsed from '@/components/ShopUsed' //已核销
 import ShopUnused from '@/components/ShopUnused' //未核销
+import SearchBar from '@/components/SearchBar'
 import eyes from '@/assets/icons/shopKeeper/小眼睛.png'
 import ceyes from '@/assets/icons/shopKeeper/小眼睛-闭上.png'
 import iconsearch from '@/assets/icons/housemantj/search.png'
@@ -42,24 +43,16 @@ export default (props) => {
   }
 
 
-  //搜索
-  const search = (value) => {
-    console.log(value);
 
-    return new Promise((resolve, reject) => {
-      console.log(resolve, reject);
-      resolve([{ text: '搜索结果', value: 1 }, { text: '搜索结果2', value: 2 }])
 
-    })
-  }
-  const handeInput = (e) => {
-    const value = e.detail.value
-    console.log("🚀 ~ file: shopKeeper.jsx ~ line 57 ~ handeInput ~ value", value)
 
 
-  }
+  const handleChange = (e) => {
+    console.log("🚀 ~ file: shopKeeper.jsx ~ line 67 ~ handleChange ~ e", e)
 
 
+  }
+
 
   useEffect(() => {
     if (tabJump) {
@@ -80,6 +73,9 @@ export default (props) => {
     },
   ]
 
+  const onSeacrh = (e) => {
+    console.log('eeeeeeeeeeeeeeeeee', e.detail.value);
+  }
 
   const [showCutover, setShowCutover] = useState(false)
   const ShowMoldeOn = () => {
@@ -120,12 +116,8 @@ export default (props) => {
             </view>
           </view>
           <view className='search'>
-            <mp-searchbar
-              placeholder='搜索订单(输入客户手机号码)'
-              search={search}
-              onInput={(e) => handeInput(e)}
-            >
-            </mp-searchbar>
+
+            <SearchBar placeholder='搜索订单(输入客户手机号码)' onBlur={onSeacrh} />
           </view>
           <view className='index-tabs'>
             <mp-tabs

src/shop/components/ShopKeeper/shopKeeper.less

@@ -145,46 +145,6 @@
   }
 }
 
-.search{
-  margin: 35px 0;
-  .weui-search-bar{
-    padding: 0px;
-    border-radius: 45px;
-    background: #F8F8F8;
-
-    .weui-search-bar__label{
-      background: #F8F8F8;
-    }
-    .weui-search-bar__form{
-      border-radius: 45px;
-      background: #F8F8F8;
-      
-
-    }
-
-    .weui-search-bar__label{
-      border-radius: 45px;
-      background: #F8F8F8;
-
-
-    }
-    .weui-search-bar__input{
-      text-align: center;
-      background: #F8F8F8;
-
-    }
-  
-    .weui-search-bar__cancel-btn{
-      position: relative;
-      left: -10px;
-      font-size: 31px;
-      padding-left: 5px;
-      background: #F8F8F8;
-
-
-    }
-  }
-}
 
 
 .index-tabs {