Merge remote-tracking branch 'origin/release' into release

Application/Admin/Controller/ToolController.class.php

@@ -16,6 +16,17 @@ class ToolController extends ThinkController {
         $config = I('config');
         $data   = array('config'=>json_encode($config),'template'=>$_POST['template'],'status'=>$_POST['status']);
         $map['name']=$name;
+
+        $day_pay = $config['day_pay_limit'];
+        $month_pay = $config['month_pay_limit'];
+        if(!empty($day_pay) && !empty($month_pay)) {
+            if($month_pay / date('t') > $day_pay) {
+                $this->error('月支付限量较日支付限量过大');
+            } elseif ($month_pay < $day_pay) {
+                $this->error('月支付限量不能小于日支付限量');
+            }
+        }
+
         if($_POST['status']==1&&$name=="weixin"){
             $map_['name']=array("in",'wei_xin,wei_xin_app,weixin_gf');
             M('tool','tab_')->where($map_)->setField('status','0');

Application/Admin/View/StatementMangement/rewardManageSave.html

@@ -68,20 +68,20 @@
             <input type="hidden" name="id" value="{$data.id}" />
             <li>
                 <label>奖惩类型</label>
-                <?php if ($data):?>
+                <?php if ($_GET['id']):?>
                 <input type="hidden" name="reward_type" value="{$data['reward_type']}">
                 <?php endif;?>
-                <select id="reward_type" name="reward_type" class="select_gallery" <?php if ($data):?> disabled<?php endif;?>>
+                <select id="reward_type" name="reward_type" class="select_gallery" <?php if ($_GET['id']):?> disabled<?php endif;?>>
                 <option value="1" <?php if ($data['reward_type'] == 1):?>selected<?php endif;?>>奖励</option>
                 <option value="2" <?php if ($data['reward_type'] == 2):?>selected<?php endif;?>>惩罚</option>
                 </select>
             </li>
             <li>
                 <label>公司类型</label>
-                <?php if ($data):?>
+                <?php if ($_GET['id']):?>
                 <input type="hidden" name="company_type" value="{$data['company_type']}">
                 <?php endif;?>
-                <select id="company_type" name="company_type" class="select_gallery" onchange="companyTypeChange()" <?php if ($data):?> disabled<?php endif;?>>
+                <select id="company_type" name="company_type" class="select_gallery" onchange="companyTypeChange()" <?php if ($_GET['id']):?> disabled<?php endif;?>>
                 <option value="1" <?php if ($data['company_type'] == 1):?>selected<?php endif;?>>上游公司</option>
                 <option value="2" <?php if ($data['company_type'] == 2):?>selected<?php endif;?>>下游公司</option>
                 </select>

Application/Admin/View/TestOrder/lists.html

@@ -192,6 +192,16 @@
   <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("TestOrder/lists")}');
+    $(function () {
+    <volist name=":I('get.')" id="vo">
+        Think.setValue('{$key}',"{$vo}");
+    </volist>
+    });
+  </script>
   <script type="text/javascript">
     $(".select_gallery").select2();
     function reload() {

Application/Admin/View/Tool/payset.html

@@ -243,6 +243,33 @@
 								<span class="notice-text">控制SDK内的支付宝支付方式，默认是APP支付，当选择WAP支付时，在SDK支付页面选择“支付宝”进行付款时，采用支付宝的WAP支付</span>
 							</td>
 						</tr>
+                        <tr>
+
+                            <td class="l noticeinfo">日支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[day_pay_limit]" type="text" value="{$alipay['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
+
+                        <tr>
+
+                            <td class="l noticeinfo">月支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[month_pay_limit]" type="text" value="{$alipay['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
 						
 						<tr>
 
@@ -348,6 +375,36 @@
 
             </tr>
 
+
+            <tr>
+
+                <td class="l noticeinfo">日支付限量</td>
+
+                <td class="r table_radio">
+
+                    <input name="config[day_pay_limit]" type="text" value="{$wei_xin['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                    <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                </td>
+
+            </tr>
+
+            <tr>
+
+                <td class="l noticeinfo">月支付限量</td>
+
+                <td class="r table_radio">
+
+                    <input name="config[month_pay_limit]" type="text" value="{$wei_xin['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                    <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                </td>
+
+            </tr>
+
+
             <tr>
 
                 <td class="l noticeinfo">启用状态</td>
@@ -453,6 +510,8 @@
 
             </tr>
 
+
+
             <tr>
 
                 <td class="l noticeinfo">启用状态</td>
@@ -1363,7 +1422,33 @@
                         </td>
                     </tr>
                     
-                    
+                    <tr>
+
+                            <td class="l noticeinfo">日支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[day_pay_limit]" type="text" value="{$sqpay['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
+
+                        <tr>
+
+                            <td class="l noticeinfo">月支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[month_pay_limit]" type="text" value="{$sqpay['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
                    
                     <tr>
 
@@ -1467,6 +1552,34 @@
                     </tr>
 
 
+                    <tr>
+
+                            <td class="l noticeinfo">日支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[day_pay_limit]" type="text" value="{$heepay['day_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
+
+                        <tr>
+
+                            <td class="l noticeinfo">月支付限量</td>
+
+                            <td class="r table_radio">
+
+                                <input name="config[month_pay_limit]" type="text" value="{$heepay['month_pay_limit']}" class="" placeholder='请输入额度' oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
+
+                                <span class="notice-text">当额度达到限制额度时，隐藏支付方式</span>
+
+                            </td>
+
+                        </tr>
+
                     <tr>
 
                         <td class="l noticeinfo">启用状态</td>