wwl
/
bk-shop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

main
wwl 2024-03-21 17:54:30 +08:00
parent 0206b16e3b
commit 2f7c194a98
12 changed files with 60 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/search-bar/index.scss
View File

@ -119,7 +119,8 @@
}
&__input-cnt {
border-radius: 5px !important;
border: 1px solid #000;
/* prettier-ignore */
border: 1PX solid #000;
box-sizing: border-box;
}
}

3
src/components/sp-login/index.scss
View File

@ -177,7 +177,8 @@
line-height: 78rpx;
text-align: center;
border-radius: 8rpx;
border: 1px solid #000;
/* prettier-ignore */
border: 1PX solid #000;
box-sizing: border-box;
overflow: hidden;
text-overflow: ellipsis;

10
src/components/sp-login/index.weapp.js
View File

@ -3,6 +3,7 @@ import React, { useEffect, useState, useCallback, useRef, useImperativeHandle }
import { View, Text, Button, ScrollView } from '@tarojs/components'
import { AtButton, AtCurtain } from 'taro-ui'
import { useImmer } from 'use-immer'
import { useSelector } from 'react-redux'
import S from '@/spx'
import api from '@/api'
import { isWeixin, isAlipay, classNames, showToast, entryLaunch } from '@/utils'
@ -26,6 +27,7 @@ function SpLogin (props, ref) {
// isUpdate && setPolicyModal(true)
}
})
const { appName } = useSelector((_state) => _state.sys)
const [isNewUser, setIsNewUser] = useState(false)
const [policyModal, setPolicyModal] = useState(false)
const [loginModal, setLoginModal] = useState(false)
@ -252,7 +254,7 @@ function SpLogin (props, ref) {
</View>
<ScrollView scrollY
scrollWithAnimation className="curtain_content_text" showScrollbar={false} enhanced>
亲爱的用户,感谢您使用Birkenstock微信小程序!为了加强对您个人信息的保护,我们根据最新法律的要求制定/更新了
亲爱的用户,感谢您使用{appName}微信小程序!为了加强对您个人信息的保护,我们根据最新法律的要求制定/更新了
<View className="agreement-list">
<Text className='agreement-name' onClick={handleClickPrivacy.bind(this, 'member_register')}>《{registerName}》</Text>和
<Text className='agreement-name' onClick={handleClickPrivacy.bind(this, 'privacy')}>《{privacyName}》</Text>
@ -262,10 +264,10 @@ function SpLogin (props, ref) {
通过《隐私政策》,我们向您主要说明:
</View>
<View className="">
1.您在使用Birkenstock微信小程序时,可以选择浏览模式,也可以选择注册/登录成为Birkenstock微信小程序用户
1.您在使用{appName}微信小程序时,可以选择浏览模式,也可以选择注册/登录成为{appName}微信小程序用户
</View>
<View className="">
2为了向你提供Birkenstock微信小程序的其本服条,我们将基于合法以及正当必要的原则,按照本政策的规定向您提供各项服务
2为了向你提供{appName}微信小程序的其本服条,我们将基于合法以及正当必要的原则,按照本政策的规定向您提供各项服务
</View>
</ScrollView>
<View className='btn-wrap'>
@ -282,7 +284,7 @@ function SpLogin (props, ref) {
</View>
<View className="no-btn" onClick={() => setLoginModal(false)}>不同意</View>
<View className="no-text">
*如果您不同意Birkenstock隐私政策，您可继续浏览小程序，但您无法使用购物结算功能
*如果您不同意{appName}隐私政策，您可继续浏览小程序，但您无法使用购物结算功能
</View>
</View>}
</AtCurtain>

1
src/hooks/usePayment.js
View File

@ -114,6 +114,7 @@ export default (props = {}) => {
paySuccess(params, orderInfo)
}
} catch (e) {
Taro.hideLoading()
console.error(e)
payError(orderInfo)
}

30
src/pages/home/index.scss
View File

@ -60,6 +60,14 @@ page {
/* #endif */
}
.content-box {
--height: calc(var(--status-bar-height) + #{$tabbar-height} + var(--area-bottom-height));
.fadeIn {
animation: fadeInAnimation 0.25s ease-in;
}
&.content-box-ovh {
overflow: hidden;
height: calc(100vh - var(--height));
}
.swiper-wapper {
position: relative;
&::-webkit-scrollbar {
@ -68,12 +76,13 @@ page {
display: none;
}
.swiper {
--height: calc(var(--status-bar-height) + #{$tabbar-height} + var(--area-bottom-height));
width: 100%;
// height: calc(100vh - #{$page-ipx-footer-height} - var(--status-bar-height));
height: calc(100vh - var(--height));
transition: height 0.3s ease-in-out;
animation: fadeInAnimation 0.35s ease-in;
transition: height 0.2s linear;
animation: fadeInAnimation 0.25s ease-in;
transform: translateZ(0);
overflow: hidden;
// &.swiper-narrow {
// height: calc(100vh - 620px - #{$tabbar-height} - var(--status-bar-height));
// }
@ -83,9 +92,10 @@ page {
position: absolute;
left: 50%;
transform: translate(-50%, 0%);
transform: translateZ(-1);
bottom: 0px;
z-index: 99;
animation: fadeInAnimation 0.35s ease-in;
z-index: 999;
animation: fadeInAnimation 0.3s ease-in;
display: flex;
flex-direction: column;
justify-content: center;
@ -104,12 +114,10 @@ page {
margin-bottom: 6px;
}
.swiper-narrow {
// height: calc(100vh - 620px - #{$tabbar-height} - var(--status-bar-height));
height: calc(
100vh - 386px - #{$tabbar-height} - var(--area-bottom-height) - var(--status-bar-height)
);
transition: height 0.35s linear;
margin-top: -200px;
height: calc(100vh - 386px - var(--height));
// transform: translateY(-520px);
// transition: all 0.25s ease-in;
}
.item-btns {
display: flex;
@ -147,7 +155,7 @@ page {
}
}
.spot-pagination {
animation: fadeInAnimation 0.35s ease-in;
animation: fadeInAnimation 0.3s ease-in;
position: absolute;
left: 50%;
transform: translateX(-50%);

20
src/pages/index.js
View File

@ -427,7 +427,7 @@ function Home () {
setState((draft) => {
draft.showRecommend = true
})
}, 500)
}, 400)
if (!state.showBottom) {
}
}
@ -461,6 +461,12 @@ function Home () {
const onSwiperChange = (e) => {
const { current } = e.detail
if (current === 0) {
setState((draft) => {
draft.showBottom = false
draft.isUpOperation = false
})
}
setState((draft) => {
draft.currentIndex = current
draft.goodList = swiperList[current].goods || []
@ -521,7 +527,9 @@ function Home () {
{/* 优惠券包 */}
{VERSION_STANDARD && <SpCouponPackage />}
<View className="content-box">
<View className={classNames('content-box', {
'content-box-ovh': !isUpOperation
})}>
<View className="swiper-wapper" onTouchStart={handleTouchStart} onTouchEnd={handleTouchEnd}>
{/* <ScrollView
className='swiper-wapper'
@ -600,9 +608,9 @@ function Home () {
{currentIndex === 0 ? <View className="item-btns">
<View className="item-tit">{activeInfo.activity_name}</View>
<SpLogin newUser={isNewUser} onChange={handleApply}>
{activeInfo.end_time * 1000 >= Date.now() && <View className="item-btn" style={{ paddingRight: 0 }} onClick={() => isLogin && handleApply()}>
{activeInfo.end_time * 1000 >= Date.now() && <View className="item-btn" style={{ padding: '30rpx 60rpx' }} onClick={() => isLogin && handleApply()}>
<View className="item-btn-txt">{activeInfo.total_count ? '已报名' : '活动申请'}</View>
<Image className="jiantou" mode="aspectFit" src={require('../assets/hengjiantou.gif')}></Image>
{/* <Image className="jiantou" mode="aspectFit" src={require('../assets/hengjiantou.gif')}></Image> */}
</View>}
</SpLogin>
</View> :
@ -632,9 +640,9 @@ function Home () {
</View>
))}
</ScrollView>}
{/* 推荐图片+商品 */}
{/* 推荐图片+商品 isUpOperation && */}
{isUpOperation && <>
{recommend.length > 0 && recommend.map((_item, id) => <View key={id + '__item'} >
{recommend.length > 0 && recommend.map((_item, id) => <View key={id + '__item'} className="fadeIn" >
<SpImage width={windowWidth * 2} height={windowWidth >= 400 ? 920 : 800} mode='scaleToFill' src={_item.img} isShowMenuByLongpress={false} lazyLoad isNew >
{/* <View className="recommend_btn" style={{ [_item.postions]: '70rpx' }}>
<View className="recommend_btn-title">{_item.text}</View>

3
src/pages/member/item-fav.scss
View File

@ -155,7 +155,8 @@
align-items: center;
}
&__btn {
border: 1px solid #000;
/* prettier-ignore */
border: 1PX solid #000;
border-radius: 6px;
padding: 15px 20px;
font-size: 20px;

4
src/pages/recommend/detail.js
View File

@ -116,7 +116,7 @@ export default function detail () {
<View>
<Text onClick={() => !activeInfo.status && setState((draft) => { draft.checked = !checked })} >我已经阅读并同意</Text>
<Text
onClick={() => Taro.navigateTo({ url: '/subpages/auth/reg-rule?type=member_logout' })}
onClick={() => Taro.navigateTo({ url: '/subpages/auth/reg-rule?type=activity_rule' })}
style={`color: #000000;text-decoration: underline;`}
>
{`《${appName}活动细则》`}
@ -203,7 +203,7 @@ export default function detail () {
title: activeInfo.activity_name,
path: `/pages/recommend/detail?id=${activeInfo.activity_id}`,
// imageUrl: activeInfo.pics[0]
imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/index/logo.png`
imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/share-logo.jpg`
}
})
const handleClose = () => {

3
src/style/taro-ui-mod.scss
View File

@ -193,7 +193,8 @@
/* prettier-ignore */
// border: 1PX solid #E5E5E5;
// color: #444;
border: 1px solid #000;
/* prettier-ignore */
border: 1PX solid #000;
color: #000;
}
&--default {

6
src/subpages/auth/reg-rule.js
View File

@ -42,7 +42,11 @@ export default class RegRule extends Component {
})
data = registerContent + privacyContent
navBarTitle = `${registerTitle}和${privactTitle}`
} else if (type) {
} else if (type === 'activity_rule') {
data = 'xxxx'
navBarTitle = 'BIRKENSTOCK活动细则'
}
else if (type) {
// 隐私政策
const { content, title = '充值协议' } = await api.shop.getRuleInfo({
type

3
src/subpages/member/index.scss
View File

@ -406,7 +406,8 @@
line-height: 78rpx;
text-align: center;
border-radius: 8rpx;
border: 1px solid #000;
/* prettier-ignore */
border: 1PX solid #000;
box-sizing: border-box;
overflow: hidden;
text-overflow: ellipsis;

6
src/subpages/member/user-info.js
View File

@ -455,10 +455,10 @@ function MemberUserInfo () {
confirmText: '我知道了'
})
} else {
Taro.navigateTo({
url: `/marketing/pages/member/destroy-member?phone=${formUserInfo.mobile}`
})
}
Taro.navigateTo({
url: `/marketing/pages/member/destroy-member?phone=${formUserInfo.mobile}`
})
}
// H5退出账号