Merge branch 'edit'

# Conflicts:
#	pages/business/lockInfo.vue
#	pages/mylock/editLock.vue
#	pages/mylock/myLock.vue

pages/business/lockInfo.vue

@@ -1,30 +1,30 @@
 <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 />
+		<componentLogin ref="refLogin"  
+		@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>
 
-					若超过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">
@@ -97,14 +97,14 @@
 					</view>
 					<view class="bo1">
 						<img src="@/assets/img/lockstatus/status1.svg"> <span>地锁</span> 
-						<span v-if="floorlockInfo.lockStatus==1||floorlockInfo.lockStatus==2">
+						<span v-if="floorlockInfo.lockStatus==1||floorlockInfo.lockStatus==2|floorlockInfo.lockStatus==3">
 							<u-icon color="#00B962" v-if="floorlockInfo.lockStatus==1" name="arrow-upward"></u-icon>
 							<u-icon  color="#8161FF" v-if="floorlockInfo.lockStatus==2" name="arrow-downward"></u-icon>
+							<u-icon  name="more-dot-fill" v-if="floorlockInfo.lockStatus==3"></u-icon>
 							
 						</span>
 						<span v-else>
-							<u-icon  name="more-dot-fill"></u-icon>
-							
+							故障
 						</span>
 						
 					</view>
@@ -190,7 +190,7 @@
 		<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="text2" v-if="permission">此车位仅限车主及授权用户使用</view>
 			<view class="botton" @click="gotoIndex" v-if="permission">返回首页</view>
 		</view>
 	</view>

pages/index/index.vue

@@ -27,7 +27,7 @@
 								
 							</view>
 							<view class="item2"   >
-								车位共<span style="color:#333">{{item.totalNum}}</span>个 | 空闲<span  style="color:#8BC34A">{{item.idleNum}}</span>个
+								地锁共<span style="color:#333">{{item.totalNum}}</span>个 | 空闲<span  style="color:#8BC34A">{{item.idleNum}}</span>个
 							</view>
 						</view>
 						
@@ -71,7 +71,7 @@
 								<span class="tag"  v-if="item.userPreferred" > <u-icon name="star-fill" color="#FFAE00" size="24"></u-icon> 常用 </span>
 							</view>
 							<view class="item2"   >
-								车位共<span style="color:#333">{{item.totalNum}}</span>个 | 空闲<span  style="color:#8BC34A">{{item.idleNum}}</span>个
+								地锁共<span style="color:#333">{{item.totalNum}}</span>个 | 空闲<span  style="color:#8BC34A">{{item.idleNum}}</span>个
 							</view>
 						</view>
 						

pages/index/main/parkingDetails.vue

@@ -40,10 +40,10 @@
 				</view>
 				<view class="item2">
 					<view class="item-a">
-						车位总数：<span>{{totalNum}}个</span>
+						地锁总数：<span>{{totalNum}}个</span>
 					</view>
 					<view class="item-b">
-						空闲车位：<span>{{idleNum}}个</span>
+						空闲地锁：<span>{{idleNum}}个</span>
 					</view>
 					<view class="item-c" @click="gotoUrl('pages/business/lockInfo')">
 						
@@ -57,7 +57,7 @@
 			
 			<view class="data " v-if="floorlockInfoList.length">
 				<view class="info">
-					<view class="name">请选择空闲车位</view>
+					<view class="name">请选择空闲地锁</view>
 					<view class="value">
 
 						<img class="img " src="@/assets/img/parkingDetails/item4.svg" alt="">

pages/information/parkingInfo.vue

@@ -61,7 +61,7 @@
 			</view>
 			<view class="item">
 				<view class="name">
-					车位号
+					地锁名称
 
 				</view>
 				<view class="value">
@@ -70,7 +70,7 @@
 			</view>
 			<view class="item">
 				<view class="name">
-					车位类型
+					地锁类型
 
 				</view>
 				<view class="value">

pages/mylock/bindLock.vue

@@ -47,7 +47,7 @@
 				</view>
 				<view class="item" >
 					<view class="name">
-						<span>*</span>车位类型
+						<span>*</span>地锁类型
 
 					</view>
 					<view class="value">
@@ -142,11 +142,13 @@
 					phone:"",
 					lockNo:"",
 					type:"",
-					remark:""
+					remark:"",
+					describe:"",
+					parkingNumber:""
 				},
 				bindInfotypelist:[
-					{id:"1",name:"公共车位"},
-					{id:"2",name:"私人车位"}
+					{id:"1",name:"公共地锁"},
+					{id:"2",name:"私人地锁"}
 				],
 				isswitchshow:false,
 				allList:[],
@@ -261,7 +263,7 @@
 				}
 				if(!this.bindInfo.type){
 					uni.showToast({
-						title: "请选择车位类型",
+						title: "请选择地锁类型",
 						icon: "none"
 					})
 					return

pages/mylock/editLock.vue

@@ -33,17 +33,19 @@
 					</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>车位类型
 
+						>{{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>
-					<view class="value">
 						<view>
 							<u-radio-group v-model="bindInfo.type" >
 										<u-radio 
@@ -123,11 +125,14 @@
 					phone:"",
 					lockNo:"",
 					type:"",
-					remark:""
+					remark:"",
+					
+					describe:"",
+					parkingNumber:""
 				},
 				bindInfotypelist:[
-					{id:'1',name:"公共车位"},
-					{id:'2',name:"私人车位"}
+					{id:'1',name:"公共地锁"},
+					{id:'2',name:"私人地锁"}
 				],
 				isswitchshow:false,
 				allList:[],
@@ -264,7 +269,7 @@
 				}
 				if(!this.bindInfo.type){
 					uni.showToast({
-						title: "请选择车位类型",
+						title: "请选择地锁类型",
 						icon: "none"
 					})
 					return

pages/mylock/infoLock.vue

@@ -10,7 +10,7 @@
 				<!-- <view class="text1">地锁名称</view> -->
 				<!---->
 				<view class="text2"   @click="gotoUrl('pages/mylock/editLock?id='+id)"   >{{
-					floorlockInfo.name
+					infotext(floorlockInfo.name)
 				}} <u-icon name="edit-pen" size="32" color="#FFFFFF"></u-icon> 
 				</view>
 			</view>
@@ -29,66 +29,50 @@
 				<view class="table">
 					<view class="row">
 						<view class="name">地锁型号</view>
-						<view class="value">{{floorlockInfo.model}}</view>
+						<view class="value">{{infotext(floorlockInfo.model)}}</view>
 					</view>
 
 
 					<view class="row">
 						<view class="name">出厂编号</view>
-						<view class="value">{{floorlockInfo.factoryNumber}}</view>
+						<view class="value">{{infotext(floorlockInfo.factoryNumber)}}</view>
 					</view>
 					<template v-if="!listShow">
 						<view class="row">
 							<view class="name">固件版号</view>
-							<view class="value">{{floorlockInfo.solidVersion}}</view>
+							<view class="value">{{infotext(floorlockInfo.solidVersion)}}</view>
 						</view>
 						<view class="row">
 							<view class="name">防护等级</view>
-							<view class="value">{{floorlockInfo.protectionGrade}}</view>
+							<view class="value">{{infotext(floorlockInfo.protectionGrade)}}</view>
 						</view>
 
-						<view class="row"  v-if="0">
-							<view class="name">输入电压</view>
-							<view class="value">{{floorlockInfo.inputVoltage}}</view>
-						</view>
-						<view class="row" v-if="0">
-							<view class="name">输出电压</view>
-							<view class="value">{{floorlockInfo.outputVoltage}}</view>
-						</view>
-
-						<view class="row"  v-if="0">
-							<view class="name">输出电流</view>
-							<view class="value">{{floorlockInfo.outputCurrent}}</view>
-						</view>
-						<view class="row"  v-if="0">
-							<view class="name">输出功率</view>
-							<view class="value">{{floorlockInfo.outputPower}}</view>
-						</view>
+					 
 
 						<view class="row">
 							<view class="name">生产日期</view>
-							<view class="value">{{floorlockInfo.manufactureDate}}</view>
+							<view class="value">{{infotext(floorlockInfo.manufactureDate)}}</view>
 						</view>
 
 						<view class="row">
 							<view class="name">标准依据</view>
-							<view class="value">{{floorlockInfo.standardBasis}}</view>
+							<view class="value">{{infotext(floorlockInfo.standardBasis)}}</view>
 						</view>
 						<view class="row">
 							<view class="name">联网卡号</view>
-							<view class="value">{{floorlockInfo.internetCard}}</view>
+							<view class="value">{{infotext(floorlockInfo.internetCard)}}</view>
 						</view>
 						<view class="row" v-if="floorlockInfo.tariffStandard">
 							<view class="name">资费标准</view>
-							<view class="value">{{floorlockInfo.tariffStandard}}元/月</view>
+							<view class="value">{{infotext(floorlockInfo.tariffStandard)}}元/月</view>
 						</view>
 						<view class="row">
 							<view class="name">地锁启动时间</view>
-							<view class="value">{{floorlockInfo.activationTime}}</view>
+							<view class="value">{{infotext(floorlockInfo.activationTime)}}</view>
 						</view>
 						<view class="row" v-if="floorlockInfo.shelfLife">
 							<view class="name">地锁质保期</view>
-							<view class="value">{{floorlockInfo.shelfLife}}年</view>
+							<view class="value">{{infotext(floorlockInfo.shelfLife)}}年</view>
 						</view>
 					</template>
 
@@ -125,7 +109,7 @@
 			</view>
 			<view class="page">
 				<view class="info-title">
-					<view class="name">车位白名单<span class="span" v-if="0">({{whiteList.length}}/3)</span></view>
+					<view class="name">地锁授权名单<span class="span" v-if="0">({{whiteList.length}}/3)</span></view>
 					<view class="value" @click="addUser()">
 						<u-icon style="    margin-top: 2px;" size="30" name="plus"></u-icon> 添加
 					</view>
@@ -159,20 +143,20 @@
 						mode="car" v-model="carshow"  :abc="abc" ></u-keyboard>
 
 
-				<view class="popup-title">{{vipUser.id?'修改':'添加'}}白名单信息</view>
-				<view style="padding: 4px;">白名单车主姓名<span style="color: red;">*</span></view>
-				<u-input :customStyle="customStyle"  maxlength="8"  v-model="vipUser.nickName" placeholder="白名单车主姓名(必填)"></u-input>
-				<view style="padding: 4px;">白名单车主手机号码<span style="color: red;">*</span></view>
+				<view class="popup-title">{{vipUser.id?'修改':'添加'}}授权信息</view>
+				<view style="padding: 4px;">授权车主姓名<span style="color: red;">*</span></view>
+				<u-input :customStyle="customStyle"  maxlength="8"  v-model="vipUser.nickName" placeholder="授权车主姓名(必填)"></u-input>
+				<view style="padding: 4px;">授权车主手机号码<span style="color: red;">*</span></view>
 				<u-input :customStyle="customStyle" maxlength="13" type="number" v-model="vipUser.phone"
-					placeholder="白名单车主手机号码(必填)"></u-input>
-				<view style="padding: 4px;">白名单车主车牌号</view>
-				<!-- 						<u-input :customStyle="customStyle" v-model="vipUser.carNumber" placeholder="白名单车主车牌号"></u-input> -->
+					placeholder="授权车主手机号码(必填)"></u-input>
+				<view style="padding: 4px;">授权车主车牌号</view>
+				<!-- 						<u-input :customStyle="customStyle" v-model="vipUser.carNumber" placeholder="授权车主车牌号"></u-input> -->
 
 				<view class="carNumber"  @click="carshow=true,valInit(1)"
 				:class="{
 								'carNumber1':!vipUser.carNumber
 							}">
-					{{vipUser.carNumber?vipUser.carNumber:'白名单车主车牌号'}}
+					{{vipUser.carNumber?vipUser.carNumber:'授权车主车牌号'}}
 				</view>
 				<view v-if="vipUser.id" style="display: flex;">
 					<u-button type="info" style="margin-top: 10px;width: 49%;" shape="circle"
@@ -190,7 +174,7 @@
 			</view>
 		</u-popup>
 		<u-modal v-model="delShow" @confirm="confirmDelete" confirm-color="#fa3534" :show-cancel-button="true"
-			ref="uModal" title="删除白名单用户" content="是否删除当前白名单用户?" confirm-text="删除"></u-modal>
+			ref="uModal" title="删除授权用户" content="是否删除当前授权用户?" confirm-text="删除"></u-modal>
 
 		<view class="floating-button">
 			<view class="button" @click="gotoUrl('pages/business/lockInfo?id='+id)" >
@@ -246,7 +230,14 @@
 		onShow(){
 				this.getFloorlockDetails()
 		},
-		methods: {
+		methods: {
+			infotext(text){
+				if(text){
+					return text
+				}else{
+					return ""
+				}
+			},
 			valInit(bl){
 				if(bl){
 					this.abc=this.vipUser.carNumber.length>0
@@ -340,13 +331,13 @@
 			submitUser() {
 				if (!this.vipUser.nickName) {
 					uni.showToast({
-						title: "请填写白名单车主姓名"
+						title: "请填写授权车主姓名"
 					})
 					return
 				}
 				if (!this.vipUser.phone) {
 					uni.showToast({
-						title: "请填写白名单车主手机号码"
+						title: "请填写授权车主手机号码"
 					})
 					return
 				}
@@ -413,7 +404,7 @@
 			addUser() {
 				// if (this.whiteList.length >= 3) {
 				// 	uni.showToast({
-				// 		title: "添加白名单用户已达到上限"
+				// 		title: "添加授权用户已达到上限"
 				// 	})
 				// 	return
 				// }

pages/mylock/myLock.vue

@@ -11,30 +11,34 @@
 					
 					
 					<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}}
-								<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>
+
+					 @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.typeN">{{item.typeN}}</span>
-								<span v-if="item.addWhiteUserName">来自{{item.addWhiteUserName}}的共享</span>
+								<span v-if="item.addWhiteUserName">来自 <span style="color:#00b962 ;">{{item.addWhiteUserName}}</span>的授权</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>
+								<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>
 
-						</view>
-					</view>
 					
 					<u-empty text="列表为空" mode="list" margin-top="80" v-if="!list.length">
 						
@@ -59,8 +63,10 @@
 			 @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">
@@ -71,28 +77,28 @@
 						mode="car" v-model="carshow"  :abc="abc" ></u-keyboard>
 		
 		
-				<view class="popup-title">{{vipUser.id?'修改':'添加'}}白名单信息</view>
-			<view style="padding: 4px;">绑定的车位<span style="color: red;">*</span></view>
+				<view class="popup-title">{{vipUser.id?'修改':'添加'}}授权信息</view>
+			<view style="padding: 4px;">绑定的地锁<span style="color: red;">*</span></view>
 			
 			<view class="carNumber"  @click="selectFloorShow=true"
 			:class="{
 							'carNumber1':!vipUser.floorlockId
 						}">
-				{{vipUser.floorlockId?mylist[selectFloorIndex[0]].name:'请先选择需要绑定的车位'}}
+				{{vipUser.floorlockId?mylist[selectFloorIndex[0]].name:'请先选择需要绑定的地锁'}}
 			</view>
-				<view style="padding: 4px;">白名单车主姓名<span style="color: red;">*</span></view>
-				<u-input :customStyle="customStyle"  maxlength="8"  v-model="vipUser.nickName" placeholder="白名单车主姓名(必填)"></u-input>
-				<view style="padding: 4px;">白名单车主手机号码<span style="color: red;">*</span></view>
+				<view style="padding: 4px;">授权车主姓名<span style="color: red;">*</span></view>
+				<u-input :customStyle="customStyle"  maxlength="8"  v-model="vipUser.nickName" placeholder="授权车主姓名(必填)"></u-input>
+				<view style="padding: 4px;">授权车主手机号码<span style="color: red;">*</span></view>
 				<u-input :customStyle="customStyle" maxlength="13" type="number" v-model="vipUser.phone"
-					placeholder="白名单车主手机号码(必填)"></u-input>
-				<view style="padding: 4px;">白名单车主车牌号</view>
-				<!-- 						<u-input :customStyle="customStyle" v-model="vipUser.carNumber" placeholder="白名单车主车牌号"></u-input> -->
+					placeholder="授权车主手机号码(必填)"></u-input>
+				<view style="padding: 4px;">授权车主车牌号</view>
+				<!-- 						<u-input :customStyle="customStyle" v-model="vipUser.carNumber" placeholder="授权车主车牌号"></u-input> -->
 		
 				<view class="carNumber"  @click="carshow=true,valInit(1)"
 				:class="{
 								'carNumber1':!vipUser.carNumber
 							}">
-					{{vipUser.carNumber?vipUser.carNumber:'白名单车主车牌号'}}
+					{{vipUser.carNumber?vipUser.carNumber:'授权车主车牌号'}}
 				</view>
 				
 				<view >
@@ -195,19 +201,19 @@
 				
 				if (!this.vipUser.floorlockId) {
 					uni.showToast({
-						title: "请先选择需要绑定的车位"
+						title: "请先选择需要绑定的地锁"
 					})
 					return
 				}
 				if (!this.vipUser.nickName) {
 					uni.showToast({
-						title: "请填写白名单车主姓名"
+						title: "请填写授权车主姓名"
 					})
 					return
 				}
 				if (!this.vipUser.phone) {
 					uni.showToast({
-						title: "请填写白名单车主手机号码"
+						title: "请填写授权车主手机号码"
 					})
 					return
 				}