意见修改

src/views/amount/index.vue

@@ -7,9 +7,12 @@
     <template v-if="erp">
       <!-- 充值 -->
       <div class="recharge" v-if="erp">
-        <van-row class="balance" >
+        <div class="cardId" >
+          <van-col span="12">卡号：<span style="color:#000">{{cardId}}</span></van-col>
+        </div>
+        <div class="balance" >
           <van-col span="12">余额：<span style="color:rgba(242, 46, 60, 1)">{{cardBalance ? cardBalance : '0.00'}}</span>元</van-col>
-        </van-row>
+        </div>
         <van-row class="rechargeInput" style="padding-top: 10px">
           <div class="jg">
             <span class="jgLabel">￥</span>
@@ -113,7 +116,8 @@
       <div class="record" v-if="erp">
         <van-row class="recordTitle">
            <van-col span="16" class="left">交易记录</van-col>
-           <van-col  class="right" @click="record">更多</van-col>
+           <van-icon name="arrow"  class="right" @click="record"/>
+           <!-- <van-col  class="right" @click="record">更多</van-col> -->
         </van-row>
         <van-row class="list">
           <van-list
@@ -128,6 +132,7 @@
                 <van-col span="10" class="jlMoney negative">
                   <van-row class="jlBalance2" v-if="item.type==1">- {{ item.amt }}元</van-row>
                   <van-row class="jlMoney just" v-if="item.type==3">+ {{ item.amt }}元</van-row>
+                  <van-row class="jlBalance2" v-if="item.type==1001">+ {{ Math.abs(item.amt) }}元</van-row>
                   <van-row class="jlBalance" style="color:#000">余额：{{ item.balance }} 元</van-row></van-col>
               </van-row>
           </van-list>
@@ -161,14 +166,14 @@ export default {
       show: false,
       loading: false,
       overlayShow: false,
-      money: "0",
+      money: 0,
       env: null, //识别是否为扫描用户进入,以便直接进入支付跳转
-      state1: "color:#000;background: #EBEBEB;",
-      state2: "color:#000;background: #EBEBEB;",
-      state3: "color:#000;background: #EBEBEB;",
-      state4: "color:#000;background: #EBEBEB;",
-      state5: "color:#000;background: #EBEBEB;",
-      state6: "color:#000;background: #EBEBEB;",
+      state1: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state2: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state3: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state4: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state5: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
+      state6: "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);",
       channelId: undefined,
       fanhui: false,
       proportion:0,//到账比例
@@ -178,7 +183,8 @@ export default {
       more: false,
       noMore: false,
       finished: false,
-      recordList:[]
+      recordList:[],
+      cardId:undefined
     };
   },
   watch: {
@@ -301,6 +307,7 @@ export default {
               localStorage.setItem("user_wt", res.data.data.id)
               // localStorage.setItem("user_wt", "0001T110000000002HBL") //测试
               localStorage.setItem("cardId", res2.data.data.cardId)
+              this.cardId = res2.data.data.cardId
               this.Balance()
               this.recharge2()
             }else{
@@ -367,7 +374,7 @@ export default {
       axios.post(`/dxtop/charge/cordPage`,{
         "startTime":undefined, 
         "endTime":undefined,
-        "size":5,
+        "size":10,
         "current":1,
         "userId":localStorage.getItem("user_wt")
       }).then(res => {
@@ -402,12 +409,12 @@ export default {
       }
     },
     handleInput(key) {
-      (this.state1 = "color:#000;background: #EBEBEB;"),
-        (this.state2 = "color:#000;background: #EBEBEB;"),
-        (this.state3 = "color:#000;background: #EBEBEB;"),
-        (this.state4 = "color:#000;background: #EBEBEB;"),
-        (this.state5 = "color:#000;background: #EBEBEB;"),
-        (this.state6 = "color:#000;background: #EBEBEB;"),
+      (this.state1 = "color:#000;background: #fff;"),
+        (this.state2 = "color:#000;background: #fff;"),
+        (this.state3 = "color:#000;background: #fff;"),
+        (this.state4 = "color:#000;background: #fff;"),
+        (this.state5 = "color:#000;background: #fff;"),
+        (this.state6 = "color:#000;background: #fff;"),
         (this.money = this.money + "");
       if (this.money === "" && key === ".") {
         this.money = "0";
@@ -603,56 +610,56 @@ export default {
     },
     btn50() {
       (this.state1 = "color:#fff;background:rgba(242, 46, 60, 1);"),
-        (this.state2 = "color:#000;background: #EBEBEB;"),
-        (this.state3 = "color:#000;background: #EBEBEB;"),
-        (this.state4 = "color:#000;background: #EBEBEB;"),
-        (this.state5 = "color:#000;background: #EBEBEB;"),
-        (this.state6 = "color:#000;background: #EBEBEB;"),
+        (this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
         (this.money = 50);
     },
     btn100() {
-      (this.state1 = "color:#000;background: #EBEBEB;"),
-        (this.state2 = "color:#fff;background: rgba(242, 46, 60, 1);"),
-        (this.state3 = "color:#000;background: #EBEBEB;"),
-        (this.state4 = "color:#000;background: #EBEBEB;"),
-        (this.state5 = "color:#000;background: #EBEBEB;"),
-        (this.state6 = "color:#000;background: #EBEBEB;"),
+      (this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state2 = "color:#fff;background: #F22E3C;"),
+        (this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
         (this.money = 100);
     },
     btn150() {
-      (this.state1 = "color:#000;background: #EBEBEB;"),
-        (this.state2 = "color:#000;background: #EBEBEB;"),
-        (this.state3 = "color:#fff;background: rgba(242, 46, 60, 1);"),
-        (this.state4 = "color:#000;background: #EBEBEB;"),
-        (this.state5 = "color:#000;background: #EBEBEB;"),
-        (this.state6 = "color:#000;background: #EBEBEB;"),
+      (this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state3 = "color:#fff;background: #F22E3C;"),
+        (this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
         (this.money = 150);
     },
     btn200() {
-      (this.state1 = "color:#000;background: #EBEBEB;"),
-        (this.state2 = "color:#000;background: #EBEBEB;"),
-        (this.state3 = "color:#000;background: #EBEBEB;"),
-        (this.state4 = "color:#fff;background: rgba(242, 46, 60, 1);"),
-        (this.state5 = "color:#000;background: #EBEBEB;"),
-        (this.state6 = "color:#000;background: #EBEBEB;"),
+      (this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state4 = "color:#fff;background: #F22E3C;"),
+        (this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
         (this.money = 200);
     },
     btn250() {
-      (this.state1 = "color:#000;background: #EBEBEB;"),
-        (this.state2 = "color:#000;background: #EBEBEB;"),
-        (this.state3 = "color:#000;background: #EBEBEB;"),
-        (this.state4 = "color:#000;background: #EBEBEB;"),
-        (this.state5 = "color:#fff;background: rgba(242, 46, 60, 1);"),
-        (this.state6 = "color:#000;background: #EBEBEB;"),
+      (this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state5 = "color:#fff;background: #F22E3C;"),
+        (this.state6 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
         (this.money = 250);
     },
     btn300() {
-      (this.state1 = "color:#000;background: #EBEBEB;"),
-        (this.state2 = "color:#000;background: #EBEBEB;"),
-        (this.state3 = "color:#000;background: #EBEBEB;"),
-        (this.state4 = "color:#000;background: #EBEBEB;"),
-        (this.state5 = "color:#000;background: #EBEBEB;"),
-        (this.state6 = "color:#fff;background: rgba(242, 46, 60, 1);"),
+      (this.state1 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state2 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state3 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state4 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state5 = "color:#000;background: #fff;border:1px solid rgba(242, 46, 60, 1);"),
+        (this.state6 = "color:#fff;background: #F22E3C;"),
         (this.money = 300);
     },
   },
@@ -678,7 +685,22 @@ export default {
     background-color: #fff;
     .balance {
       font-size: 16px;
-      margin: 10px 0;
+      margin: 12px 0 2px;
+      display: inline-block;
+      width:50%;
+      text-align: right;
+      .van-col{
+        width:100%;
+      }
+    }
+    .cardId {
+      font-size: 16px;
+      margin: 12px 0 2px;
+      display: inline-block;
+      width:50%;
+      .van-col{
+        width:100%;
+      }
     }
     .rechargeInput {
       width: 100%;
@@ -709,17 +731,20 @@ export default {
       margin-top: 0px;
       & > .van-col {
         padding: 10px 0;
-        background-color: #EBEBEB;
+        background-color: #fff;
         color: #000;
         text-align: center;
         font-size: 16px;
-        border-radius: 6px;
+        border-radius: 2px;
         margin-top: 20px;
         float: left;
         width: 28%;
+        box-sizing: border-box;
+        border:1px solid transparent;
+        overflow: hidden;
       }
       & > .van-col.active {
-        background: rgba(242, 46, 60, 1);
+        background: #F22E3C;
         color: #fff;
       }
       & > .van-col:nth-child(3n-1),
@@ -739,8 +764,9 @@ export default {
       }
     }
     .tip {
-      font-size: 14px;
+      font-size: 13px;
       color: #ccc;
+      line-height: 20px;
     }
      .van-button {
       margin-top:20px;
@@ -758,7 +784,10 @@ export default {
     .balance {
       font-size: 16px;
       margin: 10px 0;
+      display: inline-block;
+      width:50%;
     }
+    
     .rechargeInput {
       width: 100%;
       // height: 100%;
@@ -798,7 +827,7 @@ export default {
         width: 28%;
       }
       & > .van-col.active {
-        background: rgba(242, 46, 60, 1);
+        background: #F22E3C;
         color: #fff;
       }
       & > .van-col:nth-child(3n-1),
@@ -851,7 +880,8 @@ export default {
         position: absolute;
         right:0;
         text-align: right;
-        border-bottom:2px solid  #333;
+        font-size: 20px;
+        color:#808080;
       }
     }
     .list{
@@ -872,17 +902,17 @@ export default {
         align-items: center;
         border-bottom: 1px solid rgba(237, 237, 237, 1);
         .jlName {
-          font-size: 14px;
+          font-size: 16px;
           color: #000;
         }
         .jlTime {
           margin-top: 10px;
-          font-size: 12px;
+          font-size: 13px;
           color: #ccc;
         }
         .jlBalance {
           margin-top: 5px;
-          font-size: 14px;
+          font-size: 13px;
           color: rgba(242, 46, 60, 1);
         }
         .jlBalance2 {
@@ -925,27 +955,27 @@ export default {
 
 @media screen and (min-height:550px) and (max-height:570px){
    .list{
-      height:170px;
+      height:120px;
   }
 }
 @media screen and (min-height:600px) and (max-height:650px){
    .list{
-      height:196px;
+      height:166px;
   }
 }
 @media screen and (min-height:651px) and (max-height:670px){
    .list{
-      height:205px;
+      height:155px;
   }
 }
 @media screen and (min-height:680px) and (max-height:740px){
    .list{
-      height:225px;
+      height:175px;
   }
 }
 @media screen and (min-height:800px){
    .list{
-      height:330px;
+      height:300px;
   }
 }
 

src/views/login/index.vue

@@ -208,7 +208,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 });
-                
                   axios.put('/dxtop/staff', {
                     id:data.userId,
                     openId:Cookies.get("openid57")

src/views/recharge/index.vue

@@ -86,12 +86,12 @@ export default {
           * source    来源
           * data      业务参数 - 返回数据放这里
           * */
-          //_this.appMessage(e)
+          _this.appMessage(e)
 
       })
     }else{
       window.document.addEventListener('message', function (e) {
-          //_this.appMessage(e)
+          _this.appMessage(e)
       })
     }
         
@@ -112,8 +112,10 @@ export default {
               // Do Something ...
               if(res.errCode == "0"){
                 this.$router.push({ path: "/result",query: {id: 0}})
-              }else{
+              }else if(res.errCode == "1"){
                   this.$router.push({ path: "/result",query: {id: 1}})
+              }else{
+                
               }
               break
           }

src/views/record/index.vue

@@ -33,12 +33,15 @@
               v-for="(item, index) in recharge"
               :key="index"
             >
-              <van-col span="18">
+              <van-col span="14">
                 <van-row class="jlName">{{ item.shopName }}</van-row>
                 <van-row class="jlTime">时间：{{ item.createTime }}</van-row>
-                <van-row class="jlBalance">余额：{{ item.balance }} 元</van-row>
               </van-col>
-              <van-col span="6" class="jlMoney just">{{ item.amt }}元</van-col>
+              <van-col span="10">
+                <div  class="jlMoney just">{{ item.amt }}元</div>
+                <div class="jlBalance">余额：{{ item.balance }} 元</div>
+              </van-col>
+              
             </van-row>
           </van-list>
         </div>
@@ -54,16 +57,18 @@
             :immediate-check="false"
           >
             <van-row class="listBoxCell" v-for="(item, index) in consumption" :key="index">
-              <van-col span="18">
-                <van-row class="jlName">{{ item.shopName }}</van-row>
-                <van-row class="jlTime">时间：{{ item.createTime }}</van-row>
-                <van-row class="jlBalance">余额：{{ item.balance }} 元</van-row>
+              <van-col span="14">
+                <div class="jlName">{{ item.shopName }}</div>
+                <div class="jlTime">时间：{{ item.createTime }}</div>
+              </van-col>
+              <van-col span="10">
+                <div class="jlMoney negative">  {{ item.amt>0 ? '-'  + item.amt : '+' + Math.abs(item.amt)}}元</div>
+                
+                <div class="jlBalance">余额：{{ item.balance }} 元</div>
               </van-col>
-              <van-col span="6" class="jlMoney negative"> - {{ item.amt }}元</van-col>
             </van-row>
           </van-list>
         </div>
-
       </van-tab>
     </van-tabs>
     
@@ -392,18 +397,20 @@ export default {
   align-items: center;
   border-bottom: 1px solid rgba(237, 237, 237, 1);
   .jlName {
-    font-size: 14px;
+    font-size: 16px;
     color: #000;
   }
   .jlTime {
     margin-top: 5px;
-    font-size: 12px;
+    font-size: 13px;
     color: #ccc;
   }
   .jlBalance {
     margin-top: 5px;
-    font-size: 14px;
-    color: rgba(242, 46, 60, 1);
+    font-size: 13px;
+    color: #000;
+    display: block;
+    text-align: right;
   }
   .jlMoney {
     text-align: right;
@@ -411,9 +418,11 @@ export default {
   }
   .jlMoney.just {
     color: rgba(56, 129, 253, 1);
+    text-align: right;
   }
   .jlMoney.negative {
     color: rgba(242, 46, 60, 1);
+    text-align: right;
   }
 }
 .van-list {
@@ -452,10 +461,10 @@ export default {
   }
   .searchIcon{
     color:rgba(242, 46, 60, 1);
-    font-size: 30px;
+    font-size: 24px;
     position: absolute;
-    top:4px;
-    right:15px;
+    top:6px;
+    right:10px;
   }
 }
 .timeSelect2{
@@ -484,7 +493,7 @@ export default {
 
 .listHeight{
   margin-top:10px;
-  height:72vh;
+  height:78vh;
   width:100%;
   overflow: hidden;
   padding-bottom:50px;
@@ -495,64 +504,13 @@ export default {
   }
 }
 
-/deep/ .van-list__finished-text{
-  margin-bottom:30px !important;
-}
-// @media screen and (max-width:374px){
-//   .timeSelect{
-//     position: absolute; 
-//     top: 86px; 
-//   }
-//   .listData{
-//     margin-top:70px
-//   }
-// }
-// @media screen and (max-width:350px){
-//   .timeSelect{
-//     position: absolute; 
-//     top: 84px; 
-//   }
-// }
-// @media screen and (min-width:410px){
-//   .listData{
-//     margin-top:60px
-//   }
-// }
-
-// @media screen and (min-height:550px) and (max-height:570px){
-//    .timeSelectWrap{
-//       top:16%;
-//   }
-// }
-// @media screen and (min-height:600px) and (max-height:650px){
-//    .timeSelectWrap{
-//       top:18%;
-//   }
-// }
-// @media screen and (min-height:651px) and (max-height:670px){
-//   .timeSelectWrap{
-//       top:15%;
-//   }
-// }
-// @media screen and (min-height:680px) and (max-height:740px){
-//   .timeSelectWrap{
-//       top:15%;
-//   }
-// }
-// @media screen and (min-height:800px){
-//   .timeSelectWrap{
-//       top:13%;
-//   }
-// }
 </style>
 <style>
-/* .van-cell__title, .van-cell__value{
-  flex:none
-}
-.van-cell__value{
-  margin-left:20px
-} */
+
 .van-tab__text--ellipsis{
   font-size: 16px !important;
 }
+.van-tabs__line{
+  width:187px !important
+}
 </style>