From 6c46cd711ffd42704e0f1e90cc84d6a2434c412f Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Wed, 18 Dec 2019 10:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0>=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E5=91=98=E7=AE=A1=E7=90=86>=E5=85=AC=E4=BC=9A?=
 =?UTF-8?q?=E5=88=86=E6=88=90=E7=AE=A1=E7=90=86--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/PromoteGameRatio/applyRatio.html     | 40 ++++++++++++++++++-
 .../Admin/View/PromoteGameRatio/lists.html    |  2 +-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/View/PromoteGameRatio/applyRatio.html b/Application/Admin/View/PromoteGameRatio/applyRatio.html
index 3fcd39081..fe674744d 100644
--- a/Application/Admin/View/PromoteGameRatio/applyRatio.html
+++ b/Application/Admin/View/PromoteGameRatio/applyRatio.html
@@ -5,6 +5,15 @@
 <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
 <script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script>
 
+  <style>
+    .tabcon1711 input.time {
+      width: 150px;
+    }
+    #form .txt_area {
+      width: 300px;
+      height: 150px;
+    }
+  </style>
   <div class="cf main-place top_nav_list navtab_list">
     <h3 class="page_title">{$meta_title}</h3>
 <!--    <p class="description_text">说明：此功是创建推广员时所需填写信息</p>-->
@@ -65,10 +74,28 @@
             <tr>
               <td class="l">现分成比例：</td>
               <td class="r table_radio">
-                <input type="text" class="txt" name="account" value="" placeholder="" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')">
+                <input type="text" class="txt" name="ratio" value="{$record.ratio|default='0.00'}" placeholder="" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')">
                 <span class="notice-text">当前需要修改成的分成比例</span>
               </td>
             </tr>
+            <tr>
+              <td class="l">开始时间：</td>
+              <td class="r table_radio">
+                <div style="float: left;">
+                  <input type="text" class="txt time" name="start_time" placeholder="开始时间" value="">
+                  -
+                  <input type="text" class="txt time" name="start_time" placeholder="结束时间" value="">
+                </div>
+                <span class="notice-text">结束时间不填则默认永久。</span>
+              </td>
+            </tr>
+            <tr>
+              <td class="l">备注：</td>
+              <td class="r table_radio">
+                <textarea type="text" name="introduction" class="txt_area"></textarea>
+                <span class="notice-text"></span>
+              </td>
+            </tr>
             </tbody>
           </table>
         </div>
@@ -98,7 +125,11 @@
 </block>
 
 <block name="script">
-<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script><script type="text/javascript" src="__STATIC__/provincecityarea/area1.js"></script>
+  <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+  <php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
+  <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
 <script type="text/javascript">
 //导航高亮
 highlight_subnav('{:U('PromoteGameRatio/lists')}');
@@ -106,6 +137,11 @@ Think.setValue("game_type_id", {$data.game_type_id|default = 0});
 Think.setValue("category", {$data.category|default = 0});
 
 $(function(){
+    $('.time').datetimepicker({
+        language:"zh-CN",
+        hour: 13,
+        minute: 15
+    });
     showTab();
     prov="{:substr($data['bank_area'],0,2)}";
     city="{:substr($data['bank_area'],2,2)}";
diff --git a/Application/Admin/View/PromoteGameRatio/lists.html b/Application/Admin/View/PromoteGameRatio/lists.html
index 209559541..305976f2d 100644
--- a/Application/Admin/View/PromoteGameRatio/lists.html
+++ b/Application/Admin/View/PromoteGameRatio/lists.html
@@ -133,7 +133,7 @@
                             <td>{$record.applicant}</td>
                             <td>{$record.reviewer}</td>
                             <td>
-                                <a href="{:U('edit', array('id'=>$record['id']))}" class="">修改</a>
+                                <a href="{:U('applyRatio', array('id'=>$record['id']))}" class="">修改</a>
                             </td>
                         </tr>
                     </volist>