界面改版第二次上传

app.js

@@ -3,7 +3,7 @@ let wechat = require('./utils/wechat.js');
 let log = require('./utils/log.js');
 App({
   globalData: {
-    postHeadAgreement: 'http://cdgl.pjnes.com',
+    postHeadAgreement: 'https://cdgl.pjnes.com',
     helpPhoneNum: '18211188302',
     version:'2.0'
   },
@@ -48,4 +48,27 @@ App({
       }
     }
   }
+  // "tabBar": {
+  //       "color": "#a9b7b7",
+  //       "selectedColor": "#11cd6e",
+  //       "borderStyle": "black",
+  //       "list": [
+  //     {
+  //             "selectedIconPath": "images/index.png",
+  //           "iconPath": "images/index.png",
+  //             "pagePath": "pages/index/index",
+  //           "text": "首页"  
+
+  //     },
+
+  //     {
+  //            "selectedIconPath": "images/ucenter.png",
+  //            "iconPath": "images/ucenter.png",
+  //            "pagePath": "pages/ucenter/index/index",
+  //            "text": "我的"  
+
+  //     }
+
+  //   ]  
+  // },
 })

app.json

@@ -31,6 +31,7 @@
     "pages/ucenter/chargpilemonitor/chargpilemonitor",
     "pages/ucenter/chargpilemonitor/chargpilemonitorsearch"
   ],
+
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#ffffff",

pages/index/index.json

@@ -1,3 +1,5 @@
 {
-    "navigationBarTitleText": "派捷充电"
+    "navigationBarTitleText": "派捷充电",
+    "usingComponents": {}
+
 }

pages/index/index.wxml

@@ -16,11 +16,12 @@
         </picker>
       </view>
       <cover-view class='map_location' bindtap='click_location_control' hover-class='map_location_hover'>
-        <cover-image src='/images/circle1.png'></cover-image>
+        <cover-image class="circle1_1" src='/images/circle1_1.png'></cover-image>
+        <cover-image class='circle1' src='/images/circle1.png'></cover-image>
       </cover-view>
-      <cover-view class='map_scan' wx:if="{{!userInfo.flag}}" bindtap='click_scan_control'  hover-class='map_scan_hover'>
+      <!-- <cover-view class='map_scan' wx:if="{{!userInfo.flag}}" bindtap='click_scan_control'  hover-class='map_scan_hover'>
         <cover-image src='/images/scan.png' ></cover-image>
-      </cover-view>
+      </cover-view> -->
     </map>
   </view>
 
@@ -64,6 +65,7 @@
     </view>
   </view>
 </view>
+
 <view wx:if='{{!(textData.name)&&showModal&&notice.noticeTitle}}'>
   <view class="modal_box"> 
     <view class="title"><image src='/images/notice.png' />公告</view>
@@ -73,4 +75,10 @@
     </view>
     <view bindtap='Sure' class='Sure' hover-class='hover_sure'>确定</view>
   </view>
+
+</view>
+<view class='footer'>
+  <view class='footer_1' ><image src='/images/index.png'></image><text class='selected'>首页</text></view>
+  <view class='footer_2' bindtap='click_scan_control'><image src='/images/scan.png'></image></view>
+  <view class='footer_3' bindtap='bindUserAvatarUrl'><image src='/images/ucenter.png'></image><text>我的</text></view>
 </view>

pages/index/index.wxss

@@ -55,7 +55,7 @@
 .map_container_big {
   position: absolute;
   top: 89rpx;
-  bottom: 0;
+  bottom: 95rpx;
   left: 0;
   right: 0;
 }
@@ -69,9 +69,22 @@
   position: absolute;
   left: 30rpx;
   bottom: 110rpx;
-  width: 80rpx;
-  height: 80rpx;
-   z-index:999;
+  width: 86rpx;
+  height: 86rpx;
+  z-index:999;
+}
+.map_location .circle1 {
+  width: 38rpx;
+  height: 38rpx;
+  display:block;
+  position: absolute;
+  margin: 24rpx;
+}
+.map_location .circle1_1 {
+  width: 86rpx;
+  height: 86rpx;
+  display:block;
+  position: absolute;
 }
 
 .map_location_hover{
@@ -342,4 +355,70 @@ text.red {
 rich-text{
   word-break:break-all; 
 }
+
+.footer{
+  z-index: 999;
+  width: calc(100% - 100rpx);
+  height: 95rpx;
+  position: absolute;
+  bottom: 0rpx;
+  padding: 0rpx 50rpx;
+  text-align: center;
+  background-color: #fff;
+  /* box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset; */
+  box-shadow: 0rpx 0rpx 10rpx  #dedede;
+  /* margin:30rpx 0rpx; */
+  /* text-overflow: ellipsis;
+  white-space: nowrap; */
+}
+/* .footer text{
+  margin-top: 20rpx;
+} */
+.footer .footer_1{
+  display: inline-block;
+  width: 30%;
+  
+  /* margin:30rpx 0rpx; */
+  /* text-overflow: ellipsis;
+  white-space: nowrap; */
+}
+.footer_1 image{
+  width:42rpx;
+  height: 41rpx;
+  margin-top: 15rpx;
+}
+.footer .footer_2{
+  display: inline-block;
+  width: 40%;
+  /* margin:30rpx 0rpx; */
+  /* text-overflow: ellipsis;
+  white-space: nowrap; */
+}
+.footer_2 image{
+  width:238rpx;
+  height:70rpx;
+}
+.footer .footer_3{
+  display: inline-block;
+  width: 30%;
+  /* margin:30rpx 0rpx; */
+  /* text-overflow: ellipsis;
+  white-space: nowrap; */
+}
+.footer_3 image{
+  margin-top:15rpx;
+  margin-bottom:-10rpx;
+  width:32rpx;
+  height: 49rpx;
+}
+.footer text{
+  font-size: 20rpx;
+  line-height: 20rpx;
+  height: 20rpx;
+  min-height: 20rpx;
+  margin: 0;
+}
+.footer text.selected{
+  color:#fcd943;
+}
 /* 通知相关 end */

pages/ucenter/center/center.json

@@ -1,4 +1,3 @@
 {
-  "navigationBarTitleText": "个人中心",
-  "navigationBarBackgroundColor": "#2483c0"
+  "navigationBarTitleText": "个人信息"
 }

pages/ucenter/center/center.wxml

@@ -1,7 +1,7 @@
 <!--pages/ucenter/center/center.wxml-->
-<view class='title'>
+<!-- <view class='title'>
 
-</view>
+</view> -->
 <view class="container">
   <view class="user_text">
     <!--<open-data class="userAvatarUrl" bindtap="" type='userAvatarUrl'></open-data>-->
@@ -9,6 +9,7 @@
       <image src='{{isLogin&&!userInfo.flag?userInfo.avatar:"/images/userhead.png"}}'></image>
     </view>
     <text class='bold'>{{userInfo.userName}}</text>
+    <text class="edit">更换头像</text>
   </view>
 </view>
 
@@ -17,14 +18,14 @@
     <view class='context_input'>
       <view class='input_view'>
         <view class="input_text_view">
-          <image class='account_img' src='/images/account.png'></image>
+          <!-- <image class='account_img' src='/images/account.png'></image> -->
           <text class="input_text">用户名</text>
         </view>
         <input disabled='true' value='{{userInfo.loginName}}'></input>
       </view>
       <view class='input_view'>
         <view class="input_text_view">
-          <image class='man_img' src='/images/man.png'></image>
+          <!-- <image class='man_img' src='/images/man.png'></image> -->
           <text class="input_text">性别</text>
         </view>
         <input wx:if='{{userInfo.sex==1}}' disabled='true' type='text' placeholder-class='placeholder' value='男'></input>
@@ -36,14 +37,14 @@
       </view>
       <view class='input_view'>
         <view class="input_text_view">
-          <image class='phone_img' src='/images/phone.png'></image>
+          <!-- <image class='phone_img' src='/images/phone.png'></image> -->
           <text class="input_text">电话</text>
         </view>
         <input placeholder='请输入电话' maxlength='11' bindinput='inputPhone' type='number' placeholder-class='placeholder' value='{{phone}}'></input>
       </view>
       <view class='input_view'>
         <view class="input_text_view">
-          <image class='email_img' src='/images/email.png'></image>
+          <!-- <image class='email_img' src='/images/email.png'></image> -->
           <text class="input_text">邮箱</text>
         </view>
         <input placeholder='请输入邮箱' maxlength='48' bindinput='inputEmail' type='text' placeholder-class='placeholder' value='{{email}}'></input>

pages/ucenter/center/center.wxss

@@ -5,47 +5,44 @@ page {
   width: 100%;
 }
 
-.title {
+/* .title {
   background-color: #2483c0;
   width: 100%;
   height: 88rpx;
-}
+} */
 
 .container {
   height: auto;
   overflow: hidden;
-  margin: 0rpx 32rpx;
-  border-bottom: 1rpx solid #f1f1f1;
+  width: 100%;
 }
 
 .user_text {
   width: 100%;
   background: #fff;
-  margin: 40rpx 0rpx;
+  padding: 40rpx;
+  box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
 }
-
 .user_text.active {
   background: #ebebeb;
 }
-
 .userAvatarUrl {
-  height: 70rpx;
-  width: 69rpx;
+  height: 100rpx;
+  width: 100rpx;
   border-radius: 50%;
   display: block;
-  margin: 11rpx 30rpx;
-  float: right;
+  margin: 10rpx 42rpx 10rpx 30rpx;
+  float: left;
   overflow: hidden;
 }
-
 .userAvatarUrl image {
-  height: 70rpx;
-  width: 69rpx;
+  height: 100rpx;
+  width: 100rpx;
 }
 
 text {
   display: block;
-  font-size: 32rpx;
+  font-size: 24rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -53,30 +50,34 @@ text {
                  Geneva,
                  Verdana,
                  sans-serif;
-  color: #545253;
+  color: #434343;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  line-height: 32rpx;
-  height: 32rpx;
-  min-height: 32rpx;
+  line-height: 24rpx;
+  height: 24rpx;
+  min-height: 24rpx;
 }
 
 text.bold {
-  font-size: 48rpx;
-  line-height: 92rpx;
-  height: 92rpx;
-  min-height: 92rpx;
-  margin: 0 0 0rpx 30rpx;
+  width: calc(100% - 172rpx);
+  font-weight:600;
+  font-size: 32rpx;
+  line-height: 120rpx;
+  height: 120rpx;
+  min-height: 120rpx;
+  /* margin: 0rpx 0rpx 0rpx 30rpx; */
 }
 
-.h1 {
+.edit {
+  position: absolute;
+  top: 40rpx;
+  right: 30rpx;
   margin: 0 0 0 30rpx;
   font-size: 24rpx;
-  line-height: 24rpx;
-  height: 24rpx;
-  min-height: 24rpx;
-  color: #959595;
+  line-height: 120rpx;
+  height: 120rpx;
+  min-height: 120rpx;
 }
 
 .main {
@@ -94,41 +95,13 @@ text.bold {
 }
 
 .context_input {
-  margin: 0rpx 32rpx 30rpx 32rpx;
-}
-
-.account_img {
-  width: 26rpx;
-  height: 32rpx;
-  margin: 28rpx 32rpx 28rpx 0;
-}
-
-.password_img {
-  width: 24rpx;
-  height: 30rpx;
-  margin: 29rpx 34rpx 29rpx 0;
-}
-
-.phone_img {
-  width: 24rpx;
-  height: 24rpx;
-  margin: 32rpx 34rpx 32rpx 0;
-}
-
-.email_img {
-  width: 26rpx;
-  height: 20rpx;
-  margin: 34rpx 32rpx 34rpx 0;
-}
-
-.man_img {
-  width: 28rpx;
-  height: 24rpx;
-  margin: 32rpx 30rpx 32rpx 0;
+  /* margin: 0rpx 30rpx 30rpx 42rpx; */
 }
 
 .context_input .input_view {
-  border-bottom: 1rpx solid #f1f1f1;
+  padding: 0rpx 30rpx 0rpx 42rpx; 
+  border-bottom: 2rpx solid #f1f1f1;
+  height: 90rpx;
 }
 
 .input_text_view {
@@ -138,7 +111,7 @@ text.bold {
 
 .input_text {
   display: inline-block;
-  font-size: 32rpx;
+  font-size: 24rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -146,24 +119,24 @@ text.bold {
                  Geneva,
                  Verdana,
                  sans-serif;
-  color: #545253;
+  color: #434343;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  line-height: 88rpx;
-  height: 88rppx;
-  min-height: 88rpx;
+  line-height: 90rpx;
+  height: 90rppx;
+  min-height: 90rpx;
 }
 
 .context_input input {
   width: calc(100% - 158rpx);
   text-align: right;
   display: inline-block;
-  font-size: 32rpx;
-  height: 88rppx;
-  line-height: 88rpx;
-  min-height: 88rpx;
-  color: #c9c9c9;
+  font-size: 24rpx;
+  height: 90rppx;
+  line-height: 90rpx;
+  min-height: 90rpx;
+  color: #999999;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -176,11 +149,11 @@ text.bold {
   width: calc(100% - 158rpx);
   text-align: right;
   display: inline-block;
-  font-size: 32rpx;
-  height: 88rppx;
-  line-height: 88rpx;
-  min-height: 88rpx;
-  color: #c9c9c9;
+  font-size: 24rpx;
+  height: 90rppx;
+  line-height: 90rpx;
+  min-height: 90rpx;
+  color: #999999;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -190,11 +163,11 @@ text.bold {
                  sans-serif;
 }
 .context_input picker text {
-  font-size: 32rpx;
-  height: 88rppx;
-  line-height: 88rpx;
-  min-height: 88rpx;
-  color: #c9c9c9;
+  font-size: 24rpx;
+  height: 90rppx;
+  line-height: 90rpx;
+  min-height: 90rpx;
+  color: #999999;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -205,11 +178,11 @@ text.bold {
 }
 
 .context_input .placeholder {
-  color: #c9c9c9;
-  font-size: 32rpx;
-  height: 88rppx;
-  line-height: 88rpx;
-  min-height: 88rpx;
+  font-size: 24rpx;
+  height: 90rppx;
+  line-height: 90rpx;
+  min-height: 90rpx;
+  color: #999999;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -218,10 +191,9 @@ text.bold {
                  Verdana,
                  sans-serif;
 }
-
-.errorMsg text {
-  height: 28rpx;
-  margin: 0rpx 32rpx 32rpx 30rpx;
+.errorMsg{
+  height: 24rpx;
+  margin: 32rpx 60rpx 32rpx 60rpx;
   font-size: 28rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -234,11 +206,14 @@ text.bold {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+.errorMsg text {
+  color: red;
+} 
 
 .login_button {
-  width: calc(100% - 62rpx);
+  width: calc(100% - 152rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -249,13 +224,16 @@ text.bold {
   color: #fff;
   text-overflow: ellipsis;
   white-space: nowrap;
-  background-color: #3cb8b6;
+  background-color: #00a8dc;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 235rpx 76rpx 0 76rpx;
 }
-
 .login_button_disable {
-  width: calc(100% - 62rpx);
+  width: calc(100% - 152rpx);
   font-size: 32rpx;
-  margin: 0rpx 32rpx;
+  /* margin: 0rpx 32rpx; */
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -267,8 +245,12 @@ text.bold {
   text-overflow: ellipsis;
   white-space: nowrap;
   background-color: #c9c9c9;
+  border-radius: 40rpx;
+  height: 80rpx;
+  border: none;
+  margin: 235rpx 76rpx 0 76rpx;
 }
 
 .login_button.button-hover {
   background-color: #36a9a6;
-}
+}

pages/ucenter/chargemoneylog/chargemoneylog.js

@@ -32,6 +32,10 @@ Page({
         success(res) {
           console.log(res);
           let chargemoneylogs = res.data;
+          for (var i = 0; i < chargemoneylogs.length ; i++){
+            chargemoneylogs[i].rechargeTimeDate = chargemoneylogs[i].rechargeTime.split(" ")[0];
+            chargemoneylogs[i].rechargeTimeTime =chargemoneylogs[i].rechargeTime.split(" ")[1];
+          }
           that.rechargeTimeOrder(chargemoneylogs);
           that.setData({
             chargemoneylogs

pages/ucenter/chargemoneylog/chargemoneylog.json

@@ -1,5 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarBackgroundColor": "#42b9b4",
   "navigationBarTitleText": "充值记录"
 }

pages/ucenter/chargemoneylog/chargemoneylog.wxml

@@ -1,40 +1,22 @@
 <!--pages/ucenter/chargemoneylog/chargemoneylog.wxml-->
-<view class='title'>
+<!-- <view class='title'>
   <text>余额</text>
   <text class='bold'>￥{{userInfo.repaidbalance}}</text>
+</view> -->
+<view class='context_block'>
+  <text class='time'>时间</text>
+  <text class='money'>金额(元)</text>
+  <text class='state'>状态</text>
 </view>
 <scroll-view class='context' scroll-y='true'>
-  <view class='context_block'></view>
-
   <view class="text_context" hover-class='active' data-keywords="{{item}}" wx:key='{{key}}' wx:for="{{chargemoneylogs}}">
-    <!-- <view class="map-1" bindtap="getRoute">
-      <image src="/images/jt.png"></image>
-      <view>路线</view>
-    </view> -->
-    <view class='charging_text_title'>
-      <image class='card' src='/images/card.png'></image>
-      <view class='charging_text_title1'>
-        <text class='bold inline'>{{item.rechargeNumber==null?'未知':item.rechargeNumber}}</text>
-      </view>
-      <image class='car' src='/images/car.png'></image>
-      <view class='charging_text_title1'>
-        <text class='bold inline'>未知</text>
-      </view>
-    </view>
-    <view style='line-height:0;'>
-      <text class='inline'>充值金额：</text>
-      <text class='inline green' wx:if="{{item.type==1}}">+{{item.rechargeMoney}}</text>
-      <text class='inline green' wx:if="{{item.type==2}}">-{{item.rechargeMoney}}</text>
-      <text class='inline'>元</text>
+    <view class="time">
+      <text>{{item.rechargeTimeDate}}</text>
+      <text class="date_time">{{item.rechargeTimeTime}}</text>
     </view>
-    <text>充值时间：{{item.rechargeTime}}</text>
-    <text decode='true' wx:if="{{item.rechargeType=='1'}}">付款类型：预充扣款</text>
-    <text decode='true' wx:if="{{item.rechargeType=='2'}}">付款类型：信用欠款</text>
-    <text decode='true' wx:if="{{item.rechargeType=='3'}}">付款类型：支付宝</text>
-    <text decode='true' wx:if="{{item.rechargeType=='4'}}">付款类型：微信支付</text>
-    <text decode='true' wx:if="{{item.rechargeType=='5'}}">付款类型：银联卡</text>
-    <text decode='true' wx:if="{{item.rechargeType=='6'}}">付款类型：虚拟货币</text>
-    <text>充值后余额：{{item.rechargeBalance==null?'':item.rechargeBalance}}元</text>
+    <text class='money' wx:if="{{item.type==1}}">+{{item.rechargeMoney}}</text>
+    <text class='money' wx:if="{{item.type==2}}">-{{item.rechargeMoney}}</text>
+    <text class='state'>成功</text>
   </view>
   
 

pages/ucenter/chargemoneylog/chargemoneylog.wxss

@@ -1,12 +1,12 @@
 /* pages/ucenter/chargemoneylog/chargemoneylog.wxss */
 
 page {
-  background-color: #f4f4f4;
+  background-color: #fff;
   height: 100%;
   overflow-y: hidden;
 }
 
-.title {
+/* .title {
   background-color: #42b9b4;
   width: 100%;
   height: 88rpx;
@@ -22,9 +22,9 @@ page {
                  sans-serif;
   color: #fff;
   vertical-align: text-bottom;
-}
+} */
 
-.title text {
+/* .title text {
   padding: 0 10rpx 0 0;
   display: inline-block;
   font-size: 24rpx;
@@ -34,70 +34,65 @@ page {
   line-height: 24rpx;
   height: 24rpx;
   min-height: 24rpx;
-}
+} */
 
-.title .bold {
+/* .title .bold {
   font-style: italic;
   font-weight: bold;
   font-size: 28rpx;
   line-height: 28rpx;
   height: 28rpx;
   min-height: 28rpx;
-}
-
-.context {
-  height: calc(100% - 88rpx);
-}
-
+} */
 .context_block {
   width: 100%;
-  height: 32rpx;
-}
-
-.text_context {
-  position: relative;
-  height:281rpx;
-  background: #fff;
-  padding: 0 30rpx;
-  margin: 0 20rpx 32rpx 20rpx;
-  border-radius: 20rpx;
-  box-shadow: 0rpx 4rpx 4rpx #d5d5d5;
-}
-
-.text_context.active {
-  background-color: #ebebeb;
-}
-
-.charging_text_title {
-  height: 105rpx;
-  width: 100%;
+  height: 100rpx;
+  background: #f4f4f4;
   display: flex;
 }
-
-.charging_text_title1 {
+.context_block text{
+  font-size: 28rpx;
+  font-family: 'Lucida Sans',
+                 'Lucida Sans Regular',
+                 'Lucida Grande',
+                 'Lucida Sans Unicode',
+                 Geneva,
+                 Verdana,
+                 sans-serif;
+  color: #434343;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
+  line-height: 100rpx;
+  height: 100rpx;
+  min-height: 100rpx;
 }
-
-image.card {
-  margin: 39rpx 10rpx 39rpx 0;
-  width: 40rpx;
-  height: 27rpx;
+.context_block .time {
   flex-shrink: 0;
-  overflow: hidden;
+  margin-left: 40rpx;
+  width: 300rpx;
+}
+.context_block .money {
+  width: 100%;
+  text-align: right;
+  padding-right: 130rpx;
 }
-image.car {
-  margin: 39rpx 10rpx 39rpx 30rpx;
-  width: 36rpx;
-  height: 26rpx;
+.context_block .state {
   flex-shrink: 0;
-  overflow: hidden;
+  width: 120rpx;
 }
 
-.text_context text {
-  margin: 0 0 20rpx 0;
-  display: block;
+.context {
+  height: calc(100% - 100rpx);
+}
+
+.text_context {
+  position: relative;
+  display: flex;
+  height:120rpx;
+  border-bottom: 2rpx solid #f1f1f1;
+}
+.text_context text{
   font-size: 24rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
@@ -106,28 +101,35 @@ image.car {
                  Geneva,
                  Verdana,
                  sans-serif;
-  color: #545253;
+  color: #434343;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  line-height: 24rpx;
-  height: 24rpx;
-  min-height: 24rpx;
+  line-height: 120rpx;
+  height: 120rpx;
+  min-height: 120rpx;
 }
-
-.text_context .bold {
-  font-size: 28rpx;
-  font-weight: bold;
-  line-height: 45rpx;
-  height: 45rpx;
-  min-height: 45rpx;
-  margin-top: 30rpx;
-  margin-right: 10rpx;
+.text_context .time {
+  flex-shrink: 0;
+  margin-left: 40rpx;
+  width: 300rpx;
 }
-
-text.inline {
-  display: inline-block;
+.text_context .time .date_time {
+  display: block;
+  color:#999999;
+  position: absolute;
+  top: 72rpx;
+  line-height: 32rpx;
+  height: 32rpx;
+  min-height: 32rpx;
 }
-text.green{
-  color: #18b15c;
+.text_context .money {
+  width: 100%;
+  text-align: right;
+  padding-right: 130rpx;
+}
+.text_context .state {
+  flex-shrink: 0;
+  width: 120rpx;
+  color: #16b2ef;
 }

pages/ucenter/index/index.js

@@ -200,6 +200,13 @@ Page({
       url
     });
   },
+  toindex(e) {
+    let url = '/pages/index/index';
+    // wx.reLaunch({
+    //   url
+    // });
+    wx.navigateBack();
+  },
   /*,
   goLogin: function() {
     wx.navigateTo({

pages/ucenter/index/index.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "个人中心",
-  "navigationBarBackgroundColor": "#2483c0"
+  "navigationBarTitleText": "我的",
+  "usingComponents": {}
 }

pages/ucenter/index/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/ucenter/index/index.wxml-->
-<view class='title'>
+<!-- <view class='title'>
 
-</view>
+</view> -->
 <view class="container">
   <view class="user_text" bindtap='{{isLogin?"toUserCenter":"tologin"}}' hover-class='active'>
     <!--<open-data class="userAvatarUrl" bindtap="" type='userAvatarUrl'></open-data>-->
@@ -11,13 +11,36 @@
 
     <text class='bold'>{{isLogin?userInfo.userName:'点击登录'}}</text>
     <text class="h1">{{isLogin?userInfo.loginName:'工作人员登录后进行操作'}}</text>
+    <view class="user_text_zan-ft">
+      <image src='/images/enter.png'></image>
+    </view>
+  </view>
+
+  <view class="context">
+    <view class='context_view' bindtap="goPurse" hover-class='active'>
+      <image class='chargemoney' src='/images/chargemoney.png'></image>
+      <text>我的钱包</text>
+    </view>
+    <view class='context_view' bindtap="goCharginglog" hover-class='active'>
+      <image class='relevance' src='/images/relevance.png'></image>
+      <text>充电记录</text>
+    </view>
+    <view class='context_view' hover-class='active'>
+      <image class='out' src='/images/out.png'></image>
+      <text>优惠券</text>
+    </view>
+    <view class='context_view' hover-class='active'>
+      <image class='exchange' src='/images/exchange.png'></image>
+      <text>积分中心</text>
+    </view>
   </view>
 
   <view class="user-menu">
     <view class="zan-panel">
       <view class="zan-cell" wx:if='{{!userInfo.flag}}' hover-class="active" bindtap="goCharginglog">
-        <view class="zan-icon charginglog">
-          <image src='/images/charginglog.png'></image>
+        <view class="zan-icon">
+          <!-- <image src='/images/charginglog.png'></image> -->
+          <image src='/images/column.png'></image>
         </view>
         <view class="zan-text">
           <text>充电记录</text>
@@ -27,8 +50,9 @@
         </view>
       </view>
       <view class="zan-cell" wx:if='{{!userInfo.flag}}' hover-class="active" bindtap="goChargemoneylog">
-        <view class="zan-icon chargemoneylog">
-          <image src='/images/chargemoneylog.png'></image>
+        <view class="zan-icon">
+          <!-- <image src='/images/chargemoneylog.png'></image> -->
+          <image src='/images/column.png'></image>
         </view>
         <view class="zan-text">
           <text>充值记录</text>
@@ -38,8 +62,9 @@
         </view>
       </view>
       <view class="zan-cell" wx:if='{{!userInfo.flag}}' hover-class="active" bindtap="goPurse">
-        <view class="zan-icon purse">
-          <image src='/images/purse.png'></image>
+        <view class="zan-icon">
+          <!-- <image src='/images/purse.png'></image> -->
+          <image src='/images/column.png'></image>
         </view>
         <view class="zan-text">
           <text>我的钱包</text>
@@ -50,8 +75,9 @@
       </view>
       <!-- 运维用户 -->
       <view class="zan-cell" wx:if='{{userInfo.flag}}' hover-class="active" bindtap="goMyChargeSation">
-        <view class="zan-icon charging3">
-          <image src='/images/charging3.png'></image>
+        <view class="zan-icon">
+          <!-- <image src='/images/charging3.png'></image> -->
+          <image src='/images/column.png'></image>
         </view>
         <view class="zan-text">
           <text>责任场站</text>
@@ -61,8 +87,9 @@
         </view>
       </view>
        <view class="zan-cell" wx:if='{{userInfo.flag}}' hover-class="active" bindtap="goChargpileMonitor">
-        <view class="zan-icon monitor">
-          <image src='/images/monitor.png'></image>
+        <view class="zan-icon">
+          <!-- <image src='/images/monitor.png'></image> -->
+          <image src='/images/column.png'></image>
         </view>
         <view class="zan-text">
           <text>充电桩监控</text>
@@ -72,8 +99,9 @@
         </view>
       </view>
       <view class="zan-cell" wx:if='{{userInfo.flag}}' hover-class="active" bindtap="goMyWorksheet">
-        <view class="zan-icon worksheet">
-          <image src='/images/worksheet.png'></image>
+        <view class="zan-icon">
+          <!-- <image src='/images/worksheet.png'></image> -->
+          <image src='/images/column.png'></image>
         </view>
         <view class="zan-text">
           <text>我的工单</text>
@@ -85,8 +113,9 @@
       <!-- 运维用户 -->
      
       <view class="zan-cell" hover-class="active" bindtap="goNotice">
-        <view class="zan-icon notice">
-          <image src='/images/notice_icon.png'></image>
+        <view class="zan-icon">
+          <!-- <image src='/images/notice_icon.png'></image> -->
+          <image src='/images/column.png'></image>
         </view>
         <view class="zan-text">
           <text>通知公告</text>
@@ -96,8 +125,9 @@
         </view>
       </view>
       <view class="zan-cell" hover-class="active" bindtap="goHelp">
-        <view class="zan-icon help">
-          <image src='/images/help.png'></image>
+        <view class="zan-icon">
+          <!-- <image src='/images/help.png'></image> -->
+          <image src='/images/column.png'></image>
         </view>
         <view class="zan-text">
           <text>帮助中心</text>
@@ -111,7 +141,12 @@
   </view>
   <view class="logout" hover-class="active" wx:if="{{isLogin}}" bindtap="logout">退出账号</view>
 </view>
-<view class='footer' bindtap='phoneCall'>
+<!-- <view class='footer' bindtap='phoneCall'>
   <text class="h1">客服电话：18211188302</text>
   <text class="h1">工作时间：工作日 08:00-17:00</text>
+</view> -->
+<view class='footer'>
+  <view class='footer_1' bindtap="toindex"><image src='/images/index.png'></image><text class='selected'>首页</text></view>
+  <view class='footer_2' ><image src='/images/scan.png'>扫码充电</image></view>
+  <view class='footer_3' ><image src='/images/ucenter.png'></image><text>我的</text></view>
 </view>

pages/ucenter/index/index.wxss

@@ -6,14 +6,8 @@ page {
   background: #f4f4f4;
 }
 
-.title {
-  background-color: #2483c0;
-  width: 100%;
-  height: 88rpx;
-}
-
 .container {
-  background: #f4f4f4;
+  /* background: #f4f4f4; */
   height: auto;
   overflow: hidden;
   width: 100%;
@@ -23,6 +17,7 @@ page {
   width: 100%;
   background: #fff;
   padding: 40rpx;
+  box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset;
 }
 
 .user_text.active {
@@ -30,23 +25,23 @@ page {
 }
 
 .userAvatarUrl {
-  height: 70rpx;
-  width: 69rpx;
+  height: 100rpx;
+  width: 100rpx;
   border-radius: 50%;
   display: block;
-  margin: 11rpx 30rpx;
-  float: right;
+  margin: 10rpx 42rpx 10rpx 30rpx;
+  float: left;
   overflow: hidden;
 }
 
 .userAvatarUrl image {
-  height: 70rpx;
-  width: 69rpx;
+  height: 100rpx;
+  width: 100rpx;
 }
 
 text {
   display: block;
-  font-size: 32rpx;
+  font-size: 24rpx;
   font-family: 'Lucida Sans',
                  'Lucida Sans Regular',
                  'Lucida Grande',
@@ -54,24 +49,28 @@ text {
                  Geneva,
                  Verdana,
                  sans-serif;
-  color: #545253;
+  color: #434343;
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
-  line-height: 32rpx;
-  height: 32rpx;
-  min-height: 32rpx;
+  line-height: 24rpx;
+  height: 24rpx;
+  min-height: 24rpx;
 }
 
 text.bold {
-  font-size: 48rpx;
-  line-height: 48rpx;
-  height: 48rpx;
-  min-height: 48rpx;
-  margin: 0 0 20rpx 30rpx;
+  width: calc(100% - 216rpx);
+  font-weight:600;
+  font-size: 32rpx;
+  line-height: 32rpx;
+  height: 32rpx;
+  min-height: 32rpx;
+  margin: 20rpx 0 20rpx 30rpx;
+  
 }
 
 .h1 {
+  width: calc(100% - 216rpx);
   margin: 0 0 0 30rpx;
   font-size: 24rpx;
   line-height: 24rpx;
@@ -80,33 +79,131 @@ text.bold {
   color: #959595;
 }
 
+.user_text_zan-ft{
+  margin: 0;
+  width: 14rpx;
+  height: 24rpx;
+  display: inline-block;
+  right: 30rpx;
+  top: 93rpx;
+  position: absolute;
+}
+.user_text_zan-ft image{
+  display: block;
+  width: 14rpx;
+  height: 24rpx;
+  /*transform:rotate(180deg);*/
+}
+
 .user-menu {
   width: 100%;
   height: auto;
   overflow: hidden;
-  background: #f4f4f4;
+  background: #fff;
+  margin-top: 20rpx;
+}
+
+
+.context{
+  background: #fff;
+  /* margin-top: 60rpx; */
+  height: 178rpx;
+  width: 100%;
+  text-align: center;
+  min-height: 178rpx;
+  font-family: 'Lucida Sans',
+                 'Lucida Sans Regular',
+                 'Lucida Grande',
+                 'Lucida Sans Unicode',
+                 Geneva,
+                 Verdana,
+                 sans-serif;
+  font-size: 24rpx;
+  color: #434343;
+
+}
+.context_view {
+  width: 25%;
+  /* width: 30%; */
+  height: 178rpx;
+  display: inline-block;
+}
+.context_view.active{
+  background-color: #fafafa;
+}
+
+image.chargemoney {
+  margin: 30rpx 0 20rpx 0;
+  width: 52rpx;
+  height: 52rpx;
+  flex-shrink: 0;
+  overflow: hidden;
+}
+image.relevance {
+  margin: 33rpx 0 20rpx 0;
+  width: 49rpx;
+  height: 49rpx;
+  flex-shrink: 0;
+  overflow: hidden;
+}
+image.out {
+  margin: 30rpx 0 20rpx 0;
+  width: 52rpx;
+  height: 52rpx;
+  flex-shrink: 0;
+  overflow: hidden;
+}
+image.exchange {
+  margin: 40rpx 0 20rpx 0;
+  width: 56rpx;
+  height: 42rpx;
+  flex-shrink: 0;
+  overflow: hidden;
+}
+
+.context text {
+  display: block;
+  font-size: 24rpx;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  line-height: 32rpx;
+  height: 24rpx;
+  min-height: 32rpx;
 }
 
 .zan-panel {
   position: relative;
   background: #fff;
   overflow: hidden;
+  padding-top:10rpx;
 }
 
 .zan-cell {
+  height:80rpx;
   position: relative;
-  padding: 40rpx 30rpx;
+  padding: 0rpx;
+  margin: 0rpx 30rpx 0rpx 40rpx;
   display: flex;
   align-items: center;
+  border-bottom: 2rpx solid #f1f1f1;
 }
 .zan-cell.active {
   background: #ebebeb;
 }
 
 .zan-icon {
-  margin-right: 30rpx;
+  margin:12rpx 0rpx 0rpx -25rpx;
+  width: 68rpx;
+  height: 69rpx;
+}
+.zan-icon image {
+  display: block;
+  width: 68rpx;
+  height: 69rpx;
 }
 
+
 .zan-icon.charginglog {
   width: 36rpx;
   height: 38rpx;
@@ -197,8 +294,6 @@ text.bold {
   width: 28rpx;
   height: 36rpx;
 }
-
-
 .zan-text{
   width:100%;
 }
@@ -213,6 +308,7 @@ text.bold {
   height: 24rpx;
   /*transform:rotate(180deg);*/
 }
+
 .logout {
   margin-top: 20rpx;
   height: 101rpx;
@@ -223,20 +319,72 @@ text.bold {
   color: #666;
   font-size: 14px;
 }
-
 .logout.active {
   background: #ebebeb;
 }
+
 .footer{
-  width: 100%;
+  z-index: 999;
+  width: calc(100% - 100rpx);
+  height: 95rpx;
   position: absolute;
   bottom: 0rpx;
+  padding: 0rpx 50rpx;
   text-align: center;
-  margin:30rpx 0rpx;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+  background-color: #fff;
+  /* box-shadow: 0rpx 6rpx 6rpx  #f5f5f5 inset; */
+  box-shadow: 0rpx 0rpx 10rpx  #dedede;
+  /* margin:30rpx 0rpx; */
+  /* text-overflow: ellipsis;
+  white-space: nowrap; */
+}
+/* .footer text{
+  margin-top: 20rpx;
+} */
+.footer .footer_1{
+  display: inline-block;
+  width: 30%;
+  
+  /* margin:30rpx 0rpx; */
+  /* text-overflow: ellipsis;
+  white-space: nowrap; */
+}
+.footer_1 image{
+  width:42rpx;
+  height: 41rpx;
+  margin-top: 15rpx;
+}
+.footer .footer_2{
+  display: inline-block;
+  width: 40%;
+  /* margin:30rpx 0rpx; */
+  /* text-overflow: ellipsis;
+  white-space: nowrap; */
+}
+.footer_2 image{
+  width:238rpx;
+  height:70rpx;
+}
+.footer .footer_3{
+  display: inline-block;
+  width: 30%;
+  /* margin:30rpx 0rpx; */
+  /* text-overflow: ellipsis;
+  white-space: nowrap; */
+}
+.footer_3 image{
+  margin-top:15rpx;
+  margin-bottom:-10rpx;
+  width:32rpx;
+  height: 49rpx;
 }
 .footer text{
-  margin-top: 20rpx;
+  font-size: 20rpx;
+  line-height: 20rpx;
+  height: 20rpx;
+  min-height: 20rpx;
+  margin: 0;
+}
+.footer text.selected{
+  color:#fcd943;
 }
-

project.config.json

@@ -66,6 +66,20 @@
 					"pathName": "pages/register/register",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": 4,
+					"name": "我的",
+					"pathName": "pages/ucenter/index/index",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "充值记录",
+					"pathName": "pages/ucenter/chargemoneylog/chargemoneylog",
+					"query": "",
+					"scene": null
 				}
 			]
 		}