diff --git a/components/fl-page-header/fl-page-header.vue b/components/fl-page-header/fl-page-header.vue
index 9130527..19c07e1 100644
--- a/components/fl-page-header/fl-page-header.vue
+++ b/components/fl-page-header/fl-page-header.vue
@@ -68,6 +68,6 @@ export default {
diff --git a/components/price-picker/price-picker.vue b/components/price-picker/price-picker.vue
new file mode 100644
index 0000000..ac2d6df
--- /dev/null
+++ b/components/price-picker/price-picker.vue
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+ *已选择其他
+
+ 请填需求价位:
+
+ /人
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/w-picker/date-picker.vue b/components/w-picker/date-picker.vue
index 57e413f..7f9a798 100644
--- a/components/w-picker/date-picker.vue
+++ b/components/w-picker/date-picker.vue
@@ -1,760 +1,1171 @@
-
-
+
- 年份
- 月
- 日
- 时
- 分
+
+ 年份
+ 月
+ 日
+ 时
+ 分
+
+
+ 年份
+ 月
+ 日
+
-
-
- {{item}}年
-
-
-
-
- {{item}}年
-
-
- {{item}}月
-
-
-
-
- {{item}}年
-
-
- {{item}}月
-
-
- {{item}}日
-
-
-
-
- {{item}}年
-
-
- {{item}}月
-
-
- {{item}}日
-
-
- {{item}}时
-
-
-
-
- {{item}}年
-
-
- {{item}}月
-
-
- {{item}}日
-
-
- {{item}}时
-
-
- {{item}}分
-
-
-
-
- {{item}}年
-
-
- {{item}}月
-
-
- {{item}}日
-
-
- {{item}}时
-
-
- {{item}}分
-
-
- {{item}}秒
-
-
-
+
+
+ {{ item }}年
+
+
+
+
+ {{ item }}年
+
+
+ {{ item }}月
+
+
+
+
+ {{ item }}年
+
+
+ {{ item }}月
+
+
+ {{ item }}日
+
+
+
+
+ {{ item }}年
+
+
+ {{ item }}月
+
+
+ {{ item }}日
+
+
+ {{ item }}时
+
+
+
+
+ {{ item }}年
+
+
+ {{ item }}月
+
+
+ {{ item }}日
+
+
+ {{ item }}时
+
+
+ {{ item }}分
+
+
+
+
+ {{ item }}年
+
+
+ {{ item }}月
+
+
+ {{ item }}日
+
+
+ {{ item }}时
+
+
+ {{ item }}分
+
+
+ {{ item }}秒
+
+
+
diff --git a/components/w-picker/w-picker.vue b/components/w-picker/w-picker.vue
index 9706f2a..a26a584 100644
--- a/components/w-picker/w-picker.vue
+++ b/components/w-picker/w-picker.vue
@@ -1,19 +1,9 @@
-
+
-
@@ -184,9 +139,21 @@ export default {
default: false,
},
//不是插件自带为了组件复用故意传参数
- timeType:{
+ timeType: {
type: String,
- default: "half",
+ default: "",
+ },
+ // disabledMonth: {
+ // type: Number,
+ // default: 0,
+ // },
+ // disabledRange: {
+ // type: Array,
+ // default: ''
+ // },
+ disabledBefore: {
+ type: Boolean,
+ default: false,
}
},
created() {
@@ -214,7 +181,7 @@ export default {
},
handlerChange(res) {
let _this = this;
- this.result = {...res };
+ this.result = { ...res };
},
show() {
this.$emit("update:visible", true);
@@ -230,7 +197,7 @@ export default {
if (!this.confirmFlag) {
return;
}
- this.$emit("confirm", {timeType:this.timeType,...this.result});
+ this.$emit("confirm", { timeType: this.timeType, ...this.result });
this.$emit("update:visible", false);
},
},
@@ -247,8 +214,10 @@ export default {
white-space: nowrap;
font-size: 30upx;
}
+
.w-picker {
z-index: 888;
+
.mask {
position: fixed;
z-index: 1000;
@@ -261,10 +230,12 @@ export default {
opacity: 0;
transition: all 0.3s ease;
}
+
.mask.visible {
visibility: visible;
opacity: 1;
}
+
.w-picker-cnt {
position: fixed;
bottom: 0;
@@ -275,9 +246,11 @@ export default {
z-index: 3000;
background-color: #fff;
}
+
.w-picker-cnt.visible {
transform: translateY(0);
}
+
.w-picker-header {
display: flex;
align-items: center;
@@ -290,6 +263,7 @@ export default {
justify-content: space-between;
border-bottom: solid 1px #eee;
border-radius: 10upx 0;
+
.w-picker-btn {
font-size: 30upx;
}
diff --git a/pages/ticket/reserve.vue b/pages/ticket/reserve.vue
index 789c63c..cc0b541 100644
--- a/pages/ticket/reserve.vue
+++ b/pages/ticket/reserve.vue
@@ -118,6 +118,18 @@
width="64rpx"
height="34rpx"
@click="dateShow = true">
+
+
+
+ style="margin-top:182rpx;margin-bottom:60rpx">
uni-admission-fee