From 4559044dee035b0944b20fa960041131d4dc9ee0 Mon Sep 17 00:00:00 2001 From: chenkun <3289431190@qq.com> Date: Wed, 16 Oct 2024 00:11:51 +0800 Subject: [PATCH] =?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/base/centerList.vue | 15 +- components/base/topbar.vue | 48 +++--- components/config/PrivacyAgreementPoup.vue | 14 +- components/config/customerServicePopup.vue | 8 +- components/user/productList.vue | 6 +- locale/en.json | 229 +++++++++++++++++++++++--- locale/zh-Hans.json | 206 ++++++++++++++++++++++- pages/index/center2.vue | 24 +-- pages/index/clearanceService.vue | 2 +- pages/index/index.vue | 16 +- pages/index/tradingPlatform.vue | 6 +- pages_order/auth/registerShop.vue | 67 ++++---- pages_order/auth/selectionIdentity.vue | 8 +- pages_order/auth/wxLogin.vue | 18 +- pages_order/auth/wxUserInfo.vue | 237 ++++++++++++++------------- pages_order/center/helpFeedback.vue | 20 +-- pages_order/center/systemSet.vue | 45 +++-- pages_order/components/order/orderList.vue | 16 +- pages_order/mine/help.vue | 2 +- pages_order/order/backOrder.vue | 38 ++--- pages_order/order/offerOrBillLading.vue | 71 +++----- pages_order/order/orderDetail2.vue | 31 ++-- pages_order/order/pendingOrder.vue | 2 +- pages_order/tradingPlatform/confirmOrder.vue | 24 +-- pages_order/tradingPlatform/nowOrder.vue | 26 +-- 25 files changed, 787 insertions(+), 392 deletions(-) diff --git a/components/base/centerList.vue b/components/base/centerList.vue index d69a276..4ce8002 100644 --- a/components/base/centerList.vue +++ b/components/base/centerList.vue @@ -32,16 +32,23 @@ export default { // 点击列表项 tapItem(item, index) { console.log(item, index, "item,index==========") - if (item.text === '联系客服') { + + if (item.text === '联系客服' || item.englishText === 'contactCustomerService') { console.log("联系客服") this.$emit('open') - } else if (item.text === '我的挂单' || item.text === '系统设置' || item.text === '关于我们' || item.text === '帮助反馈') { - console.log("进入"+item.text) + } else if ( + item.text === '我的挂单' || item.englishText === 'myOrders' || + item.text === '系统设置' || item.englishText === 'systemSettings' || + item.text === '关于我们' || item.englishText === 'aboutUs' || + item.text === '帮助反馈' || item.englishText === 'helpFeedback' + ) { + console.log("进入 " + item.text) uni.navigateTo({ url: item.toPathUrl }) } - }, + } + , }, diff --git a/components/base/topbar.vue b/components/base/topbar.vue index 3575c8e..f95d60e 100644 --- a/components/base/topbar.vue +++ b/components/base/topbar.vue @@ -5,7 +5,7 @@ - 铝产品现货交易平台 + {{ $t('pageTitle.proName') }} @@ -15,27 +15,31 @@ \ No newline at end of file + diff --git a/components/config/PrivacyAgreementPoup.vue b/components/config/PrivacyAgreementPoup.vue index 6eda2c6..99ea0b7 100644 --- a/components/config/PrivacyAgreementPoup.vue +++ b/components/config/PrivacyAgreementPoup.vue @@ -6,11 +6,11 @@ mode=""> - 协议与隐私政策 + {{ $t('components.agreementPrivacyPolicy') }} - 欢迎来到酒店布草!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。 + {{ $t('components.agreementPrivacyPolicyTip') }} @@ -18,20 +18,20 @@ - 同意《酒店布草隐私政策》 + {{ $t('components.agree') }}《{{ $t('components.privacyPolicy') }}》 - 以及《用户协议》 + {{ $t('components.and') }}《{{ $t('components.userAgreement') }}》 - + + @agreeprivacyauthorization="handleAgreePrivacyAuthorization">{{ $t('components.agree') }} @@ -76,7 +76,7 @@ }, // 打开成功 fail: () => { uni.showToast({ - title: '打开失败，稍后重试', + title: `${$t('components.openFailed')}`, icon: 'none' }) } // 打开失败 diff --git a/components/config/customerServicePopup.vue b/components/config/customerServicePopup.vue index cababbf..ca1d0e5 100644 --- a/components/config/customerServicePopup.vue +++ b/components/config/customerServicePopup.vue @@ -3,15 +3,15 @@ - 联系客服 - 确定拨打客服电话? + {{ $t('components.contactCustomerService') }} + {{ $t('components.confirmCallCustomerService') }}? - - diff --git a/components/user/productList.vue b/components/user/productList.vue index 8ea1d18..a93bf74 100644 --- a/components/user/productList.vue +++ b/components/user/productList.vue @@ -9,11 +9,11 @@ src="https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg" mode=""> - 铝制品 + {{ $t('other.aluminumProducts') }} ￥58 - 元/起 + {{ $t('other.unitPrice2') }} @@ -29,7 +29,7 @@ - 立即采购 + {{ $t('other.immediatePurchase') }} diff --git a/locale/en.json b/locale/en.json index 949ed4e..7b62a6f 100644 --- a/locale/en.json +++ b/locale/en.json @@ -1,25 +1,214 @@ { - "tabbar.title.1": "Home", - "tabbar.title.2": "TradingPlatform", - "tabbar.title.3": "CustomsClearance", - "tabbar.title.4": "PersonalCenter", - "pages" : { - "index" : { - "index" : { - "agreement" : "Agreement content", - "language" : "Change Language", - "purchaser":"purchaser", - "supplier":"supplier", - "companyProfile":"companyProfile", - "aluminiumProduct":"aluminiumProduct" - } - } + "tabbar.title.1": "Home", + "tabbar.title.2": "Trading Platform", + "tabbar.title.3": "Customs Services", + "tabbar.title.4": "Profile", + "responseMessage": {}, + "pageTitle": { + "proName": "Aluminum Products Spot Trading Platform", + "welcomeToAluminumTradingPlatform": "Welcome to the Aluminum Trading Platform", + "aluminumTradingPlatform": "Aluminum Trading Platform", + "wechatAuthorizedLogin": "WeChat Authorized Login", + "buyerRegistration": "Buyer Registration", + "domesticCustomsClearanceApplication": "Domestic Customs Clearance Application", + "supplierQuotation": "Supplier Quotation", + "supplierOrder": "Supplier Order", + "myOrders": "My Orders", + "orderDetails": "Order Details", + "withdrawOrder": "Withdraw Order", + "accountPasswordLogin": "Account Password Login", + "phoneLogin": "Phone Login", + "forgotPasswordPage": "Forgot Password Page", + "selectIdentity": "Select Identity", + "immediateOrder": "Immediate Order", + "confirmOrder": "Confirm Order", + "systemSettings": "System Settings", + "aboutThisProgram": "About This Program", + "personalCenter": "Personal Center", + "accountSetting": "Account Setting", + "systemSetting": "System Setting", + "identitySetting": "Identity Setting", + "switchAccount": "Switch Account", + "changePassword": "Change Password", + "logout": "Logout", + "versionUpdate": "Version Update", + "languageSwitch": "Language Switch", + "clearCache": "Clear Cache", + "switchIdentity": "Switch Identity", + "cancelOrder": "Cancel Order" + }, + "components": { + "cancel": "Cancel", + "confirmD": "Confirm", + "agreementPrivacyPolicy": "Agreement & Privacy Policy", + "privacyPolicy": "Privacy Policy", + "userAgreement": "User Agreement", + "agree": "Agree", + "and": "and", + "turnDown": "Decline", + "openSuccess": "Opened Successfully", + "openFailed": "Open Failed, Try Again", + "roleSwitching": "Switch Role", + "aboutUs": "About Us", + "agreementPrivacyPolicyTip": "Welcome to the Aluminum Trading Platform! Please review the updated User Agreement and Privacy Policy.", + "immediateOrder": "Place Order", + "contactUs": "Contact Us", + "contactCustomerService": "Contact Support", + "register": "Register", + "login": "Login", + "resetPassword": "Reset Password", + "productSpe": "Product Specs", + "pickupLocation": "Pickup Location", + "enterOpeningBank": "Please enter the opening bank", + "detailedAddress": "Detailed Address", + "unitPrice": "Unit Price", + "password": "Password", + "lxPhone": "Contact Phone", + "bankName": "Bank Name", + "deliveryDate": "Delivery Date", + "username": "Username", + "avatar": "Avatar", + "nickname": "Nickname", + "pleSelectRegion": "Select Region", + "enterDetailedAddress": "Enter Detailed Address", + "contactUsIfAnyProblems": "Contact Us for Assistance", + "confirmCallCustomerService": "Call Customer Service?", + "enterAccount": "Enter Account", + "enterPassword": "Enter Password", + "agreeToReadAndAgree": "Please Agree to Our", + "privacyTerms": "Privacy Terms", + "serviceAgreement": "Service Agreement", + "enterContactInfo": "Enter Phone/User/Email", + "enterVerificationCode": "Enter Verification Code", + "setNewPassword": "Set a New Password (6 to 50 characters)", + "confirmPassword": "Confirm Password", + "agreeToPrivacyAgreement": "Agree to Privacy Policy", + "gettingVerificationCode": "Getting Code", + "verificationCodeSent": "Code Sent", + "enterYourPassword": "Enter Password", + "noDuplicateSend": "Do Not Resend", + "enterUserName": "Enter Username", + "plePhoneNumber": "Enter Contact Number", + "selectIdentity": "Select Role", + "enterBankName": "Enter Bank Name", + "selectAvatar": "Select Avatar", + "enterNickname": "Enter Nickname", + "fillNickname": "Enter a Nickname", + "businessLicense": "Business License", + "basicAccountInfo": "Account Info", + "receivingBank": "Receiving Bank", + "applicationReview": "Application Review", + "registrationNotice": "Registration Info", + "serviceAgreementAndPrivacyTerms": "Service & Privacy Terms", + "and": "and", + "personalInfoProtectionGuideline": "Personal Info Guidelines", + "applyForAvatarNickname": "Request Avatar & Nickname", + "confirmR": "Confirm", + "helpAndFeedback": "Help & Feedback", + "pleaseSubmit": "Submit Your Request or Issue. Thank You!", + "screenshot": "Screenshot", + "contactInfo": "Contact Info", + "contactName": "Contact Name", + "enterContactName": "Enter Contact Name", + "contactNumber": "Contact Number", + "submitFeedback": "Submit Feedback", + "defaultAddress": "Default Address", + "edit": "Edit", + "delete": "Delete", + "contactPerson": "Contact Person", + "enterContactPersonName": "Enter Contact Name", + "phoneNumber": "Phone Number", + "enterPhoneNumber": "Enter Phone Number", + "region": "Region", + "selectRegion": "Select Region", + "location": "Location", + "modifyAddress": "Edit Address", + "addNewAddress": "Add New Address", + "pleaseFillContactPerson": "Enter Contact Person", + "pleaseFillPhoneNumber": "Enter Phone Number", + "pleaseFillRegion": "Enter Region", + "pleaseFillDetailedAddress": "Enter Detailed Address", + "invalidPhoneFormat": "Invalid Phone Number", + "verificationPassed": "Verified", + "auditPassed": "Audit Passed", + "customerName": "Customer Name", + "share": "Share", + "shoppingCart": "Cart", + "selectContactPerson": "Select Contact", + "addressManagement": "Address Management", + "operationSuccessful": "Success", + "deleteAddress": "Delete Address", + "confirmDeleteAddress": "Delete This Address? Cannot be Undone.", + "deleteSuccessful": "Deleted", + "submitReview": "Submit for Review", + "withdrawRequestNotice": "Note: Cannot Cancel After Approval", + "productSpecification": "Product Specs", + "shippingAddress": "Shipping Address", + "orderInfo": "Order Info", + "orderNumber": "Order Number", + "orderTime": "Order Time", + "orderNotice": "Order Notice", + "accountName": "Account Name", + "enterAccountName": "Enter Account Name", + "bankAccount": "Bank Account", + "enterBankAccount": "Enter Bank Account", + "paymentNotice": "Pay within 30 Minutes", + "confirmOrder": "Confirm Order", + "cancelOrder": "Cancel Order", + "systemSettings": "Settings", + "helpFeedback": "Help & Feedback", + "unitPrice2": "Price/Unit", + "immediatePurchase": "Buy Now", + "applyNow": "Apply now" + }, + "other": { + "orderList": "Listings", + "spotTrading": "Spot Trading", + "futuresTrading": "Futures Trading", + "aluminumProducts": "Aluminum Products", + "tentativeQuantity": "Tentative Qty (Tons)", + "performanceDeposit": "Performance Bond", + "priceQuantityPercentage": "(Price * Qty * 2%)", + "companyName": "Company Name", + "enterCompanyName": "Enter Company Name", + "taxCode": "Tax Code", + "enterTaxCode": "Enter Tax Code", + "companyAddress": "Company Address", + "enterCompanyAddress": "Enter Company Address", + "companyAccount": "Company Account", + "enterCompanyAccount": "Enter Company Account", + "frameworkContractPreview": "Contract Preview", + "buyerRegistration": "Buyer Registration", + "supplierRegistration": "Supplier Registration", + "domesticCustomsClearanceApplication": "Customs Application", + "iAmBuyer": "I Am a Buyer", + "iAmSupplier": "I Am a Supplier", + "pickupAddress": "Pickup Address", + "pickupDate": "Pickup Date", + "withdrawOrder": "Withdraw Order", + "supplierName": "Supplier Name", + "deliveryTime": "Delivery Time", + "defaultAluminumPrice": "Default Aluminum Price", + "submitQuotation": "Submit Quotation", + "submitReview": "Submit for Review", + "supplierQuotation": "Supplier Quotation", + "supplierOrder": "Supplier Listing", + "myOrders": "My Listings", + "payDeposit": "Pay Bond", + "supplierBilLading": "Supplier bill of lading" }, - "components" : { - "config" : { - "configPopup" : { - + "pages": { + "index": { + "index": { + "agreement": "Agreement", + "language": "Language", + "purchaser": "Purchaser", + "supplier": "Supplier", + "companyProfile": "Company Profile", + "aluminiumProduct": "Aluminium Products", + "supplierQuotation": "Supplier Quotation", + "supplierBillLading": "Supplier Bill Lading" } } } -} \ No newline at end of file +} diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index d69f83b..04f9b7a 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -6,6 +6,200 @@ "responseMessage" : { }, + "pageTitle": { + "proName": "铝产品现货交易平台", + "welcomeToAluminumTradingPlatform": "欢迎使用铝交易平台", + "aluminumTradingPlatform": "铝交易平台", + "wechatAuthorizedLogin": "微信授权登录", + "buyerRegistration": "采购商注册", + "domesticCustomsClearanceApplication": "国内清关申请", + "supplierQuotation": "供应商报价", + "supplierOrder": "供应商挂单", + "myOrders": "我的挂单", + "orderDetails": "挂单详情", + "withdrawOrder": "我要撤单", + "accountPasswordLogin": "账号密码登录", + "phoneLogin": "手机号登录", + "forgotPasswordPage": "忘记密码页面", + "selectIdentity": "选择身份", + "immediateOrder": "立即下单", + "confirmOrder": "确认下单", + "systemSettings": "系统设置", + "aboutThisProgram": "关于本程序", + "personalCenter": "个人中心", + "accountSetting": "账号设置", + "systemSetting": "系统设置", + "identitySetting": "身份设置", + "switchAccount": "切换账号", + "changePassword": "修改密码", + "logout": "退出登录", + "versionUpdate": "版本更新", + "languageSwitch": "语言切换", + "clearCache": "清理缓存", + "switchIdentity": "切换身份", + "cancelOrder": "取消订单" + }, + "components": { + "cancel": "取消", + "confirmD": "确定", + "agreementPrivacyPolicy": "协议与隐私政策", + "privacyPolicy": "隐私政策", + "userAgreement": "用户协议", + "agree": "同意", + "and": "以及", + "turnDown": "拒绝", + "openSuccess": "打开成功", + "openFailed": "打开失败，稍后重试", + "roleSwitching": "角色切换", + "aboutUs": "关于我们", + "agreementPrivacyPolicyTip": "欢迎来到铝交易平台!我们根据最新的法律法规、监管政策要求，更新了《用户协议》和《隐私政策》,请您认真阅读。", + "immediateOrder": "立即下单", + "contactUs": "联系我们", + "applyNow": "立即申请", + "contactCustomerService": "联系客服", + "register": "注册", + "login": "登录", + "resetPassword": "重置密码", + "productSpe": "商品规格", + "pickupLocation": "提货地点", + "detailedAddress": "详细地址", + "unitPrice": "单价", + "password": "密码", + "lxPhone": "联系电话", + "bankName": "开户行", + "deliveryDate": "交货日期", + "username": "用户名", + "avatar": "头像", + "nickname": "昵称", + "pleSelectRegion": "请选择所在地区", + "enterDetailedAddress": "请输入详细地址", + "contactUsIfAnyProblems": "如有问题，请联系我们", + "confirmCallCustomerService": "确定拨打客服电话?", + "enterAccount": "请输入账号", + "enterPassword": "请输入密码", + "agreeToReadAndAgree": "请你阅读并同意我们的", + "privacyTerms": "《隐私条款》", + "serviceAgreement": "《服务协议》", + "enterContactInfo": "请输入手机号/用户/邮箱", + "enterVerificationCode": "请输入验证码", + "setNewPassword": "设置您的新密码(6到50个字符)", + "confirmPassword": "重新确认密码", + "agreeToPrivacyAgreement": "请先同意隐私协议", + "gettingVerificationCode": "正在获取验证码", + "verificationCodeSent": "验证码已发送", + "enterYourPassword": "请输入您的密码", + "noDuplicateSend": "请勿重复发送", + "enterUserName": "请输入用户名称", + "plePhoneNumber": "请输入联系电话", + "selectIdentity": "请选择你的身份", + "enterBankName": "请输入开户行名称", + "selectAvatar": "请选择头像", + "enterNickname": "请输入昵称", + "fillNickname": "请填写昵称", + "businessLicense": "营业执照", + "basicAccountInfo": "基本户信息", + "receivingBank": "收款银行", + "applicationReview": "申请审核", + "registrationNotice": "注册须知", + "serviceAgreementAndPrivacyTerms": "服务协议与隐私条款", + "and": "以及", + "personalInfoProtectionGuideline": "个人信息保护指引", + "applyForAvatarNickname": "申请获取你的头像、昵称", + "confirmR": "确认", + "helpAndFeedback": "帮助与反馈", + "pleaseSubmit": "请把您需要的帮助或者您发现的问题提交给我们,感谢您的参与(必填)", + "screenshot": "问题截图", + "contactInfo": "联系方式", + "contactName": "联系姓名", + "enterContactName": "请输入联系姓名", + "contactNumber": "联系电话", + "submitFeedback": "提交反馈", + "defaultAddress": "默认地址", + "edit": "编辑", + "delete": "删除", + "contactPerson": "联系人", + "enterContactPersonName": "请输入联系人姓名", + "phoneNumber": "手机号", + "enterPhoneNumber": "请输入手机号", + "region": "所在地区", + "selectRegion": "请选择所在地区", + "location": "定位", + "modifyAddress": "修改地址", + "addNewAddress": "新增地址", + "pleaseFillContactPerson": "请填写联系人", + "pleaseFillPhoneNumber": "请填写手机号", + "pleaseFillRegion": "请填写所在地区", + "pleaseFillDetailedAddress": "请填写详细地址", + "invalidPhoneFormat": "手机号格式不合法", + "verificationPassed": "验证通过", + "auditPassed": "审核通过", + "customerName": "客户姓名", + "share": "分享", + "shoppingCart": "购物车", + "selectContactPerson": "请选择联系人", + "addressManagement": "地址管理", + "operationSuccessful": "操作成功", + "deleteAddress": "删除地址", + "confirmDeleteAddress": "确认删除此地址?删除后数据不可恢复", + "deleteSuccessful": "删除成功", + "submitReview": "提交审核", + "withdrawRequestNotice": "提示:提交“我要撤单”审核通过后之后不可轻易取消", + "productSpecification": "产品规格", + "shippingAddress": "收货地址", + "orderInfo": "订单信息", + "orderNumber": "订单编号", + "orderTime": "下单时间", + "orderNotice": "下单须知", + "accountName": "开户名称", + "enterAccountName": "请输入开户名称", + "enterOpeningBank": "请输入开开户行", + "bankAccount": "银行账号", + "enterBankAccount": "请输入银行账号", + "paymentNotice": "提示:请于下单成功后30分钟内支付。(自动倒计时)", + "confirmOrder": "确认下单", + "cancelOrder": "取消订单", + "systemSettings": "系统设置", + "helpFeedback": "帮助反馈", + "unitPrice2": "元/起", + "immediatePurchase": "立即采购" + }, + "other": { + "orderList": "挂单列表", + "spotTrading": "现货交易", + "futuresTrading": "期货交易", + "aluminumProducts": "铝制品", + "tentativeQuantity": "暂定数量(吨)", + "performanceDeposit": "履约保证金", + "priceQuantityPercentage": "(单价*数量*2%)", + "companyName": "公司名称", + "enterCompanyName": "请输入公司名称", + "taxCode": "税收编码", + "enterTaxCode": "请输入税收编码", + "companyAddress": "公司地址", + "enterCompanyAddress": "请输入公司地址", + "companyAccount": "公司账户", + "enterCompanyAccount": "请输入公司账户", + "frameworkContractPreview": "框架合同预览", + "buyerRegistration": "采购商注册", + "supplierRegistration": "供应商注册", + "domesticCustomsClearanceApplication": "国内清关申请", + "iAmBuyer": "我是采购商", + "iAmSupplier": "我是供应商", + "pickupAddress": "提货地址", + "pickupDate": "提货日期", + "withdrawOrder": "我要撤单", + "supplierName": "供应商名称", + "deliveryTime": "交货时间", + "defaultAluminumPrice": "默认为铝品单价", + "submitQuotation": "提交报价", + "submitReview": "提交审核", + "supplierQuotation": "供应商报价", + "supplierBilLading": "供应商提单", + "supplierOrder": "供应商挂单", + "myOrders": "我的挂单", + "payDeposit": "支付保证金" + }, + "pages" : { "index" : { "index" : { @@ -14,15 +208,11 @@ "purchaser":"采购商", "supplier":"供应商", "companyProfile":"公司简介", - "aluminiumProduct":"铝制品" - } - } - }, - "components" : { - "config" : { - "configPopup" : { - "noData" : "内容未找到：404" + "aluminiumProduct":"铝制品", + "supplierQuotation":"供应商报价", + "supplierBillLading":"供应商提单" } } } + } \ No newline at end of file diff --git a/pages/index/center2.vue b/pages/index/center2.vue index 7f6d9f5..6ac6dc1 100644 --- a/pages/index/center2.vue +++ b/pages/index/center2.vue @@ -1,7 +1,7 @@ + diff --git a/pages_order/components/order/orderList.vue b/pages_order/components/order/orderList.vue index f28020c..910e0aa 100644 --- a/pages_order/components/order/orderList.vue +++ b/pages_order/components/order/orderList.vue @@ -3,10 +3,10 @@ - 铝制品 + {{ $t('other.aluminumProducts') }} - 审核通过 + {{ $t('components.auditPassed') }} @@ -18,16 +18,16 @@ - 客户姓名：张三 18888888888 + {{ $t('components.customerName') }} ：张三 18888888888 - 商品规格：铝锭【Al>96%】 + {{ $t('components.productSpe') }}：铝锭【Al>96%】 - 提货地址：北京市海淀区西二旗北路10号 + {{ $t('other.pickupAddress') }}：北京市海淀区西二旗北路10号 - 提货日期：2021-08-01 + {{ $t('other.aluminumProducts') }}：2021-08-01 @@ -39,7 +39,7 @@ - 我要撤单 + {{ $t('other.withdrawOrder') }} @@ -151,7 +151,7 @@ export default { display: flex; align-items: center; justify-content: center; - width: 25%; + width: 40%; height: 50rpx; border-radius: 40rpx; color: #afafaf; diff --git a/pages_order/mine/help.vue b/pages_order/mine/help.vue index 6c7dee6..0ee363b 100644 --- a/pages_order/mine/help.vue +++ b/pages_order/mine/help.vue @@ -1,7 +1,7 @@