📃 docs:解决冲突问题

This commit is contained in:
Haiyi
2022-09-26 14:36:03 +08:00
103 changed files with 2355 additions and 576 deletions
-1
View File
@@ -4,7 +4,6 @@ page{
}
.main {
background: linear-gradient(to bottom, $color_main 25%, $color_bg_one 42%);
padding: 24px;
padding-bottom: 0;
box-sizing: border-box;
overflow-y: scroll;
+3 -4
View File
@@ -7,13 +7,12 @@ import Tag from '@/components/tag'
import Divider from '@/components/Divider'
import LayoutBlock from '@/components/layoutBlock'
import IconCard from '@/components/iconCard'
import IconFont from '@/components/iconfont/iconfont'
import { IconNames } from '@/components/iconfont/iconfont'
import useUserInfo from '@/use/useUserInfo'
import { goLink } from '@/common/common'
type IconfontName = Parameters<typeof IconFont>['0']['name']
type IconCardType = {
iconName: IconfontName
iconName: IconNames
name: string
path: string
}
@@ -42,7 +41,7 @@ const feature: IconCardType[] = [
{
iconName: 'icon-tihuoliebiao',
name: '提货列表',
path: '',
path: '/pages/takeDelivery/index',
},
{
iconName: 'icon-shouhouzhongxin',