lizhen_gitee 9 ヶ月 前
コミット
c7f35ada88

+ 6 - 4
application/api/controller/Usercenter.php

@@ -784,11 +784,12 @@ $resArray['money'] = $money;  //返回给前端的计算结果
                 'call_minutes' => $user_match_audio_log_info['call_minutes'] + 1
             ];
 
-            $log_id = Db::name('user_match_audio_log')->where(['id' => $user_match_audio_log_info['id'], 'createtime' => $user_match_audio_log_info['createtime']])->setField($data);
-            if (!$log_id) {
+            $log_rs = Db::name('user_match_audio_log')->where(['id' => $user_match_audio_log_info['id'], 'createtime' => $user_match_audio_log_info['createtime']])->setField($data);
+            if (!$log_rs) {
                 Db::rollback();
                 $this->error('扣费失败');
             }
+            $log_id = $user_match_audio_log_info['id'];
         } else {
             //添加记录日志
             $data = [
@@ -951,11 +952,12 @@ $resArray['money'] = $money;  //返回给前端的计算结果
                 'call_minutes' => $user_match_video_log_info['call_minutes'] + 1
             ];
 
-            $log_id = Db::name('user_match_video_log')->where(['id' => $user_match_video_log_info['id'], 'createtime' => $user_match_video_log_info['createtime']])->setField($data);
-            if (!$log_id) {
+            $log_rs = Db::name('user_match_video_log')->where(['id' => $user_match_video_log_info['id'], 'createtime' => $user_match_video_log_info['createtime']])->setField($data);
+            if (!$log_rs) {
                 Db::rollback();
                 $this->error('扣费失败');
             }
+            $log_id = $user_match_video_log_info['id'];
         } else {
             //添加记录日志
             $data = [

+ 2 - 1
public/assets/css/fastadmin.css

@@ -5893,6 +5893,7 @@ fieldset[disabled] .btn-yahoo.active {
 .panda-show:hover{
   color: #555 !important;
 }
+/*
 .dropdown-menu > li > a > .glyphicon, .dropdown-menu > li > a > .fa, .dropdown-menu > li > a > .ion{
   margin-right: 0 !important;
 }
@@ -5900,4 +5901,4 @@ fieldset[disabled] .btn-yahoo.active {
   min-width: 90px !important;
   left: -15px !important;
   right: auto !important;
-}
+}*/