diff --git a/main.js b/main.js index ea7e1fe..6a13079 100644 --- a/main.js +++ b/main.js @@ -35,4 +35,10 @@ moment.locale('zh-cn', { weekdays: '周日_周一_周二_周三_周四_周五_周六'.split('_') }) Vue.prototype.util = util; -Vue.prototype.$moment = moment; +Vue.prototype.$moment = moment; + +// main.js +import Plate from '@/components/plate/index.vue' // 注意路径是否正确(建议用绝对路径) + +// 全局注册:第一个参数是组件标签名(需与页面中使用的 一致) +Vue.component('plate', Plate) diff --git a/pages.json b/pages.json index 6430ef6..9f0d416 100644 --- a/pages.json +++ b/pages.json @@ -23,7 +23,8 @@ "path": "pages/guide/index", "style": { "navigationBarTitleText": "参观指南", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { @@ -46,77 +47,88 @@ "path": "pages/visit/index", "style": { "navigationBarTitleText": "参观预约", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/activity/index", "style": { "navigationBarTitleText": "活动列表", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/visit/book", "style": { "navigationBarTitleText": "个人预约", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/visit/teambook", "style": { "navigationBarTitleText": "团体预约", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/activity/info", "style": { "navigationBarTitleText": "活动详情", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/activity/book", "style": { "navigationBarTitleText": "活动预约", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/order/visitorder", "style": { "navigationBarTitleText": "参观预约订单", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/order/parkorder", "style": { "navigationBarTitleText": "车位预约", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/park/index", "style": { "navigationBarTitleText": "停车场预约", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/order/visitorderinfo", "style": { "navigationBarTitleText": "参观预约详情", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { "path": "pages/park/book", "style": { "navigationBarTitleText": "停车场预约", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -125,7 +137,8 @@ "style" : { "navigationBarTitleText": "预约成功", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -134,7 +147,8 @@ "style" : { "navigationBarTitleText": "停车场预约", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -143,7 +157,8 @@ "style" : { "navigationBarTitleText": "活动预约", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -152,7 +167,8 @@ "style" : { "navigationBarTitleText": "活动预约详情", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -161,7 +177,8 @@ "style" : { "navigationBarTitleText": "参观指南", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -170,7 +187,8 @@ "style" : { "navigationBarTitleText": "参观指南", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -179,7 +197,8 @@ "style" : { "navigationBarTitleText": "分享预约小程序", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -188,7 +207,8 @@ "style" : { "navigationBarTitleText": "投诉建议", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -197,7 +217,8 @@ "style" : { "navigationBarTitleText": "联系我们", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -206,7 +227,8 @@ "style" : { "navigationBarTitleText": "分享二维码", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, @@ -224,7 +246,8 @@ "style" : { "navigationBarTitleText": "意见建议详情", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } diff --git a/pages/activity/info.vue b/pages/activity/info.vue index 1d76336..6bb6567 100644 --- a/pages/activity/info.vue +++ b/pages/activity/info.vue @@ -1,5 +1,16 @@ @@ -138,14 +150,14 @@ numbers: [], showNumbers: false, teamType: "", - activity_number_id: "" + activity_number_id: "", + showDisabled:false } }, onLoad(options) { var that = this; that.id = options.id; - }, onShow() { var that = this; @@ -184,7 +196,8 @@ }, numChange(item) { if (item.disabled) { - this.util.alert("您选择的场次不可预约!"); + // this.util.alert("您选择的场次不可预约!"); + this.showDisabled = true return; }; var _numbers = this.numbers; diff --git a/pages/index/index.vue b/pages/index/index.vue index 83db212..c4d589d 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -25,7 +25,7 @@ - +
@@ -588,7 +588,8 @@ } .box-top { - width: 100%; + width: 100%; + font-size: 0; } .index_bg { @@ -600,7 +601,7 @@ width: 100%; background-color: #F9F7F3; height: 63rpx; - margin-top: -30rpx; + /* margin-top: -30rpx; */ border-top-left-radius: 15rpx !important; border-top-right-radius: 15rpx !important; } diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 09d07c6..c9086c9 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -1,10 +1,10 @@