Merge branch 'develop' of http://g.28ms.com:8000/yangjianbin/page into develop

@@ -86,6 +86,9 @@ class CheckLogin
         if (!$session->loanNatureEnum) {
             $session->loanNatureEnum = $this->getLoanNatureEnum();
         }
+        if (!$session->sourceBaseType) {
+            $session->sourceBaseType = $this->getSourceBaseType();
+        }
         /*if (preg_match("/admin|base/i", uri_string())) {
             if(!$this->CI->session->isadmin){
                 redirect('login');
@@ -333,4 +336,16 @@ class CheckLogin
         }
     }
 
+    private function getSourceBaseType()
+    {
+        try {
+            $url = $this->CI->config->item('apiBaseUrl') . 'order/ordersource/baseType';
+            $res = json_decode(file_get_contents($url));
+            $products = $res->data;
+            return $products;
+        } catch (Exception $e) {
+            return array();
+        }
+    }
+
 }
\ No newline at end of file

@@ -6,8 +6,14 @@
                 <label>资料上传</label>
                 <span class="form-control select-box">
                     <select class="select uploader" size="1">
-                        <option value="1">浙江法院公开网</option>
-                        <option value="2">全国被执行网</option>
+                        <?php foreach ($this->session->sourceBaseType as $k=>$v):?>
+                            <option value="<?=$v->code?>"><?=$v->desc?></option>
+                            <?php if($v->children && !empty($v->children)):?>
+                                <?php foreach ($this->session->sourceBaseType as $kk=>$vv):?>
+                                    <option value="<?=$vv->code?>">&nbsp;&nbsp;--<?=$vv->desc?></option>
+                                <?php endforeach;?>
+                            <?php endif;?>
+                        <?php endforeach;?>
                     </select>
                 </span>
             </div>