Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wychl
uni-app
提交
4c6dbef3
U
uni-app
项目概览
wychl
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4c6dbef3
编写于
11月 15, 2018
作者:
郭
郭胜强
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:dcloudio/uni-app
上级
7ba75cf1
8266b2e2
变更
13
显示空白变更内容
内联
并排
Showing
13 changed file
with
324 addition
and
228 deletion
+324
-228
examples/hello-uniapp/common/uni.css
examples/hello-uniapp/common/uni.css
+75
-2
examples/hello-uniapp/components/graceCountd.vue
examples/hello-uniapp/components/graceCountd.vue
+7
-3
examples/hello-uniapp/pages.json
examples/hello-uniapp/pages.json
+6
-15
examples/hello-uniapp/pages/tabBar/API/API.vue
examples/hello-uniapp/pages/tabBar/API/API.vue
+6
-1
examples/hello-uniapp/pages/tabBar/component/component.vue
examples/hello-uniapp/pages/tabBar/component/component.vue
+56
-47
examples/hello-uniapp/pages/tabBar/template/template.vue
examples/hello-uniapp/pages/tabBar/template/template.vue
+9
-4
examples/hello-uniapp/pages/template/accordion/accordion.vue
examples/hello-uniapp/pages/template/accordion/accordion.vue
+5
-29
examples/hello-uniapp/pages/template/cardview/cardview.vue
examples/hello-uniapp/pages/template/cardview/cardview.vue
+2
-6
examples/hello-uniapp/pages/template/countdown/countdown.vue
examples/hello-uniapp/pages/template/countdown/countdown.vue
+65
-38
examples/hello-uniapp/pages/template/list-triplex-row/list-triplex-row.vue
...iapp/pages/template/list-triplex-row/list-triplex-row.vue
+3
-3
examples/hello-uniapp/pages/template/media-list/media-list.vue
...les/hello-uniapp/pages/template/media-list/media-list.vue
+9
-11
examples/hello-uniapp/pages/template/product-list/product-list.vue
...hello-uniapp/pages/template/product-list/product-list.vue
+10
-69
examples/hello-uniapp/platforms/h5/about/about.vue
examples/hello-uniapp/platforms/h5/about/about.vue
+71
-0
未找到文件。
examples/hello-uniapp/common/uni.css
浏览文件 @
4c6dbef3
...
...
@@ -83,7 +83,14 @@ form {
padding
:
20
upx
0
;
line-height
:
1.5
;
}
.uni-title
text
{
font-size
:
24
upx
;
color
:
#888
;}
.uni-text
{
font-size
:
28
upx
;
}
.uni-title
text
{
font-size
:
24
upx
;
color
:
#888
;
}
.uni-text-gray
{
color
:
#ccc
;
}
...
...
@@ -515,6 +522,10 @@ radio-group label, checkbox-group label{
.uni-triplex-left
{
width
:
84%
;
}
.uni-triplex-left
.uni-title
{
padding
:
8
upx
0
;
}
.uni-triplex-left
.uni-text
,
.uni-triplex-left
.uni-text-small
{
color
:
#999999
;}
.uni-triplex-right
{
width
:
16%
;
text-align
:
right
;
...
...
@@ -895,3 +906,65 @@ radio-group label, checkbox-group label{
.uni-swiper-msg-icon
image
{
width
:
100%
;
flex-shrink
:
0
;}
.uni-swiper-msg
swiper
{
width
:
100%
;
height
:
50
upx
;}
.uni-swiper-msg
swiper-item
{
line-height
:
50
upx
;}
/* product */
.uni-product-list
{
display
:
flex
;
width
:
100%
;
flex-wrap
:
wrap
;
flex-direction
:
row
;
}
.uni-product
{
padding
:
20
upx
;
display
:
flex
;
flex-direction
:
column
;
}
.image-view
{
height
:
330
upx
;
width
:
330
upx
;
margin
:
12
upx
0
;
}
.uni-product-image
{
height
:
330
upx
;
width
:
330
upx
;
}
.uni-product-title
{
width
:
300
upx
;
word-break
:
break-all
;
display
:
-webkit-box
;
overflow
:
hidden
;
line-height
:
1.5
;
text-overflow
:
ellipsis
;
-webkit-box-orient
:
vertical
;
-webkit-line-clamp
:
2
;
}
.uni-product-price
{
margin-top
:
10
upx
;
font-size
:
28
upx
;
line-height
:
1.5
;
position
:
relative
;
}
.uni-product-price-original
{
color
:
#e80080
;
}
.uni-product-price-favour
{
color
:
#888888
;
text-decoration
:
line-through
;
margin-left
:
10
upx
;
}
.uni-product-tip
{
position
:
absolute
;
right
:
10
upx
;
background-color
:
#ff3333
;
color
:
#ffffff
;
padding
:
0
10
upx
;
border-radius
:
5
upx
;
}
\ No newline at end of file
examples/hello-uniapp/components/graceCountd.vue
浏览文件 @
4c6dbef3
...
...
@@ -34,6 +34,7 @@ export default {
},
data
()
{
return
{
setTime
:
null
,
h
:
'
00
'
,
i
:
'
00
'
,
s
:
'
00
'
,
...
...
@@ -62,9 +63,12 @@ export default {
this
.
setInterValFunc
(
this
);
}
},
beforeDestroy
(){
clearInterval
(
this
.
setTime
)
},
methods
:
{
setInterValFunc
:
function
(
obj
){
setInterval
(
function
(){
obj
.
countDown
(
obj
);},
1000
);
this
.
setTime
=
setInterval
(
function
(){
obj
.
countDown
(
obj
);},
1000
);
},
countDown
:
function
(
self
){
var
leftTime
=
self
.
leftTime
-
new
Date
();
...
...
examples/hello-uniapp/pages.json
浏览文件 @
4c6dbef3
...
...
@@ -14,11 +14,6 @@
"color"
:
"#999999"
}]
}
},
"h5"
:
{
"titleNView"
:
{
"buttons"
:
[]
}
}
}
},
...
...
@@ -35,11 +30,6 @@
"color"
:
"#999999"
}]
}
},
"h5"
:
{
"titleNView"
:
{
"buttons"
:
[]
}
}
}
},
...
...
@@ -56,11 +46,6 @@
"color"
:
"#999999"
}]
}
},
"h5"
:
{
"titleNView"
:
{
"buttons"
:
[]
}
}
}
},
...
...
@@ -485,6 +470,12 @@
"navigationBarTitleText"
:
"关于"
}
},
{
"path"
:
"platforms/h5/about/about"
,
"style"
:
{
"navigationBarTitleText"
:
"关于"
}
},
{
"path"
:
"platforms/app-plus/tabbar/tabbar"
,
"style"
:
{
...
...
examples/hello-uniapp/pages/tabBar/API/API.vue
浏览文件 @
4c6dbef3
...
...
@@ -234,7 +234,12 @@
},
onNavigationBarButtonTap
(
e
)
{
uni
.
navigateTo
({
url
:
'
/platforms/app-plus/about/about
'
// #ifdef APP-PLUS
url
:
'
/platforms/app-plus/about/about
'
,
// #endif
// #ifdef H5
url
:
'
/platforms/h5/about/about
'
,
// #endif
})
},
methods
:
{
...
...
examples/hello-uniapp/pages/tabBar/component/component.vue
浏览文件 @
4c6dbef3
...
...
@@ -67,19 +67,23 @@
name
:
'
地图
'
,
open
:
false
,
pages
:
[
'
map
'
]
},
// #ifndef H5
},
{
{
id
:
'
web-view
'
,
name
:
'
网页
'
,
open
:
false
,
pages
:
[
'
web-view
'
],
},
// #endif
}
]
]
}
},
onLoad
()
{
// #ifdef APP-PLUS
//web-view组件支持本地html,依赖最新版的客户端基座
//
web-view组件支持本地html,依赖最新版的客户端基座
var
innerversion
=
plus
.
runtime
.
innerVersion
;
var
_v
=
innerversion
.
substring
(
innerversion
.
lastIndexOf
(
'
.
'
)
+
1
,
innerversion
.
length
);
if
(
_v
&&
parseInt
(
_v
)
>=
53650
)
{
...
...
@@ -103,7 +107,12 @@
},
onNavigationBarButtonTap
(
e
)
{
uni
.
navigateTo
({
url
:
'
/platforms/app-plus/about/about
'
// #ifdef APP-PLUS
url
:
'
/platforms/app-plus/about/about
'
,
// #endif
// #ifdef H5
url
:
'
/platforms/h5/about/about
'
,
// #endif
})
},
methods
:
{
...
...
examples/hello-uniapp/pages/tabBar/template/template.vue
浏览文件 @
4c6dbef3
...
...
@@ -191,12 +191,12 @@
},
{
name
:
'
倒计时
'
,
url
:
'
countdown
'
}
}
,
// #ifdef APP-PLUS
,
{
{
name
:
'
聊天窗口 chat
'
,
url
:
'
im-chat
'
}
}
,
// #endif
]
}
...
...
@@ -209,7 +209,12 @@
},
onNavigationBarButtonTap
(
e
)
{
uni
.
navigateTo
({
url
:
'
/platforms/app-plus/about/about
'
// #ifdef APP-PLUS
url
:
'
/platforms/app-plus/about/about
'
,
// #endif
// #ifdef H5
url
:
'
/platforms/h5/about/about
'
,
// #endif
})
},
methods
:
{
...
...
examples/hello-uniapp/pages/template/accordion/accordion.vue
浏览文件 @
4c6dbef3
...
...
@@ -15,11 +15,11 @@
</swiper-item>
</swiper>
<view
v-if=
"list.type === 'font'"
class=
"page-pd"
>
<view
class=
"
size-5
"
>
hello uni-app
</view>
<view
class=
"
size-4
"
>
hello uni-app
</view>
<view
class=
"
size-
3"
>
hello uni-app
</view>
<view
class=
"
size-2
"
>
hello uni-app
</view>
<view
class=
"
size-1
"
>
hello uni-app
</view>
<view
class=
"
uni-h1
"
>
hello uni-app
</view>
<view
class=
"
uni-h2
"
>
hello uni-app
</view>
<view
class=
"
uni-h
3"
>
hello uni-app
</view>
<view
class=
"
uni-h4
"
>
hello uni-app
</view>
<view
class=
"
uni-h5
"
>
hello uni-app
</view>
</view>
<view
v-if=
"list.type === 'list'"
>
<view
class=
"uni-list"
>
...
...
@@ -89,10 +89,6 @@
padding-top
:
60
upx
;
}
page
{
background
:
#efeff4
;
}
.list-collapse
{
padding-left
:
36
upx
;
box-sizing
:
border-box
;
...
...
@@ -105,24 +101,4 @@
.page-pd
{
padding
:
36
upx
;
}
.size-5
{
font-size
:
50
upx
;
}
.size-4
{
font-size
:
40
upx
;
}
.size-3
{
font-size
:
30
upx
;
}
.size-2
{
font-size
:
20
upx
;
}
.size-1
{
font-size
:
10
upx
;
}
</
style
>
examples/hello-uniapp/pages/template/cardview/cardview.vue
浏览文件 @
4c6dbef3
...
...
@@ -57,11 +57,7 @@
}
.page
{
padding-top
:
60
upx
;
}
page
{
background
:
#efeff4
;
padding-top
:
60
upx
;
background
:
#efeff4
;
}
.image-view
{
...
...
examples/hello-uniapp/pages/template/countdown/countdown.vue
浏览文件 @
4c6dbef3
...
...
@@ -17,14 +17,25 @@
</
template
>
<
script
>
import
graceCountd
from
"
../../../components/graceCountd.vue
"
;
//模拟3个时间
export
default
{
data
()
{
var
dateObj
=
new
Date
();
var
currentTime
=
dateObj
.
getTime
();
var
timer1
=
formatDateTime
((
currentTime
+
1000
*
2000
));
var
timer2
=
formatDateTime
((
currentTime
+
1000
*
3000
));
var
timer3
=
formatDateTime
((
currentTime
+
1000
*
5000
));
//时间戳 转 YY-mm-dd HH:ii:ss
function
formatDateTime
(
inputTime
){
var
timer1
=
this
.
formatDateTime
((
currentTime
+
1000
*
2000
));
var
timer2
=
this
.
formatDateTime
((
currentTime
+
1000
*
3000
));
var
timer3
=
this
.
formatDateTime
((
currentTime
+
1000
*
5000
));
return
{
title
:
'
倒计时
'
,
timer1
:
timer1
,
timer2
:
timer2
,
timer3
:
timer3
}
},
components
:
{
graceCountd
},
methods
:
{
formatDateTime
(
inputTime
)
{
//时间戳 转 YY-mm-dd HH:ii:ss
var
date
=
new
Date
(
inputTime
);
var
y
=
date
.
getFullYear
();
var
m
=
date
.
getMonth
()
+
1
;
...
...
@@ -38,25 +49,41 @@
minute
=
minute
<
10
?
(
'
0
'
+
minute
)
:
minute
;
second
=
second
<
10
?
(
'
0
'
+
second
)
:
second
;
return
y
+
'
-
'
+
m
+
'
-
'
+
d
+
'
'
+
h
+
'
:
'
+
minute
+
'
:
'
+
second
;
};
export
default
{
data
(){
return
{
title
:
'
倒计时
'
,
timer1
:
timer1
,
timer2
:
timer2
,
timer3
:
timer3
}
},
components
:{
graceCountd
}
}
</
script
>
<
style
>
view
{
display
:
flex
;
width
:
100%
;
flex-wrap
:
wrap
;
justify-content
:
center
;}
.uni-countdown
{
padding
:
2
rpx
0
;
flex-wrap
:
nowrap
;
justify-content
:
center
;}
.uni-countdown-splitor
{
width
:
auto
!important
;
justify-content
:
center
;
line-height
:
44
upx
;
padding
:
0
5
upx
;}
.uni-countdown-numbers
{
line-height
:
44
upx
;
width
:
auto
!important
;
padding
:
0
10
upx
;
justify-content
:
center
;
height
:
44
upx
;
border-radius
:
8
upx
;
margin
:
0
5
upx
;
border
:
1px
solid
#000000
;
font-size
:
22
upx
;}
view
{
display
:
flex
;
width
:
100%
;
flex-wrap
:
wrap
;
justify-content
:
center
;
}
.uni-countdown
{
padding
:
2
rpx
0
;
flex-wrap
:
nowrap
;
justify-content
:
center
;
}
.uni-countdown-splitor
{
width
:
auto
!important
;
justify-content
:
center
;
line-height
:
44
upx
;
padding
:
0
5
upx
;
}
.uni-countdown-numbers
{
line-height
:
44
upx
;
width
:
auto
!important
;
padding
:
0
10
upx
;
justify-content
:
center
;
height
:
44
upx
;
border-radius
:
8
upx
;
margin
:
0
5
upx
;
border
:
1px
solid
#000000
;
font-size
:
22
upx
;
}
</
style
>
examples/hello-uniapp/pages/template/list-triplex-row/list-triplex-row.vue
浏览文件 @
4c6dbef3
...
...
@@ -6,9 +6,9 @@
<view
class=
"uni-list-cell"
hover-class=
"uni-list-cell-hover"
>
<view
class=
"uni-triplex-row"
>
<view
class=
"uni-triplex-left"
>
<text
class=
"uni-
h4
uni-ellipsis"
>
列表主标题
</text>
<text
class=
"uni-
h5
"
>
列表副标题
</text>
<text
class=
"uni-
h6
uni-ellipsis"
>
列表内容文字,列表内容文字,列表内容文字,列表内容文字,列表内容文字,列表内容文字
</text>
<text
class=
"uni-
title
uni-ellipsis"
>
列表主标题
</text>
<text
class=
"uni-
text
"
>
列表副标题
</text>
<text
class=
"uni-
text-small
uni-ellipsis"
>
列表内容文字,列表内容文字,列表内容文字,列表内容文字,列表内容文字,列表内容文字
</text>
</view>
<view
class=
"uni-triplex-right"
>
<text
class=
"uni-h5"
>
12:15
</text>
...
...
examples/hello-uniapp/pages/template/media-list/media-list.vue
浏览文件 @
4c6dbef3
...
...
@@ -44,7 +44,6 @@
</view>
</view>
<view
class=
"title"
>
卡片列表
</view>
<view
class=
"uni-card"
>
<view
class=
"uni-list"
>
<view
class=
"uni-list-cell"
hover-class=
"uni-list-cell-hover"
v-for=
"(value,key) in list"
:key=
"key"
>
<view
class=
"uni-media-list uni-pull-right"
>
...
...
@@ -59,7 +58,6 @@
</view>
</view>
</view>
</view>
</
template
>
<
script
>
export
default
{
...
...
examples/hello-uniapp/pages/template/product-list/product-list.vue
浏览文件 @
4c6dbef3
<
template
>
<view
class=
"page"
>
<page-head
:title=
"title"
></page-head>
<view
class=
"product-list"
>
<view
class=
"product"
v-for=
"(product,index) in productList"
:key=
"index"
>
<view
class=
"
uni-
product-list"
>
<view
class=
"
uni-
product"
v-for=
"(product,index) in productList"
:key=
"index"
>
<view
class=
"image-view"
>
<image
v-if=
"renderImage"
class=
"product-image"
:src=
"product.image"
></image>
<image
v-if=
"renderImage"
class=
"
uni-
product-image"
:src=
"product.image"
></image>
</view>
<view
class=
"product-title"
>
{{
product
.
title
}}
</view>
<view
class=
"product-price"
>
<text
class=
"product-price-favour"
>
¥
{{
product
.
originalPrice
}}
</text>
<text
class=
"product-price-original"
>
¥
{{
product
.
favourPrice
}}
</text>
<text
class=
"product-tip"
>
{{
product
.
tip
}}
</text>
<view
class=
"
uni-
product-title"
>
{{
product
.
title
}}
</view>
<view
class=
"
uni-
product-price"
>
<text
class=
"
uni-
product-price-favour"
>
¥
{{
product
.
originalPrice
}}
</text>
<text
class=
"
uni-
product-price-original"
>
¥
{{
product
.
favourPrice
}}
</text>
<text
class=
"
uni-
product-tip"
>
{{
product
.
tip
}}
</text>
</view>
</view>
</view>
...
...
@@ -102,64 +102,5 @@ export default {
</
script
>
<
style
>
.product-list
{
display
:
flex
;
width
:
100%
;
flex-wrap
:
wrap
;
flex-direction
:
row
;
}
.product
{
padding
:
10
upx
20
upx
;
display
:
flex
;
flex-direction
:
column
;
}
.image-view
{
height
:
330
upx
;
width
:
330
upx
;
margin
:
12
upx
0
;
}
.product-image
{
height
:
330
upx
;
width
:
330
upx
;
}
.product-title
{
width
:
300
upx
;
word-break
:
break-all
;
display
:
-webkit-box
;
overflow
:
hidden
;
line-height
:
1.5
;
text-overflow
:
ellipsis
;
-webkit-box-orient
:
vertical
;
-webkit-line-clamp
:
2
;
}
.product-price
{
margin-top
:
10
upx
;
font-size
:
28
upx
;
line-height
:
1.5
;
position
:
relative
;
}
.product-price-original
{
color
:
#e80080
;
}
.product-price-favour
{
color
:
#888888
;
text-decoration
:
line-through
;
margin-left
:
10
upx
;
}
.product-tip
{
position
:
absolute
;
right
:
10
upx
;
background-color
:
#ff3333
;
color
:
#ffffff
;
padding
:
0
10
upx
;
border-radius
:
5
upx
;
}
</
style
>
examples/hello-uniapp/platforms/h5/about/about.vue
0 → 100644
浏览文件 @
4c6dbef3
<
template
>
<view
class=
"about"
>
<view
class=
"content"
>
<view
class=
"qrcode"
>
<image
src=
"https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/app_download.png"
></image>
<text
class=
"tip"
>
扫码体验uni-app
</text>
</view>
<view
class=
"desc"
>
<text
class=
"code"
>
uni-app
</text>
是一个使用
<text
class=
"code"
>
Vue.js
</text>
开发跨平台应用的前端框架 。
</view>
</view>
</view>
</
template
>
<
script
>
export
default
{
data
()
{
return
{};
}
}
</
script
>
<
style
>
page
,
view
{
display
:
flex
;
}
page
{
min-height
:
100%
;
background-color
:
#FFFFFF
;
}
image
{
width
:
400
upx
;
height
:
400
upx
;
}
.about
{
flex-direction
:
column
;
flex
:
1
;
}
.content
{
flex
:
1
;
padding
:
30
upx
;
flex-direction
:
column
;
justify-content
:
center
;
}
.qrcode
{
display
:
flex
;
align-items
:
center
;
flex-direction
:
column
;
}
.qrcode
.tip
{
margin-top
:
20
upx
;
}
.desc
{
margin-top
:
30
upx
;
display
:
block
;
}
.code
{
color
:
#e96900
;
background-color
:
#f8f8f8
;
}
</
style
>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录