zac3533 1 سال پیش
والد
کامیت
a5f14e7700

+ 1 - 1
application/admin/controller/Index.php

@@ -44,7 +44,7 @@ class Index extends Backend
             'dashboard' => 'hot',
             'addon'     => ['new', 'red', 'badge'],
             'auth/rule' => __('Menu'),
-        ], $this->view->site['fixedpage']);
+        ], 'dashboard');
         $action = $this->request->request('action');
         if ($this->request->isPost()) {
             if ($action == 'refreshmenu') {

+ 1 - 3
application/admin/controller/general/Config.php

@@ -28,7 +28,6 @@ class Config extends Backend
     public function _initialize()
     {
         parent::_initialize();
-        // $this->model = model('Config');
         $this->model = new ConfigModel;
         ConfigModel::event('before_write', function ($row) {
             if (isset($row['name']) && $row['name'] == 'name' && preg_match("/fast" . "admin/i", $row['value'])) {
@@ -44,8 +43,6 @@ class Config extends Backend
     {
         $siteList = [];
         $groupList = ConfigModel::getGroupList();
-
-        //dump($groupList);die;
         foreach ($groupList as $k => $v) {
             $siteList[$k]['name'] = $k;
             $siteList[$k]['title'] = $v;
@@ -139,6 +136,7 @@ class Config extends Backend
         if ($this->request->isPost()) {
             $this->token();
             $row = $this->request->post("row/a", [], 'trim');
+
             if ($row) {
                 $configList = [];
                 foreach ($this->model->all() as $v) {

+ 0 - 8
application/admin/lang/en/goods/goods.php

@@ -1,8 +0,0 @@
-<?php
-
-return [
-    'Title'   => '标题',
-    'Price'   => '价格',
-    'Img_url' => '产品图片',
-    'Status'  => '启用状态:0下架 1启用'
-];

+ 0 - 0
application/admin/lang/en/addon.php → application/admin/lang/vn/addon.php


+ 0 - 0
application/admin/lang/en/ajax.php → application/admin/lang/vn/ajax.php


+ 0 - 0
application/admin/lang/en/auth/admin.php → application/admin/lang/vn/auth/admin.php


+ 0 - 0
application/admin/lang/en/auth/group.php → application/admin/lang/vn/auth/group.php


+ 0 - 0
application/admin/lang/en/auth/rule.php → application/admin/lang/vn/auth/rule.php


+ 0 - 0
application/admin/lang/en/category.php → application/admin/lang/vn/category.php


+ 0 - 0
application/admin/lang/en/config.php → application/admin/lang/vn/config.php


+ 0 - 0
application/admin/lang/en/dashboard.php → application/admin/lang/vn/dashboard.php


+ 0 - 0
application/admin/lang/en/general/attachment.php → application/admin/lang/vn/general/attachment.php


+ 4 - 6
application/admin/lang/en/general/config.php → application/admin/lang/vn/general/config.php

@@ -7,12 +7,10 @@ return [
     'Type'                                 => '类型',
     'Title'                                => '变量标题',
     'Value'                                => '变量值',
-    'Basic'                                => '基础配置',
-    'Email'                                => '邮件配置',
-    'Attachment'                           => '附件配置',
-    'Dictionary'                           => '字典配置',
-    'User'                                 => '会员配置',
-    'Example'                              => '示例分组',
+    'Basic'                                => 'Cấu hình cơ bản',
+    'Email'                                => 'Cấu hình email',
+    'Recharge'                             => 'Cấu hình nạp tiền',
+    'Withdraw'                             => 'Cấu hình rút tiền',
     'Extend'                               => '扩展属性',
     'String'                               => '字符',
     'Password'                             => '密码',

+ 0 - 0
application/admin/lang/en/general/profile.php → application/admin/lang/vn/general/profile.php


+ 12 - 0
application/admin/lang/vn/goods/goods.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'Title'             => 'Title',
+    'Price'             => 'Price',
+    'Img_url'           => 'Product images',
+    'Status'            => 'Status',
+    'Createtime'        => 'Add time',
+    'Updatetime'        => 'Update time',
+    'Enable'            => 'Enable',
+    'Off shelf'         => 'Off shelf',
+];

+ 0 - 0
application/admin/lang/en/index.php → application/admin/lang/vn/index.php


+ 0 - 0
application/admin/lang/en/user/group.php → application/admin/lang/vn/user/group.php


+ 0 - 0
application/admin/lang/en/user/rule.php → application/admin/lang/vn/user/rule.php


+ 0 - 0
application/admin/lang/en/user/user.php → application/admin/lang/vn/user/user.php


+ 5 - 6
application/admin/lang/zh-cn.php

@@ -214,10 +214,9 @@ return [
     'Rule tips'                                             => '菜单规则通常对应一个控制器的方法,同时菜单栏数据也从规则中获取',
     'Access is allowed only to the super management group'  => '仅超级管理组能访问',
     'Local addon'                                           => '本地插件',
-    // 前台菜单
-    'Frontend'                                              => '前台',
-    'API Interface'                                         => 'API接口',
-    'User Module'                                           => '会员模块',
-    'Register'                                              => '注册',
-    'User Center'                                           => '会员中心',
+
+    'Product management'                                    => '商品管理',
+    'Product list'                                          => '商品列表',
+
+
 ];

+ 25 - 7
application/admin/lang/zh-cn/general/config.php

@@ -7,11 +7,10 @@ return [
     'Type'                                 => '类型',
     'Title'                                => '变量标题',
     'Value'                                => '变量值',
-    'Basic'                                => '基础配置',
+    'Basic'                                => '系统参数',
     'Email'                                => '邮件配置',
-    'Attachment'                           => '附件配置',
-    'Dictionary'                           => '字典配置',
-    'User'                                 => '会员配置',
+    'Recharge'                             => '充值配置',
+    'Withdraw'                             => '提现配置',
     'Example'                              => '示例分组',
     'Extend'                               => '扩展属性',
     'String'                               => '字符',
@@ -22,7 +21,7 @@ return [
     'Date'                                 => '日期',
     'Time'                                 => '时间',
     'Datetime'                             => '日期时间',
-    'Datetimerange'                        => '日期时间区间',
+    'Datetimerange'                        => '日期时间区间',//
     'Image'                                => '图片',
     'Images'                               => '图片(多)',
     'File'                                 => '文件',
@@ -50,12 +49,14 @@ return [
     'Rule'                                 => '校验规则',
     'Visible condition'                    => '可见条件',
     'Site name'                            => '站点名称',
-    'Beian'                                => '备案号',
-    'Cdn url'                              => 'CDN地址',
+
+    'Open'                                 => '开启',
+    'Close'                                => '关闭',
     'Version'                              => '版本号',
     'Timezone'                             => '时区',
     'Forbidden ip'                         => '禁止IP',
     'Languages'                            => '语言',
+
     'Fixed page'                           => '后台固定页',
     'Category type'                        => '分类类型',
     'Config group'                         => '配置分组',
@@ -80,4 +81,21 @@ return [
     'This is a test mail'                  => '这是一封来自%s的邮件',
     'Please input your email'              => '请输入测试接收者邮箱',
     'Please input correct email'           => '请输入正确的邮箱地址',
+
+    'Maintain switch'                      => '平台维护开关', 
+    'Number of daily tasks'                => '每日任务数', 
+    'Single task income'                   => '单次任务收益', 
+    
+    'USDT recharge switch'                 => 'USDT充值开关',
+    'USDT recharge address'                => 'USDT充值地址',
+    'Bank recharge switch'                 => '银行卡充值开关',
+    'Bank recharge address'                => '银行卡充值地址',
+    
+    'USDT withdraw switch'                 => 'USDT提现开关',
+    'Bank withdraw switch'                 => '银行卡提现开关',
+    'Withdrawal time'                      => '允许提现时间',
+    'Withdraw fee'                         => '提现手续费',
+
+    
+
 ];

+ 4 - 4
application/admin/view/common/header.html

@@ -24,9 +24,9 @@
         <div class="navbar-custom-menu">
             <ul class="nav navbar-nav">
 
-                <li class="hidden-xs">
+                <!-- <li class="hidden-xs">
                     <a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i> {:__('Home')}</a>
-                </li>
+                </li> -->
 
                 <!-- 清除缓存 -->
                 <li class="hidden-xs">
@@ -53,8 +53,8 @@
                         <li class="{$config['language']=='zh-cn'?'active':''}">
                             <a href="?ref=addtabs&lang=zh-cn">简体中文</a>
                         </li>
-                        <li class="{$config['language']=='en'?'active':''}">
-                            <a href="?ref=addtabs&lang=en">English</a>
+                        <li class="{$config['language']=='vn'?'active':''}">
+                            <a href="?ref=addtabs&lang=vn">Tiếng Việt</a>
                         </li>
                     </ul>
                 </li>

+ 2 - 2
application/config.php

@@ -42,13 +42,13 @@ return [
     // 默认时区
     'default_timezone'       => 'PRC',
     // 是否开启多语言
-    'lang_switch_on'         => false,
+    'lang_switch_on'         => true,
     // 默认全局过滤方法 用逗号分隔多个
     'default_filter'         => '',
     // 默认语言
     'default_lang'           => 'zh-cn',
     // 允许的语言列表
-    'allow_lang_list'        => ['zh-cn', 'en'],
+    'allow_lang_list'        => ['zh-cn', 'vn'],
     // 应用类库后缀
     'class_suffix'           => false,
     // 控制器类后缀

+ 20 - 21
application/extra/site.php

@@ -2,17 +2,10 @@
 
 return array (
   'name' => '投标系统',
-  'beian' => '',
-  'cdnurl' => '',
-  'version' => '1.0.1',
-  'timezone' => 'Asia/Shanghai',
-  'forbiddenip' => '',
-  'languages' => 
-  array (
-    'backend' => 'zh-cn',
-    'frontend' => 'zh-cn',
-  ),
-  'fixedpage' => 'dashboard',
+  'logo' => '111',
+  'Maintain_switch' => '1',
+  'day_tasks_num' => '1',
+  'Task_income' => '0.1',
   'categorytype' => 
   array (
     'default' => 'Default',
@@ -23,17 +16,9 @@ return array (
   'configgroup' => 
   array (
     'basic' => 'Basic',
-    'user'  => '充值配置',
-    'example' => '提现配置',
+    'recharge' => 'Recharge',
+    'withdraw' => 'Withdraw',
     'email' => 'Email',
-    //'dictionary' => 'Dictionary',
-  
-  ),
-  'attachmentcategory' => 
-  array (
-    'category1' => 'Category1',
-    'category2' => 'Category2',
-    'custom' => 'Custom',
   ),
   'mail_type' => '1',
   'mail_smtp_host' => 'smtp.qq.com',
@@ -42,4 +27,18 @@ return array (
   'mail_smtp_pass' => 'password',
   'mail_verify_type' => '2',
   'mail_from' => '10000@qq.com',
+  'attachmentcategory' => 
+  array (
+    'category1' => 'Category1',
+    'category2' => 'Category2',
+    'custom' => 'Custom',
+  ),
+  'recharge_usdt_switch' => '1',
+  'recharge_usdt_address' => '12',
+  'recharge_bank_switch' => '1',
+  'recharge_bank_address' => '322',
+  'withdraw_usdt_switch' => '1',
+  'withdraw_bank_switch' => '1',
+  'Withdrawal_time' => '15:04:41',
+  'Withdrawal_fee' => '0.2',
 );