Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
CoderSmallfan
uni-app
提交
a700b45b
U
uni-app
项目概览
CoderSmallfan
/
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,发现更多精彩内容 >>
提交
a700b45b
编写于
11月 11, 2018
作者:
郭
郭胜强
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:dcloudio/uni-app
上级
c34c1d45
6238ffb0
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
45 addition
and
39 deletion
+45
-39
examples/hello-uniapp/components/number-box.vue
examples/hello-uniapp/components/number-box.vue
+21
-27
examples/hello-uniapp/components/segmented-control.vue
examples/hello-uniapp/components/segmented-control.vue
+18
-6
examples/hello-uniapp/components/uni-icon.vue
examples/hello-uniapp/components/uni-icon.vue
+1
-1
examples/hello-uniapp/pages/component/button/button.vue
examples/hello-uniapp/pages/component/button/button.vue
+2
-2
examples/hello-uniapp/pages/template/number-box/number-box.vue
...les/hello-uniapp/pages/template/number-box/number-box.vue
+2
-2
examples/hello-uniapp/platforms/app-plus/feedback/feedback.vue
...les/hello-uniapp/platforms/app-plus/feedback/feedback.vue
+1
-1
未找到文件。
examples/hello-uniapp/components/number-box.vue
浏览文件 @
a700b45b
<
template
>
<view
class=
"uni-numbox"
>
<view
class=
"uni-numbox-minus"
:class=
"
{'uni-numbox-disabled': disableSubtract}" @click="_
subtract
">-
</view>
<input
class=
"uni-numbox-value"
type=
"number"
:disabled=
"disabled"
v-model=
"value"
@
blur=
"_handle
Blur"
>
<view
class=
"uni-numbox-plus"
:class=
"
{'uni-numbox-disabled': disableAdd}" @click="_
add
">+
</view>
<view
class=
"uni-numbox-minus"
:class=
"
{'uni-numbox-disabled': disableSubtract}" @click="_
calcValue('subtract')
">-
</view>
<input
class=
"uni-numbox-value"
type=
"number"
:disabled=
"disabled"
:value=
"inputValue"
@
blur=
"_on
Blur"
>
<view
class=
"uni-numbox-plus"
:class=
"
{'uni-numbox-disabled': disableAdd}" @click="_
calcValue('add')
">+
</view>
</view>
</
template
>
<
script
>
...
...
@@ -30,6 +30,11 @@
default
:
false
}
},
data
()
{
return
{
inputValue
:
this
.
value
}
},
computed
:
{
disableSubtract
()
{
return
this
.
value
<=
this
.
min
...
...
@@ -38,23 +43,18 @@
return
this
.
value
>=
this
.
max
}
},
onUnload
()
{
// 目前为解决页面重新进入组件不更新的问题,这里主动重置下数据。
this
.
value
=
0
;
this
.
step
=
1
;
this
.
max
=
Infinity
;
this
.
min
=
-
Infinity
;
watch
:
{
value
(
val
)
{
this
.
inputValue
=
val
;
},
inputValue
(
val
)
{
this
.
$emit
(
'
change
'
,
val
);
}
},
methods
:
{
_subtract
(
evt
)
{
this
.
_calcValue
(
'
subtract
'
);
},
_add
(
evt
)
{
this
.
_calcValue
(
'
add
'
);
},
_calcValue
(
type
)
{
const
scale
=
this
.
_getDecimalScale
();
let
value
=
this
.
v
alue
*
scale
;
let
value
=
this
.
inputV
alue
*
scale
;
let
step
=
this
.
step
*
scale
;
if
(
type
===
'
subtract
'
)
{
...
...
@@ -65,8 +65,7 @@
if
(
value
<
this
.
min
||
value
>
this
.
max
)
{
return
}
console
.
log
(
'
value:
'
+
value
);
this
.
value
=
value
/
scale
;
this
.
inputValue
=
value
/
scale
;
},
_getDecimalScale
()
{
let
scale
=
1
;
...
...
@@ -76,10 +75,10 @@
}
return
scale
;
},
_
handleBlur
(
ev
t
)
{
let
value
=
evt
.
detail
.
value
;
_
onBlur
(
even
t
)
{
let
value
=
ev
en
t
.
detail
.
value
;
if
(
!
value
)
{
this
.
v
alue
=
0
;
this
.
inputV
alue
=
0
;
return
}
value
=
+
value
;
...
...
@@ -88,12 +87,7 @@
}
else
if
(
value
<
this
.
min
)
{
value
=
this
.
min
}
this
.
value
=
value
}
},
watch
:
{
value
(
val
)
{
this
.
$emit
(
'
update
'
,
val
);
this
.
inputValue
=
value
}
}
}
...
...
examples/hello-uniapp/components/segmented-control.vue
浏览文件 @
a700b45b
<
template
>
<view
class=
"segmented-control"
:class=
"styleType"
:style=
"wrapStyle"
>
<view
v-for=
"(item, index) in values"
class=
"segmented-control-item"
:class=
"styleType"
:key=
"index"
:style=
"index === current ? activeStyle : itemStyle"
@
click=
"onClick(index)"
>
<view
v-for=
"(item, index) in values"
class=
"segmented-control-item"
:class=
"styleType"
:key=
"index"
:style=
"index === current
Index
? activeStyle : itemStyle"
@
click=
"onClick(index)"
>
{{
item
}}
</view>
</view>
...
...
@@ -30,6 +30,18 @@
default
:
'
button
'
}
},
data
()
{
return
{
currentIndex
:
this
.
current
}
},
watch
:
{
current
(
val
)
{
if
(
val
!==
this
.
currentIndex
)
{
this
.
currentIndex
=
val
;
}
}
},
computed
:
{
wrapStyle
()
{
let
styleString
=
''
;
...
...
@@ -70,8 +82,8 @@
},
methods
:
{
onClick
(
index
)
{
if
(
this
.
current
!==
index
)
{
this
.
current
=
index
;
if
(
this
.
current
Index
!==
index
)
{
this
.
current
Index
=
index
;
this
.
$emit
(
'
clickItem
'
,
index
);
}
}
...
...
@@ -98,7 +110,7 @@
.segmented-control.text
{
border
:
0
;
border-radius
:
0
upx
;
border-radius
:
0
upx
;
}
...
...
@@ -120,4 +132,4 @@
.segmented-control-item
:first-child
{
border-left-width
:
0
;
}
</
style
>
</
style
>
examples/hello-uniapp/components/uni-icon.vue
浏览文件 @
a700b45b
...
...
@@ -16,7 +16,7 @@
/**
* 图标大小
*/
size
:
Number
size
:
[
Number
,
String
]
},
computed
:
{
fontSize
()
{
...
...
examples/hello-uniapp/pages/component/button/button.vue
浏览文件 @
a700b45b
...
...
@@ -26,8 +26,8 @@
</view>
<!-- #ifdef MP-WEIXIN -->
<button
open-type=
"launchApp"
app-parameter=
"uni-app"
binderror=
"launchAppError"
>
打开APP
</button>
<button
open-type=
"feedback"
>
意见反馈
</button>
<!-- #endif -->
<button
open-type=
"feedback"
>
意见反馈
</button>
</view>
</view>
</view>
...
...
@@ -57,4 +57,4 @@
.mini-btn
{
margin-right
:
10
upx
;
}
</
style
>
</
style
>
examples/hello-uniapp/pages/template/number-box/number-box.vue
浏览文件 @
a700b45b
...
...
@@ -16,7 +16,7 @@
<view
class=
"item"
>
<text
class=
"item-title"
>
获取输入框的值
</text>
<view
class=
"inline-item"
>
<number-box
v-on:
update=
"numberUpdat
e"
></number-box>
<number-box
v-on:
change=
"onNumberChang
e"
></number-box>
<text
class=
"item-label-right"
>
当前的值为:
{{
numberValue
}}
</text>
</view>
</view>
...
...
@@ -60,7 +60,7 @@
numberBox
},
methods
:
{
numberUpdat
e
(
value
)
{
onNumberChang
e
(
value
)
{
this
.
numberValue
=
value
;
}
}
...
...
examples/hello-uniapp/platforms/app-plus/feedback/feedback.vue
浏览文件 @
a700b45b
...
...
@@ -111,7 +111,7 @@
console
.
log
(
JSON
.
stringify
(
this
.
sendDate
));
let
imgs
=
this
.
imageList
.
map
((
value
,
index
)
=>
{
return
{
name
:
name
:
"
images
"
+
index
,
name
:
"
images
"
+
index
,
uri
:
value
}
})
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录