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

🎈 perf(下单返现): 优化下单返现功能和修复bug

Browse Source
This commit is contained in:
xuan 2023-03-10 20:40:33 +08:00
parent 601457e5cb
commit 800ae53cf9
7 changed files with 64 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/constant.ts
View File

@ -1,4 +1,4 @@
// export const BASE_URL = CURRENT_BASE_URL export const BASE_URL = CURRENT_BASE_URL
// export const BASE_URL = `http://192.168.0.75:50001/lymarket` // export const BASE_URL = `http://192.168.0.75:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:50001/lymarket` // export const BASE_URL = `http://192.168.0.89:50001/lymarket`
// export const BASE_URL = `http://10.0.0.5:50001/lymarket` // export const BASE_URL = `http://10.0.0.5:50001/lymarket`
@ -14,7 +14,7 @@
// export const BASE_URL = `http://192.168.1.5:40001/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:50001/lymarket' // 婷 // export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷
export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰
// CDN // CDN
// 生成密钥 // 生成密钥

4
src/components/moveBtn/index.module.scss
View File

@ -1,6 +1,10 @@
.movableItem { .movableItem {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden;
display: flex;
overflow: hidden;
flex-flow: column nowrap;
} }
.moveBtn { .moveBtn {
width: 100px; width: 100px;

21
src/pages/order/comfirm.module.scss
View File

@ -1,9 +1,21 @@
page {
height: 100vh;
display: flex;
flex-flow: column nowrap;
}
.order_main { .order_main {
min-height: 100%;
background-color: $color_bg_one; background-color: $color_bg_one;
padding: 20px;
padding-bottom: 190px;
box-sizing: border-box; box-sizing: border-box;
display: flex;
flex-flow: column nowrap;
overflow: hidden;
.order_content {
flex: 1 1 auto;
overflow: scroll;
display: flex;
flex-flow: column nowrap;
overflow-y: scroll;
}
.topBox { .topBox {
background: #fffbe7; background: #fffbe7;
width: 100%; width: 100%;
@ -101,9 +113,6 @@
} }
.submit_order { .submit_order {
display: flex; display: flex;
position: fixed;
bottom: 0;
left: 0;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
height: 175px; height: 175px;

33
src/pages/order/comfirm.tsx
View File

@ -186,20 +186,28 @@ const Comfirm = () => {
return ( return (
<MoveBtn showList={['customer']}> <MoveBtn showList={['customer']}>
<View className={styles.order_main}> <View className={styles.order_main}>
{ <View className={styles.order_content}>
preViewOrder?.notice !== '' && <View className={styles.topBox}> {
<View className={styles.flexBox}> preViewOrder?.notice !== '' && <View className={styles.topBox}>
<View className={styles.gan}>!</View> <View className={styles.flexBox}>
<View className={styles.ganFont}>{preViewOrder?.notice}</View> <View className={styles.gan}>!</View>
<View className={styles.ganFont}>{preViewOrder?.notice}</View>
</View>
</View>
}
<View style={{ margin: '20rpx', marginBottom: '0' }}>
<AddressInfoDetail orderInfo={defaultAddress} onSelect={getAddress} onChangeShipmentMode={selectShipmentMode} status={1} />
</View>
<View style={{ margin: '20rpx', marginTop: '0' }}>
<KindList order={formatPreViewOrderMemo} comfirm />
</View>
<View style={{ margin: '20rpx' }}>
<View className={styles.order_desc} onClick={() => setShowDesc(true)}>
<View className={styles.order_desc_con}>订单备注</View>
{(submitOrderData?.remark && <View className={styles.order_desc_text}>{submitOrderData?.remark}</View>) || <View className={styles.order_desc_text_hint}>填写备注</View>}
<View className={classnames(styles.miconfont, 'iconfont icon-a-moreback')}></View>
</View> </View>
</View> </View>
}
<AddressInfoDetail orderInfo={defaultAddress} onSelect={getAddress} onChangeShipmentMode={selectShipmentMode} status={1} />
<KindList order={formatPreViewOrderMemo} comfirm />
<View className={styles.order_desc} onClick={() => setShowDesc(true)}>
<View className={styles.order_desc_con}>订单备注</View>
{(submitOrderData?.remark && <View className={styles.order_desc_text}>{submitOrderData?.remark}</View>) || <View className={styles.order_desc_text_hint}>填写备注</View>}
<View className={classnames(styles.miconfont, 'iconfont icon-a-moreback')}></View>
</View> </View>
<View className={styles.submit_order}> <View className={styles.submit_order}>
<View className={styles.submit_order_number}> <View className={styles.submit_order_number}>
@ -217,7 +225,6 @@ const Comfirm = () => {
<Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}> <Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}>
<Remark defaultValue={submitOrderData?.remark} onSave={e => getRemark(e)} /> <Remark defaultValue={submitOrderData?.remark} onSave={e => getRemark(e)} />
</Popup> </Popup>
<View className="common_safe_area_y"></View>
</View> </View>
</MoveBtn> </MoveBtn>
) )

3
src/pages/order/orderList/components/order/index.tsx
View File

@ -13,6 +13,7 @@ import { useSelector } from '@/reducers/hooks'
interface Param { interface Param {
value: { value: {
bill_total_sale_price: number
order_no: string order_no: string
sale_mode: number sale_mode: number
sale_mode_name: string sale_mode_name: string
@ -154,7 +155,7 @@ const Order = ({ value, onClickBtn }: Param) => {
<Text>{numText}</Text> <Text>{numText}</Text>
<Text className={styles.price}> <Text className={styles.price}>
<Text>¥</Text> <Text>¥</Text>
{value.total_sale_price ? formatPriceDiv(value.total_sale_price, 100, true) : formatPriceDiv(value.estimate_amount, 100, true)} {formatPriceDiv(value.bill_total_sale_price, 100, true)}
</Text> </Text>
</View> </View>
</View> </View>

33
src/pages/order/speedComfirm.tsx
View File

@ -216,20 +216,28 @@ const SpeedComfirm = () => {
return ( return (
<MoveBtn showList={['customer']}> <MoveBtn showList={['customer']}>
<View className={styles.order_main}> <View className={styles.order_main}>
{ <View className={styles.order_content}>
preViewOrder?.notice !== '' && <View className={styles.topBox}> {
<View className={styles.flexBox}> preViewOrder?.notice !== '' && <View className={styles.topBox}>
<View className={styles.gan}>!</View> <View className={styles.flexBox}>
<View className={styles.ganFont}>{preViewOrder?.notice}</View> <View className={styles.gan}>!</View>
<View className={styles.ganFont}>{preViewOrder?.notice}</View>
</View>
</View>
}
<View style={{ margin: '20rpx' }}>
<AddressInfoDetail orderInfo={defaultAddress} onSelect={getAddress} onChangeShipmentMode={selectShipmentMode} status={1} />
</View>
<View style={{ margin: '20rpx', marginTop: '0' }}>
<KindList order={formatPreViewOrderMemo} comfirm />
</View>
<View style={{ margin: '20rpx' }}>
<View className={styles.order_desc} onClick={() => setShowDesc(true)}>
<View className={styles.order_desc_con}>订单备注</View>
{(submitOrderData?.remark && <View className={styles.order_desc_text}>{submitOrderData?.remark}</View>) || <View className={styles.order_desc_text_hint}>填写备注</View>}
<IconFont name="icon-rukou" size={28} color="#474747"></IconFont>
</View> </View>
</View> </View>
}
<AddressInfoDetail orderInfo={defaultAddress} onSelect={getAddress} onChangeShipmentMode={selectShipmentMode} status={1} />
<KindList order={formatPreViewOrderMemo} comfirm />
<View className={styles.order_desc} onClick={() => setShowDesc(true)}>
<View className={styles.order_desc_con}>订单备注</View>
{(submitOrderData?.remark && <View className={styles.order_desc_text}>{submitOrderData?.remark}</View>) || <View className={styles.order_desc_text_hint}>填写备注</View>}
<IconFont name="icon-rukou" size={28} color="#474747"></IconFont>
</View> </View>
<View className={styles.submit_order}> <View className={styles.submit_order}>
<View className={styles.submit_order_number}> <View className={styles.submit_order_number}>
@ -247,7 +255,6 @@ const SpeedComfirm = () => {
<Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}> <Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)}>
<Remark defaultValue={submitOrderData?.remark} onSave={e => getRemark(e)} /> <Remark defaultValue={submitOrderData?.remark} onSave={e => getRemark(e)} />
</Popup> </Popup>
<View className="common_safe_area_y"></View>
</View> </View>
</MoveBtn> </MoveBtn>
) )

2
src/pages/user/index.tsx
View File

@ -188,7 +188,7 @@ export default () => {
<View className={styles.earnings_con}> <View className={styles.earnings_con}>
<View className={styles.earnings_price}> <View className={styles.earnings_price}>
<Text className={styles.earnings_title}>活动返现收益（元）</Text> <Text className={styles.earnings_title}>活动返现收益（元）</Text>
<View className={styles.earnings_total}><Text>¥</Text> <Text className={styles.all_earnings}>{formatPriceDiv(state.data.total_income, 100, true)}</Text> <View className={styles.today_earnings}>今日收益 {formatPriceDiv(state.data.today_income, 100, true)}</View></View> <View className={styles.earnings_total}><Text>¥</Text> <Text className={styles.all_earnings}>{formatPriceDiv(state.data.total_income, 100, true)}</Text> <View className={styles.today_earnings}>昨日收益 {formatPriceDiv(state.data.today_income, 100, true)}</View></View>
</View> </View>
<View className={styles.more} onClick={() => goLink('/pages/activityIncome/index')}><Text>查看收益</Text><IconFont name="icon-rukou" size={30} /></View> <View className={styles.more} onClick={() => goLink('/pages/activityIncome/index')}><Text>查看收益</Text><IconFont name="icon-rukou" size={30} /></View>
</View> </View>