diff --git a/.env.development b/.env.development index 008f505..9c69600 100755 --- a/.env.development +++ b/.env.development @@ -11,5 +11,5 @@ APP_ID=wx72e9e1a93420862c APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe 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_IMAGE_CDN_NEW=https://ecx-brikenstock-image.oss-cn-shanghai.aliyuncs.com/default_project/wxAssets APP_DIANWU_URL= diff --git a/.env.development.bak b/.env.development.bak index 19ff852..4ce8ca0 100755 --- a/.env.development.bak +++ b/.env.development.bak @@ -11,5 +11,5 @@ APP_ID=wx55ff808ba0e28b1d APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe APP_MAP_NAME=oneX新零售门店定位 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= diff --git a/.env.production b/.env.production index 008f505..9879ff2 100755 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ -APP_BASE_URL=https://test.birkenstock.net.cn/api/h5app/wxapp -APP_WEBSOCKET=wss://test.birkenstock.net.cn/ws +APP_BASE_URL=https://slb.birkenstock.net.cn/api/h5app/wxapp +APP_WEBSOCKET=wss://slb.birkenstock.net.cn/ws APP_COMPANY_ID=1 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_TRACK=youshu APP_YOUSHU_TOKEN=bi281e87ab2424481a @@ -11,5 +11,5 @@ APP_ID=wx72e9e1a93420862c APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe 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_IMAGE_CDN_NEW=https://ecx-brikenstock-image.oss-cn-shanghai.aliyuncs.com/default_project/wxAssets APP_DIANWU_URL= diff --git a/.env.production.bak b/.env.production.bak index 19ff852..4ce8ca0 100755 --- a/.env.production.bak +++ b/.env.production.bak @@ -11,5 +11,5 @@ APP_ID=wx55ff808ba0e28b1d APP_MAP_KEY=1ccc1ebc947719886f0cd766d70241fe APP_MAP_NAME=oneX新零售门店定位 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= diff --git a/src/components/search-bar/index.js b/src/components/search-bar/index.js index fc79077..86167af 100755 --- a/src/components/search-bar/index.js +++ b/src/components/search-bar/index.js @@ -24,7 +24,7 @@ export default class SearchBar extends Component { historyList: [], isShowAction: false, qaList: [ - { content: '正常版和窄版的区别' }, + { content: '常规版和窄版的区别' }, { content: '如何区分常规软木鞋床和软底软木鞋床' }, { content: '人造革和牛皮革的区别' }, ] diff --git a/src/components/sp-sku-select-new/index.js b/src/components/sp-sku-select-new/index.js index 58e7785..691bbd2 100755 --- a/src/components/sp-sku-select-new/index.js +++ b/src/components/sp-sku-select-new/index.js @@ -143,7 +143,8 @@ function SpSkuSelect (props, ref) { const _skuTxtArr = ['', '', ''] if (curItem) { 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 : '' } diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss index 546cb00..787f418 100755 --- a/src/pages/home/index.scss +++ b/src/pages/home/index.scss @@ -198,7 +198,7 @@ page { align-items: flex-start; position: absolute; left: 66px; - bottom: 170px; + bottom: 120px; z-index: 10; // justify-content: flex-start; .item-tit { @@ -210,7 +210,7 @@ page { .item-btn { // width: 180px; // height: 56px; - padding: 20rpx 90rpx 20rpx 50rpx; + padding: 20rpx 90rpx 20rpx 90rpx; color: #fff; font-size: 28px; border-radius: 10px; diff --git a/src/pages/index.js b/src/pages/index.js index 8c80739..2878b92 100755 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -371,7 +371,7 @@ function Home () { src: process.env.APP_IMAGE_CDN_NEW + '/1774/kv.jpg?t' + new Date().getTime(), goods: [], onClick: () => { - // Taro.navigateTo({ url: '/pages/other/goods' }) + Taro.navigateTo({ url: '/pages/other/goods' }) } }, ...list] setState((draft) => { @@ -574,7 +574,7 @@ function Home () { const indexUrl = 'https://mp.weixin.qq.com/s/LBXthKa-P9gNK8FCv3n1pA' const handleGoWx = () => { - return handleApply() + // handleApply() Taro.navigateTo({ url: '/pages/webview?url=' + encodeURIComponent(indexUrl) }) } return ( @@ -695,7 +695,7 @@ function Home () { {!isUpOperation && currentIndex === 0 ? - { + { } : null} diff --git a/src/pages/recommend/apply.js b/src/pages/recommend/apply.js index 1b37d0c..8cdc7c2 100644 --- a/src/pages/recommend/apply.js +++ b/src/pages/recommend/apply.js @@ -342,7 +342,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}/share-logo.jpg` + imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/share.jpg` } }) const handleClose = () => { diff --git a/src/pages/recommend/detail.js b/src/pages/recommend/detail.js index 35f940b..6221bd4 100644 --- a/src/pages/recommend/detail.js +++ b/src/pages/recommend/detail.js @@ -223,7 +223,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}/share-logo.jpg` + imageUrl: `${process.env.APP_IMAGE_CDN_NEW}/share.jpg` } }) const handleClose = () => { diff --git a/src/pages/recommend/status.js b/src/pages/recommend/status.js index dcfa45d..485a83f 100644 --- a/src/pages/recommend/status.js +++ b/src/pages/recommend/status.js @@ -153,7 +153,7 @@ export default function status () { title: activeInfo.activity_name, path: `/pages/recommend/detail?id=${activeInfo.activity_id}`, // 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' ? '待审核' : '报名成功'} diff --git a/src/subpages/auth/reg-rule.js b/src/subpages/auth/reg-rule.js index 6bcea23..fc9a2da 100755 --- a/src/subpages/auth/reg-rule.js +++ b/src/subpages/auth/reg-rule.js @@ -43,7 +43,7 @@ export default class RegRule extends Component { data = registerContent + privacyContent navBarTitle = `${registerTitle}和${privactTitle}` } 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活动细则' } else if (type) {