gq 7 vuotta sitten
vanhempi
commit
338375e724

+ 1 - 5
server/app/Http/Controllers/Admin/Dream/InfoController.php

xqd
@@ -248,11 +248,7 @@ class InfoController extends Controller
                 DreamImages::insert($arr);
             }
         }
-        if (request("file")) {
-            $ok = $this->repository->update(request('id'),$data);
-        }else{
-            $ok=1;
-        }
+        $ok = $this->repository->update(request('id'),$data);
         if ($data['status'] == 1) {   //审核通过
             $message = '你的梦想《'.$data['name'].'》已被批准,离你实现梦想又更进一步啦~ ';
             $info = [

+ 1 - 6
server/app/Http/Controllers/Admin/Interaction/InfoController.php

xqd
@@ -181,12 +181,7 @@ class InfoController extends Controller
             $info->save();
 //            dd($info);
         }
-        if (empty(request("file"))) {
-            $ok = InteractionInfo::find(request('id'))->update($interaction);
-        }else{
-            InteractionInfo::find(request('id'))->update($interaction);
-            $ok=1;
-        }
+        $ok = InteractionInfo::find(request('id'))->update($interaction);
         if($ok) {
             $url[] = array('url'=>U( 'Interaction/Info/index'),'title'=>'返回列表');
             return $this->showMessage('操作成功',urldecode(request('_referer')));

+ 2 - 2
server/resources/views/admin/user/cash/out/index.blade.php

xqd xqd
@@ -37,7 +37,7 @@
     						<tr>
 								
             <th class="sorting" data-sort="id"> id </th>
-            <th class="sorting" data-sort="number"> 交易号 </th>
+            <th class="sorting" data-sort="transaction_id"> 交易号 </th>
             <th class="sorting" data-sort="user_id"> 提现用户 </th>
             <th class="sorting" data-sort="bank_id"> 提现银行 </th>
             <th class="sorting" data-sort="bank_id"> 卡号 </th>
@@ -54,7 +54,7 @@
 							@foreach($list as $key => $item)							<tr>
 
 			<td>{{ $item->id }}</td>
-			<td>{{ $item->number }}</td>
+			<td>{{ $item->transaction_id }}</td>
 			<td>{{ !empty($item->user) ? $item->user->nickname : '' }}</td>
 			<td>{{ !empty($item->bank) ? $item->bank->bank_name : '' }}</td>
 			<td>{{ !empty($item->bank) ? $item->bank->bank_number : '' }}</td>