diff --git a/manifest.json b/manifest.json index 7885609..a1ade3b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,81 +1,79 @@ -{ - "name": "wx-dangyuanjiaoyujidi", - "appid": "__UNI__FC384E5", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - /* 5+App特有相关 */ - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - /* 模块配置 */ - "modules": {}, - /* 应用发布信息 */ - "distribute": { - /* android打包配置 */ - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios": {}, - /* SDK配置 */ - "sdkConfigs": {} - } - }, - /* 快应用特有相关 */ - "quickapp": {}, - /* 小程序特有相关 */ - "mp-weixin": { - "appid": "wxd7b6631f1d3bc6bd", - "setting": { - "urlCheck": false, - "minified": false - }, - "usingComponents": true, - "permission": { - "scope.userLocation": { - "desc": "提供您最近的活动地址" - } - }, - "requiredPrivateInfos": [ - "getLocation" - ] - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - }, - "vueVersion": "2" +{ + "name" : "wx-dangyuanjiaoyujidi", + "appid" : "__UNI__FC384E5", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + /* 5+App特有相关 */ + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + /* 模块配置 */ + "modules" : {}, + /* 应用发布信息 */ + "distribute" : { + /* android打包配置 */ + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios" : {}, + /* SDK配置 */ + "sdkConfigs" : {} + } + }, + /* 快应用特有相关 */ + "quickapp" : {}, + /* 小程序特有相关 */ + "mp-weixin" : { + "appid" : "wxd7b6631f1d3bc6bd", + "setting" : { + "urlCheck" : false, + "minified" : false + }, + "usingComponents" : true, + "permission" : { + "scope.userLocation" : { + "desc" : "提供您最近的活动地址" + } + }, + "requiredPrivateInfos" : [ "getLocation" ] + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "uniStatistics" : { + "enable" : false + }, + "vueVersion" : "2" } diff --git a/pages/park/book.vue b/pages/park/book.vue index 52b6c3f..88e0eb0 100644 --- a/pages/park/book.vue +++ b/pages/park/book.vue @@ -25,7 +25,7 @@ - + 请认真阅读、知悉并遵守《本馆停车须知》 diff --git a/pages/park/index.vue b/pages/park/index.vue index 3ec5cf5..a53ddfa 100644 --- a/pages/park/index.vue +++ b/pages/park/index.vue @@ -29,7 +29,7 @@ 可预约车位 - @@ -37,7 +37,7 @@ - 大中:{{remain_big_park}} + 大中(09:00-12:00):{{remain_big_park}} (充电桩空闲0) + + + + + + + 大中(13:00-16:00):{{remain_big_park2}} + + @@ -63,15 +74,15 @@ 残疾人车位:{{remain_special_park}} - - - - - - - 暂无可选停车位 - + + + + + + + 暂无可选停车位 + @@ -163,7 +174,8 @@ }, remain_big_park: 0, remain_small_park: 0, - remain_special_park: 0 + remain_special_park: 0, + remain_big_park2: 0 } }, onLoad() { @@ -296,6 +308,8 @@ that.remain_big_park = res.remain_big_park; that.remain_small_park = res.remain_small_park; that.remain_special_park = res.remain_special_park; + that.remain_big_park2 = res.remain_big_park2; + var mod = { latitude: that.info.latitude, longitude: that.info.longitude, @@ -360,13 +374,17 @@ border: 2rpx solid #EF9525 !important; } + .parkbox-content { + flex-wrap: wrap; + } + .parkbox-item { border: 2rpx solid #F7F6F4; background: #F7F6F4; border-radius: 5rpx; - padding: 28rpx 0rpx; position: relative; - flex: 1; + padding: 10rpx 20rpx; + margin-bottom: 20rpx; display: flex; justify-content: center; font-size: 26rpx; @@ -375,7 +393,7 @@ } .book-box { - height: 50%; + height: 60%; position: absolute; bottom: 108rpx; left: 0; diff --git a/pages/visit/book.vue b/pages/visit/book.vue index 841b0d3..65cf194 100644 --- a/pages/visit/book.vue +++ b/pages/visit/book.vue @@ -739,7 +739,8 @@ _that.util.toast("导入失败,原因‘" + err.errmsg + "’请查看批量导入说明"); } else { - var jsonlist = JSON.parse(res.data); + var jsonlist = JSON.parse(res.data); + _that.form.total=jsonlist.length; for (var m of jsonlist) { _that.form.details_list.push({ name: m.name, diff --git a/utils/util.js b/utils/util.js index 5bdac49..c14fa10 100755 --- a/utils/util.js +++ b/utils/util.js @@ -1,7 +1,7 @@ import md5 from "./md5.min"; const HOSTARR = { - 'development': 'https://dangxingjiaoyujidi.langye.net', - 'production': 'https://dangxingjiaoyujidi.langye.net' + 'development': 'http://dangxingjiaoyujidi.langye.net', + 'production': 'https://leyiyuyue.szgmbwg.org.cn' }; // 审核状态 const HOST = HOSTARR[process.env