小程序返回参数接收是修复

src/App.vue

@@ -5,6 +5,7 @@
 </template>
 
 <style lang="scss">
+
 #app {
   width: 100%;
   height: 100%;
@@ -44,3 +45,16 @@ body {
     margin:auto;
 }
 </style>
+<style>
+.el-loading-mask{
+  background-color: transparent;
+}
+.el-loading-spinner .path{
+  stroke:rgb(255, 255, 255)!important;
+}
+/* .van-loading__text,.van-loading__circular{
+  stroke:rgba(242, 46, 60, 1) !important;
+  color:rgba(242, 46, 60, 1) !important;
+} */
+
+</style>

src/views/amount/index.vue

@@ -7,10 +7,10 @@
     <template v-if="erp">
       <!-- 充值 -->
       <div class="recharge" v-if="erp">
-        <div class="cardId" >
+        <div class="cardId" v-loading="cardLoading">
           <van-col span="12">卡号：<span style="color:#000">{{cardId}}</span></van-col>
         </div>
-        <div class="balance" >
+        <div class="balance" v-loading="balanceLoading">
           <van-col span="12">余额：<span style="color:rgba(242, 46, 60, 1)">{{cardBalance ? cardBalance : '0.00'}}</span>元</van-col>
         </div>
         <van-row class="rechargeInput" style="padding-top: 10px">
@@ -117,9 +117,8 @@
         <van-row class="recordTitle">
            <van-col span="16" class="left">交易记录</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-row class="list" v-loading="listLoading">
           <van-list
               class="listData"
               :immediate-check="false"
@@ -146,7 +145,7 @@
         v-if="loadingErp"
         color="#fff"
         vertical
-        style="z-index: 999999; position: fixed; top: 40%; left: 0; right: 0"
+        style="z-index: 999999; position: fixed; top: 40%; left: 0; right: 0;color:rgba(242, 46, 60, 1) !important"
         >加载中...</van-loading
       >
       <van-overlay :show="loadingErp" style="z-index: 100; position: fixed" />
@@ -184,7 +183,10 @@ export default {
       noMore: false,
       finished: false,
       recordList:[],
-      cardId:undefined
+      cardId:undefined,
+      cardLoading:true,
+      balanceLoading:true,
+      listLoading:true,
     };
   },
   watch: {
@@ -201,7 +203,6 @@ export default {
     [Toast.name]: Toast,
   },
   created() {
-    
     var url = window.location.href;
     if(url.indexOf("token") > 1){
       //("app进入")
@@ -288,7 +289,7 @@ export default {
   },
   methods: {
 
-  //用户查询
+  //用户查询(卡号)
     userQuery(){
       axios({//查询信息
         method: 'get',
@@ -305,9 +306,10 @@ export default {
             }
             if(res2.data.data){
               localStorage.setItem("user_wt", res.data.data.id)
-              // localStorage.setItem("user_wt", "0001T110000000002HBL") //测试
+              // localStorage.setItem("user_wt", "0001T110000000002HBL") //测试id
               localStorage.setItem("cardId", res2.data.data.cardId)
               this.cardId = res2.data.data.cardId
+              this.cardLoading = false
               this.Balance()
               this.recharge2()
             }else{
@@ -363,9 +365,11 @@ export default {
           }else{
             this.cardBalance = "0.00"
           }
+          this.balanceLoading = false
         })
       }else{
         this.cardBalance = "0.00"
+        this.balanceLoading = false
       }
     },
     //交易记录
@@ -387,6 +391,7 @@ export default {
           if(res.data.data.total>5){
             this.more = true
           }
+          this.listLoading = false
         } else {
           this.noMore = true
         }
@@ -740,7 +745,7 @@ export default {
         float: left;
         width: 28%;
         box-sizing: border-box;
-        border:1px solid transparent;
+        border:1px solid rgba(242, 46, 60, 1) !important;
         overflow: hidden;
       }
       & > .van-col.active {
@@ -825,6 +830,7 @@ export default {
         margin-top: 20px;
         float: left;
         width: 28%;
+        border:1px solid rgba(242, 46, 60, 1) !important;
       }
       & > .van-col.active {
         background: #F22E3C;
@@ -979,4 +985,12 @@ export default {
   }
 }
 
+</style>
+<style>
+.el-loading-mask{
+  background-color: transparent;
+}
+.el-loading-spinner .path{
+  stroke:rgb(255, 255, 255)!important
+}
 </style>

src/views/home/index.vue

@@ -20,11 +20,11 @@
           <van-icon name="arrow"  class="arrowRight"  @click="go"/>
         </van-row>
         <van-row class="bottom">
-          <van-row v-loading="loadingBalance" >
-            <span v-if="balance">{{balance}}元<br>余额</span>
+          <van-row  >
+            <span v-if="balance" v-loading="loadingBalance">{{balance}}元<br>余额</span>
           </van-row>
-          <van-row v-loading="loadingPlateNumber" >
-            <span v-if="plateNumber">{{plateNumber}}<br>已经录入车牌</span>
+          <van-row  >
+            <span v-if="plateNumber" v-loading="loadingPlateNumber">{{plateNumber}}<br>已经录入车牌</span>
           </van-row>
           
         </van-row>
@@ -93,7 +93,7 @@
             <el-table-column label="到访时间" align="left" prop="start_time" show-overflow-tooltip min-width="45%"/>
           </el-table>
         </van-row>
-        <!-- <van-row class="recordList" style="margin-bottom:20px;">
+        <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 >
@@ -105,8 +105,10 @@
             <el-table-column label="入场车道" align="left" prop="visitor_name" show-overflow-tooltip />
             <el-table-column label="出场时间" align="left" prop="start_time" show-overflow-tooltip />
             <el-table-column label="出场车道" align="left" prop="visitor_name" show-overflow-tooltip />
+            <el-table-column label="停车时长" align="left" prop="visitor_name" show-overflow-tooltip />
+            <el-table-column label="停车费用" align="left" prop="visitor_name" show-overflow-tooltip />
           </el-table>
-        </van-row> -->
+        </van-row>
       </van-row>
     </van-row>
     <van-loading
@@ -252,27 +254,27 @@ export default {
         Toast(err.response.data.message)
     })
     //停车记录
-    // axios.post(`https://smartpark.caih.com/ykt/api/thirdparty/v1/openInterface/getParkingTraffic?page=0&size=10&sort=id,desc`, 
-    // {
-    //   "nonce": Cookies.get("nonce57"),
-    //   "timestamp": Cookies.get("timestamp57"),
-    //   "query": {
-    //     "userNumber":Cookies.get("userId57"),
-    //   }
-    // },
-    // {headers: {
-    //     "XYTACCESSTOKEN":Cookies.get("token57")
-    //   }
-    // }).then(res => {
-    //     if(res?.data?.data?.content){
-    //       this.adminList1 = res.data.data.content.slice(0,5)
-    //       this.loading1 = false
-    //     }else{
-    //       this.loading1 = false
-    //     }
-    //   }).catch(err =>{
-    //     Toast(err.response.data.message)
-    // })
+    axios.post(`https://smartpark.caih.com/ykt/api/thirdparty/v1/openInterface/getParkingTraffic?page=0&size=10&sort=id,desc`, 
+    {
+      "nonce": Cookies.get("nonce57"),
+      "timestamp": Cookies.get("timestamp57"),
+      "query": {
+        "userNumber":Cookies.get("userId57"),
+      }
+    },
+    {headers: {
+        "XYTACCESSTOKEN":Cookies.get("token57")
+      }
+    }).then(res => {
+        if(res?.data?.data?.content){
+          this.adminList1 = res.data.data.content.slice(0,5)
+          this.loading1 = false
+        }else{
+          this.loading1 = false
+        }
+      }).catch(err =>{
+        Toast(err.response.data.message)
+    })
     // 消费记录
     axios.post(`/dxtop/dish/page`,{
       "size":10,

src/views/recharge/index.vue

@@ -110,9 +110,9 @@ export default {
       switch (res.eventType) {
           case "com.launchMiniProgram": { // 小程序返回·
               // Do Something ...
-              if(res.errCode == "0"){
+              if(res.data.extMsg == "appData"){
                 this.$router.push({ path: "/result",query: {id: 0}})
-              }else if(res.errCode == "1"){
+              }else if(res.data.extMsg == "appData2"){
                   this.$router.push({ path: "/result",query: {id: 1}})
               }else{
                 

src/views/record/index.vue

@@ -63,7 +63,6 @@
               </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-row>