token修改

src/plugins/axios.js

@@ -3,10 +3,10 @@ import { Notify } from "vant";
 import Vue from 'vue';
 import axios from "axios";
 // Full config:  https://github.com/axios/axios#request-config
-//axios.defaults.baseURL = 'https://wx.ewoogi.com/dxapi/';
-//axios.defaults.baseURL = 'http://172.16.120.104:8085/'; //本地
+
+axios.defaults.baseURL = 'http://172.16.120.104:8085/'; //本地
 //axios.defaults.baseURL = 'https://qhome.usky.cn/dxapi/'; //75
-axios.defaults.baseURL = 'https://smartpark.caih.com/dxapi'; //东信部署
+//axios.defaults.baseURL = 'https://smartpark.caih.com/dxapi'; //东信部署
 // axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || '';
 // axios.defaults.headers.common['Authorization'] = AUTH_TOKEN;
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';

src/views/amount/index.vue

@@ -136,10 +136,10 @@ export default {
   methods: {
     proportionData(){
       if(localStorage.getItem("user")){
-        axios.get(`/dxtop/staff/one`,{params:{"id":"0001T11000000000V6UQ"}}).then(res => {//res.msg
-        console.log(res)
+        axios.get(`/dxtop/staff/one`,{params:{"id":localStorage.getItem("user")}}).then(res => {//res.msg
+          console.log(res)
           if(res.data.data.proportion){
-            this.proportion = Number(1 - res.data.data.proportion) .toFixed(2)
+            this.proportion = Number(1 - res.data.data.proportion).toFixed(2)
           }
         }).catch(err=>{
           console.log(err)

src/views/balance/index.vue

@@ -30,16 +30,28 @@ export default {
   mounted() {},
   created(){
     let _this = this
-    if(localStorage.getItem("balance")){
-      this.balance = localStorage.getItem("balance")
-      this.createdTime = "更新时间：" + localStorage.getItem("getBalanceTime")
-    }else{
+    // if(localStorage.getItem("balance")){
+    //   this.balance = localStorage.getItem("balance")
+    //   this.createdTime = "更新时间：" + localStorage.getItem("getBalanceTime")
+    // }else{
+    //   var time = function (){
+    //     if(localStorage.getItem("balance")){
+    //       _this.balance = localStorage.getItem("balance")
+    //       _this.createdTime = "更新时间：" + localStorage.getItem("getBalanceTime")
+    //       clearInterval(val)
+    //     }
+    //     _this.num++
+    //     if(_this.num>15){
+    //       clearInterval(val)
+    //       _this.balance = "查询失败"
+    //       _this.createdTime = "更新时间：" + getNowTime()
+    //     }
+    //   }
+    //   var val = setInterval(time,1000)
+    // }
+
+    
       var time = function (){
-        if(localStorage.getItem("balance")){
-          _this.balance = localStorage.getItem("balance")
-          _this.createdTime = "更新时间：" + localStorage.getItem("getBalanceTime")
-          clearInterval(val)
-        }
         _this.num++
         if(_this.num>15){
           clearInterval(val)
@@ -47,9 +59,8 @@ export default {
           _this.createdTime = "更新时间：" + getNowTime()
         }
       }
+      _this.cardBalance()
       var val = setInterval(time,1000)
-    }
-    
   },
   methods: {
     shuaxin(){
@@ -58,43 +69,46 @@ export default {
     cardBalance(){
       this.balance = undefined
       let _this = this
-      // axios.get('/dxtop/staff/one?id=0001T11000000000V6UQ' + localStorage.getItem("user")).then(res => {
-      axios.get('/dxtop/staff/one?id=0001T11000000000V6UQ').then(res => {
-        axios.get(`/dxtop/staff/cardBalance`,{params:{"card":res.data.data.cardId}}).then(res2 => { //res.data.data.cardId
+      axios.get(`/dxtop/staff/one?id=${localStorage.getItem("user")}`).then(res => {
+        if(res.data?.data?.cardId){
+          axios.get(`/dxtop/staff/cardBalance`,{params:{"card":res.data.data.cardId}}).then(res2 => { //res.data.data.cardId
           let msgFlag =undefined
-          axios.get(`/dxtop/msglog/one`,{params:{"id":res2.data.msg}}).then(res3 => {//res.msg
-              msgFlag = res3.data.data.msgFlag
-              let num = 0
-              var time = function (){
-                axios.get(`/dxtop/msglog/one`,{params:{"id":res2.data.msg}}).then(res4 => {//res.msg
-                    if(res4.data.data.msgFlag ==4){
-                      var data = JSON.parse(res4.data.data.consequence)
-                      if(data.code == 1){
-                        _this.balance = Number(data.balance).toFixed(2)
-                        localStorage.setItem("getBalanceTime",getNowTime())
-                        _this.createdTime = "更新时间：" + localStorage.getItem("getBalanceTime")
-                        clearInterval(val)
+            axios.get(`/dxtop/msglog/one`,{params:{"id":res2.data.msg}}).then(res3 => {//res.msg
+                msgFlag = res3.data.data.msgFlag
+                let num = 0
+                var time = function (){
+                  axios.get(`/dxtop/msglog/one`,{params:{"id":res2.data.msg}}).then(res4 => {//res.msg
+                      if(res4.data.data.msgFlag ==4){
+                        var data = JSON.parse(res4.data.data.consequence)
+                        if(data.code == 1){
+                          _this.balance = Number(data.balance).toFixed(2)
+                          localStorage.setItem("getBalanceTime",getNowTime())
+                          _this.createdTime = "更新时间：" + localStorage.getItem("getBalanceTime")
+                          clearInterval(val)
+                        }
                       }
-                    }
-                })
-                num+=2
-                console.log("余额加载秒数",num)
-                if(num>14){
-                  _this.balance = "查询失败"
-                  localStorage.setItem("getBalanceTime",getNowTime())
-                  _this.createdTime = "更新时间：" + localStorage.getItem("getBalanceTime")
-                  clearInterval(val)
-                  
+                  })
+                  num+=2
+                  console.log("余额加载秒数",num)
+                  if(num>14){
+                    _this.balance = "查询失败"
+                    localStorage.setItem("getBalanceTime",getNowTime())
+                    _this.createdTime = "更新时间：" + localStorage.getItem("getBalanceTime")
+                    clearInterval(val)
+                    
+                  }
                 }
-              }
-              var val = setInterval(time,2000)
+                var val = setInterval(time,2000)
+            }).catch(err=>{
+              console.log(err)
+            })
           }).catch(err=>{
             console.log(err)
           })
-          
-        }).catch(err=>{
-          console.log(err)
-        }) 
+        }else{
+          Toast("卡号不存在")
+        }
+         
       }).catch(() => {
 
       })

src/views/home/index.vue

@@ -5,21 +5,21 @@
       一卡通
     </van-row>
     <van-row class="contentBox">
-      <van-row @click="$router.push('/balance')" v-if="user">
+      <van-row @click="balance" v-if="user">
         <van-image
           :src="require('../../assets/image/balance.png')"
         />
         <van-col :span="24">账户余额</van-col>
         <van-col :span="24">个人账户余额信息</van-col>
       </van-row>
-      <van-row @click="$router.push('/amount')">
+      <van-row @click="amount">
         <van-image
           :src="require('../../assets/image/recharge.png')"
         />
         <van-col :span="24">充值</van-col>
         <van-col :span="24">对余额进行充值</van-col>
       </van-row>
-      <van-row @click="$router.push('/record')" v-if="user">
+      <van-row @click="record" v-if="user">
         <van-image
           :src="require('../../assets/image/record.png')"
         />
@@ -33,6 +33,7 @@
 <script>
 import axios from "axios";
 import { getNowTime } from "@/assets/js/dataFormate";
+import { Toast } from "vant";
 export default {
   data() {
     return {
@@ -41,60 +42,58 @@ export default {
     };
   },
   created(){
+    localStorage.removeItem('type');
+    localStorage.removeItem('user');
     var url = window.location.href;
-    if(this.getQueryVariable("token") ||  url.indexOf("token") >1 ){
+    if(url.indexOf("token") >1){
       console.log("app进入")
-      this.user = "0001T11000000000V6UQ"
-      localStorage.removeItem('type');
-      // 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()
-      }
-      
+      // this.getQueryVariable("token") = "0001T11000000001QZAE"
+      // if(this.getQueryVariable("token")){
+      //   axios({//查询信息
+      //     method: 'get',
+      //     url: 'https://smartpark.caih.com/zkxt/api/thirdparty/v1/user/getZkUserByCipher?cipher=' + this.getQueryVariable("token"),
+      //     timeout: 10000,
+      //   }).then(res =>{
+      //     if(res.data?.data?.id){
+      //       axios.get(`/dxtop/staff/one?id=${res.data.data.id}`).then(res2 => { //验证充值信息是否同步
+      //         if(res2.data.data){
+                this.user = "0001T11000000001QZAE"
+                localStorage.setItem("user", this.user)
+        //       }else{
+        //         this.userNoAlert()
+        //       }
+        //     })
+        //   }else if(res.data?.data?.cardId){
+        //     Toast("用户卡号未绑定")
+        //   }else{
+        //     this.userNoAlert()
+        //   }
+        // }).catch(err =>{
+        //   this.userNoAlert()
+        // });
+      // }else{
+      //   console.log("app进入")
+      //   Toast(this.getQueryVariable("无token传入！"))
+      // }
     }else if(this.getQueryVariable("type")){
       console.log("扫码游客进入")
       localStorage.removeItem('type');
       localStorage.removeItem('user');
       localStorage.setItem("type",this.type)
     }else{
-      // localStorage.removeItem('user');
-      // localStorage.removeItem('type');
-      // console.log("无user、type进入")
-
-      console.log("app进入")
-      localStorage.removeItem('type');
-      
       localStorage.removeItem('user');
-      localStorage.setItem("user", "0001T11000000000V6UQ")
-      this.user = "0001T11000000000V6UQ"
-      if(!localStorage.getItem("balance")){
-        this.cardBalance()
-      }
-     
+      localStorage.removeItem('type');
+      console.log("无user、type进入")
     }
-    // localStorage.setItem("user", "0001T11000000000V6UQ")
-    
-    
   },
   mounted() {
   },
   methods: {
-    cardBalance(){
-      axios.get('/dxtop/staff/one?id=0001T11000000000V6UQ').then(res => {
+    userNoAlert(){
+      Toast("当前账户初始流程中，请耐心等待或联系管理人员查询")
+    },
+    cardBalance(){ //余额
+      axios.get(`/dxtop/staff/one?id=${localStorage.getItem("user")}`).then(res => {
         axios.get(`/dxtop/staff/cardBalance`,{params:{"card":res.data.data.cardId}}).then(res2 => { //res.data.data.cardId
           let msgFlag =undefined
           axios.get(`/dxtop/msglog/one`,{params:{"id":res2.data.msg}}).then(res3 => {//res.msg
@@ -129,7 +128,7 @@ export default {
         Toast("用户未录入充值系统")
       })
     },
-    getQueryVariable(variable){
+    getQueryVariable(variable){//参数获取
       //window.location.search.substring(1);
       var query = window.location.hash.substring(3);
       var vars = query.split("&");
@@ -146,6 +145,32 @@ export default {
         }
       }
       return(false);
+    },
+    amount(){
+      var url = window.location.href;
+      if(url.indexOf("token") >1){
+        if(localStorage.getItem("user")){
+          this.$router.push({ path: "/amount"})
+        }else{
+          this.userNoAlert()
+        }
+      }else{
+        this.$router.push({ path: "/amount"})
+      }
+    },
+    balance(){
+      if(localStorage.getItem("user")){
+        this.$router.push({ path: "/balance"})
+      }else{
+        this.userNoAlert()
+      }
+    },
+    record(){
+      if(localStorage.getItem("user")){
+        this.$router.push({ path: "/record"})
+      }else{
+        this.userNoAlert()
+      }
     }
   },
 };

src/views/recharge/index.vue

@@ -143,30 +143,32 @@ export default {
         console.log("返回支付宝app支付链接")
         axios.get("dxtop/staff/one",{
           params:{
-            id:10045
+            id:localStorage.getItem("user")
           }
         }).then(res =>{
-          // if(res.data.code == 200){
-          //   Toast(res.data.msg)
-          // }else{
+          console.log(res)
+          if(res.data?.data?.sid){
+            console.log(res.data.data.sid)
             axios.post('/dxtop/order/callUnifiedPay', {
               "money": money,
               "topPayType": topPayType,
               "payType": payType,
               "scene": 3,
-              "userId": 7615
-              // "userId": 3822
-            }).then(res => {
+              "userId": res.data.data.sid
+            }).then(res2 => {
               this.loading = false;
-              if(res.data.code == 500){
-                Toast(res.data.msg)
+              console.log(res2)
+              if(res2.data.code == 500){
+                Toast(res2.data.msg)
               }else{
-                window.location.href = res.data.msg
+                window.location.href = res2.data.msg
               }
             }).catch(() => {
               this.loading = false;
             })
-          // }
+          }else{
+            Toast("用户sid不存在")
+          }
         })
         
       } else if(localStorage.getItem("type")){//返回支付宝微信支付连接
@@ -204,11 +206,12 @@ export default {
       }
     },
     weixin(){
+      // 正式版:0，测试版:1，体验版:2 
       let params =  {
         "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`
           }
       }

src/views/record/index.vue

@@ -156,7 +156,7 @@ export default {
           "endTime":this.endTime,
           "size":this.current,
           "current":this.page1,
-          "userId":"0001T11000000000V6UQ"
+          "userId":localStorage.getItem("user")
       }).then(res => {
         if (res?.data?.data?.records.length > 0) {
           let data = res.data.data.records
@@ -182,7 +182,7 @@ export default {
         "endTime":this.endTime,
         "size":this.current,
         "current":this.page2,
-        "userId":"0001T11000000000V6UQ"
+        "userId":localStorage.getItem("user")
       }).then(res => {
         if (res?.data?.data?.records.length > 0) {
           let data = res.data.data.records

vue.config.js

@@ -20,9 +20,9 @@ module.exports = {
         proxy: {
             // 配置多个跨域
             '/': {
-                target: 'https://smartpark.caih.com/dxapi/', //东信
+                //target: 'https://smartpark.caih.com/dxapi/', //东信
                 //target: 'https://qhome.usky.cn/dxapi/', //75
-                //target: 'http://172.16.120.104:8085/', //本地
+                target: 'http://172.16.120.104:8085/', //本地
                 changeOrigin: false,
                 pathRewrite: {
                     '': '/'

vuepay/index.html

@@ -1 +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.8ed708dc.css" rel="prefetch"><link href="/vuepay/static/js/about.20d8745f.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.52caa8ce.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.52caa8ce.js"></script></body></html>
+<!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.b1fd43c9.css" rel="prefetch"><link href="/vuepay/static/js/about.b3eba306.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.01a28ea9.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.01a28ea9.js"></script></body></html>