Merge branch 'jun' into test

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>

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>