diff --git a/examples/hello-uniapp/common/uni.css b/examples/hello-uniapp/common/uni.css index b20ccf5945fa65b3478027a37dcfcbb1fd97544f..000cb53b34a48d0d7c39e6386c51fe6437a3c169 100644 --- a/examples/hello-uniapp/common/uni.css +++ b/examples/hello-uniapp/common/uni.css @@ -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 diff --git a/examples/hello-uniapp/components/mpvue-citypicker/mpvueCityPicker.vue b/examples/hello-uniapp/components/mpvue-citypicker/mpvueCityPicker.vue index 01b1441f282b7964fab627189ef1a14223cdc19f..2a0416c31e138e35bec472974484f20a215f7549 100644 --- a/examples/hello-uniapp/components/mpvue-citypicker/mpvueCityPicker.vue +++ b/examples/hello-uniapp/components/mpvue-citypicker/mpvueCityPicker.vue @@ -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; diff --git a/examples/hello-uniapp/components/mpvue-picker/mpvuePicker.vue b/examples/hello-uniapp/components/mpvue-picker/mpvuePicker.vue index 8a0123ba7f1176fd1e5a89ef04467cf7f3258052..dd988296f9e67f25fc78787cb1d5a779a75956f2 100644 --- a/examples/hello-uniapp/components/mpvue-picker/mpvuePicker.vue +++ b/examples/hello-uniapp/components/mpvue-picker/mpvuePicker.vue @@ -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) { diff --git a/examples/hello-uniapp/pages/template/comments/comments.vue b/examples/hello-uniapp/pages/template/comments/comments.vue index 10bb4df34ef9414132d0b8504e6ed9af718066b5..9ff42e1a610489f1663b9fac9857f2f752d372ca 100755 --- a/examples/hello-uniapp/pages/template/comments/comments.vue +++ b/examples/hello-uniapp/pages/template/comments/comments.vue @@ -13,7 +13,6 @@ 08/10 08:12 - 102 上天呀！我渴望与你相知相惜，长存此心永不褪减。 @@ -23,7 +22,6 @@ 马克一天 - 100 除非巍巍群山消逝不见，除非滔滔江水干涸枯竭。除非凛凛寒冬雷声翻滚，除非炎炎酷暑白雪纷飞，除非天地相交聚合连接，直到这样的事情全都发生时，我才敢将对你的情意抛弃决绝！ @@ -33,7 +31,6 @@ 今生缘 - 66 人面不知何处去，桃花依旧笑春风。 @@ -46,11 +43,10 @@ 小猫咪 - 120 海上生明月，天涯共此时。。 - 2天前5回复 + 2天前5回复 @@ -61,25 +57,15 @@ diff --git a/examples/hello-uniapp/pages/template/mpvue-picker/mpvue-picker.vue b/examples/hello-uniapp/pages/template/mpvue-picker/mpvue-picker.vue index fa9ce1669c1957442ec5c7300c10077681030f44..114340e3225a9111e750e7d21f2947cda0c6bd37 100644 --- a/examples/hello-uniapp/pages/template/mpvue-picker/mpvue-picker.vue +++ b/examples/hello-uniapp/pages/template/mpvue-picker/mpvue-picker.vue @@ -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: { diff --git a/examples/hello-uniapp/pages/template/steps/steps.vue b/examples/hello-uniapp/pages/template/steps/steps.vue index 692b94c0f16c3074afcb6b1e178a07b8de44e116..db5a4cca83156a3f996ad28542c00d395be339bd 100755 --- a/examples/hello-uniapp/pages/template/steps/steps.vue +++ b/examples/hello-uniapp/pages/template/steps/steps.vue @@ -27,21 +27,14 @@ \ No newline at end of file