From 7d879686afab4cd42b12eb1823598587c136db14 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Wed, 26 Feb 2020 14:45:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E8=B0=83=E6=95=B4=EF=BC=8C=E9=94=81=E5=AE=9A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=BA=A2=E8=89=B2=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ResourceVerifyConfigController.class.php | 4 +---
 Application/Admin/View/ResourceVerifyConfig/add.html          | 2 +-
 Application/Admin/View/ResourceVerifyConfig/edit.html         | 2 +-
 Application/Admin/View/ResourceVerifyConfig/lists.html        | 2 +-
 Application/Home/Controller/TestResourceController.class.php  | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Application/Admin/Controller/ResourceVerifyConfigController.class.php b/Application/Admin/Controller/ResourceVerifyConfigController.class.php
index 83804bf10..c71ac61ff 100644
--- a/Application/Admin/Controller/ResourceVerifyConfigController.class.php
+++ b/Application/Admin/Controller/ResourceVerifyConfigController.class.php
@@ -186,10 +186,8 @@ class ResourceVerifyConfigController extends ThinkController
             $save['new_high_value'] = I('new_high_value');
             $save['old_value_ratio'] = I('old_value_ratio')/100;
 
-            $save['status'] = 0;
-            $save['add_time'] = time();
+//            $save['status'] = 0;
             $save['update_time'] = time();
-            $save['uid'] = UID;
             $save['id'] = I('id');
             $res = $model->save($save);
             if ($res) {
diff --git a/Application/Admin/View/ResourceVerifyConfig/add.html b/Application/Admin/View/ResourceVerifyConfig/add.html
index 1b5fef48b..ecf97c301 100644
--- a/Application/Admin/View/ResourceVerifyConfig/add.html
+++ b/Application/Admin/View/ResourceVerifyConfig/add.html
@@ -95,7 +95,7 @@
                                 class="type0">全部</span>
                         </label>
                         </gt>
-                        <volist name=":get_systems_list()" id="vo">
+                        <volist name=":get_systems_list('cnen')" id="vo">
                         <gt name="key" value="0">
                         <label id="type{$key}">
                             <input type="radio" class="inp_radio js-typeradio" value="{$key}"
diff --git a/Application/Admin/View/ResourceVerifyConfig/edit.html b/Application/Admin/View/ResourceVerifyConfig/edit.html
index 785ddb685..c15f37fb3 100644
--- a/Application/Admin/View/ResourceVerifyConfig/edit.html
+++ b/Application/Admin/View/ResourceVerifyConfig/edit.html
@@ -93,7 +93,7 @@
                                 class="type0" <if condition="$data['sdk_version']==0"> checked </if>>全部</span>
                         </label>
                         </gt>
-                        <volist name=":get_systems_list()" id="vo">
+                        <volist name=":get_systems_list('cnen')" id="vo">
                         <gt name="key" value="0">
                         <label id="type{$key}">
                             <input type="radio" disabled class="inp_radio js-typeradio" value="{$key}"
diff --git a/Application/Admin/View/ResourceVerifyConfig/lists.html b/Application/Admin/View/ResourceVerifyConfig/lists.html
index bcdf9050e..9405580fc 100644
--- a/Application/Admin/View/ResourceVerifyConfig/lists.html
+++ b/Application/Admin/View/ResourceVerifyConfig/lists.html
@@ -102,7 +102,7 @@
                             <td>{$data.new_low_value}</td>
                             <td>{$data.new_high_value}</td>
                             <td>{$data.old_value_ratio}</td>
-                            <td>{$data.status}</td>
+                            <td  <if condition="$data.status eq '锁定'">style="color: red"</if>>{$data.status}</td>
                             <td>{$data.update_time}</td>
                             <td>
                                 <a href="{:U('edit',array('id'=>$data['id']))}">编辑</a>
diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php
index 21e23eabd..31e844304 100644
--- a/Application/Home/Controller/TestResourceController.class.php
+++ b/Application/Home/Controller/TestResourceController.class.php
@@ -460,9 +460,9 @@ class TestResourceController extends BaseController
             ->find();
         if ($config) {//已存在该游戏的资源审核配置
             $count = M('test_resource', 'tab_')
-                ->where(['user_id' => $data['user_id']])
+                ->where(['user_id' => $data['user_id'], 'game_id' => $data['game_id']])
                 ->count();
-            if ($count <= $config['new_apply_count']) {//新用户
+            if ($count < $config['new_apply_count']) {//新用户
                 //申请资源数量在最低额度和最高额度之间，自动审核
                if ($data['apply_resource'] >= $config['new_low_value'] && $data['apply_resource'] <= $config['new_high_value']) {
                    $data['verify_remark'] = '自动审核';