Merge remote-tracking branch 'origin/feature/operation_log' into feature/operation_log

Application/Admin/Controller/DeductBindRecordController.class.php

@@ -43,6 +43,7 @@ class DeductBindRecordController extends ThinkController {
 	*扣除绑定平台币
 	*/
 	public function deductBindBalance(){
+		ini_set('memory_limit', '512M');
 		if(IS_POST){
 
 		    $_REQUEST['user_id'] = (M('user','tab_')->field('id')->where(['account'=>$_REQUEST['user_id']])->find())['id'];

Application/Admin/Controller/FinancePromoteController.class.php

@@ -924,6 +924,9 @@ class FinancePromoteController extends AdminController
         }
         if (isset($_REQUEST['company_belong'])) {
             $pmap['company_belong'] = $_REQUEST['company_belong'];
+            if($pmap['company_belong'] != 0){
+                $gfflg = false;
+            }
             $title .= (getCompanyBlong($_REQUEST['company_belong'])."-");
         }
         if (isset($_REQUEST['promote_id'])) {

Application/Admin/View/UserActionLog/operateLog.html

@@ -53,9 +53,9 @@
         <select id="op_type" name="op_type" class="select_gallery" >
           <option value="">请选择类型</option>
           <option value="0" <if condition="$_GET['op_type'] eq '0'">selected</if> >新增</option>
-            <option value="1" <if condition="$_GET['op_type'] eq 1">selected</if> >编辑</option>
+            <option value="1" <if condition="$_GET['op_type'] eq 1">selected</if> >修改</option>
           <option value="2" <if condition="$_GET['op_type'] eq  2">selected</if> >删除</option>
-          <option value="3" <if condition="$_GET['op_type'] eq  3">selected</if> >下载</option>
+          <option value="3" <if condition="$_GET['op_type'] eq  3">selected</if> >导出</option>
         </select>
       </div>