Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

crmeb/app/services/system/lang/LangTypeServices.php

@@ -49,9 +49,9 @@ class LangTypeServices extends BaseServices
         $langCountryList = app()->make(LangCountryServices::class)->selectList([])->toArray();
         $options = [];
         foreach ($langCountryList as $item) {
-            $options[] = ['value' => $item['code'], 'label' => $item['name']];
+            $options[] = ['value' => $item['code'], 'label' => $item['name'].' [ '.$item['code'].' ]'];
         }
-        $field[] = Form::select('file_name', '语言标识', $info['file_name'] ?? '')->setOptions(Form::setOptions($options));
+        $field[] = Form::select('file_name', '语言标识', $info['file_name'] ?? '')->setOptions(Form::setOptions($options))->filterable(1);
         $field[] = Form::radio('is_default', '是否默认', $info['is_default'] ?? 0)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
         $field[] = Form::radio('status', '状态', $info['status'] ?? 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
         return create_form($id ? '修改语言类型' : '新增语言类型', $field, Url::buildUrl('/setting/lang_type/save/' . $id), 'POST');

crmeb/public/install/crmeb.sql

@@ -26530,7 +26530,17 @@ INSERT INTO `eb_lang_code` (`id`, `type_id`, `code`, `remarks`, `lang_explain`,
 (24987, 7, '500029', '金额最多两位小数', '양 소수점 이하 두 자리까지', 1),
 (24988, 8, '500029', '金额最多两位小数', 'Хэмжээ Хоёр аравтын бутархай газар хүртэл', 1),
 (24989, 9, '500029', '金额最多两位小数', 'จำนวนทศนิยมสูงสุดสองตำแหน่ง', 1),
-(24990, 10, '500029', '金额最多两位小数', 'Số tiền tối đa hai chữ số thập phân', 1);
+(24990, 10, '500029', '金额最多两位小数', 'Số tiền tối đa hai chữ số thập phân', 1),
+(24991, 1, '500030', '名称长度需在6-17个字符之间', '名称长度需在6-17个字符之间', 1),
+(24992, 2, '500030', '名称长度需在6-17个字符之间', 'Name length should be between 6-17 characters', 1),
+(24993, 3, '500030', '名称长度需在6-17个字符之间', '名稱長度需在6-17個字符之間', 1),
+(24994, 4, '500030', '名称长度需在6-17个字符之间', 'La longueur du nom doit être comprise entre 6 et 17 caractères.', 1),
+(24995, 5, '500030', '名称长度需在6-17个字符之间', 'La lunghezza del nome deve essere compresa tra 6 e 17 caratteri', 1),
+(24996, 6, '500030', '名称长度需在6-17个字符之间', '名前の長さは6~17文字の間でなければなりません', 1),
+(24997, 7, '500030', '名称长度需在6-17个字符之间', '이름 길이는 6-17자 사이여야 합니다.', 1),
+(24998, 8, '500030', '名称长度需在6-17个字符之间', 'Нэрийн урт нь 6-17 тэмдэгтийн хооронд байх ёстой', 1),
+(24999, 9, '500030', '名称长度需在6-17个字符之间', 'ชื่อต้องมีความยาวระหว่าง 6-17 ตัวอักษร', 1),
+(25000, 10, '500030', '名称长度需在6-17个字符之间', 'Độ dài tên phải từ 6-17 ký tự.', 1);
 
 -- --------------------------------------------------------
 

template/admin/src/pages/system/maintain/systemFile/login.vue

@@ -18,7 +18,7 @@
                 prefix="ios-lock-outline"
                 placeholder="请输入密码"
               />
-              <div class="trip">提示：config/filesystem.php中手动配置password后使用，不能为空</div>
+              <div class="trip">提示：密码配置在 /config/filesystem.php 文件中修改 'password' => '密码'</div>
             </FormItem>
             <FormItem class="maxInpt">
               <Button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录</Button>

template/admin/src/router/modules/setting.js

@@ -84,7 +84,7 @@ export default {
       name: `${pre}distributionSet`,
       meta: {
         ...meta,
-        title: '分销设置',
+        title: '小程序配置',
       },
       component: () => import('@/pages/setting/setSystem/index'),
     },