Skip to content

U
uni-app

良好的行为成为习惯 / uni-app
与 Fork 源项目一致

Fork自 DCloud / uni-app

通知 1
Star 1
Fork 0
U
uni-app

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 039d5985 编写于 作者: H hulinneil
浏览文件
操作

Merge branch 'master' of https://github.com/dcloudio/uni-app

上级 04b9ed04 bfc78a0a
隐藏空白更改
内联 并排
Showing with 72 addition and 58 deletion
examples/hello-uniapp/common/uni.css
浏览文件 @ 039d5985
......@@ -861,4 +861,29 @@ radio-group label, checkbox-group label{
.uni-tab-bar-loading{
padding:20upx 0;
}
\ No newline at end of file
}
/* steps */
.uni-steps{padding:20upx 30upx; flex-grow: 1; display:flex; flex-wrap:wrap;}
.uni-steps view{display:flex; flex-wrap:wrap; float:none;}
.uni-steps .step{width:31.3%; margin:0 1%; flex-wrap:nowrap;}
.uni-steps .step-circle{width:50upx; height:50upx; border-radius:50upx; background:#F1F1F3; justify-content:center; line-height:50upx; flex-shrink:0; margin-right:15upx; color:#666; font-size:28upx;}
.uni-steps .step-content{width:100%; height:22upx; border-bottom:1px solid #F1F2F3;}
.uni-steps .step-title{line-height:50upx; height:50upx; background:#FFFFFF; width:auto; overflow:hidden; padding-right:8upx;}
.uni-steps .current .step-circle{background:#00B26A; color:#FFFFFF;}
.uni-steps .current .step-content{border-color:#00B26A;}
.uni-steps .current .step-title{color:#00B26A;}
/* uni-comment */
.uni-comment{padding:5rpx 0; display: flex; flex-grow:1; flex-direction: column;}
.uni-comment-list{flex-wrap:nowrap; padding:10rpx 0; margin:10rpx 0; width:100%; display: flex;}
.uni-comment-face{width:70upx; height:70upx; border-radius:100%; margin-right:20upx; flex-shrink:0; overflow:hidden;}
.uni-comment-face image{width:100%; border-radius:100%;}
.uni-comment-body{width:100%;}
.uni-comment-top{line-height:1.5em; justify-content:space-between;}
.uni-comment-top text{color:#0A98D5; font-size:24upx;}
.uni-comment-top text:last-child{color:#666666;}
.uni-comment-date{line-height:38upx; flex-direction:row; justify-content:space-between; display:flex !important; flex-grow:1;}
.uni-comment-date view{color:#666666; font-size:24upx; line-height:38upx;}
.uni-comment-content{line-height:1.6em; font-size:28upx; padding:8rpx 0;}
.uni-comment-replay-btn{background:#FFF; font-size:24upx; line-height:28upx; padding:5rpx 20upx; border-radius:30upx; color:#333 !important; margin:0 10upx;}
\ No newline at end of file
examples/hello-uniapp/components/mpvue-citypicker/mpvueCityPicker.vue
浏览文件 @ 039d5985
......@@ -33,32 +33,38 @@ export default {
pickerValue: [0, 0, 0],
provinceDataList: [],
cityDataList: [],
areaDataList: []
areaDataList: [],
/* 是否显示控件 */
showPicker: false,
};
},
created() {
this.handPickValueDefault(); // 对 pickerValueDefault 做兼容处理
this.provinceDataList = provinceData;
this.cityDataList = cityData[this.pickerValueDefault[0]];
this.areaDataList =
areaData[this.pickerValueDefault[0]][this.pickerValueDefault[1]];
this.pickerValue = this.pickerValueDefault;
this.init()
},
props: {
/* 是否显示控件 */
showPicker: {
type: Boolean,
default: false
},
/* 默认值 */
pickerValueDefault: {
type: Array,
default: [0, 0, 0]
default(){
return [0, 0, 0]
}
},
/* 主题色 */
themeColor: String
},
watch:{
pickerValueDefault(){
this.init();
}
},
methods: {
init() {
this.handPickValueDefault(); // 对 pickerValueDefault 做兼容处理
this.provinceDataList = provinceData;
this.cityDataList = cityData[this.pickerValueDefault[0]];
this.areaDataList = areaData[this.pickerValueDefault[0]][this.pickerValueDefault[1]];
this.pickerValue = this.pickerValueDefault;
},
show() {
setTimeout(() => {
this.showPicker = true;
......
examples/hello-uniapp/components/mpvue-picker/mpvuePicker.vue
浏览文件 @ 039d5985
......@@ -78,7 +78,9 @@
pickerValueMulTwoTwo: [],
pickerValueMulThreeOne: [],
pickerValueMulThreeTwo: [],
pickerValueMulThreeThree: []
pickerValueMulThreeThree: [],
/* 是否显示控件 */
showPicker: false,
};
},
props: {
......@@ -87,20 +89,19 @@
type: String,
default: 'selector'
},
/* 是否显示控件 */
showPicker: {
type: Boolean,
default: false
},
/* picker 数值 */
pickerValueArray: {
type: Array,
default: []
default(){
return []
}
},
/* 默认值 */
pickerValueDefault: {
type: Array,
default: []
default(){
return []
}
},
/* 几级联动 */
deepLength: {
......@@ -116,7 +117,10 @@
},
mode(oldVal, newVal) {
this.modeChange = true;
}
},
pickerValueArray(val){
this.initPicker(val);
}
},
methods: {
initPicker(valueArray) {
......
examples/hello-uniapp/pages/template/comments/comments.vue
浏览文件 @ 039d5985
......@@ -13,7 +13,6 @@
</view>
<view class="uni-comment-date">
<text>08/10 08:12</text>
<text>102</text>
</view>
<view class="uni-comment-content">上天呀！我渴望与你相知相惜，长存此心永不褪减。</view>
</view>
......@@ -23,7 +22,6 @@
<view class="uni-comment-body">
<view class="uni-comment-top">
<text>马克一天</text>
<text class="uni-iconfont icon-zan uni-comment-zan"> 100</text>
</view>
<view class="uni-comment-content">除非巍巍群山消逝不见，除非滔滔江水干涸枯竭。除非凛凛寒冬雷声翻滚，除非炎炎酷暑白雪纷飞，除非天地相交聚合连接，直到这样的事情全都发生时，我才敢将对你的情意抛弃决绝！</view>
</view>
......@@ -33,7 +31,6 @@
<view class="uni-comment-body">
<view class="uni-comment-top">
<text>今生缘</text>
<text class="uni-iconfont icon-zan"> 66</text>
</view>
<view class="uni-comment-content">人面不知何处去，桃花依旧笑春风。</view>
<view class="uni-comment-date">
......@@ -46,11 +43,10 @@
<view class="uni-comment-body">
<view class="uni-comment-top">
<text>小猫咪</text>
<text class="uni-iconfont icon-zan"> 120</text>
</view>
<view class="uni-comment-content">海上生明月，天涯共此时。。</view>
<view class="uni-comment-date">
<text>2天前<text class="uni-comment-replay-btn">5回复</text></text>
<view>2天前</view><view class="uni-comment-replay-btn">5回复</view>
</view>
</view>
</view>
......@@ -61,25 +57,15 @@
</template>
<script>
export default {
data:{
title:"评论界面"
export default {
data() {
return {
title:"评论界面"
}
}
}
</script>
<style>
.uni-comment{padding:5rpx 0; display: flex; flex-grow:1; flex-direction: column;}
.uni-comment-list{flex-wrap:nowrap; padding:10rpx 0; margin:10rpx 0; width:100%; display: flex;}
.uni-comment-face{width:70upx; height:70upx; border-radius:100%; margin-right:20upx; flex-shrink:0; overflow:hidden;}
.uni-comment-face image{width:100%; border-radius:100%;}
.uni-comment-body{width:100%;}
.uni-comment-top{line-height:1.5em; justify-content:space-between;}
.uni-comment-top text{color:#0A98D5; font-size:24upx;}
.uni-comment-top text:last-child{color:#666666;}
.uni-comment-date{line-height:1.5em; justify-content:space-between;}
.uni-comment-date text{color:#666666; font-size:24upx;}
.uni-comment-content{line-height:1.6em; font-size:28upx; padding:8rpx 0;}
.uni-comment-zan{color:#0A98D5 !important;}
.uni-comment-replay-btn{background:#F4F5F6; font-size:24upx; padding:8rpx 15upx; border-radius:30upx; color:#333 !important; margin:0 10upx;}
</style>
examples/hello-uniapp/pages/template/mpvue-picker/mpvue-picker.vue
浏览文件 @ 039d5985
......@@ -34,7 +34,6 @@
data() {
return {
title : "mvpue-picker 使用示例",
pickerValueDefault: [0, 0],
pickerSingleArray: [{
label: '中国',
value: 1
......@@ -58,7 +57,8 @@
pickerText: '',
mode: '',
deepLength: 1,
pickerValueDefault: [0]
pickerValueDefault: [0],
pickerValueArray:[]
};
},
methods: {
......
examples/hello-uniapp/pages/template/steps/steps.vue
浏览文件 @ 039d5985
......@@ -27,21 +27,14 @@
</view>
</template>
<script>
export default {
data:{
title:"步骤"
export default {
data() {
return {
title:"步骤"
}
}
}
</script>
<style>
page{background:#FFFFFF;}
.uni-steps{padding:20upx 30upx; flex-grow: 1; display:flex; flex-wrap:wrap;}
.uni-steps view{display:flex; flex-wrap:wrap; float:none;}
.uni-steps .step{width:31.3%; margin:0 1%; flex-wrap:nowrap;}
.uni-steps .step-circle{width:50upx; height:50upx; border-radius:50upx; background:#F1F1F3; justify-content:center; line-height:50upx; flex-shrink:0; margin-right:15upx; color:#666; font-size:28upx;}
.uni-steps .step-content{width:100%; height:22upx; border-bottom:1px solid #F1F2F3;}
.uni-steps .step-title{line-height:50upx; height:50upx; background:#FFFFFF; width:auto; overflow:hidden; padding-right:8upx;}
.uni-steps .current .step-circle{background:#00B26A; color:#FFFFFF;}
.uni-steps .current .step-content{border-color:#00B26A;}
.uni-steps .current .step-title{color:#00B26A;}
</style>
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或