up

3 years ago · 31648dabd9
parent 2af8bf6ce2
commit 31648dabd9
5 changed files with 116 additions and 99 deletions
--- a/manifest.json
+++ b/manifest.json
@ -1,28 +1,28 @@
 {
-	"name": "wx-dangyuanjiaoyujidi",
-	"appid": "__UNI__FC384E5",
-	"description": "",
-	"versionName": "1.0.0",
-	"versionCode": "100",
-	"transformPx": false,
+    "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
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
        },
        /* 模块配置 */
-		"modules": {},
+        "modules" : {},
        /* 应用发布信息 */
-		"distribute": {
+        "distribute" : {
            /* android打包配置 */
-			"android": {
-				"permissions": [
+            "android" : {
+                "permissions" : [
                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@ -41,41 +41,39 @@
                ]
            },
            /* ios打包配置 */
-			"ios": {},
+            "ios" : {},
            /* SDK配置 */
-			"sdkConfigs": {}
+            "sdkConfigs" : {}
        }
    },
    /* 快应用特有相关 */
-	"quickapp": {},
+    "quickapp" : {},
    /* 小程序特有相关 */
-	"mp-weixin": {
-		"appid": "wxd7b6631f1d3bc6bd",
-		"setting": {
-			"urlCheck": false,
-			"minified": false
+    "mp-weixin" : {
+        "appid" : "wxd7b6631f1d3bc6bd",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : false
        },
-		"usingComponents": true,
-		"permission": {
-			"scope.userLocation": {
-				"desc": "提供您最近的活动地址"
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "提供您最近的活动地址"
            }
        },
-		"requiredPrivateInfos": [
-			"getLocation"
-		]
+        "requiredPrivateInfos" : [ "getLocation" ]
    },
-	"mp-alipay": {
-		"usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
    },
-	"mp-baidu": {
-		"usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
    },
-	"mp-toutiao": {
-		"usingComponents": true
+    "mp-toutiao" : {
+        "usingComponents" : true
    },
-	"uniStatistics": {
-		"enable": false
+    "uniStatistics" : {
+        "enable" : false
    },
-	"vueVersion": "2"
+    "vueVersion" : "2"
 }
--- a/pages/park/book.vue
+++ b/pages/park/book.vue
@ -25,7 +25,7 @@
 				</u--form>

 				<view class="box-tip box-tipgray flex-row align-center" @click="handleChange">
-					<u-icon :name="(form.checkUser?'checkmark-circle-fill':'checkmark-circle')" color="#828282">
+					<u-icon :name="(form.checkUser?'checkmark-circle-fill':'checkmark-circle')" color="#EF9525">
 					</u-icon>
 					<view class="box-tiptxt" style="margin-left: 10rpx;">请认真阅读、知悉并遵守<text @click.stop="openNotice"
 							style="color: #EF9525;">《本馆停车须知》</text></view>
--- a/pages/park/index.vue
+++ b/pages/park/index.vue
@ -29,7 +29,7 @@
 							<view class="parkbox">
 								<view class="parkbox-title">可预约车位</view>
 								<view class="parkbox-content flex-row justify-around">
-									<view class="parkbox-item  flex-row align-center" style="margin-right: 10rpx;"
+									<view class="parkbox-item  flex-row align-center" style="margin-right: 10rpx;padding: 28rpx 20rpx;"
 										@click="handleSelectPark(2)" :class="(currentPark==2?'parkbox-item-on':'')"
 										v-if="remain_big_park>0">
 										<view class="parkbox-item-status" v-if="currentPark==2">
@ -37,7 +37,7 @@
 										</view>
 										<text class="iconfont icon-tingchechang1" style="font-size: 28rpx;"></text>
 										<view>
-											<text>大中：{{remain_big_park}}</text>
+											<text>大中(09:00-12:00)：{{remain_big_park}}</text>
 										</view>
 									</view>
 									<view class="parkbox-item flex-col align-center"
@ -53,6 +53,17 @@
 										</view>
 										<text style="font-size: 24rpx;color: #828282;">（充电桩空闲0）</text>
 									</view>
+									<view class="parkbox-item  flex-row align-center" style="margin-right: 10rpx;padding: 28rpx 20rpx;"
+										@click="handleSelectPark(4)" :class="(currentPark==4?'parkbox-item-on':'')"
+										v-if="remain_big_park2>0">
+										<view class="parkbox-item-status" v-if="currentPark==4">
+											<u-icon name="checkmark" color="#fff" size="20rpx"></u-icon>
+										</view>
+										<text class="iconfont icon-tingchechang1" style="font-size: 28rpx;"></text>
+										<view>
+											<text>大中(13:00-16:00)：{{remain_big_park2}}</text>
+										</view>
+									</view>
 									<view class="parkbox-item  flex-row align-center" style=""
 										@click="handleSelectPark(3)" :class="(currentPark==3?'parkbox-item-on':'')"
 										v-if="remain_special_park>0">
@ -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;
--- a/pages/visit/book.vue
+++ b/pages/visit/book.vue
@ -740,6 +740,7 @@

 									} else {
 										var jsonlist = JSON.parse(res.data);
+										_that.form.total=jsonlist.length;
 										for (var m of jsonlist) {
 											_that.form.details_list.push({
 												name: m.name,
--- 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