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

fix bug

main
wwl 2024-05-08 15:55:15 +08:00
parent e2fca080a9
commit d148a32332
12 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -11,5 +11,5 @@ APP_ID=wx72e9e1a93420862c
APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe
APP_MAP_NAME=BIRKENSTOCK门店定位 APP_MAP_NAME=BIRKENSTOCK门店定位
APP_IMAGE_CDN=https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop 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_IMAGE_CDN_NEW=https://ecx-brikenstock-image.oss-cn-shanghai.aliyuncs.com/default_project/wxAssets
APP_DIANWU_URL= APP_DIANWU_URL=

2
.env.development.bak
View File

@ -11,5 +11,5 @@ APP_ID=wx55ff808ba0e28b1d
APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe
APP_MAP_NAME=oneX新零售门店定位 APP_MAP_NAME=oneX新零售门店定位
APP_IMAGE_CDN=https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop 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_IMAGE_CDN_NEW=https://ecx-brikenstock-image.oss-cn-shanghai.aliyuncs.com/default_project/wxAssets
APP_DIANWU_URL= APP_DIANWU_URL=

8
.env.production
View File

@ -1,8 +1,8 @@
APP_BASE_URL=https://test.birkenstock.net.cn/api/h5app/wxapp APP_BASE_URL=https://slb.birkenstock.net.cn/api/h5app/wxapp
APP_WEBSOCKET=wss://test.birkenstock.net.cn/ws APP_WEBSOCKET=wss://slb.birkenstock.net.cn/ws
APP_COMPANY_ID=1 APP_COMPANY_ID=1
APP_PLATFORM=standard APP_PLATFORM=standard
APP_CUSTOM_SERVER=https://test.birkenstock.net.cn/ APP_CUSTOM_SERVER=https://slb.birkenstock.net.cn/
APP_HOME_PAGE=/pages/index APP_HOME_PAGE=/pages/index
APP_TRACK=youshu APP_TRACK=youshu
APP_YOUSHU_TOKEN=bi281e87ab2424481a APP_YOUSHU_TOKEN=bi281e87ab2424481a
@ -11,5 +11,5 @@ APP_ID=wx72e9e1a93420862c
APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe
APP_MAP_NAME=BIRKENSTOCK门店定位 APP_MAP_NAME=BIRKENSTOCK门店定位
APP_IMAGE_CDN=https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop 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_IMAGE_CDN_NEW=https://ecx-brikenstock-image.oss-cn-shanghai.aliyuncs.com/default_project/wxAssets
APP_DIANWU_URL= APP_DIANWU_URL=

2
.env.production.bak
View File

@ -11,5 +11,5 @@ APP_ID=wx55ff808ba0e28b1d
APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe
APP_MAP_NAME=oneX新零售门店定位 APP_MAP_NAME=oneX新零售门店定位
APP_IMAGE_CDN=https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop 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_IMAGE_CDN_NEW=https://ecx-brikenstock-image.oss-cn-shanghai.aliyuncs.com/default_project/wxAssets
APP_DIANWU_URL= APP_DIANWU_URL=

2
src/components/search-bar/index.js
View File

@ -24,7 +24,7 @@ export default class SearchBar extends Component {
historyList: [], historyList: [],
isShowAction: false, isShowAction: false,
qaList: [ qaList: [
{ content: '正常版和窄版的区别' }, { content: '常规版和窄版的区别' },
{ content: '如何区分常规软木鞋床和软底软木鞋床' }, { content: '如何区分常规软木鞋床和软底软木鞋床' },
{ content: '人造革和牛皮革的区别' }, { content: '人造革和牛皮革的区别' },
] ]

3
src/components/sp-sku-select-new/index.js
View File

@ -143,7 +143,8 @@ function SpSkuSelect (props, ref) {
const _skuTxtArr = ['', '', ''] const _skuTxtArr = ['', '', '']
if (curItem) { if (curItem) {
const name = curItem.specItem?.[0]?.specName const name = curItem.specItem?.[0]?.specName
_skuTxtArr[0] = name ? name + ':' + curItem.itemBn : '' const reg = /^[0-9]+$/
_skuTxtArr[0] = name ? name + (reg.test(curItem.itemBn) ? ':' + curItem.itemBn : '') : ''
_skuTxtArr[2] = name ? name + ':' + curItem.itemBnDetail : '' _skuTxtArr[2] = name ? name + ':' + curItem.itemBnDetail : ''
} }

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

@ -198,7 +198,7 @@ page {
align-items: flex-start; align-items: flex-start;
position: absolute; position: absolute;
left: 66px; left: 66px;
bottom: 170px; bottom: 120px;
z-index: 10; z-index: 10;
// justify-content: flex-start; // justify-content: flex-start;
.item-tit { .item-tit {
@ -210,7 +210,7 @@ page {
.item-btn { .item-btn {
// width: 180px; // width: 180px;
// height: 56px; // height: 56px;
padding: 20rpx 90rpx 20rpx 50rpx; padding: 20rpx 90rpx 20rpx 90rpx;
color: #fff; color: #fff;
font-size: 28px; font-size: 28px;
border-radius: 10px; border-radius: 10px;

6
src/pages/index.js
View File

@ -371,7 +371,7 @@ function Home () {
src: process.env.APP_IMAGE_CDN_NEW + '/1774/kv.jpg?t' + new Date().getTime(), src: process.env.APP_IMAGE_CDN_NEW + '/1774/kv.jpg?t' + new Date().getTime(),
goods: [], goods: [],
onClick: () => { onClick: () => {
// Taro.navigateTo({ url: '/pages/other/goods' }) Taro.navigateTo({ url: '/pages/other/goods' })
} }
}, ...list] }, ...list]
setState((draft) => { setState((draft) => {
@ -574,7 +574,7 @@ function Home () {
const indexUrl = 'https://mp.weixin.qq.com/s/LBXthKa-P9gNK8FCv3n1pA' const indexUrl = 'https://mp.weixin.qq.com/s/LBXthKa-P9gNK8FCv3n1pA'
const handleGoWx = () => { const handleGoWx = () => {
return handleApply() // handleApply()
Taro.navigateTo({ url: '/pages/webview?url=' + encodeURIComponent(indexUrl) }) Taro.navigateTo({ url: '/pages/webview?url=' + encodeURIComponent(indexUrl) })
} }
return ( return (
@ -695,7 +695,7 @@ function Home () {
</Swiper> </Swiper>
{!isUpOperation && currentIndex === 0 ? <View className="item-btns" style="left: 220rpx; {!isUpOperation && currentIndex === 0 ? <View className="item-btns" style="left: 220rpx;
bottom: 180rpx;" > bottom: 180rpx;" >
{<View onClick={handleGoWx} className="item-btn" style={{ padding: '50rpx 156rpx', opacity: 0, background: 'transparent', border: 'none' }} > {<View onClick={handleGoWx} className="item-btn" style={{ padding: '74rpx 156rpx', opacity: 0, background: 'transparent', border: 'none' }} >
<View className="item-btn-txt"></View> <View className="item-btn-txt"></View>
</View>} </View>}
</View> : null} </View> : null}

2
src/pages/recommend/apply.js
View File

@ -342,7 +342,7 @@ export default function detail () {
title: activeInfo.activity_name, title: activeInfo.activity_name,
path: `/pages/recommend/detail?id=${activeInfo.activity_id}`, path: `/pages/recommend/detail?id=${activeInfo.activity_id}`,
// imageUrl: activeInfo.pics[0] // imageUrl: activeInfo.pics[0]
imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/share-logo.jpg` imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/share.jpg`
} }
}) })
const handleClose = () => { const handleClose = () => {

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

@ -223,7 +223,7 @@ export default function detail () {
title: activeInfo.activity_name, title: activeInfo.activity_name,
path: `/pages/recommend/detail?id=${activeInfo.activity_id}`, path: `/pages/recommend/detail?id=${activeInfo.activity_id}`,
// imageUrl: activeInfo.pics[0] // imageUrl: activeInfo.pics[0]
imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/share-logo.jpg` imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/share.jpg`
} }
}) })
const handleClose = () => { const handleClose = () => {

2
src/pages/recommend/status.js
View File

@ -153,7 +153,7 @@ export default function status () {
title: activeInfo.activity_name, title: activeInfo.activity_name,
path: `/pages/recommend/detail?id=${activeInfo.activity_id}`, path: `/pages/recommend/detail?id=${activeInfo.activity_id}`,
// imageUrl: activeInfo.pics[0] // imageUrl: activeInfo.pics[0]
imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/share-logo.jpg` imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/share.jpg`
} }
}) })
// {activeInfo.status === 'pending' ? '待审核' : '报名成功'} // {activeInfo.status === 'pending' ? '待审核' : '报名成功'}

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

@ -43,7 +43,7 @@ export default class RegRule extends Component {
data = registerContent + privacyContent data = registerContent + privacyContent
navBarTitle = `${registerTitle}和${privactTitle}` navBarTitle = `${registerTitle}和${privactTitle}`
} else if (type === 'activity_rule') { } else if (type === 'activity_rule') {
data = 'xxxx' data = await Taro.request({ url: process.env.APP_IMAGE_CDN_NEW + '/active-rule.txt' }).then(res => res.data)
navBarTitle = 'BIRKENSTOCK活动细则' navBarTitle = 'BIRKENSTOCK活动细则'
} }
else if (type) { else if (type) {