diff --git a/resources/beike/admin/js/common.js b/resources/beike/admin/js/common.js index 2911226d..a65eb1ea 100644 --- a/resources/beike/admin/js/common.js +++ b/resources/beike/admin/js/common.js @@ -3,7 +3,7 @@ * @link https://beikeshop.com * @Author pu shuo * @Date 2022-08-22 18:32:26 - * @LastEditTime 2023-02-13 14:29:46 + * @LastEditTime 2023-02-17 17:57:40 */ export default { @@ -119,7 +119,7 @@ export default { $('.update-btn').hide(); } } else { - $http.get(`${config.api_url}/api/version?version=${config.beike_version}`).then((res) => { + $http.get(`${config.api_url}/api/version?version=${config.beike_version}`, null, {hload: true}).then((res) => { Cookies.set('beike_version', res, { expires: 1 }); bk.versionUpdateTips(); @@ -134,9 +134,13 @@ export default { if (data) { if (data.vip) { $('.vip-serve').addClass('active'); + + if (data.expiring) { + $('.vip-serve .expired-text').show().find('span').text(data.expired_at); + } } } else { - $http.get(`${config.api_url}/api/vip?domain=${config.app_url}`).then((res) => { + $http.get(`${config.api_url}/api/vip?domain=${config.app_url}`, null, {hload: true}).then((res) => { Cookies.set('beike_vip', res, { expires: 1 }); bk.vipUpdateTips(); diff --git a/resources/beike/admin/views/components/header.blade.php b/resources/beike/admin/views/components/header.blade.php index f9f31f39..a6c63557 100644 --- a/resources/beike/admin/views/components/header.blade.php +++ b/resources/beike/admin/views/components/header.blade.php @@ -20,7 +20,11 @@ @hookwrapper('admin.header.vip') @endhookwrapper diff --git a/resources/beike/admin/views/pages/setting.blade.php b/resources/beike/admin/views/pages/setting.blade.php index eade5515..2d2ce665 100644 --- a/resources/beike/admin/views/pages/setting.blade.php +++ b/resources/beike/admin/views/pages/setting.blade.php @@ -232,7 +232,7 @@ // 获取省份 const getZones = (country_id) => { - $http.get(`countries/${country_id}/zones`).then((res) => { + $http.get(`countries/${country_id}/zones`, null, {hload: true}).then((res) => { if (res.data.zones.length > 0) { $('select[name="zone_id"]').html(''); res.data.zones.forEach((zone) => { diff --git a/resources/lang/de/admin/common.php b/resources/lang/de/admin/common.php index 4f524181..34c2dadc 100644 --- a/resources/lang/de/admin/common.php +++ b/resources/lang/de/admin/common.php @@ -81,4 +81,5 @@ return [ 'update_old_version' => 'aktuelle Version', 'update_date' => 'Aktualisierungsdatum', 'update_btn' => 'zum Download gehen', + 'expired_at' => 'Ablaufzeit', ]; diff --git a/resources/lang/en/admin/common.php b/resources/lang/en/admin/common.php index cd2105f2..9ba54b3c 100644 --- a/resources/lang/en/admin/common.php +++ b/resources/lang/en/admin/common.php @@ -85,4 +85,5 @@ return [ 'update_old_version' => 'Current version', 'update_date' => 'Update date', 'update_btn' => 'Download', + 'expired_at' => 'Expired', ]; diff --git a/resources/lang/es/admin/common.php b/resources/lang/es/admin/common.php index 633c4a6e..8c301101 100644 --- a/resources/lang/es/admin/common.php +++ b/resources/lang/es/admin/common.php @@ -81,4 +81,5 @@ return [ 'update_old_version' => 'versión actual', 'update_date' => 'fecha de actualización', 'update_btn' => 'ir a descargar', + 'expired_at' => 'fecha de caducidad', ]; diff --git a/resources/lang/fr/admin/common.php b/resources/lang/fr/admin/common.php index aa4f2994..014110c9 100644 --- a/resources/lang/fr/admin/common.php +++ b/resources/lang/fr/admin/common.php @@ -81,4 +81,5 @@ return [ 'update_old_version' => 'version actuelle', 'update_date' => 'date de mise à jour', 'update_btn' => 'aller au téléchargement', + 'expired_at' => 'délai d\'expiration', ]; diff --git a/resources/lang/it/admin/common.php b/resources/lang/it/admin/common.php index 83b1c9ef..9a64b18b 100644 --- a/resources/lang/it/admin/common.php +++ b/resources/lang/it/admin/common.php @@ -81,4 +81,5 @@ return [ 'update_old_version' => 'versione corrente', 'update_date' => 'data di aggiornamento', 'update_btn' => 'vai al download', + 'expired_at' => 'ora di scadenza', ]; diff --git a/resources/lang/ja/admin/common.php b/resources/lang/ja/admin/common.php index c02e543a..14a8f193 100644 --- a/resources/lang/ja/admin/common.php +++ b/resources/lang/ja/admin/common.php @@ -81,4 +81,5 @@ return [ 'update_old_version' => '現在のバージョン', 'update_date' => '更新日', 'update_btn' => 'ダウンロードする', + 'expired_at' => '有効期限', ]; diff --git a/resources/lang/ru/admin/common.php b/resources/lang/ru/admin/common.php index 6e853a2c..eb054713 100644 --- a/resources/lang/ru/admin/common.php +++ b/resources/lang/ru/admin/common.php @@ -81,4 +81,5 @@ return [ 'update_old_version' => 'текущая версия', 'update_date' => 'дата обновления', 'update_btn' => 'перейти к загрузке', + 'expired_at' => 'срок действия', ]; diff --git a/resources/lang/zh_cn/admin/common.php b/resources/lang/zh_cn/admin/common.php index 59dc65e7..3989a861 100644 --- a/resources/lang/zh_cn/admin/common.php +++ b/resources/lang/zh_cn/admin/common.php @@ -85,4 +85,5 @@ return [ 'update_old_version' => '当前版本', 'update_date' => '更新日期', 'update_btn' => '前往下载', + 'expired_at' => '到期时间', ]; diff --git a/resources/lang/zh_hk/admin/common.php b/resources/lang/zh_hk/admin/common.php index 64a670bd..30676fd2 100644 --- a/resources/lang/zh_hk/admin/common.php +++ b/resources/lang/zh_hk/admin/common.php @@ -85,4 +85,5 @@ return [ 'update_old_version' => '當前版本', 'update_date' => '更新日期', 'update_btn' => '前往下載', + 'expired_at' => '到期時間', ];