From d6e51b776dfe5cfb575610f423238f98b5e58b94 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 22 四月 2024 15:35:55 +0800
Subject: [PATCH] fix: 修改页面
---
src/components/page/IndexXTYH39.vue | 83 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 28 deletions(-)
diff --git a/src/components/page/IndexXTYH39.vue b/src/components/page/IndexXTYH39.vue
index c27037d..6b93152 100644
--- a/src/components/page/IndexXTYH39.vue
+++ b/src/components/page/IndexXTYH39.vue
@@ -135,7 +135,7 @@
payFlag:false,
payNowFlag:false,
outParkId:"",
- type:null,
+ type:0,
statisticData:{
},
@@ -168,12 +168,17 @@
// }
var url = window.location.href;
- console.log(url,'this.url--------')
+ console.log(url,'url=====寰俊鍥炴潵浜�----39---1')
+ url = decodeURIComponent(url)
var count = url.split('?').length-1;
+ console.log(url,'url=====寰俊鍥炴潵浜�----39---2')
+ console.log(count,'count-------鏈湴-----39')
if(count >1){ //鑾峰彇鐢ㄦ埛淇℃伅鍚庤烦鍥炴潵鏈〉闈�
- let codeONE = this.getCodeFromUrl(url)
- let codeTWO = this.getCode2FromUrl(url)
- window.location.href = "http://hesuancj.cn/#/index2?code="+codeONE+"&state=STATE&code2="+codeTWO
+ let data = this.getCodeFromUrl(url)
+ console.log(data,'data=====鏁版嵁22222222222---39')
+ //window.location.href = "http://192.168.0.8:8082/#/IndexXTYH39?code="+data.code+"&state=STATE&code2="+data.code2
+ window.location.href = `http://192.168.0.8:8082/#/IndexXTYH39?code=${encodeURIComponent(data.code)}&state=STATE?code2=${encodeURIComponent(data.code2)}`
+
}
var cs = url.split('?')[1];
var cs_arr = cs.split('&');
@@ -181,31 +186,30 @@
for(var i=0;i<cs_arr.length;i++){
cs[cs_arr[i].split('=')[0]] = cs_arr[i].split('=')[1]
}
- //this.outParkId = cs.code;
+ console.log(cs,'鎴戞槸cs=====')
+ // this.outParkId = cs.code;
this.code2 = cs.code2;
this.code = cs.code;
-
+ console.log(this.code2,'this.code2=====2')
+ console.log(this.code,'this.code=====1')
//鍒濆鍖栬烦杞� 39 鏈嶅姟鍣�
- console.log(this.code2,'this.code2--------')
if(this.code2 == null || this.code2 == ''){
- console.log(this.code2,'this.code2--------222222222')
// this.$message({
// message: '1绉掑悗鑷姩璺宠浆锛岃绋嶇瓑',
// type: 'success',
// duration:1000,
// });
- window.location.href = "http://192.168.0.8:8082/#/IndexXTYH39?code2="+cs.code
+ // window.location.href = "http://hesuancj.cn/#/index2?code2="+cs.code //姝ｅ紡
+ window.location.href = "http://192.168.0.8:8082/#/IndexXTYH39?code2="+cs.code //娴嬭瘯鐢ㄧ殑
// setTimeout(function(){window.location.href = "http://192.168.0.8:8082/#/IndexXTYH39?code2="+cs.code},1000);
return;
}
- console.log(this.code2,'this.code2--------333333333')
if(this.code != null && this.code != '') {
- this.dialogVisible = true
+ this.dialogVisible = true //绔嬪嵆鏀粯寮规
}else {
this.dialogVisible = false
}
this.getDataList()
-
},
methods: {
getDataList() { //鏁版嵁鍥炴樉鎺ュ彛
@@ -249,14 +253,12 @@
}
})
} catch (err) {
- // this.dataLoading = false
+ this.dataLoading = false
}finally {
// this.dataLoading = false
}
},
pay(){
- console.log('code',this.code)
- console.log('code2',this.code2)
this.payFlag = true; //鍘荤即璐筶oading
// this.payNowFlag = true;
// this.showFlag = true
@@ -269,14 +271,13 @@
return;
}
this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/api/parkJudg', {id:this.outParkId}, res => {
- console.log(res,'res====')
if(res.code === 0){
this.payFlag = false; //鍘荤即璐筶oading
if(res.data == 1) { //1 寮瑰嚭寮规(宸茬即璐规彁绀�)
this.againDialogVisible = true
}else {
- this.dialogVisible = true; //绔嬪嵆鏀粯鐨勫脊妗�
- // this.parkXT(this.outParkId)
+ // this.dialogVisible = true; //绔嬪嵆鏀粯鐨勫脊妗�
+ this.parkXT(this.outParkId) //鍘昏幏鍙栧井淇′俊鎭�
}
// this.getCode()
// this.showFlag = false
@@ -292,11 +293,15 @@
},
againPay() {
this.againDialogVisible = false
- this.dialogVisible = true //鎵撳紑绔嬪嵆鏀粯寮规
+ this.dataLoading = true //椤甸潰loading鎵撳紑
+ this.parkXT(this.outParkId) //鑾峰彇寰俊鐢ㄦ埛淇℃伅
+
+ // this.dialogVisible = true //鎵撳紑绔嬪嵆鏀粯寮规
// this.parkXT(this.outParkId)
},
parkXT(outParkId) {
this.payNowFlag = true //绔嬪嵆鏀粯loading
+ this.dataLoading = false //椤甸潰loading鎵撳紑
try{
this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/api/parkXT', {id:outParkId}, res => {
if(res.code === 0){
@@ -348,10 +353,28 @@
* 瑙ｆ瀽寰俊redirect_uri鍦板潃涓殑code
*/
getCodeFromUrl (cur_url) {
+
+ console.log(cur_url,'cur_url-----iiiii')
let index = cur_url.split('?')[1]
- let paramStr =index.split('&')[0];
- let code =paramStr.split('=')[1];
- return code
+ let index2 = cur_url.split('?')[2]
+ let code = null
+ let code2 = null
+ let data = {}
+ console.log(index,'1111111111111111index')
+ let paramStr =index.split('&');
+
+ if(paramStr.length>1) {
+ code = paramStr[0].split('=')[1]
+ code2 = index2.split('=')[1]
+ }else {
+ code2 = paramStr[0].split('=')[1]
+ code = index2.split('&')[0].split('=')[1]
+ }
+ console.log(code,'code=====')
+ console.log(code2,'code2=====')
+ data.code = code
+ data.code2 = code2
+ return data
},
/**
* 瑙ｆ瀽寰俊redirect_uri鍦板潃涓殑code2
@@ -367,10 +390,14 @@
//寰俊锛岃幏鍙朿ode
if(this.code==null||this.code==""){
// var url = encodeURIComponent("http://hesuancj.cn/#/index2?code2="+this.code2);
- var url = encodeURIComponent("http://hesuancj.cn/#/index2?code2="+this.code2);
- window.location.href ="https://open.weixin.qq.com/connect/oauth2/authorize?" +
- "appid=wx46e756aed958f895&redirect_uri="+url+"&response_type=code" +
- "&scope=snsapi_userinfo&state=STATE#wechat_redirect";
+ //var url = encodeURIComponent("http://hesuancj.cn/#/index2?code=1233&state=STATE?code2="+this.code2);
+ window.location.href = `http://192.168.0.8:8082/#/Index2?code=${encodeURIComponent('123')}&state=STATE?code2=${encodeURIComponent(this.code2)}`
+ window.location.href =url;
+
+
+ // window.location.href ="https://open.weixin.qq.com/connect/oauth2/authorize?" +
+ // "appid=wx46e756aed958f895&redirect_uri="+url+"&response_type=code" +
+ // "&scope=snsapi_userinfo&state=STATE#wechat_redirect";
//"&scope=SCOPE&state=STATE#wechat_redirect";
}else{
this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/api/getOpenId', {id:this.outParkId,code:this.code}, res => {
@@ -522,7 +549,7 @@
.el-button{
width: 100%;
background: rgba(74,76,89,1);
- padding: 1.056vh /* 12/11.36 */ 1.761vh /* 20/11.36 */;
+ //padding: 1.056vh /* 12/11.36 */ 1.761vh /* 20/11.36 */;
}
}
}
--
Gitblit v1.9.1