From 33a4aea948f53eca715c72860680eeb74fdba3f4 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Wed, 2 Mar 2022 18:28:05 +0800
Subject: [PATCH] update

---
 src/components/dialog/index.vue               | 141 ++++++++++++++++--
 src/components/dialog2/index.vue              |   2 +-
 src/components/needBefore/index.vue           |   6 +-
 src/components/tipDialog/index.vue            |  68 ++++++++-
 src/pages/counter/list/index.vue              |  97 ++++++------
 src/pages/index/list/index.vue                |  20 ++-
 src/pages/lobbyManager/list/index.vue         |   1 +
 .../manage/list/client/consumerClient.vue     |  17 ---
 src/utils/utilFunction.js                     |   9 +-
 9 files changed, 262 insertions(+), 99 deletions(-)

diff --git a/src/components/dialog/index.vue b/src/components/dialog/index.vue
index 2f2c552..b540792 100644
--- a/src/components/dialog/index.vue
+++ b/src/components/dialog/index.vue
@@ -1,27 +1,30 @@
 <template>
 <!-- width="55%" -->
 <!-- class="2xl:w-screen xl:w-screen lg:w-full md:w-full h-auto 2xl:left-72" -->
+
+    
     <el-dialog
-        style="margin-top:0vh"
-        :visible="visible"
         
-        class="2xl:w-9/12 xl:w-screen lg:w-full md:w-full h-auto mx-auto"
+        :visible="visible"
+        class="m-auto"
         append-to-body
         :close-on-click-modal="true" 
         :show-close="false" 
-        custom-class="data-dia">
+        style="border-radius: 50px;"
+        custom-class="  data-dia23 w-2/4  ">
         <div slot="title" class="dia-header">
-            <div class="data-title" v-if="flow === 1 || flow === 2">提交</div>
+            <div class="data-title" v-if="flow === 1 || flow === 2">提示</div>
+            <div class="data-title" v-else-if="flow === 4">提交</div>
             <div class="data-title" v-else>提交成功</div>
         </div>
         <div class="popBody" v-if="flow === 1">
             <h2 class="text-red-500 text-2xl">本业务需要授权</h2>
         </div>
         <div class="popBody" v-else-if="flow === 4">
-            <h2 class="text-red-500 text-2xl">提交后将不可更改，您确认提交吗？</h2>
+            <h2 class="text-red-500 text-2xl">提交后将不可更改，您确定要提交吗？</h2>
         </div>
         <div class="popBody" v-else-if="flow === 2">
-            <el-form ref="form2" :model="disForm" label-width="80px">
+            <el-form ref="form2" :model="disForm" label-width="80px" class="text-3xl">
                     <el-form-item label="授权柜员">
                     <el-input disabled v-model="disForm.name"></el-input>
                 </el-form-item>
@@ -30,7 +33,7 @@
                 </el-form-item>
             </el-form>
         </div>
-        <div class="popBody" v-else>
+        <div class="popBody w-full" v-else>
             <el-row :gutter="20">
                 <el-form label-width="100px">
                     <el-col :span="10"  :offset="1">
@@ -54,6 +57,57 @@
             <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="sureIt">确 定</el-button>
         </div>
     </el-dialog>
+    <!-- <div class="bg-gray-50 test">
+        <div width="900px" class="data-dia22 max-h-screen 2xl:-mt-20;" ref="dataDia" v-drag>
+            <div class="dia-header">
+                <div class="data-title" v-if="flow === 1 || flow === 2">授权</div>
+                <div class="data-title" v-else>提交成功</div>
+                <img class="close" src="@/assets/svg/close.svg" alt="" @click="cancelIt" />
+            </div>
+            <div class="popBody" v-if="flow === 1">
+                <h2 class="text-red-500 text-2xl">本业务需要授权</h2>
+            </div>
+            <div class="popBody" v-else-if="flow === 4">
+                <h2 class="text-red-500 text-2xl">提交后将不可更改，您确认提交吗？</h2>
+            </div>
+            <div class="popBody" v-else-if="flow === 2">
+                <el-form ref="form2" :model="disForm" label-width="80px">
+                        <el-form-item label="授权柜员">
+                        <el-input disabled v-model="disForm.name"></el-input>
+                    </el-form-item>
+                    <el-form-item label="授权柜员">
+                        <el-input type="password" disabled v-model="disForm.pass"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div class="popBody w-full" v-else>
+                <el-row :gutter="20">
+                    <el-form label-width="100px">
+                        <el-col :span="10"  :offset="1">
+                            <el-form-item v-for="(val, key) in leftObj" :key="key" :label="key + ':'">
+                                <div>{{ val }}</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="10"  :offset="1">
+                            <el-form-item v-for="(val, key) in rightObj" :key="key" :label="key + ':'">
+                                <div>{{ val }}</div>
+                            </el-form-item>
+                        </el-col>
+                    </el-form>
+                </el-row>
+            </div>
+            <div class="popBtns" v-if="flow === 1 || flow === 2 || flow === 4">
+                <el-button class="close btn hover:bg-blue-100 " @click="cancelIt">取 消</el-button>
+                <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="sureIt">确 定</el-button>
+            </div>
+            <div class="myPopBtns" v-else>
+                <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="sureIt">确 定</el-button>
+            </div>
+        </div>
+
+        <div class="masking"></div>
+    </div> -->
+    
 </template>
 
 <script>
@@ -293,7 +347,6 @@ export default {
             }
             return str;
         }
-        console.log(num)
         if(num%2 === 1) {
             this.leftObj['流水号'] = tmpFunc2()
             this.leftObj['经办机构'] = '国税支行营业部'
@@ -370,16 +423,75 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+    .test {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 0;
+        height: 0;
+        z-index: 9899999;
+    }
+    .masking{
+        width: 100vw;
+        height: 100vh;
+        top: 0;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        opacity: .5;
+        background-color: rgba(51,51,51,.9);
+    }
+    .data-dia23{
+        position: absolute;
+        z-index: 9999;
+        .popBody {
+            min-height: 30vh;
+            display: flex;
+            align-items: center;
+            .el-form {
+                min-width: 70%;
+                height: 100%;
+                font-size: 30px;
+            }
+        }
+        .el-dialog__header{
+            padding: 0;
+            border-bottom: 0;
+            border-radius: 16px;
+            .dia-header{
+                position: relative;
+                .data-title{
+                    width: 300px;
+                    margin: 0 auto;
+                    line-height: 72px;
+                    text-align: center;
+                    color: #fff;
+                    font-size: 24px;
+                    background: url(../../assets/img/dia-title.png) 0 0/cover no-repeat;
+                }
+                .close{
+                    position: absolute;
+                    top: 15px;
+                    right: 15px;
+                    cursor: pointer;
+                }
+            }
+        }
+    }
+
     /deep/ .el-row {
         width: 100%;
     }
-    /deep/.popbody {
-        width: 100vw!important;
-    }
+    // /deep/.popbody {
+    //     width: 100vw!important;
+    //     height: 100%!important;
+    //     background-color: red!important;;
+    // }
     .popBtns {
         display: flex;
         justify-content: center;
         align-items: center;
+        margin-top: 200px;
         & > .btn {
             width: 180px;
         border-radius: 10px;
@@ -393,8 +505,8 @@ export default {
         align-items: center;
         & > .btn {
             width: 180px;
-        border-radius: 10px;
-        font-size: 18px;
+            border-radius: 10px;
+            font-size: 18px;
         }
         
     }
@@ -403,4 +515,5 @@ export default {
     //     left: 50%;
     //     transform: translateX(-25%);
     // }
+    
 </style>
\ No newline at end of file
diff --git a/src/components/dialog2/index.vue b/src/components/dialog2/index.vue
index 5045d43..eb92996 100644
--- a/src/components/dialog2/index.vue
+++ b/src/components/dialog2/index.vue
@@ -6,7 +6,7 @@
         append-to-body
         :close-on-click-modal="true" 
         :show-close="false" 
-        custom-class="data-dia">
+        custom-class="data-dia ">
         <div slot="title" class="dia-header">
             <div class="data-title" v-if="flow === 1 || flow === 2">提交</div>
             <div class="data-title" v-else>提交成功</div>
diff --git a/src/components/needBefore/index.vue b/src/components/needBefore/index.vue
index 49acc3b..bfcf985 100644
--- a/src/components/needBefore/index.vue
+++ b/src/components/needBefore/index.vue
@@ -50,7 +50,7 @@ export default {
         }else {
             this.$message({
                 message: '请先完成' + obj[this.moduleName],
-                type: 'info'
+                type: 'warning'
             });
         }
         
@@ -60,13 +60,13 @@ export default {
             // this.$router.push(obj[this.moduleName])
             this.$message({
                 message: '请先完成' + obj[this.moduleName],
-                type: 'info'
+                type: 'warning'
             });
         },
         goto2() {
             this.$message({
                 message: '您无需完成该操作！',
-                type: 'info'
+                type: 'warning'
             });
         },
     },
diff --git a/src/components/tipDialog/index.vue b/src/components/tipDialog/index.vue
index 4d169e9..028ed6b 100644
--- a/src/components/tipDialog/index.vue
+++ b/src/components/tipDialog/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog  :visible="tipsOperate? true: false" width="400px" :close-on-click-modal="false" :modal="false" :close-on-press-escape="false" :show-close="false" custom-class=" data-dia">
+    <!-- <el-dialog  :visible="tipsOperate? true: false" width="400px" :close-on-click-modal="false" :modal="false" :close-on-press-escape="false" :show-close="false" custom-class=" data-dia">
         <div slot="title" class="dia-header">
             <div class="data-title">小提示</div>
             <img class="close" src="@/assets/svg/close.svg" alt="" @click="hide">
@@ -12,11 +12,20 @@
                 <svg t="1646104114458" v-else-if="showText.includes('密码')" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7044" width="200" height="200"><path d="M815.712 226.56c-50.24-54.784-125.6-82.208-200.96-73.088-93.632 11.424-171.264 82.208-191.808 175.84-6.848 36.544-6.848 73.088 2.272 107.328L151.2 710.656c-4.576 4.576-6.848 9.12-6.848 16V856.8c0 13.696 9.12 22.848 22.848 22.848h130.144c13.696 0 22.848-9.12 22.848-22.848v-54.784h57.088c13.696 0 22.848-9.12 22.848-22.848v-54.784h54.816c13.696 0 22.848-9.12 22.848-22.848v-54.784h54.784c13.696 0 22.848-9.12 22.848-22.848 0-16 13.696-29.696 29.696-25.12 27.392 9.12 57.088 9.12 86.784 6.848 107.328-11.424 191.808-98.208 200.96-203.232 6.848-66.24-13.696-127.904-57.088-175.84z m11.424 171.264c-6.848 84.48-75.36 152.992-159.84 162.112-25.12 4.576-47.968 2.272-70.784-4.576-6.848-2.272-11.424-2.272-18.272-2.272-29.696 0-57.088 20.544-66.208 47.968h-59.36c-13.696 0-22.848 9.12-22.848 22.848v54.784h-54.816c-13.696 0-22.848 9.12-22.848 22.848v54.784h-54.816c-13.696 0-22.848 9.12-22.848 22.848v54.784h-84.48v-98.176l278.592-278.592c4.576-4.576 6.848-13.696 4.576-22.848-9.12-29.696-11.424-63.936-4.576-95.904 16-73.088 77.632-132.448 152.992-141.568 59.36-6.848 118.752 16 159.84 59.36 34.24 38.816 50.208 89.056 45.664 141.568zM646.72 263.104c-63.936 0-114.176 50.24-114.176 114.176s50.24 114.176 114.176 114.176 114.176-50.24 114.176-114.176-50.24-114.176-114.176-114.176z m0 182.656c-38.816 0-68.512-29.696-68.512-68.512s29.696-68.512 68.512-68.512 68.512 29.696 68.512 68.512-29.696 68.512-68.512 68.512z" p-id="7045"></path></svg>
                 <svg t="1646105052843" v-else-if="showText.includes('盖章')" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10246" width="200" height="200"><path d="M859.6 859.6H164.4c-15.9 0-29-13-29-29V685.8c0-47.8 39.1-86.9 86.9-86.9h185.4c-5.8-34.8-23.2-68.1-47.8-97-33.3-37.7-50.7-85.5-50.7-134.7 0-55 21.7-107.2 62.3-146.3S464.2 163 520.7 164.4C625 168.7 713.3 258.5 714.8 362.8c1.4 52.1-18.8 102.8-53.6 141.9-24.6 26.1-39.1 57.9-44.9 94.2h185.4c47.8 0 86.9 39.1 86.9 86.9v144.8c0 16-13 29-29 29z m-666.3-57.9h637.3V685.8c0-15.9-13-29-29-29H584.4c-15.9 0-29-13-29-29 0-60.8 21.7-118.8 62.3-162.2 26.1-27.5 39.1-63.7 39.1-101.4C655.4 288.9 593.1 225.1 517.7 222.3c-40.6-1.4-78.2 13-105.7 40.6-29 27.5-44.9 65.2-44.9 104.3 0 34.8 13 69.5 36.2 95.6 42 47.8 65.2 105.7 65.2 165.1 0 15.9-13 29-29 29H222.3c-15.9 0-29 13-29 29v115.8z" p-id="10247"></path></svg>
                 <svg t="1646122277509" v-else class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3421" width="200" height="200"><path d="M512 958.016611c-245.919634 0-446.016611-200.064292-446.016611-446.016611 0-245.919634 200.095256-446.016611 446.016611-446.016611 245.952318 0 446.016611 200.064292 446.016611 446.016611S757.952318 958.016611 512 958.016611zM512 129.983389c-210.655557 0-382.016611 171.359333-382.016611 382.016611 0 210.624593 171.359333 382.016611 382.016611 382.016611 210.624593 0 382.016611-171.359333 382.016611-382.016611S722.624593 129.983389 512 129.983389z" p-id="3422"></path><path d="M463.99957 304.00043c0 26.509985 21.490445 48.00043 48.00043 48.00043s48.00043-21.490445 48.00043-48.00043-21.490445-48.00043-48.00043-48.00043S463.99957 277.490445 463.99957 304.00043z" p-id="3423"></path><path d="M512 768c-17.664722 0-32.00086-14.303454-32.00086-32.00086L479.99914 448c0-17.664722 14.336138-32.00086 32.00086-32.00086s32.00086 14.336138 32.00086 32.00086l0 287.99914C544.00086 753.696546 529.664722 768 512 768z" p-id="3424"></path></svg>
-                <!-- <img src="@/assets/img/others/iceDun.jpg" alt="" v-else> -->
+                
             </div>
             <h6>{{ showText }}</h6>
         </div>
-    </el-dialog>
+    </el-dialog> -->
+    <div class='tipsMessage' :class="{ hidden: !tipsOperate }">
+        <svg t="1646193086896" fill="#FEFFFF" v-if="showText.includes('成功')" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4086" width="200" height="200"><path d="M878.08 731.274667a32 32 0 0 1-54.88-32.938667A360.789333 360.789333 0 0 0 874.666667 512c0-200.298667-162.368-362.666667-362.666667-362.666667S149.333333 311.701333 149.333333 512s162.368 362.666667 362.666667 362.666667a360.789333 360.789333 0 0 0 186.314667-51.445334 32 32 0 0 1 32.928 54.88A424.778667 424.778667 0 0 1 512 938.666667C276.362667 938.666667 85.333333 747.637333 85.333333 512S276.362667 85.333333 512 85.333333s426.666667 191.029333 426.666667 426.666667c0 78.293333-21.152 153.568-60.586667 219.274667zM374.581333 489.450667l84.341334 83.989333 190.432-190.72a32 32 0 0 1 45.290666 45.226667l-213.013333 213.333333a32 32 0 0 1-45.226667 0.064l-106.986666-106.549333a32 32 0 1 1 45.162666-45.344z" p-id="4087"></path></svg>
+        <svg t="1646193026146" fill="#FEFFFF" v-else-if="showText.includes('失败') || showText.includes('请放入') || showText.includes('不一致')|| showText.includes('不足')|| showText.includes('错误')" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3279" width="200" height="200"><path d="M942.792571 235.113605c-73.898726-114.998017-188.296753-194.296649-321.894449-223.296149-133.597696-28.9995-270.495335-4.199928-385.493352 69.698798-21.299633 13.699764-27.499526 42.099274-13.799762 63.398907 13.699764 21.299633 42.099274 27.499526 63.398907 13.799762 94.298374-60.698953 206.696435-80.998603 316.294545-57.199014 109.59811 23.79959 203.396492 88.898467 264.095445 183.196841 125.297839 194.796641 68.698815 455.19215-125.997827 580.489989-94.298374 60.698953-206.696435 80.998603-316.294545 57.199013-109.59811-23.79959-203.49649-88.898467-264.095445-183.19684-93.198393-144.997499-88.998465-329.594316 10.799814-470.191891 14.699746-20.699643 9.799831-49.29915-10.899813-63.998897-20.699643-14.699746-49.29915-9.799831-63.998896 10.899812-121.597903 171.397044-126.697815 396.293165-12.999776 572.990118 73.998724 114.998017 188.296753 194.296649 321.894449 223.29615 36.499371 7.899864 73.198738 11.799796 109.59811 11.799796 97.098325 0 192.196685-27.799521 275.795243-81.498594 237.295908-152.697367 306.194719-469.991894 153.597352-707.387801z" p-id="3280"></path><path d="M356.302685 667.706145c8.999845 8.999845 20.699643 13.399769 32.49944 13.399769s23.499595-4.499922 32.499439-13.399769l90.798434-90.798434 90.798434 90.798434c8.999845 8.999845 20.699643 13.399769 32.49944 13.399769s23.499595-4.499922 32.499439-13.399769c17.899691-17.899691 17.899691-46.999189 0-64.898881l-90.99843-90.798434 90.798434-90.798434c17.899691-17.899691 17.899691-46.999189 0-64.898881-17.899691-17.899691-46.999189-17.899691-64.898881 0L512 447.109949l-90.798434-90.798434c-17.899691-17.899691-46.999189-17.899691-64.898881 0-17.899691 17.899691-17.899691 46.999189 0 64.898881l90.798434 90.798434-90.798434 90.798434c-17.899691 17.899691-17.899691 46.899191 0 64.898881z" p-id="3281"></path></svg>
+        <svg t="1646103528503" fill="#FEFFFF"  v-else-if="showText.includes('刷')" class="icon text-center w-full" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1986" width="200" height="200"><path d="M64 469.333333a21.333333 21.333333 0 0 1-16.896-34.304l141.354667-184.277333a176.682667 176.682667 0 0 1 62.208-50.944 21.333333 21.333333 0 1 1 18.773333 38.357333 131.882667 131.882667 0 0 0-47.146667 38.570667l-141.397333 184.234667A21.333333 21.333333 0 0 1 64 469.333333zM874.666667 640h-360.405334a21.333333 21.333333 0 0 1 0-42.666667H874.666667a64.085333 64.085333 0 0 0 64-64v-298.666666A64.085333 64.085333 0 0 0 874.666667 170.666667h-469.333334A64.085333 64.085333 0 0 0 341.333333 234.666667v225.024a21.333333 21.333333 0 0 1-42.666666 0V234.666667A106.794667 106.794667 0 0 1 405.333333 128h469.333334A106.794667 106.794667 0 0 1 981.333333 234.666667v298.666666a106.794667 106.794667 0 0 1-106.666666 106.666667z" p-id="1987"></path><path d="M248.021333 810.666667H64a21.333333 21.333333 0 0 1 0-42.666667h184.021333a192.597333 192.597333 0 0 0 160.512-85.930667 208.341333 208.341333 0 0 1 60.842667-59.861333l84.778667-54.613333a50.645333 50.645333 0 0 0-57.173334-80.810667l-253.866666 108.8a21.333333 21.333333 0 1 1-16.853334-39.168l253.866667-108.8a93.312 93.312 0 0 1 102.741333 151.68 20.224 20.224 0 0 1-3.541333 2.858667l-86.869333 55.893333a165.973333 165.973333 0 0 0-48.426667 47.701333A235.093333 235.093333 0 0 1 247.978667 810.666667zM320 298.666667a21.333333 21.333333 0 0 1-0.042667-42.666667l553.557334-0.853333a21.333333 21.333333 0 0 1 0.085333 42.666666L320 298.666667z" p-id="1988"></path></svg>
+        <svg t="1646104114458" fill="#FEFFFF" v-else-if="showText.includes('密码')" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7044" width="200" height="200"><path d="M815.712 226.56c-50.24-54.784-125.6-82.208-200.96-73.088-93.632 11.424-171.264 82.208-191.808 175.84-6.848 36.544-6.848 73.088 2.272 107.328L151.2 710.656c-4.576 4.576-6.848 9.12-6.848 16V856.8c0 13.696 9.12 22.848 22.848 22.848h130.144c13.696 0 22.848-9.12 22.848-22.848v-54.784h57.088c13.696 0 22.848-9.12 22.848-22.848v-54.784h54.816c13.696 0 22.848-9.12 22.848-22.848v-54.784h54.784c13.696 0 22.848-9.12 22.848-22.848 0-16 13.696-29.696 29.696-25.12 27.392 9.12 57.088 9.12 86.784 6.848 107.328-11.424 191.808-98.208 200.96-203.232 6.848-66.24-13.696-127.904-57.088-175.84z m11.424 171.264c-6.848 84.48-75.36 152.992-159.84 162.112-25.12 4.576-47.968 2.272-70.784-4.576-6.848-2.272-11.424-2.272-18.272-2.272-29.696 0-57.088 20.544-66.208 47.968h-59.36c-13.696 0-22.848 9.12-22.848 22.848v54.784h-54.816c-13.696 0-22.848 9.12-22.848 22.848v54.784h-54.816c-13.696 0-22.848 9.12-22.848 22.848v54.784h-84.48v-98.176l278.592-278.592c4.576-4.576 6.848-13.696 4.576-22.848-9.12-29.696-11.424-63.936-4.576-95.904 16-73.088 77.632-132.448 152.992-141.568 59.36-6.848 118.752 16 159.84 59.36 34.24 38.816 50.208 89.056 45.664 141.568zM646.72 263.104c-63.936 0-114.176 50.24-114.176 114.176s50.24 114.176 114.176 114.176 114.176-50.24 114.176-114.176-50.24-114.176-114.176-114.176z m0 182.656c-38.816 0-68.512-29.696-68.512-68.512s29.696-68.512 68.512-68.512 68.512 29.696 68.512 68.512-29.696 68.512-68.512 68.512z" p-id="7045"></path></svg>
+        <svg t="1646105052843" fill="#FEFFFF" v-else-if="showText.includes('盖章')" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10246" width="200" height="200"><path d="M859.6 859.6H164.4c-15.9 0-29-13-29-29V685.8c0-47.8 39.1-86.9 86.9-86.9h185.4c-5.8-34.8-23.2-68.1-47.8-97-33.3-37.7-50.7-85.5-50.7-134.7 0-55 21.7-107.2 62.3-146.3S464.2 163 520.7 164.4C625 168.7 713.3 258.5 714.8 362.8c1.4 52.1-18.8 102.8-53.6 141.9-24.6 26.1-39.1 57.9-44.9 94.2h185.4c47.8 0 86.9 39.1 86.9 86.9v144.8c0 16-13 29-29 29z m-666.3-57.9h637.3V685.8c0-15.9-13-29-29-29H584.4c-15.9 0-29-13-29-29 0-60.8 21.7-118.8 62.3-162.2 26.1-27.5 39.1-63.7 39.1-101.4C655.4 288.9 593.1 225.1 517.7 222.3c-40.6-1.4-78.2 13-105.7 40.6-29 27.5-44.9 65.2-44.9 104.3 0 34.8 13 69.5 36.2 95.6 42 47.8 65.2 105.7 65.2 165.1 0 15.9-13 29-29 29H222.3c-15.9 0-29 13-29 29v115.8z" p-id="10247"></path></svg>
+        <svg t="1646122277509" fill="#FEFFFF" v-else class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3421" width="200" height="200"><path d="M512 958.016611c-245.919634 0-446.016611-200.064292-446.016611-446.016611 0-245.919634 200.095256-446.016611 446.016611-446.016611 245.952318 0 446.016611 200.064292 446.016611 446.016611S757.952318 958.016611 512 958.016611zM512 129.983389c-210.655557 0-382.016611 171.359333-382.016611 382.016611 0 210.624593 171.359333 382.016611 382.016611 382.016611 210.624593 0 382.016611-171.359333 382.016611-382.016611S722.624593 129.983389 512 129.983389z" p-id="3422"></path><path d="M463.99957 304.00043c0 26.509985 21.490445 48.00043 48.00043 48.00043s48.00043-21.490445 48.00043-48.00043-21.490445-48.00043-48.00043-48.00043S463.99957 277.490445 463.99957 304.00043z" p-id="3423"></path><path d="M512 768c-17.664722 0-32.00086-14.303454-32.00086-32.00086L479.99914 448c0-17.664722 14.336138-32.00086 32.00086-32.00086s32.00086 14.336138 32.00086 32.00086l0 287.99914C544.00086 753.696546 529.664722 768 512 768z" p-id="3424"></path></svg>
+        <h4>{{ showText }}</h4>
+    </div>
 </template>
 
 <script>
@@ -27,7 +36,8 @@ export default {
         return {
             takeResultVisible: false,
             showText: '',
-            timeOut: null
+            timeOut: null,
+            myMessage: null
         }
     },
     computed: {
@@ -46,10 +56,29 @@ export default {
     watch: {
         tipsOperate(newVal) {
             if(newVal) {
+
                 this.showText = newVal
+
+                let type = 'warning'
+                if(this.showText.includes('失败') || this.showText.includes('不一致') || this.showText.includes('请放入') || this.showText.includes('非')) {
+                    type = 'error'
+                }else if(this.showText.includes('成功')){
+                    type = 'success'
+                }else {
+                    type = 'warning'
+                }
+                
+
+                // this.myMessage = this.$message({
+                //     center: true,
+                //     // message: `<h4 class=' shadow-2xl'>${this.showText}</h4>`,
+                //     message: this.showText,
+                //     // dangerouslyUseHTMLString: true,
+                //     type
+                // });
                 setTimeout(() => {
                     this.setTipsOperate('')
-                }, 700)
+                }, 1000)
             }else {
                 // this.setTipsOperate('')
             }
@@ -158,4 +187,33 @@ export default {
             }
         }
     }
+
+    .tipsMessage {
+        min-width: 326px;
+        min-height: 167px;
+        border: 1px solid #979797;
+        border-radius: 16px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        transform: translate(-50%, -50%);
+        background: rgba(0,0,0,0.80);
+        background-color: rgba(31,31,31,.9);
+        svg {
+            width: 42.94px;
+            height: 42.94px;
+        }
+        h4{
+            height: 32px;
+            color: white;
+            font-size: 24px;
+            line-height: auto;
+            font-family: PingFang SC;
+            padding: 20px;
+        }
+    }
 </style>
\ No newline at end of file
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 41b245f..57f89d9 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -160,8 +160,15 @@
                 </div>
                 <div class="box right" ref="popUpSeal">
                     <!-- receptionList -->
-                    <div class="img-wrap2" :class="{ checked: commonChecked.includes(item.id) }" v-for="(item, index) in goodState" @click='dislodgeItem(index)' :key="item.id" >
-                        <img :src="item.src" class="fileSeal"  alt="" />
+                    <div class="img-wrap2 max-h-96" :class="{ checked: commonChecked.includes(item.id) }" v-for="(item, index) in goodState" @click='dislodgeItem(index)' :key="item.id" >
+                        <img v-if="item.name.includes('复印件')" :src="item.src" class="fileSeal"  :alt="item.name" :title="item.name" />
+                        <el-image
+                            v-else
+                            :src="item.src"
+                            class="fileSeal"
+                            :alt="item.name"
+                            :title="item.name"
+                            fit="contain"></el-image>
                         <p class="text">{{item.name}}</p>
                     </div>
 <!--                    <div v-for="(item, index) in goods" :key="index" :class="{ checked: checkList.includes(item.id),file:true }" @click="dblClickFn(item)">-->
@@ -171,8 +178,8 @@
                 </div>
             </div>
 
-            <div v-else-if="popText==='重要空白凭证箱'" class="seal " style="width:1200px;">
-                <div class="left else">
+            <div v-else-if="popText==='重要空白凭证箱'" class="seal content-center" style="width:1200px;">
+                <div class="left else content-center justify-center">
                     <div v-for="(item) in importanceArr" :key="item.id" :class="{ checked: importantChecked.includes(item.id),file:true, importanceArrClass: true }" @click="dblClickFn(item)">
                         <!-- <img :src="item.src" alt="" /> -->
                         <el-image
@@ -183,8 +190,8 @@
                     </div>
                 </div>
             </div>
-            <div v-else-if="popText==='普通凭证箱'" class="seal " style="width:1200px;">
-                <div class="left else">
+            <div v-else-if="popText==='普通凭证箱'" class="seal content-center" style="width:1200px;">
+                <div class="left else content-center justify-center">
                     <div v-for="(item) in commonArr" :key="item.id" :class="{ checked: commonChecked.includes(item.id),file:true }" @click="dblClickFn(item)">
                         <!-- <img :src="item.src" alt="" /> -->
                         <el-image
@@ -242,9 +249,9 @@
 
             
 
-            <div class="dia-footer3">
-                <!-- <button v-throttle @click="popSure" type="button">确定</button> -->
-                <el-button type="primary" v-throttle @click="popSure">确定</el-button>
+            <div class="dia-footer">
+                <button v-throttle @click="popSure" type="button">确定</button>
+                <!-- <el-button type="primary" v-throttle @click="popSure">确定</el-button> -->
             </div>
         </div>
 
@@ -1078,7 +1085,7 @@ export default {
                                         const getIt = evt.target.textContent
                                         for(var i=0;i<this.goods.length;i++){
                                             if (this.goods[i].name == getIt){
-                                                return this.$message.warning('物品栏中已有该物品')
+                                                return this.setTipsOperate('物品栏中已有该物品')
                                             }
                                         }
                                         for(let i=0;i<this.popArr.length; i++) {
@@ -1088,7 +1095,7 @@ export default {
                                             }
                                         }
                                     }else{
-                                        this.$message.warning('非可拖拽的交互！') 
+                                        this.setTipsOperate('非可拖拽的交互！')
                                     }
                                 }
                             })
@@ -1176,7 +1183,7 @@ export default {
             sort: false,// 禁止排序
             onEnd: function (/**Event*/evt) { // 结束拖拽
                 // 判断拖拽的地址 popUp和popUpSeal都是可以被拖拽上去的
-                if(!that.$refs.popUp && !that.$refs.popUpSeal) return that.$message.warning('非可拖拽的交互！') 
+                if(!that.$refs.popUp && !that.$refs.popUpSeal) return that.setTipsOperate('非可拖拽的交互！') 
                 let targetDom
                 if(that.$refs.popUp) {
                     targetDom = that.$refs.popUp.getBoundingClientRect()
@@ -1239,7 +1246,7 @@ export default {
             sort: false,// 禁止排序
             // 结束拖拽
             onEnd: function (/**Event*/evt) {
-                if(!that.$refs.goods) return that.$message.warning('非可拖拽的交互！')
+                if(!that.$refs.goods) return that.setTipsOperate('非可拖拽的交互！')
                 let targetDom = that.$refs.goods.getBoundingClientRect()
                 if(evt.originalEvent.pageX<targetDom.right&&evt.originalEvent.pageX>targetDom.left){
                     if(evt.originalEvent.pageY<targetDom.bottom&&evt.originalEvent.pageY>targetDom.top){
@@ -1530,25 +1537,15 @@ export default {
                 //     }
                 // }
                 if(this.passwordForm.passwordAgain.length !== 6) {
-                    this.$message({
-                        center: true,
-                        showClose: true,
-                        message: '您输入的密码不足6位!',
-                        type: 'error'
-                    });
+                    this.setTipsOperate('您输入的密码不足6位!')
                     return
                 }else if(this.passwordForm.password2 !== this.passwordForm.passwordAgain) {
-                    this.$message({
-                        center: true,
-                        showClose: true,
-                        message: '您输入的密码和确认密码不一致!',
-                        type: 'error'
-                    });
+                    this.setTipsOperate('您输入的密码和确认密码不一致!')
                     return
                 }
             }else if(this.popText.includes('身份证扫描')) {
                 if(this.receptionList.length === 0) {
-                    this.setTipsOperate('刷卡失败!请放入银行卡或存折!')
+                    this.setTipsOperate('刷卡失败!请放入身份证!')
                     return
                 }
                 for (let i=0;i<this.receptionList.length;i++){
@@ -1785,6 +1782,11 @@ export default {
                     
                     // 如果是在签字，返还资料。
                     if(this.peopleDo === 1) {
+                        if(this.goodState.length === 0) {
+                            this.setTipsOperate('请放入签字物品!')
+                            return
+                        }
+
                         for (var i=0;i<this.goodState.length;i++){formList.push({"answerId":this.goodState[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,555,"+this.goodState[i].id,"type": ""})}
                         const tmpGoods = this.goodState.map(item => item.id)
                         // this.outThings({name: this.myMap, idArr: [ ...tmpGoods ]})
@@ -1800,6 +1802,10 @@ export default {
                         }).catch((error)=>{
                         })
                     }else {
+                        if(this.goodState.length === 0) {
+                            this.setTipsOperate('请放入返还资料!')
+                            return
+                        }
                         for (var i=0;i<this.goodState.length;i++){formList.push({"answerId":this.goodState[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,556,"+this.goodState[i].id,"type": ""})}
                         let params= {
                             parentId:  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,556',
@@ -1834,7 +1840,7 @@ export default {
                 }else if (this.nbm == 2){ //普通凭证箱
                     let clickList = this.commonChecked
                     this.pushThingsGoods([...clickList])
-                    if(clickList.length===0) return this.$message.warning(`请选择物品后再确定！`)
+                    if(clickList.length===0) return this.setTipsOperate(`请选择物品后再确定！`)
                     let projectId = sessionStorage.getItem('projectId')
                     let startTime = sessionStorage.getItem('startTime')
                     let formList = []
@@ -1860,7 +1866,7 @@ export default {
                 }else if (this.nbm == 3){ //重要空白凭证箱
                     let clickList=this.importantChecked
                     this.pushThingsGoods([...clickList])
-                    if(clickList.length===0) return this.$message.warning(`请选择物品后再确定！`)
+                    if(clickList.length===0) return this.setTipsOperate(`请选择物品后再确定！`)
                     let projectId = sessionStorage.getItem('projectId')
                     let startTime = sessionStorage.getItem('startTime')
                     let formList = []
@@ -1917,12 +1923,7 @@ export default {
                     }else {
                         for (var i=0;i<this.goodState.length;i++){
                             if(this.goodState[i].id !== 15) {
-                                this.$message({
-                                    center: true,
-                                    showClose: true,
-                                    message: '请放入现金!',
-                                    type: 'error'
-                                });
+                                this.setTipsOperate('请放入现金!')
                                 return
                             }
                             formList.push(
@@ -1968,12 +1969,7 @@ export default {
                     // this.$store.commit('system/changePop', {show: false, text: ''})
                 }else if (this.nbm == 6){ //验钞机
                     if(this.goodState.length === 0 || this.goodState[0].id !== 15) {
-                        this.$message({
-                            center: true,
-                            showClose: true,
-                            message: '请放入现金!',
-                            type: 'error'
-                        });
+                        this.setTipsOperate('请放入现金!')
                         return
                     }
                     let projectId = sessionStorage.getItem('projectId')
@@ -1993,12 +1989,7 @@ export default {
                     // that.outThingsGoods([that.goodsShelfTotalData[evt.oldIndex].id])
                 }else if (this.nbm == 7){ //打印机
                     if(this.goodState.length === 0) {
-                        this.$message({
-                            center: true,
-                            showClose: true,
-                            message: '请放入证件!',
-                            type: 'error'
-                        });
+                        this.setTipsOperate('请放入证件!')
                         return
                     }
                     let projectId = sessionStorage.getItem('projectId')
@@ -2032,6 +2023,10 @@ export default {
                         this.setTipsOperate('您输入的密码和确认密码不一致!')
                     }
                 }else if (this.nbm == 9){//资料
+                    if(this.goodState.length === 0) {
+                        this.setTipsOperate('请放入资料!')
+                        return
+                    }
                     let projectId = sessionStorage.getItem('projectId')
                     let startTime = sessionStorage.getItem('startTime')
                     for (var i=0;i<this.goodState.length;i++){formList.push({"answerId":this.goodState[i].id, "emptyOne": "", "emptyTwo": "", "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,11,"+this.goodState[i].id,"type": ""})}
@@ -3214,7 +3209,7 @@ export default {
             line-height: 30px;
             text-align: center;
             color: #fff;
-            font-size: 24px;
+            font-size: 18px;
             background: url(../../../assets/img/dia-title.png) 0 0 / cover no-repeat;
             // background: url(../../../assets/img/dia-title.png);
             background-size: 200px 30px;
@@ -3453,6 +3448,14 @@ export default {
                 width: 300px;
                 height: 200px;
             }
+            // .el-image {
+            //     img {
+            //         min-height: 500px;
+            //     }
+            // }
+            // .fileSeal {
+            //     min-height: 50%;
+            // }
         }
     }
     .dia-footer {
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index b0a2ac9..a711ec2 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -10,7 +10,7 @@
         <div class="sth integrated-counter cp">
             <img width="100%" v-lazy="lazy1" alt="" @click="toPart('/counter')"> 
             <!-- src="@/assets/img/integrated-counter.png" -->
-            <!-- <div class="name">综合柜台</div> -->
+            <div class="name">综合柜台</div>
         </div>
         
         <img class="sth international cp" v-lazy="lazy2" alt="" @click="showComing">
@@ -38,7 +38,7 @@ export default {
             caseVisible: true,
             comingVisible: false,
             timer: null,
-            lazy1: require('@/assets/img/integrated-counter2.png'),
+            lazy1: require('@/assets/img/integrated-counter.png'),
             lazy2: require('@/assets/img/international.png'),
             lazy3: require('@/assets/img/manager-index.png'),
             lazy4: require('@/assets/img/credit-dep.png'),
@@ -145,17 +145,15 @@ export default {
                 left: -23%;
                 width: 220px;
                 height: 85px;
-                width: 150px;
-                height: 50px;
-                left: 10%;
-                top: 30%;
-                transform: rotate(-29deg);
+                width: 325px;
+                height: 121px;
+                // transform: rotate(-29deg);
                 z-index: 100;
 
-                line-height: 50px;
+                line-height: 85px;
                 text-align: center;
                 color: #fff;
-                font-size: 19px;
+                font-size: 38px;
                 background: url(../../../assets/img/index-btn-bg.png) 0 0/cover no-repeat;
             }
         }
@@ -165,7 +163,7 @@ export default {
             width: 28%;
             transition: all .5s;
             &:hover{
-                top: -20px;
+                top: -10px;
             }
         }
         .manager{
@@ -175,7 +173,7 @@ export default {
             transition: all .5s;
             &:hover{
                 z-index: 9999;
-                top: calc(48% - 20px);
+                top: calc(47% - 10px);
             }
         }
         .credit-dep{
diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue
index b93e147..14d54a9 100644
--- a/src/pages/lobbyManager/list/index.vue
+++ b/src/pages/lobbyManager/list/index.vue
@@ -556,6 +556,7 @@ export default {
         max-width: 100%;
         margin-top: 20px;
     }
+    
 
 
     .wrap{
diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue
index 868f4a6..df2dfca 100644
--- a/src/pages/manage/list/client/consumerClient.vue
+++ b/src/pages/manage/list/client/consumerClient.vue
@@ -222,23 +222,6 @@ export default {
         NeedBefore
     },
     created() {
-
-        const findIt = (tree, val, arr) => {
-            const quee = []
-            quee.push(tree)
-            while(quee.length) {
-                const node = quee.shift()
-                arr.push(node.val)
-                if(node.leftNode) {
-
-                }quee.push(node.leftNode)
-                if(node.rightNode) quee.push(node.rightNode)
-
-            }
-        }
-
-
-
         if(this.isNeedBefore) {
             return
         }
diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js
index 162a988..4c595c7 100644
--- a/src/utils/utilFunction.js
+++ b/src/utils/utilFunction.js
@@ -1,6 +1,7 @@
 import { MessageBox, Message } from 'element-ui';
 import { addOperation, getOperation } from '@/api/http';
 
+
 const phoneListen = function(val, form, prop) {
     if(/^[0-9]*$/.test(val)) {
         form[prop] = val;
@@ -129,10 +130,15 @@ const myValidate = (callback, refs) => {
             } catch (error) {
                 
             }
-            Message.info({
+            Message.warning({
                 center: true,
                 message
             })
+            // this.$message({
+            //     message,
+            //     center: true,
+            //     type: 'info'
+            // });
             // Message.message(message + '', '提示', {
             //     type: 'info',
             //     confirmButtonText: message
@@ -191,6 +197,7 @@ const autoPlay = (parentId, form,  myTable2, myTable, cards=[]) => {
         //     message: '提交成功'
         // })
     }).catch((error)=>{
+
         this.$message({
             message: '服务器繁忙，提交失败。',
             center: true,