From 92a9475c602dde1f42621580500d36fc5b3d41d6 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Mon, 22 Jul 2024 11:00:33 +0800 Subject: [PATCH] fix --- src/main.js.rej | 9 --------- src/pages/counter/list/index.vue | 9 +++++---- src/pages/manage/list/agent/electricRate.vue | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 src/main.js.rej diff --git a/src/main.js.rej b/src/main.js.rej deleted file mode 100644 index 1f0133d..0000000 --- a/src/main.js.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/src/main.js b/src/main.js (rejected hunks) -@@ -42,6 +42,7 @@ - } - }) - } -+}); - - - Vue.use(plugins); diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index 30ee161..53f6de1 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -2509,17 +2509,18 @@ export default { } .goods-dia { + position: fixed; + bottom: 0; + left: -100%; width: 100%; + min-height: 140px; + text-align: center; white-space: nowrap; overflow-x: auto; overflow-y: hidden; - position: fixed; - bottom: 0; - left: -100%; padding: 20px 300px 20px 300px; transition: all 0.5s; background-color: rgba(255, 255, 255, 0.95); - min-height: 140px; .file { position: relative; diff --git a/src/pages/manage/list/agent/electricRate.vue b/src/pages/manage/list/agent/electricRate.vue index 68fd440..c158cac 100644 --- a/src/pages/manage/list/agent/electricRate.vue +++ b/src/pages/manage/list/agent/electricRate.vue @@ -328,7 +328,7 @@ export default { return } if (!this.form.voucherNumber) { - messageCard('请填写凭证号码') + messageCard('请填写账号') return }