对接确认订单

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"
       ]
     }
   ]

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
-}

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
+}

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%;

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(formatPriceDiv(price))
-        return Number(num)
     }, [])
 
     //格式化数量
     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) => {
                     <View className={styles.header}>
                         <View onClick={selectAll}>{!selectStatus?'全选':'反选'}</View>
                         <View onClick={delSelect}>
-                            <text className={classnames('iconfont', 'icon-lajixiang', styles.miconfont)}></text>
+                            <text className={classnames('iconfont', 'icon-shanchu', styles.miconfont)}></text>
-                            删除勾选项
+                            删除所选
                         </View>
                     </View>
                     <View className={styles.search}>
@@ -223,7 +224,7 @@ export default ({show = false, onClose}: param) => {
                     </View>
                     <View className={styles.con}>
                         {loading&&<LoadingCard/>}
-                        {!loading&&list?.length > 0&&<InfiniteScroll  refresherTriggered={true} refresherEnabled={true} moreStatus={false} >
+                        {!loading&&list?.length > 0&&<InfiniteScroll  moreStatus={false} >
                             <View className={styles.product_list}>
                                 {list?.map((item, index) => {
                                     return <View key={index} className={classnames(styles.product_item, (selectIndex!=-1&&selectIndex!= item.sale_mode)&&styles.no_product_item_select)}>
@@ -239,7 +240,7 @@ export default ({show = false, onClose}: param) => {
                                             <View className={styles.tag}>{item.sale_mode_name}</View>
                                         </View>
                                         <View className={styles.count}>
-                                            <View className={styles.price}><text>￥</text>{formatPirce(item.sale_price)}<text>/kg</text></View>
+                                            <View className={styles.price}><text>￥</text>{formatPirce(item.sale_price)}<text>/{selectList[selectIndex].eunit}</text></View>
                                             <View className={styles.long}>×{formatCount(item)}</View>
                                         </View>
                                     </View>

src/constants/common.ts

@@ -0,0 +1,2 @@
+export const SET_COMMON = 'setCommon'
+export const CLEAR_COMMON = 'clearCommon'

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 <View className={styles.priceText}><Text>¥</Text>{price}<Text> /{selectList[selectIndex].eunit}</Text></View> 
     }, [selectIndex])
 

src/pages/details/components/swiper/index.tsx

@@ -21,7 +21,6 @@ export default ({list = []}: params) => {
         setPageIndex(e.detail.current + 1)
     }
     
-
     return (
         <View className={styles.swiper}>
             <Swiper className={styles.swiper_item} circular={true}   onAnimationFinish={(e) => swiperChange(e)}>

src/pages/index/index.tsx

@@ -86,9 +86,7 @@ export default () => {
     setRefresherTriggeredStatus(true)
   }
 
- 
 
-  
   //页面下拉刷新
   // const res = useManualPullDownRefresh()
   usePullDownRefresh(() => {

src/pages/order/comfirm.config.ts

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '确认订单'
+}

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;
+        }
+
+    }
+}

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<OrderParams>()
+
+    //获取购物车传过来的id
+    type orderPreParam = {shopping_cart_product_color_list:{shopping_cart_product_color_id:number}[], sale_mode:number}
+    const param = getParam()
+    const idsAndSaleModel = useRef<orderPreParam>({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<preViewOrderParam>() //获取到的原始数据
+    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<any>() //格式化后的数据
+    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 (
+        <View className={styles.order_main}>
+            <View className={styles.order_title}>
+                <Text>收货方式</Text>
+                {shipmentMode.current.map(item => {
+                    return <View className={classnames(styles.order_status, (submitOrder?.shipment_mode == item.value)&&styles.order_status_selected)} onClick={() => selectShipmentMode(item.value)}>{item.label}</View>
+                })}              
+            </View>
+            <AddressInfo onSelect={(e) => getAddress(e)}/>
+            <KindList value={formatPreViewOrderMemo}/>
+            <View className={styles.order_desc} onClick={() => setShowDesc(true)}>
+                <View className={styles.order_desc_con}>订单备注</View>
+                <View className={styles.order_desc_text}>点击填写</View>
+                <View className={classnames(styles.miconfont, 'iconfont icon-jiantou')}></View>
+            </View>
+            <View className={styles.submit_order}>
+                <View className={styles.submit_order_number}>
+                    <EstimatedAmount style={{color:'#007AFF'}} number={formatPriceDiv(formatPreViewOrder?.estimate_amount)}/>    
+                    <View className={styles.order_number_desc}>{`${formatPreViewOrder?.list.length}种面料，${formatPreViewOrder?.colo_count}种颜色，共${formatPreViewOrder?.num_count + formatPreViewOrder?.unit}`}</View>
+                </View>
+                <View className={classnames(styles.order_btn)}>提交订单2{btnStatus?'true':'false'}</View>    
+            </View>        
+            <Popup show={showDesc} showTitle={false} onClose={() => setShowDesc(false)} >
+                <Remark onSave={(e) => getRemark(e)}/>
+            </Popup>
+            <View className="common_safe_area_y"></View>
+        </View>
+    )
+ }

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;

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<any>()
+    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 (
         <View>
             <View className={styles.order_address} onClick={() => setShowAddressList(true)}>
-                <View className={classnames(styles.order_address_icon, 'iconfont icon-shaixuan')}></View>
+                <View className={classnames(styles.order_address_icon, 'iconfont icon-daohang')}></View>
-                {/* <View className={styles.order_address_text_no}>请选择收货地址及信息</View> */}
+                {!userInfo&&<View className={styles.order_address_text_no}>请选择收货地址及信息</View>||
                 <View className={styles.order_address_text_con}>
-                    <View className={styles.order_address_text_title}>**省**市**区**街道****仓库**省**市**区**街道****仓库</View>
+                    <View className={styles.order_address_text_title}>{formatAddress}</View>
                     <View className={styles.order_address_text_name}>
-                        <Text>陈先生</Text>
+                        <Text>{userInfo?.name}</Text>
-                        <Text>1818877790</Text>
+                        <Text>{userInfo?.phone}</Text>
                     </View>
-                </View>
+                </View>}
-                <View className={classnames(styles.order_address_more_icon, 'iconfont icon-jiantou')}></View>
+                <View className={classnames(styles.order_address_more_icon, 'iconfont icon-a-moreback')}></View>
             </View>
             <Popup show={showAddressList} showTitle={false} onClose={() => setShowAddressList(false)}>
                 <View className={styles.order_address_list}>
-                    <View className={styles.order_address_title}>选择收货地址</View>
+                    <View className={styles.order_address_title}>请选择收货地址</View>
-                    <AddressList onSelect={(item, index) => console.log(index, item)}/>
+                    <AddressList onSelect={(item) => getAddress(item)}/>
                 </View>
             </Popup>
         </View>
     )
-}
+})

src/pages/order/components/estimatedAmount/index.tsx

@@ -14,14 +14,11 @@ export default ({style, number = 0}:Param) => {
         return (
             <>
                 <Text>¥</Text>
-                <Text>{formatPrice(int_num)}</Text>
+                <Text>{Number(int_num).toLocaleString()}</Text>
                 <Text>.{decimals_num}</Text>
             </>
         )
     }, [number])
-    const formatPrice = useCallback((number: string) => {
-        return formatKbPrice(number)
-    }, [])
     return (
         <View className={styles.order_price}>
             <Text className={styles.order_price_text}>预估金额</Text>

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;

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 () => {
+type OrderParam = {
-    const [price, setPrice] = useState(123000.33)
+    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 (
         <>
             <View className={styles.orders_list_con}>
-                <View className={styles.order_list}>
+                {
-                    <View className={styles.order_list_title}>
+                    value?.list.map(item => {
-                        <View className={styles.tag}>大货</View>
+                        return <View key={item.product_code} className={styles.order_list}>
-                        <View className={styles.title}>0770# 21S单面平纹(食毛)</View>
+                            <View className={styles.order_list_title}>
-                        <View className={styles.num}>共3种</View>
+                                <View className={styles.tag}>{item.sale_mode_name}</View>
-                    </View>
+                                <View className={styles.title}>{formatHashTag(item.product_code, item.product_name)}</View>
-                    <View className={styles.order_list_scroll}>
+                                <View className={styles.num}>共{item.color_list.length}种</View>
-                        <View className={styles.order_list_item}>
+                            </View>
-                            <View className={styles.order_list_item_img}></View>
+                            <View className={styles.order_list_scroll}>
-                            <View className={styles.order_list_item_con}>
+                                {item.color_list?.map(colorItem => {
-                                <View className={styles.order_list_item_des}>
+                                    return <View className={styles.order_list_item}>
-                                    <View className={styles.order_list_item_title}>1# 薄荷绿</View>
+                                        <View className={styles.order_list_item_img}></View>
-                                    <View className={styles.order_list_item_price}>¥40/kg</View>
+                                        <View className={styles.order_list_item_con}>
-                                </View>
+                                            <View className={styles.order_list_item_des}>
-                                <View className={styles.order_list_item_count}>
+                                                <View className={styles.order_list_item_title}>{colorItem.product_color_code + ' ' + colorItem.product_color_name}</View>
-                                    <View className={styles.count_num}>×1<text>条</text></View>
+                                                <View className={styles.order_list_item_price}>¥{standardPrice(colorItem)}</View>
-                                    <View className={styles.count_price}><text>¥</text>1,000.5</View>
+                                            </View>
-                                </View>
+                                            <View className={styles.order_list_item_count}>
+                                                <View className={styles.count_num}>×{formatCount(colorItem)}<text>{value.unit}</text></View>
+                                                <View className={styles.count_price}><text>¥</text>{formatPriceDiv(colorItem.estimate_amount).toLocaleString()}</View>
+                                            </View>
+                                        </View>
+                                    </View>
+                                })}
                             </View>
                         </View>
-                        <View className={styles.order_list_item}>
+                    })
-                            <View className={styles.order_list_item_img}></View>
+                }
-                            <View className={styles.order_list_item_con}>
-                                <View className={styles.order_list_item_des}>
-                                    <View className={styles.order_list_item_title}>1# 薄荷绿</View>
-                                    <View className={styles.order_list_item_price}>¥40/kg</View>
-                                </View>
-                                <View className={styles.order_list_item_count}>
-                                    <View className={styles.count_num}>×1<text>条</text></View>
-                                    <View className={styles.count_price}><text>¥</text>1,000.5</View>
-                                </View>
-                            </View>
-                        </View>
-                    </View>
-                </View>
-                <View className={styles.order_list}>
-                    <View className={styles.order_list_title}>
-                        <View className={styles.tag}>大货</View>
-                        <View className={styles.title}>0770# 21S单面平纹(食毛)</View>
-                        <View className={styles.num}>共3种</View>
-                    </View>
-                    <View className={styles.order_list_scroll}>
-                        <View className={styles.order_list_item}>
-                            <View className={styles.order_list_item_img}></View>
-                            <View className={styles.order_list_item_con}>
-                                <View className={styles.order_list_item_des}>
-                                    <View className={styles.order_list_item_title}>1# 薄荷绿</View>
-                                    <View className={styles.order_list_item_price}>¥40/kg</View>
-                                </View>
-                                <View className={styles.order_list_item_count}>
-                                    <View className={styles.count_num}>×1<text>条</text></View>
-                                    <View className={styles.count_price}><text>¥</text>1,000.5</View>
-                                </View>
-                            </View>
-                        </View>
-                        <View className={styles.order_list_item}>
-                            <View className={styles.order_list_item_img}></View>
-                            <View className={styles.order_list_item_con}>
-                                <View className={styles.order_list_item_des}>
-                                    <View className={styles.order_list_item_title}>1# 薄荷绿</View>
-                                    <View className={styles.order_list_item_price}>¥40/kg</View>
-                                </View>
-                                <View className={styles.order_list_item_count}>
-                                    <View className={styles.count_num}>×1<text>条</text></View>
-                                    <View className={styles.count_price}><text>¥</text>1,000.5</View>
-                                </View>
-                            </View>
-                        </View>
-                    </View>
-                </View>
                 <View className={styles.order_estimated_amount}>
-                    <EstimatedAmount number={price}/>    
+                    <EstimatedAmount number={formatPriceDiv(value?.estimate_amount)}/>    
-                    <View className={styles.order_price_des}>（按照25kg/条, 预估金额）</View>
+                    {/* <View className={styles.order_price_des}>（按照25kg/条, 预估金额）</View> */}
                 </View>
             </View>
         </>
     )
-}
+})

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<preViewOrderParam>()
+    const [preViewOrder, setPreViewOrder] = useState<preViewOrderParam>() //获取到的原始数据
     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<any>() //格式化后的数据
     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 (
         <View className={styles.order_main}>
             <OrderState state="预约中" desc="客服已接单，等待仓库配布出单..."/>
@@ -83,7 +105,7 @@ import styles  from './index.module.scss'
                 <View className={styles.order_status}>上门自提</View>                
             </View>
             <AddressInfo/>
-            <KindList/>
+            <KindList value={formatPreViewOrderMemo}/>
             <View className={styles.order_desc} onClick={() => setShowDesc(true)}>
                 <View className={styles.order_desc_con}>订单备注</View>
                 <View className={styles.order_desc_text}>点击填写</View>
@@ -103,8 +125,8 @@ import styles  from './index.module.scss'
             </View>
             <View className={styles.submit_order}>
                 <View className={styles.submit_order_number}>
-                    <EstimatedAmount style={{color:'#007AFF'}} number={price}/>    
+                    <EstimatedAmount style={{color:'#007AFF'}} number={formatPriceDiv(formatPreViewOrder?.estimate_amount)}/>    
-                    <View className={styles.order_number_desc}>2种面料，6种颜色，共6条</View>
+                    <View className={styles.order_number_desc}>{`${formatPreViewOrder?.list.length}种面料，${formatPreViewOrder?.colo_count}种颜色，共${formatPreViewOrder?.num_count + formatPreViewOrder?.unit}`}</View>
                 </View>
                 <View className={styles.order_btn}>提交订单</View>    
             </View>        

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
+    }
+}

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<Params> = useReduxSelector;

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
 })

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;
+}

src/styles/download (2)/font_2987621_l1qavt5630a/demo_index.html

@@ -0,0 +1,901 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2987621" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe664;</span>
+                <div class="name">导航</div>
+                <div class="code-name">&amp;#xe664;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe663;</span>
+                <div class="name">删除</div>
+                <div class="code-name">&amp;#xe663;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65b;</span>
+                <div class="name">已发货</div>
+                <div class="code-name">&amp;#xe65b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe662;</span>
+                <div class="name">待配布</div>
+                <div class="code-name">&amp;#xe662;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65a;</span>
+                <div class="name">邀请团队</div>
+                <div class="code-name">&amp;#xe65a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65c;</span>
+                <div class="name">退款、售后</div>
+                <div class="code-name">&amp;#xe65c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65d;</span>
+                <div class="name">待付款</div>
+                <div class="code-name">&amp;#xe65d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65e;</span>
+                <div class="name">设置</div>
+                <div class="code-name">&amp;#xe65e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65f;</span>
+                <div class="name">颜色对比</div>
+                <div class="code-name">&amp;#xe65f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe660;</span>
+                <div class="name">待发货</div>
+                <div class="code-name">&amp;#xe660;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe661;</span>
+                <div class="name">包裹</div>
+                <div class="code-name">&amp;#xe661;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe652;</span>
+                <div class="name">tick-pressed</div>
+                <div class="code-name">&amp;#xe652;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe655;</span>
+                <div class="name">我的-pressed</div>
+                <div class="code-name">&amp;#xe655;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe656;</span>
+                <div class="name">分类-pressed</div>
+                <div class="code-name">&amp;#xe656;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe647;</span>
+                <div class="name">搜索</div>
+                <div class="code-name">&amp;#xe647;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe648;</span>
+                <div class="name">分享</div>
+                <div class="code-name">&amp;#xe648;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe649;</span>
+                <div class="name">筛选</div>
+                <div class="code-name">&amp;#xe649;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64a;</span>
+                <div class="name">购物车</div>
+                <div class="code-name">&amp;#xe64a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64c;</span>
+                <div class="name">清空</div>
+                <div class="code-name">&amp;#xe64c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64d;</span>
+                <div class="name">加</div>
+                <div class="code-name">&amp;#xe64d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64e;</span>
+                <div class="name">减</div>
+                <div class="code-name">&amp;#xe64e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe64f;</span>
+                <div class="name">收藏-pressed</div>
+                <div class="code-name">&amp;#xe64f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe650;</span>
+                <div class="name">收藏</div>
+                <div class="code-name">&amp;#xe650;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe651;</span>
+                <div class="name">phone</div>
+                <div class="code-name">&amp;#xe651;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe653;</span>
+                <div class="name">tick</div>
+                <div class="code-name">&amp;#xe653;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe654;</span>
+                <div class="name">more,back</div>
+                <div class="code-name">&amp;#xe654;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe657;</span>
+                <div class="name">分类</div>
+                <div class="code-name">&amp;#xe657;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe658;</span>
+                <div class="name">编辑</div>
+                <div class="code-name">&amp;#xe658;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe659;</span>
+                <div class="name">我的</div>
+                <div class="code-name">&amp;#xe659;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea4c;</span>
+                <div class="name">排序,升序</div>
+                <div class="code-name">&amp;#xea4c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xea4d;</span>
+                <div class="name">排序,降序</div>
+                <div class="code-name">&amp;#xea4d;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
+            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下：</p>
+          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@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');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-daohang"></span>
+            <div class="name">
+              导航
+            </div>
+            <div class="code-name">.icon-daohang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shanchu"></span>
+            <div class="name">
+              删除
+            </div>
+            <div class="code-name">.icon-shanchu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yifahuo"></span>
+            <div class="name">
+              已发货
+            </div>
+            <div class="code-name">.icon-yifahuo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-daipeibu"></span>
+            <div class="name">
+              待配布
+            </div>
+            <div class="code-name">.icon-daipeibu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yaoqingtuandui"></span>
+            <div class="name">
+              邀请团队
+            </div>
+            <div class="code-name">.icon-yaoqingtuandui
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-a-tuikuanshouhou"></span>
+            <div class="name">
+              退款、售后
+            </div>
+            <div class="code-name">.icon-a-tuikuanshouhou
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-daifukuan"></span>
+            <div class="name">
+              待付款
+            </div>
+            <div class="code-name">.icon-daifukuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shezhi"></span>
+            <div class="name">
+              设置
+            </div>
+            <div class="code-name">.icon-shezhi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yanseduibi"></span>
+            <div class="name">
+              颜色对比
+            </div>
+            <div class="code-name">.icon-yanseduibi
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-daifahuo"></span>
+            <div class="name">
+              待发货
+            </div>
+            <div class="code-name">.icon-daifahuo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-baoguo"></span>
+            <div class="name">
+              包裹
+            </div>
+            <div class="code-name">.icon-baoguo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tick-pressed"></span>
+            <div class="name">
+              tick-pressed
+            </div>
+            <div class="code-name">.icon-tick-pressed
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-wode-pressed"></span>
+            <div class="name">
+              我的-pressed
+            </div>
+            <div class="code-name">.icon-wode-pressed
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fenlei-pressed"></span>
+            <div class="name">
+              分类-pressed
+            </div>
+            <div class="code-name">.icon-fenlei-pressed
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-sousuo"></span>
+            <div class="name">
+              搜索
+            </div>
+            <div class="code-name">.icon-sousuo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fenxiang"></span>
+            <div class="name">
+              分享
+            </div>
+            <div class="code-name">.icon-fenxiang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shaixuan"></span>
+            <div class="name">
+              筛选
+            </div>
+            <div class="code-name">.icon-shaixuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-gouwuche"></span>
+            <div class="name">
+              购物车
+            </div>
+            <div class="code-name">.icon-gouwuche
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-qingkong"></span>
+            <div class="name">
+              清空
+            </div>
+            <div class="code-name">.icon-qingkong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jia"></span>
+            <div class="name">
+              加
+            </div>
+            <div class="code-name">.icon-jia
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jian"></span>
+            <div class="name">
+              减
+            </div>
+            <div class="code-name">.icon-jian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shoucang-pressed"></span>
+            <div class="name">
+              收藏-pressed
+            </div>
+            <div class="code-name">.icon-shoucang-pressed
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shoucang"></span>
+            <div class="name">
+              收藏
+            </div>
+            <div class="code-name">.icon-shoucang
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-phone"></span>
+            <div class="name">
+              phone
+            </div>
+            <div class="code-name">.icon-phone
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tick"></span>
+            <div class="name">
+              tick
+            </div>
+            <div class="code-name">.icon-tick
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-a-moreback"></span>
+            <div class="name">
+              more,back
+            </div>
+            <div class="code-name">.icon-a-moreback
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fenlei"></span>
+            <div class="name">
+              分类
+            </div>
+            <div class="code-name">.icon-fenlei
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-bianji"></span>
+            <div class="name">
+              编辑
+            </div>
+            <div class="code-name">.icon-bianji
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-wode"></span>
+            <div class="name">
+              我的
+            </div>
+            <div class="code-name">.icon-wode
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-sort-up-full"></span>
+            <div class="name">
+              排序,升序
+            </div>
+            <div class="code-name">.icon-sort-up-full
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-sort-down-full"></span>
+            <div class="name">
+              排序,降序
+            </div>
+            <div class="code-name">.icon-sort-down-full
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比，具有如下特点：</p>
+        <ul>
+          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下：</p>
+        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-daohang"></use>
+                </svg>
+                <div class="name">导航</div>
+                <div class="code-name">#icon-daohang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shanchu"></use>
+                </svg>
+                <div class="name">删除</div>
+                <div class="code-name">#icon-shanchu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yifahuo"></use>
+                </svg>
+                <div class="name">已发货</div>
+                <div class="code-name">#icon-yifahuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-daipeibu"></use>
+                </svg>
+                <div class="name">待配布</div>
+                <div class="code-name">#icon-daipeibu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yaoqingtuandui"></use>
+                </svg>
+                <div class="name">邀请团队</div>
+                <div class="code-name">#icon-yaoqingtuandui</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-tuikuanshouhou"></use>
+                </svg>
+                <div class="name">退款、售后</div>
+                <div class="code-name">#icon-a-tuikuanshouhou</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-daifukuan"></use>
+                </svg>
+                <div class="name">待付款</div>
+                <div class="code-name">#icon-daifukuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shezhi"></use>
+                </svg>
+                <div class="name">设置</div>
+                <div class="code-name">#icon-shezhi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yanseduibi"></use>
+                </svg>
+                <div class="name">颜色对比</div>
+                <div class="code-name">#icon-yanseduibi</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-daifahuo"></use>
+                </svg>
+                <div class="name">待发货</div>
+                <div class="code-name">#icon-daifahuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-baoguo"></use>
+                </svg>
+                <div class="name">包裹</div>
+                <div class="code-name">#icon-baoguo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tick-pressed"></use>
+                </svg>
+                <div class="name">tick-pressed</div>
+                <div class="code-name">#icon-tick-pressed</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wode-pressed"></use>
+                </svg>
+                <div class="name">我的-pressed</div>
+                <div class="code-name">#icon-wode-pressed</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fenlei-pressed"></use>
+                </svg>
+                <div class="name">分类-pressed</div>
+                <div class="code-name">#icon-fenlei-pressed</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sousuo"></use>
+                </svg>
+                <div class="name">搜索</div>
+                <div class="code-name">#icon-sousuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fenxiang"></use>
+                </svg>
+                <div class="name">分享</div>
+                <div class="code-name">#icon-fenxiang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shaixuan"></use>
+                </svg>
+                <div class="name">筛选</div>
+                <div class="code-name">#icon-shaixuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-gouwuche"></use>
+                </svg>
+                <div class="name">购物车</div>
+                <div class="code-name">#icon-gouwuche</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-qingkong"></use>
+                </svg>
+                <div class="name">清空</div>
+                <div class="code-name">#icon-qingkong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jia"></use>
+                </svg>
+                <div class="name">加</div>
+                <div class="code-name">#icon-jia</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jian"></use>
+                </svg>
+                <div class="name">减</div>
+                <div class="code-name">#icon-jian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shoucang-pressed"></use>
+                </svg>
+                <div class="name">收藏-pressed</div>
+                <div class="code-name">#icon-shoucang-pressed</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shoucang"></use>
+                </svg>
+                <div class="name">收藏</div>
+                <div class="code-name">#icon-shoucang</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-phone"></use>
+                </svg>
+                <div class="name">phone</div>
+                <div class="code-name">#icon-phone</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tick"></use>
+                </svg>
+                <div class="name">tick</div>
+                <div class="code-name">#icon-tick</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-moreback"></use>
+                </svg>
+                <div class="name">more,back</div>
+                <div class="code-name">#icon-a-moreback</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fenlei"></use>
+                </svg>
+                <div class="name">分类</div>
+                <div class="code-name">#icon-fenlei</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-bianji"></use>
+                </svg>
+                <div class="name">编辑</div>
+                <div class="code-name">#icon-bianji</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wode"></use>
+                </svg>
+                <div class="name">我的</div>
+                <div class="code-name">#icon-wode</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sort-up-full"></use>
+                </svg>
+                <div class="name">排序,升序</div>
+                <div class="code-name">#icon-sort-up-full</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sort-down-full"></use>
+                </svg>
+                <div class="name">排序,降序</div>
+                <div class="code-name">#icon-sort-down-full</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
+          <ul>
+            <li>支持多色图标了，不再受单色限制。</li>
+            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
+          </ul>
+          <p>使用步骤如下：</p>
+          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

src/styles/download (2)/font_2987621_l1qavt5630a/iconfont.css

@@ -1,7 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2987621 */
-  src: 
+  src: url('iconfont.woff2?t=1652427368246') format('woff2'),
-       url('iconfont.ttf?t=1650013104232') format('truetype');
+       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";
-}
+}
+
+.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";
+}
+

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
+    }
+  ]
+}

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";
-}
+}
+

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
+    }
+}