From d7d602897465b7d175f72a6d6f9eb92d4c0e15c5 Mon Sep 17 00:00:00 2001
From: sl <2436637291@qq.com>
Date: Fri, 19 Aug 2022 19:01:33 +0800
Subject: [PATCH] wip

---
 themes/default/account/address.blade.php   | 4 ++--
 themes/default/account/forgotten.blade.php | 2 +-
 themes/default/account/rmas/form.blade.php | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/themes/default/account/address.blade.php b/themes/default/account/address.blade.php
index 041ecee4..4c9ed77f 100644
--- a/themes/default/account/address.blade.php
+++ b/themes/default/account/address.blade.php
@@ -115,8 +115,8 @@
 
         deleteAddress(index) {
           this.$confirm('{{ __('shop/account.addresses.confirm_delete') }}', '{{ __('shop/account.addresses.hint') }}', {
-            confirmButtonText: '{{ __('shop/common.confirm') }}',
-            cancelButtonText: '{{ __('shop/common.cancel') }}',
+            confirmButtonText: '{{ __('common.confirm') }}',
+            cancelButtonText: '{{ __('common.cancel') }}',
             type: 'warning'
           }).then(() => {
             $http.delete('/account/addresses/' + this.addresses[index].id).then((res) => {
diff --git a/themes/default/account/forgotten.blade.php b/themes/default/account/forgotten.blade.php
index d86500a6..4148f1ad 100644
--- a/themes/default/account/forgotten.blade.php
+++ b/themes/default/account/forgotten.blade.php
@@ -50,7 +50,7 @@
                 <button type="button" @click="submitForm('form')" class="btn w-50 btn-dark">
                   {{-- @{{ !isCode ? '发送验证码'  :  '提交'  }} --}}
                   <template v-if="!isCode">{{ __('shop/forgotten.send_code') }}</template>
-                  <template v-else>{{ __('shop/common.submit') }}</template>
+                  <template v-else>{{ __('common.submit') }}</template>
                 </button>
               </div>
               <a href="javascript:void(0)" v-if="isCode" @click="isCode = false" class="text-muted">{{ __('shop/forgotten.to_back') }}</a>
diff --git a/themes/default/account/rmas/form.blade.php b/themes/default/account/rmas/form.blade.php
index 60661361..292ebffd 100644
--- a/themes/default/account/rmas/form.blade.php
+++ b/themes/default/account/rmas/form.blade.php
@@ -71,8 +71,8 @@
                 <div class="col-sm-6 mb-4">
                   <label class="form-label">{{ __('shop/account.rma.rma_form.unpacked') }}</label>
                   <select class="form-select" name="opened">
-                    <option selected value="0">{{ __('shop/common.no') }}</option>
-                    <option value="1">{{ __('shop/common.yes') }}</option>
+                    <option selected value="0">{{ __('common.no') }}</option>
+                    <option value="1">{{ __('common.yes') }}</option>
                   </select>
                 </div>