update admin

admin/control/merchant.php

@@ -159,12 +159,10 @@ class merchantControl extends SystemControl
             $card_types = $_POST['cardtype'];
             $specs = $_POST['spec'];
             $prices = $_POST['price'];
-            $order_limit = $_POST['order_limit'];
             foreach ($card_types as $key => $card_type) {
                 $data['card_type'] = $card_type;
                 $data['spec'] = intval($specs[$key]);
                 $data['price'] = ncPriceFormat($prices[$key]);
-                $data['order_limit'] = $order_limit[$key];
                 $params[] = $data;
             }
 
@@ -175,7 +173,6 @@ class merchantControl extends SystemControl
                     $insert['spec'] = $param['spec'];
                     $insert['price'] = $param['price'];
                     $insert['card_types'] = $param['card_type'];
-                    $insert['order_limit'] = $param['order_limit'];
                     $inserts[] = $insert;
                 }
             }
@@ -266,7 +263,6 @@ class merchantControl extends SystemControl
                     $value['spec'] = intval($item['spec']);
                     $result["{$card_type}-{$value['spec']}"] = ['card_type'=>$card_type,
                         'spec' => intval($item['spec']),
-                        'order_limit' => $item['order_limit'],
                         'price' => $item['price']];
                 }
             }
@@ -290,9 +286,7 @@ class merchantControl extends SystemControl
 
                 if(array_key_exists($cardtype_spec , $mech_specs)) {
                     $data['price'] = $mech_specs[$cardtype_spec]['price'];
-                    $data['order_limit'] = $mech_specs[$cardtype_spec]['order_limit'];
                 } else {
-                    $data['order_limit'] = -1;
                     $data['price'] = 0;
                 }
 

admin/templates/default/merchant.add.php

@@ -7,7 +7,7 @@
             <ul class="tab-base">
                 <li><a href="index.php?act=merchant&op=merchant"><span><?php echo $lang['nc_manage'] ?></span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span><?php echo $lang['nc_new'] ?></span></a></li>
-                <li><a href="index.php?act=merchant&op=price"><span>费率设置</span></a></li>
+                <li><a href="index.php?act=merchant&op=order_day_limit"><span>每日单量设置</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/merchant.index.php

@@ -7,7 +7,7 @@
             <ul class="tab-base">
                 <li><a href="JavaScript:void(0);" class="current"><span><?php echo $lang['nc_manage'] ?></span></a></li>
                 <li><a href="index.php?act=merchant&op=merchant_add"><span><?php echo $lang['nc_new'] ?></span></a></li>
-                <li><a href="index.php?act=merchant&op=price"><span>费率设置</span></a></li>
+                <li><a href="index.php?act=merchant&op=order_day_limit"><span>每日单量设置</span></a></li>
             </ul>
         </div>
     </div>

admin/templates/default/merchant.price.php

@@ -82,6 +82,7 @@
             <ul class="tab-base">
                 <li><a href="index.php?act=merchant&op=merchant"><span><?php echo $lang['nc_manage'] ?></span></a></li>
                 <li><a href="index.php?act=merchant&op=merchant_add"><span><?php echo $lang['nc_new'] ?></span></a></li>
+                <li><a href="index.php?act=merchant&op=order_day_limit"><span>每日单量设置</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>费率设置</span></a></li>
             </ul>
         </div>
@@ -120,7 +121,6 @@
                                 </div>
                             </div>
                         </th>
-                        <th class="w150 align-center">每日额度</th>
                     </tr>
                     <tbody class="tbody">
                     <?php if (!empty($output['goods']) && is_array($output['goods'])) { ?>
@@ -138,10 +138,6 @@
                                     <input type="text" name="price[]" class="txt val"
                                            value="<?php echo $v['price']; ?>">
                                 </td>
-                                <td class="w150 align-center">
-                                    <input type="text" name="order_limit[]" value="<?php echo $v['order_limit']; ?>">
-                                    <input type="hidden" name="order_limit[]" value="<?php echo $v['order_limit']; ?>">
-                                </td>
                             </tr>
                         <?php } ?>
                     <?php } ?>