Commit 54254699 authored by mqf_0707's avatar mqf_0707

wnf

parent 4a775d5e
...@@ -4,7 +4,8 @@ export default { ...@@ -4,7 +4,8 @@ export default {
'pages/packageGood/browseGoods/browseGoods', 'pages/packageGood/browseGoods/browseGoods',
'pages/packageGood/collectGoods/collectGoods', 'pages/packageGood/collectGoods/collectGoods',
'pages/packageGood/orderGoods/orderGoods', 'pages/packageGood/orderGoods/orderGoods',
'pages/packageGood/cartGoods/cartGoods' 'pages/packageGood/cartGoods/cartGoods',
'pages/preComp/preComp'
], ],
subPackages: [ subPackages: [
{ {
......
...@@ -3,14 +3,15 @@ import React from 'react' ...@@ -3,14 +3,15 @@ import React from 'react'
import styles from './ContainerFit.module.less' import styles from './ContainerFit.module.less'
export default function ContainerFit(props) { export default function ContainerFit(props) {
const { bg = ''} = props const { bg = '', hasFitPsd = false } = props
return ( return (
<View className={styles['page-container']}> <View className={styles['page-container']}>
<View className={styles['page-psd-container']} style={{ background: `url(${bg}) no-repeat`, backgroundSize: '7.5rem 16.24rem' }}> <View className={styles['page-psd-container']} style={{ background: `url(${bg}) no-repeat`, backgroundSize: '7.5rem 16.24rem' }}>
<View className={styles['page-content']}> {!hasFitPsd && <View className={styles['page-content']}>
{props.children} {props.children}
</View> </View>}
{hasFitPsd && props.children}
</View> </View>
</View> </View>
) )
......
import React, { useState } from 'react'
import { View, Image, ScrollView } from '@tarojs/components'
import Taro, { useShareAppMessage, useDidShow } from '@tarojs/taro'
import classnames from 'classnames'
import styles from './Swiper.module.less'
function Swiper(props) {
return (
<>
</>
)
}
export default Swiper
\ No newline at end of file
...@@ -4,20 +4,37 @@ import { useDidShow, useRouter, useDidHide, getApp } from '@tarojs/taro' ...@@ -4,20 +4,37 @@ import { useDidShow, useRouter, useDidHide, getApp } from '@tarojs/taro'
import API from '@/api' import API from '@/api'
import { useLogin, useLoginFromShare } from '@/hooks/useLogin' import { useLogin, useLoginFromShare } from '@/hooks/useLogin'
import { useActivityInfoModel, useLoginInfoModel } from '@/store' import { useActivityInfoModel, useLoginInfoModel } from '@/store'
import { prizeList } from '@/mock'
import styles from './preComp.module.less'
import {useAudio} from '@/hooks/useAudio' import {useAudio} from '@/hooks/useAudio'
import {CLOUD_OBJ, BGMUSIC_URL} from '@/const' import {CLOUD_OBJ, BGMUSIC_URL} from '@/const'
import ContainerFit from '@/components/_base/ContainerFit/ContainerFit'
import ScrollXView from '@/components/_tb_comps/ScrollXView/ScrollXView' import ScrollXView from '@/components/_tb_comps/ScrollXView/ScrollXView'
import SwiperView from '@/components/_tb_comps/SwiperView/SwiperView' import SwiperView from '@/components/_tb_comps/SwiperView/SwiperView'
import RotateWheel from '@/components/_tb_comps/RotateWheel/RotateWheel' import RotateWheel from '@/components/_tb_comps/RotateWheel/RotateWheel'
import RankTitle from '@/components/_tb_comps/Rank/RankTitle/RankTitle'
import RankList from '@/components/_tb_comps/Rank/RankList/RankList'
export default function PreComp(props) { export default function PreComp(props) {
return( return(
<View> <ContainerFit hasFitPsd={true}>
<View className={styles['scroll-view']}>
<ScrollXView prizeList={prizeList} />
</View>
<View className={styles['comp-view']}>
<RotateWheel />
</View>
<View className={styles['comp-view']}>
<SwiperView swiperList={prizeList} />
</View> </View>
</ContainerFit>
) )
} }
\ No newline at end of file
.scroll-view {
margin-top: 208px;
}
.comp-view {
margin-top: 50px;
width: 100%;
height: auto;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment