2
0

4 Commits 53e18e0996 ... 4bb48fe3e4

Autor SHA1 Nachricht Datum
  jun 4bb48fe3e4 Merge branch 'jun' into test vor 2 Wochen
  jun dbaf93d498 修改拼团 vor 2 Wochen
  jun edec90bc4c Merge branch 'jun' into test vor 2 Wochen
  jun 4d9bfb2334 修改拼团记录 vor 2 Wochen

+ 1 - 1
app/Http/Controllers/Api/Orders.php

@@ -845,7 +845,7 @@ class Orders extends Api{
                     'active_id'     =>  $regimentActiveInfo['id'],
                     'product_id'    =>  $buyInfo['product_id'],
                     'people_number' =>  $isPay ? 0 : 1,
-                    'status'        =>  $isPay ? 4 : 0,
+                    'status'        =>  0,
                     'start_time'    =>  $time,
                     'end_time'      =>  $time + $regimentActiveInfo['expiration']*3600,
                     'update_time'   =>  $time,

+ 3 - 0
resources/views/admin/regiment/index.blade.php

@@ -78,6 +78,9 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 								@if( $a['status'] == 3 )
 									拼团失败
 								@endif
+								@if( $a['status'] == 4 )
+									拼团待支付
+								@endif
 							</td>
 							<td>{{date('Y/m/d H:i:s',$a['start_time'])}}</td>
 							<td>{{date('Y/m/d H:i:s',$a['end_time'])}}</td>

+ 1 - 1
resources/views/admin/regiment_record/index.blade.php

@@ -70,7 +70,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 								@if( $a['status'] == 3 )
 									拼团失败
 								@endif
-								@if( $a['status'] == 3 )
+								@if( $a['status'] == 4 )
 									拼团待支付
 								@endif
 							</td>