xuan/TestEShopDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ feat(码单管理开发中):

Browse Source
This commit is contained in:
czm 2022-12-20 10:11:15 +08:00 committed by Haiyi
parent 926dca9752
commit a53c9dda64
17 changed files with 237 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app.config.ts
View File

@ -188,8 +188,8 @@ export default {
root: 'pages/codeList',
pages: [
'index',
'codeColorList/index',
],
},
],
}

4
src/common/constant.ts
View File

@ -10,9 +10,9 @@
// export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
// export const BASE_URL = `https://dev.zzfzyc.com/lymarket` // 开发环境
// export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
// export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
// export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
// export const BASE_URL = 'http://192.168.1.42:50001/lymarket' // 杰

3
src/pages/codeList/codeColorList/index.config.ts Normal file
View File

@ -0,0 +1,3 @@
export default {
navigationBarTitleText: '颜色详情',
}

35
src/pages/codeList/codeColorList/index.module.scss Normal file
View File

@ -0,0 +1,35 @@
.main {
padding: 24px;
background-color: #f7f7f7ff;
padding-bottom: 200px;
.bottom_btn {
display: flex;
justify-content: space-between;
padding: 16px 48px;
position: fixed;
width: 100%;
bottom: 0;
left: 0;
box-sizing: border-box;
background-color: #fff;
height: 160px;
z-index: 999;
text {
display: block;
width: 311px;
height: 80px;
border-radius: 44px;
text-align: center;
line-height: 80px;
&:nth-child(2) {
background: #337fff;
color: #fff;
}
&:nth-child(1) {
border: 1px solid #087eff;
color: #337fffff;
box-sizing: border-box;
}
}
}
}

17
src/pages/codeList/codeColorList/index.tsx Normal file
View File

@ -0,0 +1,17 @@
import { CoverView, Text, View } from '@tarojs/components'
import ColorItemSetting from '../components/colorItemSetting'
import styles from './index.module.scss'
export default () => {
return <View className={styles.main}>
<ColorItemSetting />
<View >
<View className={styles.bottom_btn}>
<Text>取消</Text>
<Text>确认</Text>
</View>
<View className="common_safe_area_y"></View>
</View>
</View>
}

40
src/pages/codeList/components/colorItemSetting/index.module.scss Normal file
View File

@ -0,0 +1,40 @@
.product_list {
width: 702px;
border-radius: 16px;
margin-top: 24px;
box-sizing: border-box;
.product_list__item {
.product_list__item--title {
height: 82px;
font-size: 28px;
display: flex;
color: #000000;
align-items: center;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
background-color: #fff;
padding: 0 32px;
box-sizing: border-box;
border-radius: 16px 16px 0 0;
.product_title {
margin-right: 8px;
}
.mode_status {
width: 60px;
height: 30px;
font-size: 20px;
background: #337fff;
border-radius: 8px;
text-align: center;
line-height: 30px;
color: #fff;
margin-left: 8px;
}
}
.product_list__item--con {
background-color: #fff;
padding: 24px 32px 18px 32px;
box-sizing: border-box;
margin-bottom: 8px;
}
}
}

24
src/pages/codeList/components/colorItemSetting/index.tsx Normal file
View File

@ -0,0 +1,24 @@
import { Text, View } from '@tarojs/components'
import SettingNumber from '../settingNumber'
import ProductItem from '../productItem'
import styles from './index.module.scss'
import IconFont from '@/components/iconfont/iconfont'
import LabAndImg from '@/components/LabAndImg'
export default () => {
return <>
<View className={styles.product_list}>
<View className={styles.product_list__item}>
<View className={styles['product_list__item--title']}>
<Text className={styles.product_title}>5215# 26S双纱亲水滑爽棉</Text>
<IconFont name="icon-shuru" size={50} />
<Text className={styles.mode_status}>大货</Text>
</View>
{new Array(5).fill('').map((item, index) => <View key={index} className={styles['product_list__item--con']}>
<ProductItem />
<SettingNumber />
</View>)}
</View>
</View>
</>
}

43
src/pages/codeList/components/colorSetting/index.module.scss Normal file
View File

@ -0,0 +1,43 @@
.product_list {
width: 702px;
background: #ffffff;
border-radius: 16px;
margin-top: 24px;
padding: 0 32px 32px 32px;
box-sizing: border-box;
.product_list__item {
.product_list__item--title {
height: 82px;
font-size: 28px;
display: flex;
justify-content: space-between;
color: #000000;
align-items: center;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
.product_title {
margin-right: 8px;
}
.mode_status {
width: 60px;
height: 30px;
font-size: 20px;
background: #337fff;
border-radius: 8px;
text-align: center;
line-height: 30px;
color: #fff;
margin-left: 8px;
}
.con {
display: flex;
align-items: center;
}
.update {
display: flex;
align-items: center;
color: #337fffff;
font-size: 28px;
}
}
}
}

27
src/pages/codeList/components/colorSetting/index.tsx Normal file
View File

@ -0,0 +1,27 @@
import { Text, View } from '@tarojs/components'
import ProductItem from '../productItem'
import styles from './index.module.scss'
import IconFont from '@/components/iconfont/iconfont'
import LabAndImg from '@/components/LabAndImg'
import { goLink } from '@/common/common'
export default () => {
return <>
<View className={styles.product_list}>
<View className={styles.product_list__item}>
<View className={styles['product_list__item--title']}>
<View className={styles.con}>
<Text className={styles.product_title}>5215# 26S双纱亲水滑爽棉</Text>
<IconFont name="icon-shuru" size={50} />
<Text className={styles.mode_status}>大货</Text>
</View>
<View className={styles.update} onClick={() => goLink('/pages/codeList/codeColorList/index')}>
<Text>编辑</Text>
<IconFont name="icon-rukou" size={35} />
</View>
</View>
{new Array(5).fill('').map((item, index) => <View key={index}><ProductItem /></View>)}
</View>
</View>
</>
}

26
src/pages/codeList/components/payeeHead/selectList/index.tsx
View File

@ -3,22 +3,24 @@ import classNames from 'classnames'
import { memo, useCallback, useEffect, useState } from 'react'
import styles from './index.module.scss'
export type SelectStatus = 1|2|3
interface Param {
selectIndex: 1|2|3
defaultIndex?: SelectStatus
onSelect?: (val: number) => void
}
export default memo((props: Param) => {
const { selectIndex = 1 } = props
const [index, setIndex] = useState(1)
const { defaultIndex = 1, onSelect } = props
const [selectIndex, setSelectIndex] = useState(1)
useEffect(() => {
if (selectIndex != index) { setIndex(() => props.selectIndex) }
}, [selectIndex])
const getSelect = (index) => {
setIndex(() => index)
}
return <View className={styles.select_list} onClick={getSelect}>
<View onClick={() => getSelect(1)} className={classNames(styles.select_list_item, index === 1 && styles.select_list_ed)}><Text>按整单</Text></View>
<View onClick={() => getSelect(2)} className={classNames(styles.select_list_item, index === 2 && styles.select_list_ed)}><Text>按面料</Text></View>
<View onClick={() => getSelect(3)} className={classNames(styles.select_list_item, index === 3 && styles.select_list_ed)}><Text>按颜色</Text></View>
if (defaultIndex != selectIndex) { setSelectIndex(() => defaultIndex) }
}, [defaultIndex])
const getSelect = useCallback((index) => {
setSelectIndex(() => index)
onSelect?.(index)
}, [])
return <View className={styles.select_list} >
<View onClick={() => getSelect(1)} className={classNames(styles.select_list_item, selectIndex == 1 && styles.select_list_ed)}><Text>按整单</Text></View>
<View onClick={() => getSelect(2)} className={classNames(styles.select_list_item, selectIndex == 2 && styles.select_list_ed)}><Text>按面料</Text></View>
<View onClick={() => getSelect(3)} className={classNames(styles.select_list_item, selectIndex == 3 && styles.select_list_ed)}><Text>按颜色</Text></View>
</View>
})

1
src/pages/codeList/components/productItem/index.tsx
View File

@ -19,5 +19,6 @@ export default () => {
<View className={styles.item_specs_new}>重量:400.5kg｜空差: 50.5k｜单价：¥100.0/kg</View>
<View className={styles.item_specs_old}>重量:400.5kg｜空差: 50.5k｜单价：¥100.0/kg</View>
</View>
<View className="common_ellipsis"></View>
</View>
}

11
src/pages/codeList/components/wholeOrderSetting/index.module.scss
View File

@ -3,7 +3,7 @@
background: #ffffff;
border-radius: 16px;
margin-top: 24px;
padding: 0 32px 32px 32px;
padding: 0 32px 0 32px;
box-sizing: border-box;
.product_list__item {
.product_list__item--title {
@ -28,5 +28,14 @@
margin-left: 8px;
}
}
.up_btn {
width: 100%;
height: 72px;
display: flex;
justify-content: center;
align-items: center;
font-size: 28px;
color: rgba(0, 0, 0, 0.4);
}
}
}

6
src/pages/codeList/components/wholeOrderSetting/index.tsx
View File

@ -15,8 +15,12 @@ export default () => {
<IconFont name="icon-shuru" size={50} />
<Text className={styles.mode_status}>大货</Text>
</View>
{new Array(5).fill('').map((item, index) => <View key={index}><ProductItem /></View>)}
<View className={styles['product_list__item--con']}>
{new Array(5).fill('').map((item, index) => <View key={index}><ProductItem /></View>)}
</View>
<View className={styles.up_btn}>收起<IconFont name="icon-shangla" size={35} /></View>
</View>
</View>
</>
}

1
src/pages/codeList/index.module.scss
View File

@ -5,6 +5,7 @@
.code_list__head {
background-color: #fff;
padding: 24px;
box-sizing: border-box;
}
.code_list_con {
padding: 0 24px;

18
src/pages/codeList/index.tsx
View File

@ -1,27 +1,35 @@
import { Text, View } from '@tarojs/components'
import classnames from 'classnames'
import { useCallback, useState } from 'react'
import styles from './index.module.scss'
import PayeeHead from './components/payeeHead'
import type { SelectStatus } from './components/payeeHead/selectList'
import SelectList from './components/payeeHead/selectList'
import Counter from './components/counter'
import SettingNumber from './components/settingNumber'
import WholeOrder from './components/wholeOrderSetting'
import WholeOrderSetting from './components/wholeOrderSetting'
import BottomBtn from './components/bottomBtn'
import ProductSetting from './components/productSetting'
import ColorSetting from './components/colorSetting'
import useLogin from '@/use/useLogin'
import IconFont from '@/components/iconfont/iconfont'
import LabAndImg from '@/components/LabAndImg'
export default () => {
useLogin()
const [modeIndex, setModeIndex] = useState<SelectStatus>(1)
const getTypeSelect = useCallback((index) => {
console.log('index::', index)
setModeIndex(index)
}, [])
return <View className={styles.code_list__main}>
<View className={styles.code_list__head}>
<PayeeHead />
</View>
<SelectList />
<SelectList onSelect={getTypeSelect} />
<View className={styles.code_list_con}>
{/* <WholeOrder /> */}
<ProductSetting />
{modeIndex == 1 && <WholeOrderSetting />}
{modeIndex == 2 && <ProductSetting />}
{modeIndex == 3 && <ColorSetting />}
<View className={styles.code_des}>
<View className={styles.code_des_title}>自定义单据信息</View>
<View className={styles.code_des_item}>

1
src/pages/order/components/payment/index.tsx
View File

@ -197,7 +197,6 @@ const Payment = ({ show = false, onClose, orderInfo, onSubmitSuccess }: Param) =
<View className={styles.payment_con}>
{/* <View className={classnames('iconfont icon-a-moreback', styles.miconfont_title)} onClick={onClose}></View> */}
<View className={styles.title}>待支付款项</View>
{payInfo?.delivery_payment_name && <View className={styles.playMode}>已使用{payInfo?.delivery_payment_name}方式付款</View>}
<View className={styles.payment_list}>
<View className={styles.amount}>

3
src/use/usePayBank.ts
View File

@ -16,7 +16,7 @@ export default (props: Param) => {
console.log('openstatus::', openStatus)
useEffect(() => {
Taro.onAppShow((res) => {
if (res?.referrerInfo?.appId == BANk_WX_APPID && !openStatus.current && props.custMerchId) {
if (res?.referrerInfo?.appId == BANk_WX_APPID && props.custMerchId) {
console.log('onAppShow::', res)
callBack?.(res)
const tf = res?.referrerInfo?.extraData?.payStatus == 'success'
@ -39,7 +39,6 @@ export default (props: Param) => {
},
success(res) { // 打开成功的回调函数
console.log('打开成功::', res)
openStatus.current = false
},
fail(res) {
console.log('打开失败::', res)