Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页

src/components/closeBtn/index.tsx

@@ -1,5 +1,6 @@
 import { View, Text } from "@tarojs/components"
 import { memo } from "react"
+import IconFont from "../iconfont/iconfont"
 import style from "./index.module.scss"
 
 type Params = {
@@ -9,12 +10,10 @@ type Params = {
 
 export default memo(({onClose, styleObj = {}}:Params) => {
     return (
-        <View 
-            style={styleObj}
-            className={style.icon_a_cuowuwrong_self}
-            onClick={onClose}
-        >
-            <Text className={`iconfont icon-guanbi ${style.icon_a_btn}`}></Text>
+      <View style={styleObj} className={style.icon_a_cuowuwrong_self} onClick={onClose}>
+        <View className={style.icon_a_btn}>
+          <IconFont name='icon-guanbi' size={30} color='#ccc'></IconFont>
         </View>
+      </View>
     )
 })

src/components/search/index.module.scss

@@ -19,7 +19,6 @@
       height: 60px;
       flex: 1 1 auto;
       padding-left: 60px;
-      padding-right: 30px;
       background: #eee;
       box-sizing: border-box;
       display: flex;