auto commit

pages/center/index.vue

@@ -44,6 +44,9 @@
 			}
 		},
 		onLoad() {
+			
+		},
+		onShow() {
 			if(this.$store.state.vuex_hasLogin){
 				this.userInfo = this.$store.state.vuex_user;
 				if(this.$store.state.vuex_wxinfo){
@@ -67,9 +70,12 @@
 			},
 			//登录判断
 			login(status){
+				console.log('this.$store.state.vuex_hasLogin',this.$store.state.vuex_hasLogin);
 				if(!status){
 					console.log('config',this.config);
-					window.location.replace(this.config.loginUrl)
+					this.$u.route({
+						url: 'pages/center/phoneLogin/phoneLogin'
+					});
 				}
 			},
 			customBack(){
@@ -85,6 +91,22 @@
 
 <style lang="scss" scoped>
 page{background-color: $my-page-bg-color;}
-.user-box{background-color: $my-main-color;color: #fff;}
+.user-box{
+	position: relative;
+	background-color: $my-main-color;
+	color: #fff;
+	&:after{
+		position: absolute;
+		right: 0;
+		top: -50rpx;
+		content: '';
+		background: url(../../static/img/center-top-bg.png) no-repeat;
+		background-position: -90rpx 0;
+		width: 305rpx;
+		height: 145rpx;
+		z-index: 999;
+	}
+}
 .u-avatar{border: 10rpx solid #4CAEFF;}
+.u-cell-box /deep/ .u-cell__left-icon-wrap{color: $my-main-color;}
 </style>

pages/center/order/order.scss

@@ -43,6 +43,7 @@
 			padding: 0 40rpx 25rpx;
 			border-bottom: 1px solid #DFDFDF;
 			.order-center-item{
+				margin-bottom: 9rpx;
 				font-size: 26rpx;
 				font-weight: 400;
 				color: #595959;

pages/index/index.scss

@@ -18,7 +18,7 @@ page{background-color: $my-page-bg-color;}
 }
 .content-nav{
 	display: flex;
-	justify-content: center;
+	justify-content: space-around;
 	align-items: center;
 	.content-nav-item{
 		.content-nav-item-icon-wrap{
@@ -36,7 +36,7 @@ page{background-color: $my-page-bg-color;}
 		}
 	}
 	.content-nav-item + .content-nav-item{
-		margin-left: 74rpx;
+		// margin-left: 74rpx;
 	}
 }
 .pending-order-head{

pages/index/index.vue

@@ -6,7 +6,7 @@
 				<view class="city-name">{{city}}</view>
 				<u-icon name="arrow-down" color="#fff" size="32"></u-icon>
 			</view>
-			<u-search placeholder="搜索发票、停车场" :show-action="false" @search="handleSearch" v-model="keyword"></u-search>
+			<u-search placeholder="搜索停车点" :show-action="false" @search="handleSearch" v-model="keyword"></u-search>
 			<u-icon class="scan" name="scan" color="#fff" size="48"></u-icon>
 		</view>
 		
@@ -16,25 +16,25 @@
 		
 		<u-card :show-head="false" :show-foot="false" border-radius="16" margin="20rpx 40rpx" padding="30">
 			<view class="content-nav" slot="body">
-				<view class="content-nav-item">
+				<view class="content-nav-item" @click="openPage('pages/center/order/order')">
 					<view class="content-nav-item-icon-wrap">
 						<u-image src="../../static/img/index-content-nav-01.png" width="77rpx" height="75rpx" mode="heightFix"></u-image>
 					</view>
 					<view class="content-nav-item-icon-text">停车缴费</view>
 				</view>
-				<view class="content-nav-item">
+				<view class="content-nav-item" @click="$refs.uToast.show({title: '建设中'})">
 					<view class="content-nav-item-icon-wrap">
 						<u-image src="../../static/img/index-content-nav-02.png" width="77rpx" height="75rpx" mode="heightFix"></u-image>
 					</view>
 					<view class="content-nav-item-icon-text">优惠活动</view>
 				</view>
-				<view class="content-nav-item">
+				<view class="content-nav-item" @click="openPage('pages/myCars/myCars')">
 					<view class="content-nav-item-icon-wrap">
 						<u-image src="../../static/img/index-content-nav-03.png" width="77rpx" height="75rpx" mode="heightFix"></u-image>
 					</view>
 					<view class="content-nav-item-icon-text">车辆管理</view>
 				</view>
-				<view class="content-nav-item">
+				<view class="content-nav-item" @click="$refs.uToast.show({title: '建设中'})">
 					<view class="content-nav-item-icon-wrap">
 						<u-image src="../../static/img/index-content-nav-04.png" width="77rpx" height="75rpx" mode="heightFix"></u-image>
 					</view>
@@ -157,6 +157,12 @@
 			// 		}
 			// 	})
 			// },
+			openPage(path) {
+				console.log('path',path);
+				this.$u.route({ 
+					url: path
+				})
+			},
 			handleSearch(){
 				console.log('this.keyword',this.keyword);
 				this.$u.route({

pages/parkingLists/parkingLists.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="wrap">
-		<u-empty src="http://img.momen.vip/xsfm.jpg" icon-size="360" text="正在建设中" mode="search"></u-empty>
+		<u-empty src="/static/img/empty.png" icon-size="335" text="正在建设中" color="#878787" mode="search"></u-empty>
 	</view>
 </template>
 

uview-ui/components/u-city-select/u-city-select.vue

@@ -193,11 +193,11 @@
 				this.areas = areas[this.province][index];
 				this.tabsIndex = 2;
 				// 只选到市添加以下代码
-				let result = {};
-				result.province = this.provinces[this.province];
-				result.city = this.citys[this.city];
-				this.$emit('city-change', result);
-				this.close();
+				// let result = {};
+				// result.province = this.provinces[this.province];
+				// result.city = this.citys[this.city];
+				// this.$emit('city-change', result);
+				// this.close();
 			},
 			areaChange(index) {
 				this.isChooseA = true;