From b7bb4dd2a960a04e459ffb0345ea39b5d854b49f Mon Sep 17 00:00:00 2001 From: longjieli <1060695654@qq.com> Date: Tue, 27 Aug 2024 16:59:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=BA=E5=B0=91=E7=9A=84?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/virtualScroll/virtualScroll.vue | 13 +++++--- locale/ar.js | 12 +++++-- locale/en.js | 12 +++++-- locale/es.js | 12 +++++-- locale/fr.js | 12 +++++-- locale/ru.js | 12 +++++-- pages/center/center.vue | 2 -- pages/purse/purse.vue | 5 +-- pages/runningWater/runningWater.vue | 50 ++++++++++++++++-------------- 9 files changed, 84 insertions(+), 46 deletions(-) diff --git a/components/virtualScroll/virtualScroll.vue b/components/virtualScroll/virtualScroll.vue index 370c8c2..4f9eb6b 100644 --- a/components/virtualScroll/virtualScroll.vue +++ b/components/virtualScroll/virtualScroll.vue @@ -23,8 +23,9 @@ data() { return { classOption: { - step: 1, - limitMoveNum: 1 + step: .4, + limitMoveNum: 1, + hoverStop: false } } }, @@ -53,14 +54,18 @@ overflow: hidden; .content { + display: flex; height: 50rpx; width: 100%; background: rgba(255, 255, 255, .5); box-sizing: border-box; - padding: 0rpx 10% 0rpx 30%; + padding: 0rpx 20%; span{ - margin-left: 15rpx; + width: 50%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } } diff --git a/locale/ar.js b/locale/ar.js index 51a1287..ab9f035 100644 --- a/locale/ar.js +++ b/locale/ar.js @@ -100,7 +100,8 @@ export default { "complete-top-up": "لقد أكملت عملية التعبئة", "steps": "الخطوات", "copySuccess": "نسخ نجاح", - "success": "إعادة الشحن بنجاح" + "success": "إعادة الشحن بنجاح", + "recharge-amount-placeholder": "الرجاء إدخال مبلغ الإعادة شحن" }, "withdraw": { "balance": "الرصيد", @@ -109,13 +110,18 @@ export default { "min-withdrawal": "حد أدنى السحب 1", "payment-password": "كلمة مرور الدفع", "payment_password-placeholder": "الرجاء إدخال كلمة مرور الدفع", - "confirm": "تأكيد" + "confirm": "تأكيد", + "creditLimit": "يجب أن يكون الحد الأدنى للسحب أكبر من 0", + "insufficientBalance": "مبلغ السحب أكبر من رصيد الحساب" }, "runningWater": { "all": "الكل", "income": "الدخل", "expenditure": "النفقات", - "balance": "الرصيد" + "0": "إعادة شحن المستخدم", + "1": "سحب المستخدم", + "2": "إيرادات المستخدم", + "3": "غير قيد المراجعة" }, "modifyUser": { "network": "الشبكة", diff --git a/locale/en.js b/locale/en.js index b20ae68..fbbe021 100644 --- a/locale/en.js +++ b/locale/en.js @@ -100,7 +100,8 @@ export default { "complete-top-up": "I have completed the recharge", "steps": "The steps", "copySuccess" : "Copy success", - "success" : "Recharge successfully" + "success" : "Recharge successfully", + "recharge-amount-placeholder" : "Please enter recharge amout" }, "withdraw": { "balance": "Balance", @@ -109,13 +110,18 @@ export default { "min-withdrawal": "Minimum withdrawal amount 1", "payment-password": "Payment password", "payment_passwrod-placeholder": "Please enter payment password", - "confirm": "Confirm" + "confirm": "Confirm", + "creditLimit" : "The minimum withdrawal should be greater than 0", + "insufficientBalance" : "The withdrawal amount is greater than the account balance" }, "runningWater": { "all": "All", "income": "Income", "expenditure": "Expenditure", - "balance": "Balance", + "0" : "User recharge", + "1" : "User withdrawal", + "2" : "User revenue", + "3" : "unreviewed" }, "modifyUser": { "network": "Network", diff --git a/locale/es.js b/locale/es.js index 458ce28..07822b9 100644 --- a/locale/es.js +++ b/locale/es.js @@ -100,7 +100,8 @@ export default { "complete-top-up": "He completado la recarga", "steps": "Los pasos", "copySuccess": "Copia exitosa", - "success": "Recarga realizada exitosamente" + "success": "Recarga realizada exitosamente", + "recharge-amount-placeholder": "Por favor, ingrese el monto de recarga" }, "withdraw": { "balance": "Saldo", @@ -109,13 +110,18 @@ export default { "min-withdrawal": "Cantidad mínima de retiro 1", "payment-password": "Contraseña de pago", "payment_password-placeholder": "Por favor, ingrese la contraseña de pago", - "confirm": "Confirmar" + "confirm": "Confirmar", + "creditLimit": "El mínimo retiro debe ser mayor que 0", + "insufficientBalance": "El monto de retiro es mayor que el saldo de la cuenta" }, "runningWater": { "all": "Todo", "income": "Ingresos", "expenditure": "Gastos", - "balance": "Saldo" + "0": "Recarga de usuario", + "1": "Retiro de usuario", + "2": "Ingresos de usuario", + "3": "sin revisar" }, "modifyUser": { "network": "Red", diff --git a/locale/fr.js b/locale/fr.js index 9a98e4d..dd382e5 100644 --- a/locale/fr.js +++ b/locale/fr.js @@ -100,7 +100,8 @@ export default { "complete-top-up": "J'ai complété le recharge", "steps": "Les étapes", "copySuccess": "Copie réussie", - "success": "Recharge réussie" + "success": "Recharge réussie", + "recharge-amount-placeholder": "Veuillez entrer le montant de recharge" }, "withdraw": { "balance": "Solde", @@ -109,13 +110,18 @@ export default { "min-withdrawal": "Montant minimum de retrait 1", "payment-password": "Mot de passe de paiement", "payment_password-placeholder": "Veuillez entrer votre mot de passe de paiement", - "confirm": "Confirmer" + "confirm": "Confirmer", + "creditLimit": "Le retrait minimum doit être supérieur à 0", + "insufficientBalance": "Le montant du retrait est supérieur au solde du compte" }, "runningWater": { "all": "Tout", "income": "Revenus", "expenditure": "Dépenses", - "balance": "Solde" + "0": "Recharge utilisateur", + "1": "Retrait utilisateur", + "2": "Revenus utilisateur", + "4": "non revu" }, "modifyUser": { "network": "Réseau", diff --git a/locale/ru.js b/locale/ru.js index bdc4e98..60142a7 100644 --- a/locale/ru.js +++ b/locale/ru.js @@ -100,7 +100,8 @@ export default { "complete-top-up": "Я завершил пополнение", "steps": "Шаги", "copySuccess": "Копирование успешно", - "success": "Пополнение успешно" + "success": "Пополнение успешно", + "recharge-amount-placeholder": "Пожалуйста, введите сумма пополнения" }, "withdraw": { "balance": "Баланс", @@ -109,13 +110,18 @@ export default { "min-withdrawal": "Минимальная сумма вывода 1", "payment-password": "Пароль платежа", "payment_password-placeholder": "Пожалуйста, введите пароль платежа", - "confirm": "Подтвердить" + "confirm": "Подтвердить", + "creditLimit": "Минимальный сумма вывода должна быть больше 0", + "insufficientBalance": "Сумма вывода больше баланса на счете" }, "runningWater": { "all": "Все", "income": "Доход", "expenditure": "Расход", - "balance": "Баланс" + "0": "Пополнение баланса пользователя", + "1": "Снятие средств пользователем", + "2": "Доходы пользователя", + "3": "непроверенный" }, "modifyUser": { "network": "Сеть", diff --git a/pages/center/center.vue b/pages/center/center.vue index eb1ab51..94889e7 100644 --- a/pages/center/center.vue +++ b/pages/center/center.vue @@ -426,8 +426,6 @@ // 跳转路径 toPath(item){ - console.log(item); - if('logout' == item.title){ return this.logout() } diff --git a/pages/purse/purse.vue b/pages/purse/purse.vue index a94176f..366fd94 100644 --- a/pages/purse/purse.vue +++ b/pages/purse/purse.vue @@ -20,7 +20,7 @@ {{ $t('page.purse.recharge-amount') }} - + @@ -74,7 +74,8 @@ money : '', form : { id : '', - image : '' + image : '', + money : '' }, serverList : [], showService : false, diff --git a/pages/runningWater/runningWater.vue b/pages/runningWater/runningWater.vue index c52f6e6..fb0029a 100644 --- a/pages/runningWater/runningWater.vue +++ b/pages/runningWater/runningWater.vue @@ -16,12 +16,12 @@ - - [{{ $t('page.runningWater.balance') }}] - {{ item.createTime }} + + {{ item.createTime }} +
{{ $t(`page.runningWater.${item.state == 0 ? 3 : item.type }`) }}
+ - {{ item.type == '0' ? '+' : '-' }} - {{ item.money }} + ${{ item.money }} @@ -115,6 +115,7 @@ import navbar from '@/components/base/m-navbar.vue' align-items: center; color: #989898; font-size: 28rpx; + z-index: 999; &>view{ flex: 1; display: flex; @@ -143,32 +144,35 @@ import navbar from '@/components/base/m-navbar.vue' .running-water-item { display: flex; - flex-direction: column; - align-items: center; + justify-content: space-between; box-sizing: border-box; padding: 15rpx; - width: calc(50% - 15rpx); - border: 1px solid #00000080; + width: 100%; margin-bottom: 25rpx; - - image { - width: 100rpx; - height: 100rpx; - } - - .descript { - // color: #AEC43C; - font-size: 36rpx; - } - - .time { - color: #989898; - margin: 15rpx 0rpx; + background: white; + + .left{ + .time { + margin: 15rpx 0rpx; + } + + .tag{ + display: inline-block; + background: #61ABFF; + font-size: 24rpx; + border-radius: 50rpx; + padding: 0rpx 15rpx; + } + + .red{ + color: red; + } } .money-detail { // color: #3AA56B; font-size: 36rpx; + color: #3FCE9D; } } }