Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching

src/App.vue

@@ -86,4 +86,11 @@
     width: 100%;
     height: 100%;
 }
+
+.fade-enter-active, .fade-leave-active {
+  transition: opacity .5s;
+}
+.fade-enter, .fade-leave-to /* .fade-leave-active below version 2.1.8 */ {
+  opacity: 0;
+}
 </style>

src/components/dialog/index.vue

@@ -342,12 +342,14 @@ export default {
                 this.flow = 2
             }else if(this.flow === 2) {
                 this.flow = 3
+                this.$emit('submitIt')
             }else if(this.flow === 4) {
                 this.flow = 3
+                this.$emit('submitIt')
             }else {
                 // 调用父函数
                 // 然后关掉
-                this.$emit('submitIt')
+                // this.$emit('submitIt')
                 this.cancelIt()
             }
         },

src/components/selectBusiness/index.vue

@@ -1,10 +1,10 @@
 <template>
     <el-dialog :visible="true" class="" :modal="false" @close="closeData" :close-on-click-modal="false" :show-close="false" custom-class="animate__animated animate__bounceIn data-dia 2xl:w-7/12 xl:w-9/12 lg:w-full h-9/12">
         <div slot="title" class="dia-header2">
-            <div class="data-title2">请选择业务</div>
+            <div class="data-title2">业务选择</div>
             <div class="close"><img v-lazy="closeImg" alt="" @click="showBusinessSelect(false)" /></div>
         </div>
-        <p class="tips2">请选择您要办理的业务</p>
+        <p class="tips2">请选择您要办理的业务:</p>
         <ul class="take-list2">
             <li v-for="(item) in businessArr" :class="{checked: takeCheck == item.myKey,'animate-pulse': takeCheck == item.myKey}" class=" duration-1000" :key="item.myKey" @click="checkTake(item.myKey)">
                 <img v-lazy="businessImg" alt="">
@@ -47,115 +47,115 @@ export default {
             // 选择业务逻辑
             businessArr: [ 
                 {
-                    myKey: '项目一',
+                    myKey: '业务一',
                     text: ': 个人活期开户、存款'
                 },
                 {
-                    myKey: '项目二',
+                    myKey: '业务二',
                     text: ': 个人活期转账、取款、销户'
                 },
                 {
-                    myKey: '项目三',
+                    myKey: '业务三',
                     text: ': 整存整取开户存款'
                 },
                 {
-                    myKey: '项目四',
+                    myKey: '业务四',
                     text: ': 整存整取部分提前支取'
                 },
                 {
-                    myKey: '项目五',
+                    myKey: '业务五',
                     text: ': 整存整取全部提前支取'
                 },
                 {
-                    myKey: '项目六',
+                    myKey: '业务六',
                     text: ': 零存整取开户'
                 },
                 {
-                    myKey: '项目七',
+                    myKey: '业务七',
                     text: ': 零存整取续存'
                 },
                 {
-                    myKey: '项目八',
+                    myKey: '业务八',
                     text: ': 零存整取销户'
                 },
                 {
-                    myKey: '项目九',
+                    myKey: '业务九',
                     text: ': 通知存款开户'
                 },
                 {
-                    myKey: '项目十',
+                    myKey: '业务十',
                     text: ': 通知存款销户'
                 },
                 {
-                    myKey: '项目十一',
+                    myKey: '业务十一',
                     text: ': 公司基本户和开立'
                 },
                 {
-                    myKey: '项目十二',
+                    myKey: '业务十二',
                     text: ': 公司存款'
                 },
                 {
-                    myKey: '项目十三',
+                    myKey: '业务十三',
                     text: ': 公司现金支票取款'
                 },
                 {
-                    myKey: '项目十四',
+                    myKey: '业务十四',
                     text: ': 公司现金支票转账'
                 },
                 {
-                    myKey: '项目十五',
+                    myKey: '业务十五',
                     text: ': 密码修改'
                 },
                 {
-                    myKey: '项目十六',
+                    myKey: '业务十六',
                     text: ': 密码挂失'
                 },
                 {
-                    myKey: '项目十七',
+                    myKey: '业务十七',
                     text: ': 挂失解挂'
                 },
                 {
-                    myKey: '项目十八',
+                    myKey: '业务十八',
                     text: ': 现金领用'
                 },
                 {
-                    myKey: '项目十九',
+                    myKey: '业务十九',
                     text: ': 现金上缴'
                 },
                 {
-                    myKey: '项目二十',
+                    myKey: '业务二十',
                     text: ': 现金调入'
                 },
                 {
-                    myKey: '项目二十一',
+                    myKey: '业务二十一',
                     text: ': 现金调出'
                 },
                 {
-                    myKey: '项目二十二',
+                    myKey: '业务二十二',
                     text: ': 凭证领用'
                 },
                 {
-                    myKey: '项目二十三',
+                    myKey: '业务二十三',
                     text: ': 凭证上缴'
                 },
                 {
-                    myKey: '项目二十四',
+                    myKey: '业务二十四',
                     text: ': 凭证调入'
                 },
                 {
-                    myKey: '项目二十五',
+                    myKey: '业务二十五',
                     text: ': 凭证调出'
                 },
                 {
-                    myKey: '项目二十六',
+                    myKey: '业务二十六',
                     text: ': 支票出售'
                 },
                 {
-                    myKey: '项目二十七',
+                    myKey: '业务二十七',
                     text: ': 柜员日中轧账'
                 },
                 {
-                    myKey: '项目二十八',
+                    myKey: '业务二十八',
                     text: ': 网点日中轧账'
                 }
             ],            
@@ -185,7 +185,7 @@ export default {
                 //         message: '请选择一个业务'
                 //     });          
                 // });
-                this.$confirm('由于您未选择一个业务,这将回到项目列表,是否继续?', '提示', {
+                this.$confirm('由于您未选择一个业务,这将回到业务列表,是否继续?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     center: true,
@@ -277,6 +277,7 @@ export default {
             align-items: center;
             width: 30%;
             height: 10vh;
+            font-size: 16px;
             margin: 1vh 0;
             border: 4px solid #DBDBDB;
             border-radius: 20px;
@@ -295,13 +296,19 @@ export default {
                 //margin: 0 45px;
             }
             p{
-                font-size: 14px;
+                font-size: 16px;
                 color: #000;
-                text-align: center;
+                text-align: left;
                 padding: 0 20px;
-                white-space: nowrap;
+                // white-space: wrap;
+                // overflow: hidden;
+                // text-overflow: ellipsis;
+                text-overflow: -o-ellipsis-lastline;
                 overflow: hidden;
                 text-overflow: ellipsis;
+                display: -webkit-box;
+                -webkit-line-clamp: 2;
+                -webkit-box-orient: vertical
             }
             &.checked{
                 background: rgba(97,145,255,0.10) url('../../assets/svg/checked.svg') 96% 7%/auto no-repeat;
@@ -319,6 +326,7 @@ export default {
             position: absolute;
             left: 15px;
             height: 50px;
+            font-size: 16px;
             line-height: 50px;
             color:#fff;
         }
@@ -338,7 +346,7 @@ export default {
     .tips2 {
         margin: 1vh 0 2vh 0;
         text-align: left;
-        font-size: 20px;
+        font-size: 16px;
         color: #000;
     }
     .list {

src/pages/counter/list/index.vue

@@ -2065,6 +2065,7 @@ export default {
     .computerContent{
         position: absolute;top: -50px;width:200px;left: -100px
     }
+    
 }
 @media screen and (min-width: 1920px) {
     .computerContent{
@@ -2393,6 +2394,7 @@ export default {
             left: 57vw;
             width: 4vw;
         }
+        
         .seal-box {
             top: 52vh;
             left: 61vw;
@@ -2620,6 +2622,17 @@ export default {
             left: 63vw;
             width: 5vw;
         }
+        
+        .card-machine {
+            top: 48vh;
+            left: 54vw;
+            width: 6vw;
+        }
+        .idCard-scanner {
+            top: 53vh;
+            left: 58vw;
+            width: 6vw;
+        }
         .currency-detector {
             top: 55vh;
             left: 67vw;
@@ -2636,7 +2649,7 @@ export default {
             width: 6vw;
         }
     }
-    @media screen and (min-width: 1250px) and (max-width: 1290px){
+    @media screen and (min-width: 1250px) and (max-width: 1297px){
     .wrap {
             width: 100%;
             position: relative;
@@ -2726,6 +2739,16 @@ export default {
             left: 58vw;
             width: 6vw;
         }
+        .card-machine {
+            top: 48vh;
+            left: 54vw;
+            width: 6vw;
+        }
+        .idCard-scanner {
+            top: 53vh;
+            left: 58vw;
+            width: 6vw;
+        }
         .seal-box {
             top: 54vh;
             left: 64vw;
@@ -2976,7 +2999,8 @@ export default {
         justify-content: center;
         align-items: center;
         width: 50px;
-        height: 150px;
+        // height: 150px;
+        height: 130px;
         cursor: pointer;
         z-index: 998;
         background: url(../../../assets/img/sth-bg.png) 0 0/100% 100% no-repeat;

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-counter.png'),
+            lazy1: require('@/assets/img/integrated-counter2.png'),
             lazy2: require('@/assets/img/international.png'),
             lazy3: require('@/assets/img/manager-index.png'),
             lazy4: require('@/assets/img/credit-dep.png'),
@@ -132,6 +132,7 @@ export default {
             top: -5%;
             left: 24%;
             width: 43%;
+            
             img{
                 transition: all .5s;
                 &:hover{
@@ -144,10 +145,17 @@ export default {
                 left: -23%;
                 width: 220px;
                 height: 85px;
-                line-height: 75px;
+                width: 150px;
+                height: 50px;
+                left: 10%;
+                top: 30%;
+                transform: rotate(-29deg);
+                z-index: 100;
+
+                line-height: 50px;
                 text-align: center;
                 color: #fff;
-                font-size: 24px;
+                font-size: 19px;
                 background: url(../../../assets/img/index-btn-bg.png) 0 0/cover no-repeat;
             }
         }
@@ -199,15 +207,16 @@ export default {
         }
         .case{
             position: absolute;
-            top: 80px;
-            left: 40px;
-            width: 200px;
-            height: 85px;
-            line-height: 85px;
+            top: 160px;
+            left: 150px;
+            width: 150px;
+            height: 50px;
+            line-height: 50px;
             text-align: center;
             color: #fff;
             font-size: 24px;
             background: url(../../../assets/img/case.png) 0 0 /cover no-repeat;
+            background-size: 150px 50px;
             cursor: pointer;
             // &:hover{
             //     top: 76px;

src/pages/manage/list/client/consumerClient.vue

@@ -222,6 +222,23 @@ 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
         }