mirror of
https://gitee.com/ShopeX/ECShopX_mobile-frontend
synced 2026-08-14 09:25:55 +08:00
bug(ECX-7320):
This commit is contained in:
@@ -12568,5 +12568,55 @@
|
||||
"zh-cn": "首次加车",
|
||||
"en": "The first additional vehicle",
|
||||
"zh-tw": "首次加車"
|
||||
},
|
||||
"piuijod": {
|
||||
"zh-cn": "用户服务协议和隐私政策提示",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
},
|
||||
"t65t3227": {
|
||||
"zh-cn": "感谢您使用小程序,为更好地保护您的个人信息安全,我们将提供《隐私政策》和《会员服务协议》来帮助您了解:我们如何收集、使用及储存您的个人信息,以及您享有的权利;",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
},
|
||||
"accsd08": {
|
||||
"zh-cn": "若您已阅读并同意",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
},
|
||||
"uwz0okl": {
|
||||
"zh-cn": ",请点击“同意并继续”开始使用我们的服务。",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
},
|
||||
"dw16kn5": {
|
||||
"zh-cn": "同意并继续",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
},
|
||||
"gr2vmpa": {
|
||||
"zh-cn": "登录即可解锁更多权益",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
},
|
||||
"2r66lo8": {
|
||||
"zh-cn": "请先勾选隐私协议",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
},
|
||||
"tst9oy7": {
|
||||
"zh-cn": "手机号快捷登录",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
},
|
||||
"aa2fon4": {
|
||||
"zh-cn": "以下全选",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
},
|
||||
"97t8d6w": {
|
||||
"zh-cn": "同意佛罗伦萨小镇及FV线上商城向我推送会员活动信息及品牌促销信息",
|
||||
"en": "",
|
||||
"zh-tw": ""
|
||||
}
|
||||
}
|
||||
@@ -1,33 +1,20 @@
|
||||
import React, { useRef, useEffect, useState } from 'react'
|
||||
import { View, Text, ScrollView } from '@tarojs/components'
|
||||
import Taro, { getCurrentInstance, useDidShow } from '@tarojs/taro'
|
||||
import { connect } from 'react-redux'
|
||||
import { View } from '@tarojs/components'
|
||||
import Taro, { getCurrentInstance } from '@tarojs/taro'
|
||||
import { useImmer } from 'use-immer'
|
||||
import { withPager, withBackToTop } from '@/hocs'
|
||||
import { AtDrawer, AtTabs } from 'taro-ui'
|
||||
import {
|
||||
BackToTop,
|
||||
Loading,
|
||||
TagsBar,
|
||||
SpFilterBar,
|
||||
GoodsItem,
|
||||
SpTagBar,
|
||||
SpGoodsItem,
|
||||
SpSearchBar,
|
||||
SpNavBar,
|
||||
SpLoadMore,
|
||||
TabBar,
|
||||
SpPage,
|
||||
SpScrollView,
|
||||
SpDrawer,
|
||||
SpSelect,
|
||||
SpSkuSelect
|
||||
} from '@/components'
|
||||
import doc from '@/doc'
|
||||
import api from '@/api'
|
||||
import { pickBy, classNames, isWeixin, getDistributorId, styleNames, showToast } from '@/utils'
|
||||
import { pickBy, classNames, showToast } from '@/utils'
|
||||
import { Tracker } from '@/service'
|
||||
import CompTabbar from './comps/comp-tabbar'
|
||||
|
||||
import './item-list.scss'
|
||||
|
||||
@@ -36,7 +23,6 @@ const MSpSkuSelect = React.memo(SpSkuSelect)
|
||||
const initialState = {
|
||||
leftList: [],
|
||||
rightList: [],
|
||||
brandList: [],
|
||||
brandSelect: [],
|
||||
filterList: [
|
||||
{ title: '综合' },
|
||||
@@ -48,28 +34,23 @@ const initialState = {
|
||||
tagList: [],
|
||||
curTagIdx: 0,
|
||||
keywords: '',
|
||||
show: false,
|
||||
fixTop: 0,
|
||||
info: null,
|
||||
skuPanelOpen: false,
|
||||
selectType: 'picker'
|
||||
}
|
||||
|
||||
function StoreItemList(props) {
|
||||
function StoreItemList() {
|
||||
const $instance = getCurrentInstance()
|
||||
const [state, setState] = useImmer(initialState)
|
||||
const {
|
||||
keywords,
|
||||
leftList,
|
||||
rightList,
|
||||
brandList,
|
||||
brandSelect,
|
||||
curFilterIdx,
|
||||
filterList,
|
||||
tagList,
|
||||
curTagIdx,
|
||||
show,
|
||||
fixTop,
|
||||
info,
|
||||
skuPanelOpen,
|
||||
selectType
|
||||
@@ -81,23 +62,6 @@ function StoreItemList(props) {
|
||||
|
||||
useEffect(() => {}, [])
|
||||
|
||||
// useDidShow(() => {
|
||||
// setTimeout(() => {
|
||||
// Taro.createSelectorQuery()
|
||||
// .select('#item-list-head')
|
||||
// .boundingClientRect((res) => {
|
||||
// console.log('boundingClientRect:', res) //
|
||||
// if (res) {
|
||||
// setState((draft) => {
|
||||
// draft.fixTop = res.bottom
|
||||
// console.log('fixTop:', res.bottom) //
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// .exec()
|
||||
// }, 200)
|
||||
// })
|
||||
|
||||
useEffect(() => {
|
||||
if (skuPanelOpen) {
|
||||
pageRef.current.pageLock()
|
||||
@@ -145,7 +109,6 @@ function StoreItemList(props) {
|
||||
const {
|
||||
list,
|
||||
total_count,
|
||||
item_params_list = [],
|
||||
select_tags_list = [],
|
||||
brand_list
|
||||
} = await api.item.search(params)
|
||||
@@ -174,7 +137,6 @@ function StoreItemList(props) {
|
||||
tag_id: 0
|
||||
}
|
||||
].concat(select_tags_list)
|
||||
v.fixTop = fixTop + 34
|
||||
}
|
||||
})
|
||||
|
||||
@@ -239,30 +201,8 @@ function StoreItemList(props) {
|
||||
goodsRef.current.reset()
|
||||
}
|
||||
|
||||
const onChangeBrand = (val) => {
|
||||
setState((draft) => {
|
||||
draft.brandSelect = val
|
||||
})
|
||||
}
|
||||
|
||||
const onConfirmBrand = async () => {
|
||||
await setState((draft) => {
|
||||
draft.leftList = []
|
||||
draft.rightList = []
|
||||
draft.show = false
|
||||
})
|
||||
goodsRef.current.reset()
|
||||
}
|
||||
|
||||
const onResetBrand = async () => {
|
||||
await setState((draft) => {
|
||||
draft.brandSelect = []
|
||||
draft.leftList = []
|
||||
draft.rightList = []
|
||||
draft.show = false
|
||||
})
|
||||
goodsRef.current.reset()
|
||||
}
|
||||
|
||||
const handleClickStore = (item) => {
|
||||
const url = `/subpages/store/index?id=${item.distributor_info.distributor_id}`
|
||||
@@ -290,7 +230,6 @@ function StoreItemList(props) {
|
||||
}
|
||||
}
|
||||
|
||||
console.log('page-store-item-list', fixTop)
|
||||
return (
|
||||
<SpPage
|
||||
scrollToTopBtn
|
||||
@@ -330,9 +269,6 @@ function StoreItemList(props) {
|
||||
</View>
|
||||
<SpScrollView
|
||||
className='item-list-scroll'
|
||||
style={styleNames({
|
||||
marginTop: `${fixTop}px`
|
||||
})}
|
||||
ref={goodsRef}
|
||||
fetch={fetch}
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user