From a6fd20248270daab943d373c0849ae9b90a69ec8 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 22 十月 2024 22:20:50 +0800
Subject: [PATCH] feat: 修改页面和菜单

---
 src/components/page/Index2.vue |  153 +++++++++++++++++++++++++++++++++-----------------
 1 files changed, 101 insertions(+), 52 deletions(-)

diff --git a/src/components/page/Index2.vue b/src/components/page/Index2.vue
index 8525186..2720c15 100644
--- a/src/components/page/Index2.vue
+++ b/src/components/page/Index2.vue
@@ -5,44 +5,55 @@
             <!--<div class="text"><h1>宄板嘲鐭垮尯缁煎悎琛屾斂鎵ф硶灞�</h1></div>-->
             <!--<div class="right"></div>-->
         <!--</div>-->
-        <div class="weizhang-main-box">
+        <div class="weizhang-main-box" v-loading="loading">
             <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.timeStr}}鍒嗛挓
+                        <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()" :loading="payFlag">鍘荤即璐�</el-button>
+                      <template>
+                        <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>
+                      </template>
+
                     </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
+                        class="carSearch"
+                        label-position="left">
+                        <el-form-item
+                            class='formLabel'
+                            style="display: flex;
+                            flex-direction: column;align-items: center;justify-content: center"
+                            label="鏃� 鐗� 杞� 杈� 鏌� 璇�">
+                            <el-input prefix-icon="el-icon-search" style="margin-top: 20px;border: solid 1px #ccc!important;" 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 class="weizhang-footer-box" style="display: flex;justify-content: center;margin-top: 5.498vh" label-width="0">
+                            <el-button
+                                style="borderColor:'none';background:#121215e0 "
+                                class="jiaofei-btn" type="primary" @click="noCarOut()" v-show="showFlag">鏌ヨ</el-button>
                         </el-form-item>
                     </el-form>
 
@@ -68,7 +79,9 @@
                 showFlag2:true,
                 status3:0,
                 carNo:"",
-                code2:""
+                oldCarNo:"",
+                code2:"",
+                loading: false,
             }
         },
         created(){
@@ -81,10 +94,14 @@
             }
             //this.outParkId = cs.code;
             this.code2 = cs.code;
-            this.$byutil.postData(this, this.$systemconfig.basePath + '/outPark/findByBarrierCode', {code:cs.code}, res => {
-                this.statisticData = res.data;
+
+            this.loading = true;
+            this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/outpark/findByBarrierCode', {code:cs.code}, res => {
+              this.loading = false
+              this.statisticData = res.data;
                 this.outParkId = this.statisticData.id;
                 this.status3 = this.statisticData.status3;
+                this.oldCarNo = this.statisticData.carNo;
                 this.payFlag = false
                 if(this.status3==1){
                     this.$message({
@@ -106,36 +123,31 @@
                     });
                     return;
                 }
-                this.$byutil.postData(this, this.$systemconfig.basePath + '/ffPay/park', {id:this.outParkId}, res => {
-                    this.$message({
-                        message: '2绉掑悗鑷姩璺宠浆鍒版敮浠橀〉闈紝闃叉鍐呭缃戞暟鎹悓姝ュ欢杩燂紝璇风◢绛�',
-                        type: 'success',
-                        duration:2000,
-                    });
-                  setTimeout(function(){window.location.href = res.msg;},2000);
+                this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/api/park', {id:this.outParkId}, res => {
+                    window.location.href = res.msg
                     this.showFlag = false;
                 })
             },
             noCarOut(){
-                if(this.carNo){
-                    this.$byutil.postData(this, this.$systemconfig.basePath + '/outPark/outPark2', {code2:this.code2,carNo:this.carNo}, res => {
-                        if(res.success){
-                            this.outParkId = res.data.id;
-                            this.pay();
-                            this.showFlag = false;
-                        }else{
-                            this.$message({
-                                message: res.msg, type: 'error', duration:2000,
-                            });
-                        }
-
+                if(this.oldCarNo == '鏃犺溅鐗�'){
+                  if(this.carNo){
+                    this.$byutil.postData(this, this.$systemconfig.basePath + '/ffzf/car/outParkByPhone', {code2:this.code2,carNo:this.carNo}, res => {
+                      if(res.code===0){
+                        this.statisticData = res.data;
+                        this.outParkId = this.statisticData.id;
+                      }
                     })
-                }else{
+                  }else{
                     this.$message({
-                        message: '璇疯緭鍏ユ墜鏈哄彿',
-                        type: 'error',
-                        duration:2000,
+                      message: '璇疯緭鍏ユ墜鏈哄彿',
+                      type: 'error',
                     });
+                  }
+                }else {
+                  this.$message({
+                    message: '闈炴硶杈撳叆',
+                    type: 'error',
+                  });
                 }
 
             },
@@ -147,12 +159,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>
@@ -196,13 +220,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{
@@ -217,17 +246,37 @@
     }
     }
     .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 */;
+    }
+    .formLabel{
+      ::v-deep .el-form-item__label{
+        font-size: 18px;
+      }
+      ::v-deep el-input{
+        border: solid 1px #ccc!important;
+
+      }
+
+    }
+    .carSearch{
+      border:solid 1px #ccc;
+      margin-top: 15%;
+      border-radius: 4%;
+      box-shadow: 0px 0px 0px 10px;
+
+    }
 </style>

--
Gitblit v1.9.1