diff --git a/.eslintrc b/.eslintrc
index ec9427d..430d6ac 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +1,5 @@
{
- "extends": ["taro/react"],
+ "extends": ["taro/react","plugin:react-hooks/recommended"],
"rules": {
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off"
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f3bdece
--- /dev/null
+++ b/README.md
@@ -0,0 +1,154 @@
+# 阿里图标库 iconfont 使用 Symbol 我们使用了 mini-program-iconfont-cli 这个库
+
+用法如下：
+
+# Step 1
+安装插件
+```bash
+# Yarn
+yarn add mini-program-iconfont-cli --dev
+
+# Npm
+npm install mini-program-iconfont-cli --save-dev
+```
+
+# Step 2
+生成配置文件
+```bash
+npx iconfont-init
+
+# 可传入配置文件输出路径
+# npx iconfont-init --output iconfont.json
+```
+
+此时项目根目录会生成一个`iconfont.json`的文件，内容如下：
+```json
+{
+ "symbol_url": "请参考README.md，复制 http://iconfont.cn 官网提供的JS链接",
+ "save_dir": "./iconfont",
+ "use_rpx": false,
+ "trim_icon_prefix": "icon",
+ "default_icon_size": 18
+}
+```
+
+### 配置参数说明：
+#### symbol_url
+请直接复制[iconfont](http://iconfont.cn)官网提供的项目链接。请务必看清是`.js`后缀而不是`.css`后缀。如果你现在还没有创建iconfont的仓库，那么可以填入这个链接去测试：`http://at.alicdn.com/t/font_1373348_kk9y3jk2omq.js`。
+
+
+
+#### save_dir
+根据iconfont图标生成的组件存放的位置。每次生成组件之前，该文件夹都会被清空。
+
+#### use_rpx
+使用微信提供的[尺寸单位rpx](https://developers.weixin.qq.com/miniprogram/dev/framework/view/wxss.html#%E5%B0%BA%E5%AF%B8%E5%8D%95%E4%BD%8D)还是普通的像素单位`px`。默认值为false，即使用`px`。
+
+#### trim_icon_prefix
+如果你的图标有通用的前缀，而你在使用的时候又不想重复去写，那么可以通过配置这个选项把前缀统一去掉。
+
+#### default_icon_size
+我们将为每个生成的图标组件加入默认的字体大小，当然，你也可以通过传入props的方式改变这个size值。
+
+# Step 3
+生成小程序标准组件
+```bash
+# 可传入配置文件路径
+# npx iconfont-XXXXX --config iconfont.json
+
+# 微信小程序
+npx iconfont-wechat
+
+# 支付宝小程序
+npx iconfont-alipay
+
+# 百度小程序
+npx iconfont-baidu
+
+# 头条小程序
+npx iconfont-toutiao
+
+# 快手小程序
+npx iconfont-kuaishou
+
+# QQ小程序
+npx iconfont-qq
+```
+生成后查看您设置的保存目录中是否含有所有的图标
+
+-------
+
+在生成代码之前，你可以顺便参考[snapshots目录](https://github.com/iconfont-cli/mini-program-iconfont-cli/tree/master/snapshots)自动生成的快照文件。
+
+# Step 4
+#### 微信小程序 | QQ小程序
+在根目录的`app.json`文件中引入全局图标组件，避免每个page都引入（麻烦）。
+```json5
+// 绝对路径
+{
+ "usingComponents": {
+ "iconfont": "/iconfont/iconfont"
+ }
+}
+```
+
+#### 支付宝小程序 | 百度小程序 | 头条小程序 ｜ 快手小程序
+不支持全局引入，您需要在各自page的`.json`文件中引入。
+```json5
+// 绝对路径
+{
+ "usingComponents": {
+ "iconfont": "/iconfont/iconfont"
+ }
+}
+```
+
+# 使用
+在page中使用图标。
+```jsx harmony
+// 原色彩
+
+
+// 单色：红色
+
+
+// 多色：红色+橘色
+
+
+// 不同格式的颜色写法
+
+
+// 与文字对齐
+
+ Hello
+
+
+```
+
+# 更新图标
+当您在iconfont.cn中的图标有变更时，只需更改配置`symbol_url`，然后再次执行`Step 3`即可生成最新的图标组件。
+```bash
+# 修改 symbol_url 配置后执行：
+
+# 微信小程序
+npx iconfont-wechat
+
+# 支付宝小程序
+npx iconfont-alipay
+
+# 百度小程序
+npx iconfont-baidu
+
+# 头条小程序
+npx iconfont-toutiao
+
+# 快手小程序
+npx iconfont-kuaishou
+
+# QQ小程序
+npx iconfont-qq
+```
+
+--------
+
+欢迎使用，并给我一些反馈和建议，让这个库做的更好。
diff --git a/app.json b/app.json
new file mode 100644
index 0000000..873c66f
--- /dev/null
+++ b/app.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "iconfont": "/src/components/iconfont/iconfont"
+ }
+}
diff --git a/config/dev.js b/config/dev.js
index e3a0d8a..4e1656f 100644
--- a/config/dev.js
+++ b/config/dev.js
@@ -37,8 +37,9 @@ module.exports = {
alias: {
'@': path.resolve(__dirname, '..', 'src'),
},
+
sass: {
- resource: path.resolve(__dirname, '..', 'src/styles/common.scss'),
+ resource: [path.resolve(__dirname, '..', 'src/styles/common.scss'), path.resolve(__dirname, '..', 'src/styles/iconfont.scss')],
},
// plugins: [
// '@tarojs/plugin-react-devtools'
diff --git a/config/index.js b/config/index.js
index 87d9bca..fbb6e6d 100644
--- a/config/index.js
+++ b/config/index.js
@@ -19,6 +19,7 @@ const CURRENT_VERSION = `Version: ${JSON.stringify(process.env.CODE_BRANCH || ve
)
const config = {
+ appid: 'wx64fe67f111d52457', // 测试/体验环境
projectName: 'SpiderSteward',
date: '2022-4-6',
designWidth: 750,
diff --git a/config/pre.js b/config/pre.js
index 232a1c5..ce69a73 100644
--- a/config/pre.js
+++ b/config/pre.js
@@ -38,6 +38,6 @@ module.exports = {
'@': path.resolve(__dirname, '..', 'src'),
},
sass: {
- resource: path.resolve(__dirname, '..', 'src/styles/common.scss'),
+ resource: [path.resolve(__dirname, '..', 'src/styles/common.scss'), path.resolve(__dirname, '..', 'src/styles/iconfont.scss')],
},
}
diff --git a/iconfont.json b/iconfont.json
new file mode 100644
index 0000000..489795a
--- /dev/null
+++ b/iconfont.json
@@ -0,0 +1,7 @@
+{
+ "symbol_url": "//at.alicdn.com/t/c/font_3619513_mrvpsyqxmzr.js",
+ "save_dir": "./src/components/iconfont",
+ "use_rpx": false,
+ "trim_icon_prefix": "icon",
+ "default_icon_size": 18
+}
diff --git a/package.json b/package.json
index af1d38f..b9a9717 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
"@tarojs/runtime": "3.5.4",
"@tarojs/taro": "3.5.4",
"big.js": "^6.2.1",
+ "classname": "^0.0.0",
"dayjs": "^1.11.3",
"qs": "^6.10.3",
"react": "^18.2.0",
@@ -73,6 +74,7 @@
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-react": "^7.8.2",
"eslint-plugin-react-hooks": "^4.2.0",
+ "mini-program-iconfont-cli": "^0.6.1",
"react-refresh": "0.11.0",
"stylelint": "9.3.0",
"typescript": "^4.1.0",
diff --git a/src/app.config.ts b/src/app.config.ts
index 9636b70..32008ba 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -15,30 +15,23 @@ export default defineAppConfig({
backgroundColor: '#ffffff',
},
tabBar: {
+ custom: true,
list: [
{
pagePath: 'pages/index/index',
text: '首页',
- iconPath: './styles/tabbar/list.png',
- selectedIconPath: './styles/tabbar/list_on.png',
},
{
pagePath: 'pages/shopping/index',
text: '购物',
- iconPath: './styles/tabbar/order.png',
- selectedIconPath: './styles/tabbar/order_on.png',
},
{
pagePath: 'pages/order/index',
text: '订单',
- iconPath: './styles/tabbar/order.png',
- selectedIconPath: './styles/tabbar/order_on.png',
},
{
pagePath: 'pages/user/index',
text: '我的',
- iconPath: './styles/tabbar/my.png',
- selectedIconPath: './styles/tabbar/my_on.png',
},
],
color: '#707070',
@@ -46,5 +39,9 @@ export default defineAppConfig({
backgroundColor: '#fff',
borderStyle: 'white',
},
+ usingComponents: {
+ 'custom-wrapper': '/custom-wrapper',
+
+ },
subPackages: [],
})
diff --git a/src/app.scss b/src/app.scss
index c393d5e..3e7323b 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -1,6 +1,14 @@
@import './styles/common.scss';
@import './styles/iconfont.scss';
-page{
- height: 100%;
-
-}
\ No newline at end of file
+
+/**
+ 由于Cover-view标签并不支持iconfont 所以需要把 .ttf 转成 base64 之后得到的 stylesheet.css 文件覆盖掉 iconfont.css 里的 @font-face 即可
+ [转换工具](https://transfonter.org/)
+ [教程](https://blog.csdn.net/VoidLuffy/article/details/123530341)
+ [相关说明](https://developers.weixin.qq.com/community/develop/doc/000a60f7d58a982f08d7ddfc456000)
+*/
+
+page {
+ height: 100%;
+}
+
diff --git a/src/components/iconfont/iconfont.js b/src/components/iconfont/iconfont.js
new file mode 100644
index 0000000..1b0dc5a
--- /dev/null
+++ b/src/components/iconfont/iconfont.js
@@ -0,0 +1,63 @@
+Component({
+ properties: {
+ // wodekefu | dizhi | shouhouzhongxin | wodeshoucang | shoukuanliebiao | madanguanli | qusechazhao | pandiansaoma | yaoqingma | duizhang | tihuoliebiao | yangpinduibi | yansequyang | fahuoliebiao | yuncangkucun | xiaoshou | qianzhicangkucun | lingquseka | gouwu1 | dingdan1 | gerenzhongxin1 | shouye1 | gerenzhongxin | dingdan | shouye | gouwu
+ name: {
+ type: String,
+ },
+ // string | string[]
+ color: {
+ type: null,
+ observer: function(color) {
+ this.setData({
+ colors: this.fixColor(),
+ isStr: typeof color === 'string',
+ });
+ }
+ },
+ size: {
+ type: Number,
+ value: 18,
+ observer: function(size) {
+ this.setData({
+ svgSize: size,
+ });
+ },
+ },
+ },
+ data: {
+ colors: '',
+ svgSize: 18,
+ quot: '"',
+ isStr: true,
+ },
+ methods: {
+ fixColor: function() {
+ var color = this.data.color;
+ var hex2rgb = this.hex2rgb;
+
+ if (typeof color === 'string') {
+ return color.indexOf('#') === 0 ? hex2rgb(color) : color;
+ }
+
+ return color.map(function (item) {
+ return item.indexOf('#') === 0 ? hex2rgb(item) : item;
+ });
+ },
+ hex2rgb: function(hex) {
+ var rgb = [];
+
+ hex = hex.substr(1);
+
+ if (hex.length === 3) {
+ hex = hex.replace(/(.)/g, '$1$1');
+ }
+
+ hex.replace(/../g, function(color) {
+ rgb.push(parseInt(color, 0x10));
+ return color;
+ });
+
+ return 'rgb(' + rgb.join(',') + ')';
+ }
+ }
+});
diff --git a/src/components/iconfont/iconfont.json b/src/components/iconfont/iconfont.json
new file mode 100644
index 0000000..a89ef4d
--- /dev/null
+++ b/src/components/iconfont/iconfont.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
diff --git a/src/components/iconfont/iconfont.wxml b/src/components/iconfont/iconfont.wxml
new file mode 100644
index 0000000..18c9e0b
--- /dev/null
+++ b/src/components/iconfont/iconfont.wxml
@@ -0,0 +1,77 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/iconfont/iconfont.wxss b/src/components/iconfont/iconfont.wxss
new file mode 100644
index 0000000..9f68d1a
--- /dev/null
+++ b/src/components/iconfont/iconfont.wxss
@@ -0,0 +1,3 @@
+.icon {
+ background-repeat: no-repeat;
+}
diff --git a/src/custom-tab-bar/index.module.scss b/src/custom-tab-bar/index.module.scss
new file mode 100644
index 0000000..2f58e23
--- /dev/null
+++ b/src/custom-tab-bar/index.module.scss
@@ -0,0 +1,39 @@
+.customTabBar {
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+ height: 100px;
+ display: flex;
+ flex-flow: row nowrap;
+ padding-bottom: env(safe-area-inset-bottom);
+ background-color: #fff;
+ &-line {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 1px;
+ transform: scaleY(0.5);
+ }
+ &-item {
+ flex: 1;
+ text-align: center;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ flex-flow: column nowrap;
+ &-icon {
+ width: 56px;
+ height: 56px;
+ font-size: 60px;
+ }
+ &-title {
+ margin-top: 10px;
+ font-size: 20px;
+ }
+ }
+}
+.selected {
+ color: $color_main;
+}
diff --git a/src/custom-tab-bar/index.tsx b/src/custom-tab-bar/index.tsx
new file mode 100644
index 0000000..0b5c8a7
--- /dev/null
+++ b/src/custom-tab-bar/index.tsx
@@ -0,0 +1,80 @@
+import { CoverImage, View } from '@tarojs/components'
+import { FC, useMemo, useState } from 'react'
+import styles from './index.module.scss'
+import classname from 'classname'
+type TabBarIndexMap = {
+ [Property: number]: {
+ id: number
+ pagePath: string
+ text: string
+ iconPath: string
+ selectedIconPath: string
+ }
+}
+
+const CustomTabBar: FC = () => {
+ const [tabItem, setTabItem] = useState([
+ {
+ id: 1,
+ pagePath: 'pages/index/index',
+ text: '首页',
+ iconPath: 'icon-shouye1',
+ selectedIconPath: 'icon-shouye',
+ },
+ {
+ id: 2,
+ pagePath: 'pages/shopping/index',
+ text: '购物',
+ iconPath: 'icon-gouwu1',
+ selectedIconPath: 'icon-gouwu',
+ },
+ {
+ id: 3,
+ pagePath: 'pages/order/index',
+ text: '订单',
+ iconPath: 'icon-dingdan1',
+ selectedIconPath: 'icon-dingdan',
+ },
+ {
+ id: 4,
+ pagePath: 'pages/user/index',
+ text: '我的',
+ iconPath: 'icon-gerenzhongxin1',
+ selectedIconPath: 'icon-gerenzhongxin',
+ },
+ ])
+
+ const tabBarIndexMap = useMemo(() => {
+ let map: TabBarIndexMap = {}
+ for (let i = 0; i < tabItem.length; i++) {
+ map[tabItem[i].id] = tabItem[i]
+ }
+ return map
+ }, [tabItem])
+
+ const [selectedId, setSelectedId] = useState(1)
+
+ const handleSelectTabItem = () => {
+ return () => {}
+ }
+
+ return (
+
+
+ {tabItem.map((item, index) => {
+ return (
+
+
+ {item.text}
+
+ )
+ })}
+
+ )
+}
+export default CustomTabBar
diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx
index ebf4f98..e24a9aa 100644
--- a/src/pages/user/index.tsx
+++ b/src/pages/user/index.tsx
@@ -5,6 +5,12 @@ import styles from './index.module.scss'
const SonComp: FC = memo(() => {
return 我改变了吗{new Date().getTime()}
})
+// 用户信息
+const UserInfo:FC = () => {
+ return
+ sdfasdf
+
+}
// 我的
const User = () => {
@@ -19,7 +25,8 @@ const User = () => {
return (
<>
- sdfasdfasdf {count}
+
+ sdfasdfasdf {count}
diff --git a/src/styles/iconfont.scss b/src/styles/iconfont.scss
index e08c56e..5da1113 100644
--- a/src/styles/iconfont.scss
+++ b/src/styles/iconfont.scss
@@ -1,8 +1,9 @@
+/* CDN 服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
@font-face {
- font-family: "iconfont";
- /* Project id 2987621 */
- src: url('iconfont.ttf?t=1661926630273') format('truetype');
-
+ font-family: 'iconfont'; /* Project id 3619513 */
+ src: url('//at.alicdn.com/t/c/font_3619513_g8r6ax9bp1n.woff2?t=1662609560991') format('woff2'),
+ url('//at.alicdn.com/t/c/font_3619513_g8r6ax9bp1n.woff?t=1662609560991') format('woff'),
+ url('//at.alicdn.com/t/c/font_3619513_g8r6ax9bp1n.ttf?t=1662609560991') format('truetype');
}
.iconfont {
@@ -13,222 +14,219 @@
-moz-osx-font-smoothing: grayscale;
}
-.icon-A:before {
- content: "\e6ea";
+.icon-yewuyuanqizi:before {
+ content: "\e639";
}
-.icon-erweima:before {
- content: "\e7b5";
+.icon-chakanquanbukehu:before {
+ content: "\e638";
}
-.icon-xtianzhangqi:before {
- content: "\e66a";
-}
-
-.icon-yucunkuan:before {
- content: "\e66c";
-}
-
-.icon-a-tuikuanshouhou:before {
- content: "\e65c";
-}
-
-.icon-yifahuo:before {
- content: "\e65b";
-}
-
-.icon-daipeibu:before {
- content: "\e662";
-}
-
-.icon-guanbi:before {
- content: "\e641";
-}
-
-.icon-a-saoyisao2:before {
- content: "\e613";
-}
-
-.icon-guanyuquse:before {
- content: "\e635";
-}
-
-.icon-yangpinduibi:before {
- content: "\e631";
-}
-
-.icon-lingquseka:before {
- content: "\e632";
-}
-
-.icon-sehaochazhao:before {
- content: "\e633";
-}
-
-.icon-jichuguanli:before {
- content: "\e634";
-}
-
-.icon-yuncangkucun:before {
- content: "\e630";
-}
-
-.icon-shangchuanzhaopian:before {
- content: "\e62f";
-}
-
-.icon-zhushi:before {
- content: "\e62d";
-}
-
-.icon-shenqingtuihuo:before {
- content: "\e62e";
-}
-
-.icon-quxiaodingdanxiao:before {
- content: "\e62c";
-}
-
-.icon-tuihuo1:before {
- content: "\e62a";
-}
-
-.icon-a-fenqishangchengyifahuo:before {
- content: "\e62b";
-}
-
-.icon-peibu:before {
- content: "\e626";
-}
-
-.icon-dingdanbishu:before {
- content: "\e627";
-}
-
-.icon-guanyufahuo:before {
- content: "\e628";
-}
-
-.icon-tuihuo:before {
- content: "\e629";
-}
-
-.icon-rili:before {
- content: "\e625";
-}
-
-.icon-jiangpai:before {
- content: "\e624";
-}
-
-.icon-xiaoshou:before {
- content: "\e623";
-}
-
-.icon-cangkuguanli:before {
- content: "\e61f";
-}
-
-.icon-zhibiaoduizhang:before {
- content: "\e620";
-}
-
-.icon-a-tongji1:before {
- content: "\e621";
-}
-
-.icon-shaixuan:before {
- content: "\e622";
-}
-
-.icon-xiangxiagengduo:before {
- content: "\e61e";
-}
-
-.icon-gongnengdingyi:before {
- content: "\e61a";
-}
-
-.icon-rukuguanli:before {
- content: "\e61b";
-}
-
-.icon-shenqing:before {
- content: "\e61c";
-}
-
-.icon-kehuguanli:before {
- content: "\e61d";
-}
-
-.icon-a-phone1:before {
- content: "\e619";
-}
-
-.icon-a-saoyisao2:before {
- content: "\e613";
-}
-
-.icon-ico_zhongyaofangguanli_zhongyaopandian:before {
- content: "\e615";
-}
-
-.icon-seka:before {
- content: "\e616";
-}
-
-.icon-xiaoshoutongji:before {
- content: "\e617";
-}
-
-.icon-gengduo:before {
- content: "\e618";
-}
-
-.icon-lajitong:before {
- content: "\e60c";
-}
-
-.icon-jian:before {
- content: "\e60b";
-}
-
-.icon-jia:before {
- content: "\e60a";
-}
-
-.icon-a-tick1:before {
- content: "\e609";
-}
-
-.icon-a-cuowuwrong:before {
- content: "\e608";
-}
-
-.icon-more:before {
- content: "\e606";
+.icon-biyan:before {
+ content: "\e637";
}
.icon-bianji:before {
- content: "\e607";
+ content: "\e61e";
}
-.icon-wode:before {
- content: "\e602";
+.icon-daikuan:before {
+ content: "\e61f";
}
-.icon-shangpinguanli:before {
- content: "\e603";
+.icon-cangku:before {
+ content: "\e620";
}
-.icon-dingdan:before {
+.icon-guanlidingdan:before {
+ content: "\e621";
+}
+
+.icon-mima:before {
+ content: "\e622";
+}
+
+.icon-guanbi:before {
+ content: "\e623";
+}
+
+.icon-jianshao:before {
+ content: "\e624";
+}
+
+.icon-dingwei:before {
+ content: "\e625";
+}
+
+.icon-saomiao:before {
+ content: "\e626";
+}
+
+.icon-peihuo:before {
+ content: "\e627";
+}
+
+.icon-shaixuan:before {
+ content: "\e628";
+}
+
+.icon-paiming:before {
+ content: "\e629";
+}
+
+.icon-shanchusousuoxinxi:before {
+ content: "\e62a";
+}
+
+.icon-shijian:before {
+ content: "\e62b";
+}
+
+.icon-sousuo:before {
+ content: "\e62c";
+}
+
+.icon-shouhou:before {
+ content: "\e62d";
+}
+
+.icon-sousuofanhui:before {
+ content: "\e62e";
+}
+
+.icon-sousuoshanchu:before {
+ content: "\e62f";
+}
+
+.icon-tuikuan:before {
+ content: "\e630";
+}
+
+.icon-tishi:before {
+ content: "\e631";
+}
+
+.icon-xianxiahuizong:before {
+ content: "\e632";
+}
+
+.icon-xinzeng:before {
+ content: "\e633";
+}
+
+.icon-yonghuming:before {
+ content: "\e634";
+}
+
+.icon-yanjing:before {
+ content: "\e635";
+}
+
+.icon-yufukuan:before {
+ content: "\e636";
+}
+
+.icon-wodekefu:before {
+ content: "\e60c";
+}
+
+.icon-dizhi:before {
+ content: "\e60d";
+}
+
+.icon-shouhouzhongxin:before {
+ content: "\e60e";
+}
+
+.icon-wodeshoucang:before {
+ content: "\e60f";
+}
+
+.icon-shoukuanliebiao:before {
+ content: "\e610";
+}
+
+.icon-madanguanli:before {
+ content: "\e611";
+}
+
+.icon-qusechazhao:before {
+ content: "\e612";
+}
+
+.icon-pandiansaoma:before {
+ content: "\e613";
+}
+
+.icon-yaoqingma:before {
+ content: "\e614";
+}
+
+.icon-duizhang:before {
+ content: "\e615";
+}
+
+.icon-tihuoliebiao:before {
+ content: "\e616";
+}
+
+.icon-yangpinduibi:before {
+ content: "\e617";
+}
+
+.icon-yansequyang:before {
+ content: "\e618";
+}
+
+.icon-fahuoliebiao:before {
+ content: "\e619";
+}
+
+.icon-yuncangkucun:before {
+ content: "\e61a";
+}
+
+.icon-xiaoshou:before {
+ content: "\e61b";
+}
+
+.icon-qianzhicangkucun:before {
+ content: "\e61c";
+}
+
+.icon-lingquseka:before {
+ content: "\e61d";
+}
+
+.icon-gouwu1:before {
+ content: "\e608";
+}
+
+.icon-dingdan1:before {
+ content: "\e609";
+}
+
+.icon-gerenzhongxin1:before {
+ content: "\e60a";
+}
+
+.icon-shouye1:before {
+ content: "\e60b";
+}
+
+.icon-gerenzhongxin:before {
content: "\e604";
}
-.icon-fenlei:before {
+.icon-dingdan:before {
content: "\e605";
}
-.icon-a-sousuo1:before {
- content: "\e601";
-}
\ No newline at end of file
+.icon-shouye:before {
+ content: "\e606";
+}
+
+.icon-gouwu:before {
+ content: "\e607";
+}
+
diff --git a/src/styles/iconfont.ttf b/src/styles/iconfont.ttf
index 598c57d..baa548b 100644
Binary files a/src/styles/iconfont.ttf and b/src/styles/iconfont.ttf differ
diff --git a/src/styles/tabbar/list.png b/src/styles/tabbar/list.png
deleted file mode 100644
index 4f29b95..0000000
Binary files a/src/styles/tabbar/list.png and /dev/null differ
diff --git a/src/styles/tabbar/list_on.png b/src/styles/tabbar/list_on.png
deleted file mode 100644
index 5d116c8..0000000
Binary files a/src/styles/tabbar/list_on.png and /dev/null differ
diff --git a/src/styles/tabbar/my.png b/src/styles/tabbar/my.png
deleted file mode 100644
index cff9c48..0000000
Binary files a/src/styles/tabbar/my.png and /dev/null differ
diff --git a/src/styles/tabbar/my_on.png b/src/styles/tabbar/my_on.png
deleted file mode 100644
index f987eb6..0000000
Binary files a/src/styles/tabbar/my_on.png and /dev/null differ
diff --git a/src/styles/tabbar/order.png b/src/styles/tabbar/order.png
deleted file mode 100644
index 72ea1c9..0000000
Binary files a/src/styles/tabbar/order.png and /dev/null differ
diff --git a/src/styles/tabbar/order_on.png b/src/styles/tabbar/order_on.png
deleted file mode 100644
index 9a32e1f..0000000
Binary files a/src/styles/tabbar/order_on.png and /dev/null differ
diff --git a/yarn.lock b/yarn.lock
index fffa0e0..7ef2562 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3514,6 +3514,13 @@ aws4@^1.8.0:
resolved "https://registry.npmmirror.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+axios@^0.19.0:
+ version "0.19.2"
+ resolved "https://registry.npmmirror.com/axios/-/axios-0.19.2.tgz#3ea36c5d8818d0d5f8a8a97a6d36b86cdc00cb27"
+ integrity sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==
+ dependencies:
+ follow-redirects "1.5.10"
+
babel-code-frame@6.26.0, babel-code-frame@^6.26.0:
version "6.26.0"
resolved "https://registry.npmmirror.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -4800,6 +4807,11 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"
+classname@^0.0.0:
+ version "0.0.0"
+ resolved "https://registry.npmmirror.com/classname/-/classname-0.0.0.tgz#43d171b484e354c7a293a5b78004df6852db20d6"
+ integrity sha512-kkhsspEJdUW+VhuvNzb2sQf0KbafDPfd36dB1qf03Uu42dWZwMQzaQuyNkaRr5ir0ZiAN0+TlH/EOOfwb/aaXg==
+
classnames@^2.2.5:
version "2.3.1"
resolved "https://registry.npmmirror.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
@@ -4936,6 +4948,11 @@ colorette@^2.0.10:
resolved "https://registry.npmmirror.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
+colors@^1.3.3:
+ version "1.4.0"
+ resolved "https://registry.npmmirror.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+ integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+
combined-stream@^1.0.6, combined-stream@~1.0.6:
version "1.0.8"
resolved "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -5493,6 +5510,13 @@ debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.
dependencies:
ms "2.1.2"
+debug@=3.1.0, debug@~3.1.0:
+ version "3.1.0"
+ resolved "https://registry.npmmirror.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+ integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+ dependencies:
+ ms "2.0.0"
+
debug@^3.0.0, debug@^3.2.6, debug@^3.2.7:
version "3.2.7"
resolved "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -5500,13 +5524,6 @@ debug@^3.0.0, debug@^3.2.6, debug@^3.2.7:
dependencies:
ms "^2.1.1"
-debug@~3.1.0:
- version "3.1.0"
- resolved "https://registry.npmmirror.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
- integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
- dependencies:
- ms "2.0.0"
-
debuglog@^1.0.1:
version "1.0.1"
resolved "https://registry.npmmirror.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -6792,6 +6809,13 @@ flatted@^2.0.0:
resolved "https://registry.npmmirror.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
+follow-redirects@1.5.10:
+ version "1.5.10"
+ resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
+ integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
+ dependencies:
+ debug "=3.1.0"
+
follow-redirects@^1.0.0:
version "1.15.1"
resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
@@ -7033,7 +7057,7 @@ glob@7.1.2:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6:
+glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
version "7.2.3"
resolved "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -9023,6 +9047,20 @@ mini-css-extract-plugin@2.4.6:
dependencies:
schema-utils "^4.0.0"
+mini-program-iconfont-cli@^0.6.1:
+ version "0.6.1"
+ resolved "https://registry.npmmirror.com/mini-program-iconfont-cli/-/mini-program-iconfont-cli-0.6.1.tgz#61d08cf05bf5a51c82a75c4afcf77224e20ed06c"
+ integrity sha512-69FsU+tSevwmHBiL55535Hfh1q0ciRpNyYtiTBZw2bvw9lvW3N/SCTg395P0rkisWMqf1Ki9VYIWeaONvNWy2Q==
+ dependencies:
+ axios "^0.19.0"
+ colors "^1.3.3"
+ fs-extra "^8.1.0"
+ glob "^7.1.4"
+ minimist "^1.2.5"
+ mkdirp "^0.5.1"
+ tslib "^1.10.0"
+ xml2js "^0.4.19"
+
minimalistic-assert@^1.0.0:
version "1.0.1"
resolved "https://registry.npmmirror.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"