From 2898325db11ed938f9891991198b88ea6a042d3d Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 21 十一月 2023 09:51:39 +0800
Subject: [PATCH] 修改前端页面

---
 src/components/page/IndexTest.vue |    2 +-
 src/components/page/IndexFail.vue |    2 +-
 src/components/page/IndexOk.vue   |    2 +-
 src/components/page/IndexXTYH.vue |   32 +++++++++++++++++++++-----------
 src/router/index.js               |   12 ++++++------
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/components/page/IndexFail.vue b/src/components/page/IndexFail.vue
index 5c6f944..dfa8237 100644
--- a/src/components/page/IndexFail.vue
+++ b/src/components/page/IndexFail.vue
@@ -76,7 +76,7 @@
             }
             //this.outParkId = cs.code;
             this.code2 = cs.code2;
-            this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/findByBarrierCode', {code2:cs.code2}, res => {
+            this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/findByBarrierCode2', {code2:cs.code2}, res => {
                 this.statisticData = res.data;
                 this.outParkId = this.statisticData.id;
                 this.status3 = this.statisticData.status3;
diff --git a/src/components/page/IndexOk.vue b/src/components/page/IndexOk.vue
index 255f902..98900da 100644
--- a/src/components/page/IndexOk.vue
+++ b/src/components/page/IndexOk.vue
@@ -76,7 +76,7 @@
             }
             //this.outParkId = cs.code;
             this.code2 = cs.code2;
-            this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/findByBarrierCode', {code2:cs.code2}, res => {
+            this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/findByBarrierCode2', {code2:cs.code2}, res => {
                 this.statisticData = res.data;
                 this.outParkId = this.statisticData.id;
                 this.status3 = this.statisticData.status3;
diff --git a/src/components/page/IndexTest.vue b/src/components/page/IndexTest.vue
index e4176f4..b522a4e 100644
--- a/src/components/page/IndexTest.vue
+++ b/src/components/page/IndexTest.vue
@@ -150,7 +150,7 @@
           }else {
             this.dialogVisible = false
           }
-          this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/findByBarrierCode', {code2:cs.code2}, res => {
+          this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/findByBarrierCode2', {code2:cs.code2}, res => {
             this.statisticData = res.data;
             this.outParkId = this.statisticData.id;
             this.status3 = this.statisticData.status3;
diff --git a/src/components/page/IndexXTYH.vue b/src/components/page/IndexXTYH.vue
index 703934f..cc560d8 100644
--- a/src/components/page/IndexXTYH.vue
+++ b/src/components/page/IndexXTYH.vue
@@ -131,17 +131,17 @@
             //鏀粯瀹�
             this.type = 1
           }
-          if(this.type == null){
-            this.$message.error("璇风敤寰俊鎴栨敮浠樺疂鎵弿浜岀淮鐮�")
-            return;
-          }
+          // if(this.type == null){
+          //   this.$message.error("璇风敤寰俊鎴栨敮浠樺疂鎵弿浜岀淮鐮�")
+          //   return;
+          // }
 
             var url = window.location.href;
             var count = url.split('?').length-1;
             if(count >1){
-              this.code = this.getCodeFromUrl(url)
-              this.code2 = this.getCode2FromUrl(url)
-              window.location.href = "http://hesuancj.cn/#/index2?code="+this.code+"&state=STATE&code2="+this.code2
+              let codeONE = this.getCodeFromUrl(url)
+              let codeTWO = this.getCode2FromUrl(url)
+              window.location.href = "http://hesuancj.cn/#/index2?code="+codeONE+"&state=STATE&code2="+codeTWO
             }
             var cs = url.split('?')[1];
             var cs_arr = cs.split('&');
@@ -153,14 +153,20 @@
           this.code2 = cs.code2;
           this.code = cs.code;
           if(this.code2 == null || this.code2 == ''){
-            window.location.href = "http://hesuancj.cn/#/index2?code2="+this.code
+            this.$message({
+              message: '1绉掑悗鑷姩璺宠浆锛岃绋嶇瓑',
+              type: 'success',
+              duration:1000,
+            });
+            setTimeout(function(){window.location.href = "http://hesuancj.cn/#/index2?code2="+cs.code},1000);
+            return;
           }
           if(this.code != null && this.code != '') {
             this.dialogVisible = true
           }else {
             this.dialogVisible = false
           }
-          this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/findByBarrierCode', {code2:cs.code2}, res => {
+          this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/findByBarrierCode2', {code2:cs.code2}, res => {
             this.statisticData = res.data;
             this.outParkId = this.statisticData.id;
             this.status3 = this.statisticData.status3;
@@ -177,6 +183,8 @@
         },
         methods: {
             pay(){
+                console.log('code',this.code)
+                console.log('code2',this.code2)
                 this.payFlag = true;
                 this.payNowFlag = true;
                 if(this.status3==1){
@@ -315,12 +323,14 @@
           },
           queryOrder() {
             this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/getById', {id: this.outParkId}, res => {
-              if (res.code == 0) {
+              if (res.code === 0) {
                 let outpark = res.data
-                if(outpark.status == 1){
+                if(outpark.status === 1){
                   window.location.href = "http://hesuancj.cn/#/indexOk?code2="+this.code2
+                  return;
                 }else {
                   window.location.href = "http://hesuancj.cn/#/indexFail?code2="+this.code2
+                  return;
                 }
               }
             })
diff --git a/src/router/index.js b/src/router/index.js
index 2550316..5238ccd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -95,16 +95,16 @@
             component: resolve => require(['../components/page/Index.vue'], resolve),
             meta: { title: '杩濈珷鍋滆溅' }
         },
-        // {
-        //     path: '/index2',
-        //     component: resolve => require(['../components/page/Index2.vue'], resolve),
-        //     meta: { title: '鏅烘収娉婅溅' }
-        // },
         {
             path: '/index2',
-            component: resolve => require(['../components/page/IndexXTYH.vue'], resolve),
+            component: resolve => require(['../components/page/Index2.vue'], resolve),
             meta: { title: '鏅烘収娉婅溅' }
         },
+        // {
+        //     path: '/index2',
+        //     component: resolve => require(['../components/page/IndexXTYH.vue'], resolve),
+        //     meta: { title: '鏅烘収娉婅溅' }
+        // },
         {
             path: '/indexOk',
             component: resolve => require(['../components/page/IndexOk.vue'], resolve),

--
Gitblit v1.9.1