zhengkaixin преди 1 месец
родител
ревизия
3396622976

+ 1 - 1
components/Tabbar.vue

@@ -37,7 +37,7 @@
 					 {
 					 	iconPath: img4,
 					 	selectedIconPath: img3,
-					 	text: '设备',
+					 	text: '地锁',
 					 	pagePath: "/pages/deviceTab/index",
 					 	
 					 },

+ 102 - 102
pages/deviceTab/bindLock.vue

@@ -1,107 +1,107 @@
-<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" @click="gotoscan">
-				<view class="item">
-					<view class="name">
-						<span>*</span>地锁编号
-
-					</view>
-					<view class="value">
-						<view>{{bindInfo.lockNo?bindInfo.lockNo:'请扫码识别地锁'}}</view>
-						<view><img class="img" src="@/assets/img/deviceTab/index2-3.svg" alt=""></view>
-					</view>
-				</view>
-			</view>
-
-			<view class="list">
-				<view class="item">
-					<view class="name">
-						<span>*</span>用户名
-
-					</view>
-					<view class="value">
-						<input v-model="bindInfo.name" placeholder="请填写用户真实姓名" />
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						<span>*</span>联系电话
-
-					</view>
-					<view class="value">
-						<input v-model="bindInfo.phone" placeholder="请填写用户联系电话" />
-					</view>
-				</view>
-			</view>
-
-			<view class="list">
-				<view class="item" >
-					<view class="name">
-						所属停车场
-
-					</view>
-					<view class="value" @click="isswitchshowBtn">
-						<view>{{bindInfo.parkingIdN?bindInfo.parkingIdN:'请选择所属停车场'}}</view>
-						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
-					</view>
-				</view>
-				<view class="item" v-if="bindInfo.lockNo">
-					<view class="name">
-						车位类型
-
-
-					</view>
-					<view class="value">
-						<view>{{bindInfo.typeN}}</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">
-						<input placeholder="如1号车位" v-model="bindInfo.parkingNumber" />
-					</view>
-				</view>
-				<view class="item">
-					<view class="name">
-						位置描述
-
-					</view>
-					<view class="value">
-						<input placeholder="请描述车位位置信息" />
-					</view>
-				</view>
+			</view>
+			<view class="list" @click="gotoscan">
+				<view class="item">
+					<view class="name">
+						<span>*</span>地锁编号
+
+					</view>
+					<view class="value">
+						<view>{{bindInfo.lockNo?bindInfo.lockNo:'请扫码识别地锁'}}</view>
+						<view><img class="img" src="@/assets/img/deviceTab/index2-3.svg" alt=""></view>
+					</view>
+				</view>
+			</view>
+
+			<view class="list">
+				<view class="item">
+					<view class="name">
+						<span>*</span>用户名
+
+					</view>
+					<view class="value">
+						<input v-model="bindInfo.name" placeholder="请填写用户真实姓名" />
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						<span>*</span>联系电话
+
+					</view>
+					<view class="value">
+						<input v-model="bindInfo.phone" placeholder="请填写用户联系电话" />
+					</view>
+				</view>
+			</view>
+
+			<view class="list">
+				<view class="item" >
+					<view class="name">
+						所属停车场
+
+					</view>
+					<view class="value" @click="isswitchshowBtn">
+						<view>{{bindInfo.parkingIdN?bindInfo.parkingIdN:'请选择所属停车场'}}</view>
+						<u-icon name="arrow-right" size="24" color="#BBBBBB"></u-icon>
+					</view>
+				</view>
+				<view class="item" v-if="bindInfo.lockNo">
+					<view class="name">
+						车位类型
+
+
+					</view>
+					<view class="value">
+						<view>{{bindInfo.typeN}}</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">
+						<input placeholder="如1号车位" v-model="bindInfo.parkingNumber" />
+					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						位置描述
+
+					</view>
+					<view class="value">
+						<input 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/index.js'
-	
-	export default {
-		data() {
-			return {
+	
+	export default {
+		data() {
+			return {
 				current: 0,
 				
 				columnsindex:[0],
@@ -113,15 +113,15 @@
 					remark:""
 				},
 				isswitchshow:false,
-				allList:[],
+				allList:[],
 				numList: [{
 					name: '绑定地锁'
 				}, {
 					name: '等待审核'
 				}, {
 					name: '完成绑定'
-				}],
-			};
+				}],
+			};
 		},
 		onLoad() {
 			this.userInfo = this.jphelp.getPersonInfo()
@@ -284,7 +284,7 @@
 			 
 			 		} else {
 			 			uni.showToast({
-			 				title: "当前设备不可绑定",
+			 				title: "当前地锁不可绑定",
 			 				icon: "none"
 			 			})
 						
@@ -316,19 +316,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);
@@ -393,5 +393,5 @@
 					font-size: 36rpx;
 			}
 	}
-	
+	
 </style>

Файловите разлики са ограничени, защото са твърде много
+ 504 - 504
pages/deviceTab/dataLock.vue


+ 1 - 1
pages/deviceTab/deviceList.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-navbar  title="设备列表"  ></u-navbar>
+		<u-navbar  title="地锁列表"  ></u-navbar>
 		<view class="main">
 			<view class="tabs" v-if="0">
 				<u-picker  v-model="tabsFrom.show1"

+ 5 - 5
pages/deviceTab/infoLock.vue

@@ -16,7 +16,7 @@
 			</view>
 			<view class="page">
 				<view class="info-title">
-					<view class="name">设备信息</view>
+					<view class="name">地锁信息</view>
 					<view class="value">
 						<view class="pack-up" v-show="listShow" @click="listShow=false">
 							收起<u-icon name="arrow-up" size="32" color="#AAAAAA"></u-icon>
@@ -28,7 +28,7 @@
 				</view>
 				<view class="table">
 					<view class="row">
-						<view class="name">设备型号</view>
+						<view class="name">地锁型号</view>
 						<view class="value">{{floorlockInfo.model}}</view>
 					</view>
 
@@ -83,11 +83,11 @@
 							<view class="value">{{floorlockInfo.tariffStandard}}</view>
 						</view>
 						<view class="row">
-							<view class="name">设备启动时间</view>
+							<view class="name">地锁启动时间</view>
 							<view class="value">{{floorlockInfo.activationTime}}</view>
 						</view>
 						<view class="row">
-							<view class="name">设备质保期</view>
+							<view class="name">地锁质保期</view>
 							<view class="value">{{floorlockInfo.shelfLife}}</view>
 						</view>
 					</template>
@@ -116,7 +116,7 @@
 					<view class="tips">
 						<u-icon style="    margin-top: 2px;" size="30" name="info-circle"></u-icon>
 						<view>
-							地锁内含物联网卡,此卡随设备出厂时赠送三年免费使用时长,三年后将按5元/月资费标准收取费用。
+							地锁内含物联网卡,此卡随地锁出厂时赠送三年免费使用时长,三年后将按5元/月资费标准收取费用。
 
 						</view>
 

Файловите разлики са ограничени, защото са твърде много
+ 502 - 502
pages/index/index.vue


+ 1 - 1
pages/myTab/abnormalInfo.vue

@@ -14,7 +14,7 @@
 			
 			<view class="line">
 				<view class="name">
-					告警设备
+					告警地锁
 
 			
 				</view>

+ 1 - 1
pages/myTab/customerService.vue

@@ -49,7 +49,7 @@
 				list: [{
 					name: '软件使用'
 				}, {
-					name: '设备状态及参数'
+					name: '地锁状态及参数'
 				}, {
 					name: '工单相关',
 

+ 1 - 1
uni_modules/uview-ui/components/u-dropdown-change/u-dropdown-change.vue

@@ -217,7 +217,7 @@
 			getContentHeight() {
 				// 这里的原理为,因为dropdown组件是相对定位的,它的下拉出来的内容,必须给定一个高度
 				// 才能让遮罩占满菜单一下,直到屏幕底部的高度
-				// this.$u.sys()为uView封装的获取设备信息的方法
+				// this.$u.sys()为uView封装的获取地锁信息的方法
 				let windowHeight = this.$u.sys().windowHeight;
 				this.$uGetRect('.u-dropdown__menu').then(res => {
 					// 这里获取的是dropdown的尺寸,在H5上,uniapp获取尺寸是有bug的(以前提出修复过,后来又出现了此bug,目前hx2.8.11版本)

+ 1 - 1
uni_modules/uview-ui/components/u-dropdown/u-dropdown.vue

@@ -214,7 +214,7 @@
 			getContentHeight() {
 				// 这里的原理为,因为dropdown组件是相对定位的,它的下拉出来的内容,必须给定一个高度
 				// 才能让遮罩占满菜单一下,直到屏幕底部的高度
-				// this.$u.sys()为uView封装的获取设备信息的方法
+				// this.$u.sys()为uView封装的获取地锁信息的方法
 				let windowHeight = this.$u.sys().windowHeight;
 				this.$uGetRect('.u-dropdown__menu').then(res => {
 					// 这里获取的是dropdown的尺寸,在H5上,uniapp获取尺寸是有bug的(以前提出修复过,后来又出现了此bug,目前hx2.8.11版本)

+ 1 - 1
uni_modules/uview-ui/components/u-subsection/u-subsection.vue

@@ -89,7 +89,7 @@
 				type: String,
 				default: '#ffffff'
 			},
-			// 在切换分段器的时候,是否让设备震一下
+			// 在切换分段器的时候,是否让地锁震一下
 			vibrateShort: {
 				type: Boolean,
 				default: false

+ 1 - 1
uni_modules/uview-ui/index.js

@@ -61,7 +61,7 @@ import getParent from './libs/function/getParent.js'
 // 获取整个父组件
 import $parent from './libs/function/$parent.js'
 // 获取sys()和os()工具方法
-// 获取设备信息,挂载到$u的sys()(system的缩写)属性中,
+// 获取地锁信息,挂载到$u的sys()(system的缩写)属性中,
 // 同时把安卓和ios平台的名称"ios"和"android"挂到$u.os()中,方便取用
 import {sys, os} from './libs/function/sys.js'
 // 防抖方法

Някои файлове не бяха показани, защото твърде много файлове са промени