按需引入， 降低主包大小

App.vue

@@ -1,6 +1,6 @@
 <style lang="scss">
 	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
-	@import "@/uni_modules/uview-ui/index.scss";
+	@import "@/subpackage/uview-ui/index.scss";
 	
 </style>
 <script>

config/.env.dev.js

@@ -2,7 +2,7 @@ const UNI_APP = {
 	ProjectName :"智泊e家",
 	BASE_URL: 'http://192.168.8.162:8081/floorlock/',
 	BASE_URL:"https://youdian-test.hbjp.com.cn/floorlock-server/",
-	//BASE_URL:"https://zbyj.hbjp.com.cn/floorlock-server/",
+	BASE_URL:"https://zbyj.hbjp.com.cn/floorlock-server/",
 	
 	PREFIX : "jp-floorlock-phone",
 	NODE_ENV :"dev",

main.js

@@ -14,7 +14,8 @@ Vue.prototype.jphelp = mixin
 
 //import Vconsole from 'vconsole'
 //import uView from "uview-ui";
-import uView from '@/uni_modules/uview-ui'
+
+import uView from '@/uni_modules/subpackage'
 
 Vue.use(uView);
 
@@ -61,7 +62,8 @@ Vue.mixin({
 			title: '智泊e家',
 			path: '/pages/index/index' 
 		}
-	},
+	},
+	
 	methods: {
 		distanceN(distance){
 			if(!distance){

manifest.json

@@ -51,6 +51,12 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "wxefea1c17991d644c",
+		"optimization": {
+		      "subPackages": true // 开启分包优化
+		    },
+		    "splitChunks": {
+		      "automaticCommonSplit": false // 关闭自动提取公共模块
+		    },
         "setting" : {
             "urlCheck" : false
         },
@@ -61,7 +67,7 @@
             }
         },
         "lazyCodeLoading" : "requiredComponents",
-        "requiredPrivateInfos" : [ "getLocation" ]
+        "requiredPrivateInfos" : [ "getLocation","chooseLocation" ]
     },
     "mp-alipay" : {
         "usingComponents" : true

pages.json

@@ -1,199 +1,184 @@
 {
+
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		 
-				{
-					"path" : "pages/index/index",
-					"style" : 
-					{
-						"navigationBarTitleText" : "选择停车场"
-					}
-				},
-				
-				{
-					"path" : "pages/index/main/parkingDetails",
-					"style" : 
-					{
-						
-						 
-					}
-				},
-				
-				
-				
-				{
-					"path" : "pages/index/center",
-					"style" : 
-					{
-						"navigationBarTitleText" : "个人中心"
-					}
-				}
-			    
-       
-    ],
-	"preloadRule": {
-			"pages/index/center": {
-				"network": "all",
-				"packages": ["pages/business","pages/mylock","pages/information"]
-			}
-	},
-	"subPackages": [
-		{
-			"root": "pages/business",
-			"pages": [ 
-				
-				{
-					"path" : "lockInfo",
-					"style" : 
-					{
-						 
-					}
-				},
-				{
-					"path" : "quickInfo",
-					"style" : 
-					{
-						"navigationBarTitleText" : "快捷停车"
-						
-					}
-				}
-				
-			]
-		},
-		{
-			"root": "pages/information",
-			"pages": [ 
-				{
-					"path" : "information",
-					"style" : 
-					{
-						"navigationBarTitleText" : "个人信息"
-					
-					}
-				},
-				
-				
-				{
-					"path" : "cropImage",
-					"style" : {
-						"navigationBarTitleText" : "裁剪头像"
-					}
-				},
-				{
-					"path" : "parkingRecord",
-					"style" : 
-					{
-						"navigationBarTitleText" : "停车记录"
-						
-					}
-				},
-				{
-					"path" : "parkingInfo",
-					"style" : 
-					{
-						"navigationBarTitleText" : "停车记录"
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/mylock",
-			"pages": [ 
-				{
-					"path" : "myLock",
-					"style" : 
-					{
-						"navigationBarTitleText" : "我的地锁"
-						
-					}
-				},
-				{
-					"path" : "bindLock",
-					"style" : 
-					{
-						"navigationBarTitleText" : "绑定新地锁"
-						
-					}
-				},
-				
-				{
-					"path" : "infoLock",
-					"style" : 
-					{
-						"navigationBarTitleText" : "地锁详情"
-						 
-					}
-				},
-				{
-					"path" : "bindLockStatus",
-					"style" : 
-					{
-						"navigationBarTitleText" : "绑定新地锁"
-					}
-				},
-				{
-					"path" : "myWhite",
-					"style" : 
-					{
-						"navigationBarTitleText" : "我的白名单"
-					}
-				},
-				{
-					"path" : "editLock",
-					"style" : 
-					{
-						"navigationBarTitleText" : "修改地锁",
-						"mp-alipay": {
-						      "usingComponents": {
-						        "u-picker": "/uni_modules/uview-ui/components/u-picker/u-picker"
-						      }
-						 }
-					}
-				}
-			]
-		}
-	],
-	"tabBar": {
-		"navigationStyle": "custom",
-		"color": "#7A7E83",
-		"selectedColor": "#347CF6",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		 
-		"list": [{
-			"pagePath": "pages/index/index",
-		
-			"text": "附近"
-		}, {
-			"pagePath": "pages/index/center",
-		
-			"text": "我的"
-		}]
-	},
-	
-	"permission":{
-			"scope.userLocation":{
-				"desc":"获得用户当前位置"
-			}
+
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "选择停车场"
+			}
+		},
+
+		{
+			"path": "pages/index/main/parkingDetails",
+			"style": {
+
+
+			}
+		},
+
+		{
+			"path": "pages/index/center",
+			"style": {
+				"navigationBarTitleText": "个人中心"
+			}
+		}
+
+
+	],
+	"preloadRule": {
+		"pages/index/center": {
+			"network": "all",
+			"packages": ["pages/business", "pages/mylock", "pages/information"]
+		}
+	},
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			"^u-(.*)": "@/subpackage/uview-ui/components/u-$1/u-$1.vue"
+		}
+	},
+	"subPackages": [{
+			"root": "subpackage/uview-ui",
+			"pages": [] // 无需页面，仅存放组件
+		},
+		{
+			"root": "pages/business",
+			"pages": [
+
+				{
+					"path": "lockInfo",
+					"style": {
+
+					}
+				},
+				{
+					"path": "quickInfo",
+					"style": {
+						"navigationBarTitleText": "快捷停车"
+
+					}
+				}
+
+			]
+		},
+		{
+			"root": "pages/information",
+			"pages": [{
+					"path": "information",
+					"style": {
+						"navigationBarTitleText": "个人信息"
+
+					}
+				},
+
+
+				{
+					"path": "cropImage",
+					"style": {
+						"navigationBarTitleText": "裁剪头像"
+					}
+				},
+				{
+					"path": "parkingRecord",
+					"style": {
+						"navigationBarTitleText": "停车记录"
+
+					}
+				},
+				{
+					"path": "parkingInfo",
+					"style": {
+						"navigationBarTitleText": "停车记录"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mylock",
+			"pages": [{
+					"path": "myLock",
+					"style": {
+						"navigationBarTitleText": "我的地锁"
+
+					}
+				},
+				{
+					"path": "bindLock",
+					"style": {
+						"navigationBarTitleText": "绑定新地锁"
+
+					}
+				},
+
+				{
+					"path": "infoLock",
+					"style": {
+						"navigationBarTitleText": "地锁详情"
+
+					}
+				},
+				{
+					"path": "bindLockStatus",
+					"style": {
+						"navigationBarTitleText": "绑定新地锁"
+					}
+				},
+				{
+					"path": "myWhite",
+					"style": {
+						"navigationBarTitleText": "我的白名单"
+					}
+				},
+				{
+					"path": "editLock",
+					"style": {
+						"navigationBarTitleText": "修改地锁"
+
+					}
+				}
+			]
+		}
+	],
+	"tabBar": {
+		"navigationStyle": "custom",
+		"color": "#7A7E83",
+		"selectedColor": "#347CF6",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+
+		"list": [{
+			"pagePath": "pages/index/index",
+
+			"text": "附近"
+		}, {
+			"pagePath": "pages/index/center",
+
+			"text": "我的"
+		}]
+	},
+
+	"permission": {
+		"scope.userLocation": {
+			"desc": "获得用户当前位置"
+		}
 	},
 	"globalStyle": {
 		//"navigationStyle": "custom", // 隐藏系统导航栏
 		"navigationBarTitleText": "智泊e家",
-		"enablePullDownRefresh": false,
-		"navigationBarTextStyle":"black",
-		"navigationBarBackgroundColor":"#fff"
-		
-	},
-	
+		"enablePullDownRefresh": false,
+		"navigationBarTextStyle": "black",
+		"navigationBarBackgroundColor": "#fff"
+
+	},
+
 	"uniIdRouter": {},
-	"condition" : { //模式配置，仅开发期间生效
+	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [
-			{
-				"name": "", //模式名称
-				"path": "", //启动页面，必选
-				"query": "" //启动参数，在页面的onLoad函数里面得到
-			}
-		]
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
 	}
-}
-
+}

pages/business/lockInfo.vue

@@ -1,30 +1,30 @@
-<template>
+<template>
 	<view>
 		<componentLogin ref="refLogin"  :check="0"
 		@findByOpenId="findByOpenId"></componentLogin>
-		
-		<u-popup v-model="showMessage" mode="bottom" border-radius="30">
-			<view class="showMessage">
-				<view class="title">降锁成功</view>
-				<view class="body">
-					车位锁已经降锁，请尽快驶入车位充电！<br />
-
-					若超过3分钟未停车，车位锁将自动升起上锁，如需继续使用请重新扫码降锁。
-
-				</view>
-				<view class="botton">
-					<u-button @click="showMessage=false" type="primary" shape="square">知道了</u-button>
-				</view>
-			</view>
-		</u-popup>
-
-		
-		<view class="jpmain  "  v-if="loading"  >
-			<view class="gradient-header">
-				<view class="jpback">
-
-				</view>
-			</view>
+		
+		<u-popup v-model="showMessage" mode="bottom" border-radius="30">
+			<view class="showMessage">
+				<view class="title">降锁成功</view>
+				<view class="body">
+					车位锁已经降锁，请尽快驶入车位充电！<br />
+
+					若超过3分钟未停车，车位锁将自动升起上锁，如需继续使用请重新扫码降锁。
+
+				</view>
+				<view class="botton">
+					<u-button @click="showMessage=false" type="primary" shape="square">知道了</u-button>
+				</view>
+			</view>
+		</u-popup>
+
+		
+		<view class="jpmain  "  v-if="loading"  >
+			<view class="gradient-header">
+				<view class="jpback">
+
+				</view>
+			</view>
 			<view class="body" v-if="id" >
 				<view class="page" v-if="floorlockInfo.id" >
 					<view class="page-main">
@@ -54,7 +54,7 @@
 						</view>
 					</view>
 				</view>
-			</view>
+			</view>
 			<view class="page-top" v-if="id">
 				<template v-if="floorlockInfo.status==0" >
 					<view class="name">
@@ -67,20 +67,20 @@
 					<view class="name" v-if="floorlockInfo.parkingStatus==1">
 						
 						<img class="img" src="@/assets/img/lockstatus/index3.png" alt="">
-					</view>
-					<view class="name" v-else-if="floorlockInfo.lockStatus==1">
-						<img class="img" src="@/assets/img/lockstatus/index1.png" alt="">
+					</view>
+					<view class="name" v-else-if="floorlockInfo.lockStatus==1">
+						<img class="img" src="@/assets/img/lockstatus/index1.png" alt="">
 					</view>
 					<view class="name" v-else-if="floorlockInfo.lockStatus==3">
 						<img class="img" src="@/assets/img/lockstatus/index2.png" alt="">
 						
-					</view>
+					</view>
 					<view class="name" v-else-if="floorlockInfo.lockStatus==2">
-						<img class="img" src="@/assets/img/lockstatus/index2.png" alt="">
-					</view>
-					<view class="name" v-else-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
+						<img class="img" src="@/assets/img/lockstatus/index2.png" alt="">
+					</view>
+					<view class="name" v-else-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
 						
-						<img class="img" src="@/assets/img/lockstatus/index4.png" alt="">
+						<img class="img" src="@/assets/img/lockstatus/index4.png" alt="">
 					</view>
 					
 				</template>
@@ -144,32 +144,32 @@
 					</template>
 					
 					
-				</view>
-			</view>
-			<view class="body">
-
-
-				
-				<view class="page">
-
-					<view class="page-content">
-						<view class="tip1">
+				</view>
+			</view>
+			<view class="body">
+
+
+				
+				<view class="page">
+
+					<view class="page-content">
+						<view class="tip1">
 							<view class="step">1、从微信小程序入口进入停车场页面，或通过微信扫描位于充电桩或地锁上的二维码进入车位详情页面；</view>
 							
 							<view class="step">2、选择需要降锁的车位，点击“降锁”按钮，等待地锁降下后系统会提示降锁成功，此时即可将车辆驶入指定车位。</view>
-
-						</view>
-						<view class="tip2">
-							<view class="tip-title">温馨提示</view>
-
-							<view class="step">1、成功降锁后请于三分钟内将车辆驶入指定车位；超时地锁会自动升起，需重新扫码降锁；</view>
-							<view class="step">2、请按降锁流程说明停车，严禁使用外力降锁；</view>
-							<view class="step">3、地锁服务热线 400-8899-619。</view>
-
-						</view>
-					</view>
-				</view>
-			</view>
+
+						</view>
+						<view class="tip2">
+							<view class="tip-title">温馨提示</view>
+
+							<view class="step">1、成功降锁后请于三分钟内将车辆驶入指定车位；超时地锁会自动升起，需重新扫码降锁；</view>
+							<view class="step">2、请按降锁流程说明停车，严禁使用外力降锁；</view>
+							<view class="step">3、地锁服务热线 400-8899-619。</view>
+
+						</view>
+					</view>
+				</view>
+			</view>
 			
 			<u-modal v-model="openLockBl" @confirm="lockStatus1" confirm-color="#00B962" :show-cancel-button="true"
 				ref="uModal" title="提示" content="是否下降当前地锁?" confirm-text="开启"></u-modal>
@@ -184,49 +184,49 @@
 			<u-modal v-model="openModalBl" @confirm="confirmPhone" confirm-text="拨打电话" confirm-color="#606266"
 				:show-cancel-button="true" ref="uModal" :asyncClose="true" title="客服电话" :content="content"
 				:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
-			
-
+			
+
 		</view>
 		<view class="page-role" v-else>
 			<img class="img" src="@/assets/img/nonwhitelist/info.png" alt="">
 			<view class="text1">{{permission?'暂无权限':'加载中...'}}</view>
 			<view class="text2" v-if="permission">此车位仅限车主及白名单用户使用</view>
 			<view class="botton" @click="gotoIndex" v-if="permission">返回首页</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/index.js'
-	import componentLogin from '@/components/componentLogin.vue';
-
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/index.js'
+	import componentLogin from '@/components/componentLogin.vue';
+
 	export default {
 		components: {
 			componentLogin,
-			'u-modal': () => import('@/uni_modules/uview-ui/components/u-modal/u-modal'),
-			'u-popup': () => import('@/uni_modules/uview-ui/components/u-popup/u-popup'),
-			'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
-
-		},
-		data() {
-			return {
-				id: "",
+			//'u-modal': () => import('@/uni_modules/uview-ui/components/u-modal/u-modal'),
+			//'u-popup': () => import('@/uni_modules/uview-ui/components/u-popup/u-popup'),
+			//'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
+
+		},
+		data() {
+			return {
+				id: "",
 				loading: true,
-				usable:false,
+				usable:false,
 				permission: false,
-				loginBl:false,
+				loginBl:false,
 				floorlockInfo: {
 					lockStatusN:""
-				},
-				setIntervalId: "",
+				},
+				setIntervalId: "",
 				showMessage: 0,
 				content: "400-8899-619",
 				openLockBl:false,
 				closeLockBl:false,
 				openModalBl: false,
-				
-			}
-		},
+				
+			}
+		},
 		onLoad(op) {
 			 
 			if(op.q){
@@ -241,19 +241,19 @@
 				}
 				
 			}
-			 if (op.id) {
-				this.id = op.id
-				uni.setNavigationBarTitle({
-					title: "加载中..."
-				})
-				// this.$refs.refLogin.findByOpenId()
-			} else {
-				this.loading = true
-				uni.setNavigationBarTitle({
-					title: "降锁说明"
-				})
-			}
-
+			 if (op.id) {
+				this.id = op.id
+				uni.setNavigationBarTitle({
+					title: "加载中..."
+				})
+				// this.$refs.refLogin.findByOpenId()
+			} else {
+				this.loading = true
+				uni.setNavigationBarTitle({
+					title: "降锁说明"
+				})
+			}
+
 		},
 		onShareTimeline(){
 			if(this.id){
@@ -284,8 +284,8 @@
 					path: '/pages/index/index' ,
 				}
 			}
-		},
-		onReady() {
+		},
+		onReady() {
 			this.$refs.refLogin.findByOpenId()
 			this.setIntervalId = setInterval(() => {
 				this.getFloorlockDetails(1)
@@ -294,15 +294,15 @@
 			this.jphelp.setInterval("lockInfo",this.setIntervalId)
 			
 			this.getFloorlockDetails()
-			
-		},
-		onUnload() {
-			//setInterval
-			if (this.setIntervalId) {
-				clearInterval(this.setIntervalId)
-			}
-
-		},
+			
+		},
+		onUnload() {
+			//setInterval
+			if (this.setIntervalId) {
+				clearInterval(this.setIntervalId)
+			}
+
+		},
 		methods: {
 			findByOpenId(res) {
 				
@@ -315,11 +315,11 @@
 				uni.makePhoneCall({
 					phoneNumber: this.content //仅为示例
 				});
-			},
-			gotoIndex() {
-				uni.switchTab({
-					url: "/pages/index/index"
-				})
+			},
+			gotoIndex() {
+				uni.switchTab({
+					url: "/pages/index/index"
+				})
 			},
 			lockStatus1(){
 				uni.showLoading({
@@ -403,7 +403,7 @@
 			},
 			loginconfirm(){
 				this.$refs.refLogin.ashow()
-			},
+			},
 			operateBtn() {
 				if(!this.jphelp.getPersonInfo().id){
 					this.loginBl=true;
@@ -424,24 +424,24 @@
 						this.lockStatus3()  //过程
 					}
 				}
-				
-			},
-			getFloorlockDetails(bl) {
-				if (!this.id) {
-					return
-				}
-				if (!bl) {
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-				}
-
-				var obj = {
-					id: this.id
-				}
-
-				API.floorlockDetails(obj).then((res) => {
+				
+			},
+			getFloorlockDetails(bl) {
+				if (!this.id) {
+					return
+				}
+				if (!bl) {
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+				}
+
+				var obj = {
+					id: this.id
+				}
+
+				API.floorlockDetails(obj).then((res) => {
 					this.floorlockInfo = res.data.floorlockInfo
 					// this.floorlockInfo.status=1;
 					// this.floorlockInfo.lockStatus=1
@@ -449,154 +449,154 @@
 					if(this.floorlockInfo.parkingPhone){
 						this.content=this.floorlockInfo.parkingPhone
 					}
-					
-					if (res.data.usable) {
-
-						uni.setNavigationBarTitle({
-							title: this.floorlockInfo.parkingName
-						})
-
-						this.loading = true
-
-
-
+					
+					if (res.data.usable) {
+
+						uni.setNavigationBarTitle({
+							title: this.floorlockInfo.parkingName
+						})
+
+						this.loading = true
+
+
+
 					} else {
-						this.loading = false
-						this.permission = true
-						// #ifdef MP-WEIXIN
-						uni.setBackgroundColor({
-							backgroundColor: '#ffffff',
-						})
-						// #endif
-					}
-
-
-					if (!bl) {
-						uni.hideLoading();
-					}
-				}).catch(error => {
-
-					uni.hideLoading();
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			}
-		},
-
-	}
-</script>
-<style>
-	page {
-		background-color: rgba(242, 244, 246, 1);
-	}
-</style>
-<style scoped lang="scss">
-	/* styles.css */
-	.page-role {
-		padding-top: 120rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.img {
-			width: 500rpx;
-			height: 500rpx;
-		}
-
-		.text1 {
-			color: rgba(51, 51, 51, 1);
-			font-weight: bold;
-			font-size: 48rpx;
-			margin-bottom: 16rpx;
-		}
-
-		.text2 {
-			color: rgba(51, 51, 51, 1);
-			font-size: 36rpx;
-			margin-bottom: 200rpx;
-		}
-
-		.botton {
-			border-radius: 100rpx;
-			width: 360rpx;
-			text-align: center;
-			border: 1px solid rgba(187, 187, 187, 1);
-			color: rgba(22, 119, 255, 1);
-			padding: 16rpx;
-
-		}
-	}
-
-	.body {
-		padding: 32rpx;
-	}
-
-	.gradient-header {
-		height: 0px;
-	}
-
-	.jpback {
-		height: 400rpx;
-		background: linear-gradient(180deg, rgba(203, 234, 255, 1) 0%, rgba(203, 234, 255, 0) 100%);
-	}
-
-	.page-top {
-		padding: 40rpx;
-		padding-top: 0rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.name {
-			width: 320rpx;
-			height: 320rpx;
-			display: flex;
-			align-items: flex-end;
-
-			.img {
-				width: 320rpx;
-				height: 320rpx;
-			}
-
-			.img2 {
-				width: 320rpx;
-				height: 140rpx;
+						this.loading = false
+						this.permission = true
+						// #ifdef MP-WEIXIN
+						uni.setBackgroundColor({
+							backgroundColor: '#ffffff',
+						})
+						// #endif
+					}
+
+
+					if (!bl) {
+						uni.hideLoading();
+					}
+				}).catch(error => {
+
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			}
-			
-		}
-
-		.value {
-			//margin-top: 24rpx;
-			font-size: 40rpx;
-			font-weight: bold;
-			color: #333333;
-		}
-	}
-
-	.page {
-
-		border-radius: 16rpx;
-		background-color: rgba(255, 255, 255, 1);
-		color: rgba(16, 16, 16, 1);
-
-		padding: 32rpx;
-		margin-bottom: 32rpx;
-		font-size: 32rpx;
-		color: rgb(16, 16, 16);
-
-		.page-main {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.name {
-				color: rgba(51, 51, 51, 1);
-				font-size: 36rpx;
-				
+		},
+
+	}
+</script>
+<style>
+	page {
+		background-color: rgba(242, 244, 246, 1);
+	}
+</style>
+<style scoped lang="scss">
+	/* styles.css */
+	.page-role {
+		padding-top: 120rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.img {
+			width: 500rpx;
+			height: 500rpx;
+		}
+
+		.text1 {
+			color: rgba(51, 51, 51, 1);
+			font-weight: bold;
+			font-size: 48rpx;
+			margin-bottom: 16rpx;
+		}
+
+		.text2 {
+			color: rgba(51, 51, 51, 1);
+			font-size: 36rpx;
+			margin-bottom: 200rpx;
+		}
+
+		.botton {
+			border-radius: 100rpx;
+			width: 360rpx;
+			text-align: center;
+			border: 1px solid rgba(187, 187, 187, 1);
+			color: rgba(22, 119, 255, 1);
+			padding: 16rpx;
+
+		}
+	}
+
+	.body {
+		padding: 32rpx;
+	}
+
+	.gradient-header {
+		height: 0px;
+	}
+
+	.jpback {
+		height: 400rpx;
+		background: linear-gradient(180deg, rgba(203, 234, 255, 1) 0%, rgba(203, 234, 255, 0) 100%);
+	}
+
+	.page-top {
+		padding: 40rpx;
+		padding-top: 0rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.name {
+			width: 320rpx;
+			height: 320rpx;
+			display: flex;
+			align-items: flex-end;
+
+			.img {
+				width: 320rpx;
+				height: 320rpx;
+			}
+
+			.img2 {
+				width: 320rpx;
+				height: 140rpx;
+			}
+			
+		}
+
+		.value {
+			//margin-top: 24rpx;
+			font-size: 40rpx;
+			font-weight: bold;
+			color: #333333;
+		}
+	}
+
+	.page {
+
+		border-radius: 16rpx;
+		background-color: rgba(255, 255, 255, 1);
+		color: rgba(16, 16, 16, 1);
+
+		padding: 32rpx;
+		margin-bottom: 32rpx;
+		font-size: 32rpx;
+		color: rgb(16, 16, 16);
+
+		.page-main {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.name {
+				color: rgba(51, 51, 51, 1);
+				font-size: 36rpx;
+				
 				display: flex;
-				flex-direction: column;
+				flex-direction: column;
 				.name-info{
 					font-size: 36rpx;
 					font-weight: bold;
@@ -607,8 +607,8 @@
 					font-size: 24rpx;
 					color: rgba(119,119,119,1);
 				
-				}
-				
+				}
+				
 			}
 			.tags{
 				
@@ -642,134 +642,134 @@
 					background-color:#A7A2A2;
 					border: 1px solid #A7A2A2;
 				}
-			}
-
-		}
+			}
+
+		}
 		.page-info{
 			    font-size: 24rpx;
 			    color: #777777;
 				display: flex;
 				justify-content: space-between;
-		}
-		.page-content {
-			.step {
-				margin-bottom: 16rpx;
-			}
-
-			.tip-title {
-				color: #101010;
-				font-size: 36rpx;
-				font-weight: bold;
-				margin-bottom: 24rpx;
-			}
-
-			.tip1 {
-				.step {
-					color: #101010
-				}
-
-				border-bottom: 1px solid rgba(241, 241, 241, 1);
-				margin-bottom: 24rpx;
-				padding-bottom: 8rpx;
-			}
-
-			.tip2 {
-
-				.step {
-					color: #333333
-				}
-			}
-		}
-
-
-
-	}
-
-
+		}
+		.page-content {
+			.step {
+				margin-bottom: 16rpx;
+			}
+
+			.tip-title {
+				color: #101010;
+				font-size: 36rpx;
+				font-weight: bold;
+				margin-bottom: 24rpx;
+			}
+
+			.tip1 {
+				.step {
+					color: #101010
+				}
+
+				border-bottom: 1px solid rgba(241, 241, 241, 1);
+				margin-bottom: 24rpx;
+				padding-bottom: 8rpx;
+			}
+
+			.tip2 {
+
+				.step {
+					color: #333333
+				}
+			}
+		}
+
+
+
+	}
+
+
 	.jpbutton {
-		    margin-top: 60rpx;
-		border-radius: 100rpx;
+		    margin-top: 60rpx;
+		border-radius: 100rpx;
 		width: 400rpx;
-		height: 84rpx;
-		color: #fff;
-		padding: 8rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		    font-size: 36rpx;
-		.img {
-			margin-right: 8rpx;
-			width: 36rpx;
-			height: 32rpx;
-		}
-	}
-
-	.jpbutton1 {
-		background-color: #2979FF;
-
-		.img {
-			width: 32rpx;
-			height: 32rpx;
-		}
-	}
-
-	.jpbutton2 {
-		background-color: #2979FF;
-
-		.img {
-			width: 40rpx;
-			height: 40rpx;
-			animation: spin 2s linear infinite;
-			/* 添加无限旋转动画 */
-
-		}
-
-		/* 定义旋转动画 */
-		@keyframes spin {
-			from {
-				transform: rotate(0deg);
-				/* 起始角度 */
-			}
-
-			to {
-				transform: rotate(360deg);
-				/* 结束角度 */
-			}
-		}
-	}
-
-	.jpbutton3 {
-		background-color: #00B962;
-	}
-
-	.jpbutton4 {
-		background-color: #A7A2A2;
-	}
+		height: 84rpx;
+		color: #fff;
+		padding: 8rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		    font-size: 36rpx;
+		.img {
+			margin-right: 8rpx;
+			width: 36rpx;
+			height: 32rpx;
+		}
+	}
+
+	.jpbutton1 {
+		background-color: #2979FF;
+
+		.img {
+			width: 32rpx;
+			height: 32rpx;
+		}
+	}
+
+	.jpbutton2 {
+		background-color: #2979FF;
+
+		.img {
+			width: 40rpx;
+			height: 40rpx;
+			animation: spin 2s linear infinite;
+			/* 添加无限旋转动画 */
+
+		}
+
+		/* 定义旋转动画 */
+		@keyframes spin {
+			from {
+				transform: rotate(0deg);
+				/* 起始角度 */
+			}
+
+			to {
+				transform: rotate(360deg);
+				/* 结束角度 */
+			}
+		}
+	}
+
+	.jpbutton3 {
+		background-color: #00B962;
+	}
+
+	.jpbutton4 {
+		background-color: #A7A2A2;
+	}
 	.jpbutton6 {
 		background-color: #FF7B00;
-	}
-	.jpbutton5 {
-		background-color: #1677FF;
-	}
-
-	.showMessage {
-		//padding: 24rpx 56rpx;
-		padding: 40rpx 40rpx 60rpx 40rpx;
-
-		.title {
-			color: rgba(16, 16, 16, 1);
-			font-size: 36rpx;
-			margin-top: 32rpx;
-			text-align: center;
-			font-weight: bold;
-		}
-
-		.body {
-			color: rgba(16, 16, 16, 1);
-			font-size: 32rpx;
-			padding-bottom: 66rpx;
-		}
-
+	}
+	.jpbutton5 {
+		background-color: #1677FF;
+	}
+
+	.showMessage {
+		//padding: 24rpx 56rpx;
+		padding: 40rpx 40rpx 60rpx 40rpx;
+
+		.title {
+			color: rgba(16, 16, 16, 1);
+			font-size: 36rpx;
+			margin-top: 32rpx;
+			text-align: center;
+			font-weight: bold;
+		}
+
+		.body {
+			color: rgba(16, 16, 16, 1);
+			font-size: 32rpx;
+			padding-bottom: 66rpx;
+		}
+
 	}
 	
 	.valuestatus{
@@ -804,5 +804,5 @@
 			span{
 				margin-left:  16rpx;
 			}
-	}
+	}
 </style>

pages/business/quickInfo.vue

@@ -1,117 +1,117 @@
-<template>
-	<view>
-		<view v-if="isReady" class="isReady">
+<template>
+	<view>
+		<view v-if="isReady" class="isReady">
 			<view class="gradient-header">
 				<view class="jpback">
 			
 				</view>
-			</view>
-			<view v-if="0" class="isReady_1">
-				 
-
-				<view class="body">
-					<view class="page">
-						<view class="page-main">
-
-							<view class="name">
-
-								<view class="name-info">
-									{{floorlockInfo.name}}
-								</view>
-								<view class="code-info">
-									编号：{{floorlockInfo.lockNo}}
-								</view>
-
-							</view>
-							<view class=" tags">
-								<span class="tag typeN"
-									:class="'typeN'+floorlockInfo.type">{{floorlockInfo.typeN}}</span>
-								<span class="tag"
-									:class="'status'+floorlockInfo.status">{{floorlockInfo.status==1?'在线':'离线'}}</span>
-							</view>
-						</view>
-						<view class="page-info">
-							<view class="info-span" v-if="floorlockInfo.lastOnlineTime">
-								更新时间：{{floorlockInfo.lastOnlineTime}}
-
-							</view>
-							<view class="info-span" v-if="floorlockInfo.batteryLevel">
-								电压：{{floorlockInfo.batteryLevel}}V
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="page-top" v-if="id">
-					<template v-if="floorlockInfo.status==0">
-						<view class="name">
-							<img class="img" src="@/assets/img/lockstatus/index4.png" alt="">
-
-						</view>
-					</template>
-					<template v-else>
-
-						<view class="name" v-if="floorlockInfo.parkingStatus==1">
-
-							<img class="img" src="@/assets/img/lockstatus/index3.png" alt="">
-						</view>
-						<view class="name" v-else-if="floorlockInfo.lockStatus==1">
-							<img class="img" src="@/assets/img/lockstatus/index1.png" alt="">
-						</view>
-						<view class="name" v-else-if="floorlockInfo.lockStatus==3">
-							<img class="img" src="@/assets/img/lockstatus/index2.png" alt="">
-
-						</view>
-						<view class="name" v-else-if="floorlockInfo.lockStatus==2">
-							<img class="img" src="@/assets/img/lockstatus/index2.png" alt="">
-						</view>
-						<view class="name" v-else-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
-
-							<img class="img" src="@/assets/img/lockstatus/index4.png" alt="">
-						</view>
-
-					</template>
-					<view class=" value" style="color:red;text-align: center;font-size: 28rpx;"
-						v-if="floorlockInfo.lockStatus==2&&floorlockInfo.parkingStatus==0">
-						3分钟后自动抬锁，请尽快驶入车位
-
-					</view>
-					
-					<view class="valuebutton" @click="operateBtn">
-
-						<template v-if="floorlockInfo.status==0">
-							<view class="jpbutton jpbutton5">
-								<u-icon name="phone-fill" label="电话报修" color="#fff" label-color="#fff"
-									label-size="36"></u-icon>
-							</view>
-						</template>
-						<template v-else>
-
-							<view class="jpbutton jpbutton6" v-if="floorlockInfo.parkingStatus==1">
-								该车位已被占用
-							</view>
-
-							<view class="jpbutton jpbutton1" v-else-if="floorlockInfo.lockStatus==1">
-								<img class="img" src="@/assets/img/button/lock.svg" alt="">
-								降锁
-							</view>
-
-							<!-- <view class="jpbutton jpbutton6" v-else-if="floorlockInfo.lockStatus==2">
-								地锁降
-				
-							</view> -->
-							<view class="jpbutton jpbutton4" v-else-if="floorlockInfo.lockStatus==3">
-								降锁中
-
-							</view>
-
-							<view class="jpbutton jpbutton5"
-								v-else-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
-								<u-icon name="phone-fill" label="电话报修" color="#fff" label-color="#fff"
-									label-size="36"></u-icon>
-							</view>
-						</template>
-
-
+			</view>
+			<view v-if="0" class="isReady_1">
+				 
+
+				<view class="body">
+					<view class="page">
+						<view class="page-main">
+
+							<view class="name">
+
+								<view class="name-info">
+									{{floorlockInfo.name}}
+								</view>
+								<view class="code-info">
+									编号：{{floorlockInfo.lockNo}}
+								</view>
+
+							</view>
+							<view class=" tags">
+								<span class="tag typeN"
+									:class="'typeN'+floorlockInfo.type">{{floorlockInfo.typeN}}</span>
+								<span class="tag"
+									:class="'status'+floorlockInfo.status">{{floorlockInfo.status==1?'在线':'离线'}}</span>
+							</view>
+						</view>
+						<view class="page-info">
+							<view class="info-span" v-if="floorlockInfo.lastOnlineTime">
+								更新时间：{{floorlockInfo.lastOnlineTime}}
+
+							</view>
+							<view class="info-span" v-if="floorlockInfo.batteryLevel">
+								电压：{{floorlockInfo.batteryLevel}}V
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="page-top" v-if="id">
+					<template v-if="floorlockInfo.status==0">
+						<view class="name">
+							<img class="img" src="@/assets/img/lockstatus/index4.png" alt="">
+
+						</view>
+					</template>
+					<template v-else>
+
+						<view class="name" v-if="floorlockInfo.parkingStatus==1">
+
+							<img class="img" src="@/assets/img/lockstatus/index3.png" alt="">
+						</view>
+						<view class="name" v-else-if="floorlockInfo.lockStatus==1">
+							<img class="img" src="@/assets/img/lockstatus/index1.png" alt="">
+						</view>
+						<view class="name" v-else-if="floorlockInfo.lockStatus==3">
+							<img class="img" src="@/assets/img/lockstatus/index2.png" alt="">
+
+						</view>
+						<view class="name" v-else-if="floorlockInfo.lockStatus==2">
+							<img class="img" src="@/assets/img/lockstatus/index2.png" alt="">
+						</view>
+						<view class="name" v-else-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
+
+							<img class="img" src="@/assets/img/lockstatus/index4.png" alt="">
+						</view>
+
+					</template>
+					<view class=" value" style="color:red;text-align: center;font-size: 28rpx;"
+						v-if="floorlockInfo.lockStatus==2&&floorlockInfo.parkingStatus==0">
+						3分钟后自动抬锁，请尽快驶入车位
+
+					</view>
+					
+					<view class="valuebutton" @click="operateBtn">
+
+						<template v-if="floorlockInfo.status==0">
+							<view class="jpbutton jpbutton5">
+								<u-icon name="phone-fill" label="电话报修" color="#fff" label-color="#fff"
+									label-size="36"></u-icon>
+							</view>
+						</template>
+						<template v-else>
+
+							<view class="jpbutton jpbutton6" v-if="floorlockInfo.parkingStatus==1">
+								该车位已被占用
+							</view>
+
+							<view class="jpbutton jpbutton1" v-else-if="floorlockInfo.lockStatus==1">
+								<img class="img" src="@/assets/img/button/lock.svg" alt="">
+								降锁
+							</view>
+
+							<!-- <view class="jpbutton jpbutton6" v-else-if="floorlockInfo.lockStatus==2">
+								地锁降
+				
+							</view> -->
+							<view class="jpbutton jpbutton4" v-else-if="floorlockInfo.lockStatus==3">
+								降锁中
+
+							</view>
+
+							<view class="jpbutton jpbutton5"
+								v-else-if="floorlockInfo.lockStatus==4||floorlockInfo.lockStatus==0">
+								<u-icon name="phone-fill" label="电话报修" color="#fff" label-color="#fff"
+									label-size="36"></u-icon>
+							</view>
+						</template>
+
+
 					</view>
 					<view class="page  pagemanage">
 						<view class="page-main">
@@ -139,10 +139,10 @@
 								{{item.body}}
 							</u-collapse-item>
 						</u-collapse>
-					</view>
-				</view>
-			</view>
-			<view v-else class="isReady_2">
+					</view>
+				</view>
+			</view>
+			<view v-else class="isReady_2">
 				<view class="page-top" >
 					<view class="name">
 						<img class="img" src="@/assets/img/lockstatus/index0.svg" alt="">
@@ -159,41 +159,41 @@
 								label-size="36"></u-icon>
 						</view>
 					</view>
-				</view>
-			</view>
-
-
-		</view>
-
-		<tabbar></tabbar>
-	</view>
-</template>
-
-<script>
-	import componentLogin from '@/components/componentLogin.vue';
-	import tabbar from '@/components/Tabbar.vue';
-	import * as API from '@/apis/pagejs/mylock.js'
-
-	export default {
-		components: {
-			componentLogin,
+				</view>
+			</view>
+
+
+		</view>
+
+		<tabbar></tabbar>
+	</view>
+</template>
+
+<script>
+	import componentLogin from '@/components/componentLogin.vue';
+	import tabbar from '@/components/Tabbar.vue';
+	import * as API from '@/apis/pagejs/mylock.js'
+
+	export default {
+		components: {
+			componentLogin,
 			tabbar,
-			'u-collapse-item': () => import('@/uni_modules/uview-ui/components/u-collapse-item/u-collapse-item'),
-			'u-collapse': () => import('@/uni_modules/uview-ui/components/u-collapse/u-collapse'),
+			//'u-collapse-item': () => import('@/uni_modules/uview-ui/components/u-collapse-item/u-collapse-item'),
+			//'u-collapse': () => import('@/uni_modules/uview-ui/components/u-collapse/u-collapse'),
 			
-			
-		},
-
-		data() {
-			return {
-				isReady: false,
-				id: "",
-				whiteList: [],
-				list: [],
-				mylist: [],
-				loginBl: false,
-				floorlockInfo: {
-					lockStatusN: ""
+			
+		},
+
+		data() {
+			return {
+				isReady: false,
+				id: "",
+				whiteList: [],
+				list: [],
+				mylist: [],
+				loginBl: false,
+				floorlockInfo: {
+					lockStatusN: ""
 				},
 				itemList: [{
 									head: "操作指南",
@@ -204,71 +204,71 @@
 									head: "温馨提示",
 									body: "1、成功降锁后请于三分钟内将车辆驶入指定车位；超时地锁会自动升起，需重新扫码降锁；2、请按降锁流程说明停车，严禁使用外力降锁；3、地锁服务热线 400-8899-619。",
 									open: false,
-								}],
-				content: "400-8899-619",
-				setIntervalId: "",
-			}
-		},
-		onLoad(op) {
-			if (op.id) {
-				this.id = op.id
-			}
-			if (1) {
+								}],
+				content: "400-8899-619",
+				setIntervalId: "",
+			}
+		},
+		onLoad(op) {
+			if (op.id) {
+				this.id = op.id
+			}
+			if (1) {
 				this.isReady = 1
 				this.id=1
-				this.getFloorlockDetails()
-			}
-		},
-		methods: {
-			getFloorlockList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				this.list = []
-				API.myParkingSpot().then((res) => {
-
-					this.mylist = res.data.floorList
-					this.whiteList = res.data.whiteList
-
-					for (var i in this.mylist) {
-						var item = this.mylist[i]
-						item.phonetype = 1
-						this.list.push(item)
-					}
-					for (var i in this.whiteList) {
-						var item = this.whiteList[i]
-						item.phonetype = 2
-						this.list.push(item)
-					}
-
-					uni.hideLoading();
-
-				}).catch(error => {
-
-					uni.hideLoading();
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			getFloorlockDetails(bl) {
-				if (!this.id) {
-					return
-				}
-				if (!bl) {
-					uni.showLoading({
-						title: "加载中",
-						mask: true,
-					})
-				}
-
-				var obj = {
-					id: this.id
-				}
-
-				API.floorlockDetails(obj).then((res) => {
+				this.getFloorlockDetails()
+			}
+		},
+		methods: {
+			getFloorlockList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				this.list = []
+				API.myParkingSpot().then((res) => {
+
+					this.mylist = res.data.floorList
+					this.whiteList = res.data.whiteList
+
+					for (var i in this.mylist) {
+						var item = this.mylist[i]
+						item.phonetype = 1
+						this.list.push(item)
+					}
+					for (var i in this.whiteList) {
+						var item = this.whiteList[i]
+						item.phonetype = 2
+						this.list.push(item)
+					}
+
+					uni.hideLoading();
+
+				}).catch(error => {
+
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			getFloorlockDetails(bl) {
+				if (!this.id) {
+					return
+				}
+				if (!bl) {
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})
+				}
+
+				var obj = {
+					id: this.id
+				}
+
+				API.floorlockDetails(obj).then((res) => {
 					this.floorlockInfo = res.data.floorlockInfo
 					if(1){
 						this.floorlockInfo.status=1;
@@ -279,62 +279,62 @@
 					if(this.floorlockInfo.parkingPhone){
 						this.content=this.floorlockInfo.parkingPhone
 					}
-					
-					if (res.data.usable) {
-
-						uni.setNavigationBarTitle({
-							title: this.floorlockInfo.parkingName
-						})
-
-						this.loading = true
-
-
-
+					
+					if (res.data.usable) {
+
+						uni.setNavigationBarTitle({
+							title: this.floorlockInfo.parkingName
+						})
+
+						this.loading = true
+
+
+
 					} else {
-						this.loading = false
-						this.permission = true
-						// #ifdef MP-WEIXIN
-						uni.setBackgroundColor({
-							backgroundColor: '#ffffff',
-						})
-						// #endif
-					}
-
-
-					if (!bl) {
-						uni.hideLoading();
-					}
-				}).catch(error => {
-
-					uni.hideLoading();
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			}
-		}
-	}
-</script>
+						this.loading = false
+						this.permission = true
+						// #ifdef MP-WEIXIN
+						uni.setBackgroundColor({
+							backgroundColor: '#ffffff',
+						})
+						// #endif
+					}
+
+
+					if (!bl) {
+						uni.hideLoading();
+					}
+				}).catch(error => {
+
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
+		}
+	}
+</script>
 
 <style>
 	page{
 		background-color:#F2F4F6;
 	}
-</style>
-<style scoped lang="scss">
-	.body {
-		padding: 32rpx;
-	}
-
-	.gradient-header {
-		height: 0px;
-	}
-
-	.jpback {
-		height: 760rpx;
-		background: linear-gradient(180deg, rgba(203, 234, 255, 1) 0%, rgba(203, 234, 255, 0) 100%);
-	}
+</style>
+<style scoped lang="scss">
+	.body {
+		padding: 32rpx;
+	}
+
+	.gradient-header {
+		height: 0px;
+	}
+
+	.jpback {
+		height: 760rpx;
+		background: linear-gradient(180deg, rgba(203, 234, 255, 1) 0%, rgba(203, 234, 255, 0) 100%);
+	}
 	.isReady_2{
 		margin-top: 80rpx;
 		.r2text{
@@ -351,38 +351,38 @@
 			}
 		}
 	}
-	
-	.page-top {
-		padding: 40rpx;
-		padding-top: 0rpx;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.name {
-			width: 320rpx;
-			height: 320rpx;
-			display: flex;
-			align-items: flex-end;
-
-			.img {
-				width: 320rpx;
-				height: 320rpx;
-			}
-
-			.img2 {
-				width: 320rpx;
-				height: 140rpx;
-			}
-
-		}
-
-		.value {
-			//margin-top: 24rpx;
-			font-size: 40rpx;
-			font-weight: bold;
-			color: #333333;
-		}
+	
+	.page-top {
+		padding: 40rpx;
+		padding-top: 0rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.name {
+			width: 320rpx;
+			height: 320rpx;
+			display: flex;
+			align-items: flex-end;
+
+			.img {
+				width: 320rpx;
+				height: 320rpx;
+			}
+
+			.img2 {
+				width: 320rpx;
+				height: 140rpx;
+			}
+
+		}
+
+		.value {
+			//margin-top: 24rpx;
+			font-size: 40rpx;
+			font-weight: bold;
+			color: #333333;
+		}
 	}
 	.pagemanage{
 		margin-top: 80rpx;
@@ -579,5 +579,5 @@
 	}
 	.jpbutton5 {
 		background-color: #1677FF;
-	}
+	}
 </style>

pages/index/index.vue

@@ -94,7 +94,7 @@
 	
 	export default {
 		components: {
-			componentLogin,tabbar
+			componentLogin,tabbar,
 		},
 		data() {
 			return {

pages/information/information.vue

@@ -1,4 +1,4 @@
-<template>
+<template>
 	<view class="jpmain  ">
 		
 		<u-popup v-model="showMessage" mode="bottom" border-radius="30" >
@@ -22,11 +22,11 @@
 		
 		
 		
-		
+		
 		<componentLogin ref="refLogin" @findByOpenId="findByOpenId"></componentLogin>
-		
-
-		<view class="body">
+		
+
+		<view class="body">
 			<view class="page">
 			
 				<view class="page-content">
@@ -47,19 +47,19 @@
 				
 				</view>
 			</view>
-			
-			<view class="page">
-
-				<view class="page-content">
-					<view class="item">
-						<view class="title">
+			
+			<view class="page">
+
+				<view class="page-content">
+					<view class="item">
+						<view class="title">
 							用户昵称
-
-						</view>
+
+						</view>
 						<view class="goto" @click="showMessage=true,nickName=userInfo.nickName">
-							{{userInfo.nickName?userInfo.nickName:'未设置'}}
-							<u-icon name="arrow-right" style="margin-left: 8rpx;" size="24" color="#BBBBBB"></u-icon>
-						</view>
+							{{userInfo.nickName?userInfo.nickName:'未设置'}}
+							<u-icon name="arrow-right" style="margin-left: 8rpx;" size="24" color="#BBBBBB"></u-icon>
+						</view>
 					</view>
 					<view class="item">
 						<view class="title">
@@ -70,16 +70,16 @@
 							{{userInfo.carNumber?userInfo.carNumber:'未设置'}}
 							<u-icon name="arrow-right" style="margin-left: 8rpx;" size="24" color="#BBBBBB"></u-icon>
 						</view>
-					</view>
-					<view class="item">
-						<view class="title">
-							手机号码
-						</view>
-						<view class="goto">
-							{{userInfo.phone}}
-						</view>
-					</view>
-				</view>
+					</view>
+					<view class="item">
+						<view class="title">
+							手机号码
+						</view>
+						<view class="goto">
+							{{userInfo.phone}}
+						</view>
+					</view>
+				</view>
 			</view>
 			
 			<view class="page" v-if="false">
@@ -88,12 +88,12 @@
 					退出账号
 				
 				</view>
-			</view>
-
-		</view>
-	</view>
-</template>
-
+			</view>
+
+		</view>
+	</view>
+</template>
+
 <script>
 	import * as API from '@/apis/pagejs/index.js'
 	
@@ -101,15 +101,15 @@
 	export default {
 		components: {
 			componentLogin,
-			'u-popup': () => import('@/uni_modules/uview-ui/components/u-popup/u-popup'),
-			'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
-			'u-input': () => import('@/uni_modules/uview-ui/components/u-input/u-input'),
-			'u-keyboard': () => import('@/uni_modules/uview-ui/components/u-keyboard/u-keyboard'),
+			//'u-popup': () => import('@/uni_modules/uview-ui/components/u-popup/u-popup'),
+			//'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
+			//'u-input': () => import('@/uni_modules/uview-ui/components/u-input/u-input'),
+			//'u-keyboard': () => import('@/uni_modules/uview-ui/components/u-keyboard/u-keyboard'),
 			
 			
-		},
-		data() {
-			return {
+		},
+		data() {
+			return {
 				userInfo:{
 					phone:"",
 					headImg:"",
@@ -128,8 +128,8 @@
 					margin: "5px 0 ",
 					
 				},
-				
-			}
+				
+			}
 		},
 		onLoad() {
 			this.userInfo = this.jphelp.getPersonInfo()	
@@ -137,7 +137,7 @@
 		onReady() {
 			this.$refs.refLogin.findByOpenId()
 			
-		},
+		},
 		methods: {
 			carNumberBtn(){
 				 
@@ -235,7 +235,7 @@
 						icon: "none"
 					})		
 				})
-			},
+			},
 			findByOpenId(res){
 				this.userInfo = this.jphelp.getPersonInfo()	
 				
@@ -309,17 +309,17 @@
 			
 					}
 				});
-			},
-		}
-	}
-</script>
+			},
+		}
+	}
+</script>
 <style>
 	page {
 		background-color: rgba(242, 244, 246, 1);
 	}
-</style>
-<style scoped lang="scss">
-	/* styles.css */
+</style>
+<style scoped lang="scss">
+	/* styles.css */
 	.showMessage{
 		padding: 40rpx 40rpx 60rpx 40rpx;
 		.carNumber {
@@ -353,47 +353,47 @@
 			    display: flex;
 				justify-content: space-between;
 		}
-	}
-
-	.body {
-		padding: 32rpx;
-	}
-
-
-
-	
-
-	.page {
-
-		border-radius: 16rpx;
-		background-color: rgba(255, 255, 255, 1);
-		color: rgba(16, 16, 16, 1);
-
-		padding:0 32rpx;
-		margin-bottom: 32rpx;
-		font-size: 32rpx;
-		color: rgb(16, 16, 16);
-
-		
-
+	}
+
+	.body {
+		padding: 32rpx;
+	}
+
+
+
+	
+
+	.page {
+
+		border-radius: 16rpx;
+		background-color: rgba(255, 255, 255, 1);
+		color: rgba(16, 16, 16, 1);
+
+		padding:0 32rpx;
+		margin-bottom: 32rpx;
+		font-size: 32rpx;
+		color: rgb(16, 16, 16);
+
+		
+
 		.page-content {
 			.item:not(:last-child) {
 			  border-bottom:1px solid rgba(232,232,232,1);
-			}
+			}
 			.item {
-				padding: 32rpx 0;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: 32rpx;
-				.title {
-					display: flex;
-					justify-content: space-between;
-					display: flex;
+				padding: 32rpx 0;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: 32rpx;
+				.title {
+					display: flex;
+					justify-content: space-between;
+					display: flex;
 					align-items: center;
 					color: rgba(51,51,51,1);
 					
-					
+					
 				}
 				.goto{
 					display: flex;
@@ -412,15 +412,15 @@
 						width: 100%;
 						height: 100%;
 					}
-				}
-			}
-		}
-
-
+				}
+			}
+		}
+
+
 		.button{
 			text-align: center;
 			color: red;
 			    padding: 32rpx 0;
-		}
-	}
+		}
+	}
 </style>

pages/information/parkingInfo.vue

@@ -167,7 +167,7 @@
 	} from '@/apis/utils'
 	export default {
 		components: {
-			'u-steps': () => import('@/uni_modules/uview-ui/components/u-steps/u-steps'),
+			//'u-steps': () => import('@/uni_modules/uview-ui/components/u-steps/u-steps'),
 		
 		},
 		data() {

pages/information/parkingRecord.vue

@@ -1,82 +1,82 @@
-<template>
-	<view class="jpmain  ">
-		<view class="top">
+<template>
+	<view class="jpmain  ">
+		<view class="top">
 			<view class="search">
 				<view class="searchBox">
 					<u-search shape="square" placeholder="搜索停车场" v-model="testName" :show-action="false" :animation="true"></u-search>
 					<u-button type="primary" size="mini" @click="testBtn">搜素</u-button>
 				</view>
-			</view>
-		</view>
-		<view class="body2">
+			</view>
+		</view>
+		<view class="body2">
 			<view class="item" v-for="(item,i) in list"
-			 @click="gotoUrl('pages/information/parkingInfo?id='+item.id)"
-				:key="i">
-				<view class="data">
-					<view class="view1">
-						{{item.parkingName}} {{item.lockName}}
-					</view>
-					<view class="view2">
-						
-					</view>
-					<view class="view3">
+			 @click="gotoUrl('pages/information/parkingInfo?id='+item.id)"
+				:key="i">
+				<view class="data">
+					<view class="view1">
+						{{item.parkingName}} {{item.lockName}}
+					</view>
+					<view class="view2">
+						
+					</view>
+					<view class="view3">
 						{{showTime(item.startTime)}}
 						<template v-if="item.status!=0">
 							{{item.endTime?'-'+showTime(item.endTime):'-当前'}}
 						</template>
-						
-					</view>
-				</view>
-				<view class="goto " :class="'status'+item.status">
+						
+					</view>
+				</view>
+				<view class="goto " :class="'status'+item.status">
 					{{item.status==2?getTime(item):''}}
 					{{item.status==1?'使用中':''}}
-					{{item.status==0?'启动中':''}}
-
-					<u-icon name="arrow-right" size="24" style="margin-left: 8rpx;" color="#BBBBBB"></u-icon>
-
-				</view>
+					{{item.status==0?'启动中':''}}
+
+					<u-icon name="arrow-right" size="24" style="margin-left: 8rpx;" color="#BBBBBB"></u-icon>
+
+				</view>
 			</view>
-			
+			
 		</view>
 		<u-divider  color="#B6BDC3"  :isnone="list.length==0"
-			>已经到底了</u-divider>
-
-	</view>
-</template>
-
+			>已经到底了</u-divider>
+
+	</view>
+</template>
+
 <script>
 	import * as API from '@/apis/pagejs/index.js'
 	import {
 		newDate,
 	
-	} from '@/apis/utils'
+	} from '@/apis/utils'
 	export default {
 		components: {
-		'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
+		//'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
 		
-			'u-search': () => import('@/uni_modules/uview-ui/components/u-search/u-search'),
+			//'u-search': () => import('@/uni_modules/uview-ui/components/u-search/u-search'),
 			
-		},
-		data() {
-			return {
+		},
+		data() {
+			return {
 				list: [],
-				testName:"",
-				listForm: {
-					name: "",
-					pageIndex: 1,
-					pageSize: 20,
-					recordsTotal: 1,
-				}
-			};
-		},
-		onLoad() {
-			this.getList()
-		},
-		onReachBottom() {
-			if (this.list.length < this.listForm.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
+				testName:"",
+				listForm: {
+					name: "",
+					pageIndex: 1,
+					pageSize: 20,
+					recordsTotal: 1,
+				}
+			};
+		},
+		onLoad() {
+			this.getList()
+		},
+		onReachBottom() {
+			if (this.list.length < this.listForm.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
 		methods: {
 			testBtn(){
 				this.listForm.name=this.testName;
@@ -113,49 +113,49 @@
 				}else{
 					return '已完成'
 				}
-			},
-			myLoadmore() {
-				this.listForm.pageIndex += 1;
-				this.getList()
-			},
-
-			getList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-
-				API.recordList(this.listForm).then((res) => {
-					var list = []
-
-					if (this.listForm.pageIndex == 1) {
-						list = res.data.data;
-					} else {
-						list = [
-							...list,
-							...res.data.data
-						];
-					}
-					this.list = res.data.data
-					uni.hideLoading();
-
-				}).catch(error => {
-
-					uni.hideLoading();
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			}
-		}
-	}
-</script>
+			},
+			myLoadmore() {
+				this.listForm.pageIndex += 1;
+				this.getList()
+			},
+
+			getList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+				API.recordList(this.listForm).then((res) => {
+					var list = []
+
+					if (this.listForm.pageIndex == 1) {
+						list = res.data.data;
+					} else {
+						list = [
+							...list,
+							...res.data.data
+						];
+					}
+					this.list = res.data.data
+					uni.hideLoading();
+
+				}).catch(error => {
+
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
+		}
+	}
+</script>
 <style>
 	page {
 		background-color: rgba(242, 244, 246, 1);
 	}
-</style>
+</style>
 <style lang="scss" scoped >
 	::v-deep .u-content{
 		width: 380% !important;
@@ -173,7 +173,7 @@
 			border-radius: 8px;
 			    justify-content: space-between;
 		}
-	}
+	}
 	.body2{
 		
 		.item{
@@ -208,5 +208,5 @@
 				}
 			
 		}
-	}
+	}
 </style>

pages/mylock/bindLock.vue

@@ -123,13 +123,14 @@
 	
 	export default {
 		components: {
-			'u-radio-group': () => import('@/uni_modules/uview-ui/components/u-radio-group/u-radio-group'),
+			// //'u-radio-group': () => import('@/uni_modules/uview-ui/components/u-radio-group/u-radio-group'),
 			
-			'u-radio': () => import('@/uni_modules/uview-ui/components/u-radio/u-radio'),
+			// //'u-radio': () => import('@/uni_modules/uview-ui/components/u-radio/u-radio'),
 			
-			'u-picker': () => import('@/uni_modules/uview-ui/components/u-picker/u-picker'),
+			//'u-picker': () => import('@/uni_modules/uview-ui/components/u-picker/u-picker'),
 			
-		},
+		},
+		options:{styleIsolation: 'shared'},
 		data() {
 			return {
 				id:"",
@@ -187,6 +188,7 @@
 				uni.authorize({
 					scope: 'scope.userLocation',
 					success() {
+						
 						uni.chooseLocation({
 							success: function (res) {
 								console.log('位置名称：' + res.name);

pages/mylock/editLock.vue

@@ -1,49 +1,49 @@
-<template>
+<template>
 	<view class="jpmain  ">
 		<u-picker mode="selector"
 		 v-model="isswitchshow" 
 		 :range="columns" range-key="label"
 		  :default-selector="columnsindex"
 		   @confirm="switchBtn" ></u-picker>
-		
+		
 	<!-- 	<view class="body">
 			<u-steps :list="numList" mode="number" :current="current" un-active-color="#999999"></u-steps >
-			</view>-->
-			<view class="list" >
-				<view class="item" >
-					<view class="name">
-						地锁编号
-
-					</view>
-					<view class="value">
-						<view>{{bindInfo.lockNo?bindInfo.lockNo:'请扫码识别地锁'}}</view>
-						
-					</view>
-				</view>
-		
-				
-				
-			</view>
-
-			<view class="list">
-				<view class="item"  >
-					<view class="name">
-						<span>*</span>所属停车场
-
-					</view>
-					<view class="value" @click="isswitchshowBtn">
+			</view>-->
+			<view class="list" >
+				<view class="item" >
+					<view class="name">
+						地锁编号
+
+					</view>
+					<view class="value">
+						<view>{{bindInfo.lockNo?bindInfo.lockNo:'请扫码识别地锁'}}</view>
+						
+					</view>
+				</view>
+		
+				
+				
+			</view>
+
+			<view class="list">
+				<view class="item"  >
+					<view class="name">
+						<span>*</span>所属停车场
+
+					</view>
+					<view class="value" @click="isswitchshowBtn">
 						<view :style="bindInfo.parkingIdN?'':'color:#BBB'"
-						>{{bindInfo.parkingIdN?bindInfo.parkingIdN:'请选择所属停车场'}}</view>
-						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
-					</view>
-				</view>
-				<view class="item" >
-					<view class="name">
-						<span>*</span>车位类型
-
-
-					</view>
-					<view class="value">
+						>{{bindInfo.parkingIdN?bindInfo.parkingIdN:'请选择所属停车场'}}</view>
+						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
+					</view>
+				</view>
+				<view class="item" >
+					<view class="name">
+						<span>*</span>车位类型
+
+
+					</view>
+					<view class="value">
 						<view>
 							<u-radio-group v-model="bindInfo.type" >
 										<u-radio 
@@ -55,9 +55,9 @@
 											{{item.name}}
 										</u-radio>
 									</u-radio-group>
-						</view>
-						<!-- <u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon> -->
-					</view>
+						</view>
+						<!-- <u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon> -->
+					</view>
 				</view>
 				<view class="item">
 					<view class="name">
@@ -68,53 +68,53 @@
 					<view class="value">
 						<input placeholder="如1号车位" v-model="bindInfo.name" />
 					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						停车位编号
-
-
-					</view>
-					<view class="value">
-						<input placeholder="如1号车位" v-model="bindInfo.parkingNumber" />
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						位置描述
-
-					</view>
-					<view class="value">
-						<input v-model="bindInfo.describe" placeholder="请描述车位位置信息" />
-					</view>
-				</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						停车位编号
+
+
+					</view>
+					<view class="value">
+						<input placeholder="如1号车位" v-model="bindInfo.parkingNumber" />
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						位置描述
+
+					</view>
+					<view class="value">
+						<input v-model="bindInfo.describe" placeholder="请描述车位位置信息" />
+					</view>
+				</view>
 			<view class="floating-button">
 				<view class="button"   @click="submit" >
 					
 					提交
 				</view>
 				
-			</view>
-
-		</view>
-	</view>
-</template>
-
+			</view>
+
+		</view>
+	</view>
+</template>
+
 <script>
 	import * as API from '@/apis/pagejs/mylock.js'
-	
+	
 	export default {
 		components: {
-			'u-radio-group': () => import('@/uni_modules/uview-ui/components/u-radio-group/u-radio-group'),
+			//'u-radio-group': () => import('@/uni_modules/uview-ui/components/u-radio-group/u-radio-group'),
 			
-			'u-radio': () => import('@/uni_modules/uview-ui/components/u-radio/u-radio'),
+			//'u-radio': () => import('@/uni_modules/uview-ui/components/u-radio/u-radio'),
 			
-			'u-picker': () => import('@/uni_modules/uview-ui/components/u-picker/u-picker'),
+			//'u-picker': () => import('@/uni_modules/uview-ui/components/u-picker/u-picker'),
 			
-		},
-		data() {
+		},
+		data() {
 			return {
-				id:"",
+				id:"",
 				current: 0,
 				nowscan:{},
 				columnsindex:[0],
@@ -130,15 +130,15 @@
 					{id:'2',name:"私人车位"}
 				],
 				isswitchshow:false,
-				allList:[],
+				allList:[],
 				numList: [{
 					name: '绑定地锁'
 				}, {
 					name: '等待审核'
 				}, {
 					name: '完成绑定'
-				}],
-			};
+				}],
+			};
 		},
 		onLoad(op) {
 		
@@ -379,19 +379,19 @@
 			
 			
 			},
-		}
-	}
-</script>
+		}
+	}
+</script>
 <style>
 	page {
 		background-color: rgba(242, 244, 246, 1);
 	}
-</style>
-<style lang="scss" scoped>
-	 
-
-	.body {
-		padding: 32rpx;
+</style>
+<style lang="scss" scoped>
+	 
+
+	.body {
+		padding: 32rpx;
 	}
 	.list{
 		background-color: rgba(255,255,255,1);
@@ -456,5 +456,5 @@
 					font-size: 36rpx;
 			}
 	}
-	
+	
 </style>

pages/mylock/infoLock.vue

@@ -209,12 +209,12 @@
 
 	export default {
 		components: {
-		'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
-		'u-keyboard': () => import('@/uni_modules/uview-ui/components/u-keyboard/u-keyboard'),
+		//'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
+		//'u-keyboard': () => import('@/uni_modules/uview-ui/components/u-keyboard/u-keyboard'),
 		
-			'u-popup': () => import('@/uni_modules/uview-ui/components/u-popup/u-popup'),
-			'u-modal': () => import('@/uni_modules/uview-ui/components/u-modal/u-modal'),
-			'u-input': () => import('@/uni_modules/uview-ui/components/u-input/u-input'),
+			//'u-popup': () => import('@/uni_modules/uview-ui/components/u-popup/u-popup'),
+			//'u-modal': () => import('@/uni_modules/uview-ui/components/u-modal/u-modal'),
+			//'u-input': () => import('@/uni_modules/uview-ui/components/u-input/u-input'),
 			
 		},
 		data() {

pages/mylock/myLock.vue

@@ -1,66 +1,66 @@
-<template>
-	<view class="jpmain  ">
-
-
-		<view class="body">
-
-
-			<view class="page">
-
+<template>
+	<view class="jpmain  ">
+
+
+		<view class="body">
+
+
+			<view class="page">
+
 				<view class="page-content">
 					
-					
+					
 					<view class="item" v-for="(item,i) in list"
-					 @click="gotoItem(item)">
-						<view class="title">
-
-							<view class="name">
-								<img class="img" src="@/assets/img/mylock/item1.svg" alt="">
-
-								{{item.name}}
+					 @click="gotoItem(item)">
+						<view class="title">
+
+							<view class="name">
+								<img class="img" src="@/assets/img/mylock/item1.svg" alt="">
+
+								{{item.name}}
 								<span v-if="item.phonetype==1" class="tag tag1">我的</span>
-								<span v-if="item.phonetype==2"  class="tag tag2">共享</span>
-							</view>
-							<view class="value">
-								<span v-if="item.parkingName">{{item.parkingName}}</span>
+								<span v-if="item.phonetype==2"  class="tag tag2">共享</span>
+							</view>
+							<view class="value">
+								<span v-if="item.parkingName">{{item.parkingName}}</span>
 								<span v-if="item.typeN">{{item.typeN}}</span>
 								<span v-if="item.addWhiteUserName">来自{{item.addWhiteUserName}}的共享</span>
 								
-								<span v-if="item.whitePhoneNum">白名单：{{item.whitePhoneNum}}</span>
-							</view>
-						</view>
-						<view class="goto">
-
-							<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
-
-						</view>
-					</view>
+								<span v-if="item.whitePhoneNum">白名单：{{item.whitePhoneNum}}</span>
+							</view>
+						</view>
+						<view class="goto">
+
+							<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
+
+						</view>
+					</view>
 					
 					<u-empty text="列表为空" mode="list" margin-top="80" v-if="!list.length">
 						
-					</u-empty>
-					
-					
-
-				</view>
-			</view>
-
-		</view>
-		<view class="floating-button">
+					</u-empty>
+					
+					
+
+				</view>
+			</view>
+
+		</view>
+		<view class="floating-button">
 			<view class="button  "  :class="{
 				lt1:mylist.length
 			}"
-			 @click="gotoUrl('pages/mylock/bindLock')" >
-				<img class="img" src="@/assets/img/mylock/item2.svg" alt="">
-
-				绑定新地锁
-			</view>
+			 @click="gotoUrl('pages/mylock/bindLock')" >
+				<img class="img" src="@/assets/img/mylock/item2.svg" alt="">
+
+				绑定新地锁
+			</view>
 			<view class="button lt2"  v-if="mylist.length"
 			 @click="addUser()" >
 				<img class="img" src="@/assets/img/mylock/item4.svg" alt="">
 			
 				添加白名单
-			</view>
+			</view>
 		</view>
 		
 		<u-popup v-model="popupShow" mode="bottom" :closeable="true" border-radius="30">
@@ -106,27 +106,27 @@
 				
 			</view>
 		</u-popup>
-		
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/mylock.js'
-
+		
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/mylock.js'
+
 	export default {
 		components: {
-		'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
-		'u-keyboard': () => import('@/uni_modules/uview-ui/components/u-keyboard/u-keyboard'),
+		//'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
+		//'u-keyboard': () => import('@/uni_modules/uview-ui/components/u-keyboard/u-keyboard'),
 		
-			'u-popup': () => import('@/uni_modules/uview-ui/components/u-popup/u-popup'),
-			'u-select': () => import('@/uni_modules/uview-ui/components/u-select/u-select'),
-			'u-input': () => import('@/uni_modules/uview-ui/components/u-input/u-input'),
+			//'u-popup': () => import('@/uni_modules/uview-ui/components/u-popup/u-popup'),
+			//'u-select': () => import('@/uni_modules/uview-ui/components/u-select/u-select'),
+			//'u-input': () => import('@/uni_modules/uview-ui/components/u-input/u-input'),
 			
-		},
-		data() {
+		},
+		data() {
 			return {
 				popupShow:false,
-				whiteList:[],
+				whiteList:[],
 				list:[],
 				mylist:[],
 				vipUser: {},
@@ -140,15 +140,15 @@
 					padding: "5px 20px",
 					margin: "5px 0 ",
 					
-				},
-			}
-		},
-		onLoad() {
-			
+				},
+			}
+		},
+		onLoad() {
+			
 		},
 		onShow() {
 			this.getFloorlockList()
-		},
+		},
 		methods: {
 			addUser() {
 				
@@ -268,14 +268,14 @@
 					this.gotoUrl('pages/business/lockInfo?id='+item.id)
 				}
 			},
-			
-			getFloorlockList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-			 	this.list=[]
-				API.myParkingSpot().then((res) => {
+			
+			getFloorlockList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+			 	this.list=[]
+				API.myParkingSpot().then((res) => {
 					
 					this.mylist = res.data.floorList
 					this.whiteList = res.data.whiteList
@@ -290,121 +290,121 @@
 						item.phonetype=2
 						this.list.push(item)
 					}
-					
-					uni.hideLoading();
-
-				}).catch(error => {
-
-					uni.hideLoading();
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			}
-		}
-	}
-</script>
-<style>
-	page {
-		background-color: rgba(242, 244, 246, 1);
-	}
-</style>
-<style scoped lang="scss">
-	/* styles.css */
-
-
-	.body {
-		padding: 32rpx;
-	}
-
-
-
-
-
-	.page {
-
-		.page-content {
-
-			.item {
-				padding: 32rpx;
-				margin-bottom: 32rpx;
-				background-color: rgba(255, 255, 255, 1);
-				border-radius: 16rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: 32rpx;
-
-				.title {
-
-
+					
+					uni.hideLoading();
+
+				}).catch(error => {
+
+					uni.hideLoading();
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: rgba(242, 244, 246, 1);
+	}
+</style>
+<style scoped lang="scss">
+	/* styles.css */
+
+
+	.body {
+		padding: 32rpx;
+	}
+
+
+
+
+
+	.page {
+
+		.page-content {
+
+			.item {
+				padding: 32rpx;
+				margin-bottom: 32rpx;
+				background-color: rgba(255, 255, 255, 1);
+				border-radius: 16rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: 32rpx;
+
+				.title {
+
+
 					.name {
 						    display: flex;
-						    align-items: center;
-						color: rgba(22, 119, 255, 1);
-						font-size: 32rpx;
-						font-weight: bold;
-						margin-bottom: 8rpx;
-
-						.img {
-							width: 36rpx;
-							height: 32rpx;
-							margin-right: 8rpx;
-						}
-
-					}
-
-					.value {
-						color: rgba(119, 119, 119, 1);
-						font-size: 24rpx;
-
-						span {
-							margin-right: 16rpx;
-						}
-					}
-
-				}
-
-				.goto {
-
-					color: rgba(119, 119, 119, 1);
-
-				}
-
-			}
-		}
-
-
-	}
-
-	.floating-button {
-		position: fixed;
-		bottom: 0;
+						    align-items: center;
+						color: rgba(22, 119, 255, 1);
+						font-size: 32rpx;
+						font-weight: bold;
+						margin-bottom: 8rpx;
+
+						.img {
+							width: 36rpx;
+							height: 32rpx;
+							margin-right: 8rpx;
+						}
+
+					}
+
+					.value {
+						color: rgba(119, 119, 119, 1);
+						font-size: 24rpx;
+
+						span {
+							margin-right: 16rpx;
+						}
+					}
+
+				}
+
+				.goto {
+
+					color: rgba(119, 119, 119, 1);
+
+				}
+
+			}
+		}
+
+
+	}
+
+	.floating-button {
+		position: fixed;
+		bottom: 0;
 		width: 100%;
-		height: 120rpx;
-		display: flex;
-		background-color:#fff;
-		justify-content: center;
-		padding-top: 20rpx;
-		.button {
-			border-radius: 50px;
-			background-color: rgba(49, 51, 52, 1);
-			color: rgba(255, 255, 255, 1);
-			font-size: 28rpx;
+		height: 120rpx;
+		display: flex;
+		background-color:#fff;
+		justify-content: center;
+		padding-top: 20rpx;
+		.button {
+			border-radius: 50px;
+			background-color: rgba(49, 51, 52, 1);
+			color: rgba(255, 255, 255, 1);
+			font-size: 28rpx;
 			width: 240rpx;
 			height: 80rpx;
-
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			padding: 12rpx;
-
-			.img {
-				width: 40rpx;
-				height: 40rpx;
-				margin-right: 8rpx;
-			}
+
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			padding: 12rpx;
+
+			.img {
+				width: 40rpx;
+				height: 40rpx;
+				margin-right: 8rpx;
+			}
 		}
 		.lt1{
 			    border-radius: 50px 0 0 50px;
@@ -413,7 +413,7 @@
 		.lt2{
 			    border-radius:0 50px 50px 0;
 				background-color: #307AF6;
-		}
+		}
 	}
 	.tag{
 		border-radius: 4px;
@@ -507,5 +507,5 @@
 			}
 		}
 	}
-
+
 </style>

uni_modules/uview-ui/components/u-radio-group/u-radio-group.vue → subpackage/uview-ui/components/u-radio-group/u-radio-group.vue

@@ -22,6 +22,7 @@
 	 * @example <u-radio-group v-model="value"></u-radio-group>
 	 */
 	export default {
+		
 		name: "u-radio-group",
 		mixins: [Emitter],
 		props: {

uni_modules/uview-ui/components/u-radio/u-radio.vue → subpackage/uview-ui/components/u-radio/u-radio.vue

@@ -31,6 +31,7 @@
 	 * @example <u-radio :label-disabled="false">门掩黄昏，无计留春住</u-radio>
 	 */
 	export default {
+		options:{styleIsolation: 'shared'},
 		name: "u-radio",
 		props: {
 			// radio的名称