diff --git a/iconfont.json b/iconfont.json index ac9a6ae..f6c3387 100644 --- a/iconfont.json +++ b/iconfont.json @@ -1,5 +1,5 @@ { - "symbol_url": "//at.alicdn.com/t/c/font_3786318_zkugv9z8j0e.js", + "symbol_url": "//at.alicdn.com/t/c/font_3786318_9p9bgzmjvv.js", "save_dir": "./src/components/iconfont", "use_typescript": false, "use_rpx": true, diff --git a/project.private.config.json b/project.private.config.json index 26a50a2..ac3660c 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -49,4 +49,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/api/shopCart.ts b/src/api/shopCart.ts index 7fe6f4d..af1df9a 100644 --- a/src/api/shopCart.ts +++ b/src/api/shopCart.ts @@ -28,7 +28,7 @@ export const AddShoppingCartApi = () => { */ export const MallsaleOrderadd = () => { return useRequest({ - url: '/v1/mall/saleOrder/add', + url: '/v3/mallCherry/saleOrder/atOnceAdd', method: 'post', }) } diff --git a/src/api/user.ts b/src/api/user.ts index 79e5665..0f18a89 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -142,3 +142,19 @@ export const GetInviteeRecord = () => { pagination: true, }) } + +// 下单返现 +export const GetCashBackInfo = () => { + return useRequest({ + url: '/v3/mallCherry/rebate/homePage', + method: 'get', + }) +} + +// 下单返现详情 +export const GetRebateDetail = () => { + return useRequest({ + url: '/v3/mallCherry/rebate/detail', + method: 'get', + }) +} diff --git a/src/common/enum.ts b/src/common/enum.ts index 8e88834..8740174 100644 --- a/src/common/enum.ts +++ b/src/common/enum.ts @@ -41,6 +41,11 @@ export const SALE_MODE = { SaleModeLengthCut: { value: 1, label: '剪版' }, SaLeModeWeightCut: { value: 2, label: '散剪' }, } +export enum ENUM_SALE_MODE { + SALE_MODE_BULK, + SALE_MODE_LENGTH_CUT, + SALE_MODE_WEIGHT_CUT, +} export type saleModeType = 0 | 1 | 2 // 分享场景枚举 diff --git a/src/components/iconfont/iconfont.tsx b/src/components/iconfont/iconfont.tsx index fa4d39c..7c6a893 100644 --- a/src/components/iconfont/iconfont.tsx +++ b/src/components/iconfont/iconfont.tsx @@ -24,7 +24,7 @@ function hex2rgb(hex) { return "rgb(" + rgb.join(",") + ")"; } -export type IconNames = 'icon-lijitixian' | 'icon-hongbao' | 'icon-xuanzhongshijian' | 'icon-zhankai1' | 'icon-shouqi1' | 'icon-shoucang1' | 'icon-weixinyijiandenglu' | 'icon-nanzhuang' | 'icon-zhuanyefenlei' | 'icon-tongzhuang' | 'icon-chaoliumianliao' | 'icon-nvzhuang' | 'icon-dingwei' | 'icon-xuanzhongyanse' | 'icon-sekajianyanglingqu' | 'icon-lingseka' | 'icon-lingjianyang' | 'icon-gerenzhongxin-dianji' | 'icon-shouye-dianji' | 'icon-gouwuche-weidianji' | 'icon-gerenzhongxin-weidianji' | 'icon-gouwuche-dianji' | 'icon-shouye-weidianji' | 'icon-paixu1' | 'icon-zhankai' | 'icon-shouqi' | 'icon-tips' | 'icon-dianhua' | 'icon-paixu' | 'icon-shaixuan' | 'icon-bodakehujingli' | 'icon-guanfangweixinkefu' | 'icon-tuijianbiaoqian' | 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-wodekefu' | 'icon-yanseduibi' | 'icon-dizhiguanli' | 'icon-weixin' | 'icon-riqi' | 'icon-shuru' | 'icon-a-0tianzhangqi' | 'icon-huodaofukuan' | 'icon-huozhuziti' | 'icon-saomazhifu' | 'icon-xianxiahuikuan' | 'icon-yufukuan' | 'icon-xinzengshoucangjia' | 'icon-qingchusousuo' | 'icon-xuanzechenggong' | 'icon-gongnengtubiao-saomiao' | 'icon-bianjizidingyimadan' | 'icon-zidingyimadanyulan' | 'icon-yuanshimadanyulan' | 'icon-xiala' | 'icon-shangla' | 'icon-qingchuxinxi' | 'icon-sousuo' | 'icon-guanli' | 'icon-bianji' | 'icon-shoucangjia' | 'icon-shezhi' | 'icon-tishi' | 'icon-erweima' | 'icon-dianjishoucang' | 'icon-gouwuche' | 'icon-shoucangchenggong' | 'icon-fenxiangshangpin' | 'icon-kefu' | 'icon-xinzenganniu' | 'icon-jianshaoanniu' | 'icon-daifahuo2' | 'icon-daishouhuo2' | 'icon-tuikuan-shouhou' | 'icon-daipeibu2' | 'icon-daifukuan2'; +export type IconNames = 'icon-yanseduibi1' | 'icon-shoucangshangpin' | 'icon-lijitixian' | 'icon-hongbao' | 'icon-xuanzhongshijian' | 'icon-zhankai1' | 'icon-shouqi1' | 'icon-shoucang1' | 'icon-weixinyijiandenglu' | 'icon-nanzhuang' | 'icon-zhuanyefenlei' | 'icon-tongzhuang' | 'icon-chaoliumianliao' | 'icon-nvzhuang' | 'icon-dingwei' | 'icon-xuanzhongyanse' | 'icon-sekajianyanglingqu' | 'icon-lingseka' | 'icon-lingjianyang' | 'icon-gerenzhongxin-dianji' | 'icon-shouye-dianji' | 'icon-gouwuche-weidianji' | 'icon-gerenzhongxin-weidianji' | 'icon-gouwuche-dianji' | 'icon-shouye-weidianji' | 'icon-paixu1' | 'icon-zhankai' | 'icon-shouqi' | 'icon-tips' | 'icon-dianhua' | 'icon-paixu' | 'icon-shaixuan' | 'icon-bodakehujingli' | 'icon-guanfangweixinkefu' | 'icon-tuijianbiaoqian' | 'icon-rukou' | 'icon-renzhengchenggong' | 'icon-wodekefu' | 'icon-yanseduibi' | 'icon-dizhiguanli' | 'icon-weixin' | 'icon-riqi' | 'icon-shuru' | 'icon-a-0tianzhangqi' | 'icon-huodaofukuan' | 'icon-huozhuziti' | 'icon-saomazhifu' | 'icon-xianxiahuikuan' | 'icon-yufukuan' | 'icon-xinzengshoucangjia' | 'icon-qingchusousuo' | 'icon-xuanzechenggong' | 'icon-gongnengtubiao-saomiao' | 'icon-bianjizidingyimadan' | 'icon-zidingyimadanyulan' | 'icon-yuanshimadanyulan' | 'icon-xiala' | 'icon-shangla' | 'icon-qingchuxinxi' | 'icon-sousuo' | 'icon-guanli' | 'icon-bianji' | 'icon-shoucangjia' | 'icon-shezhi' | 'icon-tishi' | 'icon-erweima' | 'icon-dianjishoucang' | 'icon-gouwuche' | 'icon-shoucangchenggong' | 'icon-fenxiangshangpin' | 'icon-kefu' | 'icon-xinzenganniu' | 'icon-jianshaoanniu' | 'icon-daifahuo2' | 'icon-daishouhuo2' | 'icon-tuikuan-shouhou' | 'icon-daipeibu2' | 'icon-daifukuan2'; type PropsType = { name: IconNames; @@ -84,7 +84,13 @@ const IconFont:FC = ({ className={classnames(icon, customClassName)} /> )} */} - {/* icon-lijitixian */} + {/* icon-yanseduibi1 */} + + { name === 'icon-yanseduibi1' && () } +{/* icon-shoucangshangpin */} + + { name === 'icon-shoucangshangpin' && () } +{/* icon-lijitixian */} { name === 'icon-lijitixian' && () } {/* icon-hongbao */} diff --git a/src/pages/activityIncome/index.module.scss b/src/pages/activityIncome/index.module.scss index 9566e69..3e01f3c 100644 --- a/src/pages/activityIncome/index.module.scss +++ b/src/pages/activityIncome/index.module.scss @@ -51,12 +51,8 @@ display: flex; flex-direction: column; justify-content: center; - border-top: 1px #fff solid; padding-left: 48px; box-sizing: border-box; - &:nth-child(1) { - border-right: 1px #fff solid; - } text { display: block; &:nth-child(2) { @@ -80,12 +76,12 @@ font-weight: 500; padding-top: 40px; .text { + display: flex; + flex-flow: row nowrap; + align-items: center; font-size: 28px; font-weight: 500; } - .miconfont { - font-size: 30px; - } .price { font-size: 66px; margin-top: 16px; diff --git a/src/pages/activityIncome/index.tsx b/src/pages/activityIncome/index.tsx index 4b4c573..0023131 100644 --- a/src/pages/activityIncome/index.tsx +++ b/src/pages/activityIncome/index.tsx @@ -1,11 +1,14 @@ import { Icon, Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' +import Taro, { useReady } from '@tarojs/taro' import classNames from 'classnames' import { useState } from 'react' import styles from './index.module.scss' import IconFont from '@/components/iconfont/iconfont' import { alert } from '@/common/common' +import { GetRebateDetail } from '@/api/user' +import { formatPriceDiv } from '@/common/fotmat' +import Divider from '@/components/divider' export default () => { const openMsg = () => { @@ -13,22 +16,29 @@ export default () => { title: '提示', showCancel: false, content: '每笔订单产生的返佣，在已收货14天后会自动到账账户余额中，期间中途产生的退货条数会自动扣除，每天9:00自动更新收益。', - success(res) { - }, + confirmColor: '#337fff', + confirmText: '我知道了', }) } const openWithdraw = () => { alert.none('若需提现，请联系线上客服进行处理') } + + const { fetchData, state } = GetRebateDetail() + + useReady(() => { + fetchData() + }) + return ( - 账户余额(元） - 20,330.00 - 累计收益20,330.00元 + 账户余额（元） + {formatPriceDiv(state.data.balance).toLocaleString()} + 累计收益{formatPriceDiv(state.data.total_income).toLocaleString()}元 @@ -36,21 +46,26 @@ export default () => { + - 今日收益(元） - 5,000.00 + 今日收益（元） + {formatPriceDiv(state.data.today_income).toLocaleString()} + - 近14日收益(元） - 5,000.00 + 近14日收益（元） + {formatPriceDiv(state.data.recently_fourteen_day_income).toLocaleString()} - 待结算收益(元) - 180.00 + + 待结算收益（元） + + + {formatPriceDiv(state.data.wait_settle_income).toLocaleString()} @@ -59,11 +74,11 @@ export default () => { - 10条 + {state.data.wait_settle_bulk_roll}条 大货条数 - 120元 + {formatPriceDiv(state.data.wait_settle_bulk_income).toLocaleString()}元 大货收益 @@ -75,20 +90,20 @@ export default () => { - 10条 + {state.data.passive_wait_settle_bulk_roll}条 大货条数 - 120元 + {formatPriceDiv(state.data.passive_wait_settle_bulk_income).toLocaleString()}元 大货收益 - 120元 - 大货收益 + {state.data.passive_wait_settle_user_nums}元 + 下单用户 - 120元 - 大货收益 + {state.data.passive_wait_settle_bulk_order_nums}元 + 订单数量 diff --git a/src/pages/order/components/addressInfoDetail/index.module.scss b/src/pages/order/components/addressInfoDetail/index.module.scss index 6774697..1bdc18b 100644 --- a/src/pages/order/components/addressInfoDetail/index.module.scss +++ b/src/pages/order/components/addressInfoDetail/index.module.scss @@ -59,14 +59,15 @@ .updateBtn { width: 200px; font-size: $font_size_min; - background-color: #f0f0f0; + // background-color: #f0f0f0; height: 64px; - border-radius: 24px; + // border-radius: 24px; color: $color_font_two; position: absolute; bottom: 10px; right: 10px; z-index: 999; + display: flex; .updateBtn_list { position: absolute; display: flex; @@ -77,14 +78,17 @@ } } .updateBtn_item { + display: flex; + align-items: center; flex: 1; text-align: center; line-height: 64px; + color: #666666; } .updateBtn_item_select_update { - background-color: #007aff; - color: #fff; - border-radius: 24px; + // background-color: #007aff; + color: #007aff; + // border-radius: 24px; } .updateBtn_select { color: #fff; diff --git a/src/pages/order/components/addressInfoDetail/index.tsx b/src/pages/order/components/addressInfoDetail/index.tsx index 45a1573..2441adf 100644 --- a/src/pages/order/components/addressInfoDetail/index.tsx +++ b/src/pages/order/components/addressInfoDetail/index.tsx @@ -11,6 +11,7 @@ import { ORDER_STATUS } from '@/common/enum' import { debounce, throttle } from '@/common/util' import AddressList from '@/components/AddressList' import Popup from '@/components/popup' +import IconFont from '@/components/iconfont/iconfont' interface Param { onSelect?: (val: any) => void // 选择地址 @@ -180,11 +181,21 @@ const AddressInfoDetail = ({ onSelect, onChangeShipmentMode, orderInfo, status = useImperativeHandle(ref, () => ({ changeShow, })) + + const handleTips = (e) => { + e.stopPropagation() + Taro.showToast({ title: '暂不支持提货', icon: 'none' }) + } + return ( - changeShow()}> - - + + + { + receivingStatus == 2 ? : + } + + changeShow()} className={styles.order_address_text_con}> {formatAddress || '请选择收货地址及信息'} {receivingStatus == 2 && !logisticsShow && } @@ -196,11 +207,18 @@ const AddressInfoDetail = ({ onSelect, onChangeShipmentMode, orderInfo, status = {(!logisticsShow && ( + + 自提 + + onReceivingStatus(2, e)} > - 物流 + 物流 {/* { // 对应数量 const formatCount = useCallback( (item) => { - return order?.sale_mode == 0 ? item.roll : Number(item.length / 100) + return order?.sale_mode === ENUM_SALE_MODE.SALE_MODE_BULK ? item.roll : Number(item.length / 100) }, [order], ) // 对应单价 const standardPrice = useCallback( (price) => { - return `${formatPriceDiv(price)}/${order?.sale_mode == 1 ? 'm' : 'kg'}` + return `${formatPriceDiv(price)}/${order?.sale_mode === ENUM_SALE_MODE.SALE_MODE_LENGTH_CUT ? 'm' : 'kg'}` }, [order], ) @@ -143,7 +145,7 @@ const KindList = ({ order, comfirm = false }: Param) => { // 数量格式 const numText = useMemo(() => { if (order) { - const total_number = order?.sale_mode == 0 ? order?.total_number : order?.total_number / 100 + const total_number = order?.sale_mode === ENUM_SALE_MODE.SALE_MODE_BULK ? order?.total_number : order?.total_number / 100 return `${order?.total_fabrics} 种面料，${order?.total_colors} 种颜色，共 ${total_number} ${order?.unit}` } }, [order]) @@ -189,15 +191,21 @@ const KindList = ({ order, comfirm = false }: Param) => { [order], ) + const showCashBackInfo = useMemo(() => { + return order?.sale_mode === ENUM_SALE_MODE.SALE_MODE_BULK && order?.is_open_rebate + }, [order?.sale_mode, order?.is_open_rebate]) + const [returnCashShow, setReturnCashShow] = useState(false) return ( <> {numText} - - setReturnCashShow(true)}> - 大货订单，此单预估返现 48 元 - + + { + showCashBackInfo && setReturnCashShow(true)}> + 大货订单，此单预估返现 {formatPriceDiv(order?.rebate_money).toLocaleString()} 元 + + } {order?.list?.map((item) => { return ( diff --git a/src/pages/order/speedComfirm.tsx b/src/pages/order/speedComfirm.tsx index 5496cc8..e41d1e5 100644 --- a/src/pages/order/speedComfirm.tsx +++ b/src/pages/order/speedComfirm.tsx @@ -18,6 +18,7 @@ import { UseSubscriptionMessage } from '@/use/useCommon' import { throttle } from '@/common/util' import MoveBtn from '@/components/moveBtn' import { MallsaleOrderadd, SaleOrderpreView } from '@/api/shopCart' +import IconFont from '@/components/iconfont/iconfont' const SpeedComfirm = () => { const router = useRouter() @@ -76,6 +77,8 @@ const SpeedComfirm = () => { setFormatPreViewOrder({ estimate_amount: preViewOrder.estimate_amount, // 预估金额 sale_mode: preViewOrder.sale_mode, + is_open_rebate: preViewOrder.is_open_rebate, + rebate_money: preViewOrder.rebate_money, sale_mode_name: preViewOrder.sale_mode_name, total_colors: preViewOrder.total_colors, // 总颜色数量 total_number: preViewOrder.total_number, // 总数量 @@ -226,7 +229,7 @@ const SpeedComfirm = () => { setShowDesc(true)}> 订单备注 {(submitOrderData?.remark && {submitOrderData?.remark}) || 填写备注} - + diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss index fb4ed98..e595454 100644 --- a/src/pages/user/index.module.scss +++ b/src/pages/user/index.module.scss @@ -53,7 +53,7 @@ flex-direction: column; flex: 1; position: relative; - .header_user{ + .header_user { display: flex; align-items: center; } @@ -67,7 +67,7 @@ } .header_user_name { font-size: 36px; - font-weight: 500; + font-weight: 550; } .arcd-info-left-phone { position: relative; @@ -321,6 +321,7 @@ height: 136px; box-shadow: 0px 0px 9px 0px rgba(202, 214, 255, 0.49); box-sizing: border-box; + background: url('https://cdn.zzfzyc.com/mall/cash_back_bar.png') center center no-repeat; .earnings_price { .earnings_title { font-size: 24px; @@ -337,9 +338,9 @@ font-weight: bold; } .today_earnings { - width: 159px; height: 38px; font-size: 22px; + padding: 0 10px; background: linear-gradient(270deg, #6798ff 0%, #4581ff 100%); border-radius: 8px; color: #fff; diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index a4de480..8626abc 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -12,6 +12,7 @@ import useLogin from '@/use/useLogin' import IconFont from '@/components/iconfont/iconfont' import SvgIconfont from '@/components/svgIconfont' import { BASE_URL, getCDNSource } from '@/common/constant' +import { GetCashBackInfo } from '@/api/user' export default () => { const userInfo = useSelector(state => state.userInfo) @@ -19,8 +20,11 @@ export default () => { const { fetchData: ApigetTotal, state: orderState } = userorderStatistics() const { getAdminUserInfo, getPhoneNumber } = useLogin() + const { fetchData, state } = GetCashBackInfo() + useDidShow(() => { ApigetTotal() + fetchData() getAdminUserInfo() Apiassets() }) @@ -60,7 +64,7 @@ export default () => { { label: '地址管理', icon: 'icon-dizhiguanli', callback: () => goLink('/pages/addressManager/index') }, { label: '码单管理', icon: 'icon-mdgl', icon_status: 'local', callback: () => goLink('/pages/codeList/index') }, { label: '色卡剪样', icon: 'icon-sekajianyanglingqu', callback: () => goLink('/pages/colorCardClipping/index') }, - { label: '颜色对比', icon: 'icon-yanseduibi', callback: () => goLink('/pages/sampleComparison/index') }, + // { label: '颜色对比', icon: 'icon-yanseduibi', callback: () => goLink('/pages/sampleComparison/index') }, { label: '我的客服', icon: 'icon-wodekefu', text: '7x24小时服务', callback: () => (set_customer_service_show(true)) }, ] @@ -77,7 +81,8 @@ export default () => { } const integral = () => { - alert.none('【积分】暂未对外开放 敬请期待') + // alert.none('【积分】暂未对外开放 敬请期待') + goLink('/pages/sampleComparison/index') } usePullDownRefresh(async() => { @@ -110,7 +115,7 @@ export default () => { - {userInfo?.adminUserInfo?.phone ? userInfo?.adminUserInfo?.user_name : '点击登录'} + {userInfo?.adminUserInfo?.phone ? userInfo?.adminUserInfo?.company_name : '点击登录'} { userInfo?.adminUserInfo?.is_bd && @@ -120,9 +125,9 @@ export default () => { {userInfo?.adminUserInfo?.phone || 'Hi,欢迎来到商城'} - {!!userInfo?.adminUserInfo?.company_name && + {/* {!!userInfo?.adminUserInfo?.company_name && - {userInfo?.adminUserInfo?.company_name}} + {userInfo?.adminUserInfo?.company_name}} */} goLink('/pages/userEdit/index')}> @@ -130,12 +135,12 @@ export default () => { goLink('/pages/collection/index')}> - {orderState?.data?.collection_quantity || 0} + 商品收藏 - 0 - 活动积分 + + 颜色对比 @@ -182,8 +187,8 @@ export default () => { - 活动返现收益(元） - ¥ 20330.00 今日收益 5000 + 活动返现收益（元） + ¥ {formatPriceDiv(state.data.total_income).toLocaleString()} 今日收益 {formatPriceDiv(state.data.today_income).toLocaleString()} goLink('/pages/activityIncome/index')}>查看收益