some bug fixes

frontendApi/config/menu.php

@@ -100,7 +100,7 @@ return [
         ]
     ],
     'article'=>[
-        'name'=>'文章管理',
+        'name'=>'Article Management',//文章管理
         'class' => '',
         'icon'=>'el-icon-document',
         'controller'=>'article',

frontendApi/modules/v1/controllers/DashboardController.php

@@ -72,6 +72,26 @@ class DashboardController extends BaseController
                 $wkrd =$k+1;break;
             }
         }
+        if($wkrd==1){
+            $wkrd.='st';
+        }else{
+            $wkrd.='nd';
+        }
+
+        $monthArray = [
+            1 => 'Jan',
+            2 => 'Feb',
+            3 => 'Mar',
+            4 => 'Apr',
+            5 => 'May',
+            6 => 'Jun',
+            7 => 'Jul',
+            8 => 'Aug',
+            9 => 'Sep',
+            10 => 'Oct',
+            11 => 'Nov',
+            12 => 'Dec',
+        ];
 
         return static::notice([
             'nowTime' => $nowTime,
@@ -81,7 +101,8 @@ class DashboardController extends BaseController
             'decLvName'=>$decLvName,
             'slides'=>Ad::findUseSlaves()->select('ID,IMAGE,LID,TITLE,CONTENT,TYPE')->where('LID=:LID AND STATUS=1', [':LID'=>'7EFF6260A16C3CC7E053693418AC03E4'])->orderBy('SORT ASC')->asArray()->all(),
             'news'=>$news,
-            'periodNum'=>$periodNum.'期，'.$curYM['CALC_MONTH'].'月第'.$wkrd.'周，共'.$weeks.'周',
+//            'periodNum'=>'Period '.$periodNum.' ，'.$curYM['CALC_MONTH'].'月第'.$wkrd.'周，共'.$weeks.'周',
+            'periodNum'=>$periodNum.' ，'.$wkrd.' period  out of '.$weeks.', '. $monthArray[$curYM['CALC_MONTH']],
         ]);
     }
 

frontendEle/src/views/bonus/other.vue

@@ -6,13 +6,13 @@
         </el-table-column>
         <el-table-column label="Welcome Bonus" prop="BONUS_TG.value"><!-- 销售奖金 -->
         </el-table-column>
-        <el-table-column label="业绩奖金" prop="ORI_BONUS_QY.value"><!-- 业绩奖金 -->
-        </el-table-column>
+<!--        <el-table-column label="业绩奖金" prop="ORI_BONUS_QY.value">&lt;!&ndash; 业绩奖金 &ndash;&gt;-->
+<!--        </el-table-column>-->
         <el-table-column label="Director Bonus" prop="ORI_BONUS_BS_MNT.value"><!-- 管理奖金 -->
         </el-table-column>
         <el-table-column label="Team Bonus" prop="ORI_BONUS_BS_ABBR.value"><!-- 绩效奖金 -->
         </el-table-column>
-        <el-table-column label="Quarter Pool Bank(GPB)" prop="ORI_BONUS_QUARTER.value"><!-- 季度分红 -->
+        <el-table-column label="Quarter Pool Bank(GPB)" prop="ORI_BONUS_QUARTER.value" width="200px"><!-- 季度分红 -->
         </el-table-column>
         <el-table-column label="Travel" prop="BONUS_TRAVEL.value"><!-- 旅游奖 -->
         </el-table-column>
@@ -38,7 +38,7 @@
           <el-descriptions-item class="bonus-item" label="Pay cycle">{{newData.PERIOD_NUM.value}}</el-descriptions-item><!-- 期数 -->
           <el-descriptions-item class="bonus-item" label="Member Level">{{newData.LAST_DEC_LV.value}}</el-descriptions-item><!-- 会员等级 -->
           <el-descriptions-item class="bonus-item" label="Welcome Bonus">{{newData.ORI_BONUS_TG.value}}</el-descriptions-item><!-- 销售奖金 -->
-          <el-descriptions-item class="bonus-item" label="业绩奖金">{{newData.ORI_BONUS_QY.value}}</el-descriptions-item><!-- 业绩奖金 -->
+<!--          <el-descriptions-item class="bonus-item" label="业绩奖金">{{newData.ORI_BONUS_QY.value}}</el-descriptions-item>&lt;!&ndash; 业绩奖金 &ndash;&gt;-->
           <el-descriptions-item class="bonus-item" label="Director Bonus">{{newData.ORI_BONUS_BS_MNT.value}}</el-descriptions-item><!-- 管理奖金 -->
           <el-descriptions-item class="bonus-item" label="Team Bonus">{{newData.ORI_BONUS_BS_ABBR.value}}</el-descriptions-item><!-- 绩效奖金 -->
           <el-descriptions-item class="bonus-item" label="Quarter Pool Bank(GPB)">{{newData.ORI_BONUS_QUARTER.value}}</el-descriptions-item><!-- 季度分红 -->

frontendEle/src/views/config/receive-address-list.vue

@@ -6,9 +6,9 @@
         <el-table-column label="Phone number" prop="MOBILE" width="150"></el-table-column><!-- 手机号码 -->
         <el-table-column label="Detailed address" prop="ADDRESS" ></el-table-column><!-- 详细地址 -->
         <el-table-column label="City" prop="CITY_NAME" width="150"></el-table-column>
-        <el-table-column label="Local Government Area" prop="LGA_NAME" width="150"></el-table-column>
+        <el-table-column label="Local Government Area" prop="LGA_NAME" width="180"></el-table-column>
         <el-table-column label="State" prop="PROVINCE_NAME" width="150"></el-table-column>
-        <el-table-column label="是否默认" width="100">
+        <el-table-column label="Default" width="100">
           <template slot-scope="scope">
             {{scope.row.IS_DEFAULT === '1' ? 'YES' : 'NO'}}<!-- 是：否 -->
           </template>

frontendEle/src/views/finance/recharge.vue

@@ -14,7 +14,7 @@
 <!--                    </el-table-column>-->
                     <el-table-column label="CURRENCY" prop="CURRENCY" width="100px"><!--货币名称-->
                     </el-table-column>
-                    <el-table-column label="充值金额" prop="AMOUNT" width="150px">
+                    <el-table-column label="AMOUNT" prop="AMOUNT" width="150px">
                     </el-table-column>
 
                     <el-table-column label="Recharge status name" width="200px"><!-- 充值状态名称 -->
@@ -23,7 +23,7 @@
                       </template>
                     </el-table-column>
 
-                    <el-table-column label="动作">
+                    <el-table-column label="ACTIONS">
                       <template slot-scope="scope">
                         <template v-if="scope.row.RECHARGE_STATUS==0">
                           <el-button type="primary" plain>去支付</el-button>

frontendEle/src/views/finance/withdraw.vue

@@ -3,25 +3,25 @@
     <div class="white-box">
       <leo-filter :filter="handleFilter" :dateRangePickerDisplay="false" :dateMonthPickerDisplay="true"></leo-filter>
       <el-table class="withdraw-table" ref="multipleTable" :data="tableData" stripe style="width: 100%;">
-        <el-table-column label="Member Code"><!-- 会员编号 -->
+        <el-table-column label="Member Code" width="120"><!-- 会员编号 -->
           <template slot-scope="scope">
             {{scope.row.USER_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="Member Name"><!-- 会员姓名 -->
+        <el-table-column label="Member Name" width="120"><!-- 会员姓名 -->
           <template slot-scope="scope">
             {{scope.row.REAL_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="Withdrawal way"><!-- 提现方式 -->
+        <el-table-column label="Withdrawal way" width="140"><!-- 提现方式 -->
           <template slot-scope="scope">
             {{scope.row.IS_AUTO_WITHDRAW==='1'?'Automatic withdrawal':'Manual withdrawal'}}<!-- 自动体现：手动体现 -->
           </template>
         </el-table-column>
-        <el-table-column label="Cash withdrawal amount" prop="AMOUNT"></el-table-column><!-- 提现金额 -->
-        <el-table-column label="Service charge" prop="FEES"></el-table-column><!-- 手续费 -->
-        <el-table-column label="Actual amount" prop="REAL_AMOUNT"></el-table-column><!-- 实际到账金额 -->
-        <el-table-column label="Withdraw time" width="180"><!-- 提现时间 -->
+        <el-table-column label="Cash withdrawal amount" prop="AMOUNT" width="200px"></el-table-column><!-- 提现金额 -->
+        <el-table-column label="Service charge" prop="FEES" width="120"></el-table-column><!-- 手续费 -->
+        <el-table-column label="Actual amount" prop="REAL_AMOUNT" width="120"></el-table-column><!-- 实际到账金额 -->
+        <el-table-column label="Withdraw time" width="120"><!-- 提现时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}
           </template>
@@ -36,7 +36,7 @@
             <el-tag :type="tool.statusType(scope.row.REMARK)">{{scope.row.REMARK}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="Note Returned for withdrawal" width="120"><!-- 提现退回备注 -->
+        <el-table-column label="Note Returned for withdrawal" width="220"><!-- 提现退回备注 -->
           <template slot-scope="scope">
             <el-tag :type="tool.statusType(scope.row.BACK_REMARK)">{{scope.row.BACK_REMARK}}</el-tag>
           </template>
@@ -74,7 +74,7 @@
             <!--</el-button>-->
           <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column label="Reasons for payment failure" width="120"><!-- 付款失败原因 -->
+        <el-table-column label="Reasons for payment failure" width="220"><!-- 付款失败原因 -->
           <template slot-scope="scope">
             {{scope.row.PAID_FAIL_REMARK}}
           </template>

frontendEle/src/views/layout/layout.vue

@@ -17,7 +17,7 @@
               <el-dropdown-item icon="el-icon-user" @click.native="onGo('/user/index')">Personal Information</el-dropdown-item><!--个人资料-->
               <!--<el-dropdown-item icon="el-icon-message" @click.native="onGo('/message/list')">站内信</el-dropdown-item>-->
 <!--              <el-dropdown-item icon="el-icon-setting" @click.native="onGo('/config/base')">个人设置</el-dropdown-item>-->
-              <el-dropdown-item icon="el-icon-switch-button" @click.native="onLogout">Logging Out</el-dropdown-item><!--安全退出-->
+              <el-dropdown-item icon="el-icon-switch-button" @click.native="onLogout">Log Out</el-dropdown-item><!--安全退出-->
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -68,7 +68,7 @@
           </li>
         </ul>
         <div style="text-align: right">
-          <el-button type="text" @click.native="onLogout">Logging Out</el-button><!--安全退出-->
+          <el-button type="text" @click.native="onLogout">Log Out</el-button><!--安全退出-->
         </div>
       </el-header>
       <div :class="'breadcrumb-box '+menuClass">