Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
anyefeiyu
uni-app
提交
23f9d945
U
uni-app
项目概览
anyefeiyu
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
23f9d945
编写于
11月 18, 2018
作者:
H
hulinneil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
合并 icon.css和uni.css;load-more改为 uni-load-more
上级
2ba5876f
变更
12
显示空白变更内容
内联
并排
Showing
12 changed file
with
578 addition
and
593 deletion
+578
-593
examples/hello-uniapp/common/icon.css
examples/hello-uniapp/common/icon.css
+0
-377
examples/hello-uniapp/common/uni.css
examples/hello-uniapp/common/uni.css
+375
-1
examples/hello-uniapp/components/im-chat/chatinput.vue
examples/hello-uniapp/components/im-chat/chatinput.vue
+0
-2
examples/hello-uniapp/components/uni-icon.vue
examples/hello-uniapp/components/uni-icon.vue
+1
-4
examples/hello-uniapp/components/uni-load-more.vue
examples/hello-uniapp/components/uni-load-more.vue
+191
-191
examples/hello-uniapp/pages/component/icon/icon.vue
examples/hello-uniapp/pages/component/icon/icon.vue
+0
-2
examples/hello-uniapp/pages/component/input/input.vue
examples/hello-uniapp/pages/component/input/input.vue
+0
-1
examples/hello-uniapp/pages/template/load-more/load-more.vue
examples/hello-uniapp/pages/template/load-more/load-more.vue
+5
-5
examples/hello-uniapp/pages/template/qrcode/qrcode.vue
examples/hello-uniapp/pages/template/qrcode/qrcode.vue
+0
-3
examples/hello-uniapp/pages/template/sbanner/sbanner.vue
examples/hello-uniapp/pages/template/sbanner/sbanner.vue
+0
-1
examples/hello-uniapp/pages/template/tabbar/tabbar.vue
examples/hello-uniapp/pages/template/tabbar/tabbar.vue
+3
-3
examples/hello-uniapp/platforms/app-plus/tabbar/tabbar.vue
examples/hello-uniapp/platforms/app-plus/tabbar/tabbar.vue
+3
-3
未找到文件。
examples/hello-uniapp/common/icon.css
已删除
100644 → 0
浏览文件 @
2ba5876f
@font-face
{
font-family
:
uniicons
;
font-weight
:
normal
;
font-style
:
normal
;
src
:
url('https://img-cdn-qiniu.dcloud.net.cn/fonts/uni.ttf?t=1536565627510')
format
(
'truetype'
);
}
.uni-icon
{
font-family
:
uniicons
;
font-size
:
24px
;
font-weight
:
normal
;
font-style
:
normal
;
line-height
:
1
;
display
:
inline-block
;
text-decoration
:
none
;
-webkit-font-smoothing
:
antialiased
;
}
.uni-icon.uni-active
{
color
:
#007aff
;
}
.uni-icon-contact
:before
{
content
:
'\e100'
;
}
.uni-icon-person
:before
{
content
:
'\e101'
;
}
.uni-icon-personadd
:before
{
content
:
'\e102'
;
}
.uni-icon-contact-filled
:before
{
content
:
'\e130'
;
}
.uni-icon-person-filled
:before
{
content
:
'\e131'
;
}
.uni-icon-personadd-filled
:before
{
content
:
'\e132'
;
}
.uni-icon-phone
:before
{
content
:
'\e200'
;
}
.uni-icon-email
:before
{
content
:
'\e201'
;
}
.uni-icon-chatbubble
:before
{
content
:
'\e202'
;
}
.uni-icon-chatboxes
:before
{
content
:
'\e203'
;
}
.uni-icon-phone-filled
:before
{
content
:
'\e230'
;
}
.uni-icon-email-filled
:before
{
content
:
'\e231'
;
}
.uni-icon-chatbubble-filled
:before
{
content
:
'\e232'
;
}
.uni-icon-chatboxes-filled
:before
{
content
:
'\e233'
;
}
.uni-icon-weibo
:before
{
content
:
'\e260'
;
}
.uni-icon-weixin
:before
{
content
:
'\e261'
;
}
.uni-icon-pengyouquan
:before
{
content
:
'\e262'
;
}
.uni-icon-chat
:before
{
content
:
'\e263'
;
}
.uni-icon-qq
:before
{
content
:
'\e264'
;
}
.uni-icon-videocam
:before
{
content
:
'\e300'
;
}
.uni-icon-camera
:before
{
content
:
'\e301'
;
}
.uni-icon-mic
:before
{
content
:
'\e302'
;
}
.uni-icon-location
:before
{
content
:
'\e303'
;
}
.uni-icon-mic-filled
:before
,
.uni-icon-speech
:before
{
content
:
'\e332'
;
}
.uni-icon-location-filled
:before
{
content
:
'\e333'
;
}
.uni-icon-micoff
:before
{
content
:
'\e360'
;
}
.uni-icon-image
:before
{
content
:
'\e363'
;
}
.uni-icon-map
:before
{
content
:
'\e364'
;
}
.uni-icon-compose
:before
{
content
:
'\e400'
;
}
.uni-icon-trash
:before
{
content
:
'\e401'
;
}
.uni-icon-upload
:before
{
content
:
'\e402'
;
}
.uni-icon-download
:before
{
content
:
'\e403'
;
}
.uni-icon-close
:before
{
content
:
'\e404'
;
}
.uni-icon-redo
:before
{
content
:
'\e405'
;
}
.uni-icon-undo
:before
{
content
:
'\e406'
;
}
.uni-icon-refresh
:before
{
content
:
'\e407'
;
}
.uni-icon-star
:before
{
content
:
'\e408'
;
}
.uni-icon-plus
:before
{
content
:
'\e409'
;
}
.uni-icon-minus
:before
{
content
:
'\e410'
;
}
.uni-icon-circle
:before
,
.uni-icon-checkbox
:before
{
content
:
'\e411'
;
}
.uni-icon-close-filled
:before
,
.uni-icon-clear
:before
{
content
:
'\e434'
;
}
.uni-icon-refresh-filled
:before
{
content
:
'\e437'
;
}
.uni-icon-star-filled
:before
{
content
:
'\e438'
;
}
.uni-icon-plus-filled
:before
{
content
:
'\e439'
;
}
.uni-icon-minus-filled
:before
{
content
:
'\e440'
;
}
.uni-icon-circle-filled
:before
{
content
:
'\e441'
;
}
.uni-icon-checkbox-filled
:before
{
content
:
'\e442'
;
}
.uni-icon-closeempty
:before
{
content
:
'\e460'
;
}
.uni-icon-refreshempty
:before
{
content
:
'\e461'
;
}
.uni-icon-reload
:before
{
content
:
'\e462'
;
}
.uni-icon-starhalf
:before
{
content
:
'\e463'
;
}
.uni-icon-spinner
:before
{
content
:
'\e464'
;
}
.uni-icon-spinner-cycle
:before
{
content
:
'\e465'
;
}
.uni-icon-search
:before
{
content
:
'\e466'
;
}
.uni-icon-plusempty
:before
{
content
:
'\e468'
;
}
.uni-icon-forward
:before
{
content
:
'\e470'
;
}
.uni-icon-back
:before
,
.uni-icon-left-nav
:before
{
content
:
'\e471'
;
}
.uni-icon-checkmarkempty
:before
{
content
:
'\e472'
;
}
.uni-icon-home
:before
{
content
:
'\e500'
;
}
.uni-icon-navigate
:before
{
content
:
'\e501'
;
}
.uni-icon-gear
:before
{
content
:
'\e502'
;
}
.uni-icon-paperplane
:before
{
content
:
'\e503'
;
}
.uni-icon-info
:before
{
content
:
'\e504'
;
}
.uni-icon-help
:before
{
content
:
'\e505'
;
}
.uni-icon-locked
:before
{
content
:
'\e506'
;
}
.uni-icon-more
:before
{
content
:
'\e507'
;
}
.uni-icon-flag
:before
{
content
:
'\e508'
;
}
.uni-icon-home-filled
:before
{
content
:
'\e530'
;
}
.uni-icon-gear-filled
:before
{
content
:
'\e532'
;
}
.uni-icon-info-filled
:before
{
content
:
'\e534'
;
}
.uni-icon-help-filled
:before
{
content
:
'\e535'
;
}
.uni-icon-more-filled
:before
{
content
:
'\e537'
;
}
.uni-icon-settings
:before
{
content
:
'\e560'
;
}
.uni-icon-list
:before
{
content
:
'\e562'
;
}
.uni-icon-bars
:before
{
content
:
'\e563'
;
}
.uni-icon-loop
:before
{
content
:
'\e565'
;
}
.uni-icon-paperclip
:before
{
content
:
'\e567'
;
}
.uni-icon-eye
:before
{
content
:
'\e568'
;
}
.uni-icon-arrowup
:before
{
content
:
'\e580'
;
}
.uni-icon-arrowdown
:before
{
content
:
'\e581'
;
}
.uni-icon-arrowleft
:before
{
content
:
'\e582'
;
}
.uni-icon-arrowright
:before
{
content
:
'\e583'
;
}
.uni-icon-arrowthinup
:before
{
content
:
'\e584'
;
}
.uni-icon-arrowthindown
:before
{
content
:
'\e585'
;
}
.uni-icon-arrowthinleft
:before
{
content
:
'\e586'
;
}
.uni-icon-arrowthinright
:before
{
content
:
'\e587'
;
}
.uni-icon-pulldown
:before
{
content
:
'\e588'
;
}
.uni-icon-scan
:before
{
content
:
"\e612"
;
}
examples/hello-uniapp/common/uni.css
浏览文件 @
23f9d945
...
...
@@ -1052,3 +1052,377 @@ radio-group label, checkbox-group label{
.uni-timeline-last-item
.uni-timeline-item-divider
{
background-color
:
#1AAD19
;
}
/* uni-icon */
.uni-icon
{
font-family
:
uniicons
;
font-size
:
24px
;
font-weight
:
normal
;
font-style
:
normal
;
line-height
:
1
;
display
:
inline-block
;
text-decoration
:
none
;
-webkit-font-smoothing
:
antialiased
;
}
.uni-icon.uni-active
{
color
:
#007aff
;
}
.uni-icon-contact
:before
{
content
:
'\e100'
;
}
.uni-icon-person
:before
{
content
:
'\e101'
;
}
.uni-icon-personadd
:before
{
content
:
'\e102'
;
}
.uni-icon-contact-filled
:before
{
content
:
'\e130'
;
}
.uni-icon-person-filled
:before
{
content
:
'\e131'
;
}
.uni-icon-personadd-filled
:before
{
content
:
'\e132'
;
}
.uni-icon-phone
:before
{
content
:
'\e200'
;
}
.uni-icon-email
:before
{
content
:
'\e201'
;
}
.uni-icon-chatbubble
:before
{
content
:
'\e202'
;
}
.uni-icon-chatboxes
:before
{
content
:
'\e203'
;
}
.uni-icon-phone-filled
:before
{
content
:
'\e230'
;
}
.uni-icon-email-filled
:before
{
content
:
'\e231'
;
}
.uni-icon-chatbubble-filled
:before
{
content
:
'\e232'
;
}
.uni-icon-chatboxes-filled
:before
{
content
:
'\e233'
;
}
.uni-icon-weibo
:before
{
content
:
'\e260'
;
}
.uni-icon-weixin
:before
{
content
:
'\e261'
;
}
.uni-icon-pengyouquan
:before
{
content
:
'\e262'
;
}
.uni-icon-chat
:before
{
content
:
'\e263'
;
}
.uni-icon-qq
:before
{
content
:
'\e264'
;
}
.uni-icon-videocam
:before
{
content
:
'\e300'
;
}
.uni-icon-camera
:before
{
content
:
'\e301'
;
}
.uni-icon-mic
:before
{
content
:
'\e302'
;
}
.uni-icon-location
:before
{
content
:
'\e303'
;
}
.uni-icon-mic-filled
:before
,
.uni-icon-speech
:before
{
content
:
'\e332'
;
}
.uni-icon-location-filled
:before
{
content
:
'\e333'
;
}
.uni-icon-micoff
:before
{
content
:
'\e360'
;
}
.uni-icon-image
:before
{
content
:
'\e363'
;
}
.uni-icon-map
:before
{
content
:
'\e364'
;
}
.uni-icon-compose
:before
{
content
:
'\e400'
;
}
.uni-icon-trash
:before
{
content
:
'\e401'
;
}
.uni-icon-upload
:before
{
content
:
'\e402'
;
}
.uni-icon-download
:before
{
content
:
'\e403'
;
}
.uni-icon-close
:before
{
content
:
'\e404'
;
}
.uni-icon-redo
:before
{
content
:
'\e405'
;
}
.uni-icon-undo
:before
{
content
:
'\e406'
;
}
.uni-icon-refresh
:before
{
content
:
'\e407'
;
}
.uni-icon-star
:before
{
content
:
'\e408'
;
}
.uni-icon-plus
:before
{
content
:
'\e409'
;
}
.uni-icon-minus
:before
{
content
:
'\e410'
;
}
.uni-icon-circle
:before
,
.uni-icon-checkbox
:before
{
content
:
'\e411'
;
}
.uni-icon-close-filled
:before
,
.uni-icon-clear
:before
{
content
:
'\e434'
;
}
.uni-icon-refresh-filled
:before
{
content
:
'\e437'
;
}
.uni-icon-star-filled
:before
{
content
:
'\e438'
;
}
.uni-icon-plus-filled
:before
{
content
:
'\e439'
;
}
.uni-icon-minus-filled
:before
{
content
:
'\e440'
;
}
.uni-icon-circle-filled
:before
{
content
:
'\e441'
;
}
.uni-icon-checkbox-filled
:before
{
content
:
'\e442'
;
}
.uni-icon-closeempty
:before
{
content
:
'\e460'
;
}
.uni-icon-refreshempty
:before
{
content
:
'\e461'
;
}
.uni-icon-reload
:before
{
content
:
'\e462'
;
}
.uni-icon-starhalf
:before
{
content
:
'\e463'
;
}
.uni-icon-spinner
:before
{
content
:
'\e464'
;
}
.uni-icon-spinner-cycle
:before
{
content
:
'\e465'
;
}
.uni-icon-search
:before
{
content
:
'\e466'
;
}
.uni-icon-plusempty
:before
{
content
:
'\e468'
;
}
.uni-icon-forward
:before
{
content
:
'\e470'
;
}
.uni-icon-back
:before
,
.uni-icon-left-nav
:before
{
content
:
'\e471'
;
}
.uni-icon-checkmarkempty
:before
{
content
:
'\e472'
;
}
.uni-icon-home
:before
{
content
:
'\e500'
;
}
.uni-icon-navigate
:before
{
content
:
'\e501'
;
}
.uni-icon-gear
:before
{
content
:
'\e502'
;
}
.uni-icon-paperplane
:before
{
content
:
'\e503'
;
}
.uni-icon-info
:before
{
content
:
'\e504'
;
}
.uni-icon-help
:before
{
content
:
'\e505'
;
}
.uni-icon-locked
:before
{
content
:
'\e506'
;
}
.uni-icon-more
:before
{
content
:
'\e507'
;
}
.uni-icon-flag
:before
{
content
:
'\e508'
;
}
.uni-icon-home-filled
:before
{
content
:
'\e530'
;
}
.uni-icon-gear-filled
:before
{
content
:
'\e532'
;
}
.uni-icon-info-filled
:before
{
content
:
'\e534'
;
}
.uni-icon-help-filled
:before
{
content
:
'\e535'
;
}
.uni-icon-more-filled
:before
{
content
:
'\e537'
;
}
.uni-icon-settings
:before
{
content
:
'\e560'
;
}
.uni-icon-list
:before
{
content
:
'\e562'
;
}
.uni-icon-bars
:before
{
content
:
'\e563'
;
}
.uni-icon-loop
:before
{
content
:
'\e565'
;
}
.uni-icon-paperclip
:before
{
content
:
'\e567'
;
}
.uni-icon-eye
:before
{
content
:
'\e568'
;
}
.uni-icon-arrowup
:before
{
content
:
'\e580'
;
}
.uni-icon-arrowdown
:before
{
content
:
'\e581'
;
}
.uni-icon-arrowleft
:before
{
content
:
'\e582'
;
}
.uni-icon-arrowright
:before
{
content
:
'\e583'
;
}
.uni-icon-arrowthinup
:before
{
content
:
'\e584'
;
}
.uni-icon-arrowthindown
:before
{
content
:
'\e585'
;
}
.uni-icon-arrowthinleft
:before
{
content
:
'\e586'
;
}
.uni-icon-arrowthinright
:before
{
content
:
'\e587'
;
}
.uni-icon-pulldown
:before
{
content
:
'\e588'
;
}
.uni-icon-scan
:before
{
content
:
"\e612"
;
}
\ No newline at end of file
examples/hello-uniapp/components/im-chat/chatinput.vue
浏览文件 @
23f9d945
...
...
@@ -53,8 +53,6 @@
</
script
>
<
style
>
@import
"../../common/icon.css"
;
.footer
{
display
:
flex
;
flex-direction
:
row
;
...
...
examples/hello-uniapp/components/uni-icon.vue
浏览文件 @
23f9d945
...
...
@@ -31,6 +31,3 @@
}
</
script
>
<
style
>
@import
"../common/icon.css"
;
</
style
>
examples/hello-uniapp/components/load-more.vue
→
examples/hello-uniapp/components/
uni-
load-more.vue
浏览文件 @
23f9d945
examples/hello-uniapp/pages/component/icon/icon.vue
浏览文件 @
23f9d945
...
...
@@ -120,7 +120,6 @@
</
script
>
<
style
>
@import
"../../../common/icon.css"
;
.icon-item
{
display
:
inline-flex
;
width
:
105
upx
;
...
...
@@ -128,5 +127,4 @@
margin
:
5
upx
;
justify-content
:
center
;
}
</
style
>
examples/hello-uniapp/pages/component/input/input.vue
浏览文件 @
23f9d945
...
...
@@ -113,6 +113,5 @@
</
script
>
<
style
>
@import
"../../../common/icon.css"
;
.title
{
padding
:
10
upx
25
upx
;}
</
style
>
examples/hello-uniapp/pages/template/load-more/load-more.vue
浏览文件 @
23f9d945
...
...
@@ -3,25 +3,25 @@
<page-head
:title=
"title"
></page-head>
<view
class=
"uni-padding-wrap"
>
<view
class=
"uni-helllo-text"
>
这是load-more组件使用示例,配置loadingType改变组件状态,配置contentText改变文字内容,配置showImage改变loading时是否显示loading图标,配置color改变文字和loading图标颜色。
这是
uni-
load-more组件使用示例,配置loadingType改变组件状态,配置contentText改变文字内容,配置showImage改变loading时是否显示loading图标,配置color改变文字和loading图标颜色。
</view>
<view
class=
"uni-title"
>
在列表中使用
</view>
<view>
<view
class=
"list-view"
>
<view
class=
"list-item"
v-for=
"(value,index) in list"
:key=
"index"
>
list -
{{
value
}}
</view>
</view>
<
load-more
:loadingType=
"loadingType"
:contentText=
"contentText"
></
load-more>
<
uni-load-more
:loadingType=
"loadingType"
:contentText=
"contentText"
></uni-
load-more>
</view>
</view>
</view>
</
template
>
<
script
>
import
loadMore
from
'
../../../components/
load-more.vue
'
import
uniLoadMore
from
'
../../../components/uni-
load-more.vue
'
export
default
{
data
()
{
return
{
title
:
'
load-more
'
,
title
:
'
uni-
load-more
'
,
list
:
[],
loadingType
:
0
,
contentText
:
{
...
...
@@ -59,7 +59,7 @@
},
800
);
},
components
:
{
l
oadMore
uniL
oadMore
}
}
</
script
>
...
...
examples/hello-uniapp/pages/template/qrcode/qrcode.vue
浏览文件 @
23f9d945
...
...
@@ -71,6 +71,3 @@
}
</
script
>
<
style
>
@import
"../../../common/icon.css"
;
</
style
>
examples/hello-uniapp/pages/template/sbanner/sbanner.vue
浏览文件 @
23f9d945
...
...
@@ -48,7 +48,6 @@
</
script
>
<
style
>
@import
"../../../common/icon.css"
;
/* 遮罩层 */
.uni-mask
{
background
:
rgba
(
0
,
0
,
0
,
0.6
);
...
...
examples/hello-uniapp/pages/template/tabbar/tabbar.vue
浏览文件 @
23f9d945
...
...
@@ -11,7 +11,7 @@
<media-list
:data=
"newsitem"
@
close=
"close(index1,index2)"
@
click=
"goDetail(newsitem)"
></media-list>
</block>
<view
class=
"uni-tab-bar-loading"
>
<
load-more
:loadingType=
"tab.loadingType"
:contentText=
"loadingText"
></
load-more>
<
uni-load-more
:loadingType=
"tab.loadingType"
:contentText=
"loadingText"
></uni-
load-more>
</view>
</scroll-view>
</swiper-item>
...
...
@@ -20,11 +20,11 @@
</
template
>
<
script
>
import
mediaList
from
'
@/components/tab-nvue/mediaList.vue
'
;
import
loadMore
from
'
@/components/
load-more.vue
'
;
import
uniLoadMore
from
'
@/components/uni-
load-more.vue
'
;
export
default
{
components
:
{
mediaList
,
l
oadMore
uniL
oadMore
},
data
()
{
return
{
...
...
examples/hello-uniapp/platforms/app-plus/tabbar/tabbar.vue
浏览文件 @
23f9d945
...
...
@@ -11,7 +11,7 @@
<media-list
:data=
"newsitem"
@
close=
"close(index1,index2)"
@
click=
"goDetail(newsitem)"
></media-list>
</block>
<view
class=
"uni-tab-bar-loading"
>
<
load-more
:loadingType=
"tab.loadingType"
:contentText=
"loadingText"
></
load-more>
<
uni-load-more
:loadingType=
"tab.loadingType"
:contentText=
"loadingText"
></uni-
load-more>
</view>
</scroll-view>
</swiper-item>
...
...
@@ -20,11 +20,11 @@
</
template
>
<
script
>
import
mediaList
from
'
@/components/tab-nvue/mediaList.vue
'
;
import
loadMore
from
'
@/components/
load-more.vue
'
;
import
uniLoadMore
from
'
@/components/uni-
load-more.vue
'
;
export
default
{
components
:
{
mediaList
,
l
oadMore
uniL
oadMore
},
data
()
{
return
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录