admin recharge add update and shop fetch order update

admin/control/refill_detail.php

@@ -81,7 +81,7 @@ class refill_detailControl extends SystemControl
         $result = [];
         while (true) {
             $start = $i * 1000;
-            $list = Model('')->table('refill_refund')->where($condition)->order('refund_time desc')->limit("{$start},1000")->select();
+            $list = Model('')->table('refill_detail')->where($condition)->order('order_time desc')->limit("{$start},1000")->select();
 
             if (empty($list)) {
                 break;
@@ -104,30 +104,23 @@ class refill_detailControl extends SystemControl
         //设置样式
         $excel_obj->setStyle(array('id' => 's_title', 'Font' => array('FontName' => '宋体', 'Size' => '12', 'Bold' => '1')));
         //header
-        $excel_data[0][] = array('styleid' => 's_title', 'data' => '通道名称');
-        $excel_data[0][] = array('styleid' => 's_title', 'data' => '通道退款金额');
         $excel_data[0][] = array('styleid' => 's_title', 'data' => '机构编码');
         $excel_data[0][] = array('styleid' => 's_title', 'data' => '机构名称');
-        $excel_data[0][] = array('styleid' => 's_title', 'data' => '机构退款金额');
-        $excel_data[0][] = array('styleid' => 's_title', 'data' => '退款卡号');
-        $excel_data[0][] = array('styleid' => 's_title', 'data' => '退款卡类型');
-        $excel_data[0][] = array('styleid' => 's_title', 'data' => '退款面值');
-        $excel_data[0][] = array('styleid' => 's_title', 'data' => '退款日期');
-        $excel_data[0][] = array('styleid' => 's_title', 'data' => '备注');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '机构单号');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '充值卡号');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '充值面值');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '下单日期');
+        $excel_data[0][] = array('styleid' => 's_title', 'data' => '订单状态');
         //data
         foreach ((array)$data as $v) {
-            $mch_name = $v['company_name'] ?? $v['name'];
             $tmp = array();
-            $tmp[] = array('data' => "{$v['provider_name']}({$v['store_name']})");
-            $tmp[] = array('data' => $v['channel_amount']);
             $tmp[] = array('data' => $v['mchid']);
-            $tmp[] = array('data' => $mch_name);
-            $tmp[] = array('data' => $v['mch_amount']);
-            $tmp[] = array('data' => $v['card_no']);
-            $tmp[] = array('data' => $v['card_type_text']);
-            $tmp[] = array('data' => $v['refill_amount']);
-            $tmp[] = array('data' => date('Y-m-d H:i:s', $v['refund_time']));
-            $tmp[] = array('data' => $v['bz']);
+            $tmp[] = array('data' => $v['company_name']);
+            $tmp[] = array('data' => $v['mch_order']);
+            $tmp[] = array('data' => $v['params']['card_no']);
+            $tmp[] = array('data' => $v['params']['amount']);
+            $tmp[] = array('data' => date('Y-m-d H:i:s', $v['order_time']));
+            $tmp[] = array('data' => $v['order_state_text']);
 
             $excel_data[] = $tmp;
         }

admin/templates/default/recharge.add.php

@@ -11,7 +11,7 @@
     </div>
   </div>
   <div class="fixed-empty"></div>
-  <form id="points_form" method="post" name="form1">
+  <form id="points_form" method="post">
     <input type="hidden" name="form_submit" value="ok" />
    
     <table class="table tb-type2 nobdb">
@@ -82,7 +82,7 @@
       </tbody>
       <tfoot>
         <tr class="tfoot">
-          <td colspan="2" ><a href="JavaScript:void(0);" class="btn" onclick="document.form1.submit()"><span><?php echo $lang['nc_submit'];?></span></a></td>
+          <td colspan="2" ><a href="JavaScript:void(0);" class="btn" id="submitBtn" ><span><?php echo $lang['nc_submit'];?></span></a></td>
         </tr>
       </tfoot>
     </table>
@@ -103,9 +103,17 @@ function checkevidence(){
 	        }
 	});
 }
+$("#submitBtn").click(function () {
+    if ($("#points_form").valid()) {
+        $("#points_form").submit();
+    }
+});
 $(function(){
 	
     $('#points_form').validate({
+        errorPlacement: function (error, element) {
+            error.appendTo(element.parent().parent().prev().find('td:first'));
+        },
         rules : {
             apply_id: {
 				required : true

shop/templates/default/seller/store_refill_order.batch_dispose.php

@@ -19,6 +19,31 @@
     position: relative;
     z-index: 99;
 }
+.tabmenu .tab .active a {
+    font: 18px/36px "microsoft yahei";
+    color: #FFF;
+    /* background: -webkit-linear-gradient(top,blue,#00ffff);
+     */
+    background: -webkit-linear-gradient(top,#1f8af5,#44a2ff);
+
+    display: inline-block;
+    height: 36px;
+    padding: 0 20px;
+    cursor: default;
+    border-radius: 3px;
+
+}
+.tabmenu .tab .normal a {
+    font: lighter 14px/33px "microsoft yahei";
+    color: #FFF;
+    background: -webkit-linear-gradient(top,#AAA,#ccc);
+
+    display: inline-block;
+    height: 33px;
+    padding: 0 10px;
+    border-radius: 3px;
+
+}
 </style>
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 
@@ -26,8 +51,8 @@
 
 <div class="tabmenu">
     <ul class="tab pngFix">
-        <li class="normal"><a target="" href="<?php echo urlShop('store_refill_order', 'index'); ?>">待我处理的订单</a></li>
-        <li class="active"><a target="" href="<?php echo urlShop('store_refill_order', 'fetch_list'); ?>">我已完成订单</a>
+        <li class="normal"><a target="" href="<?php echo urlShop('store_refill_order', 'index'); ?>">待处理</a></li>
+        <li class="active"><a target="" href="<?php echo urlShop('store_refill_order', 'fetch_list'); ?>">已完成</a>
         </li>
     </ul>
 </div>

shop/templates/default/seller/store_refill_order.index.php

@@ -1,5 +1,5 @@
 <style>
-    .rob {
+     .rob {
         font-size: 22px;
         color: #000;
         padding:0 10px;
@@ -15,9 +15,22 @@
     }
     .block {
         display: inline-block;
-        background-color: rgba(246,97,97,1)!important;
-        border:1px solid rgba(246,97,97,1)!important;
+        /* background-color: rgba(246,97,97,1)!important;
+        border:1px solid rgba(246,97,97,1)!important; */
+        /* border: 1px solid rgb(255, 145, 0)!important; */
+        /* background: -webkit-linear-gradient(top,#ff4e00,#fff); */
+        /* background: -webkit-linear-gradient(left,rgb(255, 145, 0),#ff7423); */
+  /* box-shadow: 0 5px 20px rgba(255, 128, 9, 0.5), 0 0 40px rgba(255, 255, 255, .5) inset; */
+
+        /* border-radius: 3px!important; */
+        /* color: #666!important; */
+        margin-top: -7px;
+
     }
+    /* .block img {
+        width: 100px;
+        height: 40px;
+    } */
 
     select {
     height: 25px;
@@ -36,7 +49,7 @@
     margin-left: 30px;
 }
 .flexright {
-    margin: 3px 32px 0px 9px;
+    margin: 3px 32px 0px 5px;
     font-size: 16px;
 }
 .flexleft {
@@ -107,14 +120,68 @@ a{
     z-index: 1;
 }
 }
+.tabmenuright {
+   
+    color: #333333;
+    background: #FAFAFA none repeat scroll 0 0;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #ABADB3 #E2E3EA #E2E3EA #ABADB3;
+
+}
+.amountright {
+   
+    color: #333333;
+    background: #FAFAFA none repeat scroll 0 0;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #ABADB3 #E2E3EA #E2E3EA #ABADB3;
+
+}
+.querySelect {
+    color: #333333;
+    background: #FAFAFA none repeat scroll 0 0;
+    border-style: solid;
+    border-width: 1px;
+    border-color: #ABADB3 #E2E3EA #E2E3EA #ABADB3;
+
+}
+.tabmenu .tab .active a {
+    font: 18px/36px "microsoft yahei";
+    color: #FFF;
+    /* background: -webkit-linear-gradient(top,blue,#00ffff); */
+    background: -webkit-linear-gradient(top,#1f8af5,#44a2ff);
+
+    display: inline-block;
+    height: 36px;
+    padding: 0 20px;
+    cursor: default;
+    border-radius: 3px;
+}
+.tabmenu .tab a {
+    font: lighter 14px/33px "microsoft yahei";
+    color: #FFF;
+    /* background-color: #AAA; */
+    background: -webkit-linear-gradient(top,#AAA,#ccc);
+
+    display: inline-block;
+    height: 33px;
+    padding: 0 10px;
+    border-radius: 3px;
+
+}
+.tabmenu .tab {
+    height: 36px;
+    border-bottom: solid 2px #44a2ff!important;
+}
 </style>
 <?php defined('InShopNC') or exit('Access Invalid!'); ?>
 
 
 <div class="tabmenu">
     <ul class="tab pngFix">
-        <li class="active"><a target="" href="<?php echo urlShop('store_refill_order', 'index'); ?>">待我处理的订单</a></li>
-        <li class="normal"><a target="" href="<?php echo urlShop('store_refill_order', 'fetch_list'); ?>">我已完成订单</a>
+        <li class="active"><a target="" href="<?php echo urlShop('store_refill_order', 'index'); ?>">待处理</a></li>
+        <li class="normal"><a target="" href="<?php echo urlShop('store_refill_order', 'fetch_list'); ?>">已完成</a>
         </li>
     </ul>
     <!-- <a href="#" class="ncsc-btn ncsc-btn-orange" style="right: 80px" onclick="hCopy(event)"><i class="icon-edit"></i>拷贝</a>
@@ -131,7 +198,7 @@ a{
         <option value="<?php echo mtopcard\ChinaUnicomCard;?>" <?php if($_GET['card_type'] == mtopcard\ChinaUnicomCard){ echo 'selected';}?>>中国联通</option>
         <option value="<?php echo mtopcard\ChinaTelecomCard;?>" <?php if($_GET['card_type'] == mtopcard\ChinaTelecomCard){ echo 'selected';}?>>中国电信</option>
         </select>
-    <span>共有<span class="rob"></span>笔订单可抢</span>
+    <span style="color: #000">共有<span class="rob"></span>笔订单可抢</span>
     <select name="refill_amount" id="amountright" class="amountright">
     <option value="0">面值</option>
     <option value="10"
@@ -159,18 +226,17 @@ a{
     <!-- </div> -->
     
     <div class="flex">
-        <p class="flexleft">抢</p>
+        <p class="flexleft" style="color: #000">抢</p>
         <select name="" id="queryrob" class="querySelect">
         <option value="0">请选择</option>
             <?php for($i = 1; $i < 11; $i++){?>
         <option value="<?php echo $i;?>" <?php if($_GET['num'] == $i){ echo 'selected';}?>><?php echo $i;?></option>
             <?php }?>
         </select>
-        <p class="flexright">单</p>
+        <p class="flexright" style="color: #000">单</p>
  
     </div>
-    <a href="#" id="blockrob" class="block ncsc-btn ncsc-btn-blue ">确认抢单</a>
-
+    <a href="#" id="blockrob" class="block   "><img src="./templates/default/seller/images/sky/button3.png" alt=""></a>
 </div>
 
 <table class="ncsc-default-table order">