Pārlūkot izejas kodu

1.替换AVATAR
2.语言包优化
3.修正一个BUG

zhangjiangbin 8 gadi atpakaļ
vecāks
revīzija
bbd0848d3d

+ 15 - 13
resources/lang/en/home.php

@@ -9,7 +9,7 @@ return [
     // 菜单
     'home' => 'Home',
     'services' => 'Services',
-    'traffic_log' => 'My Traffic',
+    'traffic_log' => 'Monitor',
     'invite_code' => 'Invite Code',
     'invoices' => 'Invoices',
     'tickets' => 'Tickets',
@@ -22,7 +22,7 @@ return [
     'account_level' => 'Level',
     'account_balance' => 'Balance',
     'account_score' => 'Score',
-    'account_expire' => 'Expire At',
+    'account_expire' => 'Overdue At',
     'account_last_usage' => 'Last Usage',
     'account_last_login' => 'Last Login',
     'account_bandwidth_usage' => 'Bandwidth Usage',
@@ -36,18 +36,17 @@ return [
     'service_desc' => 'Description',
     'service_price' => 'Sales Price',
     'service_quantity' => 'Quantity',
+    'service_subtotal_price' => 'Subtotal Price',
     'service_total_price' => 'Total Price',
-    'service_settlement_price' => 'Settlement Price',
     'service_pay_button' => 'Pay',
     'services_none' => 'None Services',
     'service_traffic' => 'Transfer',
-    'service_days' => 'Available Days',
+    'service_days' => 'Term of Validity',
     'service_buy_button' => 'Order Now',
     'day' => 'days',
     'coupon' => 'Coupon',
     'redeem_coupon' => 'Redeem',
 
-
     // 流量日志
     'traffic_log_tips' => 'Tips: the flow statistics in 30 days will not be counted at the present day, and the flow statistics in 24 hours will not be counted at the present hour.',
     'traffic_log_30days' => '30Days Statistics',
@@ -61,13 +60,13 @@ return [
     'invite_code_tips2' => 'invite codes.',
     'invite_code_my_codes' => 'My Invite Codes',
     'invite_code_table_name' => 'Codes',
-    'invite_code_table_date' => 'Expire Date',
+    'invite_code_table_date' => 'Overdue Date',
     'invite_code_table_user' => 'Usage User',
     'invite_code_table_status' => 'Status',
     'invite_code_table_none_codes' => 'None Data',
     'invite_code_table_status_un' => 'Active',
     'invite_code_table_status_yes' => 'Already Used',
-    'invite_code_table_status_expire' => 'Expired',
+    'invite_code_table_status_expire' => 'Overdue',
 
     // 单据
     'invoice_title' => 'My Invoices',
@@ -79,21 +78,24 @@ return [
     'invoice_table_closed' => 'Closed',
     'invoice_table_wait_payment' => 'Wait Payment',
     'invoice_table_wait_confirm' => 'Wait Confirm',
-    'invoice_table_wait_active' => 'Wait Active',
-    'invoice_table_expired' => 'Expired',
+    'invoice_table_wait_active' => 'Active',
+    'invoice_table_expired' => 'Overdue',
 
     // 工单
     'ticket_title' => 'My Tickets',
     'ticket_table_title' => 'Title',
     'ticket_table_status' => 'Status',
     'ticket_table_none' => 'No Data',
-    'ticket_table_status_wait' => 'No Data',
-    'ticket_table_status_reply' => 'No Data',
-    'ticket_table_status_close' => 'No Data',
-    'ticket_table_new_button' => 'Open Ticket',
+    'ticket_table_status_wait' => 'Wait Reply',
+    'ticket_table_status_reply' => 'Wait Reply',
+    'ticket_table_status_close' => 'Closed',
+    'ticket_table_new_button' => 'New Ticket',
     'ticket_table_new_desc' => 'Please fill in your questions. If the picture is submitted to the work list, upload the picture at the reply.',
     'ticket_table_new_cancel' => 'Cancel',
     'ticket_table_new_yes' => 'Submit',
+    'ticket_reply_me' => 'Me',
+    'ticket_reply_master' => 'Master',
+    'ticket_reply_button' => 'Reply',
 
     // 推广返利
     'referral_title' => 'My Referrals',

+ 5 - 2
resources/lang/zh-CN/home.php

@@ -36,8 +36,8 @@ return [
     'service_desc' => '描述',
     'service_price' => '价格',
     'service_quantity' => '数量',
-    'service_total_price' => '共计',
-    'service_settlement_price' => '结算价',
+    'service_subtotal_price' => '小计',
+    'service_total_price' => '合计',
     'service_pay_button' => '支付',
     'services_none' => '暂无可用服务',
     'service_traffic' => '内含流量',
@@ -93,6 +93,9 @@ return [
     'ticket_table_new_desc' => '请填写您的问题,如果图片请提交工单后在回复处上传图片',
     'ticket_table_new_cancel' => '取消',
     'ticket_table_new_yes' => '提交',
+    'ticket_reply_me' => '我',
+    'ticket_reply_master' => '管理员',
+    'ticket_reply_button' => '回复',
 
     // 推广返利
     'referral_title' => '推广返利',

+ 1 - 1
resources/views/admin/layouts.blade.php

@@ -62,7 +62,7 @@
                         <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
                             <span class="username username-hide-on-mobile"> {{Session::get('user')['username']}} </span>
                             <!-- DOC: Do not remove below empty space(&nbsp;) as its purposely used -->
-                            <img alt="" class="img-circle" src="/assets/images/avatar.jpg" /> </a>
+                            <img alt="" class="img-circle" src="/assets/images/avatar.png" /> </a>
                         <ul class="dropdown-menu dropdown-menu-default">
                             <li>
                                 <a href="{{url('/user')}}"> <i class="icon-home"></i> 个人中心 </a>

+ 4 - 3
resources/views/user/addOrder.blade.php

@@ -23,7 +23,7 @@
                         <tr>
                             <td style="padding: 10px;">
                                 <h2>{{$goods->name}}</h2>
-                                <p> {{trans('home.service_traffic')}} {{$goods->traffic}}({{trans('home.service_days')}} {{$goods->days}}{{trans('home.day')}}) </p>
+                                <p> {{trans('home.service_traffic')}} {{$goods->traffic}}({{trans('home.service_days')}} {{$goods->days}} {{trans('home.day')}}) </p>
                             </td>
                             <td class="text-center"> ¥{{$goods->price}} </td>
                             <td class="text-center"> x 1 </td>
@@ -34,7 +34,7 @@
             </div>
             <div class="row invoice-subtotal">
                 <div class="col-xs-3">
-                    <h2 class="invoice-title"> {{trans('home.service_total_price')}} </h2>
+                    <h2 class="invoice-title"> {{trans('home.service_subtotal_price')}} </h2>
                     <p class="invoice-desc"> ¥{{$goods->price}} </p>
                 </div>
                 <div class="col-xs-3">
@@ -49,7 +49,7 @@
                     </p>
                 </div>
                 <div class="col-xs-6">
-                    <h2 class="invoice-title"> {{trans('home.service_settlement_price')}} </h2>
+                    <h2 class="invoice-title"> {{trans('home.service_total_price')}} </h2>
                     <p class="invoice-desc grand-total"> ¥{{$goods->price}} </p>
                 </div>
             </div>
@@ -93,6 +93,7 @@
                             total_price = goods_price * ret.data.discount;
                         } else {
                             total_price = goods_price - ret.data.amount;
+                            total_price = total_price > 0 ? total_price : 0;
                         }
 
                         $(".grand-total").text("¥" + total_price);

+ 1 - 1
resources/views/user/invite.blade.php

@@ -38,7 +38,7 @@
                             <div class="table-scrollable table-scrollable-borderless">
                                 <table class="table table-hover table-light table-checkable order-column">
                                     <thead>
-                                        <tr class="uppercase">
+                                        <tr>
                                             <th> # </th>
                                             <th> {{trans('home.invite_code_table_name')}} </th>
                                             <th> {{trans('home.invite_code_table_date')}} </th>

+ 1 - 1
resources/views/user/layouts.blade.php

@@ -62,7 +62,7 @@
                         <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
                             <span class="username username-hide-on-mobile"> {{Session::get('user')['username']}} </span>
                             <!-- DOC: Do not remove below empty space(&nbsp;) as its purposely used -->
-                            <img alt="" class="img-circle" src="/assets/images/avatar.jpg" /> </a>
+                            <img alt="" class="img-circle" src="/assets/images/avatar.png" /> </a>
                         <ul class="dropdown-menu dropdown-menu-default">
                             @if(Session::get('user')['is_admin'])
                                 <li>

+ 2 - 2
resources/views/user/orderList.blade.php

@@ -26,10 +26,10 @@
                     </div>
                     <div class="portlet-body">
                         <div class="table-scrollable">
-                            <table class="table table-striped table-bordered table-hover">
+                            <table class="table table-striped table-bordered table-hover table-checkable order-column">
                                 <thead>
                                     <tr>
-                                        <th> 编号 </th>
+                                        <th> # </th>
                                         <th> {{trans('home.invoice_table_name')}} </th>
                                         <th> {{trans('home.invoice_table_price')}} </th>
                                         <th> {{trans('home.invoice_table_create_date')}} </th>

+ 5 - 13
resources/views/user/replyTicket.blade.php

@@ -7,15 +7,7 @@
 @section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
-    <div class="page-content">
-        <!-- BEGIN PAGE BREADCRUMB -->
-        <ul class="page-breadcrumb breadcrumb">
-            <li>
-                <a href="{{url('user/ticketList')}}">我的工单</a>
-                <i class="fa fa-circle"></i>
-            </li>
-        </ul>
-        <!-- END PAGE BREADCRUMB -->
+    <div class="page-content" style="padding-top:0;">
         <!-- BEGIN PAGE BASE CONTENT -->
         <div class="row">
             <div class="col-md-12">
@@ -45,7 +37,7 @@
                                     <div class="timeline-body-arrow"></div>
                                     <div class="timeline-body-head">
                                         <div class="timeline-body-head-caption">
-                                            <span class="timeline-body-alerttitle font-blue-madison"></span>
+                                            <span class="timeline-body-alerttitle font-blue-madison">{{trans('home.ticket_reply_me')}}</span>
                                             <span class="timeline-body-time font-grey-cascade"> {{$ticket->created_at}} </span>
                                         </div>
                                         <div class="timeline-body-head-actions"></div>
@@ -72,9 +64,9 @@
                                             <div class="timeline-body-head">
                                                 <div class="timeline-body-head-caption">
                                                     @if($reply->user->is_admin)
-                                                        <a href="javascript:;" class="timeline-body-title font-red-intense">管理员</a>
+                                                        <a href="javascript:;" class="timeline-body-title font-red-intense">{{trans('home.ticket_reply_master')}}</a>
                                                     @else
-                                                        <span class="timeline-body-alerttitle font-blue-madison"></span>
+                                                        <span class="timeline-body-alerttitle font-blue-madison">{{trans('home.ticket_reply_me')}}</span>
                                                     @endif
                                                     <span class="timeline-body-time font-grey-cascade"> {{$reply->created_at}} </span>
                                                 </div>
@@ -93,7 +85,7 @@
                             <div class="row">
                                 <div class="col-md-12">
                                     <script id="editor" type="text/plain" style="padding-bottom:10px;"></script>
-                                    <button class="btn blue" type="button" onclick="replyTicket()"> 回 复 </button>
+                                    <button class="btn blue" type="button" onclick="replyTicket()"> {{trans('home.ticket_reply_button')}} </button>
                                 </div>
                             </div>
                         @endif