From 0eabb0e98051f46c81bfad56a75e5b4dce786672 Mon Sep 17 00:00:00 2001 From: "luoJunYong.123" Date: Tue, 1 Mar 2022 17:17:55 +0800 Subject: [PATCH 1/5] update --- src/pages/counter/list/index.vue | 14 ++++++++------ src/pages/lobbyManager/list/index.vue | 16 ++++++++++++++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index b1fd803..f81a012 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -264,21 +264,22 @@ - + -
+ -
+ @@ -3139,7 +3140,8 @@ export default { } .imgPop{ - width: 100%; + max-width: 100%; + margin-top: 20px; } .masking{ position: fixed; diff --git a/src/pages/lobbyManager/list/index.vue b/src/pages/lobbyManager/list/index.vue index 8d7b888..b93e147 100644 --- a/src/pages/lobbyManager/list/index.vue +++ b/src/pages/lobbyManager/list/index.vue @@ -203,11 +203,11 @@ - +
@@ -552,6 +552,12 @@ export default { \ No newline at end of file diff --git a/src/components/tipDialog/index.vue b/src/components/tipDialog/index.vue index 1183764..4d169e9 100644 --- a/src/components/tipDialog/index.vue +++ b/src/components/tipDialog/index.vue @@ -61,6 +61,7 @@ export default { \ 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 ">
提交
提交成功
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 @@ \ No newline at end of file diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 57f89d9..0d00aa2 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -158,18 +158,19 @@

{{item.name}}

-
+
-

{{item.name}}

+
@@ -185,7 +186,7 @@ + fit="scale-down">

{{item.name}}

@@ -204,13 +205,25 @@
- + +

{{item.name}}

- + +

{{item.name}}

@@ -218,7 +231,13 @@
- + +

{{item.name}}

@@ -227,13 +246,25 @@
- + +

{{item.name}}

- + +

{{item.name}}

@@ -242,7 +273,13 @@
- + +

{{item.name }}

@@ -250,7 +287,7 @@ @@ -3203,16 +3240,16 @@ export default { .dia-header { position: relative; .data-title { - height:30px; - width: 200px; + height:50px; + width: 250px; margin: 0 auto; - line-height: 30px; + line-height: 50px; text-align: center; color: #fff; 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; + background-size: 250px 50px; } .close { position: absolute; @@ -3369,9 +3406,15 @@ export default { .box{ border: 2px solid #e6e6e6; width: 45%; - min-height: 280px; + min-height: 40vh; border-radius: 10px; padding: 10px; + + height: 100%; + // opacity: 0.5; + background: #FCFCFC; + border: 4px solid #DBDBDB; + border-radius: 16px; } .left{ display: flex; @@ -3432,6 +3475,9 @@ export default { } .right{ margin-left: 5%; + + + } .else{ width: 100%; @@ -3461,6 +3507,9 @@ export default { .dia-footer { margin-top: 30px; text-align: center; + button { + width: 10vw; + } // button { // width: 100px; // line-height: 60px; @@ -3535,11 +3584,14 @@ export default { .box{ //background-color: red; border: 2px solid #e6e6e6; - height: 2vh; - width: 45%; - min-height: 280px; + min-height: 50vh; border-radius: 10px; padding: 10px; + + // opacity: 0.5; + background: #FCFCFC; + border: 4px solid #DBDBDB; + border-radius: 16px; } .else{ width: 100%; diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index a711ec2..c0deae7 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -10,11 +10,22 @@
-
综合柜台
+
综合柜台
+
+ +
+ + + +
国际结算部
+
+ + +
+ +
大堂经理
- - @@ -115,6 +126,23 @@ export default { \ No newline at end of file