From 930ad6d4d6ab0a0f69fd4f0caef83f4ef18b1f45 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 1 Jun 2023 15:01:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=BB=98=E8=AE=A4=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/default/site/siteset/extends.html | 9 +++++++++
 app/admin/view/default/sms/nav.html              | 2 +-
 app/lang/cht.php                                 | 5 +++++
 app/lang/en.php                                  | 5 +++++
 app/lang/spa.php                                 | 5 +++++
 app/lang/zh.php                                  | 5 +++++
 app/service/ConfigService.php                    | 3 ++-
 config/lang.php                                  | 2 +-
 public/static/admin/default/js/site.js           | 2 +-
 9 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/app/admin/view/default/site/siteset/extends.html b/app/admin/view/default/site/siteset/extends.html
index 529b4d1bf..a1f3ea602 100644
--- a/app/admin/view/default/site/siteset/extends.html
+++ b/app/admin/view/default/site/siteset/extends.html
@@ -173,6 +173,15 @@
                             {{/foreach}}
                         </div>
                     </div>
+                    <div class="am-form-group">
+                        <label>{{$data.common_multilingual_default_value.name}}<span class="am-form-group-label-tips">{{$data.common_multilingual_default_value.describe}}</span></label>
+                        <select name="{{$data.common_multilingual_default_value.only_tag}}" class="am-radius chosen-select" data-placeholder="{{:MyLang('please_select_tips')}}" data-validation-message="{{$data.common_multilingual_default_value.error_tips}}">
+                            <option value="0">{{:MyLang('please_select_tips')}}</option>
+                            {{foreach $common_multilingual_list as $k=>$v}}
+                                <option value="{{$k}}" {{if isset($data['common_multilingual_default_value']['value']) and $data['common_multilingual_default_value']['value'] eq $k}}selected{{/if}}>{{$v}}</option>
+                            {{/foreach}}
+                        </select>
+                    </div>
                     <div class="am-form-group">
                         <label>{{$data.common_multilingual_auto_status.name}}<span class="am-form-group-label-tips">{{$data.common_multilingual_auto_status.describe}}</span></label>
                         <select name="{{$data.common_multilingual_auto_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.common_multilingual_auto_status.error_tips}}" required>
diff --git a/app/admin/view/default/sms/nav.html b/app/admin/view/default/sms/nav.html
index abaa32559..6de294029 100755
--- a/app/admin/view/default/sms/nav.html
+++ b/app/admin/view/default/sms/nav.html
@@ -10,5 +10,5 @@
 
 <div class="am-alert am-alert-warning am-radius am-margin-bottom-0" data-am-alert>
     <button type="button" class="am-close">&times;</button>
-    <p class="am-text-xs">{{:MyLang('sms.top_tips')}} <a href="https://www.aliyun.com/acts/alicomcloud/new-discount?userCode=iub0dy6g" class="am-margin-left-sm" target="_blank">{{:MyLang('sms.top_to_aliyun_tips')}} <i class="am-icon-external-link"></i></a> </p>
+    <p class="am-text-xs">{{:MyLang('sms.top_tips')}} <a href="https://www.aliyun.com/product/sms?userCode=iub0dy6g" class="am-margin-left-sm" target="_blank">{{:MyLang('sms.top_to_aliyun_tips')}} <i class="am-icon-external-link"></i></a> </p>
 </div>
\ No newline at end of file
diff --git a/app/lang/cht.php b/app/lang/cht.php
index 490e45db8..e96bb0319 100644
--- a/app/lang/cht.php
+++ b/app/lang/cht.php
@@ -3869,6 +3869,11 @@ return [
             'desc' => '默認關閉',
             'tips' => '請選擇後端使用多語言',
         ],
+        'common_multilingual_default_value'  => [
+            'name' => '默認語言',
+            'desc' => '默認中文',
+            'tips' => '請選擇默認語言',
+        ],
         'home_use_multilingual_status'  => [
             'name' => '前端用多語言',
             'desc' => '默認關閉',
diff --git a/app/lang/en.php b/app/lang/en.php
index 9fcfbff78..15f57f8ac 100644
--- a/app/lang/en.php
+++ b/app/lang/en.php
@@ -3904,6 +3904,11 @@ return [
             'desc' => 'Check to use',
             'tips' => 'Please tick the language you want to use',
         ],
+        'common_multilingual_default_value'  => [
+            'name' => 'default language',
+            'desc' => 'Default Chinese',
+            'tips' => 'Please select the default language',
+        ],
         'admin_use_multilingual_status'  => [
             'name' => 'Backend uses multiple languages',
             'desc' => 'Default on',
diff --git a/app/lang/spa.php b/app/lang/spa.php
index b3cc00912..95488ed92 100644
--- a/app/lang/spa.php
+++ b/app/lang/spa.php
@@ -3864,6 +3864,11 @@ return [
             'desc' => 'Si se marca, se utiliza',
             'tips' => 'Por favor, marque el idioma que necesita usar',
         ],
+        'common_multilingual_default_value'  => [
+            'name' => 'Idioma predeterminado',
+            'desc' => 'Chino predeterminado',
+            'tips' => 'Por favor, elija el idioma predeterminado',
+        ],
         'admin_use_multilingual_status'  => [
             'name' => 'El back - end utiliza Multilingüismo',
             'desc' => 'Cierre predeterminado',
diff --git a/app/lang/zh.php b/app/lang/zh.php
index d16602de1..7ff8e4be5 100755
--- a/app/lang/zh.php
+++ b/app/lang/zh.php
@@ -3869,6 +3869,11 @@ return [
             'desc' => '默认关闭',
             'tips' => '请选择后端使用多语言',
         ],
+        'common_multilingual_default_value'  => [
+            'name' => '默认语言',
+            'desc' => '默认中文',
+            'tips' => '请选择默认语言',
+        ],
         'home_use_multilingual_status'  => [
             'name' => '前端用多语言',
             'desc' => '默认关闭',
diff --git a/app/service/ConfigService.php b/app/service/ConfigService.php
index fe12b4acc..76a7fd22e 100755
--- a/app/service/ConfigService.php
+++ b/app/service/ConfigService.php
@@ -126,8 +126,9 @@ class ConfigService
         // cookie有效域名
         'common_cookie_domain',
 
-        // 多语言可选列表
+        // 多语言可选列表和默认值
         'common_multilingual_choose_list',
+        'common_multilingual_default_value',
     ];
 
     /**
diff --git a/config/lang.php b/config/lang.php
index f82fce28d..492e0e482 100644
--- a/config/lang.php
+++ b/config/lang.php
@@ -14,7 +14,7 @@
 // +----------------------------------------------------------------------
 return [
     // 默认语言
-    'default_lang'    => 'zh',
+    'default_lang'    => MyFileConfig('common_multilingual_default_value', '', 'zh', true),
     // 允许的语言列表（preg 正则匹配、code 语言编码、语言名称在对应语言文件中）
     'allow_lang_list' => [
         // 简体中文        
diff --git a/public/static/admin/default/js/site.js b/public/static/admin/default/js/site.js
index d7b0e7539..793d8880b 100644
--- a/public/static/admin/default/js/site.js
+++ b/public/static/admin/default/js/site.js
@@ -25,7 +25,7 @@ function AddressModalHandle(data)
         var address = data.address || null;
         var lng = data.lng || null;
         var lat = data.lat || null;
-        if(name == null || tel == null || province == null || city == null || county == null || address == null)
+        if(name == null || tel == null || province == null || city == null || address == null)
         {
             Prompt(window['lang_operate_params_error'] || '数据填写有误');
             return false;