Merge branch 'master' into gczdev

App.vue

@@ -34,6 +34,7 @@
 </script>
 
 <style lang="scss">
+	@import "./static/css/iconfont.css";
 	@import "uview-ui/index.scss";
 	/*每个页面公共css */
 </style>

pages/center/index.vue

@@ -14,20 +14,63 @@
 			</view> -->
 		</view>
 		
+		<view class="u-m-t-20">
+			<u-cell-group>				
+				<u-cell-item title="我的车辆" @click="openPage('pages/myCars/myCars')">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="wodecheliang"></u-icon>
+				</u-cell-item>
+				<u-cell-item title="停车记录" @click="openPage('pages/center/order/order')">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="tingchejilu"></u-icon>
+				</u-cell-item>
+			</u-cell-group>
+		</view>
 		<view class="u-m-t-20">
 			<u-cell-group>
-				<u-cell-item icon="car" title="我的车辆" @click="openPage('pages/myCars/myCars')"></u-cell-item>
-				<u-cell-item icon="order" title="停车记录" @click="openPage('pages/center/order/order')"></u-cell-item>
+				<u-cell-item title="充值" @click="openPage('pages/myCars/myCars')">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="chongzhi"></u-icon>
+				</u-cell-item>
+				<u-cell-item title="包月" @click="openPage('pages/center/order/order')">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="baoyue"></u-icon>
+				</u-cell-item>
+				<u-cell-item title="提现" @click="openPage('pages/center/order/order')">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="tixian"></u-icon>
+				</u-cell-item>
+				<u-cell-item title="退款" @click="openPage('pages/center/order/order')">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="tk"></u-icon>
+				</u-cell-item>
+				<u-cell-item title="账单记录" @click="openPage('pages/center/order/order')">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="zhangdanjilu"></u-icon>
+				</u-cell-item>
 			</u-cell-group>
 		</view>
-		
 		<view class="u-m-t-20">
 			<u-cell-group>
-				<u-cell-item icon="phone" title="手机号登录" @click="openPage('/pages/center/phoneLogin/phoneLogin')"></u-cell-item>
-				<!-- <u-cell-item icon="star" title="微信支付" @click="handlewxpay"></u-cell-item> -->
+				<u-cell-item title="我的优惠" @click="openPage('pages/myCars/myCars')">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="wodeyouhui"></u-icon>
+				</u-cell-item>
+			</u-cell-group>
+		</view>
+		<view class="u-m-t-20">
+			<u-cell-group>
+				<u-cell-item title="发票管理" @click="openPage('pages/myCars/myCars')">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="fapiaoguanli"></u-icon>
+				</u-cell-item>
+			</u-cell-group>
+		</view>
+		<view class="u-m-t-20 u-m-b-40">
+			<u-cell-group>
+				<u-cell-item title="拨打客服电话" @click="phoneCall(phoneNo)">
+					<u-icon slot="icon" custom-prefix="custom-icon" size="35" name="dianhua"></u-icon>
+				</u-cell-item>
 			</u-cell-group>
 		</view>
 		
+		<!-- <view class="u-m-t-20">
+			<u-cell-group>
+				<u-cell-item icon="phone" title="手机号登录" @click="openPage('/pages/center/phoneLogin/phoneLogin')"></u-cell-item>
+			</u-cell-group>
+		</view> -->
+		
 		<u-toast ref="uToast" />
 	</view>
 </template>
@@ -40,6 +83,7 @@
 				pic:'/static/img/default-avatar.png',
 				userInfo:[],
 				code:null,
+				phoneNo:'114',
 				
 			}
 		},
@@ -84,6 +128,11 @@
 					url: 'pages/index/index'
 				});
 			},
+			phoneCall(phone){
+				uni.makePhoneCall({
+				    phoneNumber: phone
+				});
+			}
 
 		}
 	}
@@ -108,5 +157,7 @@ page{background-color: $my-page-bg-color;}
 	}
 }
 .u-avatar{border: 10rpx solid #4CAEFF;}
-.u-cell-box /deep/ .u-cell__left-icon-wrap{color: $my-main-color;}
+.u-cell-box /deep/ .u-cell__left-icon-wrap,
+.u-cell-box /deep/ .custom-icon
+{color: $my-main-color;margin-right: 10rpx;}
 </style>