Merge branch 'zjl_vp_order_20180502'

config/perm.php

@@ -2,7 +2,7 @@
 	return [
 		// 菜单权限
 		'订单管理' => [
-			'平台订单' => ['orderlist_check', 'export', 'check_order', 'cancel_order', 'check_account', 'order_send', 'send_invoice', 'update_address', 'update_invoice', 'check_test_order', 'check_offline_order'],
+			'平台订单' => ['orderlist_check', 'export', 'check_order', 'cancel_order', 'check_account', 'order_send', 'send_invoice', 'update_address', 'update_invoice', 'check_test_order', 'check_offline_order', 'download_contract'],
 
 			'ERP订单'  => ['erp_order_check'],
 

config/website.php

@@ -22,5 +22,5 @@ return [
     'check_access_api'  => 'http://perm.liexin.net/api/perms/access',
 
     // 竞调账户配置显示时间
-    'vp_time_set' => '2018-04-01',
+    'vp_time_set' => '2018-05-01',
 ];

resources/views/orderlist/content.blade.php

@@ -273,6 +273,17 @@
                                         @if (in_array('check_order', $userPerms))
     	                                    <a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a>
                                         @endif
+
+                                        <?php 
+                                            $apiUrl = Config('website.api_domain');
+                                            $k1  = time();
+                                            $k2  = md5(md5($k1).'fh6y5t4rr351d2c3bryi');
+                                            $downLoadUrl = $apiUrl.'contract/pdfinfo?id='.$v['order_id'].'&k1='.$k1.'&k2='.$k2;
+                                        ?>
+                                        
+                                        @if (in_array('download_contract', $userPerms))
+                                            <a class="btn btn-info" href="{{$downLoadUrl}}">下载合同</a>
+                                        @endif
                                 </div>
                             </td>
                         </tr>