Merge branches 'feature/wgts' and 'feature/wgts' of https://git.ishopex.cn/ecshopx/ecshopx-vshop into feature/wgts

src/components/sp-page/header.js

@@ -41,7 +41,7 @@ const CustomNavigationHeader = memo((props) => {
       backgroundPosition: 'center',
       paddingTop: `${gStatusBarHeight}px`
     }
-    if (value?.navigateBackgroundColorr) {
+    if (value?.navigateBackgroundColor) {
       style.backgroundColor = value?.navigateBackgroundColor
     }
     if (value?.navigateBackgroundImage) {
@@ -139,7 +139,7 @@ const CustomNavigationHeader = memo((props) => {
 
   const renderNearby = useCallback(() => {
     return (
-      <View className='title-function nearby-function' onClick={handleNearbyClick}>
+      <View className='title-function nearby-function' onClick={handleNearbyClick} style={{ color: value?.titleColor }}>
         <Text className='nearby-function-text'>
           {VERSION_STANDARD ? shopInfo?.name || '总店' : nearbyText || '选择地区'}
         </Text>
@@ -149,19 +149,15 @@ const CustomNavigationHeader = memo((props) => {
   }, [handleNearbyClick, nearbyText])
 
   const renderSearch = useCallback(() => {
-    if (titleStyle !== '3' || !value?.showSearchButton) return null
     return (
-      <View className='title-search'>
+      <View className='title-search' onClick={() => Taro.navigateTo({ url: '/subpages/item/list' })}>
         <View className='search-container'>
           <Text className='iconfont icon-sousuo-01 search-icon' />
-          <Input
-            className='search-input'
-            placeholder=''
-            onConfirm={(e) => onSearchConfirm && onSearchConfirm(e.detail?.value)}
-          />
-          <View className='search-button' style={styleNames(searchButtonStyle())}>
-            <Text>搜索</Text>
-          </View>
+          {value?.showSearchButton && (
+            <View className='search-button' style={styleNames(searchButtonStyle())}>
+              <Text>搜索</Text>
+            </View>
+          )}
         </View>
       </View>
     )

src/components/sp-page/index.scss

@@ -146,7 +146,6 @@
 
           .nearby-function-text {
             font-size: 28px;
-            color: #333;
             overflow: hidden;
             text-overflow: ellipsis;
             white-space: nowrap;
@@ -155,7 +154,6 @@
 
           .nearby-function-icon {
             font-size: 28px;
-            color: #333;
           }
         }
 
@@ -203,17 +201,9 @@
           border-radius: 8px;
           overflow: hidden;
           position: relative;
-
-          .search-input {
-            flex: 1;
-            height: 64px;
-            padding: 0 24px 0 40px;
-            border: 1px solid #e0e0e0;
-            border-right: none;
-            border-radius: 8px 0 0 8px;
-            background-color: #fff;
-            font-size: 28px;
-          }
+          border: 1PX solid #e0e0e0;
+          background-color: #fff;
+          height: 64px;
 
           .search-icon {
             position: absolute;
@@ -237,6 +227,8 @@
             justify-content: center;
             white-space: nowrap;
             flex-shrink: 0;
+            position: absolute;
+            right: 0;
           }
         }
       }

src/pages/category/index.js

@@ -59,7 +59,10 @@ function StoreItemList(props) {
   return (
     <SpPage
       className='page-category'
-      renderNavigation={<SpSearchOne />}
+      pageConfig={{
+        titleStyle:'3',
+        navigateBackgroundColor:'#fff'
+      }}
       ref={pageRef}
       showLive
       renderFooter={<SpTabbar />}

src/pages/custom/custom-page.js

@@ -36,9 +36,6 @@ const initialState = {
 function CustomPage(props) {
   const $instance = getCurrentInstance()
   const [state, setState] = useImmer(initialState)
-  const { setNavigationBarTitle } = useNavigation()
-  const { address, location } = useSelector((s) => s.user)
-  const nearbyText = address?.city || location?.city || ''
   const { wgts, loading, shareInfo, skuPanelOpen, selectType, info, isShowTabBar } = state
   const MSpSkuSelect = React.memo(SpSkuSelect)
   const pageRef = useRef()
@@ -137,11 +134,8 @@ function CustomPage(props) {
   return (
     <SpPage
       btnHomeEnable={router.params.fromConnect !== 'davild'}
-      immersive={pageData?.base?.isImmersive}
       scrollToTopBtn
       className='page-custom-page'
-      pageConfig={pageData?.base}
-      nearbyText={nearbyText}
       loading={loading}
       title={shareInfo?.page_name}
       ref={pageRef}

src/subpages/member/index.js

@@ -451,8 +451,7 @@ function MemberIndex(props) {
   return (
     <SpPage
       className='pages-member-index'
-      immersive={state.pageData?.base?.isImmersive}
-      pageConfig={state.pageData?.base || {}}
+      immersive
       renderFooter={<SpTabbar />}
       title='会员中心'
     >

src/subpages/store/list.js

@@ -131,12 +131,12 @@ function NearlyShop(props) {
 
     // 构建位置相关参数
     if (filterType == 1) {
-      const [chooseProvince, chooseCity, chooseDistrict] = chooseValue
+      // const [chooseProvince, chooseCity, chooseDistrict] = chooseValue
       params = {
         ...params,
-        province: chooseProvince,
-        city: chooseCity,
-        area: chooseDistrict
+        // province: chooseProvince,
+        // city: chooseCity,
+        // area: chooseDistrict
       }
       if (keyword) {
         params = {
@@ -280,7 +280,7 @@ function NearlyShop(props) {
     <SpPage className='page-store-list' ref={pageRef}>
       <View className='search-block'>
         <View className='search-bar'>
-          <View className='region-picker'>
+          {/* <View className='region-picker'>
             <View
               className='pick-title'
               onClick={() => {
@@ -291,9 +291,8 @@ function NearlyShop(props) {
             >
               <View className='iconfont icon-periscope'></View>
               <Text className='pick-address'>{chooseValue.join('') || '选择地区'}</Text>
-              {/* <Text className='iconfont icon-arrowDown'></Text> */}
             </View>
-          </View>
+          </View> */}
 
           <View className='search-comp-wrap'>
             <Text className='iconfont icon-sousuo-01'></Text>

src/subpages/store/list.scss

@@ -11,7 +11,7 @@
     border-radius: 40px;
     display: flex;
     align-items: center;
-    padding: 6px 6px 6px 20px;
+    padding: 6px 6px 6px 6px;
   }
   .region-picker {
     display: flex;