From 5f3af2a6bdab53728eaab4279c8dd936e607c26d Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Mon, 13 Feb 2023 17:55:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Common.php | 22 ++ app/admin/controller/Theme.php | 2 +- app/admin/lang/{en-us.php => en.php} | 39 +-- app/admin/lang/{zh-cn.php => zh.php} | 17 +- app/admin/view/default/admin/login_info.html | 6 +- app/admin/view/default/appmini/index.html | 4 +- app/admin/view/default/appmini/upload.html | 2 +- app/admin/view/default/public/nav.html | 24 +- app/admin/view/default/theme/index.html | 4 +- app/admin/view/default/theme/upload.html | 2 +- app/common.php | 76 +++-- app/index/controller/Common.php | 4 + app/index/lang/{en-us.php => en.php} | 34 +-- app/index/lang/{zh-cn.php => zh.php} | 0 app/index/view/default/index/index.html | 4 +- .../view/default/public/header_top_nav.html | 11 +- app/install/controller/Common.php | 32 +- app/lang/{en-us.php => en.php} | 93 +++--- app/lang/{zh-cn.php => zh.php} | 67 +++-- app/middleware.php | 2 +- app/service/MultilingualService.php | 278 ++++++++++++++++++ app/service/NavigationService.php | 16 +- app/service/SystemService.php | 7 + config/lang.php | 45 ++- .../static/admin/default/css/index.index.css | 2 +- public/static/index/default/css/common.css | 26 +- 26 files changed, 631 insertions(+), 188 deletions(-) rename app/admin/lang/{en-us.php => en.php} (98%) rename app/admin/lang/{zh-cn.php => zh.php} (99%) rename app/index/lang/{en-us.php => en.php} (95%) rename app/index/lang/{zh-cn.php => zh.php} (100%) rename app/lang/{en-us.php => en.php} (98%) rename app/lang/{zh-cn.php => zh.php} (98%) create mode 100644 app/service/MultilingualService.php diff --git a/app/admin/controller/Common.php b/app/admin/controller/Common.php index 98ee01f55..af7f93e6e 100755 --- a/app/admin/controller/Common.php +++ b/app/admin/controller/Common.php @@ -19,6 +19,7 @@ use app\service\AdminPowerService; use app\service\ConfigService; use app\service\ResourcesService; use app\service\StoreService; +use app\service\MultilingualService; /** * 管理员公共控制器 @@ -105,6 +106,9 @@ class Common extends BaseController // 系统初始化 $this->SystemInit(); + // 系统运行开始 + SystemService::SystemBegin($this->data_request); + // 管理员信息 $this->admin = AdminService::LoginInfo(); @@ -122,6 +126,20 @@ class Common extends BaseController $this->CommonPluginsInit(); } + /** + * 析构函数 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-18 + * @desc description + */ + public function __destruct() + { + // 系统运行结束 + SystemService::SystemEnd($this->data_request); + } + /** * 系统初始化 * @author Devil @@ -372,6 +390,10 @@ class Common extends BaseController // 省市联动是否必选选择 $assign['is_force_region_choice'] = 1; + // 多语言 + $assign['multilingual_default_code'] = MultilingualService::GetUserMultilingualValue(); + $assign['multilingual_data'] = MultilingualService::MultilingualData(); + // 模板赋值 MyViewAssign($assign); } diff --git a/app/admin/controller/Theme.php b/app/admin/controller/Theme.php index 947c1d709..b0ec01d0f 100755 --- a/app/admin/controller/Theme.php +++ b/app/admin/controller/Theme.php @@ -57,7 +57,7 @@ class Theme extends Base // 导航参数 'view_type' => $this->view_type, // 基础导航 - 'base_nav' => MyLang('appmini.base_nav_list'), + 'base_nav' => MyLang('theme.base_nav_list'), // 应用商店 'store_theme_url' => StoreService::StoreThemeUrl(), ]; diff --git a/app/admin/lang/en-us.php b/app/admin/lang/en.php similarity index 98% rename from app/admin/lang/en-us.php rename to app/admin/lang/en.php index 7e39be54c..330ca8ff7 100644 --- a/app/admin/lang/en-us.php +++ b/app/admin/lang/en.php @@ -204,7 +204,7 @@ return [ '3. The style of the front category page will be different if the level is different', ], 'goods_auto_mode_max_count_tips_list' => [ - '1. Configure the maximum number of products displayed on each floor', + '1. Configure the maximum number of goods displayed on each floor', '2. It is not recommended to modify the quantity too large, which will lead to too large blank area on the left side of the PC', ], 'goods_auto_mode_order_by_tips_list' => [ @@ -212,7 +212,7 @@ return [ ], 'goods_manual_mode_max_tips_list' => [ '1. Click the title of the item to drag and sort it and display it in order', - '2. It is not recommended to add many products, which will lead to too large blank area on the left side of the PC', + '2. It is not recommended to add many goods, which will lead to too large blank area on the left side of the PC', ], 'extends_crontab_tips' => 'It is recommended that you add the script address to the timing request of the Linux scheduled task (the result is SUCS: 0, FAIL: 0, followed by the colon is the number of data processed, SUCS succeeded, FALI failed)', 'left_images_random_tips' => 'The left picture can upload up to 3 pictures, and one of them can be displayed randomly each time', @@ -225,7 +225,7 @@ return [ 'site_setup_choice_payment_message' => 'Please select {:name} default payment method', 'sitetype_top_tips_list' => [ '1. Express delivery, conventional e-commerce process, user selects the receiving address to place an order for payment ->merchant shipment ->confirmation of receipt ->order completion', - '2. Display type, only display products, can initiate consultation (cant place an order)', + '2. Display type, only display goods, can initiate consultation (cant place an order)', '3. Select the self-pickup address when placing the order, and the user places the order for payment ->confirm the delivery ->order completion', '4. Virtual sales, conventional e-commerce process, user order payment ->automatic delivery ->confirmation of delivery ->order completion', ], @@ -410,7 +410,7 @@ return [ // 动态表格 'form_table' => [ 'goods' => 'Base Info', - 'goods_placeholder' => 'Please enter the product name/model', + 'goods_placeholder' => 'Please enter the goods name/model', 'warehouse_name' => 'Warehouse', 'is_enable' => 'Enable or not', 'inventory' => 'Total Inventory', @@ -430,9 +430,9 @@ return [ ], 'base_nav_title' => 'Admin', // 登录 - 'login_type_username_title' => 'Account Password', - 'login_type_mobile_title' => 'Mobile Verify Code', - 'login_type_email_title' => 'Email Verify Code', + 'login_type_username_title' => 'Account', + 'login_type_mobile_title' => 'Mobile', + 'login_type_email_title' => 'Email', 'login_close_tips' => 'Temporarily closed login', // 忘记密码 'form_forget_password_name' => 'Forgot Password?', @@ -486,9 +486,10 @@ return [ 'nav_theme_download_tips' => 'The theme of mobile phone is developed by uniapp (supporting multi-terminal applet+H5), and APP is also in emergency adaptation。', 'form_alipay_extend_title' => 'Customer service configuration', 'form_alipay_extend_tips' => 'PS: If [APP/applet] is enabled (online customer service is enabled), the following configuration must be filled in [Enterprise Code] and [Chat Window Code]', + 'form_theme_upload_tips' => 'Upload a zip compressed installation package', 'list_no_data_tips' => 'No related theme packs', - 'list_author_title' => 'Author：', - 'list_version_title' => 'Applicable version：', + 'list_author_title' => 'Author', + 'list_version_title' => 'Applicable version', 'package_generate_tips' => 'The generation time is relatively long, please do not close the browser window!', // 动态表格 'form_table' => [ @@ -588,7 +589,7 @@ return [ 'user' => 'User Info', 'user_placeholder' => 'Please enter user name/nickname/mobile phone/email', 'goods' => 'Base Info', - 'goods_placeholder' => 'Please enter the product name/model', + 'goods_placeholder' => 'Please enter the goods name/model', 'business_type' => 'Business Type', 'content' => 'Content', 'images' => 'Images', @@ -770,7 +771,7 @@ return [ // 动态表格 'form_table' => [ 'goods' => 'Base Info', - 'goods_placeholder' => 'Please enter order ID/order number/product name/model', + 'goods_placeholder' => 'Please enter order ID/order number/goods name/model', 'user' => 'User Info', 'user_placeholder' => 'Please enter user name/nickname/mobile phone/email', 'status' => 'Order Status', @@ -820,7 +821,7 @@ return [ // 动态表格 'form_table' => [ 'goods' => 'Base Info', - 'goods_placeholder' => 'Please enter the order number/product name/model', + 'goods_placeholder' => 'Please enter the order number/goods name/model', 'user' => 'User Info', 'user_placeholder' => 'Please enter user name/nickname/mobile phone/email', 'status' => 'Status', @@ -896,9 +897,9 @@ return [ ['name' => 'Theme Install', 'type' => 'upload'], ], 'nav_store_theme_name' => 'More topic downloads', - 'list_author_title' => 'Author：', + 'list_author_title' => 'Author', 'list_version_title' => 'Applicable Version', - 'form_item_upload_tips' => 'Upload an application installation package in zip compression format', + 'form_theme_upload_tips' => 'Upload a zip compressed theme installation package', ], // 用户中心导航 @@ -1027,9 +1028,9 @@ return [ 'base_top_tips_one' => 'List sorting method [custom sorting ->earliest installation]', 'base_top_tips_two' => 'Click and drag icon button to adjust plug-in call and display order', 'base_open_sort_title' => 'Enable sorting', - 'data_list_author_title' => 'Author：', - 'data_list_author_url_title' => 'HomePage：', - 'data_list_version_title' => 'Version：', + 'data_list_author_title' => 'Author', + 'data_list_author_url_title' => 'HomePage', + 'data_list_version_title' => 'Version', 'uninstall_confirm_tips' => 'Uninstallation may lose the basic configuration data of the plug-in. Is it unrecoverable and confirm the operation?', 'not_install_divide_title' => 'The following plugins are not installed', 'delete_plugins_text' => '1. Delete apps only', @@ -1198,7 +1199,7 @@ return [ '1. All (displayed under goods basic information and detail parameters)', '2. Details (only displayed under the goods details parameter)', '3. Basic (only displayed under goods basic information)', - '4. The shortcut operation will clear the original data and reload the page to restore the original data (only effective after saving the product)', + '4. The shortcut operation will clear the original data and reload the page to restore the original data (only effective after saving the goods)', ], ], @@ -1222,7 +1223,7 @@ return [ 'item' => [ 'site_index' => 'Site setup', 'site_save' => 'Site setup editing', - 'site_goodssearch' => 'Site setup and product search', + 'site_goodssearch' => 'Site setup and goods search', 'layout_layoutindexhomesave' => 'Homepage layout admin', 'sms_index' => 'SMS setup', 'sms_save' => 'SMS setup editing', diff --git a/app/admin/lang/zh-cn.php b/app/admin/lang/zh.php similarity index 99% rename from app/admin/lang/zh-cn.php rename to app/admin/lang/zh.php index 4f3a9df17..8a4b6ab18 100755 --- a/app/admin/lang/zh-cn.php +++ b/app/admin/lang/zh.php @@ -485,9 +485,10 @@ return [ 'nav_theme_download_tips' => '手机端主题采用uniapp开发（支持多端小程序+H5），APP也在紧急适配中。', 'form_alipay_extend_title' => '客服配置', 'form_alipay_extend_tips' => 'PS：如【APP/小程序】中开启（开启在线客服），则以下配置必填 [企业编码] 和 [聊天窗编码]', + 'form_theme_upload_tips' => '上传一个zip压缩格式的安装包', 'list_no_data_tips' => '没有相关主题包', - 'list_author_title' => '作者：', - 'list_version_title' => '适用版本：', + 'list_author_title' => '作者', + 'list_version_title' => '适用版本', 'package_generate_tips' => '生成时间比较长，请不要关闭浏览器窗口！', // 动态表格 'form_table' => [ @@ -881,9 +882,9 @@ return [ ['name' => '主题安装', 'type' => 'upload'], ], 'nav_store_theme_name' => '更多主题下载', - 'list_author_title' => '作者：', - 'list_version_title' => '适用版本：', - 'form_item_upload_tips' => '上传一个zip压缩格式的应用安装包', + 'list_author_title' => '作者', + 'list_version_title' => '适用版本', + 'form_theme_upload_tips' => '上传一个zip压缩格式的主题安装包', ], // 用户中心导航 @@ -1012,9 +1013,9 @@ return [ 'base_top_tips_one' => '列表排序方式[ 自定义排序 -> 最早安装 ]', 'base_top_tips_two' => '可点击拖动图标按钮调整插件调用和展示顺序', 'base_open_sort_title' => '开启排序', - 'data_list_author_title' => '作者：', - 'data_list_author_url_title' => '主页：', - 'data_list_version_title' => '版本：', + 'data_list_author_title' => '作者', + 'data_list_author_url_title' => '主页', + 'data_list_version_title' => '版本', 'uninstall_confirm_tips' => '卸载可能会丢失插件基础配置数据不可恢复、确认操作吗？', 'not_install_divide_title' => '以下插件未安装', 'delete_plugins_text' => '1. 仅删除应用', diff --git a/app/admin/view/default/admin/login_info.html b/app/admin/view/default/admin/login_info.html index a138d450b..e237212dc 100755 --- a/app/admin/view/default/admin/login_info.html +++ b/app/admin/view/default/admin/login_info.html @@ -58,7 +58,7 @@ {{/if}}
- +
@@ -84,7 +84,7 @@
- +
@@ -110,7 +110,7 @@
- +
diff --git a/app/admin/view/default/appmini/index.html b/app/admin/view/default/appmini/index.html index 85c23c118..76e393e3a 100644 --- a/app/admin/view/default/appmini/index.html +++ b/app/admin/view/default/appmini/index.html @@ -34,14 +34,14 @@ {{/if}} -
{{:MyLang('appmini.list_author_title')}} +
{{:MyLang('appmini.list_author_title')}}： {{if empty($v['home'])}} {{$v.author}} {{else /}} {{$v.author}} {{/if}}
-
{{:MyLang('appmini.list_version_title')}}{{$v.ver}}
+
{{:MyLang('appmini.list_version_title')}}：{{$v.ver}}
diff --git a/app/admin/view/default/appmini/upload.html b/app/admin/view/default/appmini/upload.html index 704ab69d1..912bad7f2 100644 --- a/app/admin/view/default/appmini/upload.html +++ b/app/admin/view/default/appmini/upload.html @@ -17,7 +17,7 @@ - {{:MyLang('appmini.form_item_upload_file_tips')}} + {{:MyLang('appmini.form_theme_upload_tips')}}
diff --git a/app/admin/view/default/public/nav.html b/app/admin/view/default/public/nav.html index 855657419..b457b5432 100755 --- a/app/admin/view/default/public/nav.html +++ b/app/admin/view/default/public/nav.html @@ -20,14 +20,30 @@
-
{{:MyLang('theme.list_author_title')}} +
{{:MyLang('theme.list_author_title')}}： {{if empty($v['home'])}} {{$v.author}} {{else /}} {{$v.author}} {{/if}}
-
{{:MyLang('theme.list_version_title')}}{{$v.ver}}
+
{{:MyLang('theme.list_version_title')}}：{{$v.ver}}
diff --git a/app/admin/view/default/theme/upload.html b/app/admin/view/default/theme/upload.html index 39508d82d..696d650ea 100755 --- a/app/admin/view/default/theme/upload.html +++ b/app/admin/view/default/theme/upload.html @@ -14,7 +14,7 @@ - {{:MyLang('theme.form_item_upload_tips')}} + {{:MyLang('theme.form_theme_upload_tips')}}
diff --git a/app/common.php b/app/common.php index 5cc2a60db..050460ac4 100755 --- a/app/common.php +++ b/app/common.php @@ -17,6 +17,7 @@ use app\service\PluginsService; use app\service\ConstService; use app\service\AdminService; use app\service\AdminPowerService; +use app\service\MultilingualService; /** * 两个数组字段对比处理、arr1不存在arr2中的字段则移除 @@ -164,15 +165,27 @@ function MyLang($key, $vars = [], $lang = '') $value = ''; if(!empty($key)) { + // 当前语言 + $current_lang = empty($lang) ? MultilingualService::GetUserMultilingualValue() : $lang; + // key使用 . 分隔 $key_arr = explode('.', $key); + // 语言数据容器 + static $lang_data = []; + + // 系统语言 + $arr_file = [ + APP_PATH.RequestModule().DS.'lang'.DS.$current_lang.'.php', + APP_PATH.'lang'.DS.$current_lang.'.php', + ]; // 是否插件语言 if(RequestController() == 'plugins') { - // 静态存储、不用每次都从磁盘读取 - static $lang_data = []; - $file = APP_PATH.'plugins'.DS.MyInput('pluginsname').DS.'lang'.DS.MyConfig('lang.default_lang').'.php'; + array_unshift($arr_file, APP_PATH.'plugins'.DS.MyInput('pluginsname').DS.'lang'.DS.$current_lang.'.php'); + } + foreach($arr_file as $file) + { $md5_key = md5($file); if(!array_key_exists($md5_key, $lang_data) && file_exists($file)) { @@ -193,51 +206,36 @@ function MyLang($key, $vars = [], $lang = '') if(array_key_exists($key_arr[0], $temp_lang_data)) { $value = $temp_lang_data[$key_arr[0]]; - } - // 移除第一级 - array_shift($key_arr); - // 循环后面级别的数据 - foreach($key_arr as $v) - { - if(is_array($value) && array_key_exists($v, $value)) + if(!empty($value) && is_array($value)) { - $value = $value[$v]; - } else { - // 未匹配到则赋空值 - $value = $key; - break; + // 移除第一级 + array_shift($key_arr); + // 循环后面级别的数据 + foreach($key_arr as $v) + { + if(array_key_exists($v, $value)) + { + $value = $value[$v]; + } else { + // 未匹配到则赋空值 + $value = $key; + break; + } + } } } } } } - // 默认也从系统读取 - // 插件未读取成功则从系统读取 - if($value === '') + // 未找到对应语言 + if($value == '' || $key == $value) { - // 系统语言 - // 仅一级则直接读取 - if(count($key_arr) == 1) + // 非默认语言则读取默认语言 + $default_lang = MyConfig('lang.default_lang'); + if($default_lang != $lang) { - $value = lang($key, [], $lang); - } else { - // 默认先读取第一级 - $value = lang($key_arr[0], [], $lang); - // 移除第一级 - array_shift($key_arr); - // 循环后面级别的数据 - foreach($key_arr as $v) - { - if(isset($value[$v])) - { - $value = $value[$v]; - } else { - // 未匹配到则赋空值 - $value = $key; - break; - } - } + $value = MyLang($key, $vars, $default_lang); } } diff --git a/app/index/controller/Common.php b/app/index/controller/Common.php index 57cfd985a..34f7e2c0e 100755 --- a/app/index/controller/Common.php +++ b/app/index/controller/Common.php @@ -25,6 +25,7 @@ use app\service\ConfigService; use app\service\UserService; use app\service\AdminService; use app\service\QuickNavService; +use app\service\MultilingualService; /** * 前端公共控制器 @@ -457,6 +458,9 @@ class Common extends BaseController // 省市联动是否必选选择 $assign['is_force_region_choice'] = 1; + // 多语言 + $assign['multilingual_default_code'] = MultilingualService::GetUserMultilingualValue(); + // 模板赋值 MyViewAssign($assign); } diff --git a/app/index/lang/en-us.php b/app/index/lang/en.php similarity index 95% rename from app/index/lang/en-us.php rename to app/index/lang/en.php index 7b87a27fd..d0df683e8 100644 --- a/app/index/lang/en-us.php +++ b/app/index/lang/en.php @@ -20,7 +20,7 @@ return [ // 页面公共 'common' => [ // 公共 - 'shop_home_title' => 'Mall homepage', + 'shop_home_title' => 'Mall Home', 'back_to_the_home_title' => 'Back to the home', 'all_category_text' => 'All Category', 'login_title' => 'Login', @@ -90,7 +90,7 @@ return [ 'browser_seo_title' => 'Goods Category', 'no_category_data_tips' => 'No classification data', 'no_sub_category_data_tips' => 'No subcategory data', - 'view_category_sub_goods_name' => 'View products under category', + 'view_category_sub_goods_name' => 'View goods under category', ], // 购物车 @@ -193,7 +193,7 @@ return [ 'detail_browser_seo_title' => 'Order Detail', 'comments_browser_seo_title' => 'Order Comments', 'batch_payment_name' => 'Batch Payment', - 'comments_goods_list_thead_base' => 'Product information', + 'comments_goods_list_thead_base' => 'Goods Info', 'comments_goods_list_thead_price' => 'Price', 'comments_goods_list_thead_content' => 'Comment Content', 'form_you_have_commented_tips' => 'You have commented', @@ -238,7 +238,7 @@ return [ // 动态表格 'form_table' => [ 'goods' => 'Base Info', - 'goods_placeholder' => 'Please enter the order number/product name/model', + 'goods_placeholder' => 'Please enter the order number/goods name/model', 'status' => 'Order Status', 'pay_status' => 'Payment Status', 'total_price' => 'Total Price(yuan)', @@ -325,7 +325,7 @@ return [ // 动态表格 'form_table' => [ 'goods' => 'Base Info', - 'goods_placeholder' => 'Please enter the order number/product name/model', + 'goods_placeholder' => 'Please enter the order number/goods name/model', 'status' => 'Status', 'type' => 'Apply Type', 'reason' => 'Reason', @@ -358,16 +358,16 @@ return [ // 登录 'login_top_register_tips' => 'Dont have an account yet?', 'login_close_tips' => 'Temporarily closed login', - 'login_type_username_title' => 'Account Password', - 'login_type_mobile_title' => 'Mobile Verify Code', - 'login_type_email_title' => 'Email Verify Code', + 'login_type_username_title' => 'Account', + 'login_type_mobile_title' => 'Mobile', + 'login_type_email_title' => 'Email', 'login_retrieve_password_title' => 'Retrieve Password', // 注册 'register_top_login_tips' => 'I have registered, now', 'register_close_tips' => 'Registration is temporarily closed', - 'register_type_username_title' => 'Account Register', - 'register_type_mobile_title' => 'Mobile Register', - 'register_type_email_title' => 'Email Register', + 'register_type_username_title' => 'Account', + 'register_type_mobile_title' => 'Mobile', + 'register_type_email_title' => 'Email', // 忘记密码 'forget_password_top_login_tips' => 'Already have an account?', // 表单 @@ -405,9 +405,9 @@ return [ 'various_cart_tips' => 'Put the goods you want to buy into the shopping cart and make it easier to settle together', 'various_favor_title' => 'Goods Favor', 'various_favor_empty_title' => 'You havent collected any goods yet', - 'various_favor_tips' => 'Favorite products will display the latest promotions and price reductions', + 'various_favor_tips' => 'Favorite goods will display the latest promotions and price reductions', 'various_browse_title' => 'My Browse', - 'various_browse_empty_title' => 'Your product browse record is empty', + 'various_browse_empty_title' => 'Your goods browse record is empty', 'various_browse_tips' => 'Go to the mall to see the promotional activities', ], @@ -421,8 +421,8 @@ return [ 'browser_seo_title' => 'My Browse', // 动态表格统计数据 'form_table' => [ - 'goods' => 'Product information', - 'goods_placeholder' => 'Please enter the product name/brief description/SEO information', + 'goods' => 'Goods Info', + 'goods_placeholder' => 'Please enter the goods name/brief description/SEO information', 'price' => 'Sales price (yuan)', 'original_price' => 'Original price (yuan)', @@ -435,8 +435,8 @@ return [ 'browser_seo_title' => 'Goods Favor', // 动态表格统计数据 'form_table' => [ - 'goods' => 'Product information', - 'goods_placeholder' => 'Please enter the product name/brief description/SEO information', + 'goods' => 'Goods Info', + 'goods_placeholder' => 'Please enter the goods name/brief description/SEO information', 'price' => 'Sales price (yuan)', 'original_price' => 'Original price (yuan)', diff --git a/app/index/lang/zh-cn.php b/app/index/lang/zh.php similarity index 100% rename from app/index/lang/zh-cn.php rename to app/index/lang/zh.php diff --git a/app/index/view/default/index/index.html b/app/index/view/default/index/index.html index 31a322485..2656ac77f 100755 --- a/app/index/view/default/index/index.html +++ b/app/index/view/default/index/index.html @@ -61,9 +61,9 @@ {{if !empty($user_order_status)}} {{foreach $user_order_status as $v}} {{if in_array($v['status'], [1,2,3])}} - {{$v.count}}{{$v.name}} + {{$v.count}}{{$v.name}} {{elseif in_array($v['status'], [100]) /}} - {{$v.count}}{{$v.name}} + {{$v.count}}{{$v.name}} {{/if}} {{/foreach}} {{/if}} diff --git a/app/index/view/default/public/header_top_nav.html b/app/index/view/default/public/header_top_nav.html index 5bc976acf..2bd8ad344 100755 --- a/app/index/view/default/public/header_top_nav.html +++ b/app/index/view/default/public/header_top_nav.html @@ -29,13 +29,14 @@ [{{:MyLang('common.register_title')}}] {{/if}} {{else /}} - {{:MyLang('common.header_top_nav_left_login_first')}} + {{:MyLang('common.header_top_nav_left_login_first')}} {{if !empty($user['icon'])}} {{/if}} - {{$user.user_name_view}}{{:MyLang('common.header_top_nav_left_login_last')}} - {{:MyC('home_site_name')}} - [{{:MyLang('common.logout_title')}}] + {{$user.user_name_view}} + {{:MyLang('common.header_top_nav_left_login_last')}} + {{:MyC('home_site_name')}} + [{{:MyLang('common.logout_title')}}] {{/if}} @@ -109,7 +110,7 @@ {{$nav.name}} -