Merge branch 'lw_test' of http://git.bms16.com/liuwei/zx_flk_app into lw_test

.hbuilderx/launch.json

@@ -1,24 +1,26 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-alipay" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "mp-alipay" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

pages.json

@@ -344,21 +344,21 @@
 		"color": "#8a8a8a",
 		"selectedColor": "#0074FF",
 		"list": [{
-				"pagePath": "pages/index/index",
-				"text": "租车",
-				"iconPath": "static/resource/images/home-w.png",
-				"selectedIconPath": "static/resource/images/home-b.png"
+				"pagePath": "pages/index/index"
+				// "text": "租车",
+				// "iconPath": "static/resource/images/home-w.png",
+				// "selectedIconPath": "static/resource/images/home-b.png"
 			},{
-				"pagePath": "pages/service/service",
-				"text": "租车",
-				"iconPath": "static/resource/images/home-w.png",
-				"selectedIconPath": "static/resource/images/home-b.png"
+				"pagePath": "pages/service/service"
+				// "text": "租车",
+				// "iconPath": "static/resource/images/home-w.png",
+				// "selectedIconPath": "static/resource/images/home-b.png"
 			},
 			{
-				"pagePath": "pages/my/my",
-				"text": "我的",
-				"iconPath": "static/resource/images/my-w.png",
-				"selectedIconPath": "static/resource/images/my-b.png"
+				"pagePath": "pages/my/my"
+				// "text": "我的",
+				// "iconPath": "static/resource/images/my-w.png",
+				// "selectedIconPath": "static/resource/images/my-b.png"
 			}
 		]
 	},

pages/index/components/control/control.vue

@@ -5,15 +5,15 @@
 				<img class="contril-item-img"  src="https://qiniu.bms16.com/FmDQhes8TGJh0GZB1Hu3yePuUsRw" alt="">
 				<text>{{$t("开机")}}</text>
 			</view>
-			<view class="contril-item flex-row">
+			<view @tap="tapOpen" class="contril-item flex-row">
 				<img class="contril-item-img" src="https://qiniu.bms16.com/FjoP6k55xhNkbJa-Zm582KQcbuy8" alt="">
 				<text>{{$t("闪灯鸣笛")}}</text>
 			</view>
-			<view class="contril-item flex-row">
+			<view @tap="tapOpen" class="contril-item flex-row">
 				<img class="contril-item-img" src="https://qiniu.bms16.com/FsUx45Qk6skjrCZuFHHMcqp6WR_I" alt="">
 				<text>{{$t("打开座桶")}}</text>
 			</view>
-			<view class="contril-item flex-row">
+			<view @tap="tapOpen" class="contril-item flex-row">
 				<img class="contril-item-img" src="https://qiniu.bms16.com/FjgrfPEufqSzOxb6Aobuc_bbbtJE" alt="">
 				<text>{{$t("打开尾箱")}}</text>
 			</view>

pages/index/index.css

@@ -45,6 +45,7 @@
 	opacity: 0.5
 }
 .card-bg{
+	width: 336rpx;
 	background-color: #FFF;
 	border-radius: 40rpx;
 	height: 48%;

pages/index/index.vue

@@ -55,7 +55,7 @@
 				</view>
 			</view>
 			<view class="config-view">
-				<view class="flex-row config-car-view">
+				<view @tap="navToPage"  class="flex-row config-car-view">
 					<view class="margin_r_20"><img class="icon_style_64" src="https://qiniu.bms16.com/Ftzyvs5whxDdMFksYChHaWKVb0Uk" alt=""></view>
 					<view class="flex-row config-text-view" @tap="inductiveUnlockHandle">
 						<view class="flex-row font_w_600">{{$t("感应解锁")}}</view>
@@ -63,7 +63,7 @@
 					</view>
 					<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 				</view>
-				<view class="flex-row config-car-view">
+				<view @tap="navToPage"  data-url="/pages/userManagement/userManagement"  class="flex-row config-car-view">
 					<view class="margin_r_20"><img class="icon_style_64"  src="https://qiniu.bms16.com/FhKkijkN__9UzhYNgamBFSggIlYo" alt=""></view>
 					<view class="flex-row config-text-view">
 						<view class="flex-row font_w_600">{{$t("用车人管理")}}</view>
@@ -71,7 +71,7 @@
 					</view>
 					<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 				</view>
-				<view class="flex-row config-car-view">
+				<view @tap="navToPage" class="flex-row config-car-view">
 					<view class="margin_r_20"><img class="icon_style_64" src="https://qiniu.bms16.com/FsAg6mHEBJfbtpgIHBrDdNiPo1iH" alt=""></view>
 					<view class="flex-row config-text-view">
 						<view class="flex-row font_w_600">{{$t("设备信息")}}</view>
@@ -159,6 +159,59 @@
 			},
 			inductiveUnlockHandle() {
 				this.$refs.bluetoothUnlockAuth.open();
+			},
+			navToPage(e) {
+				const me = this
+				const url = e.currentTarget.dataset.url;
+				if (!url) {
+					return;
+				}
+				uni.navigateTo({
+					url: url
+				});
+				// if (me.userInfo.is_auth - 0 == 1 && me.userInfo.status - 0 == 2) {
+				// 	uni.navigateTo({
+				// 		url: url
+				// 	});
+				// } else if (me.userInfo.is_auth - 0 == 1 && me.userInfo.status - 0 != 2) {
+				// 	uni.showModal({
+				// 		title: '身份认证提示',
+				// 		content: '尚未完成身份认证，是否进行身份认证?',
+				// 		cancelText: '取消',
+				// 		confirmText: '确定',
+				// 		success: function(res) {
+				// 			if (res.confirm) {
+				// 				me.loadFaceToken()
+				// 			}
+				// 		},
+				// 		fail: function(res) {},
+				// 		complete: function(res) {},
+				// 	})
+				// } else {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: '您还未登录，请先登录',
+				// 		showCancel: true,
+				// 		cancelText: '取消',
+				// 		confirmText: '确定',
+				// 		success: function(res) {
+				// 			if (res.confirm) {
+				// 				//#ifdef MP-ALIPAY
+				// 				uni.navigateTo({
+				// 					url: '/pages/phoneLogin/phoneLogin',
+				// 				})
+				// 				//#endif
+				// 				//#ifdef MP-WEIXIN
+				// 				uni.navigateTo({
+				// 					url: '/pages/login/login',
+				// 				})
+				// 				//#endif
+				// 			}
+				// 		},
+				// 		fail: function(res) {},
+				// 		complete: function(res) {},
+				// 	})
+				// }
 			}
 
 		}

pages/userManagement/userManagement.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="user-card">
 		<view class="flex-row align-center user-card-heard">
-			<img style="width: 48rpx;height: 48rpx;" src="https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX" alt="">
-			<text>共享用户</text>
+			<img style="width: 48rpx;height: 48rpx;" src="https://qiniu.bms16.com/FieeNq75ybyjIzQO6fmNcdTlRsp5" alt="">
+			<text style="margin-left: 16rpx;">共享用户</text>
 		</view>
 		<view class="user-card-text">家人、朋友长期共用车辆，授权账户可以使用感应解锁，寻车定位，查看设置等功能；</view>
 		<!-- <view v-for="(item,index) in userList" :key="index"> -->
@@ -23,7 +23,7 @@
 			<img class="user-nav-img" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 		</view>
 		<view class="flex-row user-card-btn align-center">
-			<img style="width: 20rpx;height: 20rpx;" src="https://qiniu.bms16.com/FsL6XWGoIhfsVB7jRg6EGFVsuaTZ" alt="">
+			<img style="width: 20rpx;height: 20rpx;" src="https://qiniu.bms16.com/FvP_5VTgawzExIHW3kJahXAvE04z" alt="">
 			<text style="margin-left: 6rpx;">添加成员</text>
 		</view>
 	</view>