fix bug
parent
067e9892be
commit
6e18cc6b4f
|
|
@ -1,15 +1,15 @@
|
|||
APP_BASE_URL=http://47.103.169.154:8080/api/h5app/wxapp
|
||||
APP_WEBSOCKET=wss://http://47.103.169.154:8080/ws
|
||||
APP_BASE_URL=https://test.birkenstock.net.cn/api/h5app/wxapp
|
||||
APP_WEBSOCKET=wss://test.birkenstock.net.cn/ws
|
||||
APP_COMPANY_ID=1
|
||||
APP_PLATFORM=standard
|
||||
APP_CUSTOM_SERVER=http://47.103.169.154:8081/
|
||||
APP_CUSTOM_SERVER=https://test.birkenstock.net.cn/
|
||||
APP_HOME_PAGE=/pages/index
|
||||
APP_TRACK=youshu
|
||||
APP_YOUSHU_TOKEN=bi281e87ab2424481a
|
||||
# APP_ID=wx3e1c17c88abf3e45
|
||||
APP_ID=wx55ff808ba0e28b1d
|
||||
APP_ID=wx72e9e1a93420862c
|
||||
APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe
|
||||
APP_MAP_NAME=oneX新零售门店定位
|
||||
APP_MAP_NAME=BIRKENSTOCK门店定位
|
||||
APP_IMAGE_CDN=https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop
|
||||
APP_IMAGE_CDN_NEW=https://espier-oss-cdn.oss-cn-shanghai.aliyuncs.com/default_project/wxAssets
|
||||
APP_DIANWU_URL=
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"miniprogramRoot": "dist/",
|
||||
"projectname": "ecshopx-vshop",
|
||||
"description": "weshop for platform",
|
||||
"appid": "wx55ff808ba0e28b1d",
|
||||
"appid": "wx72e9e1a93420862c",
|
||||
"setting": {
|
||||
"urlCheck": false,
|
||||
"es6": false,
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ function SpPage (props, ref) {
|
|||
isTop = false,
|
||||
isBlack = false,
|
||||
title = '', // 页面导航标题
|
||||
showNavLogo = true,
|
||||
showNavLogo = false,
|
||||
showNavkfIcon = false,
|
||||
showNavHomeIcon = false,
|
||||
showNavSearchIcon = false,
|
||||
|
|
@ -133,7 +133,8 @@ function SpPage (props, ref) {
|
|||
draft.pageTitle = pageTitle
|
||||
draft.isTabBarPage = isTabBarPage
|
||||
draft.showLeftContainer = !['/subpages/guide/index', '/pages/index'].includes(`/${page?.route}`)
|
||||
draft.showCustomNavigation = ['/pages/cart/espier-index', '/pages/index', '/subpages/member/index', '/pages/category/index', '/pages/recommend/list', '/pages/recommend/list'].includes(`/${page?.route}`)
|
||||
// '/subpages/member/index',
|
||||
draft.showCustomNavigation = ['/pages/cart/espier-index', '/pages/index', '/pages/category/index', '/pages/recommend/list'].includes(`/${page?.route}`)
|
||||
// draft.showCustomNavigation = true
|
||||
draft.showNavCartIcon = ['/subpages/marketing/coupon-center', '/subpages/marketing/coupon', '/pages/item/list'].includes(`/${page?.route}`)
|
||||
})
|
||||
|
|
@ -257,7 +258,7 @@ function SpPage (props, ref) {
|
|||
}
|
||||
|
||||
}
|
||||
renderTitle = showCustomNavigation && showNavLogo ? <SpImage src={`member/logo-${isBlack ? "black" : "light"}.png`} height={34} mode='heightFix' isNew /> : undefined
|
||||
renderTitle = showCustomNavigation || showNavLogo ? <SpImage src={`member/logo-${isBlack ? "black" : "light"}.png`} height={34} mode='heightFix' isNew /> : undefined
|
||||
const navigationBarTitleText = props.navigationBarTitleText || getCurrentInstance().page?.config?.navigationBarTitleText
|
||||
return (
|
||||
<View
|
||||
|
|
|
|||
|
|
@ -469,7 +469,7 @@ function MemberIndex (props) {
|
|||
// console.log('====config===', config.menu)
|
||||
|
||||
return (
|
||||
<SpPage loading={state.loading} className='pages-member-index has-navbar' renderFooter={<SpTabbar />} isTop>
|
||||
<SpPage loading={state.loading} className='pages-member-index has-navbar' renderFooter={<SpTabbar />} title='' showNavSearchIcon={false} showNavLogo isBlack isTop>
|
||||
<View
|
||||
className='header-block'
|
||||
style={styleNames({
|
||||
|
|
@ -552,11 +552,12 @@ function MemberIndex (props) {
|
|||
|
||||
{isLogin && <View className="header-code">
|
||||
<Text className="" onClick={() => {
|
||||
Taro.navigateTo({ url: '/subpages/member/member-level' })
|
||||
// Taro.navigateTo({ url: '/subpages/member/member-level' })
|
||||
}}>{
|
||||
vipInfo.isVip ? vipInfo.grade_name || '会员' : userInfo?.gradeInfo?.grade_name || ''
|
||||
}</Text>
|
||||
<SpImage onClick={handleClickLink.bind(this, '/marketing/pages/member/member-code')} src='member/qr-code.png' height={30} width={30} isNew />
|
||||
<Text></Text>
|
||||
{/* <SpImage onClick={handleClickLink.bind(this, '/marketing/pages/member/member-code')} src='member/qr-code.png' height={30} width={30} isNew /> */}
|
||||
</View>}
|
||||
</View>
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ const initialState = {
|
|||
showCheckboxPicker: false,
|
||||
checkboxKey: '',
|
||||
checkboxList: [],
|
||||
checked: false,
|
||||
checked: true,
|
||||
info: {},
|
||||
areaList: [],
|
||||
multiIndex: [],
|
||||
|
|
@ -618,9 +618,9 @@ function MemberUserInfo () {
|
|||
<View className='block-container'>
|
||||
<View className='check-box'>
|
||||
{/* <Checkbox value='选中' checked={state.checked} >选中</Checkbox> */}
|
||||
<SpCheckbox checked={checked} colors="#000" onChange={() => setState((draft) => { draft.checked = !checked })} />
|
||||
<SpCheckbox checked={checked} disabled colors="#000" onChange={() => setState((draft) => { draft.checked = !checked })} />
|
||||
<View>
|
||||
<Text onClick={() => setState((draft) => { draft.checked = !draft.checked })} >我已经阅读并同意</Text>
|
||||
<Text onClick={() => false && setState((draft) => { draft.checked = !draft.checked })} >我已经阅读并同意</Text>
|
||||
<Text
|
||||
onClick={() => Taro.navigateTo({ url: '/subpages/auth/reg-rule?type=member_register' })}
|
||||
style={`color: #000000`}
|
||||
|
|
|
|||
Loading…
Reference in New Issue