Преглед изворни кода

admin provider info update, add provider evidence import

xiaoyu пре 3 година
родитељ
комит
bb3fb000f5

+ 0 - 101
admin/control/merchant.php

@@ -1183,105 +1183,4 @@ class merchantControl extends SystemControl
         }
     }
 
-    public function provider_evidenceOp()
-    {
-        $mod = Model('provider_evidence');
-        $condition = [];
-        if (trim($_GET['store_name']) != '') {
-            $condition['store_name'] = ['like', '%' . $_GET['store_name'] . '%'];
-        }
-        $start_unixtime = intval(strtotime($_GET['query_start_time']));
-        $end_unixtime = intval(strtotime($_GET['query_end_time']));
-        if ($start_unixtime > 0 && $end_unixtime > $start_unixtime) {
-            $condition['apply_time'] = [['egt', $start_unixtime], ['lt', $end_unixtime], 'and'];
-        } elseif ($start_unixtime > 0) {
-            $condition['apply_time'] = ['egt', $start_unixtime];
-        } elseif ($end_unixtime > 0) {
-            $condition['apply_time'] = ['lt', $end_unixtime];
-        }
-
-        //上游充值申请列表
-        $evidence_list = $mod->getProviderEvidence($condition, 30, '*', 'apply_time desc');
-        $stats = $mod->field('sum(amount) as amounts')->where($condition)->find();
-        Tpl::output('amounts', $stats['amounts']);
-        Tpl::output('evidence_list', $evidence_list);
-        Tpl::output('page', $mod->showpage());
-        Tpl::showpage('merchant.provider.evidence_list');
-    }
-
-    public function provider_evidence_addOp()
-    {
-        $provider_model = Model('refill_provider');
-        if (chksubmit()) {
-            $obj_validate = new Validator();
-            $obj_validate->validateparam = [
-                ["input" => $_POST["provider_id"], "require" => "true", "message" => '上游通道不能为空'],
-                ["input" => $_POST["bank_username"], "require" => "true", "message" => '开户人姓名不能为空'],
-                ["input" => $_POST["bank_name"], "require" => "true", "message" => '开户银行不能为空'],
-                ["input" => $_POST["to_bank_username"], "require" => "true", "message" => '上游开户人姓名不能为空'],
-                ["input" => $_POST["to_bank_name"], "require" => "true", "message" => '上游开户银行不能为空'],
-                ["input" => $_POST["amount"], "require" => "true", "message" => '预存金额不能为空'],
-                ["input" => $_POST["apply_time"], "require" => "true", "message" => '申请日期不能为空']
-            ];
-            $error = $obj_validate->validate();
-            if ($error != '') {
-                showMessage($error);
-            }
-            $provider_id = $_POST["provider_id"];
-            $provider_info = $provider_model->table('refill_provider,store')
-                ->where((['provider_id' => $provider_id]))
-                ->field('refill_provider.*,store.store_name')
-                ->join('inner')
-                ->on('store.store_id=refill_provider.store_id')
-                ->find();
-            if (!$provider_info) {
-                showMessage('对应店铺不存在');
-            }
-            $amount = $_POST['amount'];
-            $money = abs($amount);
-            if ($money == 0) {
-                showMessage('申请金额错误');
-            }
-            if(!empty($_FILES['voucher']['name'])) {
-                $upload = new UploadFile();
-                $upload->set('default_dir',ATTACH_UPFILE.'/provider');
-
-                $result = $upload->upfile('voucher');
-                if ($result){
-                    $_POST['voucher'] = $upload->file_name;
-                    $input['voucher_name'] = $_POST['voucher'];
-                }else {
-                    showMessage($upload->error);
-                }
-            }
-
-            $input['store_name'] = $provider_info['store_name'];
-            $input['store_id'] = $provider_info['store_id'];
-            $input['amount'] = $amount;
-            $input['bank_username'] = $_POST['bank_username'];
-            $input['bank_name'] = $_POST['bank_name'];
-            $input['to_bank_username'] = $_POST['to_bank_username'];
-            $input['to_bank_name'] = $_POST['to_bank_name'];
-            $input['add_time'] = time();
-            $input['bz'] = $_POST['bz'];
-            $input['apply_time'] = strtotime($_POST['apply_time']);
-            $mod = Model('provider_evidence');
-            $res = $mod->addProviderEvidence($input);
-
-            if ($res) {
-                showMessage('操作成功',"index.php?act=merchant&op=provider_evidence");
-            } else {
-                showMessage('操作失败');
-            }
-        } else {
-            $provider_list = Model('')->table('refill_provider,store')
-                ->field('refill_provider.*,store.store_name')
-                ->join('inner')
-                ->on('store.store_id=refill_provider.store_id')
-                ->limit(1000)
-                ->select();
-            Tpl::output('provider_list', $provider_list);
-            Tpl::showpage('provider.evidence.add');
-        }
-    }
 }

+ 198 - 1
admin/control/provider_info.php

@@ -1,6 +1,6 @@
 <?php
 
-
+require_once(BASE_HELPER_PATH . '/PHPExcel/PHPExcel.php');
 class provider_infoControl extends SystemControl
 {
     public function __construct()
@@ -187,4 +187,201 @@ class provider_infoControl extends SystemControl
         echo json_encode(['to_bank_username' =>$to_bank_username, 'to_bank_name' => $to_bank_name]);
         exit;
     }
+
+    public function provider_evidenceOp()
+    {
+        $mod = Model('provider_evidence');
+        $condition = [];
+        if (trim($_GET['store_name']) != '') {
+            $condition['store_name'] = ['like', '%' . $_GET['store_name'] . '%'];
+        }
+        $start_unixtime = intval(strtotime($_GET['query_start_time']));
+        $end_unixtime = intval(strtotime($_GET['query_end_time']));
+        if ($start_unixtime > 0 && $end_unixtime > $start_unixtime) {
+            $condition['apply_time'] = [['egt', $start_unixtime], ['lt', $end_unixtime], 'and'];
+        } elseif ($start_unixtime > 0) {
+            $condition['apply_time'] = ['egt', $start_unixtime];
+        } elseif ($end_unixtime > 0) {
+            $condition['apply_time'] = ['lt', $end_unixtime];
+        }
+
+        //上游充值申请列表
+        $evidence_list = $mod->getProviderEvidence($condition, 30, '*', 'apply_time desc');
+        $stats = $mod->field('sum(amount) as amounts')->where($condition)->find();
+        Tpl::output('amounts', $stats['amounts']);
+        Tpl::output('evidence_list', $evidence_list);
+        Tpl::output('page', $mod->showpage());
+        Tpl::showpage('merchant.provider.evidence_list');
+    }
+
+    public function provider_evidence_addOp()
+    {
+        $provider_model = Model('refill_provider');
+        if (chksubmit()) {
+            $obj_validate = new Validator();
+            $obj_validate->validateparam = [
+                ["input" => $_POST["provider_id"], "require" => "true", "message" => '上游通道不能为空'],
+                ["input" => $_POST["bank_username"], "require" => "true", "message" => '开户人姓名不能为空'],
+                ["input" => $_POST["bank_name"], "require" => "true", "message" => '开户银行不能为空'],
+                ["input" => $_POST["to_bank_username"], "require" => "true", "message" => '上游开户人姓名不能为空'],
+                ["input" => $_POST["to_bank_name"], "require" => "true", "message" => '上游开户银行不能为空'],
+                ["input" => $_POST["amount"], "require" => "true", "message" => '预存金额不能为空'],
+                ["input" => $_POST["apply_time"], "require" => "true", "message" => '申请日期不能为空']
+            ];
+            $error = $obj_validate->validate();
+            if ($error != '') {
+                showMessage($error);
+            }
+            $provider_id = $_POST["provider_id"];
+            $provider_info = $provider_model->table('refill_provider,store')
+                ->where((['provider_id' => $provider_id]))
+                ->field('refill_provider.*,store.store_name')
+                ->join('inner')
+                ->on('store.store_id=refill_provider.store_id')
+                ->find();
+            if (!$provider_info) {
+                showMessage('对应店铺不存在');
+            }
+            $amount = $_POST['amount'];
+            $money = abs($amount);
+            if ($money == 0) {
+                showMessage('申请金额错误');
+            }
+            if(!empty($_FILES['voucher']['name'])) {
+                $upload = new UploadFile();
+                $upload->set('default_dir',ATTACH_UPFILE.'/provider');
+
+                $result = $upload->upfile('voucher');
+                if ($result){
+                    $_POST['voucher'] = $upload->file_name;
+                    $input['voucher_name'] = $_POST['voucher'];
+                }else {
+                    showMessage($upload->error);
+                }
+            }
+
+            $input['store_name'] = $provider_info['store_name'];
+            $input['store_id'] = $provider_info['store_id'];
+            $input['amount'] = $amount;
+            $input['bank_username'] = $_POST['bank_username'];
+            $input['bank_name'] = $_POST['bank_name'];
+            $input['to_bank_username'] = $_POST['to_bank_username'];
+            $input['to_bank_name'] = $_POST['to_bank_name'];
+            $input['add_time'] = time();
+            $input['bz'] = $_POST['bz'];
+            $input['apply_time'] = strtotime($_POST['apply_time']);
+            $mod = Model('provider_evidence');
+            $res = $mod->addProviderEvidence($input);
+
+            if ($res) {
+                showMessage('操作成功',"index.php?act=provider_info&op=provider_evidence");
+            } else {
+                showMessage('操作失败');
+            }
+        } else {
+            $provider_list = Model('')->table('refill_provider,store')
+                ->field('refill_provider.*,store.store_name')
+                ->join('inner')
+                ->on('store.store_id=refill_provider.store_id')
+                ->limit(1000)
+                ->select();
+            Tpl::output('provider_list', $provider_list);
+            Tpl::showpage('provider.evidence.add');
+        }
+    }
+
+    public function importOp()
+    {
+        if(chksubmit()) {
+            $provider_list = Model('')->table('refill_provider,store')
+                ->field('refill_provider.provider_id,store.store_id,store.store_name')
+                ->join('inner')
+                ->on('store.store_id=refill_provider.store_id')
+                ->limit(1000)
+                ->select();
+            $store = [];
+            foreach ($provider_list as $provider) {
+                $store[$provider['provider_id']] = ['store_id' => $provider['store_id'], 'store_name' => $provider['store_name']];
+            }
+            if(empty($store)) {
+                showMessage('上游通道为空,不可导入');
+            }
+//得到导入文件
+            $filename = $_FILES['csv']['name'];
+            $tmp_name = $_FILES['csv']['tmp_name'];
+            $extend = strrchr($filename,'.');
+            $extendLower = strtolower($extend);
+            if (!in_array($extendLower, ['.xls', '.xlsx', '.csv']))
+            {
+                showMessage('文件格式有误');
+            }
+            $filePath = BASE_ROOT_PATH . '/data/upload/upfile/provider/';
+
+            /** Error reporting */
+            error_reporting(E_ALL);
+            //注意设置时区
+            $time=date("m-d-H-i-s");//去当前上传的时间
+            //根据当前时间外加后五位产生一个 防止多个用户同时操作产生的重复概率
+            $randnum = 'RefillOrderImport_'.$time.str_pad(mt_rand(1, 99999), 5, '0', STR_PAD_LEFT);
+            //上传后的文件名
+            $name=$randnum.$extendLower;
+
+            $upload_filename=$filePath.$name;//上传后的文件名地址
+
+            $result=move_uploaded_file($tmp_name,$upload_filename);//假如上传到当前目录下
+            if(!$result){
+                showMessage('上传失败,稍后再试!');
+                exit;
+            }
+
+            $fileType = PHPExcel_IOFactory::identify($upload_filename);
+            $objReader = PHPExcel_IOFactory::createReader($fileType);
+            $objPHPExcel = $objReader->load($upload_filename);
+
+            $time = time();
+            $mod = Model('provider_evidence');
+            foreach ($objPHPExcel->getWorkSheetIterator() as $sheet)
+            {
+                foreach ($sheet->getRowIterator() as $row)
+                {
+                    $index = $row->getRowIndex();
+                    if ($index == 1) continue;
+                    $items = [];
+                    foreach ($row->getCellIterator() as $cell) {
+                        $data = $cell->getValue();
+                        $items[] = $data;
+                    }
+                    $provider_id = intval($items[0]);
+                    $params = [
+                        'store_id' => $store[$provider_id]['store_id'],
+                        'store_name' => $store[$provider_id]['store_name'],
+                        'amount' => $items[1] ?? '',
+                        'bank_username' => trim($items[2]) ?? '',
+                        'bank_name' => trim($items[3]) ?? '',
+                        'to_bank_username' => trim($items[4]) ?? '',
+                        'to_bank_name' => trim($items[5]) ?? '',
+                        'apply_time' => strtotime($items[6]) ?? '',
+                        'add_time' => $time
+                    ];
+                    if(!empty($items[7])) {
+                        $params['bz'] = $items[7];
+                    }
+                    $json_txt = json_encode($params);
+                    Log::record("import data: {$json_txt}",LOG::DEBUG);
+                    if(empty($params['store_id']) || empty($params['store_name'])) {
+                        Log::record("provider evidence import err,not find store info, provider_id: {$provider_id}, amount: {$params['amount']}",LOG::DEBUG);
+                    }
+                    $res = $mod->addProviderEvidence($params);
+                    if(!$res){
+                        Log::record("provider evidence import err, provider_id: {$provider_id}, amount: {$params['amount']}",LOG::DEBUG);
+                    }
+                }
+            }
+            showMessage('操作完成');
+        }
+        else
+        {
+            Tpl::showpage('provider.evidence.import');
+        }
+    }
 }

+ 18 - 6
admin/templates/default/merchant.provider.evidence_list.php

@@ -5,6 +5,14 @@
         margin-bottom:10px !important;
         font-weight:700 !important;
     }
+    .page .fixed-bar .item-title h3 {
+    margin-top: 18px !important;
+    margin-bottom: 10px !important;
+    font-weight: 700 !important;
+}
+.tab-base li span {
+    font-size: 12px !important;
+}
 </style>
 <div class="page">
     <div class="fixed-bar">
@@ -12,15 +20,18 @@
             <h3>上游信息管理</h3>
             <ul class="tab-base">
                 <li><a href="index.php?act=provider_info&op=provider"><span>上游信息管理</span></a></li>
+                <li><a href="index.php?act=provider_info&op=add"><span>新增</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>上游充值申请记录</span></a></li>
-                <li><a href="index.php?act=merchant&op=provider_evidence_add"><span>新增上游充值申请</span></a></li>
+                <li><a href="index.php?act=provider_info&op=provider_evidence_add"><span>新增上游充值申请</span></a></li>
+                <li><a href="index.php?act=provider_info&op=import"><span>导入上游充值申请</span></a></li>
             </ul>
         </div>
     </div>
     <div class="fixed-empty"></div>
-    <form method="get" name="formSearch" id="formSearch">
-        <input type="hidden" value="merchant" name="act">
+    <form method="get" name="formSearch" action="" id="formSearch" enctype="multipart/form-data">
+        <input type="hidden" value="provider_info" name="act">
         <input type="hidden" value="provider_evidence" name="op">
+
         <table class="tb-type1 noborder search">
             <tbody>
             <tr>
@@ -42,7 +53,8 @@
                     <?php if ($output['mch_name'] != '') { ?>
                         <a href="index.php?act=merchant&op=refill_evidence" class="btns "
                            title="<?php echo $lang['nc_cancel_search']; ?>"><span><?php echo $lang['nc_cancel_search']; ?></span></a>
-                    <?php } ?></td>
+                    <?php } ?>
+                </td>
             </tr>
             </tbody>
         </table>
@@ -66,7 +78,7 @@
         </tr>
         </tbody>
     </table>
-    <form method="post" id="merchant_name_form">
+    <form type="file" method="post" id="merchant_name_form">
         <input type="hidden" name="form_submit" value="ok"/>
         <table class="table tb-type2">
             <thead>
@@ -130,6 +142,7 @@
 <script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
 <link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
 <script>
+
     $(function () {
         // 日期选择器
         laydate.render({
@@ -153,5 +166,4 @@
             })
         })
     });
-    
 </script>

+ 87 - 12
admin/templates/default/provider.evidence.add.php

@@ -28,8 +28,10 @@
       <h3>上游信息管理</h3>
       <ul class="tab-base">
           <li><a href="index.php?act=provider_info&op=provider"><span>上游信息管理</span></a></li>
-          <li><a href="index.php?act=merchant&op=provider_evidence"><span>上游充值申请记录</span></a></li>
+          <li><a href="index.php?act=provider_info&op=add"><span>新增</span></a></li>
+          <li><a href="index.php?act=provider_info&op=provider_evidence"><span>上游充值申请记录</span></a></li>
           <li><a href="JavaScript:void(0);" class="current"><span>新增上游充值申请</span></a></li>
+          <li><a href="index.php?act=provider_info&op=import"><span>导入上游充值申请</span></a></li>
       </ul>
     </div>
   </div>
@@ -44,8 +46,8 @@
         </tr>
         <tr class="">
           <td class="">
-              <select name="provider_id" class="layui_in" lay-verify="" lay-search>
-                  <option value=""><?php echo $lang['nc_please_choose']; ?></option>
+              <select name="provider_id" class="layui_in" id="provider_id" lay-verify="" lay-search lay-filter="provider_id">
+                  <option id="" value=""><?php echo $lang['nc_please_choose']; ?></option>
                   <?php foreach($output['provider_list'] as $provider){?>
                       <option value="<?php echo $provider['provider_id']?>"><?php echo $provider['store_name']?></option>
                   <?php }?>
@@ -78,18 +80,24 @@
         <tr class="noborder">
             <td colspan="2" class="required"><label class="validation">上游收款转账开户人姓名:</label></td>
         </tr>
-        <tr class="noborder">
-            <td class="vatop rowform">
-                <input type="text" name="to_bank_username" id="to_bank_username" class="txt" value="">
+        <tr class="">
+            <td class=" ">
+                <select name="to_bank_username" id="to_bank_username">
+                    <option value="">请选择</option>
+                </select>
+            </td>
             <td class="vatop tips"></td>
         </tr>
         <tr class="noborder">
             <td colspan="2" class="required"><label class="validation">上游收款转账银行名称:</label></td>
         </tr>
-        <tr class="noborder">
-            <td class="vatop rowform">
-                <input type="text" name="to_bank_name" id="to_bank_name" class="txt" value="">
-            <td class="vatop tips"></td>
+        <tr class="">
+             <td class="">
+                 <select name="to_bank_name" id="to_bank_name">
+                 <option value="">请选择</option>
+                 </select>
+             </td>
+        <td class="vatop tips"></td>
         </tr>
         <tr>
             <td colspan="2"><label>充值申请凭证:</label></td>
@@ -132,12 +140,13 @@
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/i18n/zh-CN.js"
         charset="utf-8"></script>
  <link rel="stylesheet" type="text/css"
-      href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/> 
+      href="<?php echo RESOURCE_SITE_URL; ?>/js/jquery-ui/themes/ui-lightness/jquery.ui.css"/>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL;?>/refill/layer.js"></script>
 <script type="text/javascript" src="<?php echo ADMIN_TEMPLATES_URL;?>/layui/layui.js"></script>
 <link rel="stylesheet" type="text/css" href="<?php echo ADMIN_TEMPLATES_URL; ?>/layui/css/layui.css"/>
 
 <script type="text/javascript">
+var ji=null;
 $(function(){
     $("#voucher").change(function(){
         $("#textfield1").val($(this).val());
@@ -147,6 +156,70 @@ $(function(){
             $("#points_form").submit();
         }
     });
+        layui.use(['form'], function(){
+            var form = layui.form;
+            form.on('select(provider_id)', function (data) {
+                let category = data.value;
+                form.render('select')
+                $.get('index.php?act=provider_info&op=get_provider_info&provider_id='+ category,function(data) {
+                    data = JSON.parse(data)
+                    let html='';
+                    data.to_bank_username.forEach(item=>{
+                        html+=`<option value="${item}">${item}</option>`;
+                    })
+                    $('#to_bank_username').append(html);
+
+                    html='';
+                    data.to_bank_name.forEach(item=>{
+                        html+=`<option value="${item}">${item}</option>`;
+                    })
+                    $('#to_bank_name').append(html);
+                    form.render();
+                })
+            })
+        
+        //    form.on('select(city)', function (data) {
+        //       let city_1 = data.value;
+        //       let city_2 = data.elem[data.elem.selectedIndex].text;
+        //       form.render('select')
+        //       let city_3 = {name: [], value: []}
+        //      //   city_3.push(city_1)
+        //       //   city_3.push(city_2)
+
+        //     //   console.log(city_3);
+        //    $.get('index.php?act=provider_info&op=get_provider_info',
+        //      {
+        //         provider_id:city_3,
+
+
+        //       },function(data) {
+        //           data = JSON.parse(data)
+        //              city_3.value.push(city_1)
+        //              city_3.name.push(city_2)
+        //          data.to_bank_username.push(city_3)
+        //         //  data.to_bank_username.push(city_2),
+        //          console.log(data);
+        //          })
+        //   })
+        //   form.on('select(city_q)', function (data) {
+        //       let city_4 = data.value;
+        //       let city_5 = data.elem[data.elem.selectedIndex].text;
+        //       form.render('select')
+        //       let city_6 = {name: [], value: []}
+        //     //   city_3.push(city_1)
+        //     //   city_3.push(city_2)
+
+        //       console.log(city_6);
+        //    $.get('index.php?act=provider_info&op=get_provider_info&provider_id'+city_6,function(data) {
+        //           data = JSON.parse(data)
+        //              city_6.value.push(city_4)
+        //              city_6.name.push(city_5)
+        //          data.to_bank_name.push(city_6)
+        //         //  data.to_bank_username.push(city_2),
+        //         //  console.log(data);
+        //          })
+        //   })
+
     $('#points_form').validate({
         errorPlacement: function (error, element) {
             error.appendTo(element.parent().parent().prev().find('td:first'));
@@ -204,5 +277,7 @@ $(function(){
         type: 'datetime',
         trigger: 'click'
     });
-});
+ });
+
+})
 </script>

+ 49 - 0
admin/templates/default/provider.evidence.import.php

@@ -0,0 +1,49 @@
+<?php defined('InShopNC') or exit('Access Invalid!');?>
+
+<div class="page">
+  <div class="fixed-bar">
+    <div class="item-title">
+      <h3>上游信息管理</h3>
+        <ul class="tab-base">
+            <li><a href="index.php?act=provider_info&op=provider"><span>上游信息管理</span></a></li>
+            <li><a href="index.php?act=provider_info&op=add"><span>新增</span></a></li>
+            <li><a href="index.php?act=provider_info&op=provider_evidence"><span>上游充值申请记录</span></a></li>
+            <li><a href="index.php?act=provider_info&op=provider_evidence_add"><span>新增上游充值申请</span></a></li>
+            <li><a href="JavaScript:void(0);" class="current"><span>导入上游充值申请</span></a></li>
+        </ul>
+    </div>
+  </div>
+  <div class="fixed-empty"></div>
+  <form method="post" enctype="multipart/form-data" name="form1">
+    <input type="hidden" name="form_submit" value="ok" />
+    <input type="hidden" name="charset" value="gbk" />
+    <table class="table tb-type2">
+      <tbody>
+        <tr class="noborder">
+          <td colspan="2" class="required"><label>请选择文件:</label></td>
+        </tr>
+        <tr class="noborder">
+          <td class="vatop rowform"><span class="type-file-box">
+            <input type="file" name="csv" id="csv" class="type-file-file"  size="30"  />
+            </span></td>
+          <td class="vatop tips">如果导入速度较慢,建议您把文件拆分为几个小文件,然后分别导入</td>
+        </tr>
+      </tbody>
+      <tfoot>
+        <tr class="tfoot">
+          <td colspan="2"><a href="JavaScript:document.form1.submit();" class="btn"><span>导入</span></a></td>
+        </tr>
+      </tfoot>
+    </table>
+  </form>
+</div>
+
+<script type="text/javascript">
+	$(function(){
+    var textButton="<input type='text' name='textfield' id='textfield1' class='type-file-text' /><input type='button' name='button' id='button1' value='' class='type-file-button' />"
+	$(textButton).insertBefore("#csv");
+	$("#csv").change(function(){
+	$("#textfield1").val($("#csv").val());
+	});
+});
+</script> 

+ 3 - 2
admin/templates/default/provider.info.add.php

@@ -28,8 +28,9 @@
             <ul class="tab-base">
                 <li><a href="index.php?act=provider_info&op=index"><span>上游信息管理</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>新增</span></a></li>
-                <li><a href="index.php?act=merchant&op=provider_evidence"><span>上游充值申请记录</span></a></li>
-                <li><a href="index.php?act=merchant&op=provider_evidence_add"><span>新增上游充值申请</span></a></li>
+                <li><a href="index.php?act=provider_info&op=provider_evidence"><span>上游充值申请记录</span></a></li>
+                <li><a href="index.php?act=provider_info&op=provider_evidence_add"><span>新增上游充值申请</span></a></li>
+                <li><a href="index.php?act=provider_info&op=import"><span>导入上游充值申请</span></a></li>
             </ul>
         </div>
     </div>

+ 3 - 2
admin/templates/default/provider.info.edit.php

@@ -11,8 +11,9 @@
             <ul class="tab-base">
                 <li><a href="index.php?act=provider_info&op=index"><span>上游信息管理</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>编辑</span></a></li>
-                <li><a href="index.php?act=merchant&op=provider_evidence"><span>上游充值申请记录</span></a></li>
-                <li><a href="index.php?act=merchant&op=provider_evidence_add"><span>新增上游充值申请</span></a></li>
+                <li><a href="index.php?act=provider_info&op=provider_evidence"><span>上游充值申请记录</span></a></li>
+                <li><a href="index.php?act=provider_info&op=provider_evidence_add"><span>新增上游充值申请</span></a></li>
+                <li><a href="index.php?act=provider_info&op=import"><span>导入上游充值申请</span></a></li>
             </ul>
         </div>
     </div>

+ 3 - 2
admin/templates/default/provider.info.php

@@ -22,8 +22,9 @@
             <ul class="tab-base">
                 <li><a href="JavaScript:void(0);" class="current"><span>上游信息管理</span></a></li>
                 <li><a href="index.php?act=provider_info&op=add"><span>新增</span></a></li>
-                <li><a href="index.php?act=merchant&op=provider_evidence"><span>上游充值申请记录</span></a></li>
-                <li><a href="index.php?act=merchant&op=provider_evidence_add"><span>新增上游充值申请</span></a></li>
+                <li><a href="index.php?act=provider_info&op=provider_evidence"><span>上游充值申请记录</span></a></li>
+                <li><a href="index.php?act=provider_info&op=provider_evidence_add"><span>新增上游充值申请</span></a></li>
+                <li><a href="index.php?act=provider_info&op=import"><span>导入上游充值申请</span></a></li>
             </ul>
         </div>
     </div>

+ 1 - 1
core/framework/libraries/model.php

@@ -886,7 +886,7 @@ class ModelDb
 
     protected function parseTable($options) 
     {
-    	if ($options['on']) return null;
+    	if (!empty($options['on'])) return null;
     	$tables = $options['table'];
         if(is_array($tables)) {// 别名定义
             $array   =  [];

+ 1 - 1
helper/PHPExcel/PHPExcel/Shared/OLE.php

@@ -287,7 +287,7 @@ class PHPExcel_Shared_OLE
 				$pps = new PHPExcel_Shared_OLE_PPS_File($name);
 				break;
 			default:
-				continue;
+                break;
 			}
 			fseek($fh, 1, SEEK_CUR);
 			$pps->Type    = $type;