充值页面、首页调整、充值逻辑调整

src/assets/scss/common.scss

@@ -20,6 +20,7 @@ body {
         z-index: 100;
         .returnWrap {
             font-weight: 500;
+            margin-top: 2px;
             .arrow-left {
                 width: 10px;
             }
@@ -29,7 +30,7 @@ body {
                 line-height: 44px;
                 position: absolute;
                 left: 30px;
-                top: -2px;
+                top: -1px;
             }
         }
         .title {

src/utils/jsencrypt.js

@@ -16,6 +16,15 @@ const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYour
     'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
     'UP8iWi1Qw0Y='
 
+const privateKey3 = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
+    '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
+    'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
+    'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
+    'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
+    'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
+    'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
+    'UP8iWi1Qw0Y='
+
 // 加密
 export function encrypt(txt) {
     const encryptor = new JSEncrypt()

src/views/catering/index.vue

@@ -428,8 +428,7 @@ export default {
             }
         }
     }
-    
-    
+ 
 }
 
 </style>

src/views/home/index.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="mianBox">
-    <van-row class="headerBox">
+    <van-row class="headerBox" style="background:#FF4747">
       智慧楼宇
     </van-row>
+    <van-row class="bgc"></van-row>
     <van-row class="people">
       <van-row class="top">
         <van-row class="left">
@@ -14,47 +15,48 @@
             {{nickName57}}
           </van-row>
           <van-row class="dept">
-            {{dept57}}
+            {{phone57}} / {{dept57}}
           </van-row>
-          <van-row class="phone">{{phone57}}</van-row>
+          <!-- <van-row class="phone">{{phone57}}</van-row> -->
           <van-icon name="arrow"  class="arrowRight"  @click="go"/>
         </van-row>
         <van-row class="bottom">
-          <van-row  >
-            <span  v-loading="loadingBalance">{{balance}}元<br>余额</span>
-          </van-row>
-          <van-row  >
-            <span  v-loading="loadingPlateNumber">{{plateNumber}}<br>车牌信息</span>
-          </van-row>
-          
+          <van-col  span="12">
+            <van-image :src="require('../../assets/image/ic_我的余额.png')" />
+            <van-col  v-loading="loadingBalance" class="text">我的余额：<span >{{balance}}元</span></van-col>
+          </van-col>
+          <van-col  span="12">
+            <van-image :src="require('../../assets/image/ic_车牌.png')" />
+            <van-col  v-loading="loadingPlateNumber" class="text" >已录入车牌信息<span>{{plateNumber}}</span></van-col>
+          </van-col>
         </van-row>
       </van-row>
     </van-row>
     <van-row class="contentBox">
       <van-row class="system">
-        <van-row  type="flex"  gutter="10" class="menu">
+        <van-row  type="flex"  gutter="22" class="menu">
           <!-- <van-col span="6" class="function" @click="sm('https://smartpark.caih.com/h5/#/licence',1)">
             <van-image :src="require('../../assets/image/function/icon2.png')" />
             <div class="title">车牌登记</div>
           </van-col> -->
           <van-col span="6" class="function" @click="ykt">
-            <van-image :src="require('../../assets/image/function/icon3.png')" />
+            <van-image :src="require('../../assets/image/ic_点餐服务.png')" />
             <div class="title">一卡通</div>
           </van-col>
           <!-- <van-col span="6" class="function" @click="sm('https://smartpark.caih.com/h5/#/visitorApply',2)">
-            <van-image :src="require('../../assets/image/function/icon6.png')" />
-            <div class="title">访客申请</div>
+            <van-image :src="require('../../assets/image/ic_访客登记.png')" />
+            <div class="title">访客登记</div>
           </van-col> -->
           <!-- <van-col span="6" class="function" @click="sm('https://smartpark.caih.com/h5/#/safeIndex',3)" v-if="people57 == '1'">
-            <van-image :src="require('../../assets/image/function/icon10.png')" />
+            <van-image :src="require('../../assets/image/ic_综合安防.png')" />
             <div class="title">综合安防</div>
           </van-col> -->
           <!-- <van-col span="6" class="function" @click="dc" >
-            <van-image :src="require('../../assets/image/function/dc.png')" />
+            <van-image :src="require('../../assets/image/ic_配餐服务.png')" />
             <div class="title">点餐服务</div>
           </van-col> -->
           <van-col span="6" class="function" @click="pc" v-if="pcy">
-            <van-image :src="require('../../assets/image/function/pc.png')" />
+            <van-image :src="require('../../assets/image/ic_配餐服务.png')" />
             <div class="title">配餐服务</div>
           </van-col>
           <!-- <van-col span="6" class="function"  v-if="people57 == '1'">
@@ -64,70 +66,62 @@
         </van-row>
       </van-row>
       <van-row class="record">
-        
         <van-row class="recordList">
-          <van-row class="listTitle"><span></span>最近消费记录</van-row>
-          <el-table v-loading="loading2" :data="adminList2" style="margin-top:10px;" :header-cell-style="{background:'#F5F5F5'}" >
-            <el-table-column label="序号" align="left"  show-overflow-tooltip min-width="15%">
-              <template slot-scope="scop">
-                {{scop.$index+1}}
-              </template>
-            </el-table-column>
-            <el-table-column label="消费设备" align="left" prop="termName" show-overflow-tooltip min-width="25%"/>
-            <el-table-column label="金额" align="left" prop="amt" show-overflow-tooltip min-width="22%">
+          <van-row class="recordTitle">
+           <van-col span="16" class="left">最近通行记录</van-col>
+           <!-- <van-col span="8" class="right" >查看更多<van-icon name="arrow"  class="rightIcon" /></van-col> -->
+          </van-row>
+          <el-table v-loading="loading1" :data="adminList1" class="recordTable">
+            <el-table-column label="通行地点" align="left" prop="dmRoomDevice.name" show-overflow-tooltip min-width="50%"/>
+            <el-table-column label="时间" align="left" prop="accessTime" show-overflow-tooltip min-width="50%"/>
+          </el-table>
+        </van-row>
+        <van-row class="recordList">
+          <van-row class="recordTitle">
+           <van-col span="16" class="left">最近消费记录</van-col>
+           <!-- <van-col span="8" class="right" >查看更多<van-icon name="arrow"  class="rightIcon" /></van-col> -->
+          </van-row>
+          <el-table v-loading="loading2" :data="adminList2" class="recordTable">
+            <el-table-column label="食堂设备" align="left" prop="termName" show-overflow-tooltip min-width="30%"/>
+            <el-table-column label="金额" align="left" prop="amt" show-overflow-tooltip min-width="20%">
                <template slot-scope="scop">
                 {{scop.row.amt}}元
               </template>
             </el-table-column>
-            <el-table-column label="时间" align="left" prop="createTime" show-overflow-tooltip min-width="40%"/>
+            <el-table-column label="时间" align="left" prop="createTime" show-overflow-tooltip min-width="50%"/>
           </el-table>
         </van-row>
-        <van-row class="recordList" style="margin-bottom:20px;">
-          <van-row class="listTitle"><span></span>最近访客预约记录</van-row>
-          <el-table v-loading="loading3" :data="adminList3" style="margin-top:10px;" :header-cell-style="{background:'#F5F5F5'}" >
-            <el-table-column label="序号" align="left"  show-overflow-tooltip min-width="15%">
-              <template slot-scope="scop">
-                {{scop.$index+1}}
-              </template>
-            </el-table-column>
-            <el-table-column label="访客名称" align="left" prop="visitor_name" show-overflow-tooltip min-width="40%"/>
-            <el-table-column label="到访时间" align="left" prop="start_time" show-overflow-tooltip min-width="45%"/>
+        <van-row class="recordList"> 
+          <van-row class="recordTitle">
+           <van-col span="16" class="left">最近访客预约记录</van-col>
+           <!-- <van-col span="8" class="right" >查看更多<van-icon name="arrow"  class="rightIcon" /></van-col> -->
+          </van-row>
+          <el-table v-loading="loading3" :data="adminList3"  class="recordTable" >
+            <el-table-column label="访客名称" align="left" prop="visitor_name" show-overflow-tooltip min-width="50%"/>
+            <el-table-column label="到访时间" align="left" prop="start_time" show-overflow-tooltip min-width="50%"/>
           </el-table>
         </van-row>
         
-        <van-row class="recordList" style="margin-bottom:20px;">
-          <van-row class="listTitle"><span></span>最近停车记录</van-row>
-          <el-table v-loading="loading4" :data="adminList4" style="margin-top:10px;" :header-cell-style="{background:'#F5F5F5'}" class="tableScroll">
-            <el-table-column label="序号" align="left"  show-overflow-tooltip min-width="15%">
-              <template slot-scope="scop">
-                {{scop.$index+1}}
-              </template>
-            </el-table-column>
-            <el-table-column label="车牌号" align="left" prop="plate_number" show-overflow-tooltip min-width="25%"/>
-            <el-table-column label="方向" align="left" prop="" show-overflow-tooltip min-width="15%">
+        <van-row class="recordList">
+          <van-row class="recordTitle">
+           <van-col span="16" class="left">最近停车记录</van-col>
+           <!-- <van-col span="8" class="right" >查看更多<van-icon name="arrow"  class="rightIcon" /></van-col> -->
+          </van-row>
+          <el-table v-loading="loading4" :data="adminList4" class="recordTable">
+            <el-table-column label="车牌号" align="left" prop="plate_number" show-overflow-tooltip min-width="30%"/>
+            <el-table-column label="方向" align="left" prop="" show-overflow-tooltip min-width="20%">
               <template slot-scope="scop">
                 {{scop.row.ingatename ? "进":"出"}}
               </template>
             </el-table-column>
-            <el-table-column label="时间" align="left" prop="" show-overflow-tooltip min-width="45%">
+            <el-table-column label="时间" align="left" prop="" show-overflow-tooltip min-width="50%">
               <template slot-scope="scop">
                 {{scop.row.intime ? scop.row.intime:scop.row.outtime}}
               </template>
             </el-table-column>
           </el-table>
         </van-row>
-        <van-row class="recordList">
-          <van-row class="listTitle"><span></span>最近通行记录</van-row>
-          <el-table v-loading="loading1" :data="adminList1" style="margin-top:10px;" :header-cell-style="{background:'#F5F5F5'}" >
-            <el-table-column label="序号" align="left"  show-overflow-tooltip min-width="15%">
-              <template slot-scope="scop">
-                {{scop.$index+1}}
-              </template>
-            </el-table-column>
-            <el-table-column label="通行地点" align="left" prop="dmRoomDevice.name" show-overflow-tooltip min-width="40%"/>
-            <el-table-column label="时间" align="left" prop="accessTime" show-overflow-tooltip min-width="45%"/>
-          </el-table>
-        </van-row>
+        
       </van-row>
     </van-row>
     <van-loading
@@ -322,6 +316,7 @@ export default {
       }else{
         this.loading2 = false
       }
+      console.log(this.adminList2[0])
     })
     //访客查询
     
@@ -444,18 +439,36 @@ export default {
     padding-top: 44px;
     box-sizing: border-box;
     background-color: #F9F9F9;
+    .bgc{
+      height: 110px;
+      position: relative;
+      z-index: 0;
+      overflow: hidden;
+      margin-top:-2px;
+    }
+    .bgc::after{
+      content: '';
+      width: 120%;
+      height: 110px;
+      position: absolute;
+      z-index: 0;
+      left: -10%;     //椭圆左边隐藏10%，右边隐藏10%
+      top: 0;
+      border-radius: 0 0 200% 200%;  //左上角，右上角，右下角，左下角
+      background-image: linear-gradient(180deg, #FF4747 0%, #D7000F 100%);
+    }
     .people{
       width:100%;
-      padding:15px 15px 20px 15px;
+      padding:0px 15px 0;
       box-sizing: border-box;
-      background-color: #F22E3C;
-      overflow-x: hidden;
+      margin-top:-92px;
+      background-color: #fff;
       .top{
         margin-top:0;
         position: relative;
         .left{
-          width:80px;
-          height:80px;
+          width:64px;
+          height:64px;
           background-color: #fff;
           border-radius: 50%;
           display: inline-block;
@@ -464,8 +477,8 @@ export default {
           position: relative;
           .upload{
             position: absolute;
-            width:90px;
-            height:80px;
+            width:80px;
+            height:70px;
             overflow: hidden;
             top:0px;
             opacity:0;
@@ -473,8 +486,8 @@ export default {
             background: transparent;
           }
           .portrait{
-            width:76px;
-            height:76px;
+            width:60px;
+            height:60px;
             margin:2px;
             vertical-align: middle;
             ::v-deep .van-image__img{
@@ -488,9 +501,16 @@ export default {
           vertical-align: top;
           .name{
             margin:10px 0 6px;
+            font-size: 18px;
           }
           .dept{
             margin-bottom:6px;
+            font-size: 13px;
+            white-space: nowrap;
+            /* 超出隐藏 */
+            overflow: hidden;
+            /* 文本超出显示成... */
+            text-overflow: ellipsis;
           }
           .arrowRight{
             display: inline-block;
@@ -499,78 +519,136 @@ export default {
             position: absolute;
             z-index: 2;
             right:-10px;
-            top:22%;
+            top:12%;
           }
         }
         .bottom{
           font-size: 14px;
-          margin-top:10px;
-          .van-row{
-            width:50%;
+          margin-top:60px;
+          padding-bottom:20px;
+          .van-image{
+            width:50px;
+            vertical-align: middle;
+            display: inline-block;
+            float:left;
+            margin-right:14px;
+          }
+          .text{
+            vertical-align: middle;
             text-align: center;
             display: inline-block;
-            line-height: 25px;
+            font-size: 13px;
+            color:#666666;
+            margin-top:2px;
+            span{
+              font-size: 18px;
+              color:#333333;
+              font-weight: 700;
+              display: block;
+              margin-top:4px;
+            }
           }
         }
       }
     }
+    
     .contentBox{
       width: 100%;
-      height: auto;
-      
-      overflow: hidden;
+      margin-top:8px;
       .system{
         width:100%;
         background-color: #fff;
-        padding: 15px;
+        padding: 4px 16px 10px;
         box-sizing: border-box;
         .function{
-          width:20%;margin:10px 2.5%;
+          margin:12px 0;
           .title{
-            font-size: 12px;
-            color:#000;
+            font-size: 14px;
+            color:#333333;
             text-align: center;
-            margin-top:6px;
-            width:70px;
+            margin-top:-2px;
           }
           .van-image{
-            width:70px;
           }
 
         }
       }
       .record{
+        background-color: #F9F9F9;
         .recordList{
-          margin-top:10px;
-        padding: 10px;
-        box-sizing: border-box;
-        background-color: #fff;
-          .listTitle{
-            font-size: 14px;
-            color:#000;
-            span{
-              width:4px;
-              height:14px;
-              display: inline-block;
-              background-color: #F22E3C;
-              margin-right:4px;
+          margin-top:8px;
+            .recordTitle{
+            font-size: 18px;
+            height:48px;
+            line-height: 48px;
+            padding: 0 15px;
+            background-color: #fff;
+            box-shadow: inset 0px -1px 0px 0px rgba(232,232,232,1);
+            .left{
+              font-size: 15px;
+              font-weight: 700;
+              text-align: left;
+              color:#333;
+            }
+            .right{
+              text-align: right;
+              font-size: 14px;
+              color:#666666;
+              vertical-align: middle;
+              .rightIcon{
+                width:6px;
+                margin:-2px 0 0 5px;
+                vertical-align: middle;
+              }
             }
-            
-
-            
           }
         }
       }
     }
 }
-.el-table th>.cell{
-  font-size: 11px;
-}
+
+
 
 </style>
 <style>
+.recordTable  .cell{
+  color:#999999 !important;
+}
+
+.el-table td{
+  padding:0;
+}
+.el-table td, .el-table th{
+  padding:0 !important;
+}
+.recordTable th>.cell{
+  /* height:48px;
+  line-height: 48px; */
+  font-size: 15px;
+  color:#666;
+  padding:0 15px;
+}
+th{
+  height:40px;
+  line-height: 40px;
+}
+tr{
+  height:48px;
+  line-height: 48px;
+}
+.el-table__body-wrapper tr td>.cell{
+  padding:0 15px;
+  box-sizing: border-box;
+}
+tr:nth-child(even){
+  background-color: #fff;
+}
+tr:nth-child(odd){
+  background-color: #F9F9F9;
+}
 .el-table td, .el-table th{
   padding:4px 0 !important;
+  color:#666;
 }
 .el-loading-mask{
   background-color: transparent !important;
@@ -586,11 +664,11 @@ export default {
   z-index: 10;
   background-color: blue;
 }
-.el-table .cell{
+/* .el-table .cell{
   padding-right:0;
 }
 .tableScroll{
   overflow-x:scroll;
-}
+} */
 </style>
 

src/views/information/index.vue

@@ -269,19 +269,20 @@ export default {
     box-sizing: border-box;
     background-color: #F7F7F7;
     .my{
-      width:96%;
+     
       margin:0 auto;
       height:calc(100% - 44px);
       overflow-y:scroll;
       .msg{
-        height:50px;
-        line-height: 50px;
+        padding:0 15px;
+        height:46px;
+        line-height: 46px;
         border-bottom:1px solid #ccc;
         text-align: center;
         .left{
           width:50%;
           text-align: left;
-          color:#000;
+          color:#333333;
           display: inline-block;
           vertical-align: middle;
         }

src/views/login/index.vue

@@ -102,7 +102,7 @@ export default {
   mounted() {
 
     document.title = '中国东信智慧园区'
-    //Cookies.set("openid57",'o5P6I5tLj-TjrK7leWUT8EFmTCa4') //本地测试
+    Cookies.set("openid57",'o5P6I5tLj-TjrK7leWUT8EFmTCa4') //本地测试
     if(Cookies.get('rememberMe57')){
       this.loginForm.rememberMe = Boolean(Cookies.get('rememberMe57'))
     }
@@ -185,8 +185,8 @@ export default {
     },
     login_info() {
       if(Cookies.get("openid57") && Cookies.get("username57") && Cookies.get("password57")){
-        window.location.href = "https://smartpark.caih.com/vuepay2/#/home"
-        //this.$router.push({ path: `/home`}) 
+        //window.location.href = "https://smartpark.caih.com/vuepay2/#/home"
+        this.$router.push({ path: `/home`}) 
       }else{
         this.$refs.loginForm.validate(valid => {
           if (valid) {
@@ -216,7 +216,6 @@ export default {
                     Cookies.set("dept57", data.user.dept.name, { expires: 300 });
                     Cookies.set("phone57", data.user.dmUser.contacts, { expires: 300 });
                     Cookies.set("people57", 0, { expires: 300 });
-                    // Cookies.set("orderingFood57", 0, { expires: 300 });
                     
                     axios.put('/dxtop/staff', {
                       id:data.userId,
@@ -242,8 +241,8 @@ export default {
                           }
                         }
                         setTimeout(()=>{
-                          //this.$router.push({ path: `/home`}) 
-                          window.location.href = "https://smartpark.caih.com/vuepay2/#/home"
+                          this.$router.push({ path: `/home`}) 
+                          //window.location.href = "https://smartpark.caih.com/vuepay2/#/home"
                         },200)
                      })
                     })

src/views/orderingFood/index.vue

@@ -138,7 +138,6 @@ export default {
       Toast("没有获取token信息")
     }
     
-    
   },
   mounted(){
     //获取菜单

src/views/recharge/index.vue

@@ -74,26 +74,7 @@ export default {
       document.title = '中国东信智慧园区'
     }
 
-    // 监听
-    let uas = navigator.userAgent;
-    let _this = this
-    if(uas.indexOf('iPhone') > -1){
-      // 监听APP的传过来的消息
-      window.addEventListener('message', function (e) {
-          /*
-          * e.data 是APP返回的JSON字符串，字段：
-          * eventType 事件类型
-          * source    来源
-          * data      业务参数 - 返回数据放这里
-          * */
-          _this.appMessage(e)
-
-      })
-    }else{
-      window.document.addEventListener('message', function (e) {
-          _this.appMessage(e)
-      })
-    }
+   
         
   },
   created() {

src/views/record/index.vue

@@ -1,8 +1,12 @@
 <template>
   <div class="mianBox">
-    <van-row class="headerBox">
-      <van-icon name="arrow-left" @click="$router.go(-1)" />
-      交易记录
+    <van-row class="headerBox" >
+      <van-col class="returnWrap" @click="$router.go(-1)">
+        <van-image class="arrow-left"
+          :src="require('../../assets/image/left.png')"
+        />
+      </van-col>
+      <van-col class="title">{{title}}</van-col>
     </van-row>
     <van-tabs
       v-model="active"
@@ -11,17 +15,22 @@
       line-width="60px"
       @click="tab"
     >
-    <div class="timeSelectWrap">
-      <p class="start" @click="start(1)">{{startTime2}}</p> ~
-      <p class="end" @click="end(2)">{{endTime2}}</p>
-      <van-icon name="search"  @click="search" class="searchIcon"/>
-    </div>
+      <div class="line"></div>
+      <div class="timeSelecContent" :class="timeSelecContent ? 'timeSelecContentSlide' : ''">
+        <div class="timeSelectWrap">
+          <p class="start" @click="start(1)">{{startTime2}}</p> ~
+          <p class="end" @click="end(2)">{{endTime2}}</p>
+          <van-image class="searchIcon" @click="search"
+              :src="require('../../assets/image/search.png')"
+            />
+        </div>
+      </div>
       <van-tab title="充值记录">
-        <div class="listHeight">
+        <div class="listHeight"  @touchstart="handleTouchstart" @touchend="handleTouchend">
           <van-list
             v-model="loading"
             :finished="finished"
-            finished-text="没有更多了"
+            finished-text="没有更多数据了"
             @load="onLoad"
             :style="height"
             class="listData"
@@ -47,11 +56,11 @@
         </div>
       </van-tab>
       <van-tab title="消费记录">
-        <div class="listHeight">
+        <div class="listHeight"  @touchstart="handleTouchstart" @touchend="handleTouchend">
           <van-list
             v-model="loading"
             :finished="finished"
-            finished-text="没有更多了"
+            finished-text="没有更多数据了"
             @load="onLoad"
             class="listData"
             :immediate-check="false"
@@ -110,6 +119,7 @@ import Cookies from "js-cookie";
 export default {
   data() {
     return {
+      title:"交易记录",
       minDate: new Date(2022, 1, 1),
       maxDate: new Date(2099, 12, 31),
       currentDate: new Date(),
@@ -136,12 +146,28 @@ export default {
       isref:true,
       starTime:undefined,
       endTime:undefined,
-      userId:undefined
+      userId:undefined,
+      timeSelecContent:false,
+      yStart:undefined,
+      yEnd:undefined
     };
   },
+  // watch:{
+  //   $route(to,form) {
+  //     console.log(this.$refs.allScrollTop.scrollTop)
+  //   }
+  // },
   components: {
     [Toast.name]: Toast,
   },
+  mounted(){
+    // if(Cookies.get("userId57")){//公众号途径
+    //   document.title = '中国东信智慧园区'
+    // }
+    // document.querySelector("ch").addEventListener('scroll',this.handleScroll)
+    // document.querySelector("xf").addEventListener('scroll',this.handleScroll)
+    // window.addEventListener('scroll', this.handleScroll, true); 
+  },
   created() {
     this.startTime2 = getMonthStartDate(),
     this.endTime2 =  getDateStrNowDay(),
@@ -173,13 +199,65 @@ export default {
       this.finished = true
     }
   },
-  mouted(){
-    if(Cookies.get("userId57")){//公众号途径
-      document.title = '中国东信智慧园区'
-    }
-  },
+
   
   methods: {
+     handleTouchstart(event){
+      this.startTime = Date.now()
+      // this.startX = event.changedTouches[0].clientX
+      // this.startY = event.changedTouches[0].clientY
+      this.yStart = event.changedTouches[0].clientY
+    },
+    //手指离开屏幕
+    handleTouchend(event){
+      const endTime = Date.now()
+      // const endX = event.changedTouches[0].clientX
+      //const endY = event.changedTouches[0].clientY
+      this.yEnd = event.changedTouches[0].clientY
+      if(this.yEnd<this.yStart){
+        this.timeSelecContent = true
+      }else{
+        this.timeSelecContent = false
+      }
+      //判断按下的时长
+      // if(endTime - this.startTime >2000){
+      //   return
+      // }
+      //滑动的方向
+      // let direction = "";
+      // //先判断用户滑动的距离，是否合法，合法:判断滑动的方向 注意 距离要加上绝对值
+      // if(Math.abs(endX -this.startX)>10){
+      //   //滑动方向
+      //   if(Math.abs(endY -this.startY)>30){
+      //     // console.log("y方向偏移太多，不让你滑了")
+      //     return
+      //   }else{
+      //     direction = endX -this.startX >0?"right":"left"
+      //   }
+      // }else{
+      //   return
+      // }
+      // //用户做了合法的滑动操作
+      // // console.log('方向'+direction)
+      // if(direction==='left'){
+      //   if(this.currents+1===this.list.length){
+      //     return
+      //   }else{
+      //     this.currents++
+      //     //触发事件
+      //     // this.$emit('getData')
+      //   }
+      // }
+      // if(direction==='right'){
+      //   if(this.currents===0){
+      //     return
+      //   }else{
+      //     this.currents--
+      //     //触发事件
+      //     // this.$emit('getData')
+      //   }
+      // }
+    },
     // 标准日转化为年月日
     transformTime(date){
       let data = new Date(date);
@@ -386,86 +464,115 @@ export default {
   overflow-y: hidden;
   font-family: "Helvetica Neue", Helvetica, STHeiTi, sans-serif;
   letter-spacing: 1px;
-}
-.listBoxCell {
-  height: 75px;
-  width: 100%;
-  padding: 10px 10px 10px;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px solid rgba(237, 237, 237, 1);
-  .jlName {
-    font-size: 16px;
-    color: #000;
-  }
-  .jlTime {
-    margin-top: 5px;
-    font-size: 13px;
-    color: #ccc;
-  }
-  .jlBalance {
-    margin-top: 5px;
-    font-size: 13px;
-    color: #000;
-    display: block;
-    text-align: right;
+  .type{
+    height:48px !important;
+    line-height: 48px !important;
+    background-color: #fff;
+
   }
-  .jlMoney {
-    text-align: right;
-    font-size: 16px;
+  .line{
+    width:100%;
+    height:1px;
+    border-bottom: 1px solid rgba(232,232,232,1);
   }
-  .jlMoney.just {
-    color: rgba(56, 129, 253, 1);
-    text-align: right;
+  .timeSelecContent{
+    width:100%;
+    padding-bottom:0.5px;
+    position: absolute;
+    z-index: 100;
+    background-color: #fff;
+    .timeSelectWrap{
+      width:calc(100% - 52px);
+      margin:8px;
+      overflow: hidden;
+      background-color: #fff;
+      border:1px solid  rgba(204,204,204,1);
+      border-radius: 4px;
+      height:36px;
+      line-height: 36px;
+      position: relative;
+      padding:0px 16px;
+      .start{
+        display: inline-block;
+        font-size: 15px;
+        line-height: 30px;
+        width:28%;
+      }
+      .end{
+        display: inline-block;
+        font-size: 15px;
+        width:28%;
+        margin-left:5px;
+      }
+      .search{
+        background-color: rgba(242, 46, 60, 1);
+        border-radius: 6px;
+        margin-top:-2px;
+        color:#fff;
+        width:10%;
+        
+      }
+      .searchIcon{
+        width:18px;
+        position: absolute;
+        top:10px;
+        right:10px;
+      }
+    }
   }
-  .jlMoney.negative {
-    color: rgba(242, 46, 60, 1);
-    text-align: right;
+  .timeSelecContentSlide{
+    box-shadow: 0px 4px 6px 0px rgba(0,0,0,0.06) !important;
   }
-}
-.van-list {
-  overflow-y: auto;
-}
-.timeSelectWrap{
-  width:calc(100% - 20px);
-  margin:10px;
-  overflow: hidden;
-  background-color: #fff;
-  border:1px solid #ccc;
-  border-radius: 20px;
-  height:35px;
-  line-height: 35px;
-  position: relative;
-  .start{
-    display: inline-block;
-    font-size: 16px;
-    line-height: 30px;
-    margin-left:15px;
-    width:30%;
+  
+  .listBoxCell {
+    height: 81px;
+    line-height:20px;
+    width: 100%;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    padding: 0 15px;
+    .jlName {
+      font-size: 15px;
+      text-align: left;
+      margin-top: 4px;
+    }
+    .jlTime {
+      margin-top: 8px;
+      font-size: 14px;
+      color: #999999;
+      text-align: left;
+    }
+    .jlBalance {
+      font-size: 14px;
+      color: #999999;
+      text-align: right;
+      margin-top:8px;
+    }
+    .jlMoney {
+      text-align: right;
+      font-size: 16px;
+      
+    }
+    .negative{
+      color:#D7000F ;
+    }
+    .just{
+      color:#0091FF
+    }
   }
-  .end{
-    display: inline-block;
-    font-size: 16px;
-    width:30%;
-    margin-left:10px;
+  .listBoxCell:nth-child(even){
+    background-color: #fff;
   }
-  .search{
-    background-color: rgba(242, 46, 60, 1);
-    border-radius: 6px;
-    margin-top:-2px;
-    color:#fff;
-    width:10%;
-    
+  .listBoxCell:nth-child(odd){
+    background-color: #F9F9F9;
   }
-  .searchIcon{
-    color:rgba(242, 46, 60, 1);
-    font-size: 24px;
-    position: absolute;
-    top:6px;
-    right:10px;
+  .van-list {
+    overflow-y: auto;
   }
 }
+
+
 .timeSelect2{
   width:100%;
   height:30%;
@@ -491,8 +598,8 @@ export default {
 }
 
 .listHeight{
-  margin-top:10px;
-  height:78vh;
+  margin-top:55px;
+  height:calc(100vh - 128px);
   width:100%;
   overflow: hidden;
   padding-bottom:50px;
@@ -507,9 +614,15 @@ export default {
 <style>
 
 .van-tab__text--ellipsis{
-  font-size: 16px !important;
+  font-size: 15px !important;
 }
 .van-tabs__line{
-  width:187px !important
+  width:65px !important
+}
+.van-list__finished-text{
+  font-size: 12px !important;
+  height:80px;
+  line-height: 80px;
+  text-align: center;
 }
 </style>

src/views/result/index.vue

@@ -1,18 +1,22 @@
 <template>
     <div class="mianBox" >
         <van-row class="headerBox">
-            <van-icon name="arrow-left" @click="$router.go(-2)" />
-            充值结果
+          <van-col class="returnWrap" @click="$router.go(-2)">
+            <van-image class="arrow-left"
+              :src="require('../../assets/image/left.png')"
+            />
+          </van-col>
+          <van-col class="title">{{title}}</van-col>
         </van-row>
         <div v-if="result">
             <img src="../../assets/image/success.png" alt="" class="result">
             <van-row class="text">支付完成</van-row>
-            <van-button   type="danger" @click="$router.go(-2)" class="fanhui">返 回</van-button>
+            <van-button   type="danger" @click="$router.go(-2)" class="fanhui">返回APP</van-button>
         </div>
         <div v-if="!result">
             <img src="../../assets/image/fail.png" alt="" class="result">
             <van-row class="text">支付失败</van-row>
-            <van-button  type="danger" @click="$router.go(-1)" class="fanhui">返 回</van-button>
+            <van-button  type="danger" @click="$router.go(-1)" class="fanhui">返回APP</van-button>
         </div>
     </div>
         
@@ -22,6 +26,7 @@ export default {
   data() {
     return {
       result:undefined,
+      title:"充值结果"
     };
   },
 
@@ -34,9 +39,6 @@ export default {
         }
     }
   },
-  methods: {
-    
-  }
 }
 </script>
 
@@ -44,7 +46,7 @@ export default {
 .mianBox {
   width: 100vw;
   height: 100vh;
-  padding:20px;
+  padding:44px 15px 0;
   color: #000;
   box-sizing: border-box;
   overflow-y: hidden;
@@ -53,20 +55,21 @@ export default {
   text-align: center;
   position: relative;
   .result{
-      width:30%;
-      margin:50px 35% 0;
+      width:100px;
+      margin:70px auto 0;
   }
   .text{
-    font-size: 16px;
-    margin:10px auto;
+    font-size: 18px;
+    margin:16px auto 0;
+    font-weight: 700;
   }
   .fanhui{
       width:100%;
       margin-top:60px;
       height: 40px;
-      border-radius: 10px;
+      border-radius: 5px;
       font-size: 16px;
-      
+      font-weight: 700;
   }
 }
 </style>