bingo 7 лет назад
Родитель
Сommit
ee5fd15b00

+ 1 - 1
app/Http/Controllers/RegisterController.php

@@ -105,7 +105,7 @@ class RegisterController extends Controller
 
             // 如果需要邀请注册
             if (self::$systemConfig['is_invite_register']) {
-                //必须使用邀请码
+                // 必须使用邀请码
                 if (self::$systemConfig['is_invite_register'] == 2 && empty($code)) {
                     Session::flash('errorMsg', '请输入邀请码');
 

+ 58 - 59
resources/views/user/buy.blade.php

@@ -12,77 +12,76 @@
             <div class="row invoice-body">
                 <div class="col-xs-12 table-responsive">
                     <table class="table table-hover">
-                      @if($goods->type == '3')
-                        <thead>
-                        <tr>
-                            <th class="invoice-title"> {{trans('home.service_name')}} </th>
-                            <th class="invoice-title text-center"> {{trans('home.service_price')}} </th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr>
-                            <td style="padding: 10px;">
-                                <h2>{{$goods->name}}</h2>
-                                添加帐户余额{{$goods->price}}元
-                            </td>
-                            <td class="text-center"> ¥{{$goods->price}} </td>
-                        </tr>
-                        </tbody>
-                      @else
-                        <thead>
-                        <tr>
-                            <th class="invoice-title"> {{trans('home.service_name')}} </th>
-                            <th class="invoice-title text-center"> {{trans('home.service_price')}} </th>
-                            <th class="invoice-title text-center"> {{trans('home.service_quantity')}} </th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr>
-                            <td style="padding: 10px;">
-                                <h2>{{$goods->name}}</h2>
-                                {{trans('home.service_traffic')}} {{$goods->traffic_label}}
-                                <br/>
-                                {{trans('home.service_days')}} {{$goods->days}} {{trans('home.day')}}
-                            </td>
-                            <td class="text-center"> ¥{{$goods->price}} </td>
-                            <td class="text-center"> x 1 </td>
-                        </tr>
-                        </tbody>
+                        @if($goods->type == 3)
+                            <thead>
+                                <tr>
+                                    <th class="invoice-title"> {{trans('home.service_name')}} </th>
+                                    <th class="invoice-title text-center"> {{trans('home.service_price')}} </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr>
+                                    <td style="padding: 10px;">
+                                        <h2>{{$goods->name}}</h2>
+                                        添加帐户余额{{$goods->price}}元
+                                        </td>
+                                    <td class="text-center"> ¥{{$goods->price}} </td>
+                                </tr>
+                            </tbody>
+                        @else
+                            <thead>
+                                <tr>
+                                    <th class="invoice-title"> {{trans('home.service_name')}} </th>
+                                    <th class="invoice-title text-center"> {{trans('home.service_price')}} </th>
+                                    <th class="invoice-title text-center"> {{trans('home.service_quantity')}} </th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr>
+                                    <td style="padding: 10px;">
+                                        <h2>{{$goods->name}}</h2>
+                                        {{trans('home.service_traffic')}} {{$goods->traffic_label}}
+                                        <br/>
+                                        {{trans('home.service_days')}} {{$goods->days}} {{trans('home.day')}}
+                                    </td>
+                                    <td class="text-center"> ¥{{$goods->price}} </td>
+                                    <td class="text-center"> x 1 </td>
+                                </tr>
+                            </tbody>
                       	@endif
                     </table>
                 </div>
             </div>
-            @if($goods->type == '3')
-            @else
-            <div class="row invoice-subtotal">
-                <div class="col-xs-3">
-                    <h2 class="invoice-title"> {{trans('home.service_subtotal_price')}} </h2>
-                    <p class="invoice-desc"> ¥{{$goods->price}} </p>
-                </div>
-                <div class="col-xs-3">
-                    <h2 class="invoice-title"> {{trans('home.service_total_price')}} </h2>
-                    <p class="invoice-desc grand-total"> ¥{{$goods->price}} </p>
-                </div>
-                <div class="col-xs-6">
-                    <h2 class="invoice-title"> {{trans('home.coupon')}} </h2>
-                    <p class="invoice-desc">
-                    <div class="input-group">
-                        <input class="form-control" type="text" name="coupon_sn" id="coupon_sn" placeholder="{{trans('home.coupon')}}" />
-                        <span class="input-group-btn">
-                            <button class="btn btn-default" type="button" onclick="redeemCoupon()"><i class="fa fa-refresh"></i> {{trans('home.redeem_coupon')}} </button>
-                        </span>
+            @if($goods->type <= 2)
+                <div class="row invoice-subtotal">
+                    <div class="col-xs-3">
+                        <h2 class="invoice-title"> {{trans('home.service_subtotal_price')}} </h2>
+                        <p class="invoice-desc"> ¥{{$goods->price}} </p>
+                    </div>
+                    <div class="col-xs-3">
+                        <h2 class="invoice-title"> {{trans('home.service_total_price')}} </h2>
+                        <p class="invoice-desc grand-total"> ¥{{$goods->price}} </p>
+                    </div>
+                    <div class="col-xs-6">
+                        <h2 class="invoice-title"> {{trans('home.coupon')}} </h2>
+                        <p class="invoice-desc">
+                            <div class="input-group">
+                                <input class="form-control" type="text" name="coupon_sn" id="coupon_sn" placeholder="{{trans('home.coupon')}}" />
+                                <span class="input-group-btn">
+                                    <button class="btn btn-default" type="button" onclick="redeemCoupon()"><i class="fa fa-refresh"></i> {{trans('home.redeem_coupon')}} </button>
+                                </span>
+                            </div>
+                        </p>
                     </div>
-                    </p>
                 </div>
-            </div>
             @endif
             <div class="row">
                 <div class="col-xs-12" style="text-align: right;">
                     @if($is_youzan)
                         <a class="btn btn-lg red hidden-print" onclick="onlinePay()"> {{trans('home.online_pay')}} </a>
                     @endif
-                  	@if($goods->type <= '2')
-                    <a class="btn btn-lg blue hidden-print uppercase" onclick="pay()"> {{trans('home.service_pay_button')}} </a>
+                  	@if($goods->type <= 2)
+                        <a class="btn btn-lg blue hidden-print uppercase" onclick="pay()"> {{trans('home.service_pay_button')}} </a>
                   	@endif
                 </div>
             </div>

+ 15 - 15
resources/views/user/index.blade.php

@@ -39,22 +39,22 @@
                 <div class="row">
                     <div class="col-md-12">
                         @if(!$articleList->isEmpty())
-                        @foreach($articleList as $key => $article)
-                        <div class="portlet light bordered">
-                            <div class="portlet-title tabbable-line">
-                                <div class="caption">
-                                    <i class="icon-directions font-green hide"></i>
-                                    <span class="caption-subject bold font-dark uppercase"> {{$article->title}} </span>
-                                    <span class="caption-helper">发布于:{{$article->created_at}}</span>
-                                </div>
-                            </div>
-                            <div class="portlet-body">
-                                <div class="tab-content">
-                                    {!!$article->content!!} 
+                            @foreach($articleList as $key => $article)
+                                <div class="portlet light bordered">
+                                    <div class="portlet-title tabbable-line">
+                                        <div class="caption">
+                                            <i class="icon-directions font-green hide"></i>
+                                            <span class="caption-subject bold font-dark uppercase"> {{$article->title}} </span>
+                                            <span class="caption-helper">发布于:{{$article->created_at}}</span>
+                                        </div>
+                                    </div>
+                                    <div class="portlet-body">
+                                        <div class="tab-content">
+                                            {!!$article->content!!}
+                                        </div>
+                                    </div>
                                 </div>
-                            </div>
-                        </div> 
-                        @endforeach
+                            @endforeach
                         @endif
                     </div>
                 </div>