diff --git a/src/app.config.ts b/src/app.config.ts index c9abe95..441af6a 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -45,7 +45,7 @@ export default { { root: "pages/details", pages: [ - "index" + "index", ] }, { @@ -95,7 +95,8 @@ export default { { root: "pages/order", pages: [ - "index" + "index", + "comfirm" ] } ] diff --git a/src/common/client.js b/src/common/client.js index 0aefa83..e69de29 100644 --- a/src/common/client.js +++ b/src/common/client.js @@ -1,17 +0,0 @@ -import Taro from "@tarojs/taro"; - - -/** - * 设置 客户 本地存储 - * @param {Object} clientInfo - */ -export const setClient = (clientInfo) => { - Taro.setStorageSync('client', clientInfo) -} - -/** - * 返回 客户 本地存储 - */ -export const getClient = () => { - Taro.getStorageSync('client') || null -} diff --git a/src/common/system.js b/src/common/system.ts similarity index 66% rename from src/common/system.js rename to src/common/system.ts index 12e2036..1d99ae5 100644 --- a/src/common/system.js +++ b/src/common/system.ts @@ -32,3 +32,19 @@ export const getAccountInfo = () => { const result = Taro.getStorageSync('accountInfo') return result ? JSON.parse(result) : null } + +/** + * 设置 参数本地存储 + * @param {Object} info + */ +export const setParam = (info:Object) => { + Taro.setStorageSync('params', JSON.stringify(info)) +} + +/** + * 返回 参数本地存储 + */ +export const getParam = () => { + const res = Taro.getStorageSync('params') || null + return res?JSON.parse(res):null +} diff --git a/src/components/shopCart/index.module.scss b/src/components/shopCart/index.module.scss index 9af0c2e..633b89e 100644 --- a/src/components/shopCart/index.module.scss +++ b/src/components/shopCart/index.module.scss @@ -35,13 +35,10 @@ border: 2px solid $color_main; background-color: #ecf5ff; color: $color_main; - width: 144px; - height: 51px; } } .con{ padding:30px; - padding-bottom: 100px; box-sizing: border-box; flex:1; height: 0; @@ -49,7 +46,7 @@ height: 100%; } .product_list{ - padding-bottom: 20px; + padding-bottom: 120px; .product_item{ display: flex; justify-content: space-between; @@ -148,7 +145,7 @@ .buy_btn{ width: 100%; position: fixed; - bottom: 0; + bottom: 20px; display: flex; justify-content: center; padding-bottom: constant(safe-area-inset-bottom); @@ -163,6 +160,7 @@ align-items: center; padding: 20px 0; box-sizing: border-box; + box-shadow: 0px 4px 12px 0px rgba(0,0,0,0.5); .icon{ width: 100px; height: 100%; diff --git a/src/components/shopCart/index.tsx b/src/components/shopCart/index.tsx index dc900f4..15c5d43 100644 --- a/src/components/shopCart/index.tsx +++ b/src/components/shopCart/index.tsx @@ -9,7 +9,8 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import Taro from "@tarojs/taro"; import { alert, goLink } from "@/common/common"; import {GetShoppingCartApi, DelShoppingCartApi} from "@/api/shopCart" -import { formatHashTag, formatImgUrl, formatMillionYuan } from "@/common/fotmat"; +import { formatHashTag, formatImgUrl, formatPriceDiv } from "@/common/fotmat"; +import { setParam } from "@/common/system"; type param = { show?: true|false, @@ -175,13 +176,12 @@ export default ({show = false, onClose}: param) => { //格式化金额 const formatPirce = useCallback((price) => { - const {num} = formatMillionYuan(price, 100) - return Number(num) + return Number(formatPriceDiv(price)) }, []) //格式化数量 const formatCount = useCallback((item) => { - return item.sale_mode == 0? item.roll + '件': item.length + 'm' + return item.sale_mode == 0? item.roll + '件': (item.length/100) + 'm' }, []) //预估金额 @@ -190,7 +190,7 @@ export default ({show = false, onClose}: param) => { list.map(item => { if(item.select) count += item.sale_price }) - return Number(formatMillionYuan(count, 100).num) + return Number(formatPriceDiv(count)) },[list]) //去结算 @@ -200,7 +200,8 @@ export default ({show = false, onClose}: param) => { alert.error('请选择面料') } else { let ids = selectIds.current.join('-') - goLink('/pages/order/index',{ids, sale_mode:selectIndex}) + setParam({ids, sale_mode:selectIndex}) + goLink('/pages/order/comfirm') } } @@ -212,8 +213,8 @@ export default ({show = false, onClose}: param) => { {!selectStatus?'全选':'反选'} - - 删除勾选项 + + 删除所选 @@ -223,7 +224,7 @@ export default ({show = false, onClose}: param) => { {loading&&} - {!loading&&list?.length > 0&& + {!loading&&list?.length > 0&& {list?.map((item, index) => { return @@ -239,7 +240,7 @@ export default ({show = false, onClose}: param) => { {item.sale_mode_name} - {formatPirce(item.sale_price)}/kg + {formatPirce(item.sale_price)}/{selectList[selectIndex].eunit} ×{formatCount(item)} diff --git a/src/constants/common.ts b/src/constants/common.ts new file mode 100644 index 0000000..65b352f --- /dev/null +++ b/src/constants/common.ts @@ -0,0 +1,2 @@ +export const SET_COMMON = 'setCommon' +export const CLEAR_COMMON = 'clearCommon' \ No newline at end of file diff --git a/src/pages/details/components/orderCount/index.tsx b/src/pages/details/components/orderCount/index.tsx index 6f5233a..f581163 100644 --- a/src/pages/details/components/orderCount/index.tsx +++ b/src/pages/details/components/orderCount/index.tsx @@ -13,7 +13,7 @@ import {GetColorList} from "@/api/materialColor" import {AddShoppingCartApi} from "@/api/shopCart" import Taro, { useRouter } from "@tarojs/taro"; import UseLogin from "@/use/useLogin" -import { formatHashTag, formatMillionYuan } from "@/common/fotmat"; +import { formatHashTag, formatPriceDiv } from "@/common/fotmat"; import { getFilterData } from "@/common/util"; @@ -114,7 +114,7 @@ export default memo(({show = false, onClose, title = '', productId = 0}: param) if(item.count > 0) { sumCount = Big(sumCount).add(item.count).toNumber() kindCount ++ - color_list_info = selectIndex == 0? {product_color_id:item.id, roll:item.count}:{product_color_id:item.id, length:item.count} + color_list_info = selectIndex == 0? {product_color_id:item.id, roll:item.count}:{product_color_id:item.id, length:(item.count*100)} color_list.push(color_list_info) } @@ -195,7 +195,7 @@ export default memo(({show = false, onClose, title = '', productId = 0}: param) //格式化金额 const formatPrice = useCallback((item) => { - const price = Number(formatMillionYuan(item[selectList[selectIndex].priceField], 100).num) + const price = Number(formatPriceDiv(item[selectList[selectIndex].priceField])) return ¥{price} /{selectList[selectIndex].eunit} }, [selectIndex]) diff --git a/src/pages/details/components/swiper/index.tsx b/src/pages/details/components/swiper/index.tsx index 7fa0497..be07358 100644 --- a/src/pages/details/components/swiper/index.tsx +++ b/src/pages/details/components/swiper/index.tsx @@ -21,7 +21,6 @@ export default ({list = []}: params) => { setPageIndex(e.detail.current + 1) } - return ( swiperChange(e)}> diff --git a/src/pages/index/index.tsx b/src/pages/index/index.tsx index 9222be9..172de29 100644 --- a/src/pages/index/index.tsx +++ b/src/pages/index/index.tsx @@ -86,9 +86,7 @@ export default () => { setRefresherTriggeredStatus(true) } - - //页面下拉刷新 // const res = useManualPullDownRefresh() usePullDownRefresh(() => { diff --git a/src/pages/order/comfirm.config.ts b/src/pages/order/comfirm.config.ts new file mode 100644 index 0000000..b0cb522 --- /dev/null +++ b/src/pages/order/comfirm.config.ts @@ -0,0 +1,3 @@ +export default { + navigationBarTitleText: '确认订单' +} diff --git a/src/pages/order/comfirm.module.scss b/src/pages/order/comfirm.module.scss new file mode 100644 index 0000000..980cde1 --- /dev/null +++ b/src/pages/order/comfirm.module.scss @@ -0,0 +1,122 @@ +.order_main{ + min-height: 100%; + background-color:$color_bg_one; + padding: 20px; + padding-bottom: 190px; + box-sizing: border-box; + + .order_title{ + display: flex; + align-items: center; + padding: 20px 30px; + box-sizing: border-box; + background-color: #fff; + height: 116px; + border-radius: 20px; + margin-top: 20px; + text{ + flex:1; + font-size: $font_size; + font-weight: 700; + } + .order_status{ + background-color: #F0F0F0; + width: 148px; + height: 55px; + color: $color_font_three; + text-align: center; + line-height: 55px; + font-size: $font_size_medium; + border-radius: 30px; + &:nth-last-child(1) { + margin-left: 20px; + } + } + .order_status_selected{ + color: $color_main; + border: 1px solid $color_main; + } + } + .order_desc{ + display: flex; + align-items: center; + background-color: #fff; + padding: 0 20px; + height: 116px; + border-radius: 20px; + margin-top: 20px; + .order_desc_con{ + flex:1; + font-size: $font_size; + font-weight: 700; + } + .order_desc_text{ + font-size: $font_size_medium; + color: $color_font_two; + margin-right: 10px; + } + .miconfont{ + font-size: 20px; + color: $color_font_two; + } + } + .submit_order{ + display: flex; + position: fixed; + bottom: 0; + left: 0; + justify-content: space-between; + width: 100%; + height: 175px; + align-items: center; + background-color: #fff; + box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16); + padding: 20px 50px; + box-sizing: border-box; + padding-bottom: constant(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + .order_btn { + width: 250px; + height: 90px; + opacity: 0.6; + background: linear-gradient(38deg,#007aff, #4fa6ff 100%, #68b4ff 100%); + border-radius: 46px; + display: flex; + justify-content: center; + align-items: center; + color: #fff; + } + .order_number_desc{ + font-size: $font_size_medium; + color: $color_font_two; + } + } + .order_info{ + background-color: #fff; + margin-top: 20px; + border-radius: 20px; + padding: 20px; + .order_info_title{ + font-size: $font_size; + font-weight: 700; + margin-bottom: 20px; + + } + .order_num{ + display: flex; + justify-content: space-between; + align-items: center; + .order_num_btn{ + font-size: $font_size_medium; + padding: 5px 10px; + border: 2px solid #007cf7; + border-radius: 10px; + color: $color_main; + } + } + text{ + font-size: $font_size; + } + + } +} \ No newline at end of file diff --git a/src/pages/order/comfirm.tsx b/src/pages/order/comfirm.tsx new file mode 100644 index 0000000..2bb5bd1 --- /dev/null +++ b/src/pages/order/comfirm.tsx @@ -0,0 +1,146 @@ +import { SaleOrderPreViewApi } from "@/api/order"; +import { formatPriceDiv } from "@/common/fotmat"; +import Popup from "@/components/popup"; +import SearchInput from "@/components/searchInput"; +import { Text, Textarea, View } from "@tarojs/components" +import Taro, { useRouter } from "@tarojs/taro"; +import classnames from "classnames"; +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; +import AddressInfo from "./components/addressInfo"; +import EstimatedAmount from "./components/estimatedAmount"; +import KindList from "./components/kindList"; +import OrderState from "./components/orderState"; +import Remark from "./components/remark"; +import styles from './comfirm.module.scss' +import { getParam } from "@/common/system"; + + export default () => { + const [showDesc, setShowDesc] = useState(false) + //下单信息 + type OrderParams = {address_id?: number, remark?: string, sale_mode?: number, shipment_mode?: number, list?: any[]} + const [submitOrder, setSubmitOrder] = useState() + + //获取购物车传过来的id + type orderPreParam = {shopping_cart_product_color_list:{shopping_cart_product_color_id:number}[], sale_mode:number} + const param = getParam() + const idsAndSaleModel = useRef({shopping_cart_product_color_list:[], sale_mode:0}) + useEffect(() => { + idsAndSaleModel.current.sale_mode = Number(param?.sale_mode) + param?.ids?.split('-')?.map(item => { + return idsAndSaleModel.current.shopping_cart_product_color_list?.push({ + shopping_cart_product_color_id: Number(item) + }) + }) + getSaleOrderPreView() + }, []) + + //获取销售预览订单 + type preViewOrderParam = {estimate_amount:number, estimate_weight:number, product_color_list:any[], sale_mode:number, sale_mode_name:string} + const [preViewOrder, setPreViewOrder] = useState() //获取到的原始数据 + const {fetchData} = SaleOrderPreViewApi() + const getSaleOrderPreView = async () => { + if(idsAndSaleModel.current.shopping_cart_product_color_list?.length > 0) { + let res = await fetchData(idsAndSaleModel.current) + setPreViewOrder(res.data) + } + } + + //监听获取到的数据 + useEffect(() => { + if(preViewOrder) + formatData() + }, [preViewOrder]) + + //格式化数据格式 + const [formatPreViewOrder, setFormatPreViewOrder] = useState() //格式化后的数据 + const formatData = () => { + if(preViewOrder?.product_color_list&&preViewOrder?.product_color_list.length > 0) { + let dataList = {} + let num_count = 0 //总数量 + let orderList:{shopping_cart_product_color_id:number}[] = [] //提交订单时的格式 + preViewOrder?.product_color_list.map(item => { + dataList[item.product_code] = dataList[item.product_code]||{} + dataList[item.product_code].product_code = item.product_code + dataList[item.product_code].product_name = item.product_name + dataList[item.product_code].sale_mode_name = preViewOrder.sale_mode_name + dataList[item.product_code].color_list = dataList[item.product_code]?.color_list||[] + dataList[item.product_code].color_list.push(item) + //大货 + if (preViewOrder.sale_mode == 0) num_count += item.roll + //剪板或散件 + if (preViewOrder.sale_mode == 1 || preViewOrder.sale_mode == 2) num_count += item.length + orderList.push({shopping_cart_product_color_id:item.id}) + }) + if (preViewOrder.sale_mode == 1 || preViewOrder.sale_mode == 2) num_count = Number(num_count / 100); + setFormatPreViewOrder({ + estimate_amount: preViewOrder.estimate_amount, //预估金额 + estimate_weight: preViewOrder.estimate_weight, + sale_mode: preViewOrder.sale_mode, + sale_mode_name: preViewOrder.sale_mode_name, + colo_count: preViewOrder.product_color_list.length, //颜色数量 + num_count: num_count, //总数量 + unit: preViewOrder.sale_mode == 0?'条':'m', //单位 + list: Object.values(dataList) + }) + setSubmitOrder({...submitOrder, list: orderList}) + } + } + const formatPreViewOrderMemo = useMemo(() => { + return formatPreViewOrder + }, [formatPreViewOrder]) + + //获取地址 + const getAddress = (e) => { + console.log('address::', submitOrder) + setSubmitOrder({...submitOrder, address_id:e.id}) + } + + //收货方法 1:自提,2:物流 + const shipmentMode = useRef([ + {value:1, label:'上门自提', selected:false}, + {value:2, label:'物流', selected:false} + ]) + const selectShipmentMode = (value) => { + setSubmitOrder({...submitOrder, shipment_mode:value}) + } + + //获取备注 + const getRemark = useCallback((e) => { + setSubmitOrder({...submitOrder, remark:e}) + }, []) + + //提交按钮是否可用 + const btnStatus = useMemo(() => { + console.log('submitOrder::',submitOrder) + return submitOrder?.address_id&& submitOrder.list?.length &&submitOrder.shipment_mode + }, [submitOrder]) + + return ( + + + 收货方式 + {shipmentMode.current.map(item => { + return selectShipmentMode(item.value)}>{item.label} + })} + + getAddress(e)}/> + + setShowDesc(true)}> + 订单备注 + 点击填写 + + + + + + {`${formatPreViewOrder?.list.length}种面料,${formatPreViewOrder?.colo_count}种颜色,共${formatPreViewOrder?.num_count + formatPreViewOrder?.unit}`} + + 提交订单2{btnStatus?'true':'false'} + + setShowDesc(false)} > + getRemark(e)}/> + + + + ) + } diff --git a/src/pages/order/components/addressInfo/index.module.scss b/src/pages/order/components/addressInfo/index.module.scss index 8273d60..abdae24 100644 --- a/src/pages/order/components/addressInfo/index.module.scss +++ b/src/pages/order/components/addressInfo/index.module.scss @@ -9,6 +9,7 @@ margin-top: 20px; .order_address_icon{ font-size: 60px; + color: $color_main; } .order_address_text_con{ flex:1; diff --git a/src/pages/order/components/addressInfo/index.tsx b/src/pages/order/components/addressInfo/index.tsx index 9bcd9e0..a176a93 100644 --- a/src/pages/order/components/addressInfo/index.tsx +++ b/src/pages/order/components/addressInfo/index.tsx @@ -2,31 +2,51 @@ import AddressList from "@/components/AddressList"; import Popup from "@/components/popup"; import { Text, View } from "@tarojs/components" import classnames from "classnames"; -import { useState } from "react"; +import { memo, useCallback, useEffect, useMemo, useState } from "react"; import styles from './index.module.scss' -export default () => { + +type Param = { + onSelect?: (val:any) => void +} + +export default memo(({onSelect}: Param) => { const [showAddressList, setShowAddressList] = useState(false) + + //选择地址 + const [userInfo, setUserInfo] = useState() + const getAddress = useCallback((val) => { + setShowAddressList(false) + setUserInfo(val) + onSelect?.(val) + }, []) + + //地址格式 + const formatAddress = useMemo(() => { + if(userInfo) { + return userInfo.province_name + userInfo.city_name + userInfo.district_name + userInfo.address_detail + } + }, [userInfo]) return ( setShowAddressList(true)}> - - {/* 请选择收货地址及信息 */} + + {!userInfo&&请选择收货地址及信息|| - **省**市**区**街道****仓库**省**市**区**街道****仓库 + {formatAddress} - 陈先生 - 1818877790 + {userInfo?.name} + {userInfo?.phone} - - + } + setShowAddressList(false)}> - 选择收货地址 - console.log(index, item)}/> + 请选择收货地址 + getAddress(item)}/> ) -} \ No newline at end of file +}) \ No newline at end of file diff --git a/src/pages/order/components/estimatedAmount/index.tsx b/src/pages/order/components/estimatedAmount/index.tsx index 7e9ae1b..70f76c6 100644 --- a/src/pages/order/components/estimatedAmount/index.tsx +++ b/src/pages/order/components/estimatedAmount/index.tsx @@ -14,14 +14,11 @@ export default ({style, number = 0}:Param) => { return ( <> ¥ - {formatPrice(int_num)} + {Number(int_num).toLocaleString()} .{decimals_num} ) }, [number]) - const formatPrice = useCallback((number: string) => { - return formatKbPrice(number) - }, []) return ( 预估金额 diff --git a/src/pages/order/components/kindList/index.module.scss b/src/pages/order/components/kindList/index.module.scss index ad8a7b2..18da4a6 100644 --- a/src/pages/order/components/kindList/index.module.scss +++ b/src/pages/order/components/kindList/index.module.scss @@ -67,6 +67,10 @@ } } .order_list_item_count{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: flex-end; .count_num{ color: $color_main; font-size: $font_size; diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx index 17d026a..d7feb64 100644 --- a/src/pages/order/components/kindList/index.tsx +++ b/src/pages/order/components/kindList/index.tsx @@ -1,88 +1,64 @@ +import { formatHashTag, formatPriceDiv } from "@/common/fotmat" import { View } from "@tarojs/components" -import { useState } from "react" +import { memo, useCallback } from "react" import EstimatedAmount from "../estimatedAmount" import styles from './index.module.scss' -export default () => { - const [price, setPrice] = useState(123000.33) +type OrderParam = { + estimate_amount: number, + estimate_weight: number, + list: any[], + sale_mode: number, + sale_mode_name: string + unit: string +} + + +export default memo(({value}:{value:OrderParam}) => { + //对应数量 + const formatCount = useCallback((item) => { + return value.sale_mode == 0? item.roll : Number(item.length / 100) + }, [value]) + //对应单价 + const standardPrice = useCallback(item => { + return formatPriceDiv(item.standard_price).toLocaleString() + '/' + (value.sale_mode == 1?'m':'kg') + }, [value]) return ( <> - - - 大货 - 0770# 21S单面平纹(食毛) - 共3种 - - - - - - - 1# 薄荷绿 - ¥40/kg - - - ×1 - ¥1,000.5 - + { + value?.list.map(item => { + return + + {item.sale_mode_name} + {formatHashTag(item.product_code, item.product_name)} + 共{item.color_list.length}种 + + + {item.color_list?.map(colorItem => { + return + + + + {colorItem.product_color_code + ' ' + colorItem.product_color_name} + ¥{standardPrice(colorItem)} + + + ×{formatCount(colorItem)}{value.unit} + ¥{formatPriceDiv(colorItem.estimate_amount).toLocaleString()} + + + + })} - - - - - 1# 薄荷绿 - ¥40/kg - - - ×1 - ¥1,000.5 - - - - - - - - 大货 - 0770# 21S单面平纹(食毛) - 共3种 - - - - - - - 1# 薄荷绿 - ¥40/kg - - - ×1 - ¥1,000.5 - - - - - - - - 1# 薄荷绿 - ¥40/kg - - - ×1 - ¥1,000.5 - - - - - + }) + } - - (按照25kg/条, 预估金额) + + {/* (按照25kg/条, 预估金额) */} ) -} \ No newline at end of file +}) \ No newline at end of file diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index 3a8afc9..bdb5978 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -1,10 +1,11 @@ import { SaleOrderPreViewApi } from "@/api/order"; +import { formatPriceDiv } from "@/common/fotmat"; import Popup from "@/components/popup"; import SearchInput from "@/components/searchInput"; import { Text, Textarea, View } from "@tarojs/components" import Taro, { useRouter } from "@tarojs/taro"; import classnames from "classnames"; -import { useCallback, useEffect, useRef, useState } from "react"; +import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import AddressInfo from "./components/addressInfo"; import EstimatedAmount from "./components/estimatedAmount"; import KindList from "./components/kindList"; @@ -13,21 +14,8 @@ import Remark from "./components/remark"; import styles from './index.module.scss' export default () => { - const [price, setPrice] = useState(123000.33) const [showDesc, setShowDesc] = useState(false) - - //复制功能 - const clipboardData = () => { - Taro.setClipboardData({ - data: '123123121321', - success: function (res) { - Taro.showToast({ - icon: 'none', - title: '复制成功' - }) - } - }) - } + //获取购物车传过来的id type orderPreParam = {shopping_cart_product_color_list:{shopping_cart_product_color_id:number}[], sale_mode:number} const router = useRouter() @@ -44,7 +32,7 @@ import styles from './index.module.scss' //获取销售预览订单 type preViewOrderParam = {estimate_amount:number, estimate_weight:number, product_color_list:any[], sale_mode:number, sale_mode_name:string} - const [preViewOrder, setPreViewOrder] = useState() + const [preViewOrder, setPreViewOrder] = useState() //获取到的原始数据 const {fetchData} = SaleOrderPreViewApi() const getSaleOrderPreView = async () => { if(idsAndSaleModel.current.shopping_cart_product_color_list?.length > 0) { @@ -53,27 +41,61 @@ import styles from './index.module.scss' } } + //监听获取到的数据 useEffect(() => { - formatData() + if(preViewOrder) + formatData() }, [preViewOrder]) //格式化数据格式 + const [formatPreViewOrder, setFormatPreViewOrder] = useState() //格式化后的数据 const formatData = () => { if(preViewOrder?.product_color_list&&preViewOrder?.product_color_list.length > 0) { let dataList = {} + let num_count = 0 //总数量 preViewOrder?.product_color_list.map(item => { dataList[item.product_code] = dataList[item.product_code]||{} dataList[item.product_code].product_code = item.product_code dataList[item.product_code].product_name = item.product_name - dataList[item.product_code].sale_mode_name = item.sale_mode_name + dataList[item.product_code].sale_mode_name = preViewOrder.sale_mode_name dataList[item.product_code].color_list = dataList[item.product_code]?.color_list||[] dataList[item.product_code].color_list.push(item) + //大货 + if (preViewOrder.sale_mode == 0) num_count += item.roll + //剪板或散件 + if (preViewOrder.sale_mode == 1 || preViewOrder.sale_mode == 2) num_count += item.length + }) + if (preViewOrder.sale_mode == 1 || preViewOrder.sale_mode == 2) num_count = Number(num_count / 100); + setFormatPreViewOrder({ + estimate_amount: preViewOrder.estimate_amount, //预估金额 + estimate_weight: preViewOrder.estimate_weight, + sale_mode: preViewOrder.sale_mode, + sale_mode_name: preViewOrder.sale_mode_name, + colo_count: preViewOrder.product_color_list.length, //颜色数量 + num_count: num_count, //总数量 + unit: preViewOrder.sale_mode == 0?'条':'m', //单位 + list: Object.values(dataList) }) - console.log('dataList::',Object.values(dataList)) - return Object.values(dataList) } } + const formatPreViewOrderMemo = useMemo(() => { + return formatPreViewOrder + }, [formatPreViewOrder]) + + //复制功能 + const clipboardData = () => { + Taro.setClipboardData({ + data: '123123121321', + success: function (res) { + Taro.showToast({ + icon: 'none', + title: '复制成功' + }) + } + }) + } + return ( @@ -83,7 +105,7 @@ import styles from './index.module.scss' 上门自提 - + setShowDesc(true)}> 订单备注 点击填写 @@ -103,8 +125,8 @@ import styles from './index.module.scss' - - 2种面料,6种颜色,共6条 + + {`${formatPreViewOrder?.list.length}种面料,${formatPreViewOrder?.colo_count}种颜色,共${formatPreViewOrder?.num_count + formatPreViewOrder?.unit}`} 提交订单 diff --git a/src/reducers/commonData.ts b/src/reducers/commonData.ts new file mode 100644 index 0000000..17968fc --- /dev/null +++ b/src/reducers/commonData.ts @@ -0,0 +1,35 @@ +//公共数据,什么都可往里面传,可用于临时传参 +import Taro from '@tarojs/taro' +import { + SET_COMMON, + CLEAR_COMMON +} from '../constants/common' + +export type DataParam = { + common: any +} + +type Action = { + type?: string, + data?: DataParam +} + + + +const INIT = { + common: Taro.getStorageSync('common')?JSON.parse(Taro.getStorageSync('common')):null, +} + +export default function counter (state = INIT, action: Action) { + const {type, data} = action + switch (type) { + case SET_COMMON: + Taro.setStorageSync('common',JSON.stringify(data)) + return {...state,...data} + case CLEAR_COMMON: + Taro.removeStorageSync('common') + return {...state, common: null} + default: + return state + } +} \ No newline at end of file diff --git a/src/reducers/hooks.ts b/src/reducers/hooks.ts index b882f8f..e2f3457 100644 --- a/src/reducers/hooks.ts +++ b/src/reducers/hooks.ts @@ -2,7 +2,9 @@ //该方法纯粹只是个Ts类型定义文件 import { useSelector as useReduxSelector, TypedUseSelectorHook } from 'react-redux'; import { DataParam } from './userInfo'; +import { DataParam as commonDataParam } from './commonData'; type Params = { - userInfo: DataParam + userInfo: DataParam, + commonData: commonDataParam } export const useSelector: TypedUseSelectorHook = useReduxSelector; \ No newline at end of file diff --git a/src/reducers/index.ts b/src/reducers/index.ts index 2af35af..1b859e6 100644 --- a/src/reducers/index.ts +++ b/src/reducers/index.ts @@ -1,6 +1,8 @@ import { combineReducers } from 'redux' import userInfo from './userInfo' +import commonData from './commonData' export default combineReducers({ - userInfo + userInfo, + commonData }) \ No newline at end of file diff --git a/src/styles/download (2)/font_2987621_l1qavt5630a/demo.css b/src/styles/download (2)/font_2987621_l1qavt5630a/demo.css new file mode 100644 index 0000000..a67054a --- /dev/null +++ b/src/styles/download (2)/font_2987621_l1qavt5630a/demo.css @@ -0,0 +1,539 @@ +/* Logo 字体 */ +@font-face { + font-family: "iconfont logo"; + src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834'); + src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'), + url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'), + url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'), + url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg'); +} + +.logo { + font-family: "iconfont logo"; + font-size: 160px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +/* tabs */ +.nav-tabs { + position: relative; +} + +.nav-tabs .nav-more { + position: absolute; + right: 0; + bottom: 0; + height: 42px; + line-height: 42px; + color: #666; +} + +#tabs { + border-bottom: 1px solid #eee; +} + +#tabs li { + cursor: pointer; + width: 100px; + height: 40px; + line-height: 40px; + text-align: center; + font-size: 16px; + border-bottom: 2px solid transparent; + position: relative; + z-index: 1; + margin-bottom: -1px; + color: #666; +} + + +#tabs .active { + border-bottom-color: #f00; + color: #222; +} + +.tab-container .content { + display: none; +} + +/* 页面布局 */ +.main { + padding: 30px 100px; + width: 960px; + margin: 0 auto; +} + +.main .logo { + color: #333; + text-align: left; + margin-bottom: 30px; + line-height: 1; + height: 110px; + margin-top: -50px; + overflow: hidden; + *zoom: 1; +} + +.main .logo a { + font-size: 160px; + color: #333; +} + +.helps { + margin-top: 40px; +} + +.helps pre { + padding: 20px; + margin: 10px 0; + border: solid 1px #e7e1cd; + background-color: #fffdef; + overflow: auto; +} + +.icon_lists { + width: 100% !important; + overflow: hidden; + *zoom: 1; +} + +.icon_lists li { + width: 100px; + margin-bottom: 10px; + margin-right: 20px; + text-align: center; + list-style: none !important; + cursor: default; +} + +.icon_lists li .code-name { + line-height: 1.2; +} + +.icon_lists .icon { + display: block; + height: 100px; + line-height: 100px; + font-size: 42px; + margin: 10px auto; + color: #333; + -webkit-transition: font-size 0.25s linear, width 0.25s linear; + -moz-transition: font-size 0.25s linear, width 0.25s linear; + transition: font-size 0.25s linear, width 0.25s linear; +} + +.icon_lists .icon:hover { + font-size: 100px; +} + +.icon_lists .svg-icon { + /* 通过设置 font-size 来改变图标大小 */ + width: 1em; + /* 图标和文字相邻时,垂直对齐 */ + vertical-align: -0.15em; + /* 通过设置 color 来改变 SVG 的颜色/fill */ + fill: currentColor; + /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示 + normalize.css 中也包含这行 */ + overflow: hidden; +} + +.icon_lists li .name, +.icon_lists li .code-name { + color: #666; +} + +/* markdown 样式 */ +.markdown { + color: #666; + font-size: 14px; + line-height: 1.8; +} + +.highlight { + line-height: 1.5; +} + +.markdown img { + vertical-align: middle; + max-width: 100%; +} + +.markdown h1 { + color: #404040; + font-weight: 500; + line-height: 40px; + margin-bottom: 24px; +} + +.markdown h2, +.markdown h3, +.markdown h4, +.markdown h5, +.markdown h6 { + color: #404040; + margin: 1.6em 0 0.6em 0; + font-weight: 500; + clear: both; +} + +.markdown h1 { + font-size: 28px; +} + +.markdown h2 { + font-size: 22px; +} + +.markdown h3 { + font-size: 16px; +} + +.markdown h4 { + font-size: 14px; +} + +.markdown h5 { + font-size: 12px; +} + +.markdown h6 { + font-size: 12px; +} + +.markdown hr { + height: 1px; + border: 0; + background: #e9e9e9; + margin: 16px 0; + clear: both; +} + +.markdown p { + margin: 1em 0; +} + +.markdown>p, +.markdown>blockquote, +.markdown>.highlight, +.markdown>ol, +.markdown>ul { + width: 80%; +} + +.markdown ul>li { + list-style: circle; +} + +.markdown>ul li, +.markdown blockquote ul>li { + margin-left: 20px; + padding-left: 4px; +} + +.markdown>ul li p, +.markdown>ol li p { + margin: 0.6em 0; +} + +.markdown ol>li { + list-style: decimal; +} + +.markdown>ol li, +.markdown blockquote ol>li { + margin-left: 20px; + padding-left: 4px; +} + +.markdown code { + margin: 0 3px; + padding: 0 5px; + background: #eee; + border-radius: 3px; +} + +.markdown strong, +.markdown b { + font-weight: 600; +} + +.markdown>table { + border-collapse: collapse; + border-spacing: 0px; + empty-cells: show; + border: 1px solid #e9e9e9; + width: 95%; + margin-bottom: 24px; +} + +.markdown>table th { + white-space: nowrap; + color: #333; + font-weight: 600; +} + +.markdown>table th, +.markdown>table td { + border: 1px solid #e9e9e9; + padding: 8px 16px; + text-align: left; +} + +.markdown>table th { + background: #F7F7F7; +} + +.markdown blockquote { + font-size: 90%; + color: #999; + border-left: 4px solid #e9e9e9; + padding-left: 0.8em; + margin: 1em 0; +} + +.markdown blockquote p { + margin: 0; +} + +.markdown .anchor { + opacity: 0; + transition: opacity 0.3s ease; + margin-left: 8px; +} + +.markdown .waiting { + color: #ccc; +} + +.markdown h1:hover .anchor, +.markdown h2:hover .anchor, +.markdown h3:hover .anchor, +.markdown h4:hover .anchor, +.markdown h5:hover .anchor, +.markdown h6:hover .anchor { + opacity: 1; + display: inline-block; +} + +.markdown>br, +.markdown>p>br { + clear: both; +} + + +.hljs { + display: block; + background: white; + padding: 0.5em; + color: #333333; + overflow-x: auto; +} + +.hljs-comment, +.hljs-meta { + color: #969896; +} + +.hljs-string, +.hljs-variable, +.hljs-template-variable, +.hljs-strong, +.hljs-emphasis, +.hljs-quote { + color: #df5000; +} + +.hljs-keyword, +.hljs-selector-tag, +.hljs-type { + color: #a71d5d; +} + +.hljs-literal, +.hljs-symbol, +.hljs-bullet, +.hljs-attribute { + color: #0086b3; +} + +.hljs-section, +.hljs-name { + color: #63a35c; +} + +.hljs-tag { + color: #333333; +} + +.hljs-title, +.hljs-attr, +.hljs-selector-id, +.hljs-selector-class, +.hljs-selector-attr, +.hljs-selector-pseudo { + color: #795da3; +} + +.hljs-addition { + color: #55a532; + background-color: #eaffea; +} + +.hljs-deletion { + color: #bd2c00; + background-color: #ffecec; +} + +.hljs-link { + text-decoration: underline; +} + +/* 代码高亮 */ +/* PrismJS 1.15.0 +https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */ +/** + * prism.js default theme for JavaScript, CSS and HTML + * Based on dabblet (http://dabblet.com) + * @author Lea Verou + */ +code[class*="language-"], +pre[class*="language-"] { + color: black; + background: none; + text-shadow: 0 1px white; + font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace; + text-align: left; + white-space: pre; + word-spacing: normal; + word-break: normal; + word-wrap: normal; + line-height: 1.5; + + -moz-tab-size: 4; + -o-tab-size: 4; + tab-size: 4; + + -webkit-hyphens: none; + -moz-hyphens: none; + -ms-hyphens: none; + hyphens: none; +} + +pre[class*="language-"]::-moz-selection, +pre[class*="language-"] ::-moz-selection, +code[class*="language-"]::-moz-selection, +code[class*="language-"] ::-moz-selection { + text-shadow: none; + background: #b3d4fc; +} + +pre[class*="language-"]::selection, +pre[class*="language-"] ::selection, +code[class*="language-"]::selection, +code[class*="language-"] ::selection { + text-shadow: none; + background: #b3d4fc; +} + +@media print { + + code[class*="language-"], + pre[class*="language-"] { + text-shadow: none; + } +} + +/* Code blocks */ +pre[class*="language-"] { + padding: 1em; + margin: .5em 0; + overflow: auto; +} + +:not(pre)>code[class*="language-"], +pre[class*="language-"] { + background: #f5f2f0; +} + +/* Inline code */ +:not(pre)>code[class*="language-"] { + padding: .1em; + border-radius: .3em; + white-space: normal; +} + +.token.comment, +.token.prolog, +.token.doctype, +.token.cdata { + color: slategray; +} + +.token.punctuation { + color: #999; +} + +.namespace { + opacity: .7; +} + +.token.property, +.token.tag, +.token.boolean, +.token.number, +.token.constant, +.token.symbol, +.token.deleted { + color: #905; +} + +.token.selector, +.token.attr-name, +.token.string, +.token.char, +.token.builtin, +.token.inserted { + color: #690; +} + +.token.operator, +.token.entity, +.token.url, +.language-css .token.string, +.style .token.string { + color: #9a6e3a; + background: hsla(0, 0%, 100%, .5); +} + +.token.atrule, +.token.attr-value, +.token.keyword { + color: #07a; +} + +.token.function, +.token.class-name { + color: #DD4A68; +} + +.token.regex, +.token.important, +.token.variable { + color: #e90; +} + +.token.important, +.token.bold { + font-weight: bold; +} + +.token.italic { + font-style: italic; +} + +.token.entity { + cursor: help; +} diff --git a/src/styles/download (2)/font_2987621_l1qavt5630a/demo_index.html b/src/styles/download (2)/font_2987621_l1qavt5630a/demo_index.html new file mode 100644 index 0000000..5debfad --- /dev/null +++ b/src/styles/download (2)/font_2987621_l1qavt5630a/demo_index.html @@ -0,0 +1,901 @@ + + + + + iconfont Demo + + + + + + + + + + + + + +
+

+ + +

+ +
+
+
    + +
  • + +
    导航
    +
    &#xe664;
    +
  • + +
  • + +
    删除
    +
    &#xe663;
    +
  • + +
  • + +
    已发货
    +
    &#xe65b;
    +
  • + +
  • + +
    待配布
    +
    &#xe662;
    +
  • + +
  • + +
    邀请团队
    +
    &#xe65a;
    +
  • + +
  • + +
    退款、售后
    +
    &#xe65c;
    +
  • + +
  • + +
    待付款
    +
    &#xe65d;
    +
  • + +
  • + +
    设置
    +
    &#xe65e;
    +
  • + +
  • + +
    颜色对比
    +
    &#xe65f;
    +
  • + +
  • + +
    待发货
    +
    &#xe660;
    +
  • + +
  • + +
    包裹
    +
    &#xe661;
    +
  • + +
  • + +
    tick-pressed
    +
    &#xe652;
    +
  • + +
  • + +
    我的-pressed
    +
    &#xe655;
    +
  • + +
  • + +
    分类-pressed
    +
    &#xe656;
    +
  • + +
  • + +
    搜索
    +
    &#xe647;
    +
  • + +
  • + +
    分享
    +
    &#xe648;
    +
  • + +
  • + +
    筛选
    +
    &#xe649;
    +
  • + +
  • + +
    购物车
    +
    &#xe64a;
    +
  • + +
  • + +
    清空
    +
    &#xe64c;
    +
  • + +
  • + +
    +
    &#xe64d;
    +
  • + +
  • + +
    +
    &#xe64e;
    +
  • + +
  • + +
    收藏-pressed
    +
    &#xe64f;
    +
  • + +
  • + +
    收藏
    +
    &#xe650;
    +
  • + +
  • + +
    phone
    +
    &#xe651;
    +
  • + +
  • + +
    tick
    +
    &#xe653;
    +
  • + +
  • + +
    more,back
    +
    &#xe654;
    +
  • + +
  • + +
    分类
    +
    &#xe657;
    +
  • + +
  • + +
    编辑
    +
    &#xe658;
    +
  • + +
  • + +
    我的
    +
    &#xe659;
    +
  • + +
  • + +
    排序,升序
    +
    &#xea4c;
    +
  • + +
  • + +
    排序,降序
    +
    &#xea4d;
    +
  • + +
+
+

Unicode 引用

+
+ +

Unicode 是字体在网页端最原始的应用方式,特点是:

+
    +
  • 支持按字体的方式去动态调整图标大小,颜色等等。
  • +
  • 默认情况下不支持多色,直接添加多色图标会自动去色。
  • +
+
+

注意:新版 iconfont 支持两种方式引用多色图标:SVG symbol 引用方式和彩色字体图标模式。(使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。)

+
+

Unicode 使用步骤如下:

+

第一步:拷贝项目下面生成的 @font-face

+
@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.woff2?t=1652427368246') format('woff2'),
+       url('iconfont.woff?t=1652427368246') format('woff'),
+       url('iconfont.ttf?t=1652427368246') format('truetype');
+}
+
+

第二步:定义使用 iconfont 的样式

+
.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+

第三步:挑选相应图标并获取字体编码,应用于页面

+
+<span class="iconfont">&#x33;</span>
+
+
+

"iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。

+
+
+
+
+
    + +
  • + +
    + 导航 +
    +
    .icon-daohang +
    +
  • + +
  • + +
    + 删除 +
    +
    .icon-shanchu +
    +
  • + +
  • + +
    + 已发货 +
    +
    .icon-yifahuo +
    +
  • + +
  • + +
    + 待配布 +
    +
    .icon-daipeibu +
    +
  • + +
  • + +
    + 邀请团队 +
    +
    .icon-yaoqingtuandui +
    +
  • + +
  • + +
    + 退款、售后 +
    +
    .icon-a-tuikuanshouhou +
    +
  • + +
  • + +
    + 待付款 +
    +
    .icon-daifukuan +
    +
  • + +
  • + +
    + 设置 +
    +
    .icon-shezhi +
    +
  • + +
  • + +
    + 颜色对比 +
    +
    .icon-yanseduibi +
    +
  • + +
  • + +
    + 待发货 +
    +
    .icon-daifahuo +
    +
  • + +
  • + +
    + 包裹 +
    +
    .icon-baoguo +
    +
  • + +
  • + +
    + tick-pressed +
    +
    .icon-tick-pressed +
    +
  • + +
  • + +
    + 我的-pressed +
    +
    .icon-wode-pressed +
    +
  • + +
  • + +
    + 分类-pressed +
    +
    .icon-fenlei-pressed +
    +
  • + +
  • + +
    + 搜索 +
    +
    .icon-sousuo +
    +
  • + +
  • + +
    + 分享 +
    +
    .icon-fenxiang +
    +
  • + +
  • + +
    + 筛选 +
    +
    .icon-shaixuan +
    +
  • + +
  • + +
    + 购物车 +
    +
    .icon-gouwuche +
    +
  • + +
  • + +
    + 清空 +
    +
    .icon-qingkong +
    +
  • + +
  • + +
    + 加 +
    +
    .icon-jia +
    +
  • + +
  • + +
    + 减 +
    +
    .icon-jian +
    +
  • + +
  • + +
    + 收藏-pressed +
    +
    .icon-shoucang-pressed +
    +
  • + +
  • + +
    + 收藏 +
    +
    .icon-shoucang +
    +
  • + +
  • + +
    + phone +
    +
    .icon-phone +
    +
  • + +
  • + +
    + tick +
    +
    .icon-tick +
    +
  • + +
  • + +
    + more,back +
    +
    .icon-a-moreback +
    +
  • + +
  • + +
    + 分类 +
    +
    .icon-fenlei +
    +
  • + +
  • + +
    + 编辑 +
    +
    .icon-bianji +
    +
  • + +
  • + +
    + 我的 +
    +
    .icon-wode +
    +
  • + +
  • + +
    + 排序,升序 +
    +
    .icon-sort-up-full +
    +
  • + +
  • + +
    + 排序,降序 +
    +
    .icon-sort-down-full +
    +
  • + +
+
+

font-class 引用

+
+ +

font-class 是 Unicode 使用方式的一种变种,主要是解决 Unicode 书写不直观,语意不明确的问题。

+

与 Unicode 使用方式相比,具有如下特点:

+
    +
  • 相比于 Unicode 语意明确,书写更直观。可以很容易分辨这个 icon 是什么。
  • +
  • 因为使用 class 来定义图标,所以当要替换图标时,只需要修改 class 里面的 Unicode 引用。
  • +
+

使用步骤如下:

+

第一步:引入项目下面生成的 fontclass 代码:

+
<link rel="stylesheet" href="./iconfont.css">
+
+

第二步:挑选相应图标并获取类名,应用于页面:

+
<span class="iconfont icon-xxx"></span>
+
+
+

" + iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。

+
+
+
+
+
    + +
  • + +
    导航
    +
    #icon-daohang
    +
  • + +
  • + +
    删除
    +
    #icon-shanchu
    +
  • + +
  • + +
    已发货
    +
    #icon-yifahuo
    +
  • + +
  • + +
    待配布
    +
    #icon-daipeibu
    +
  • + +
  • + +
    邀请团队
    +
    #icon-yaoqingtuandui
    +
  • + +
  • + +
    退款、售后
    +
    #icon-a-tuikuanshouhou
    +
  • + +
  • + +
    待付款
    +
    #icon-daifukuan
    +
  • + +
  • + +
    设置
    +
    #icon-shezhi
    +
  • + +
  • + +
    颜色对比
    +
    #icon-yanseduibi
    +
  • + +
  • + +
    待发货
    +
    #icon-daifahuo
    +
  • + +
  • + +
    包裹
    +
    #icon-baoguo
    +
  • + +
  • + +
    tick-pressed
    +
    #icon-tick-pressed
    +
  • + +
  • + +
    我的-pressed
    +
    #icon-wode-pressed
    +
  • + +
  • + +
    分类-pressed
    +
    #icon-fenlei-pressed
    +
  • + +
  • + +
    搜索
    +
    #icon-sousuo
    +
  • + +
  • + +
    分享
    +
    #icon-fenxiang
    +
  • + +
  • + +
    筛选
    +
    #icon-shaixuan
    +
  • + +
  • + +
    购物车
    +
    #icon-gouwuche
    +
  • + +
  • + +
    清空
    +
    #icon-qingkong
    +
  • + +
  • + +
    +
    #icon-jia
    +
  • + +
  • + +
    +
    #icon-jian
    +
  • + +
  • + +
    收藏-pressed
    +
    #icon-shoucang-pressed
    +
  • + +
  • + +
    收藏
    +
    #icon-shoucang
    +
  • + +
  • + +
    phone
    +
    #icon-phone
    +
  • + +
  • + +
    tick
    +
    #icon-tick
    +
  • + +
  • + +
    more,back
    +
    #icon-a-moreback
    +
  • + +
  • + +
    分类
    +
    #icon-fenlei
    +
  • + +
  • + +
    编辑
    +
    #icon-bianji
    +
  • + +
  • + +
    我的
    +
    #icon-wode
    +
  • + +
  • + +
    排序,升序
    +
    #icon-sort-up-full
    +
  • + +
  • + +
    排序,降序
    +
    #icon-sort-down-full
    +
  • + +
+
+

Symbol 引用

+
+ +

这是一种全新的使用方式,应该说这才是未来的主流,也是平台目前推荐的用法。相关介绍可以参考这篇文章 + 这种用法其实是做了一个 SVG 的集合,与另外两种相比具有如下特点:

+
    +
  • 支持多色图标了,不再受单色限制。
  • +
  • 通过一些技巧,支持像字体那样,通过 font-size, color 来调整样式。
  • +
  • 兼容性较差,支持 IE9+,及现代浏览器。
  • +
  • 浏览器渲染 SVG 的性能一般,还不如 png。
  • +
+

使用步骤如下:

+

第一步:引入项目下面生成的 symbol 代码:

+
<script src="./iconfont.js"></script>
+
+

第二步:加入通用 CSS 代码(引入一次就行):

+
<style>
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+</style>
+
+

第三步:挑选相应图标并获取类名,应用于页面:

+
<svg class="icon" aria-hidden="true">
+  <use xlink:href="#icon-xxx"></use>
+</svg>
+
+
+
+ +
+
+ + + diff --git a/src/styles/bak/iconfont.scss b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.css similarity index 60% rename from src/styles/bak/iconfont.scss rename to src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.css index 868bd5f..b3cfe6f 100644 --- a/src/styles/bak/iconfont.scss +++ b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.css @@ -1,7 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2987621 */ - src: - url('iconfont.ttf?t=1650013104232') format('truetype'); + src: url('iconfont.woff2?t=1652427368246') format('woff2'), + url('iconfont.woff?t=1652427368246') format('woff'), + url('iconfont.ttf?t=1652427368246') format('truetype'); } .iconfont { @@ -12,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-daohang:before { + content: "\e664"; +} + +.icon-shanchu:before { + content: "\e663"; +} + .icon-yifahuo:before { content: "\e65b"; } @@ -86,4 +95,45 @@ .icon-jian:before { content: "\e64e"; -} \ No newline at end of file +} + +.icon-shoucang-pressed:before { + content: "\e64f"; +} + +.icon-shoucang:before { + content: "\e650"; +} + +.icon-phone:before { + content: "\e651"; +} + +.icon-tick:before { + content: "\e653"; +} + +.icon-a-moreback:before { + content: "\e654"; +} + +.icon-fenlei:before { + content: "\e657"; +} + +.icon-bianji:before { + content: "\e658"; +} + +.icon-wode:before { + content: "\e659"; +} + +.icon-sort-up-full:before { + content: "\ea4c"; +} + +.icon-sort-down-full:before { + content: "\ea4d"; +} + diff --git a/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.js b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.js new file mode 100644 index 0000000..043dece --- /dev/null +++ b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.js @@ -0,0 +1 @@ +!function(a){var t,h,l,o,i,e='',d=(d=document.getElementsByTagName("script"))[d.length-1].getAttribute("data-injectcss"),p=function(a,t){t.parentNode.insertBefore(a,t)};if(d&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function z(){i||(i=!0,l())}function n(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}z()}t=function(){var a,t=document.createElement("div");t.innerHTML=e,e=null,(t=t.getElementsByTagName("svg")[0])&&(t.setAttribute("aria-hidden","true"),t.style.position="absolute",t.style.width=0,t.style.height=0,t.style.overflow="hidden",t=t,(a=document.body).firstChild?p(t,a.firstChild):a.appendChild(t))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),t()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(l=t,o=a.document,i=!1,n(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,z())})}(window); \ No newline at end of file diff --git a/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.json b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.json new file mode 100644 index 0000000..b949949 --- /dev/null +++ b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.json @@ -0,0 +1,226 @@ +{ + "id": "2987621", + "name": "电子商城", + "font_family": "iconfont", + "css_prefix_text": "icon-", + "description": "", + "glyphs": [ + { + "icon_id": "29692046", + "name": "导航", + "font_class": "daohang", + "unicode": "e664", + "unicode_decimal": 58980 + }, + { + "icon_id": "29588731", + "name": "删除", + "font_class": "shanchu", + "unicode": "e663", + "unicode_decimal": 58979 + }, + { + "icon_id": "29349174", + "name": "已发货", + "font_class": "yifahuo", + "unicode": "e65b", + "unicode_decimal": 58971 + }, + { + "icon_id": "29349143", + "name": "待配布", + "font_class": "daipeibu", + "unicode": "e662", + "unicode_decimal": 58978 + }, + { + "icon_id": "29346808", + "name": "邀请团队", + "font_class": "yaoqingtuandui", + "unicode": "e65a", + "unicode_decimal": 58970 + }, + { + "icon_id": "29346810", + "name": "退款、售后", + "font_class": "a-tuikuanshouhou", + "unicode": "e65c", + "unicode_decimal": 58972 + }, + { + "icon_id": "29346811", + "name": "待付款", + "font_class": "daifukuan", + "unicode": "e65d", + "unicode_decimal": 58973 + }, + { + "icon_id": "29346812", + "name": "设置", + "font_class": "shezhi", + "unicode": "e65e", + "unicode_decimal": 58974 + }, + { + "icon_id": "29346813", + "name": "颜色对比", + "font_class": "yanseduibi", + "unicode": "e65f", + "unicode_decimal": 58975 + }, + { + "icon_id": "29346814", + "name": "待发货", + "font_class": "daifahuo", + "unicode": "e660", + "unicode_decimal": 58976 + }, + { + "icon_id": "29346815", + "name": "包裹", + "font_class": "baoguo", + "unicode": "e661", + "unicode_decimal": 58977 + }, + { + "icon_id": "29240262", + "name": "tick-pressed", + "font_class": "tick-pressed", + "unicode": "e652", + "unicode_decimal": 58962 + }, + { + "icon_id": "29240263", + "name": "我的-pressed", + "font_class": "wode-pressed", + "unicode": "e655", + "unicode_decimal": 58965 + }, + { + "icon_id": "29240264", + "name": "分类-pressed", + "font_class": "fenlei-pressed", + "unicode": "e656", + "unicode_decimal": 58966 + }, + { + "icon_id": "29240057", + "name": "搜索", + "font_class": "sousuo", + "unicode": "e647", + "unicode_decimal": 58951 + }, + { + "icon_id": "29240058", + "name": "分享", + "font_class": "fenxiang", + "unicode": "e648", + "unicode_decimal": 58952 + }, + { + "icon_id": "29240059", + "name": "筛选", + "font_class": "shaixuan", + "unicode": "e649", + "unicode_decimal": 58953 + }, + { + "icon_id": "29240060", + "name": "购物车", + "font_class": "gouwuche", + "unicode": "e64a", + "unicode_decimal": 58954 + }, + { + "icon_id": "29240062", + "name": "清空", + "font_class": "qingkong", + "unicode": "e64c", + "unicode_decimal": 58956 + }, + { + "icon_id": "29240063", + "name": "加", + "font_class": "jia", + "unicode": "e64d", + "unicode_decimal": 58957 + }, + { + "icon_id": "29240064", + "name": "减", + "font_class": "jian", + "unicode": "e64e", + "unicode_decimal": 58958 + }, + { + "icon_id": "29240065", + "name": "收藏-pressed", + "font_class": "shoucang-pressed", + "unicode": "e64f", + "unicode_decimal": 58959 + }, + { + "icon_id": "29240066", + "name": "收藏", + "font_class": "shoucang", + "unicode": "e650", + "unicode_decimal": 58960 + }, + { + "icon_id": "29240067", + "name": "phone", + "font_class": "phone", + "unicode": "e651", + "unicode_decimal": 58961 + }, + { + "icon_id": "29240069", + "name": "tick", + "font_class": "tick", + "unicode": "e653", + "unicode_decimal": 58963 + }, + { + "icon_id": "29240070", + "name": "more,back", + "font_class": "a-moreback", + "unicode": "e654", + "unicode_decimal": 58964 + }, + { + "icon_id": "29240073", + "name": "分类", + "font_class": "fenlei", + "unicode": "e657", + "unicode_decimal": 58967 + }, + { + "icon_id": "29240074", + "name": "编辑", + "font_class": "bianji", + "unicode": "e658", + "unicode_decimal": 58968 + }, + { + "icon_id": "29240075", + "name": "我的", + "font_class": "wode", + "unicode": "e659", + "unicode_decimal": 58969 + }, + { + "icon_id": "18174913", + "name": "排序,升序", + "font_class": "sort-up-full", + "unicode": "ea4c", + "unicode_decimal": 59980 + }, + { + "icon_id": "18174920", + "name": "排序,降序", + "font_class": "sort-down-full", + "unicode": "ea4d", + "unicode_decimal": 59981 + } + ] +} diff --git a/src/styles/bak/iconfont.ttf b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.ttf similarity index 78% rename from src/styles/bak/iconfont.ttf rename to src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.ttf index 02f0408..13d9375 100644 Binary files a/src/styles/bak/iconfont.ttf and b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.ttf differ diff --git a/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.woff b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.woff new file mode 100644 index 0000000..4bbadc2 Binary files /dev/null and b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.woff differ diff --git a/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.woff2 b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.woff2 new file mode 100644 index 0000000..20b6fdf Binary files /dev/null and b/src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.woff2 differ diff --git a/src/styles/iconfont.scss b/src/styles/iconfont.scss index 92fec06..5eb33fc 100644 --- a/src/styles/iconfont.scss +++ b/src/styles/iconfont.scss @@ -1,6 +1,6 @@ @font-face { font-family: "iconfont"; /* Project id 2987621 */ - src:url('iconfont.ttf?t=1652068398646') format('truetype'); + src: url('iconfont.ttf?t=1652427368246') format('truetype'); } .iconfont { @@ -11,6 +11,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-daohang:before { + content: "\e664"; +} + .icon-shanchu:before { content: "\e663"; } @@ -129,4 +133,5 @@ .icon-sort-down-full:before { content: "\ea4d"; -} \ No newline at end of file +} + diff --git a/src/styles/iconfont.ttf b/src/styles/iconfont.ttf index 8b37876..13d9375 100644 Binary files a/src/styles/iconfont.ttf and b/src/styles/iconfont.ttf differ diff --git a/src/use/useCommonData.ts b/src/use/useCommonData.ts new file mode 100644 index 0000000..eebefef --- /dev/null +++ b/src/use/useCommonData.ts @@ -0,0 +1,23 @@ +import { useDispatch } from 'react-redux' +import {SET_COMMON, CLEAR_COMMON} from '@/constants/common' +import {useSelector} from '@/reducers/hooks' +/** + * 这个hook 用来临时存储数据用 + */ +export default () => { + const {common: commonData} = useSelector(state => state.commonData) + const dispatch = useDispatch() + const setCommonData = (val:any) => { + dispatch({type:SET_COMMON, data:val}) + } + + const removeCommonData = () => { + dispatch({type:CLEAR_COMMON}) + } + + return { + setCommonData, + removeCommonData, + commonData + } +} \ No newline at end of file