wangtao před 3 roky
rodič
revize
0387c695d7

+ 36 - 24
src/views/amount/index.vue

@@ -204,6 +204,7 @@ export default {
   },
   created() {
     var url = window.location.href;
+    localStorage.setItem("amount57",url)
     if(url.indexOf("token") > 1){
       //("app进入")
       if(this.getQueryVariable("token")){
@@ -220,12 +221,10 @@ export default {
       //console.log("扫码游客进入")
       localStorage.removeItem('type');
       localStorage.removeItem('user_wt');
-      localStorage.removeItem("classify")
       localStorage.setItem("type",this.type)
     }else{
       localStorage.removeItem('user_wt');
       localStorage.removeItem('type');
-      localStorage.removeItem("classify")
       //console.log("无user、type、classify进入")
     }
     if (this.$route.query.type) {
@@ -307,7 +306,7 @@ export default {
             if(res2.data.data){
               localStorage.setItem("user_wt", res.data.data.id)
               // localStorage.setItem("user_wt", "0001T110000000002HBL") //测试id
-              localStorage.setItem("cardId", res2.data.data.cardId)
+              localStorage.setItem("cardId57", res2.data.data.cardId)
               this.cardId = res2.data.data.cardId
               this.cardLoading = false
               this.Balance()
@@ -334,6 +333,7 @@ export default {
     },
     getQueryVariable(variable){//参数获取 设定微信进入参数
       //window.location.search.substring(1);
+      console.log(variable)
       var query = window.location.hash.substring(3);
       var vars = query.split("&");
       if(vars[2]){ //判定微信端进入
@@ -346,7 +346,7 @@ export default {
         if(pair[0] == variable || pair[0] =="mount?token"){
           
           if(vars[1] != "classify"){
-            localStorage.removeItem("classify")
+            // localStorage.removeItem("classify")
           }
           if(variable =="token"){
             this.user = pair[1]
@@ -363,9 +363,9 @@ export default {
     //余额
     Balance(){ 
       this.erp = true
-      if(localStorage.getItem("cardId")){
+      if(localStorage.getItem("cardId57")){
         //axios.get(`/dxtop/staff/cardBalance?card=3186100745`).then(res => { //测试
-        axios.get(`/dxtop/staff/cardBalance?card=${localStorage.getItem("cardId")}`).then(res => { //验证充值信息是否同步
+        axios.get(`/dxtop/staff/cardBalance?card=${localStorage.getItem("cardId57")}`).then(res => { //验证充值信息是否同步
           if(res.data.data){
             this.cardBalance = returnFloat(res.data.data)
           }else{
@@ -468,7 +468,7 @@ export default {
       if(money.toString().indexOf(".")<1){
         money = money + ".00"
       }
-      if(localStorage.getItem("type")){
+      if(localStorage.getItem("type")){ //充值系统后台扫码充值
         axios.post('/dxtop/order/topScanPayApi', {
             "money": Number(money).toFixed(2),
             "topPayType": topPayType,
@@ -483,20 +483,22 @@ export default {
             window.location.href = res.data.data
           }
         })
-      }else{
+      }else{ //公众号充值(ERP或外包人员)
         axios.get("dxtop/staff/one",{
           params:{
             id:localStorage.getItem("user_wt")
           }
         }).then(res =>{
           if(res.data?.data?.sid){
-            //("erp返回支付宝app支付链接 公众号返回微信支付链接")
             if(localStorage.getItem("classify")){
               let type = localStorage.getItem("classify")
               let channelName =undefined
               if(type == "1"){
                 channelName = "外包人员充值"
               }
+              if(type == "2"){
+                channelName = "ERP人员充值"
+              }
               axios.post('/dxtop/order/topScanPayApi', {
                   "money": Number(money).toFixed(2),
                   "topPayType": topPayType,
@@ -533,6 +535,7 @@ export default {
         }
     },
     jumpMode() {
+      console.log(localStorage.getItem("classify"))
       if (this.money) {
         if(this.money == '0' ||  this.money == '0.0' ||  this.money == '0.'){
           Dialog.confirm({
@@ -595,8 +598,7 @@ export default {
       }
     },
     recharge() {
-      this.isWeixinOrAlipay();
-      this.jumpMode();
+      
       if(this.env == "WeiXin" || this.env == "Alipay"){
         if(this.money == '0' ||  this.money == '0.0' ||  this.money == '0.'){
           Dialog.confirm({
@@ -611,10 +613,12 @@ export default {
             message: "充值金额不能为0元!",
           });
         }else{
-          this.$router.push({
-            path: "/recharge",
-            query: { money: this.money, channelId: this.channelId },
-          });
+          this.isWeixinOrAlipay();
+          this.jumpMode();
+          // this.$router.push({
+          //   path: "/recharge",
+          //   query: { money: this.money, channelId: this.channelId },
+          // });
         }
         
       }
@@ -675,11 +679,16 @@ export default {
     },
     //返回上级或app目录页
     fanhuiBtn(){
-      if(localStorage.getItem("passageway")){
-        this.$router.go(-1)
-      }else{
-        window.location.href = "https://smartpark.caih.com/h5/#/home/feature?isApp=true"
-      }
+      this.$router.go(-1)
+      // if(localStorage.getItem("passageway")){
+      //   this.$router.go(-1)
+      // }else{
+        // setTimeout(()=>{
+        //   this.$router.go(-2)
+        // },10)
+        
+        //window.location.href = "https://smartpark.caih.com/h5/#/home/feature?isApp=true"
+      //}
     }
   },
 };
@@ -906,8 +915,11 @@ export default {
     }
     .list{
       margin-top:10px;
-     
-      overflow-y:scroll;
+      -webkit-overflow-scrolling: touch;
+      .listData{
+        height:100%;
+        overflow-y: scroll;
+      }
       .loading{
         text-align: center;
         margin:20px auto 10px;
@@ -993,9 +1005,9 @@ export default {
       height:175px;
   }
 }
-@media screen and (min-height:800px){
+@media screen and (min-height:741px){
    .list{
-      height:300px;
+      height:175px;
   }
 }
 

+ 2 - 2
src/views/balance/index.vue

@@ -41,8 +41,8 @@ export default {
       return (Date.parse(new Date(str)) / 1000)
     },
     cardBalance(){ //消费充值余额取最大值
-      if(localStorage.getItem("cardId")){
-        axios.get(`/dxtop/staff/cardBalance?card=${localStorage.getItem("cardId")}`).then(res => { //验证充值信息是否同步
+      if(localStorage.getItem("cardId57")){
+        axios.get(`/dxtop/staff/cardBalance?card=${localStorage.getItem("cardId57")}`).then(res => { //验证充值信息是否同步
           if(res.data.data){
             this.balance = res.data.data
           }else{

+ 55 - 31
src/views/home/index.vue

@@ -21,7 +21,7 @@
         </van-row>
         <van-row class="bottom">
           <van-row  >
-            <span v-if="balance" v-loading="loadingBalance">{{balance}}元<br>余额</span>
+            <span  v-loading="loadingBalance">{{balance}}元<br>余额</span>
           </van-row>
           <van-row  >
             <span v-if="plateNumber" v-loading="loadingPlateNumber">{{plateNumber}}<br>已经录入车牌</span>
@@ -56,18 +56,7 @@
         </van-row>
       </van-row>
       <van-row class="record">
-        <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 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'}" >
@@ -97,20 +86,38 @@
             <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="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 >
+            <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%">
+              <template slot-scope="scop">
+                {{scop.row.ingatename ? "进":"出"}}
+              </template>
+            </el-table-column>
+            <el-table-column label="时间" align="left" prop="" show-overflow-tooltip min-width="45%">
+              <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="visitor_name" show-overflow-tooltip />
-            <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-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>
@@ -193,13 +200,13 @@ export default {
     if(Cookies.get("password57")){
       this.password = decrypt(Cookies.get("password57"))
     }
-    if(!Cookies.get("openid57") || !Cookies.get("username57") || !Cookies.get("password57")){
+    if(!Cookies.get("openid57") || !Cookies.get("username57") || !Cookies.get("password57") || !localStorage.getItem('cipher57')){
       this.outLogin()
     }
     //余额
     axios.get(`/dxtop/staff/one?id=${Cookies.get("userId57")}`).then(res => { //验证充值信息是否同步
       if(res?.data?.data?.cardId){
-        Cookies.set("cardId",res?.data?.data?.cardId)
+        Cookies.set("cardId57",res?.data?.data?.cardId)
          axios.get(`/dxtop/staff/cardBalance?card=${res.data.data.cardId}`).then(res => { //验证充值信息是否同步
           if(res.data.data){
             this.balance = res.data.data
@@ -258,7 +265,7 @@ 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`, 
+    axios.post(`https://smartpark.caih.com/ykt/api/thirdparty/v1/openInterface/getParkingTrafficByUserNumber?page=0&size=10&sort=id,desc`, 
     {
       "nonce": Cookies.get("nonce57"),
       "timestamp": Cookies.get("timestamp57"),
@@ -270,11 +277,23 @@ export default {
         "XYTACCESSTOKEN":Cookies.get("token57")
       }
     }).then(res => {
-        if(res?.data?.data?.content){
-          this.adminList1 = res.data.data.content.slice(0,5)
-          this.loading1 = false
+        if(res.data.data){
+          let data = res.data.data.slice(0,5)
+          let arr = []
+          for(let i =0; i<data.length;i++){
+            arr[i] = {}
+            arr[i].plate_number = data[i].plate_number
+            arr[i].ingatename = data[i].ingatename
+            arr[i].intime = data[i].intime
+            arr[i*2 +1] = {}
+            arr[i*2 +1].plate_number = data[i].plate_number
+            arr[i*2 +1].outgatename = data[i].outgatename
+            arr[i*2 +1].outtime = data[i].outtime
+          }
+          this.adminList4 = arr
+          this.loading4 = false
         }else{
-          this.loading1 = false
+          this.loading4 = false
         }
       }).catch(err =>{
         Toast(err.response.data.message)
@@ -360,17 +379,19 @@ export default {
     //世茂
     sm(url){
       // https://smartpark.caih.com/h5/#/myVisitor 访客申请列表页
-      let param = {
+       let param = {
         userid:encrypt(Cookies.get("username57")),
         password:Cookies.get("password57"),
         type:"wx_yt"
       }
-      //console.log( `${url}?param=${encodeURIComponent(JSON.stringify(param))}`)
-       window.location.href = `${url}?param=${encodeURIComponent(JSON.stringify(param))}`
+      window.location.href = `${url}?param=${encodeURIComponent(JSON.stringify(param))}`
     },
     //修改页
     go(){
       this.$router.push({ path: "/information"})
+    },
+    outLogin(){
+      this.$router.push({ path: "/"})
     }
   },
 };
@@ -410,6 +431,7 @@ export default {
             top:0px;
             opacity:0;
             z-index: 10;
+            background: transparent;
           }
           .portrait{
             width:76px;
@@ -526,4 +548,6 @@ export default {
 .tableScroll{
   overflow-x:scroll;
 }
-</style>
+
+</style>
+

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

@@ -94,7 +94,7 @@ export default {
               if(res2.data.data){
                 //localStorage.setItem("user", res.data.data.id)
                 localStorage.setItem("user_wt", "0001T110000000002HBL")
-                localStorage.setItem("cardId", res2.data.data.cardId)
+                localStorage.setItem("cardId57", res2.data.data.cardId)
               }else{
                 this.userNoAlert()
               }

+ 33 - 1
src/views/information/index.vue

@@ -210,6 +210,12 @@ export default {
         title: '提示',
         message: '确定退出登录吗?',
       }).then(() => {
+        axios.put('/dxtop/staff', {
+          id:Cookies.get("userId57"),
+          openId:""
+        })
+        Cookies.remove("timestamp57");
+        //Cookies.remove("classify");
         Cookies.remove("username57");
         Cookies.remove("rememberMe57");
         Cookies.remove("password57");
@@ -217,9 +223,35 @@ export default {
         Cookies.remove("userId57");
         Cookies.remove("token57");
         Cookies.remove("nonce57");
+        
         Cookies.remove("timestamp57");
-        Cookies.remove("openid57")
+        Cookies.remove("nickName57");
+        Cookies.remove("dept57");
+        Cookies.remove("phone57");
+        Cookies.remove("people57");
+        Cookies.remove("openid57");
+        Cookies.remove("cardId57");
+        
+        
+        
+    
+        localStorage.removeItem("amount57");
+        localStorage.removeItem("passageway");
+        localStorage.removeItem("user_wt")
+              // localStorage.setItem("user_wt", "0001T110000000002HBL") //测试id
+        localStorage.removeItem("cardId57")
+        localStorage.removeItem("classify")
+        localStorage.removeItem("type")
+        localStorage.removeItem("cipher57")
+        localStorage.removeItem("dwtype")
+        localStorage.removeItem("cipher")
+        
+        
+        
+        
         this.$router.push({ path: "/"})
+
+        
       });
       
     }

+ 80 - 66
src/views/login/index.vue

@@ -100,7 +100,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'))
     }
@@ -183,76 +183,90 @@ export default {
     },
     login_info() {
       if(Cookies.get("openid57") && Cookies.get("username57") && Cookies.get("password57")){
-        this.$router.push({ path: "/home"})
+        window.location.href = "https://smartpark.caih.com/vuepay/#/home"
+        //this.$router.push({ path: `/home`}) 
       }else{
         this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true;
-          axios.get(`https://smartpark.caih.com/zkxt/api/thirdparty/v1/user/appLogin?name=${this.loginForm.username}&pass=${this.loginForm.password}`).then(res => {
-            if (res?.data?.data?.data?.cipher) {
-              let data = res.data.data.data
-              //人员种类(00-正式人员、01-外协单位、02-租户)
-              if(data.user.dmUser.type == "00"){
-                //Toast('请使用"中国东信APP查看功能"')
-                  localStorage.setItem("cipher57",data.cipher)
-                  localStorage.setItem("classify","1")
-                  Cookies.set("username57", this.loginForm.username, { expires: 300 });
-                  Cookies.set("rememberMe57", this.loginForm.rememberMe, { expires: 300 });
-                  Cookies.set("password57", encrypt(this.loginForm.password), { expires: 300 });
-                  Cookies.set("portrait57", data.user.dmUser.faceid, { expires: 300 });
-                  Cookies.set("userId57", data.userId, { expires: 300 });
-                  Cookies.set("token57", data.token, { expires: 300 });
-                  Cookies.set("nonce57", data.nonce, { expires: 300 });
-                  Cookies.set("timestamp57", data.timestamp, { expires: 300 });
-                  Cookies.set("nickName57", data.user.nickName, { expires: 300 });
-                  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")
-                  })
-                  this.$router.push({ path: "/home"})
+          if (valid) {
+            this.loading = true;
+            axios.get(`https://smartpark.caih.com/zkxt/api/thirdparty/v1/user/appLogin?name=${this.loginForm.username}&pass=${this.loginForm.password}`).then(res => {
+              if (res?.data?.data?.data?.cipher) {
+                let data = res.data.data.data
+                //人员种类(00-正式人员、01-外协单位、02-租户)
+                if(data.user.dmUser.type == "00"){
+                  //Toast('请使用"中国东信APP查看功能"')
+                  if(data.user.dmUser.status == false){
+                    Toast("离职人员,暂无权限")
+                    return
+                  }else{
+                    localStorage.setItem("cipher57",data.cipher)
+                    localStorage.setItem("classify","2")
+                    Cookies.set("username57", this.loginForm.username, { expires: 300 });
+                    Cookies.set("rememberMe57", this.loginForm.rememberMe, { expires: 300 });
+                    Cookies.set("password57", encrypt(this.loginForm.password), { expires: 300 });
+                    Cookies.set("portrait57", data.user.dmUser.faceid, { expires: 300 });
+                    Cookies.set("userId57", data.userId, { expires: 300 });
+                    Cookies.set("token57", data.token, { expires: 300 });
+                    Cookies.set("nonce57", data.nonce, { expires: 300 });
+                    Cookies.set("timestamp57", data.timestamp, { expires: 300 });
+                    Cookies.set("nickName57", data.user.nickName, { expires: 300 });
+                    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")
+                    })
+                    setTimeout(()=>{
+                      //this.$router.push({ path: `/home`}) 
+                      window.location.href = "https://smartpark.caih.com/vuepay/#/home"
+                    },200)
+                  }
 
-              }else if(data.user.dmUser.type == "01"){
-                if(data.user.dmUser.status == false){
-                  Toast("离职人员,暂无权限")
-                  return
+                }else if(data.user.dmUser.type == "01"){
+                  if(data.user.dmUser.status == false){
+                    Toast("离职人员,暂无权限")
+                    return
+                  }else{
+                    
+                    localStorage.setItem("cipher57",data.cipher)
+                    localStorage.setItem("classify","1")
+                    Cookies.set("username57", this.loginForm.username, { expires: 300 });
+                    Cookies.set("rememberMe57", this.loginForm.rememberMe, { expires: 300 });
+                    Cookies.set("password57", encrypt(this.loginForm.password), { expires: 300 });
+                    Cookies.set("portrait57", data.user.dmUser.faceid, { expires: 300 });
+                    Cookies.set("userId57", data.userId, { expires: 300 });
+                    Cookies.set("token57", data.token, { expires: 300 });
+                    Cookies.set("nonce57", data.nonce, { expires: 300 });
+                    Cookies.set("timestamp57", data.timestamp, { expires: 300 });
+                    Cookies.set("nickName57", data.user.nickName, { expires: 300 });
+                    Cookies.set("dept57", data.user.dept.name, { expires: 300 });
+                    Cookies.set("phone57", data.user.dmUser.contacts, { expires: 300 });
+                    Cookies.set("people57", 1, { expires: 300 });
+                    
+                    axios.put('/dxtop/staff', {
+                      id:data.userId,
+                      openId:Cookies.get("openid57")
+                    })
+                    setTimeout(()=>{
+                      window.location.href = "https://smartpark.caih.com/vuepay/#/home"
+                    },200)
+                    
+                  }
+                }else if(data.user.dmUser.type == "02"){
+                  Toast("暂无权限")
                 }else{
-                  localStorage.setItem("cipher57",data.cipher)
-                  localStorage.setItem("classify","1")
-                  Cookies.set("username57", this.loginForm.username, { expires: 300 });
-                  Cookies.set("rememberMe57", this.loginForm.rememberMe, { expires: 300 });
-                  Cookies.set("password57", encrypt(this.loginForm.password), { expires: 300 });
-                  Cookies.set("portrait57", data.user.dmUser.faceid, { expires: 300 });
-                  Cookies.set("userId57", data.userId, { expires: 300 });
-                  Cookies.set("token57", data.token, { expires: 300 });
-                  Cookies.set("nonce57", data.nonce, { expires: 300 });
-                  Cookies.set("timestamp57", data.timestamp, { expires: 300 });
-                  Cookies.set("nickName57", data.user.nickName, { expires: 300 });
-                  Cookies.set("dept57", data.user.dept.name, { expires: 300 });
-                  Cookies.set("phone57", data.user.dmUser.contacts, { expires: 300 });
-                  Cookies.set("people57", 1, { expires: 300 });
-                  axios.put('/dxtop/staff', {
-                    id:data.userId,
-                    openId:Cookies.get("openid57")
-                  })
-                  this.$router.push({ path: "/home"})
-                }
-              }else if(data.user.dmUser.type == "02"){
-                Toast("暂无权限")
-              }else{
 
-              }
-            } 
-          }).catch(err =>{
-            Toast(err.response.data.message)
-          })
-          setTimeout(()=>{
-            this.loading = false
-          },2000)
-        }
-      });
+                }
+              } 
+            }).catch(err =>{
+              Toast(err.response.data.message)
+            })
+            setTimeout(()=>{
+              this.loading = false
+            },2000)
+          }
+        });
       }
     },
   },

+ 3 - 0
src/views/recharge/index.vue

@@ -173,6 +173,9 @@ export default {
               if(type == "1"){
                 channelName = "外包人员充值"
               }
+              if(type == "2"){
+                channelName = "ERP人员充值"
+              }
               axios.post('/dxtop/order/callUnifiedPay', {
                 "money": Number(money).toFixed(2),
                 "topPayType": topPayType,

+ 3 - 5
src/views/result/index.vue

@@ -1,13 +1,13 @@
 <template>
     <div class="mianBox" >
         <van-row class="headerBox">
-            <van-icon name="arrow-left" @click="$router.go(-1)" />
+            <van-icon name="arrow-left" @click="$router.go(-2)" />
             充值结果
         </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="fanhui()" class="fanhui">返 回</van-button>
+            <van-button   type="danger" @click="$router.go(-2)" class="fanhui">返 回</van-button>
         </div>
         <div v-if="!result">
             <img src="../../assets/image/fail.png" alt="" class="result">
@@ -35,9 +35,7 @@ export default {
     }
   },
   methods: {
-    fanhui(){
-      window.location.href = localStorage.getItem("amount57")
-    }
+    
   }
 }
 </script>

+ 1 - 1
vue.config.js

@@ -27,7 +27,7 @@ module.exports = {
             // 配置多个跨域
             '/': {
                 target: 'https://smartpark.caih.com/dxapi/', //东信
-                //target: 'http://172.16.120.104:8085/', //本地
+                //target: 'http://172.16.120.213:8085/', //本地
                 changeOrigin: false,
                 pathRewrite: {
                     '': '/'