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

component/comPopup/Confirm.vue

@@ -0,0 +1,141 @@
+<template>
+  <view class="modal-mask" v-if="value">
+    <view class="confirm-container">
+      <view class="popup-title">{{ dialogInfo.title }}</view>
+      <view class="popup-content">{{ dialogInfo.text }}</view>
+      <view class="flex-row modal-footer">
+        <view class="show-btn cencel-btn-pop" v-if="dialogInfo.showCancelButton" @tap="cancel">
+          {{ dialogInfo.cancelBtnText }}
+        </view>
+        <view class="show-btn ok-btn-pop" @tap="confirm">{{ dialogInfo.confirmBtnText }}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: Boolean,
+      default: false
+    },
+    dialogInfo: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  methods: {
+    cancel() {
+      this.hide()
+    },
+    confirm() {
+      this.hide()
+      const { opType = null } = this.dialogInfo
+      this.$emit("confirm", opType)
+    },
+    hide() {
+      this.$emit("input", false)
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.modal-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+
+  .confirm-container {
+    background-color: #fff;
+    padding: 48rpx;
+    border-radius: 40rpx;
+    width: 75%;
+
+    .popup-title {
+      font-weight: 600;
+      font-size: 36rpx;
+      color: #060809;
+      text-align: center;
+      margin-bottom: 26rpx;
+      font-family: PingFangSC, PingFang SC;
+    }
+
+    .popup-content {
+      text-align: center;
+      font-weight: 400;
+      font-size: 28rpx;
+      color: #828384;
+      margin-bottom: 42rpx;
+      font-family: PingFangSC, PingFang SC;
+      line-height: 40rpx;
+    }
+  }
+
+  .modal-footer {
+    width: 100%;
+    align-items: center;
+
+    .show-btn {
+      border-radius: 40rpx;
+      flex: 1;
+      text-align: center;
+      font-weight: 600;
+      font-size: 32rpx;
+      border-radius: 40rpx;
+      height: 80rpx;
+      line-height: 80rpx;
+
+      &:active {
+        opacity: 0.7;
+      }
+    }
+
+    .cencel-btn-pop {
+      color: #060809;
+      background: #EBECEC;
+      margin-right: 12rpx;
+    }
+
+    .ok-btn-pop {
+      color: #FFFFFF;
+      background: #060809;
+    }
+  }
+}
+
+
+
+
+@keyframes confirm-fadein {
+  0% {
+    opacity: 0;
+  }
+
+  100% {
+    opacity: 1;
+  }
+}
+
+@keyframes confirm-zoom {
+  0% {
+    transform: scale(0);
+  }
+
+  50% {
+    transform: scale(1.1);
+  }
+
+  100% {
+    transform: scale(1);
+  }
+}
+</style>

component/comPopup/index.js

@@ -0,0 +1,22 @@
+import Vue from 'vue'
+import Confirm from './Confirm.vue'
+ 
+let newInstance;
+const ConfirmInstance = Vue.extend(Confirm)
+ 
+const initInstance = () => {
+  newInstance = new ConfirmInstance()
+  document.body.appendChild(newInstance.$mount().$el)
+}
+ 
+
+export const confirm = (options) => { 
+  if (!newInstance) {
+    initInstance()
+  }
+  Object.assign(newInstance, options)
+ 
+  return newInstance.show(vm => {
+    newInstance = null
+  })
+}

main.js

@@ -9,6 +9,7 @@ Polyfill.init();
 import Mixin from './polyfill/mixins';
 import messages from './locale/index'
 import uView from "uview-ui";
+
 Vue.use(uView);
 
 let i18nConfig = {

pages.json

@@ -14,8 +14,7 @@
 		{
 			"path": "pages/my/my",
 			"style": {
-				"navigationBarTitleText": "个人中心",
-				"navigationBarBackgroundColor": "#C2DEFF"
+				"titleNView": false
 			}
 		},
 		{

pages/my/my.css

@@ -1,155 +0,0 @@
-.container-view {
-	background-color: #ffffff;
-	height: 100vh;
-}
-
-.user {
-	/* background: url('https://qiniu.bms16.com/FjTiZgePOrZrT7OWtRHqv_Y6SG6F'); */
-	background: #C2DEFF;
-	padding: 64rpx 40rpx 60rpx 40rpx;
-}
-
-.user-img {
-	width: 144rpx;
-	height: 144rpx;
-	border-radius: 50%;
-	border: 4rpx solid #ffffff;
-}
-
-.head_img {
-	border-radius: 50%;
-	width: 144rpx;
-	height: 144rpx;
-	overflow: hidden;
-	background: none;
-	padding: 0;
-	margin: 0 auto;
-	line-height: 1;
-}
-
-.user-information {
-	/* margin-left: 24rpx; */
-}
-
-.user-phone,
-.user-login {
-	font-size: 48rpx;
-	font-weight: bold;
-	color: #2A3A5A;
-	margin-bottom: 16rpx;
-	margin-top: 20rpx;
-}
-
-.user-status {
-	border: 2rpx solid #626E86;
-	color: #626E86;
-	font-size: 24rpx;
-	border-radius: 24rpx;
-	width: 144rpx;
-	text-align: center;
-	padding: 12rpx 0;
-}
-
-.ok-status {
-	color: #2A3A5A;
-	font-size: 28rpx;
-	font-weight: bold;
-}
-
-.ok-status > img {
-	width: 40rpx;
-	height: 40rpx;
-	margin-left: 12rpx;
-	vertical-align: middle;
-}
-
-.my-vip {
-	position: relative;
-	width: 670rpx;
-	height: 104rpx;
-	margin-top: 40rpx;
-	background: url('https://qiniu.bms16.com/FgFCmXNIafwuy0KIxhS_iOTeStLT') no-repeat;
-	background-size: cover;
-	
-}
-
-.vip-text {
-	color: #ffffff;
-	font-size: 28rpx;
-	position: absolute;
-	top: 38rpx;
-	left: 144rpx;
-}
-
-.activate-vip {
-	position: absolute;
-	top: 24rpx;
-	right: 32rpx;
-	background: linear-gradient( to right, #FFE5A5 0%, #FFC76C 100%);
-	border-radius: 32rpx;
-	padding: 16rpx 24rpx;
-	font-size: 24rpx;
-	color: #2F3248;
-	font-weight: bold;
-}
-
-.option {
-	/* padding: 40rpx 72rpx; */
-	padding: 40rpx 35rpx;
-}
-
-.option-first {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: space-between;
-	/* display: grid;
-	grid-template-columns: repeat(4, 1fr); */
-	margin-bottom: 40rpx;
-}
-
-.my_function {
-  flex: 0 0 25%;
-}
-
-.no-button {
-	overflow: hidden;
-	background: none;
-	padding: 0;
-	margin: 0 auto;
-	line-height: 1;
-}
-
-.my_icon {
-  width: 80rpx;
-  height: 80rpx;
-  margin: 0 auto;
-  vertical-align: middle;
-  text-align: center;
-}
-
-.my_title_o {
-  width: 100%;
-  height: 28rpx;
-  line-height: 28rpx;
-  margin-top: 12rpx;
-  font-size: 28rpx;
-  text-align: center;
-  vertical-align: middle;
-  color: #2A3A5A;
-}
-
-.my_title_t {
-  width: 100%;
-  height: 24rpx;
-  line-height: 24rpx;
-  margin-top: 8rpx;
-  font-size: 24rpx;
-  text-align: center;
-  vertical-align: middle;
-  color: #5B677D;
-}
-
-.service-btn {
-	padding: 0;
-	margin: 0;
-}

pages/my/my.scss

@@ -0,0 +1,144 @@
+.container-view {
+    height: calc(100vh - 96rpx);
+    padding: 36rpx 32rpx;
+    box-sizing: border-box;
+    background: linear-gradient(180deg, #CFD1DE 0%, #F1F3F4 100%), #F1F3F4;
+    background-size: 100% 528rpx;
+    background-repeat: no-repeat;
+
+    .user-switch-row {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .name-wrap {
+            font-family: DIN, DIN;
+            font-weight: 500;
+            font-size: 32rpx;
+            color: #060809;
+            display: flex;
+            align-items: center;
+
+            &:active {
+                opacity: .8;
+            }
+
+            &::before {
+                content: "";
+                width: 48rpx;
+                height: 48rpx;
+                margin-right: 16rpx;
+                background: url('https://qiniu.bms16.com/FghCVNMWDBKJpqbIrqoxT-de9Has');
+                background-size: 100%;
+            }
+
+            &::after {
+                content: "";
+                width: 28rpx;
+                height: 28rpx;
+                margin-left: 10rpx;
+                background: url('https://qiniu.bms16.com/FvLGTjPNELdBiqcSf6S2G4GLSElS');
+                background-size: 100%;
+            }
+        }
+
+        .message {
+            width: 44rpx;
+            height: 34rpx;
+
+            &:active {
+                opacity: .8;
+            }
+        }
+    }
+
+    .user-info-wrap {
+        margin: 54rpx auto 48rpx;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .head-img {
+            width: 144rpx;
+            height: 144rpx;
+            border-radius: 50%;
+        }
+
+        .user-name {
+            font-family: DIN, DIN;
+            font-weight: bold;
+            font-size: 40rpx;
+            color: #060809;
+            margin: 12rpx 0 8rpx;
+        }
+
+        .e-mail {
+            font-family: Futura, Futura;
+            font-weight: 500;
+            font-size: 24rpx;
+            color: #060809;
+        }
+    }
+
+    .common-tabs {
+        display: flex;
+        justify-content: space-between;
+
+        .item {
+            width: 216rpx;
+            height: 216rpx;
+            background: #FFFFFF;
+            border-radius: 40rpx;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+
+            .icon {
+                width: 80rpx;
+                height: 80rpx;
+                margin-bottom: 30rpx;
+            }
+
+            .name {
+                font-family: PingFangSC, PingFang SC;
+                font-weight: bold;
+                font-size: 32rpx;
+                color: #060809;
+                line-height: 32rpx;
+            }
+        }
+    }
+
+    .tabs-wrap {
+        width: 100%;
+        background: #FFFFFF;
+        border-radius: 40rpx;
+        margin-top: 24rpx;
+        padding: 40rpx 32rpx 32rpx 32rpx;
+
+        .tab-item {
+            display: flex;
+            align-items: center;
+            padding: 32rpx 0;
+            border-bottom: 2PX solid #F1F4F5;
+
+            &:last-child {
+                border-bottom: none;
+            }
+
+            .icon {
+                width: 64rpx;
+                height: 64rpx;
+                margin-right: 16rpx;
+            }
+
+            .name {
+                font-family: PingFangSC, PingFang SC;
+                font-weight: bold;
+                font-size: 32rpx;
+                color: #060809;
+            }
+        }
+    }
+}

pages/my/my.vue

@@ -1,525 +1,98 @@
 <template>
-	<view class="container-view">
-		<view class="user">
-			<view v-if="user_token" class="flex-row" style="flex-direction: column;">
-				<!-- #ifdef MP-ALIPAY-->
-				<view @tap="onChooseImg"><img class="user-img" :src="avatarUrl" /></view>
-				<!-- #endif  -->
-				<!-- #ifdef MP-WEIXIN -->
-				<view>
-					<button class="head_img" style="border: 4rpx solid #ffffff;" open-type="chooseAvatar"
-						@chooseavatar="onChooseAvatar">
-						<image class="head_img" :src="avatarUrl"></image>
-					</button>
-				</view>
-				<!-- #endif -->
-				<view class="user-information flex-row" style="flex-direction: column;">
-					<view class="user-login">{{maskPhone}}</view>
-					<view v-if="userInfo.is_auth==1&&userInfo.status!=1&&userInfo.status!=2"
-						@click.native.stop="navToAuthIdentity" class="user-status">实名认证</view>
-					<!-- 用户状态 userInfo.status 0: 未身份认证  1: 申请身份认证   2: 身份认证通过，账户正常   3: 身份认证不通过  4: 警告  5: 冻结 -->
-					<view v-else-if="userInfo.status==2" class="ok-status">
-						已实名
-						<img src="https://qiniu.bms16.com/Fim_Fx9ghw2HiX9BI60GTmYKVTHB" />
-					</view>
-				</view>
-			</view>
-			<view @tap="navToLoignPage" v-if="!user_token" class="flex-row" style="flex-direction: column;">
-				<view ><img class="user-img" :src="avatarUrl" /></view>
-				<view class="user-information flex-row" style="flex-direction: column;">
-					<view  class="user-phone">请点击登录</view>
-				</view>
-			</view>
-			<!-- <view class="my-vip">
-				<view class="vip-text">开卡立享骑行折扣</view>
-				<view @tap="bindNotShow" class="activate-vip">立即开通</view>
-			</view> -->
-		</view>
-		<view class="option">
-			<view class="flex-row flex-between option-first">
-				<view @tap="navToPage" data-url="/pages/wallet/wallet" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/Fkrp0-SQwgLdu2tPmbudScdRIg9A"></image>
-					<view class="my_title_o">我的钱包</view>
-				</view>
-				<!-- <view @tap="bindNotShow" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/Fmt9-v5f8SiVadoFgNJol4z8bIGw"></image>
-					<view class="my_title_o">优惠券</view>
-				</view> -->
-				<view @tap="navToPage" data-url="/pages/order/order" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/FpiqF1dfAWmUkWRbR1wcO3JNSKIL"></image>
-					<view class="my_title_o">租车订单</view>
-				</view>
-<!-- 				<view @tap="navToPage" data-url="/pages/exchangeGuide/exchangeGuide" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/FpiqF1dfAWmUkWRbR1wcO3JNSKIL"></image>
-					<view class="my_title_o">租车订单</view>
-				</view> -->
-				<view @tap="navToBattery" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/FjNIrru2jMEzfKEwZXRmisggxCII"></image>
-					<view class="my_title_o">我的车辆</view>
-				</view>
-				<view @tap="navToPage" data-url="/pages/exchangeRecord/exchangeRecord" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/FnOA-7WRsxwMh3FiFLY5FWh3rfAY"></image>
-					<view class="my_title_o">换电记录</view>
-				</view>
-				<!-- 判断是否绑定车牌才显示 我的车辆-->
-				<!-- <view v-if="(car_list && (car_list.order_status == 2 || car_list.order_status == 3 || car_list.order_status == 4 ||car_list.order_status == 5))" 
-					@tap="navToBattery" 
-					class="flex-column my_function"> -->
-				
-			</view>
-			<view class="flex-row flex-between option-first">
-				<!-- #ifdef MP-ALIPAY-->
-				<view @tap="bindNotShow" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/FgIm7yFZgw4YO5DiGlnHV2UXxjJr"></image>
-					<view class="my_title_t">客服中心</view>
-				</view>
-				<!-- #endif  -->
-				<!-- #ifdef MP-WEIXIN -->
-				<button open-type="contact" plain="true" style="border: none;"
-					class="flex-column my_function service-btn">
-					<image class="my_icon" src="https://qiniu.bms16.com/FgIm7yFZgw4YO5DiGlnHV2UXxjJr"></image>
-					<view class="my_title_t">客服中心</view>
-				</button>
-				<!-- #endif -->
-				<view @tap="navToPage" data-url="/pages/feedback/feedback" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/Ft6hjfFCvqNF_ReaSRAmngZLcNz7"></image>
-					<view class="my_title_t">问题反馈</view>
-				</view>
-				<view @tap="loadNavToMy" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/FmjP9FC6J8kXeK0i2ox0zgLkOiow"></image>
-					<view class="my_title_t">关于我们</view>
-				</view>
-				<view @tap="loadNavToInstall" class="flex-column my_function">
-					<image class="my_icon" src="https://qiniu.bms16.com/FumqzeUKKbdeMwYew5PtfffC5lXP"></image>
-					<view class="my_title_t">基础设置</view>
-				</view>
-			</view>
-		</view>
-		<!-- #ifdef MP-WEIXIN  -->
-		<CustomTabbar curtTab="my" />
-		<!-- #endif  -->
-	</view>
+    <view class="container-view">
+        <view class="user-switch-row">
+            <view class="name-wrap">{{ userInfo.name }}</view>
+            <image class="message" @tap="routerLink({ url: '/pages/message/index' })"
+                :src="QINIU_URL + 'FghCVNMWDBKJpqbIrqoxT-de9Has'" />
+        </view>
+        <view class="user-info-wrap">
+            <image class="head-img" :src="userInfo.headImg" />
+            <view class="user-name">{{ userInfo.userName }}</view>
+            <view class="e-mail">{{ userInfo.eMail }}</view>
+        </view>
+        <view class="common-tabs">
+            <view class="item" v-for="(item, index) in commonTabs" :key="index" @click="routerLink(item)">
+                <image :src="QINIU_URL + item.icon" class="icon" />
+                <view class="name">{{ item.name }}</view>
+            </view>
+        </view>
+        <view class="tabs-wrap">
+            <view class="tab-item" v-for="(item, index) in baseTabs" :key="index" @click="routerLink(item)">
+                <image :src="QINIU_URL + item.icon" class="icon" />
+                <view class="name">{{ item.name }}</view>
+            </view>
+        </view>
+        <Confirm 
+            v-model="comboDialoginfo.showConfirm"
+            :dialogInfo="comboDialoginfo"
+            @confirm="dialogConfirm"
+        />
+    </view>
 </template>
-<script>
-	var config = require('../../common/config.js');
-	var http = require('../../common/http.js');
-	var common = require('../../common/common.js');
-	var storage = require('../../common/storage.js')
-	const defaultAvatarUrl = 'https://qiniu.bms16.com/FpzmRTePsa2QSxemAbc-xWdzSsn1'
-	import CustomTabbar from '@/component/customTabbar/index';
-	export default {
-		data() {
-			return {
-				user_token: '',
-				avatarUrl: defaultAvatarUrl,
-				userInfo: {},
-				trust_deposit: {},
-				maskPhone: '',
-				app_version: '',
-				appConfig: null,
-				face_token: '',
-				face_key: '',
-				myLocation: {
-					latitude: null,
-					longitude: null
-				},
-				car_list: {
-
-				}
-			};
-		}
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		,
-		onLoad: function(options) {
-			const appConfig = storage.getAppConfig()
-			this.app_version = config.APP_VERSION
-			this.appConfig = appConfig
-			const locationStr = uni.getStorageSync('user_current_location')
-			if (locationStr) {
-				this.myLocation = locationStr;
-			}
-			
-		},
-		components: { CustomTabbar },
-		/**
-		 * 生命周期函数--监听页面显示
-		 */
-		onShow: function() {
-			const appConfig = storage.getAppConfig()
-			const user_token = storage.getUserToken()
-			this.user_token = user_token
-			if (this.user_token) {
-				this.loadUserInfo()
-			}
-			// 监听用户车辆是否解绑
-			this.car_list = uni.getStorageSync('user_car_list') || null
-
-			// #ifdef MP-ALIPAY
-			
-			if (typeof this.$scope.getTabBar === 'function' && this.$scope.getTabBar()) {
-				this.$scope.getTabBar().setData({
-					curtTab: 1
-				})
-			}
-			// #endif
-		},
-		
-		// 分享给好友
-		onShareAppMessage: function(res) { //发送给朋友
-			return {
-				title: this.appConfig.app_name,
-				path: 'pages/my/my',
-			}
-		},
-		
-		methods: {
-			loadUserInfo() {
-				var userInfo = storage.getUserInfoData()
-				const maskPhone = common.maskPhoneNumber(userInfo.userInfo.phone)
-				this.setData({
-					userInfo: userInfo.userInfo,
-					avatarUrl: userInfo.userInfo.headimg || this.avatarUrl,
-					maskPhone: maskPhone
-				})
-				this.trust_deposit = userInfo.trust_deposit
-			},
-
-			loadIsLogin(url_page) {
-				const user_token = storage.getUserToken()
-				if (!user_token) {
-					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) {},
-					})
-				} else {
-					uni.navigateTo({
-						url: url_page,
-					})
-				}
-			},
-
-			navToLogin() {
-				uni.navigateTo({
-					url: '/pages/login/login'
-				});
-			},
-
-			navToPage(e) {
-				const me = this
-				const url = e.currentTarget.dataset.url;
-				if (!url) {
-					return;
-				}
-				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) {},
-					})
-				}
-			},
-
-			loadNavToMy() {
-				uni.navigateTo({
-					url: '/pages/aboutMy/aboutMy?app_version=' + this.app_version,
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {},
-				})
-			},
-
-			loadNavToInstall() {
-				const user_token = storage.getUserToken()
-				if (!user_token) {
-					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) {},
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/install/install?app_version=' + this.app_version,
-						success: function(res) {},
-						fail: function(res) {},
-						complete: function(res) {},
-					})
-				}
-			},
 
-			onChooseImg() {
-				uni.chooseImage({
-					count: 1,
-					sizeType: ['original', 'compressed'],
-					sourceType: ['album', 'camera'],
-					success: (res) => {
-						this.avatarUrl = res.tempFilePaths[0]; // 选择图片后返回的路径
-					}
-				});
-			},
-
-			onChooseAvatar(e) {
-				this.uploadAvatar(e.detail.avatarUrl)
-			},
-
-			uploadAvatar(avatarFile) {
-				const me = this
-				http.getApi(config.API_QINIU_UP_IMG_TOKEN, {}, function(response) {
-					if (response.data.code === 200) {
-						const token = response.data.data.token
-						uni.uploadFile({
-							url: config.QINIU_UPLOAD_SITE,
-							filePath: avatarFile,
-							name: 'file',
-							formData: {
-								token: token
-							},
-							success: function(res1) {
-								var rtDataObj = JSON.parse(res1.data);
-								const key = rtDataObj.key
-								var imgUrl = config.QINIU_SITE + key
-								me.setData({
-									avatarUrl: imgUrl
-								})
-								http.postApi(config.API_REPORT_USER_INFO, {
-									avatarUrl: imgUrl
-								}, function(rs2) {
-									if (rs2.data.code == 200) {}
-								});
-							},
-							fail: function(res) {
-								common.simpleToast('上传失败')
-								uni.hideLoading()
-							},
-						})
-					} else {
-						common.simpleToast(response.data.msg)
-						uni.hideLoading()
-					}
-				})
-			},
-
-			navToAuthIdentity() {
-				http.postApi(config.API_USER_FACE_TOKEN, {}, (resp) => {
-					if (resp.data.code === 200) {
-						this.face_token = resp.data.data.token
-						this.face_key = resp.data.data.key
-						uni.navigateTo({
-							url: '/pages/livenessView/livenessView?face_token=' + this.face_token +
-								'&face_key=' + this.face_key,
-							success: function(res) {},
-							fail: function(res) {},
-							complete: function(res) {},
-						})
-					} else {
-						common.simpleToast(resp.data.msg)
-					}
-				})
-			},
-
-			navToLoignPage() {
-				//#ifdef MP-ALIPAY
-				uni.navigateTo({
-					url: '/pages/phoneLogin/phoneLogin',
-				})
-				//#endif
-				//#ifdef MP-WEIXIN
-				uni.navigateTo({
-					url: '/pages/login/login',
-				})
-				//#endif
-			},
-
-			bindNotShow() {
-				common.simpleToast('功能暂未开放')
-			},
-
-			loadCarList() {
-				return new Promise((resolve, reject) => {
-					http.postApi(config.API_DAYHIRE_CAR_CAR_LIST, {}, (resp) => {
-						if (resp.data.code !== 200) return
-						const carList = resp.data.data.data || []
-						const plate_number = carList.length > 0 ? carList[0].license_plate_number : ''
-						let carData = {}
-						if (carList.length) {
-							carData = {
-								plate_number
-							}
-						}
-						resolve(carData)
-					})
-				})
-			},
-
-			navToBattery() {
-				const me = this
-				const user_token = storage.getUserToken()
-				if (!user_token) {
-					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) {},
-					})
-				} else {
-					if(me.car_list&&me.car_list.order_status == 2) {
-						uni.showModal({
-							title: '提示',
-							content: '是否前往激活车辆页面？',
-							// showCancel: false,
-							confirmText: '确定',
-							success: function(res) {
-								// 扫码租车
-								uni.navigateTo({
-									url: '/pages/activation/activation?plate_number=' + me
-										.car_list.plate_number,
-									success: function(res) {},
-									fail: function(res) {},
-									complete: function(res) {}
-								});
-							},
-							fail: function(res) {},
-							complete: function(res) {},
-						})
-					}else if(me.car_list&&me.car_list.order_status == 5) {
-						uni.showModal({
-							title: '提示',
-							content: '请等待商家确认还车',
-							showCancel: false,
-							confirmText: '确定',
-							success: function(res) {
-								return false
-							},
-							fail: function(res) {},
-							complete: function(res) {},
-						})
-					}else{
-						this.loadCarList().then(carData => {
-							console.log('carData', carData)
-							uni.navigateTo({
-								url: '/pages/battery/battery' + '?plate_number=' + carData.plate_number,
-								success: function(res) {},
-								fail: function(res) {},
-								complete: function(res) {},
-							})
-						})
-					}
-				}
-			},
-			
-			loadFaceToken() {
-				const me = this
-				http.postApi(config.API_USER_FACE_TOKEN, {}, (resp) => {
-					if (resp.data.code === 200) {
-						me.face_token = resp.data.data.token
-						me.face_key = resp.data.data.key
-						uni.navigateTo({
-							url: '/pages/livenessView/livenessView?face_token=' + me.face_token +
-								'&face_key=' + this.face_key,
-							success: function(res) {},
-							fail: function(res) {},
-							complete: function(res) {},
-						})
-					} else {
-						common.simpleToast(resp.data.msg)
-					}
-				})
-			},
-		}
-	};
+<script>
+import Confirm from '@/component/comPopup/Confirm'
+import { QINIU_URL } from '@/common/constant'
+export default {
+    components: {
+        Confirm
+    },
+    data() {
+        return {
+            QINIU_URL,
+            comboDialoginfo: {
+                showConfirm: false,
+                title: '温馨提示',
+                opType: 'combo',
+                text: '您还未购买换电套餐，是否前往进行换电套餐？',
+                confirmBtnText: '前往购买',
+                showCancelButton: false
+            },
+            userInfo: {
+                name: 'Real name',
+                userName: 'Kabuda-4',
+                eMail: '1007929522@Mail.com',
+                headImg: 'https://tse4-mm.cn.bing.net/th/id/OIP-C.lmGw9aECIAIIvJK_U92f_gAAAA?w=169&h=180&c=7&r=0&o=5&pid=1.7'
+            }
+        }
+    },
+    computed: {
+        commonTabs() {
+            return [
+                { name: `${this.$t('我的车辆')}`, url: '', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+                { name: `${this.$t('用车人')}`, url: '', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+                { name: `${this.$t('换电套餐')}`, jumpCheck: 'combo', url: '', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+            ]
+        },
+        baseTabs() {
+            const lang = t => this.$t(t)
+            return [
+                { name: `${lang('我的订单')}`, url: '', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+                { name: `${lang('换电记录')}`, url: '', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+                { name: `${lang('关于我们')}`, url: '', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+                { name: `${lang('客服中心')}`, url: '', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+                { name: `${lang('设置')}`, url: '/pages/my/set', icon: 'Fp6G-Kzb-YUGkP2WR-kjTlIbbTj1' },
+            ]
+        }
+    },
+    methods: {
+        checkHandle_combo() {
+            this.comboDialoginfo.showConfirm = true
+        },
+        dialogConfirm(type) {
+            console.log('dialogConfirm', type)
+        },
+        routerLink({ url, jumpCheck }) {
+            if (jumpCheck) {
+                this[`checkHandle_${jumpCheck}`]()
+                return
+            }
+            uni.navigateTo({ url })
+        }
+    }
+}
 </script>
 
-<style>
-	@import './my.css';
+<style lang="scss" scoped>
+@import './my.scss';
 </style>