diff --git a/src/components/search-bar/index.scss b/src/components/search-bar/index.scss
index 85fb20d..293dd8f 100755
--- a/src/components/search-bar/index.scss
+++ b/src/components/search-bar/index.scss
@@ -119,7 +119,8 @@
}
&__input-cnt {
border-radius: 5px !important;
- border: 1px solid #000;
+ /* prettier-ignore */
+ border: 1PX solid #000;
box-sizing: border-box;
}
}
diff --git a/src/components/sp-login/index.scss b/src/components/sp-login/index.scss
index 502b735..ab23496 100755
--- a/src/components/sp-login/index.scss
+++ b/src/components/sp-login/index.scss
@@ -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;
diff --git a/src/components/sp-login/index.weapp.js b/src/components/sp-login/index.weapp.js
index 154f7be..9d07b58 100755
--- a/src/components/sp-login/index.weapp.js
+++ b/src/components/sp-login/index.weapp.js
@@ -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) {
- 亲爱的用户,感谢您使用Birkenstock微信小程序!为了加强对您个人信息的保护,我们根据最新法律的要求制定/更新了
+ 亲爱的用户,感谢您使用{appName}微信小程序!为了加强对您个人信息的保护,我们根据最新法律的要求制定/更新了
《{registerName}》和
《{privacyName}》
@@ -262,10 +264,10 @@ function SpLogin (props, ref) {
通过《隐私政策》,我们向您主要说明:
- 1.您在使用Birkenstock微信小程序时,可以选择浏览模式,也可以选择注册/登录成为Birkenstock微信小程序用户
+ 1.您在使用{appName}微信小程序时,可以选择浏览模式,也可以选择注册/登录成为{appName}微信小程序用户
- 2为了向你提供Birkenstock微信小程序的其本服条,我们将基于合法以及正当必要的原则,按照本政策的规定向您提供各项服务
+ 2为了向你提供{appName}微信小程序的其本服条,我们将基于合法以及正当必要的原则,按照本政策的规定向您提供各项服务
@@ -282,7 +284,7 @@ function SpLogin (props, ref) {
setLoginModal(false)}>不同意
- *如果您不同意Birkenstock隐私政策,您可继续浏览小程序,但您无法使用购物结算功能
+ *如果您不同意{appName}隐私政策,您可继续浏览小程序,但您无法使用购物结算功能
}
diff --git a/src/hooks/usePayment.js b/src/hooks/usePayment.js
index d5418b4..e7cae6e 100755
--- a/src/hooks/usePayment.js
+++ b/src/hooks/usePayment.js
@@ -114,6 +114,7 @@ export default (props = {}) => {
paySuccess(params, orderInfo)
}
} catch (e) {
+ Taro.hideLoading()
console.error(e)
payError(orderInfo)
}
diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss
index cb6561b..61e5dd9 100755
--- a/src/pages/home/index.scss
+++ b/src/pages/home/index.scss
@@ -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%);
diff --git a/src/pages/index.js b/src/pages/index.js
index 1610c28..27eeb24 100755
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -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 && }
-
+
{/*
{activeInfo.activity_name}
- {activeInfo.end_time * 1000 >= Date.now() && isLogin && handleApply()}>
+ {activeInfo.end_time * 1000 >= Date.now() && isLogin && handleApply()}>
{activeInfo.total_count ? '已报名' : '活动申请'}
-
+ {/* */}
}
:
@@ -632,9 +640,9 @@ function Home () {
))}
}
- {/* 推荐图片+商品 */}
+ {/* 推荐图片+商品 isUpOperation && */}
{isUpOperation && <>
- {recommend.length > 0 && recommend.map((_item, id) =>
+ {recommend.length > 0 && recommend.map((_item, id) =>
= 400 ? 920 : 800} mode='scaleToFill' src={_item.img} isShowMenuByLongpress={false} lazyLoad isNew >
{/*
{_item.text}
diff --git a/src/pages/member/item-fav.scss b/src/pages/member/item-fav.scss
index 357f240..6b46745 100755
--- a/src/pages/member/item-fav.scss
+++ b/src/pages/member/item-fav.scss
@@ -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;
diff --git a/src/pages/recommend/detail.js b/src/pages/recommend/detail.js
index ae76cae..fc22a02 100644
--- a/src/pages/recommend/detail.js
+++ b/src/pages/recommend/detail.js
@@ -116,7 +116,7 @@ export default function detail () {
!activeInfo.status && setState((draft) => { draft.checked = !checked })} >我已经阅读并同意
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 = () => {
diff --git a/src/style/taro-ui-mod.scss b/src/style/taro-ui-mod.scss
index 6312c25..37037bd 100755
--- a/src/style/taro-ui-mod.scss
+++ b/src/style/taro-ui-mod.scss
@@ -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 {
diff --git a/src/subpages/auth/reg-rule.js b/src/subpages/auth/reg-rule.js
index e79e941..6bcea23 100755
--- a/src/subpages/auth/reg-rule.js
+++ b/src/subpages/auth/reg-rule.js
@@ -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
diff --git a/src/subpages/member/index.scss b/src/subpages/member/index.scss
index ab621ce..2e16b80 100755
--- a/src/subpages/member/index.scss
+++ b/src/subpages/member/index.scss
@@ -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;
diff --git a/src/subpages/member/user-info.js b/src/subpages/member/user-info.js
index 569c7cd..614c823 100755
--- a/src/subpages/member/user-info.js
+++ b/src/subpages/member/user-info.js
@@ -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退出账号