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 0000000..30a8499 Binary files /dev/null and b/src/assets/i-sou-1.gif differ diff --git a/src/assets/i-sou.gif b/src/assets/i-sou.gif new file mode 100755 index 0000000..decd78f Binary files /dev/null and b/src/assets/i-sou.gif differ 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}使用条款》`} 及