From 413e771cf893e7374dbdacad25b3f5f8f6d46cb7 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 16 十月 2024 15:39:49 +0800
Subject: [PATCH] fix: 泊车修改车位页面
---
src/components/page/IndexXTYH.vue | 458 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 349 insertions(+), 109 deletions(-)
diff --git a/src/components/page/IndexXTYH.vue b/src/components/page/IndexXTYH.vue
index 7fab5c5..1c59692 100644
--- a/src/components/page/IndexXTYH.vue
+++ b/src/components/page/IndexXTYH.vue
@@ -58,6 +58,38 @@
</div>
</div>
+ <div class="moreCarNum" v-if="pipaiCarNumShow">
+ <h1 class="title">浠ヤ笅鏄笌鎮ㄨ溅鐗屽彿鐩镐技鐨勫叆鍦鸿褰�</h1>
+ <div class="moreCarNum-main">
+ <el-table :data="moreCarNumData">
+ <el-table-column
+ prop="carNo"
+ label="杞︾墝"
+ align="left"
+ header-align="center"
+ min-width="30%"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="createTime"
+ label="鍏ュ満鏃堕棿"
+ align="left"
+ header-align="center"
+ min-width="50%"
+ >
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ header-align="center"
+ min-width="20%"
+ >
+ <template slot-scope="scope">
+ <el-button size="mini" type="success" @click="handleClickCarNum(scope.row)">纭畾</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
<div class="dialog-box">
<el-dialog
title="鏀粯"
@@ -100,13 +132,25 @@
width="100%">
<div class="again-dialog-main">
<h1>
- 鎮ㄥ凡鍙戣捣杩囨璁㈠崟缂磋垂鐢宠锛屽纭缂磋垂鎴愬姛锛岃鍘熷湴绛夊緟鎶潌锛屽缂磋垂鏈垚鍔燂紝璇风户缁敮浠�
+ 鎮ㄥ凡鍙戣捣杩囨璁㈠崟缂磋垂鐢宠锛屽纭缂磋垂鎴愬姛锛岃鍘熷湴绛夊緟鎶潌鎴栬仈绯荤鐞嗗憳锛屽缂磋垂鏈垚鍔燂紝璇风户缁敮浠�
</h1>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="againDialogVisible = false" type="primary">鍙栨秷</el-button>
<el-button @click="againPay" type="success">纭畾</el-button>
</span>
+ </el-dialog>
+ </div>
+ <div class="pipeicarNum-dialog-box">
+ <el-dialog
+ title="璇烽�夋嫨璇嗗埆姝ｇ‘鐨勮褰�"
+ :close-on-click-modal="false"
+ :visible.sync="pipeicardialogVisible"
+ width="100%">
+ <div class="peipeiCarnum">
+ <el-button size="mini" type="primary" @click="handleCarType(0)">鍏ュ満姝ｇ‘</el-button>
+ <el-button size="mini" type="primary" @click="handleCarType(1)">鍑哄満姝ｇ‘</el-button>
+ </div>
</el-dialog>
</div>
<tishi-dialog ref="TishiDialog" v-if="tishiDialogVisiable"></tishi-dialog>
@@ -127,6 +171,11 @@
},
data() {
return {
+ moreCarNumData:[], //鍖归厤杞︾墝Data
+ pipaiCar:false, //鍖归厤杞︾墝
+ pipeicardialogVisible: false, //鍖归厤寮规
+ enterParkId:null, //鍏ュ満id
+ pipaiCarNumShow:false, //鍖归厤鍐呭
tishiDialogVisiable: false,
tishiDialogVisiable2: false,
isShowjiaofei: true,
@@ -168,11 +217,13 @@
}
var url = window.location.href;
+ url = decodeURIComponent(url)
var count = url.split('?').length-1;
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)
+ // window.location.href = "http://192.168.0.8:8082/#/IndexXTYH39?code="+data.code+"&state=STATE&code2="+data.code2
+ window.location.href = `http://hesuancj.cn/#/index2?code=${encodeURIComponent(data.code)}&state=STATE&code2=${encodeURIComponent(data.code2)}`
+ return;
}
var cs = url.split('?')[1];
var cs_arr = cs.split('&');
@@ -180,10 +231,8 @@
for(var i=0;i<cs_arr.length;i++){
cs[cs_arr[i].split('=')[0]] = cs_arr[i].split('=')[1]
}
- // this.outParkId = cs.code;
this.code2 = cs.code2;
this.code = cs.code;
-
//鍒濆鍖栬烦杞� 39 鏈嶅姟鍣�
if(this.code2 == null || this.code2 == ''){
// this.$message({
@@ -191,13 +240,13 @@
// type: 'success',
// duration:1000,
// });
- window.location.href = "http://hesuancj.cn/#/index2?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);
+ //window.location.href = "http://60.0.121.40:8889/#/IndexXTYH39?code2="+cs.code //娴嬭瘯鐢ㄧ殑
return;
}
if(this.code != null && this.code != '') {
- this.dialogVisible = true
+ this.dialogVisible = true //绔嬪嵆鏀粯寮规
}else {
this.dialogVisible = false
}
@@ -217,22 +266,25 @@
this.payFlag = false
if(!this.statisticData.enterTime) { //娌℃湁鍏ュ満
this.isShowjiaofei = false
- this.tishiDialogVisiable = true
- // this.$message({
- // showClose: false,
- // duration:0,
- // type: 'success',
- // message: '鍏ュ満寮傚父锛岃鑱旂郴绠＄悊鍛�'
- // });
+ this.pipaiCarNumShow = true //鍖归厤鍖哄煙鏄剧ず
+ this.$byutil.getData(this,this.$systemconfig.basePath + '/ffzf/outpark/getLikeCar',{outParkId:this.outParkId},res => {
+ if(res.code == 0) {
+ if(res.data.length > 0) {
+ this.moreCarNumData = res.data.map(item => {
+ return {
+ ...item,
+ createTime: this.$moment(item.createTime).format('YYYY-MM-DD HH:mm:ss')
+ }
+ })
+ }else {
+ this.tishiDialogVisiable = true //鍏ュ満淇℃伅 寮傚父鎻愮ず
+ }
+ }
+ })
+
}else if(this.statisticData.enterTime && (!this.statisticData.price || this.statisticData.price == 0)) { //閲戦涓�0
this.isShowjiaofei = false
this.tishiDialogVisiable2 = true
- // this.$message({
- // showClose: false,
- // duration:0,
- // type: 'success',
- // message: '鏃犻渶缂磋垂锛岃鍘熷湴绛夊緟锛屾垨鑱旂郴绠＄悊鍛�'
- // });
}else {
this.isShowjiaofei = true
}
@@ -245,10 +297,31 @@
}
})
} catch (err) {
- // this.dataLoading = false
+ this.dataLoading = false
}finally {
// this.dataLoading = false
}
+ },
+ handleClickCarNum(item) { //鐐瑰嚮鍖归厤鍖哄煙鐨勭‘瀹氭寜閽�
+ console.log(item,'纭畾鎸夐挳')
+ this.pipeicardialogVisible = true
+ this.enterParkId = item.id
+
+ },
+ handleCarType(type) { //璇嗗埆姝ｇ‘鐨勮褰�
+ this.$byutil.getData(this,this.$systemconfig.basePath + '/ffzf/outpark/editOutPark',{type:type,outParkId:this.outParkId,enterParkId:this.enterParkId},res => {
+ console.log(res,'res==========')
+ if(res.code == 0) {
+ this.pipeicardialogVisible = false
+ this.statisticData = res.data
+ this.isShowjiaofei = true //缂磋垂鎸夐挳鏄剧ず
+ this.pipaiCarNumShow = false //鍏虫帀杞︾墝鍖归厤鍖哄煙
+ this.$message.success(res.msg)
+ }else {
+ this.pipeicardialogVisible = false
+ this.$message.error('鏇存柊澶辫触,璇疯仈绯荤鐞嗗憳')
+ }
+ })
},
pay(){
this.payFlag = true; //鍘荤即璐筶oading
@@ -268,8 +341,8 @@
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
@@ -285,11 +358,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){
@@ -341,10 +418,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
@@ -359,12 +454,12 @@
if(this.type == 0 ){
//寰俊锛岃幏鍙朿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 = `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 => {
if(res.code === 0){
@@ -451,98 +546,178 @@
<style lang="scss">
-.el-message{
- padding: 6.944vh /* 75/10.8 */ 0.78125vw /* 15/19.2 */ 6.944vh /* 75/10.8 */ 1.042vw /* 20/19.2 */;
-}
-.el-icon-success:before{
- content: none;
-}
-.el-message__content{
- font-size: 5vw;
-}
-.el-icon-error:before{
- font-size: 5vw
-}
-.weizhang-main-bootom{
- .el-input__inner{
- border:none;
+//.el-message{
+// padding: 6.944vh /* 75/10.8 */ 0.78125vw /* 15/19.2 */ 6.944vh /* 75/10.8 */ 1.042vw /* 20/19.2 */;
+//}
+.weizhang-box{
+ .el-form-item{
+ margin-bottom: 3.8vw!important;
}
.el-form-item__label{
- color: #000;
- font-weight: 600;
+ font-size: 3.73vw /* 28/7.5 */;
+ width: 21.33vw /* 160/7.5 */
+ !important;
+ line-height: 2.5;
}
-}
-.weizhang-footer-box{
.el-form-item__content{
- width: 100%;
- display: flex;
- justify-content: center;
+ font-size: 3.73vw /* 28/7.5 */;
+ line-height: 2.5;
}
- .el-button--small{
- padding: 11px 15px;
- font-size: 0.347rem /* 26/75 */;
+ .el-icon-success:before{
+ content: none;
}
-}
-.dialog-box{
- .el-dialog{
- bottom: 0;
- position: fixed;
- left: 0;
- margin: 0;
+ .el-message__content{
+ font-size: 5vw;
}
- .el-dialog__header{
- width: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
- padding: 1.87vw /* 14/7.5 */;
- background: rgba(103,201,122,0.1);
+ .el-icon-error:before{
+ font-size: 5vw
}
-}
-.dialog-box,.again-dialog-box{
- .el-dialog__body{
- padding: 2.67vw /* 20/7.5 */ 5.33vw /* 40/7.5 */;
+ .weizhang-main-bootom{
+ .el-input__inner{
+ border:none;
+ }
+ .el-form-item__label{
+ color: #000;
+ font-weight: 600;
+ }
}
- .el-dialog__title{
- font-size: 4vw /* 30/7.5 */;
- }
- .el-dialog__headerbtn{
- top: 2.67vw /* 20/7.5 */;
- }
- .dialog-footer{
- display: flex;
- width: 100% !important;
- .el-button{
+ .weizhang-footer-box{
+ .el-form-item__content{
width: 100%;
- background: rgba(74,76,89,1);
- padding: 1.056vh /* 12/11.36 */ 1.761vh /* 20/11.36 */;
+ display: flex;
+ justify-content: center;
+ }
+ .el-button--small{
+ padding: 11px 15px;
+ font-size: 0.347rem /* 26/75 */;
+ }
+ }
+ .dialog-box{
+ .el-dialog{
+ bottom: 0;
+ position: fixed;
+ left: 0;
+ margin: 0;
+ }
+ .el-dialog__header{
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 1.87vw /* 14/7.5 */;
+ background: rgba(103,201,122,0.1);
+ }
+ }
+ .dialog-box,.again-dialog-box{
+ .el-dialog__body{
+ padding: 2.67vw /* 20/7.5 */ 5.33vw /* 40/7.5 */;
+ }
+ .el-dialog__title{
+ font-size: 4vw /* 30/7.5 */;
+ }
+ .el-dialog__headerbtn{
+ top: 2.67vw /* 20/7.5 */;
+ }
+ .dialog-footer{
+ display: flex;
+ width: 100% !important;
+ .el-button{
+ width: 100%;
+ background: rgba(74,76,89,1);
+ //padding: 1.056vh /* 12/11.36 */ 1.761vh /* 20/11.36 */;
+ }
+ }
+ }
+ .again-dialog-box{
+ .el-button--success{
+ background: linear-gradient(to right, #33b1fe, #0679dc)!important;
+ }
+ .el-dialog__body{
+ padding: 8.67vw 5.33vw;
+ }
+ .el-dialog{
+ width: 80%!important;
+ margin-top: 47vh!important;
+ border-radius: 2.67vw /* 20/7.5 */;
+ }
+ .el-dialog__header{
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 1.87vw /* 14/7.5 */;
+ background: rgba(103,201,122,0.1);
+ }
+ }
+ .moreCarNum{
+ tr{
+ td{
+ &:nth-child(3) {
+ .cell{
+ padding-left: 0;
+ }
+ }
+ }
+ }
+ .el-button--mini, .el-button--mini.is-round{
+ padding: 0.816vh /* 7/11.36 */ 4vw /* 15/7.5 */;
+ }
+ .el-button--mini, .el-button--small{
+ font-size: 3.2vw /* 24/7.5 */;
+ }
+ .el-table td, .el-table th{
+ padding: 2.5vw /* 12/7.5 */ 0;
+ }
+ //.el-table td, .el-table th.is-leaf{
+ // border-bottom: 1px solid transparent;
+ //}
+ .el-table::before{
+ height: 0;
+ }
+ .el-table{
+ font-size: 3.47vw /* 26/7.5 */;
+ }
+ tbody{
+ tr:last-child {
+ td{
+ border-bottom:1px solid transparent;
+ }
+ }
+ }
+ }
+ .pipeicarNum-dialog-box{
+ .el-dialog{
+ width: 85%!important;
+ margin-top: 45vh!important;
+ border-radius: 2.67vw /* 20/7.5 */;
+ }
+ .el-dialog__title{
+ font-size: 4vw /* 30/7.5 */;
+ }
+ .el-button--mini{
+ padding: 3vw /* 18/7.5 */ 8vw /* 44/7.5 */;
+ font-size:3.73vw /* 28/7.5 */;
+ }
+ .el-dialog__header{
+ padding: 7vw /* 48/7.5 */ 6.4vw 4vw /* 30/7.5 */;
+ }
+ .el-dialog__body{
+ padding: 10vw /* 60/7.5 */ 5.33vw /* 40/7.5 */ 14vw 5.33vw;
}
}
}
-.again-dialog-box{
- .el-button--success{
- background: linear-gradient(to right, #33b1fe, #0679dc)!important;
- }
- .el-dialog__body{
- padding: 8.67vw 5.33vw;
- }
- .el-dialog{
- width: 80%!important;
- margin-top: 47vh!important;
- border-radius: 2.67vw /* 20/7.5 */;
- }
- .el-dialog__header{
- width: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
- padding: 1.87vw /* 14/7.5 */;
- background: rgba(103,201,122,0.1);
- }
-}
+
+
</style>
<style lang="scss" scoped>
+.weizhang-box{
+ height: 100%;
+ overflow-y: auto;
+ display: flex;
+ flex-direction: column;
+ padding-bottom: 2.67vw /* 20/7.5 */;
+}
h1,h2,h3,h4,h5{
font-family: '鑻规柟 涓瓑';
font-weight: normal;
@@ -574,10 +749,10 @@
width: 100%;
display: flex;
flex-direction: column;
- padding:5.33vw /* 40/7.5 */;
+ padding:0 /* 20/7.5 */ 5.33vw /* 40/7.5 */ 2.67vw /* 20/7.5 */ 5.33vw;
}
.weizhang-main-top{
- height: 21.489vh /* 300/13.34 */;
+ height: 15vh /* 300/13.34 */;
display: flex;
flex-direction: column;
justify-content: center;
@@ -681,4 +856,69 @@
}
}
}
+.moreCarNum{
+ width: 90%;
+ margin: 0 auto;
+ display: flex;
+ flex-direction: column;
+
+ .title{
+ font-size: 3.47vw /* 26/7.5 */;
+ margin-bottom: 2.67vw /* 20/7.5 */;
+ padding-left: 2.67vw /* 20/7.5 */;
+ font-weight: 550;
+ letter-spacing: 1px;
+ }
+ .moreCarNum-heard{
+ width: 100%;
+ display: flex;
+ .moreCarNum-block{
+ text-align: center;
+ h1{
+ font-size: 3.47vw /* 26/7.5 */;
+ }
+ &:nth-child(1){
+ width: 30%;
+ }
+ &:nth-child(2){
+ width: 50%;
+ }
+ &:nth-child(3){
+ width: 20%;
+ }
+ }
+ }
+ .moreCarNum-main{
+ border: 1px solid #dbdbdb;
+ border-radius: 2.67vw /* 20/7.5 */;
+ padding: 1.07vw /* 8/7.5 */ 2.67vw /* 20/7.5 */;
+ box-sizing: border-box;
+ width: 100%;
+ min-height: 17.366vh /* 220/11.36 */;
+ max-height: 25vh /* 250/11.36 */;
+ overflow-y: auto;
+ }
+ .moreCarNum-line{
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ margin-top: 3.2vw /* 24/7.5 */;
+ .moreCarNum-block{
+ display: flex;
+ h1{
+ font-size: 3.73vw /* 28/7.5 */;
+ font-weight: 550;
+ margin-right: 5.33vw /* 40/7.5 */;
+ }
+ h2{
+ font-size: 3.73vw /* 28/7.5 */;
+ }
+ }
+ }
+}
+.peipeiCarnum{
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+}
</style>
--
Gitblit v1.9.1