diff --git a/config/dev.js b/config/dev.js
index 03776341d..64f8f7af3 100644
--- a/config/dev.js
+++ b/config/dev.js
@@ -5,5 +5,26 @@ module.exports = {
defineConstants: {
},
weapp: {},
- h5: {}
+ h5: {},
+ mini: {
+ webpackChain: (chain, webpack) => {
+ chain.merge({
+ plugin: {
+ install: {
+ plugin: require('terser-webpack-plugin'),
+ args: [
+ {
+ terserOptions: {
+ compress: true, // 默认使用terser压缩
+ // mangle: false,
+ keep_classnames: true, // 不改变class名称
+ keep_fnames: true, // 不改变函数名称
+ },
+ },
+ ],
+ },
+ },
+ })
+ },
+ },
}
diff --git a/src/components/sp-page/index.js b/src/components/sp-page/index.js
index 28393c4b5..0ea2028f1 100644
--- a/src/components/sp-page/index.js
+++ b/src/components/sp-page/index.js
@@ -447,7 +447,7 @@ const SpPage = memo(
return (
@@ -464,39 +464,25 @@ const SpPage = memo(
-
- {props.loading &&
+ {props.loading && (
+
- }
- {props.children}
-
- Powered by
-
+ )}
+ {props.children}
+
+ Powered by
+
)}
diff --git a/src/components/sp-page/index.scss b/src/components/sp-page/index.scss
index 171f8c759..311252d75 100644
--- a/src/components/sp-page/index.scss
+++ b/src/components/sp-page/index.scss
@@ -42,14 +42,16 @@
justify-content: center;
gap: 10px;
height: 80px;
+ background: rgba(255, 255, 255, 0);
}
+
.powered-logo {
width: 120px;
height: 32px;
}
+
.sp-page__body-content {
- height: fit-content;
- min-height: 100%;
+ height: 100%;
box-sizing: border-box;
position: relative;
}
@@ -135,4 +137,4 @@
position: absolute;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/marketing/pages/distribution/good-category.config.js b/src/marketing/pages/distribution/good-category.config.js
index 9c7fc80e3..409377e6b 100644
--- a/src/marketing/pages/distribution/good-category.config.js
+++ b/src/marketing/pages/distribution/good-category.config.js
@@ -2,4 +2,6 @@
* Copyright © ShopeX (http://www.shopex.cn). All rights reserved.
* See LICENSE file for license details.
*/
-export default {}
+export default {
+ navigationBarTitleText: '分类'
+}
diff --git a/src/marketing/pages/distribution/good-category.js b/src/marketing/pages/distribution/good-category.js
index 3cc958055..7bbbe80c9 100644
--- a/src/marketing/pages/distribution/good-category.js
+++ b/src/marketing/pages/distribution/good-category.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react'
import Taro, { getCurrentInstance } from '@tarojs/taro'
import { View, ScrollView, Image, Text, Button } from '@tarojs/components'
-import { Loading, SpNote } from '@/components'
+import { Loading, SpNote, SpPage } from '@/components'
import { classNames, pickBy, getCurrentRoute, isAlipay } from '@/utils'
import { AtTabBar } from 'taro-ui'
import { withPager, withBackToTop } from '@/hocs'
@@ -17,6 +17,7 @@ import './shop-category.scss'
@withBackToTop
export default class DistributionShopCategory extends Component {
$instance = getCurrentInstance()
+ spPageRef = React.createRef()
constructor(props) {
super(props)
@@ -57,6 +58,7 @@ export default class DistributionShopCategory extends Component {
withShareTicket: true,
menus: ['shareAppMessage', 'shareTimeline']
})
+ this.spPageRef.current?.pageLock()
const { status } = this.$instance.router.params
const { tabList } = this.state
tabList[0].url += `?status=${status}`
@@ -280,26 +282,12 @@ export default class DistributionShopCategory extends Component {
goodIds
} = this.state
return (
-
- {/*
-
- */}
+ }>
- {/* */}
@@ -381,8 +369,7 @@ export default class DistributionShopCategory extends Component {
-
-
+
)
}
}
diff --git a/src/marketing/pages/distribution/goods.config.js b/src/marketing/pages/distribution/goods.config.js
index 9c7fc80e3..cc7d29971 100644
--- a/src/marketing/pages/distribution/goods.config.js
+++ b/src/marketing/pages/distribution/goods.config.js
@@ -2,4 +2,6 @@
* Copyright © ShopeX (http://www.shopex.cn). All rights reserved.
* See LICENSE file for license details.
*/
-export default {}
+export default {
+ navigationBarTitleText: '推广商品'
+}
diff --git a/src/marketing/pages/distribution/goods.js b/src/marketing/pages/distribution/goods.js
index 6f21aea23..4cebab9f9 100644
--- a/src/marketing/pages/distribution/goods.js
+++ b/src/marketing/pages/distribution/goods.js
@@ -20,6 +20,7 @@ import './goods.scss'
@withBackToTop
export default class DistributionGoods extends Component {
$instance = getCurrentInstance()
+ spPageRef = React.createRef()
constructor(props) {
super(props)
@@ -61,6 +62,7 @@ export default class DistributionGoods extends Component {
menus: ['shareAppMessage', 'shareTimeline']
})
this.firstStatus = true
+ this.spPageRef.current?.pageLock()
const { status } = this.$instance.router.params
const { tabList } = this.state
tabList[1].url += `?status=${status}`
@@ -376,13 +378,12 @@ export default class DistributionGoods extends Component {
console.log(list)
return (
-
-
+ }>
false}
- onCancel={() => {}}
+ onCancel={() => { }}
onChange={this.handleSearchChange}
onClear={this.handleConfirm.bind(this)}
onConfirm={this.handleConfirm.bind(this)}
@@ -424,8 +425,7 @@ export default class DistributionGoods extends Component {
)}
-
-
+
)
}
}
diff --git a/src/marketing/pages/distribution/goods.scss b/src/marketing/pages/distribution/goods.scss
index 194cd997a..6e004aa3f 100644
--- a/src/marketing/pages/distribution/goods.scss
+++ b/src/marketing/pages/distribution/goods.scss
@@ -53,7 +53,7 @@
}
}
&__scroll {
- @include page-scroll($tabs-height + $navigate-height, $tabbar-height);
+ height: calc(100% - 140px);
/* #ifdef h5 */
// @include page-scroll(
// $tabs-height + $navigate-height-h5 + $searchbar-height,
diff --git a/src/marketing/pages/distribution/index.js b/src/marketing/pages/distribution/index.js
index 989b6767f..c24c4f4e0 100644
--- a/src/marketing/pages/distribution/index.js
+++ b/src/marketing/pages/distribution/index.js
@@ -150,7 +150,6 @@ export default class DistributionDashboard extends Component {
}
return (
-
-
+
+
@@ -104,7 +104,8 @@ export default class PointPlatform extends Component {
*/}
-
+
+
)
}
}
diff --git a/src/marketing/pages/distribution/qrcode.config.js b/src/marketing/pages/distribution/qrcode.config.js
index 9c7fc80e3..099a9e6d5 100644
--- a/src/marketing/pages/distribution/qrcode.config.js
+++ b/src/marketing/pages/distribution/qrcode.config.js
@@ -2,4 +2,6 @@
* Copyright © ShopeX (http://www.shopex.cn). All rights reserved.
* See LICENSE file for license details.
*/
-export default {}
+export default {
+ navigationBarTitleText: '二维码'
+}
diff --git a/src/marketing/pages/distribution/qrcode.js b/src/marketing/pages/distribution/qrcode.js
index 758a539eb..e4436a216 100644
--- a/src/marketing/pages/distribution/qrcode.js
+++ b/src/marketing/pages/distribution/qrcode.js
@@ -6,7 +6,7 @@ import React, { Component } from 'react'
import Taro, { getCurrentInstance } from '@tarojs/taro'
import { View, Image } from '@tarojs/components'
import { connect } from 'react-redux'
-import { SpNavBar } from '@/components'
+import { SpPage } from '@/components'
import api from '@/api'
import userIcon from '@/assets/imgs/user-icon.png'
@@ -57,8 +57,8 @@ export default class DistributionQrcode extends Component {
const { info } = this.state
return (
-
-
+
+
邀请卡
@@ -69,7 +69,8 @@ export default class DistributionQrcode extends Component {
微信扫一扫或长按识别
-
+
+
)
}
}
diff --git a/src/marketing/pages/distribution/qrcode.scss b/src/marketing/pages/distribution/qrcode.scss
index 4198c94c3..13686ebd5 100644
--- a/src/marketing/pages/distribution/qrcode.scss
+++ b/src/marketing/pages/distribution/qrcode.scss
@@ -5,15 +5,15 @@
@import '@/style/imports';
.page-distribution-qrcode {
- display: flex;
- align-items: center;
- justify-content: center;
- width: 100vw;
- height: 100vh;
- /* #ifdef h5 */
- box-sizing: border-box;
- padding-top: $navigate-height-h5;
- /* #endif */
+ .page-distribution-qrcode-content {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ /* #ifdef h5 */
+ box-sizing: border-box;
+ padding-top: $navigate-height-h5;
+ /* #endif */
+ }
.qrcode-bg {
display: flex;
flex-direction: column;
diff --git a/src/marketing/pages/distribution/setting.config.js b/src/marketing/pages/distribution/setting.config.js
index 9c7fc80e3..4aaa93725 100644
--- a/src/marketing/pages/distribution/setting.config.js
+++ b/src/marketing/pages/distribution/setting.config.js
@@ -2,4 +2,6 @@
* Copyright © ShopeX (http://www.shopex.cn). All rights reserved.
* See LICENSE file for license details.
*/
-export default {}
+export default {
+ navigationBarTitleText: '会员资料'
+}
diff --git a/src/marketing/pages/distribution/setting.js b/src/marketing/pages/distribution/setting.js
index 3e37d9887..7c2f51845 100644
--- a/src/marketing/pages/distribution/setting.js
+++ b/src/marketing/pages/distribution/setting.js
@@ -4,7 +4,7 @@
*/
import React, { Component } from 'react'
import { View, Text } from '@tarojs/components'
-import { SpNavBar } from '@/components'
+import { SpPage } from '@/components'
import api from '@/api'
import './setting.scss'
@@ -58,8 +58,8 @@ export default class DistributionSetting extends Component {
const { info, shop_name, isEdit } = this.state
return (
-
-
+
+
会员资料
@@ -88,7 +88,8 @@ export default class DistributionSetting extends Component {
-
+
+
)
}
}
diff --git a/src/marketing/pages/distribution/shop-achievement.js b/src/marketing/pages/distribution/shop-achievement.js
index 205844d8c..c70794b89 100644
--- a/src/marketing/pages/distribution/shop-achievement.js
+++ b/src/marketing/pages/distribution/shop-achievement.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react'
import Taro, { getCurrentInstance } from '@tarojs/taro'
import { View, Text, ScrollView, Picker } from '@tarojs/components'
-import { SpToast, Loading, SpNote } from '@/components'
+import { SpToast, Loading, SpNote, SpPage } from '@/components'
// import S from '@/spx'
import api from '@/api'
import { withPager, withBackToTop } from '@/hocs'
@@ -92,7 +92,8 @@ export default class DistributionShopAchievement extends Component {
const { list, page, date, scrollTop } = this.state
return (
-
+
+
-
+
)
}
}
diff --git a/src/marketing/pages/distribution/shop-category.config.js b/src/marketing/pages/distribution/shop-category.config.js
index 881e05799..81a3df397 100644
--- a/src/marketing/pages/distribution/shop-category.config.js
+++ b/src/marketing/pages/distribution/shop-category.config.js
@@ -3,5 +3,5 @@
* See LICENSE file for license details.
*/
export default {
- navigationBarTitleText: ''
+ navigationBarTitleText: '分类'
}
diff --git a/src/marketing/pages/distribution/shop-category.js b/src/marketing/pages/distribution/shop-category.js
index 464440e69..508f4bf61 100644
--- a/src/marketing/pages/distribution/shop-category.js
+++ b/src/marketing/pages/distribution/shop-category.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react'
import Taro, { getCurrentInstance } from '@tarojs/taro'
import { View, ScrollView, Text, Image } from '@tarojs/components'
-import { Loading, SpImg, SpNote, SpNavBar } from '@/components'
+import { Loading, SpImg, SpNote, SpNavBar, SpPage } from '@/components'
import { classNames, pickBy, getCurrentRoute } from '@/utils'
import { AtTabBar } from 'taro-ui'
import S from '@/spx'
@@ -221,8 +221,8 @@ export default class DistributionShopCategory extends Component {
this.state
const isHaveLeft = list.length > 0
return (
-
-
+ }>
+
-
-
+
+
)
}
}
diff --git a/src/marketing/pages/distribution/shop-category.scss b/src/marketing/pages/distribution/shop-category.scss
index 030e6f30f..6d290fa2d 100644
--- a/src/marketing/pages/distribution/shop-category.scss
+++ b/src/marketing/pages/distribution/shop-category.scss
@@ -16,7 +16,6 @@
.category-comps-not {
box-sizing: border-box;
background: #ffffff;
- @include page-scroll(0, $tabbar-height);
}
}
.search-input-fixed {
@@ -43,13 +42,16 @@
box-sizing: border-box;
background: #ffffff;
/* #ifdef weapp */
- @include page-scroll(0, $tabbar-height);
+ height:100%;
+ // @include page-scroll(0, $tabbar-height);
/* #endif */
/* #ifdef h5 */
- @include page-scroll($navigate-height-h5, $tabbar-height);
+ height:100%;
+ // @include page-scroll($navigate-height-h5, $tabbar-height);
/* #endif */
}
.shop-category__wrap {
+ height:100%;
&.all {
.category-list__scroll {
width: 100%;
@@ -57,12 +59,10 @@
}
}
.category-list__scroll {
- @include page-scroll($tabs-height + $navigate-height, 0);
+ height:100%;
/* #ifdef h5 */
- @include page-scroll($tabs-height + $navigate-height-h5, 0);
+ height:100%;
/* #endif */
- top: 0;
- left: 25vw;
width: 75vw;
}
}
diff --git a/src/marketing/pages/distribution/shop-form.js b/src/marketing/pages/distribution/shop-form.js
index a5de7533b..f3159675a 100644
--- a/src/marketing/pages/distribution/shop-form.js
+++ b/src/marketing/pages/distribution/shop-form.js
@@ -99,7 +99,7 @@ export default class DistributionShopForm extends Component {
return (
-
+
{info.key == 'shop_name' && (
-
- false}
- onCancel={() => {}}
- onChange={this.handleSearchChange}
- onClear={this.handleConfirm.bind(this)}
- onConfirm={this.handleConfirm.bind(this)}
- />
-
-
-
- {list.map((item, index) => {
- const isRelease = goodsIds.findIndex((n) => item.goods_id == n) !== -1
- return (
-
-
-
-
-
- {item.title}
- {item.desc}
-
- ¥ {item.price}
+
+
+
+ false}
+ onCancel={() => { }}
+ onChange={this.handleSearchChange}
+ onClear={this.handleConfirm.bind(this)}
+ onConfirm={this.handleConfirm.bind(this)}
+ />
+
+
+
+ {list.map((item, index) => {
+ const isRelease = goodsIds.findIndex((n) => item.goods_id == n) !== -1
+ return (
+
+
+
+
+
+ {item.title}
+ {item.desc}
+
+ ¥ {item.price}
+
+
+
+ 任务模式
+ {item.rebate_type === 'total_num' && (
+ 按售出总量
+ )}
+ {item.rebate_type === 'total_money' && (
+ 按总销售金额
+ )}
-
- 任务模式
- {item.rebate_type === 'total_num' && (
- 按售出总量
- )}
- {item.rebate_type === 'total_money' && (
- 按总销售金额
- )}
-
-
- {!item.view_detail ? (
-
- 查看指标明细
-
- ) : (
-
-
- 规格
- 指标
- 奖金
+ {!item.view_detail ? (
+
+ 查看指标明细
- {item.details &&
- item.details.map((detail, dindex) => (
-
-
- {detail.item_spec ? (
- detail.item_spec &&
- detail.item_spec.map((sku, sindex) => (
-
- {sku.spec_image_url && (
-
- )}
- {sku.spec_custom_value_name || sku.spec_value_name}
-
- ))
- ) : (
- 单规格
+ ) : (
+
+
+ 规格
+ 指标
+ 奖金
+
+ {item.details &&
+ item.details.map((detail, dindex) => (
+
+
+ {detail.item_spec ? (
+ detail.item_spec &&
+ detail.item_spec.map((sku, sindex) => (
+
+ {sku.spec_image_url && (
+
+ )}
+ {sku.spec_custom_value_name || sku.spec_value_name}
+
+ ))
+ ) : (
+ 单规格
+ )}
+
+ {detail.task && (
+
+ {detail.task.map((task, tindex) => (
+
+ {task.filter}
+
+ {task.money && ¥}
+ {task.money}
+
+
+ ))}
+
)}
- {detail.task && (
-
- {detail.task.map((task, tindex) => (
-
- {task.filter}
-
- {task.money && ¥}
- {task.money}
-
-
- ))}
-
- )}
-
- ))}
-
- )}
-
-
-
- {isRelease ? (
- 从小店下架
- ) : (
- 上架到小店
+ ))}
+
)}
-
+
+
+ {isRelease ? (
+ 从小店下架
+ ) : (
+ 上架到小店
+ )}
+
+
+
-
- )
- })}
-
- {page.isLoading ? 正在加载... : null}
- {!page.isLoading && !page.hasNext && !list.length && (
- 暂无数据~
- )}
-
+ )
+ })}
+
+ {page.isLoading ? 正在加载... : null}
+ {!page.isLoading && !page.hasNext && !list.length && (
+ 暂无数据~
+ )}
+
+
-
+
)
}
}
diff --git a/src/marketing/pages/distribution/shop-goods.scss b/src/marketing/pages/distribution/shop-goods.scss
index 77f96d598..7fcd1f105 100644
--- a/src/marketing/pages/distribution/shop-goods.scss
+++ b/src/marketing/pages/distribution/shop-goods.scss
@@ -21,8 +21,9 @@
}
.goods-list {
padding: 10px 30px;
+ box-sizing: border-box;
&__scroll {
- @include page-scroll($searchbar-height + 10, 0);
+ height: calc(100% - 30PX);
}
.shop-goods-item {
margin-bottom: 30px;
diff --git a/src/marketing/pages/distribution/shop-home.js b/src/marketing/pages/distribution/shop-home.js
index b139b8820..83a77a1af 100644
--- a/src/marketing/pages/distribution/shop-home.js
+++ b/src/marketing/pages/distribution/shop-home.js
@@ -6,7 +6,7 @@ import React, { Component } from 'react'
import Taro, { getCurrentInstance } from '@tarojs/taro'
import { View, Text, Button, Image, Input } from '@tarojs/components'
import { AtTabBar } from 'taro-ui'
-import { BackToTop, Loading, SpNavBar, SpImg, SpNote } from '@/components'
+import { BackToTop, Loading, SpNavBar, SpImg, SpNote, SpPage } from '@/components'
import S from '@/spx'
import api from '@/api'
import qs from 'qs'
@@ -466,14 +466,12 @@ export default class DistributionShopHome extends Component {
}
]
- if (!info.is_valid) {
- return
- }
+ // if (!info.is_valid) {
+ // return
+ // }
return (
-
- 0} isHome={isHome} statusBarHeight={statusBarHeight} />
-
+ }>
)}
-
-
-
-
+ {/* */}
+
)
}
}
diff --git a/src/marketing/pages/distribution/shop-setting.js b/src/marketing/pages/distribution/shop-setting.js
index 9d1842d2e..7ba421a77 100644
--- a/src/marketing/pages/distribution/shop-setting.js
+++ b/src/marketing/pages/distribution/shop-setting.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react'
import Taro, { getCurrentInstance } from '@tarojs/taro'
import { View, Image } from '@tarojs/components'
-import { SpCell } from '@/components'
+import { SpCell, SpPage } from '@/components'
import api from '@/api'
import './shop-setting.scss'
@@ -48,7 +48,8 @@ export default class DistributionShopSetting extends Component {
const { info } = this.state
return (
-
+
+
-
+
+
)
}
}
diff --git a/src/marketing/pages/distribution/shop-trade.js b/src/marketing/pages/distribution/shop-trade.js
index 7737344b7..4c94fe4c3 100644
--- a/src/marketing/pages/distribution/shop-trade.js
+++ b/src/marketing/pages/distribution/shop-trade.js
@@ -4,7 +4,7 @@
*/
import React, { Component } from 'react'
import { View, Text, ScrollView, Image } from '@tarojs/components'
-import { SpToast, Loading, SpNote } from '@/components'
+import { SpToast, Loading, SpNote, SpPage } from '@/components'
import api from '@/api'
import { withPager, withBackToTop } from '@/hocs'
import { pickBy, formatDateTime } from '@/utils'
@@ -74,7 +74,7 @@ export default class DistributionShopTrade extends Component {
const { list, page, scrollTop } = this.state
return (
-
+
-
+
)
}
}
diff --git a/src/marketing/pages/distribution/shop-trade.scss b/src/marketing/pages/distribution/shop-trade.scss
index 27d712f4c..f7d44039e 100644
--- a/src/marketing/pages/distribution/shop-trade.scss
+++ b/src/marketing/pages/distribution/shop-trade.scss
@@ -9,7 +9,7 @@
.trade-list {
padding: 24px $edge-margin;
&__scroll {
- @include page-scroll(0, 0);
+ height: 100%;
}
&__item {
&-code {
diff --git a/src/marketing/pages/distribution/shop.js b/src/marketing/pages/distribution/shop.js
index 6942144a6..4c7ae1bce 100644
--- a/src/marketing/pages/distribution/shop.js
+++ b/src/marketing/pages/distribution/shop.js
@@ -107,6 +107,7 @@ export default class DistributionShop extends Component {
return (
+
@@ -173,6 +174,7 @@ export default class DistributionShop extends Component {
)}
+
)
}
diff --git a/src/marketing/pages/distribution/statistics.config.js b/src/marketing/pages/distribution/statistics.config.js
index 9c7fc80e3..f1675c4d1 100644
--- a/src/marketing/pages/distribution/statistics.config.js
+++ b/src/marketing/pages/distribution/statistics.config.js
@@ -2,4 +2,6 @@
* Copyright © ShopeX (http://www.shopex.cn). All rights reserved.
* See LICENSE file for license details.
*/
-export default {}
+export default {
+ navigationBarTitleText: '推广费'
+}
diff --git a/src/marketing/pages/distribution/statistics.js b/src/marketing/pages/distribution/statistics.js
index e15e594b7..a014838db 100644
--- a/src/marketing/pages/distribution/statistics.js
+++ b/src/marketing/pages/distribution/statistics.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react'
import { View, Text, Navigator } from '@tarojs/components'
import api from '@/api'
-import { SpNavBar } from '@/components'
+import { SpNavBar, SpPage } from '@/components'
import { pickBy } from '@/utils'
import './statistics.scss'
@@ -47,8 +47,8 @@ export default class DistributionStatistics extends Component {
const { info } = this.state
return (
-
-
+
+
@@ -130,7 +130,8 @@ export default class DistributionStatistics extends Component {
-
+
+
)
}
}
diff --git a/src/marketing/pages/distribution/subordinate.config.js b/src/marketing/pages/distribution/subordinate.config.js
index 9c7fc80e3..02862f8b9 100644
--- a/src/marketing/pages/distribution/subordinate.config.js
+++ b/src/marketing/pages/distribution/subordinate.config.js
@@ -2,4 +2,6 @@
* Copyright © ShopeX (http://www.shopex.cn). All rights reserved.
* See LICENSE file for license details.
*/
-export default {}
+export default {
+ navigationBarTitleText: '我的会员'
+}
diff --git a/src/marketing/pages/distribution/subordinate.js b/src/marketing/pages/distribution/subordinate.js
index b0c10198a..f5641fbae 100644
--- a/src/marketing/pages/distribution/subordinate.js
+++ b/src/marketing/pages/distribution/subordinate.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react'
import { View, Text, Image, ScrollView } from '@tarojs/components'
import { AtTabs, AtTabsPane } from 'taro-ui'
-import { Loading, SpNote, SpNavBar } from '@/components'
+import { Loading, SpNote, SpNavBar, SpPage } from '@/components'
import api from '@/api'
import { withPager } from '@/hocs'
import { classNames, pickBy } from '@/utils'
@@ -89,8 +89,7 @@ export default class DistributionSubordinate extends Component {
const { list, page, curTabIdx, tabList, scrollTop } = this.state
return (
-
-
+
暂无数据~
)}
-
+
)
}
}
diff --git a/src/marketing/pages/distribution/subordinate.scss b/src/marketing/pages/distribution/subordinate.scss
index 0ee706e6a..b9982adc2 100644
--- a/src/marketing/pages/distribution/subordinate.scss
+++ b/src/marketing/pages/distribution/subordinate.scss
@@ -6,25 +6,18 @@
.page-distribution-subordinate {
height: 100%;
- .client-list__tabs {
- /* #ifdef h5 */
- top: $navigate-height-h5;
- /* #endif */
+ .at-tabs {
+ height: 84px;
}
+ // .client-list__tabs {
+ // /* #ifdef h5 */
+ // top: $navigate-height-h5;
+ // /* #endif */
+ // }
.subordinate-list__scroll {
- @include page-scroll(94px, 0);
- height: calc(100vh - #{$tabs-height + $navigate-height});
- /* #ifdef h5 */
- @include page-scroll($tabs-height + $navigate-height-h5, 0);
- height: calc(100vh - #{$tabs-height + $navigate-height-h5});
- /* #endif */
- }
- .list {
- min-height: calc(100vh - #{$tabs-height + $navigate-height});
- /* #ifdef h5 */
- min-height: calc(100vh - #{$tabs-height + $navigate-height-h5});
- /* #endif */
+ height: calc(100% - 84px);
}
+
.avatar {
width: 70px;
height: 70px;
diff --git a/src/marketing/pages/distribution/trade.js b/src/marketing/pages/distribution/trade.js
index 10577748f..321fb67d7 100644
--- a/src/marketing/pages/distribution/trade.js
+++ b/src/marketing/pages/distribution/trade.js
@@ -6,7 +6,7 @@ import React, { Component } from 'react'
import { getCurrentInstance } from '@tarojs/taro'
import { View, Text, Image, ScrollView } from '@tarojs/components'
import { AtTabs, AtTabsPane } from 'taro-ui'
-import { Loading, SpNote, SpNavBar } from '@/components'
+import { Loading, SpNote, SpNavBar, SpPage } from '@/components'
import api from '@/api'
import { hasNavbar, pickBy } from '@/utils'
import { withPager, withBackToTop } from '@/hocs'
@@ -93,10 +93,9 @@ export default class DistributionTrade extends Component {
console.log(list)
return (
-
-
+
暂无数据~
)}
-
+
)
}
}
diff --git a/src/marketing/pages/distribution/trade.scss b/src/marketing/pages/distribution/trade.scss
index 2fe67bf48..d3c393f43 100644
--- a/src/marketing/pages/distribution/trade.scss
+++ b/src/marketing/pages/distribution/trade.scss
@@ -5,20 +5,11 @@
@import '@/style/imports';
.page-distribution-trade {
- .trade-list__tabs_web {
- // 浏览器(不包含微信浏览器)
- margin-top: $navigate-height-h5;
+ .at-tabs {
+ height: 84px;
}
.trade-list__scroll {
- @include page-scroll($tabs-height + $navigate-height, 0);
- /* #ifdef h5 */
- @include page-scroll($tabs-height + $navigate-height-h5, 0);
- top: 110px;
- /* #endif */
- }
- .trade-list__scroll_web {
- // 浏览器(不包含微信浏览器)
- top: $tabs-height + $navigate-height-h5 + 30px;
+ height: calc(100% - 84px);
}
.order-no {
font-size: 30px;
diff --git a/src/marketing/pages/distribution/withdraw.js b/src/marketing/pages/distribution/withdraw.js
index 0be7ffc32..bcdee8521 100644
--- a/src/marketing/pages/distribution/withdraw.js
+++ b/src/marketing/pages/distribution/withdraw.js
@@ -169,7 +169,18 @@ export default class DistributionWithdraw extends Component {
payText
} = this.state
return (
-
+
+
+ }
+ >
+
可提现金额(元)
@@ -232,14 +243,6 @@ export default class DistributionWithdraw extends Component {
提现申请审核通过后1个工作日后到账,节假日顺延
修改银行卡信息请前往实名认证信息进行修改
-
-
)
diff --git a/src/marketing/pages/distribution/withdrawals-acount.js b/src/marketing/pages/distribution/withdrawals-acount.js
index e41914872..03352427c 100644
--- a/src/marketing/pages/distribution/withdrawals-acount.js
+++ b/src/marketing/pages/distribution/withdrawals-acount.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react'
import Taro, { getCurrentInstance } from '@tarojs/taro'
import { View, Text, Button } from '@tarojs/components'
-import { SpInput as AtInput } from '@/components'
+import { SpInput as AtInput, SpPage } from '@/components'
import { showToast } from '@/utils'
import api from '@/api'
@@ -78,8 +78,23 @@ export default class DistributionWithdrawalsAcount extends Component {
console.log('00', hasBind)
return (
-
-
+
+
+
+ {/* { !hasBind && }
+ { hasBind && !isEdit && }
+ { hasBind && isEdit && } */}
+
+
+ 请务必准确填写开户人姓名和支付宝账号
+ {/* 支持支付宝账户的修改,但每天仅限1次 */}
+ >
+ }
+ >
+
} */}
-
-
- {/* { !hasBind && }
- { hasBind && !isEdit && }
- { hasBind && isEdit && } */}
-
-
- 请务必准确填写开户人姓名和支付宝账号
- {/* 支持支付宝账户的修改,但每天仅限1次 */}
-
-
+
)
}
}
diff --git a/src/marketing/pages/distribution/withdrawals-record.js b/src/marketing/pages/distribution/withdrawals-record.js
index cccf26e48..6773efc79 100644
--- a/src/marketing/pages/distribution/withdrawals-record.js
+++ b/src/marketing/pages/distribution/withdrawals-record.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react'
import { View, Text, Icon, ScrollView } from '@tarojs/components'
import { AtTabs, AtTabsPane } from 'taro-ui'
-import { BackToTop, Loading, SpNote } from '@/components'
+import { BackToTop, Loading, SpNote, SpPage } from '@/components'
import api from '@/api'
import { withPager, withBackToTop } from '@/hocs'
import { classNames, pickBy } from '@/utils'
@@ -80,7 +80,7 @@ export default class DistributionWithdrawalsRecord extends Component {
const { list, page, scrollTop } = this.state
return (
-
+
暂无数据~
)}
-
+
)
}
}
diff --git a/src/marketing/pages/distribution/withdrawals-record.scss b/src/marketing/pages/distribution/withdrawals-record.scss
index e4bb74c5d..e72c25f4f 100644
--- a/src/marketing/pages/distribution/withdrawals-record.scss
+++ b/src/marketing/pages/distribution/withdrawals-record.scss
@@ -6,7 +6,7 @@
.page-distribution-record {
.record-list__scroll {
- @include page-scroll($tabs-height + $navigate-height, 0);
+ height: 100%;
}
.status-icon {
display: block;
diff --git a/src/others/pages/auth/index.js b/src/others/pages/auth/index.js
index 3cfd2412a..7a96618ae 100644
--- a/src/others/pages/auth/index.js
+++ b/src/others/pages/auth/index.js
@@ -5,7 +5,7 @@
import React, { Component } from 'react'
import Taro, { getCurrentInstance } from '@tarojs/taro'
import { View } from '@tarojs/components'
-import { Loading } from '@/components'
+import { Loading, SpPage } from '@/components'
import api from '@/api'
import S from '@/spx'
import { normalizeQuerys, getAppId } from '@/utils'
@@ -107,12 +107,13 @@ export default class AuthLogin extends Component {
const { showAuth } = this.state
const user = Taro.getStorageSync('userinfo')
- if (!showAuth) {
- return
- }
+ // if (!showAuth) {
+ // return
+ // }
return (
-
+
+
尊敬的{user.username}
您即将在门店大屏登录并在门店进行购物,请您确认是否登录
@@ -123,7 +124,8 @@ export default class AuthLogin extends Component {
取消
-
+
+
)
}
}
diff --git a/src/others/pages/bindOrder/index.config.js b/src/others/pages/bindOrder/index.config.js
index 9c7fc80e3..a30a78159 100644
--- a/src/others/pages/bindOrder/index.config.js
+++ b/src/others/pages/bindOrder/index.config.js
@@ -2,4 +2,6 @@
* Copyright © ShopeX (http://www.shopex.cn). All rights reserved.
* See LICENSE file for license details.
*/
-export default {}
+export default {
+ navigationBarTitleText: '线下订单关联'
+}
diff --git a/src/others/pages/bindOrder/index.js b/src/others/pages/bindOrder/index.js
index f6f2cbf1a..ef6f08d44 100644
--- a/src/others/pages/bindOrder/index.js
+++ b/src/others/pages/bindOrder/index.js
@@ -8,7 +8,7 @@ import { View, Input, Image } from '@tarojs/components'
import { AtModal, AtModalContent, AtModalAction } from 'taro-ui'
import { connect } from 'react-redux'
import api from '@/api'
-import { SpNavBar } from '@/components'
+import { SpNavBar, SpPage } from '@/components'
import './index.scss'
@@ -83,7 +83,7 @@ export default class BindOrder extends Component {
title: '关联成功,请至订单列表查看',
icon: 'none'
})
- } catch (e) {}
+ } catch (e) { }
}
render() {
@@ -91,39 +91,7 @@ export default class BindOrder extends Component {
const { colors } = this.props
return (
-
-
-
-
- 请输入或者扫码录入订单号
-
-
-
-
-
-
-
-
-
- 请输入订单随机码
-
-
-
-
-
-
+
关联
-
-
- {tips}
-
-
-
-
- 确认
+ }
+ >
+
+
+
+ 请输入或者扫码录入订单号
+
-
-
-
+
+
+
+
+
+
+
+ 请输入订单随机码
+
+
+
+
+
+
+
+
+ {tips}
+
+
+
+
+ 确认
+
+
+
+
+
)
}
}
diff --git a/src/others/pages/bindOrder/index.scss b/src/others/pages/bindOrder/index.scss
index c37a34064..3a0accb6c 100644
--- a/src/others/pages/bindOrder/index.scss
+++ b/src/others/pages/bindOrder/index.scss
@@ -9,48 +9,61 @@
height: 100vh;
background: #fff;
box-sizing: border-box;
- padding-top: 20px;
- /* #ifdef h5 */
- padding-top: $navigate-height-h5;
- /* #endif */
+
+ .bind-order-content {
+ box-sizing: border-box;
+ padding-top: 20px;
+ /* #ifdef h5 */
+ padding-top: $navigate-height-h5;
+ /* #endif */
+ }
+
.barCode {
width: 80%;
margin: 0 auto;
+
.input,
.line {
display: flex;
align-items: center;
+
.text {
flex: 1;
}
+
.iconfont {
font-size: 42px;
color: #149bd5;
}
}
+
.line {
padding: 20px 0;
justify-content: space-between;
+
.iconfont {
font-size: 38px;
}
}
}
+
.btn {
width: 50%;
- margin: 60px auto 0 auto;
+ margin: auto;
text-align: center;
height: 80px;
line-height: 80px;
color: #fff;
border-radius: 10px;
}
+
.tipsModal {
.img {
width: 80%;
margin: 20px auto;
display: block;
}
+
.confirm {
width: 100%;
height: 80px;
@@ -59,4 +72,4 @@
text-align: center;
}
}
-}
+}
\ No newline at end of file
diff --git a/src/pages/category/comps/comps-category-tile.scss b/src/pages/category/comps/comps-category-tile.scss
index 4fab446df..c0f5141fc 100644
--- a/src/pages/category/comps/comps-category-tile.scss
+++ b/src/pages/category/comps/comps-category-tile.scss
@@ -53,11 +53,13 @@
.category-comps {
box-sizing: border-box;
background: #ffffff;
- @include page-scroll($tabs-height + 16px, $tabbar-height);
+ position: static!important;
+ height: 100%;
}
.category-comps-not {
box-sizing: border-box;
background: #ffffff;
- @include page-scroll(0, $tabbar-height);
+ position: static!important;
+ height: 100%;
}
}
diff --git a/src/pages/category/index.js b/src/pages/category/index.js
index 2a22ac39a..bd89e5efe 100644
--- a/src/pages/category/index.js
+++ b/src/pages/category/index.js
@@ -45,10 +45,10 @@ function StoreItemList(props) {
}
return (
-
+ <>
{state.layout === 1 && }
{state.layout === 2 && }
-
+ >
)
}
diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss
index d810d4c03..a437597d9 100644
--- a/src/pages/home/index.scss
+++ b/src/pages/home/index.scss
@@ -2,8 +2,4 @@
* Copyright © ShopeX (http://www.shopex.cn). All rights reserved.
* See LICENSE file for license details.
*/
-.page-index {
- .home-body {
- height: 100%;
- }
-}
+
diff --git a/src/pages/index.js b/src/pages/index.js
index 3ebee116e..2692c1da8 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -289,8 +289,8 @@ function Home() {
})
}}
>
-
)}
-
+
{/* 小程序收藏提示 */}
{isWeixin && }
diff --git a/src/pages/item/list.scss b/src/pages/item/list.scss
index bf1b9707d..e85fe923e 100644
--- a/src/pages/item/list.scss
+++ b/src/pages/item/list.scss
@@ -55,7 +55,9 @@ $search-wrap-height: 90px;
}
}
}
-
+ .item-list-scroll{
+ min-height: calc(100% - 322px);
+ }
.list-scroll-container {
height: calc(100% - #{$search-wrap-height});
}
diff --git a/src/pages/purchase/comps/comp-tabbar.scss b/src/pages/purchase/comps/comp-tabbar.scss
index f9a5164af..fb4ae0563 100644
--- a/src/pages/purchase/comps/comp-tabbar.scss
+++ b/src/pages/purchase/comps/comp-tabbar.scss
@@ -2,13 +2,11 @@
* Copyright © ShopeX (http://www.shopex.cn). All rights reserved.
* See LICENSE file for license details.
*/
-.comp-tabbar {
- .at-badge__num {
- background-color: var(--color-dianwu-primary);
- }
+.at-badge__num {
+ background-color: var(--color-dianwu-primary);
+}
- &.at-tab-bar {
- height: 100%;
- position: absolute;
- }
+.at-tab-bar {
+ height: 100%;
+ position: absolute;
}
\ No newline at end of file
diff --git a/src/style/global.scss b/src/style/global.scss
index d7f2d0825..b92a0559c 100644
--- a/src/style/global.scss
+++ b/src/style/global.scss
@@ -148,3 +148,6 @@
.opacity-0 {
opacity: 0;
}
+.min-h-full {
+ min-height: 100%;
+}
\ No newline at end of file
diff --git a/src/style/rtl.scss b/src/style/rtl.scss
index f8a6d9196..697be442f 100644
--- a/src/style/rtl.scss
+++ b/src/style/rtl.scss
@@ -12,10 +12,6 @@ view.rtl-layout {
direction: rtl;
text-align: right;
- // 确保所有子元素也应用 RTL
- > * {
- direction: rtl;
- }
.text-left {
text-align: right;
@@ -34,7 +30,7 @@ view.rtl-layout {
}
// Fix Taro UI icons if needed (example)
- .at-icon-chevron-right,.icon-arrowRight,.icon-arrowRight-img {
+ .at-icon-chevron-right,.icon-arrowRight,.icon-arrowRight-img,.icon-qianwang-01 {
transform: rotate(180deg);
}
diff --git a/src/subpages/mdugc/index.js b/src/subpages/mdugc/index.js
index 45111a5e8..c04ac2cf6 100644
--- a/src/subpages/mdugc/index.js
+++ b/src/subpages/mdugc/index.js
@@ -232,7 +232,7 @@ function UgcIndex() {
onConfirm={handleConfirm}
/>
-
+ <>
-
+ >
)
}
diff --git a/src/subpages/mdugc/index.scss b/src/subpages/mdugc/index.scss
index 4fbae600e..a78a78c5d 100644
--- a/src/subpages/mdugc/index.scss
+++ b/src/subpages/mdugc/index.scss
@@ -22,6 +22,9 @@
}
}
}
+ .list-scroll{
+ min-height: calc(100% - 402px);
+ }
.ugc-tag {
&.sp-tag-bar {
diff --git a/src/subpages/member/index.js b/src/subpages/member/index.js
index a2afee381..e9d19841a 100644
--- a/src/subpages/member/index.js
+++ b/src/subpages/member/index.js
@@ -453,16 +453,10 @@ function MemberIndex(props) {
className='pages-member-index'
immersive={state.pageData?.base?.isImmersive}
pageConfig={state.pageData?.base || {}}
- renderFooter={}
+ renderFooter={}
title='会员中心'
- onReady={({ footerHeight }) => {
- setState((draft) => {
- draft.footerHeight = footerHeight
- })
- console.log('onReady', footerHeight)
- }}
>
-
+