Quellcode durchsuchen

token过滤和交易记录不能滑动bug修改

wangtao vor 3 Jahren
Ursprung
Commit
e92bb8789e

+ 2 - 1
src/views/amount/index.vue

@@ -127,6 +127,7 @@ export default {
       })
       this.proportionData()
     } else if(localStorage.getItem("user")) {
+      this.fanhui = true
       this.proportionData()
     }else{
       this.fanhui = true;
@@ -223,7 +224,7 @@ export default {
         }else if(this.channelId){
             if (this.env == "WeiXin") {
               console.log("微信环境充值--游客");
-              alert("微信环境充值--游客")
+             
               //微信
               this.loading = true;
               this.pay(this.money,  "W06" ,"2", this.channelId);

+ 36 - 18
src/views/home/index.vue

@@ -41,32 +41,50 @@ export default {
     };
   },
   created(){
-    if(this.getQueryVariable("token")){
+    var url = window.location.href;
+    if(this.getQueryVariable("token") ||  url.indexOf("token") >1 ){
       console.log("app进入")
-      axios({
-        method: 'get',
-        url: 'https://smartpark.caih.com/zkxt/api/thirdparty/v1/user/getZkUserByCipher?cipher=' + "10C5E9787553EBB4962F5299B2C051B4A15F3010563E8B1604213F174397786CA49117EB5658C1965210DDFF56F5E730424B786B2670D78C6EB27DDE9EC42F6376519441B0D1B9FCF70BE7DF9D9813E49C5C8919F7F931CEFCD4BF440CEE3C412ADE7F7C2933FDB7FFBF21D7ECAEE3238C93248038AC77CBE50BB91DA9EB00C4ACCDA4D8F1951F5922F5338BEDEDE723",
-        timeout: 10000,
-      }).then(res =>{
-        //localStorage.setItem("user",res.data.data.id)
-        localStorage.setItem("user", "0001T11000000000V6UQ")
-        if(!localStorage.getItem("balance")){
-          this.cardBalance()
-        }
-      }).catch(err =>{
-        console.log(err)
-      });
+      this.user = "0001T11000000000V6UQ"
       localStorage.removeItem('type');
-      localStorage.removeItem('user');
+      // localStorage.removeItem('user');
+      // axios({
+      //   method: 'get',
+      //   url: 'https://smartpark.caih.com/zkxt/api/thirdparty/v1/user/getZkUserByCipher?cipher=' + "10C5E9787553EBB4962F5299B2C051B4A15F3010563E8B1604213F174397786CA49117EB5658C1965210DDFF56F5E730424B786B2670D78C6EB27DDE9EC42F6376519441B0D1B9FCF70BE7DF9D9813E49C5C8919F7F931CEFCD4BF440CEE3C412ADE7F7C2933FDB7FFBF21D7ECAEE3238C93248038AC77CBE50BB91DA9EB00C4ACCDA4D8F1951F5922F5338BEDEDE723",
+      //   timeout: 10000,
+      // }).then(res =>{
+       
+      //   localStorage.setItem("user", "0001T11000000000V6UQ")
+      //   if(!localStorage.getItem("balance")){
+      //     this.cardBalance()
+      //   }
+      // }).catch(err =>{
+      //   console.log(err)
+      // });
+      localStorage.setItem("user", "0001T11000000000V6UQ")
+      if(!localStorage.getItem("balance")){
+        this.cardBalance()
+      }
+      
     }else if(this.getQueryVariable("type")){
       console.log("扫码游客进入")
       localStorage.removeItem('type');
       localStorage.removeItem('user');
       localStorage.setItem("type",this.type)
     }else{
-      localStorage.removeItem('user');
+      // localStorage.removeItem('user');
+      // localStorage.removeItem('type');
+      // console.log("无user、type进入")
+
+      console.log("app进入")
       localStorage.removeItem('type');
-      console.log("无user、type进入")
+      
+      localStorage.removeItem('user');
+      localStorage.setItem("user", "0001T11000000000V6UQ")
+      this.user = "0001T11000000000V6UQ"
+      if(!localStorage.getItem("balance")){
+        this.cardBalance()
+      }
+     
     }
     // localStorage.setItem("user", "0001T11000000000V6UQ")
     
@@ -108,7 +126,7 @@ export default {
           console.log(err)
         }) 
       }).catch(() => {
-
+        Toast("用户未录入充值系统")
       })
     },
     getQueryVariable(variable){

+ 1 - 1
src/views/recharge/index.vue

@@ -208,7 +208,7 @@ export default {
           "eventType": "com.launchMiniProgram",
           "data": {
               userName: 'gh_e9f7d5c76d18',
-              miniProgramType: 2,
+              miniProgramType: 0,
               path:  `/pages/index/index?money=${this.money}&scene=3&userId=${localStorage.getItem("user")}&channelId=null&openid=null`
             }
       }

+ 3 - 1
src/views/record/index.vue

@@ -283,7 +283,9 @@ export default {
   z-index: 10
 }
 .listData{
-  margin-top:40px
+  margin-top:40px;
+  height:calc(100vh - 10rem);
+  overflow-y: scroll;
 }
 /deep/ .van-list__finished-text{
   margin-bottom:30px !important;

BIN
vuepay/favicon.ico


+ 1 - 0
vuepay/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name="format-detection" content="telephone=yes"><link rel="icon" href="/vuepay/favicon.ico"><script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script><title></title><script></script><link href="/vuepay/static/css/about.28ee1785.css" rel="prefetch"><link href="/vuepay/static/js/about.414cbd5b.js" rel="prefetch"><link href="/vuepay/static/css/app.c691c8f1.css" rel="preload" as="style"><link href="/vuepay/static/css/chunk-vendors.9e9d9b26.css" rel="preload" as="style"><link href="/vuepay/static/js/app.33537d55.js" rel="preload" as="script"><link href="/vuepay/static/js/chunk-vendors.635a522f.js" rel="preload" as="script"><link href="/vuepay/static/css/chunk-vendors.9e9d9b26.css" rel="stylesheet"><link href="/vuepay/static/css/app.c691c8f1.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/vuepay/static/js/chunk-vendors.635a522f.js"></script><script src="/vuepay/static/js/app.33537d55.js"></script></body></html>

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
vuepay/static/css/about.28ee1785.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
vuepay/static/css/app.c691c8f1.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
vuepay/static/css/chunk-vendors.9e9d9b26.css


BIN
vuepay/static/fonts/element-icons.535877f5.woff


BIN
vuepay/static/fonts/element-icons.732389de.ttf


BIN
vuepay/static/img/balance.372c2252.png


BIN
vuepay/static/img/recharge.09054179.png


BIN
vuepay/static/img/record.a43c4fa2.png


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
vuepay/static/js/about.414cbd5b.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
vuepay/static/js/app.33537d55.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
vuepay/static/js/chunk-vendors.635a522f.js


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.