zhengkaixin hai 1 mes
pai
achega
7c6e2ea55c

+ 18 - 0
apis/pagejs/quickInfo.js

@@ -0,0 +1,18 @@
+import requestWhite from '@/apis/utils/requestWhite'
+
+
+export function myParkingSpot(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/floorlock/myParkingSpot'
+ 	})
+}
+
+export function floorlockDetails(data) {
+ 	return requestWhite({
+ 		method: 'post',
+ 		data: data,
+ 		url: '/mobile/floorlock/floorlockDetails'
+ 	})
+}

+ 6 - 0
assets/img/lockstatus/index0.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1092 1024" width="160" height="150.06" style="" filter="drop-shadow(0px 4px 6px rgba(22,119,255,0.2))">
+    
+    <g>
+    <path d="M546.133333 68.266667c306.449067 0 450.3552 235.383467 477.866667 443.733333h-84.650667a36.864 36.864 0 0 1-35.2256-26.112C848.6912 306.0736 729.361067 216.1664 546.133333 216.1664c-183.227733 0-302.557867 89.9072-357.9904 269.7216A36.864 36.864 0 0 1 152.917333 512H68.266667C95.778133 303.616 239.684267 68.266667 546.133333 68.266667z" fill="rgba(255,255,255,1)" p-id="3768" stroke="none"></path><path d="M546.133333 34.133333C227.771733 34.133333 34.133333 292.795733 34.133333 591.633067v150.9376C34.133333 822.613333 98.986667 887.466667 179.029333 887.466667h734.208C993.28 887.466667 1058.133333 822.613333 1058.133333 742.570667v-150.9376C1058.133333 292.795733 864.494933 34.133333 546.133333 34.133333z m0 68.266667c275.6608 0 443.733333 224.529067 443.733334 489.233067v150.9376A76.629333 76.629333 0 0 1 913.237333 819.2H179.029333A76.629333 76.629333 0 0 1 102.4 742.570667v-150.9376C102.4 326.929067 270.472533 102.4 546.133333 102.4z" fill="rgba(255,255,255,1)" p-id="3769" stroke="none"></path><path d="M170.666667 775.304533l0.170666-1.809066c6.075733-30.856533 165.410133-55.7056 363.383467-56.661334h23.620267c201.9328 0.955733 363.758933 26.760533 363.758933 58.4704v156.0576C921.6 963.652267 753.493333 989.866667 546.133333 989.866667s-375.466667-26.2144-375.466666-58.504534v-156.0576z" fill="rgba(255,255,255,1)" p-id="3770" stroke="none"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/mylock/item5.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24" width="20" height="20" style="" filter="none">
+    
+    <g>
+    <path d="M12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm8.94 3A8.994 8.994 0 0 0 13 3.06V1h-2v2.06A8.994 8.994 0 0 0 3.06 11H1v2h2.06A8.994 8.994 0 0 0 11 20.94V23h2v-2.06A8.994 8.994 0 0 0 20.94 13H23v-2h-2.06zM12 19c-3.87 0-7-3.13-7-7s3.13-7 7-7 7 3.13 7 7-3.13 7-7 7z" fill="rgba(22,119,255,1)"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/quick/item1.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="24" height="24" style="" filter="none">
+    
+    <g>
+    <path d="M9.333 2.667v26.667h-5.333v-26.667h5.333zM12 2.667h13.34c1.469 0 2.66 1.197 2.66 2.653v21.36c0 1.465-1.191 2.653-2.66 2.653h-13.34v-26.667zM29.333 8h2.667v5.333h-2.667v-5.333zM29.333 16h2.667v5.333h-2.667v-5.333zM20 16c1.473 0 2.667-1.194 2.667-2.667s-1.194-2.667-2.667-2.667v0c-1.473 0-2.667 1.194-2.667 2.667s1.194 2.667 2.667 2.667v0zM16 21.333h8c0-2.209-1.791-4-4-4s-4 1.791-4 4v0z" fill="rgba(22,119,255,1)"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/quick/item2.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="24" height="24" style="" filter="none">
+    
+    <g>
+    <path d="M20 4h8v8h-8v-8zM12 4v8h-8v-8h8zM20 28v-8h8v8h-8zM12 28h-8v-8h8v8zM4 14.667h24v2.667h-24v-2.667z" fill="rgba(22,119,255,1)"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/quick/item3.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="24" height="24" style="" filter="none">
+    
+    <g>
+    <path d="M13.272 2.947c0.822-0.18 1.766-0.284 2.734-0.284 0.963 0 1.903 0.102 2.808 0.297l-0.087-0.016c0.255 1.64 1.228 3.011 2.581 3.802l0.025 0.014c0.765 0.45 1.684 0.715 2.666 0.715 0.7 0 1.368-0.135 1.979-0.38l-0.036 0.013c1.184 1.321 2.114 2.897 2.697 4.633l0.027 0.094c-1.224 0.984-2 2.481-2 4.159 0 0.002 0 0.005 0 0.007v-0c0 1.685 0.781 3.188 2.003 4.165-0.613 1.828-1.545 3.403-2.739 4.737l0.011-0.013c-0.576-0.232-1.244-0.367-1.943-0.367-0.981 0-1.901 0.266-2.69 0.729l0.025-0.014c-1.378 0.804-2.35 2.174-2.601 3.783l-0.004 0.030c-0.824 0.181-1.77 0.285-2.74 0.285-0.961 0-1.899-0.102-2.802-0.295l0.087 0.016c-0.254-1.642-1.227-3.015-2.581-3.806l-0.025-0.014c-0.764-0.449-1.683-0.715-2.664-0.715-0.7 0-1.369 0.135-1.981 0.381l0.036-0.013c-1.184-1.321-2.114-2.898-2.697-4.634l-0.027-0.094c1.224-0.984 2-2.481 2-4.159 0-0.001 0-0.003 0-0.004v0c0-0.001 0-0.003 0-0.004 0-1.679-0.778-3.177-1.992-4.153l-0.010-0.008c0.613-1.828 1.545-3.403 2.739-4.737l-0.011 0.013c0.576 0.232 1.244 0.367 1.943 0.367 0.981 0 1.901-0.266 2.69-0.729l-0.025 0.014c1.377-0.804 2.35-2.174 2.601-3.783l0.004-0.030zM16 20c2.209 0 4-1.791 4-4s-1.791-4-4-4v0c-2.209 0-4 1.791-4 4s1.791 4 4 4v0z" fill="rgba(22,119,255,1)"></path>
+    </g>
+  </svg>

+ 0 - 0
static/tabBar/center-HL.png → assets/img/tabBar/center-HL.png


+ 0 - 0
static/tabBar/center.png → assets/img/tabBar/center.png


+ 0 - 0
static/tabBar/home-HL.png → assets/img/tabBar/home-HL.png


+ 0 - 0
static/tabBar/home.png → assets/img/tabBar/home.png


BIN=BIN
assets/img/tabBar/index1-HL.png


BIN=BIN
assets/img/tabBar/index1.png


BIN=BIN
assets/img/tabBar/parking_icon.png


+ 4 - 37
components/componentLogin.vue

@@ -25,15 +25,7 @@
 		
 				</view>
 		
-				<view class="radio" v-if="false">
-					<!-- <radio></radio>
-							<view class="agreement">
-								阅读并同意<text style="color: #2795FD">《用户隐私协议》</text>
-						</view> -->
-					<u-radio-group v-model="value">
-						<u-radio active-color="red">阅读并同意<text style="color: #2795FD">《用户隐私协议》</text></u-radio>
-					</u-radio-group>
-				</view>
+				 
 			</view>
 		</u-popup>
 	</view>
@@ -45,10 +37,7 @@
 	export default {
 		name:"componentLogin",
 		props:{
-			check: {
-				type: Boolean,
-				default: false
-			},
+			
 		},
 		data() {
 			return {
@@ -84,9 +73,7 @@
 					this.jphelp.logoff();
 					this.userInfo = {};
 				
-					if(this.check){
-						this.ashow()
-					}
+					
 					
 			
 				})
@@ -306,27 +293,7 @@
 			}
 		}
 	
-		.radio {
-			display: inline-block;
-			width: 100%;
-			display: flex;
-			justify-content: center;
-			font-size: 24rpx;
-			color: #777777;
-			margin-left: 20rpx;
-	
-			.uni-radio-input {
-				width: 24rpx;
-				height: 24rpx;
-	
-			}
-	
-			.uni-radio-input-checked:before {
-				font-size: 24rpx;
-				background-color: rgb(0, 122, 255);
-				border-color: rgb(0, 122, 255);
-			}
-		}
+		
 	
 	}
 </style>

+ 24 - 5
pages.json

@@ -46,6 +46,14 @@
 					"style" : 
 					{
 						 
+					}
+				},
+				{
+					"path" : "quickInfo",
+					"style" : 
+					{
+						"navigationBarTitleText" : "快捷停车"
+						
 					}
 				}
 				
@@ -59,6 +67,7 @@
 					"style" : 
 					{
 						"navigationBarTitleText" : "个人信息"
+					
 					}
 				},
 				
@@ -74,6 +83,7 @@
 					"style" : 
 					{
 						"navigationBarTitleText" : "停车记录"
+						
 					}
 				},
 				{
@@ -93,6 +103,7 @@
 					"style" : 
 					{
 						"navigationBarTitleText" : "我的地锁"
+						
 					}
 				},
 				{
@@ -100,6 +111,7 @@
 					"style" : 
 					{
 						"navigationBarTitleText" : "绑定新地锁"
+						
 					}
 				},
 				
@@ -108,6 +120,7 @@
 					"style" : 
 					{
 						"navigationBarTitleText" : "地锁详情"
+						 
 					}
 				},
 				{
@@ -128,29 +141,35 @@
 					"path" : "editLock",
 					"style" : 
 					{
-						"navigationBarTitleText" : "修改地锁"
+						"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",
-			"iconPath":"static/tabBar/home.png",
-			"selectedIconPath": "/static/tabBar/home-HL.png",
+		
 			"text": "附近"
 		}, {
 			"pagePath": "pages/index/center",
-			"iconPath": "/static/tabBar/center.png",
-			"selectedIconPath": "/static/tabBar/center-HL.png",
+		
 			"text": "我的"
 		}]
 	},
+	
 	"permission":{
 			"scope.userLocation":{
 				"desc":"获得用户当前位置"

+ 6 - 1
pages/business/lockInfo.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
 		<componentLogin ref="refLogin"  :check="0"
-		@findByOpenId="findByOpenId"></componentLogin>
+		@findByOpenId="findByOpenId"></componentLogin>
+		
 		<u-popup v-model="showMessage" mode="bottom" border-radius="30">
 			<view class="showMessage">
 				<view class="title">降锁成功</view>
@@ -202,6 +203,10 @@
 	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 {

+ 9 - 4
pages/index/center.vue

@@ -59,18 +59,23 @@
 				</view>
 			</view>
 
-		</view>
+		</view>
+		<tabbar   ></tabbar>
 	</view>
 </template>
 
 <script>
+	
 	import * as API from '@/apis/pagejs/index.js'
 	
-	import componentLogin from '@/components/componentLogin.vue';
+	import componentLogin from '@/components/componentLogin.vue';
+	import tabbar from '@/components/Tabbar.vue';
+	
 	export default {
 		components: {
-			componentLogin,
-		},
+			componentLogin,tabbar
+		},
+	
 		data() {
 			return {
 				isReady:false,

+ 4 - 3
pages/index/index.vue

@@ -83,17 +83,18 @@
 
 			</view>
 		</view>
-
+		<tabbar  ></tabbar>
 	</view>
 </template>
 
 <script>
 	import * as API from '@/apis/pagejs/index.js'
 	import componentLogin from '@/components/componentLogin.vue';
-
+	import tabbar from '@/components/Tabbar.vue';
+	
 	export default {
 		components: {
-			componentLogin,
+			componentLogin,tabbar
 		},
 		data() {
 			return {

+ 6 - 0
pages/information/information.vue

@@ -101,6 +101,12 @@
 	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'),
+			
+			
 		},
 		data() {
 			return {

+ 4 - 0
pages/information/parkingInfo.vue

@@ -166,6 +166,10 @@
 	
 	} from '@/apis/utils'
 	export default {
+		components: {
+			'u-steps': () => import('@/uni_modules/uview-ui/components/u-steps/u-steps'),
+		
+		},
 		data() {
 			return {
 				current: 0,

+ 7 - 1
pages/information/parkingRecord.vue

@@ -50,7 +50,13 @@
 		newDate,
 	
 	} from '@/apis/utils'
-	export default {
+	export default {
+		components: {
+		'u-button': () => import('@/uni_modules/uview-ui/components/u-button/u-button'),
+		
+			'u-search': () => import('@/uni_modules/uview-ui/components/u-search/u-search'),
+			
+		},
 		data() {
 			return {
 				list: [],

+ 37 - 2
pages/mylock/bindLock.vue

@@ -94,6 +94,17 @@
 					<view class="value">
 						<input v-model="bindInfo.describe" placeholder="请描述车位位置信息" />
 					</view>
+				</view>
+				<view class="item">
+					<view class="name">
+						获取定位
+				
+					</view>
+					<view class="value" @click="getUserLocation" >
+						<view :style="bindInfo.parkingIdN?'':'color:#BBB'"
+						>{{bindInfo.parkingIdN?bindInfo.parkingIdN:'点击获取车位定位信息'}}</view>
+						<view><img class="img" src="@/assets/img/mylock/item5.svg" alt=""></view>
+					</view>
 				</view>
 			<view class="floating-button">
 				<view class="button"  @click="submit" >
@@ -110,7 +121,15 @@
 <script>
 	import * as API from '@/apis/pagejs/mylock.js'
 	
-	export default {
+	export default {
+		components: {
+			'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-picker': () => import('@/uni_modules/uview-ui/components/u-picker/u-picker'),
+			
+		},
 		data() {
 			return {
 				id:"",
@@ -164,6 +183,22 @@
 			}
 		},
 		methods:{
+			getUserLocation(){
+				uni.authorize({
+					scope: 'scope.userLocation',
+					success() {
+						uni.chooseLocation({
+							success: function (res) {
+								console.log('位置名称:' + res.name);
+								console.log('详细地址:' + res.address);
+								console.log('纬度:' + res.latitude);
+								console.log('经度:' + res.longitude);
+							}
+						});
+					}
+				})
+				
+			},
 			switchBtn(e){
 				this.columnsindex=[e[0]]
 				var obj=this.columns[e[0]]
@@ -292,7 +327,7 @@
 			 
 			 	}).then((res) => {
 			 		uni.hideLoading();
-			 		if (res.data.openBind||1) {
+			 		if (res.data.openBind) {
 			 			
 			 			var nowscan=res.data.floorlockInfoList;
 						if(nowscan&&nowscan.length){

+ 9 - 1
pages/mylock/editLock.vue

@@ -103,7 +103,15 @@
 <script>
 	import * as API from '@/apis/pagejs/mylock.js'
 	
-	export default {
+	export default {
+		components: {
+			'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-picker': () => import('@/uni_modules/uview-ui/components/u-picker/u-picker'),
+			
+		},
 		data() {
 			return {
 				id:"",

+ 9 - 0
pages/mylock/infoLock.vue

@@ -208,6 +208,15 @@
 	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-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() {
 			return {
 				id: "",

+ 10 - 1
pages/mylock/myLock.vue

@@ -113,7 +113,16 @@
 <script>
 	import * as API from '@/apis/pagejs/mylock.js'
 
-	export default {
+	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-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() {
 			return {
 				popupShow:false,

+ 2 - 4
uni_modules/uview-ui/components/u-keyboard/u-keyboard.vue

@@ -13,10 +13,8 @@
 				{{confirmBtn ? confirmText : ''}}
 			</view>
 		</view>
-		<block v-if="mode == 'number' || mode == 'card'">
-			<u-number-keyboard :random="random" @backspace="backspace" @change="change" :mode="mode" :dotEnabled="dotEnabled"></u-number-keyboard>
-		</block>
-		<block v-else>
+		
+		<block >
 			<u-car-keyboard :random="random" :abc="abc" @backspace="backspace" @change="change"></u-car-keyboard>
 		</block>
 	</u-popup>

+ 2 - 1
uni_modules/uview-ui/components/u-picker/u-picker.vue

@@ -10,7 +10,8 @@
 				>{{cancelText}}</view>
 				<view class="u-picker__title" v-if="range.length<5" >{{ title }}</view>
 				<view class="u-picker__title" v-else >
-						<u-input v-model="querykey" placeholder="输入内容查询" type="text" :border="true" />
+						<input v-model="querykey"  style="    border: 1px solid #9E9E9E;"
+						placeholder="输入内容查询" type="text" :border="true" />
 
 				</view>
 				

+ 5 - 3
uni_modules/uview-ui/components/u-tabbar/u-tabbar.vue

@@ -32,7 +32,7 @@
 					<text class="u-line-1">{{item.text}}</text>
 				</view>
 			</view>
-			<view v-if="midButton" class="u-tabbar__content__circle__border" :class="{
+			<view v-if="midButton&&0" class="u-tabbar__content__circle__border" :class="{
 				'u-border': borderTop,
 			}" :style="{
 				backgroundColor: bgColor,
@@ -172,6 +172,7 @@
 		},
 		methods: {
 			async clickHandler(index) {
+				
 				if(this.beforeSwitch && typeof(this.beforeSwitch) === 'function') {
 					// 执行回调,同时传入索引当作参数
 					// 在微信,支付宝等环境(H5正常),会导致父组件定义的customBack()函数体中的this变成子组件的this
@@ -195,11 +196,12 @@
 			},
 			// 切换tab
 			switchTab(index) {
+				console.log(11)
 				// 发出事件和修改v-model绑定的值
 				this.$emit('change', index);
 				// 如果有配置pagePath属性,使用uni.switchTab进行跳转
 				if(this.list[index].pagePath) {
-					uni.redirectTo({
+					uni.switchTab({
 						url: this.list[index].pagePath
 					})
 				} else {
@@ -307,7 +309,7 @@
 				justify-content: space-between;
 				z-index: 10;
 				/* #ifndef APP-NVUE */
-				height: calc(100% - 1px);
+				height: calc(100% - 15px);
 				/* #endif */
 
 				&__button {