update 1.3.7

main
王文龙 2024-03-11 13:37:25 +08:00
parent 2404adc363
commit 812f9b0e3d
13 changed files with 67 additions and 7 deletions

4
.vscode/修改.txt vendored Normal file
View File

@ -0,0 +1,4 @@
商品评价折叠
展开显示2条
尺码默认出现所有尺码,点击宽窄版型后出现对应尺码。
宽窄版型默认不选中

View File

@ -1,6 +1,6 @@
{ {
"name": "ecshopx-vshop", "name": "BIRKENSTOCK",
"app_name": "ecshopx", "app_name": "BIRKENSTOCK",
"version": "3.13.20", "version": "3.13.20",
"private": true, "private": true,
"description": "taro app for bbc", "description": "taro app for bbc",

View File

@ -9,6 +9,7 @@ const config = {
// 'pages/cart/cashier-alipay', // 支付宝收银台adapay // 'pages/cart/cashier-alipay', // 支付宝收银台adapay
'pages/cart/cashier-weapp', // 微信收银台adapay 'pages/cart/cashier-weapp', // 微信收银台adapay
'pages/home/story', // 品牌故事
'pages/home/landing', // 跳转等待页面 'pages/home/landing', // 跳转等待页面
'pages/floorguide/index', // 楼层引导页面 'pages/floorguide/index', // 楼层引导页面

BIN
src/assets/i-sou-1.gif Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
src/assets/i-sou.gif Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -115,6 +115,7 @@ export default class SearchBar extends Component {
} }
handleBlurSearch = () => { handleBlurSearch = () => {
return //不需要了
this.props.onBlur?.() this.props.onBlur?.()
this.setState({ this.setState({
showSearchDailog: false, showSearchDailog: false,

View File

@ -293,7 +293,7 @@ function SpPage (props, ref) {
/> />
</View>} </View>}
{/* <Image className="chazhao" src={require("@/assets/chazhao-light.png")}></Image> */} {/* <Image className="chazhao" src={require("@/assets/chazhao-light.png")}></Image> */}
{showCustomNavigation ? <SpImage onClick={() => Taro.navigateTo({ url: '/pages/item/list' })} src={`member/chazhao-${isBlack ? "black" : "light"}.png`} height={34} mode='heightFix' isNew /> {showCustomNavigation ? <SpImage onClick={() => Taro.navigateTo({ url: '/pages/item/list?showSearch=true' })} src={`member/chazhao-${isBlack ? "black" : "light"}.png`} height={34} mode='heightFix' isNew />
: <View className='icon-wrap'> : <View className='icon-wrap'>
<Text <Text
className={classNames('iconfont', { className={classNames('iconfont', {

19
src/pages/home/story.js Normal file
View File

@ -0,0 +1,19 @@
import React from 'react'
import { View } from '@tarojs/components'
import { SpImage, SpPage } from '@/components'
import Taro from '@tarojs/taro'
import './story.scss'
export default function story () {
const windowWidth = Taro.getSystemInfoSync().windowWidth
return (
<SpPage className='page-home-story has-navbar' isBlack showNavSearchIcon title={<SpImage src={`member/logo-black.png`} height={34} mode='heightFix' isNew />}>
<SpImage width={windowWidth * 2} mode='widthFix' src="index/story/story-1.jpg" isShowMenuByLongpress={false} lazyLoad isNew></SpImage>
<SpImage width={windowWidth * 2} mode='widthFix' src="index/story/story-2.jpg" isShowMenuByLongpress={false} lazyLoad isNew></SpImage>
<SpImage width={windowWidth * 2} mode='widthFix' src="index/story/story-3.jpg" isShowMenuByLongpress={false} lazyLoad isNew></SpImage>
<SpImage width={windowWidth * 2} mode='widthFix' src="index/story/story-4.jpg" isShowMenuByLongpress={false} lazyLoad isNew></SpImage>
<View className="boback-btn" onClick={() => Taro.navigateBack({ delta: 1 })}></View>
</SpPage>
)
}

16
src/pages/home/story.scss Normal file
View File

@ -0,0 +1,16 @@
.page-home-story {
position: relative;
.boback-btn {
position: absolute;
left: 0;
right: 0;
/* prettier-ignore */
bottom: 40PX;
z-index: 1;
height: 80px;
width: 80%;
margin: 0 auto;
// margin: 20px auto;
}
}

View File

@ -555,6 +555,19 @@ function Home () {
</ScrollView> </ScrollView>
</View>)} </View>)}
</>} </>}
{isUpOperation && showRecommend && <View className="brand" style={{ padding: '0 15px 15px', height: '250px' }}>
<SpImage width={windowWidth * 2 - 60} mode='widthFix' src="index/story/story.png" onClick={() => Taro.navigateTo({
url: '/pages/home/story'
})} isShowMenuByLongpress={false} lazyLoad isNew></SpImage>
{/* <SpImage width={windowWidth * 2 - 60} mode='widthFix' src="index/story/more.png" isShowMenuByLongpress={false} lazyLoad isNew></SpImage> */}
{/* <View style={{ marginTop: '30px' }}>
<SpImage onClick={() => Taro.navigateTo({
url: '/pages/webview?url=' + encodeURIComponent('https://www.baidu.com')
})} width={windowWidth * 2 - 60} mode='widthFix' src="index/story/more.png" isShowMenuByLongpress={false} lazyLoad isNew></SpImage>
</View> */}
</View>}
{false && isUpOperation && showRecommend && <View className="brand" style={{ padding: '15px', height: '550px' }}> {false && isUpOperation && showRecommend && <View className="brand" style={{ padding: '15px', height: '550px' }}>
<View className="brand-title">品牌介绍</View> <View className="brand-title">品牌介绍</View>
<ScrollView scrollX scrollWithAnimation showScrollbar={false} scrollLeft={0} className="brand-img" style={{ height: '220px' }}> <ScrollView scrollX scrollWithAnimation showScrollbar={false} scrollLeft={0} className="brand-img" style={{ height: '220px' }}>

View File

@ -1,3 +1,3 @@
export default { export default {
navigationBarTitleText: '首页' navigationBarTitleText: ''
} }

View File

@ -78,6 +78,7 @@ function ItemList () {
const dispatch = useDispatch() const dispatch = useDispatch()
const goodsRef = useRef() const goodsRef = useRef()
const searchRef = useRef()
// console.log('$instance.router.params', $instance.router?.params) // console.log('$instance.router.params', $instance.router?.params)
useEffect(() => { useEffect(() => {
if (S.getAuthToken()) { if (S.getAuthToken()) {
@ -88,8 +89,11 @@ function ItemList () {
useEffect(() => { useEffect(() => {
// card_id, user_card_id: 兑换券参数 // card_id, user_card_id: 兑换券参数
entryLaunch.getRouteParams($instance.router.params).then((params) => { entryLaunch.getRouteParams($instance.router.params).then((params) => {
const { cat_id, main_cat_id, tag_id, card_id, user_card_id } = params const { cat_id, main_cat_id, tag_id, card_id, user_card_id, showSearch } = params
if (showSearch === 'true') {
setIsShowSearch(true)
searchRef.current.handleFocusSearchHistory(true)
}
setState((draft) => { setState((draft) => {
draft.routerParams = { draft.routerParams = {
cat_id, cat_id,
@ -362,6 +366,7 @@ function ItemList () {
</View> </View>
)} )}
<SpSearchBar <SpSearchBar
ref={searchRef}
className='search-wrap' className='search-wrap'
keyword={keywords} keyword={keywords}
hotSearch={historyList} hotSearch={historyList}

View File

@ -48,6 +48,7 @@ function MemberUserInfo () {
loading loading
} = state } = state
const { userInfo = {} } = useSelector((_state) => _state.user) const { userInfo = {} } = useSelector((_state) => _state.user)
const { appName } = useSelector((_state) => _state.sys)
const pageRef = useRef() const pageRef = useRef()
const { getUserInfo, logout } = useLogin() const { getUserInfo, logout } = useLogin()
@ -623,7 +624,7 @@ function MemberUserInfo () {
onClick={() => Taro.navigateTo({ url: '/subpages/auth/reg-rule?type=member_logout' })} onClick={() => Taro.navigateTo({ url: '/subpages/auth/reg-rule?type=member_logout' })}
style={`color: #000000`} style={`color: #000000`}
> >
Birkenstock使用条款 {`${appName}使用条款》`}
</Text> </Text>
<Text <Text