From 812f9b0e3d9ed645660ddecd7f3b044d2520b8c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E9=BE=99?= Date: Mon, 11 Mar 2024 13:37:25 +0800 Subject: [PATCH] update 1.3.7 --- .vscode/修改.txt | 4 ++++ package.json | 4 ++-- src/app.config.js | 1 + src/assets/i-sou-1.gif | Bin 0 -> 4170 bytes src/assets/i-sou.gif | Bin 0 -> 2709 bytes src/components/search-bar/index.js | 1 + src/components/sp-page/index.js | 2 +- src/pages/home/story.js | 19 +++++++++++++++++++ src/pages/home/story.scss | 16 ++++++++++++++++ src/pages/index.js | 13 +++++++++++++ src/pages/index/index.config.js | 2 +- src/pages/item/list.js | 9 +++++++-- src/subpages/member/user-info.js | 3 ++- 13 files changed, 67 insertions(+), 7 deletions(-) create mode 100644 .vscode/修改.txt create mode 100755 src/assets/i-sou-1.gif create mode 100755 src/assets/i-sou.gif create mode 100644 src/pages/home/story.js create mode 100644 src/pages/home/story.scss diff --git a/.vscode/修改.txt b/.vscode/修改.txt new file mode 100644 index 0000000..386742a --- /dev/null +++ b/.vscode/修改.txt @@ -0,0 +1,4 @@ +商品评价折叠 +展开显示2条 +尺码默认出现所有尺码，点击宽窄版型后出现对应尺码。 +宽窄版型默认不选中 diff --git a/package.json b/package.json index 3826f79..04de003 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "ecshopx-vshop", - "app_name": "ecshopx", + "name": "BIRKENSTOCK", + "app_name": "BIRKENSTOCK", "version": "3.13.20", "private": true, "description": "taro app for bbc", diff --git a/src/app.config.js b/src/app.config.js index 9a07e40..961a8ce 100755 --- a/src/app.config.js +++ b/src/app.config.js @@ -9,6 +9,7 @@ const config = { // 'pages/cart/cashier-alipay', // 支付宝收银台（adapay） 'pages/cart/cashier-weapp', // 微信收银台（adapay） + 'pages/home/story', // 品牌故事 'pages/home/landing', // 跳转等待页面 'pages/floorguide/index', // 楼层引导页面 diff --git a/src/assets/i-sou-1.gif b/src/assets/i-sou-1.gif new file mode 100755 index 0000000000000000000000000000000000000000..30a84994882b3029b55627c188f20f9f5817ee96 GIT binary patch literal 4170 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 literal 0 HcmV?d00001 diff --git a/src/components/search-bar/index.js b/src/components/search-bar/index.js index a2a00c3..75e9ef6 100755 --- a/src/components/search-bar/index.js +++ b/src/components/search-bar/index.js @@ -115,6 +115,7 @@ export default class SearchBar extends Component { } handleBlurSearch = () => { + return //不需要了 this.props.onBlur?.() this.setState({ showSearchDailog: false, diff --git a/src/components/sp-page/index.js b/src/components/sp-page/index.js index 00ca351..618ca6d 100755 --- a/src/components/sp-page/index.js +++ b/src/components/sp-page/index.js @@ -293,7 +293,7 @@ function SpPage (props, ref) { /> } {/* */} - {showCustomNavigation ? Taro.navigateTo({ url: '/pages/item/list' })} src={`member/chazhao-${isBlack ? "black" : "light"}.png`} height={34} mode='heightFix' isNew /> + {showCustomNavigation ? Taro.navigateTo({ url: '/pages/item/list?showSearch=true' })} src={`member/chazhao-${isBlack ? "black" : "light"}.png`} height={34} mode='heightFix' isNew /> : }> + + + + + Taro.navigateBack({ delta: 1 })}> + + ) +} diff --git a/src/pages/home/story.scss b/src/pages/home/story.scss new file mode 100644 index 0000000..d8200cf --- /dev/null +++ b/src/pages/home/story.scss @@ -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; + } +} diff --git a/src/pages/index.js b/src/pages/index.js index 39988d3..c1f535c 100755 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -555,6 +555,19 @@ function Home () { )} } + {isUpOperation && showRecommend && + Taro.navigateTo({ + url: '/pages/home/story' + })} isShowMenuByLongpress={false} lazyLoad isNew> + {/* */} + {/* + 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> + */} + } + + {false && isUpOperation && showRecommend && 品牌介绍 diff --git a/src/pages/index/index.config.js b/src/pages/index/index.config.js index be3ab00..bce635d 100755 --- a/src/pages/index/index.config.js +++ b/src/pages/index/index.config.js @@ -1,3 +1,3 @@ export default { - navigationBarTitleText: '首页' + navigationBarTitleText: '' } diff --git a/src/pages/item/list.js b/src/pages/item/list.js index df13495..d8e96d1 100755 --- a/src/pages/item/list.js +++ b/src/pages/item/list.js @@ -78,6 +78,7 @@ function ItemList () { const dispatch = useDispatch() const goodsRef = useRef() + const searchRef = useRef() // console.log('$instance.router.params', $instance.router?.params) useEffect(() => { if (S.getAuthToken()) { @@ -88,8 +89,11 @@ function ItemList () { useEffect(() => { // card_id, user_card_id: 兑换券参数 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) => { draft.routerParams = { cat_id, @@ -362,6 +366,7 @@ function ItemList () { )} _state.user) + const { appName } = useSelector((_state) => _state.sys) const pageRef = useRef() const { getUserInfo, logout } = useLogin() @@ -623,7 +624,7 @@ function MemberUserInfo () { onClick={() => Taro.navigateTo({ url: '/subpages/auth/reg-rule?type=member_logout' })} style={`color: #000000`} > - 《Birkenstock使用条款》 + {`《${appName}使用条款》`} 及