From dc7ef35a8d972bdd853c8324703087ac4b6b9063 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期五, 31 三月 2023 16:52:46 +0800
Subject: [PATCH] 细节修改
---
src/components/page/Index2.vue | 113 ++++++++++++++++++++++++++++----------------------------
1 files changed, 56 insertions(+), 57 deletions(-)
diff --git a/src/components/page/Index2.vue b/src/components/page/Index2.vue
index 953f13f..acb6fd4 100644
--- a/src/components/page/Index2.vue
+++ b/src/components/page/Index2.vue
@@ -8,43 +8,43 @@
<div class="weizhang-main-box">
<div class="weizhang-main-top">
<img class="logoPhone" src="../../assets/images/logoImg.png" alt="">
- <span class="money">锟{this.statisticData.price}}</span>
<span class="weizhang">鍋滆溅鏀惰垂</span>
+ <span class="money">锟{this.statisticData.price}}</span>
</div>
<div class="weizhang-main-bootom">
<div class="weizhang-main-form">
- <el-form label-width="100px" :model="statisticData" label-position="left">
- <el-form-item label="杞︾墝鍙�" style="margin-left: 25px;">
+ <el-form label-width="80px" :model="statisticData" label-position="left">
+ <el-form-item label="杞︾墝鍙�:" style="margin-left: 25px;">
{{this.statisticData.carNo}}
</el-form-item>
- <el-form-item label="杩涘満鏃堕棿" style="margin-left: 25px;">
+ <el-form-item label="杩涘満鏃堕棿:" style="margin-left: 25px;">
{{this.statisticData.enterTime}}
</el-form-item>
- <el-form-item label="鍑哄満鏃堕棿" style="margin-left: 25px;">
+ <el-form-item label="鍑哄満鏃堕棿:" style="margin-left: 25px;">
{{this.statisticData.createTime}}
</el-form-item>
- <el-form-item label="鍋滅暀鏃堕棿" style="margin-left: 25px;">
- {{this.statisticData.time}}鍒嗛挓
+ <el-form-item label="鍋滅暀鏃堕棿:" style="margin-left: 25px;">
+ {{this.statisticData.timeStr}}
</el-form-item>
- <el-form-item label="浣嶇疆" style="margin-left: 25px;">
+ <el-form-item label="鍋滆溅鍦�:" style="margin-left: 25px;">
{{this.statisticData.parkName}}
</el-form-item>
- <el-form-item label="璁㈠崟鍙�" style="margin-left: 25px;">
+ <el-form-item label="璁㈠崟鍙�:" style="margin-left: 25px;">
{{this.statisticData.code}}
<!--<el-input v-model="statisticData.code" readonly></el-input>-->
</el-form-item>
- <el-form-item style="display: flex;justify-content: center;margin-top: 4.498vh" label-width="0" v-show="showFlag">
- <el-button class="jiaofei-btn" type="primary" @click="pay()">鍘荤即璐�</el-button>
+ <el-form-item class="weizhang-footer-box" style="display: flex;justify-content: center;margin-top: 5.498vh" label-width="0" v-show="showFlag">
+ <el-button class="jiaofei-btn" type="primary" @click="pay()" :loading="payFlag">鍘荤即璐�</el-button>
</el-form-item>
</el-form>
- <el-form label-width="100px" label-position="left">
- <el-form-item label="璇疯緭鍏ユ墜鏈哄彿" style="margin-left: 5px;">
- <el-input v-model="carNo" placeholder="璇疯緭鍏ユ墜鏈哄彿"></el-input>
- </el-form-item>
- <el-form-item style="display: flex;justify-content: center;margin-top: 2px" label-width="0">
- <el-button class="jiaofei-btn" type="primary" @click="noCarOut()" v-show="showFlag">鏃犵墝鍑哄満缂磋垂</el-button>
- </el-form-item>
- </el-form>
+<!-- <el-form label-width="100px" label-position="left">-->
+<!-- <el-form-item label="璇疯緭鍏ユ墜鏈哄彿" style="margin-left: 5px;">-->
+<!-- <el-input v-model="carNo" placeholder="璇疯緭鍏ユ墜鏈哄彿"></el-input>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item style="display: flex;justify-content: center;margin-top: 2px" label-width="0">-->
+<!-- <el-button class="jiaofei-btn" type="primary" @click="noCarOut()" v-show="showFlag">鏃犵墝鍑哄満缂磋垂</el-button>-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
</div>
@@ -59,6 +59,7 @@
name: 'dashboard',
data() {
return {
+ payFlag:false,
outParkId:"",
statisticData:{
@@ -82,10 +83,9 @@
this.code2 = cs.code;
this.$byutil.postData(this, this.$systemconfig.basePath + '/outPark/findByBarrierCode', {code:cs.code}, res => {
this.statisticData = res.data;
- this.statisticData.enterTime = this.dateFormat('yyyy-MM-dd HH:mm:ss',this.statisticData.enterTime)
- this.statisticData.createTime = this.dateFormat('yyyy-MM-dd HH:mm:ss',this.statisticData.createTime)
this.outParkId = this.statisticData.id;
this.status3 = this.statisticData.status3;
+ this.payFlag = false
if(this.status3==1){
this.$message({
message: '鎮ㄦ湁杩濈珷鏈鐞嗭紝璇峰厛澶勭悊鎴栬仈绯诲仠杞﹀満绠＄悊浜哄憳',
@@ -97,21 +97,22 @@
},
methods: {
pay(){
+ this.payFlag = true;
if(this.status3==1){
this.$message({
message: '鎮ㄦ湁杩濈珷鏈鐞嗭紝璇峰厛澶勭悊鎴栬仈绯诲仠杞﹀満绠＄悊浜哄憳',
type: 'error',
- duration:5000,
+ duration:3000,
});
return;
}
this.$byutil.postData(this, this.$systemconfig.basePath + '/ffPay/park', {id:this.outParkId}, res => {
this.$message({
- message: '10绉掑悗鑷姩璺宠浆鍒版敮浠橀〉闈紝闃叉鍐呭缃戞暟鎹悓姝ュ欢杩燂紝璇风◢绛�',
+ message: '2绉掑悗鑷姩璺宠浆鍒版敮浠橀〉闈紝闃叉鍐呭缃戞暟鎹悓姝ュ欢杩燂紝璇风◢绛�',
type: 'success',
- duration:10000,
+ duration:2000,
});
- setTimeout(function(){window.location.href = res.data.obj;},10000);
+ setTimeout(function(){window.location.href = res.msg;},2000);
this.showFlag = false;
})
},
@@ -124,7 +125,7 @@
this.showFlag = false;
}else{
this.$message({
- message: res.message, type: 'error', duration:2000,
+ message: res.msg, type: 'error', duration:2000,
});
}
@@ -138,28 +139,6 @@
}
},
- dateFormat(fmt, date) {
- let ret
- const opt = {
- 'y+': date.getFullYear().toString(), // 骞�
- 'M+': (date.getMonth() + 1).toString(), // 鏈�
- 'd+': date.getDate().toString(), // 鏃�
- 'H+': date.getHours().toString(), // 鏃�
- 'm+': date.getMinutes().toString(), // 鍒�
- 's+': date.getSeconds().toString(), // 绉�
- // 鏈夊叾浠栨牸寮忓寲瀛楃闇�姹傚彲浠ョ户缁坊鍔狅紝蹇呴』杞寲鎴愬瓧绗︿覆
- }
- for (let k in opt) {
- ret = new RegExp('(' + k + ')').exec(fmt)
- if (ret) {
- fmt = fmt.replace(
- ret[1],
- ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
- )
- }
- }
- return fmt
- },
}
}
@@ -168,12 +147,24 @@
<style lang="scss">
.weizhang-main-bootom{
- .el-input__inner{
- border:none;
+ .el-input__inner{
+ border:none;
+ }
+ .el-form-item__label{
+ color: #000;
+ font-weight: 600;
+ }
}
- .el-form-item__label{
- color: #999999;
- }
+ .weizhang-footer-box{
+ .el-form-item__content{
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ }
+ .el-button--small{
+ padding: 11px 15px;
+ font-size: 0.347rem /* 26/75 */;
+ }
}
</style>
@@ -217,13 +208,18 @@
flex-direction: column;
justify-content: center;
align-items: center;
+ border-bottom: 1px solid #f0f0f0;
.money{
font-size: 6.93vw /* 52/7.5 */;
font-weight: 550;
+ color: #000;
}
.weizhang{
- font-size: 4.8vw /* 36/7.5 */;
+ font-size: 0.4rem /* 30/75 */;
+ line-height: 2;
+ font-weight: normal;
margin-top:1.33vw /* 10/7.5 */;
+ color: #000;
}
}
.weizhang-main-form{
@@ -238,17 +234,20 @@
}
}
.jiaofei-btn{
- width: 64.53vw /* 484/7.5 */;
+ width: 80%;
border-radius: 5.33vw /* 40/7.5 */;
background-image: linear-gradient(to right,#33b1fe,#0679dc);
}
.logoPhone{
margin-top: 0.67vw;
- width: 20vw /* 180/7.5 */;
- height: 20vw /* 180/7.5 */;
+ width: 1.333rem /* 100/75 */;
+ height: 1.333rem /* 100/75 */;
}
.el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
margin-bottom: 10px;
}
+ .weizhang-main-bootom{
+ margin-top: 0.333rem /* 25/75 */;
+ }
</style>
--
Gitblit v1.9.1