lizhen пре 1 недеља
родитељ
комит
1985cceb0e

+ 3 - 8
application/admin/controller/general/Profile.php

@@ -52,12 +52,10 @@ class Profile extends Backend
             $params = $this->request->post("row/a");
             $params = array_filter(array_intersect_key(
                 $params,
-                array_flip(array('email', 'nickname', 'password', 'avatar'))
+                array_flip(array('nickname', 'password', 'avatar'))
             ));
             unset($v);
-            if (!Validate::is($params['email'], "email")) {
-                $this->error(__("Please input correct email"));
-            }
+
             if (isset($params['password'])) {
                 if (!Validate::is($params['password'], "/^[\S]{6,30}$/")) {
                     $this->error(__("Please input correct password"));
@@ -65,10 +63,7 @@ class Profile extends Backend
                 $params['salt'] = Random::alnum();
                 $params['password'] = md5(md5($params['password']) . $params['salt']);
             }
-            $exist = Admin::where('email', $params['email'])->where('id', '<>', $this->auth->id)->find();
-            if ($exist) {
-                $this->error(__("Email already exists"));
-            }
+
             if ($params) {
                 $admin = Admin::get($this->auth->id);
                 $admin->save($params);

+ 2 - 2
application/admin/lang/zh-cn/servicegrade.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'User_id'         => '考试用户ID',
+    'User_id'         => '用户ID',
     'Paper_id'        => '社区服务类型ID',
     'Question_ids'    => '试卷ID集合',
     'User_answers'    => '用户答案集合',
@@ -11,5 +11,5 @@ return [
     'Status_switch 0' => '待处理',
     'Status_switch 1' => '已处理',
     'Paper.name'      => '社区服务类型',
-    'User.nickname'   => '考试用户昵称'
+    'User.nickname'   => '用户昵称'
 ];

+ 1 - 20
application/admin/view/general/attachment/index.html

@@ -1,31 +1,12 @@
 <div class="panel panel-default panel-intro">
 
-    <div class="panel-heading">
-        {:build_heading(null,FALSE)}
-        <ul class="nav nav-tabs" data-field="category">
-            <li class="active"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
-            {foreach name="categoryList" item="vo"}
-            <li><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
-            {/foreach}
-            <li class="pull-right dropdown filter-type">
-                <a href="javascript:" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-filter"></i> {:__('Filter Type')}</a>
-                <ul class="dropdown-menu text-left" role="menu">
-                    <li class="active"><a href="javascript:" data-value="">{:__('All')}</a></li>
-                    {foreach name="mimetypeList" id="item"}
-                    <li><a href="javascript:" data-value="{$key}">{$item}</a></li>
-                    {/foreach}
-                </ul>
-            </li>
-        </ul>
-    </div>
 
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in" id="one">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
-                        {:build_toolbar('refresh,add,edit,del')}
-                        <a class="btn btn-info btn-classify dropdown-toggle btn-disabled disabled {:$auth->check('general/attachment/edit')?'':'hide'}"><i class="fa fa-arrow-right"></i> {:__('Classify')}</a>
+                        {:build_toolbar('refresh,add,del')}
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('general/attachment/edit')}"

+ 2 - 2
application/admin/view/general/profile/index.html

@@ -62,14 +62,14 @@
                             <label for="username" class="control-label">{:__('Username')}:</label>
                             <input type="text" class="form-control" id="username" name="row[username]" value="{$admin.username|htmlentities}" disabled/>
                         </div>
-                        <div class="form-group">
+                        <!--<div class="form-group">
                             <label for="mobile" class="control-label">{:__('Mobile')}:</label>
                             <input type="text" class="form-control" id="mobile" name="row[mobile]" value="{$admin.mobile|htmlentities}" disabled/>
                         </div>
                         <div class="form-group">
                             <label for="email" class="control-label">{:__('Email')}:</label>
                             <input type="text" class="form-control" id="email" name="row[email]" value="{$admin.email|htmlentities}" data-rule="required;email"/>
-                        </div>
+                        </div>-->
                         <div class="form-group">
                             <label for="nickname" class="control-label">{:__('Nickname')}:</label>
                             <input type="text" class="form-control" id="nickname" name="row[nickname]" value="{$admin.nickname|htmlentities}" data-rule="required"/>

+ 0 - 1
application/config.php

@@ -370,7 +370,6 @@ return [
     'newconfiggroup' =>
         [
             'website' => '全站基础配置',
-            'takecash' => '提现配置',
             'show' => '显示配置',
         ],
 

+ 0 - 6
application/extra/site.php

@@ -26,7 +26,6 @@ return array (
     'email' => '邮件配置',
     'dictionary' => '字典配置',
     'website' => '全站基础配置',
-    'takecash' => '提现配置',
     'show' => '显示配置',
   ),
   'mail_type' => '1',
@@ -48,11 +47,6 @@ return array (
   'order_refund_rule' => '未使用、未激活可随时申请退订,订单不支持部分退。 
 如需改期,请申请退订后重新预订。',
   'kefu_qrcode' => '/uploads/20241017/9c906c9714fb1b7268b8096120e33256.jpg',
-  'min_takecash_money' => '1',
-  'max_takecash_money' => '10000',
-  'takecash_plat_bili' => '0.6',
-  'unishop_order_intromoney_bili' => '0',
-  'take_cash_rule' => '单次提现最低一元,最高一万元。提现手续费千分之六',
   'mini_login_bgimage' => '/uploads/20250605/bc0270dd56731960da4a373c06e1bdf9.png',
   'dongtai_audit_switch' => '1',
   'index_logo' => '/uploads/20250610/a3f3db9858269a9282f7f881ee9d1c75.png',