h5修改提交

master
lion 2 months ago
parent b8a5a5489d
commit abbb6f73cb

@ -22,7 +22,7 @@
<section class="panel" :class="{show:show}"> <section class="panel" :class="{show:show}">
<div class="header"> <div class="header">
<div class="p24" @click="panelReset"></div> <div class="p24" @click="panelReset"></div>
<img src="/static/img/down.png" style="width: 140upx;" mode="widthFix" @click="panelHide" /> <!-- <img src="/static/img/down.png" style="width: 140upx;" mode="widthFix" @click="panelHide" /> -->
<div class="p24" @click="panelHide"></div> <div class="p24" @click="panelHide"></div>
</div> </div>
<div class="panelList clearfix"> <div class="panelList clearfix">
@ -45,7 +45,7 @@
return [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N', return [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'J', 'K', 'L', 'M', 'N',
'P', 'Q', 'P', 'Q',
'R', 'R',
'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '港', '澳', '学', '领' 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '警','港', '澳', '学', '领'
] ]
} }
}, },
@ -140,7 +140,7 @@
width: 66upx; width: 66upx;
height: 66upx; height: 66upx;
background-color: #fffbe9; background-color: #fffbe9;
border: 1px solid #cf995a; border: 1px solid #EF9525;
border-radius: 10upx; border-radius: 10upx;
display: flex; display: flex;
align-items: center; align-items: center;
@ -155,7 +155,7 @@
} }
&.active { &.active {
background-color: #cf995a; background-color: #EF9525;
} }
} }
} }
@ -212,7 +212,7 @@
position: absolute; position: absolute;
bottom: 10upx; bottom: 10upx;
right: 22upx; right: 22upx;
width: 100upx; width: 62upx;
height: 84upx; height: 84upx;
background-color: #adb2bc; background-color: #adb2bc;
border-radius: 10upx; border-radius: 10upx;

@ -36,3 +36,9 @@ moment.locale('zh-cn', {
}) })
Vue.prototype.util = util; Vue.prototype.util = util;
Vue.prototype.$moment = moment; Vue.prototype.$moment = moment;
// main.js
import Plate from '@/components/plate/index.vue' // 注意路径是否正确(建议用绝对路径)
// 全局注册:第一个参数是组件标签名(需与页面中使用的 <plate> 一致)
Vue.component('plate', Plate)

@ -274,7 +274,8 @@
.orderBoxInfoRowTxt { .orderBoxInfoRowTxt {
font-size: 24rpx; font-size: 24rpx;
font-family: PingFang SC; font-family: PingFang SC;
color: #828282; color: #828282;
width:100%;
} }
.orderBoxTime { .orderBoxTime {

@ -113,13 +113,12 @@
</template> </template>
<script> <script>
import { // import {
plate // Plate
} from '@/components/plate/index.vue' // } from '@/components/plate/index.vue'
export default { export default {
name: "index",
components: { components: {
plate // plate:Plate
}, },
data() { data() {
return { return {

@ -433,7 +433,11 @@
handleConfirmOrder() { handleConfirmOrder() {
if (this.selectInfo.orderid === 0) { if (this.selectInfo.orderid === 0) {
this.util.toast("请选择预约的活动或者预约的参观"); // this.util.toast("");
uni.showToast({
title:'请选择预约的活动或者预约的参观',
icon:'none'
})
return false; return false;
} }
this.showSelectorder = false; this.showSelectorder = false;
@ -588,10 +592,18 @@
}, },
tobook() { tobook() {
if (this.selectInfo.orderid === 0) { if (this.selectInfo.orderid === 0) {
this.util.toast("请选择预约的活动或者预约的参观"); // this.util.toast("");
uni.showToast({
title:'请选择预约的活动或者预约的参观',
icon:'none'
})
return false; return false;
} else if (this.currentPark === 0) { } else if (this.currentPark === 0) {
this.util.toast("请选择停车位"); // this.util.toast("");
uni.showToast({
title:'请选择预约的活动或者预约的参观',
icon:'none'
})
return false; return false;
} else { } else {
var json = escape(JSON.stringify(this.selectInfo)); var json = escape(JSON.stringify(this.selectInfo));

@ -25,21 +25,24 @@
"style": { "style": {
"navigationBarTitleText": "展览", "navigationBarTitleText": "展览",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff" "navigationBarBackgroundColor": "#fff",
"navigationStyle": "custom"
} }
},{ },{
"path": "pages/exhibit/detail", "path": "pages/exhibit/detail",
"style": { "style": {
"navigationBarTitleText": "展览", "navigationBarTitleText": "展览",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff" "navigationBarBackgroundColor": "#fff",
"navigationStyle": "custom"
} }
},{ },{
"path": "pages/exhibit/bookdetail", "path": "pages/exhibit/bookdetail",
"style": { "style": {
"navigationBarTitleText": "党史书籍", "navigationBarTitleText": "党史书籍",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff" "navigationBarBackgroundColor": "#fff",
"navigationStyle": "custom"
} }
},{ },{
"path": "pages/vr/index", "path": "pages/vr/index",
@ -61,7 +64,8 @@
"navigationBarTitleText": "服务", "navigationBarTitleText": "服务",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff", "navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black" "navigationBarTextStyle": "black",
"navigationStyle": "custom"
} }
}, { }, {
@ -76,35 +80,40 @@
"path": "pages/visit/index", "path": "pages/visit/index",
"style": { "style": {
"navigationBarTitleText": "参观信息", "navigationBarTitleText": "参观信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "pages/visit/book", "path": "pages/visit/book",
"style": { "style": {
"navigationBarTitleText": "个人信息", "navigationBarTitleText": "个人信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "pages/visit/teambook", "path": "pages/visit/teambook",
"style": { "style": {
"navigationBarTitleText": "团队信息", "navigationBarTitleText": "团队信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "pages/success/success", "path": "pages/success/success",
"style": { "style": {
"navigationBarTitleText": "填报成功", "navigationBarTitleText": "填报成功",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "pages/mine/recommend", "path": "pages/mine/recommend",
"style": { "style": {
"navigationBarTitleText": "分享预约小程序", "navigationBarTitleText": "分享预约小程序",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
} }
@ -116,7 +125,8 @@
"style": { "style": {
"navigationBarTitleText": "展厅导览", "navigationBarTitleText": "展厅导览",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff" "navigationBarBackgroundColor": "#fff",
"navigationStyle": "custom"
} }
}, { }, {
"path": "map/map", "path": "map/map",
@ -130,77 +140,88 @@
"path": "activity/index", "path": "activity/index",
"style": { "style": {
"navigationBarTitleText": "活动列表", "navigationBarTitleText": "活动列表",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
},{ },{
"path": "activity/info", "path": "activity/info",
"style": { "style": {
"navigationBarTitleText": "活动详情", "navigationBarTitleText": "活动详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "activity/book", "path": "activity/book",
"style": { "style": {
"navigationBarTitleText": "活动预约", "navigationBarTitleText": "活动预约",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "park/index", "path": "park/index",
"style": { "style": {
"navigationBarTitleText": "停车场预约", "navigationBarTitleText": "停车场预约",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "park/book", "path": "park/book",
"style": { "style": {
"navigationBarTitleText": "停车场预约", "navigationBarTitleText": "停车场预约",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
},{ },{
"path": "order/visitorder", "path": "order/visitorder",
"style": { "style": {
"navigationBarTitleText": "参观订单", "navigationBarTitleText": "参观订单",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "order/parkorder", "path": "order/parkorder",
"style": { "style": {
"navigationBarTitleText": "车位预约", "navigationBarTitleText": "车位预约",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "order/visitorderinfo", "path": "order/visitorderinfo",
"style": { "style": {
"navigationBarTitleText": "参观信息详情", "navigationBarTitleText": "参观信息详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "order/parkorderinfo", "path": "order/parkorderinfo",
"style": { "style": {
"navigationBarTitleText": "停车场预约", "navigationBarTitleText": "停车场预约",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "order/activityorder", "path": "order/activityorder",
"style": { "style": {
"navigationBarTitleText": "活动预约", "navigationBarTitleText": "活动预约",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, { }, {
"path": "order/activityorderinfo", "path": "order/activityorderinfo",
"style": { "style": {
"navigationBarTitleText": "活动预约详情", "navigationBarTitleText": "活动预约详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}] }]

Loading…
Cancel
Save