Merge branch 'master' into zx-dev

backendApi/modules/v1/models/lists/bonus/FlowBonusList.php

@@ -99,15 +99,15 @@ class FlowBonusList extends \common\libs\dataList\DataList implements DataListIn
                         'tag' => ['type' => 'warning', 'size' => 'small', 'class' => 'no-border']
                     ],
                 ],
-                'LAST_EMP_LV_NAME' => [
-                    'header' => 'Rank',//聘级
-                    'headerOther' => [
-                        'width' => '130',
-                    ],
-                    'valueOther' => [
-                        'tag' => ['type' => 'warning', 'size' => 'small', 'class' => 'no-border']
-                    ],
-                ],
+//                'LAST_EMP_LV_NAME' => [
+//                    'header' => 'Rank',//聘级
+//                    'headerOther' => [
+//                        'width' => '130',
+//                    ],
+//                    'valueOther' => [
+//                        'tag' => ['type' => 'warning', 'size' => 'small', 'class' => 'no-border']
+//                    ],
+//                ],
 //                'LAST_STATUS_NAME' => [
 //                    'header' => '会员状态',
 //                    'headerOther' => ['width' => '110'],

backendEle/src/App.vue

@@ -18,4 +18,18 @@ export default {
     padding: 0;
     background: #f4f6f8;
   }
+  .el-table__body-wrapper::-webkit-scrollbar {
+    width: 12px; /*滚动条宽度*/
+    height: 10px; /*滚动条高度*/
+  }
+  .el-table__body-wrapper::-webkit-scrollbar-track {
+    border-radius: 10px; /*滚动条的背景区域的圆角*/
+    -webkit-box-shadow: inset 0 0 15px rgba(238,238,238, 0.3);
+    background-color: #eeeeee; /*滚动条的背景颜色*/
+  }
+  .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    border-radius: 10px; /*滚动条的圆角*/
+    -webkit-box-shadow: inset 0 0 15px rgba(145, 143, 0143, 0.3);
+    background-color: rgb(145, 143, 143); /*滚动条的背景颜色*/
+  }
 </style>

backendEle/src/views/bonus/cf-lx-audit-list.vue

@@ -118,7 +118,7 @@
       handleMuli(command) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请选择要操作的记录',
+            message: 'Select the record to operate on', // '请选择要操作的记录',
             type: 'warning'
           })
           return;

backendEle/src/views/bonus/resend-qy-audit-list.vue

@@ -98,7 +98,7 @@ export default {
     handleMuli(command) {
       if (this.multipleSelection.length < 1) {
         this.$message({
-          message: '请选择要操作的记录',
+          message: 'Select the record to operate on', // '请选择要操作的记录',
           type: 'warning'
         })
         return;

backendEle/src/views/finance/perf-audit-list.vue

@@ -216,7 +216,7 @@
       handleMuli(command) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请选择要操作的记录',
+            message: 'Select the record to operate on', // '请选择要操作的记录',
             type: 'warning'
           })
           return;

backendEle/src/views/finance/withdraw.vue

@@ -74,9 +74,9 @@
                   Return <!-- 设为提现退回 -->
                 </el-dropdown-item>
                 <el-dropdown-item command="status"
-                                  @click.native="handleStatusShow(scope.row, 7, '该会员已提供发票，请确认是否处理提现退回？', 'Note on withdrawal return')"
+                                  @click.native="handleStatusShow(scope.row, 7, 'The member has provided the invoice, please confirm whether to process the withdrawal return?', 'Note on withdrawal return')"
                                   v-show="(scope.row.AUDIT_STATUS === '1'||scope.row.AUDIT_STATUS === '2'||scope.row.AUDIT_STATUS === '3') && permission.hasPermission(`finance/withdraw-status`)"><!-- 提现退回备注 -->
-                  Return <!-- 设为提现退回 -->
+                  Return <!-- 该会员已提供发票，请确认是否处理提现退回 --> <!-- 设为提现退回 -->
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -95,26 +95,26 @@
             <el-dropdown-item command="7">Batch return</el-dropdown-item> <!-- 批量退回 -->
           </el-dropdown-menu>
           <el-dropdown-menu v-else-if="filterStatus==='2'" slot="dropdown">
-            <el-dropdown-item command="3">批量设为待付款</el-dropdown-item>
+            <el-dropdown-item command="3">Batch set to be paid</el-dropdown-item><!-- 批量设为待付款 -->
           </el-dropdown-menu>
           <el-dropdown-menu v-else-if="filterStatus==='3'" slot="dropdown">
-            <el-dropdown-item command="6">批量设为已付款</el-dropdown-item>
-            <el-dropdown-item command="7">批量退回</el-dropdown-item>
+            <el-dropdown-item command="6">Batch set paid</el-dropdown-item><!--批量设为已付款-->
+            <el-dropdown-item command="7">Batch return</el-dropdown-item><!--批量退回-->
           </el-dropdown-menu>
           <el-dropdown-menu v-else-if="filterStatus==='6'" slot="dropdown">
-            <el-dropdown-item command="4">批量设为付款失败</el-dropdown-item>
+            <el-dropdown-item command="4">Batch set payment failure</el-dropdown-item><!--批量设为付款失败-->
           </el-dropdown-menu>
           <el-dropdown-menu v-else-if="filterStatus==='4'" slot="dropdown">
-            <el-dropdown-item command="3">批量设为待付款</el-dropdown-item>
+            <el-dropdown-item command="3">Batch set to be paid</el-dropdown-item><!-- 批量设为待付款 -->
           </el-dropdown-menu>
         </el-dropdown>
 
         <el-button type="success" size="small" @click="handleExport"
                    v-show="permission.hasPermission(`finance/transfer-list-export`)">Export Excel
         </el-button>
-        <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange"
+        <pagination :total="totalCount" :page_size="pageSize" :page_sizes="pageSizes" @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"></pagination>
-        <el-dialog title="修改提现信息" :visible.sync="dialogEditFormVisible">
+        <el-dialog title="modify the withdrawal information" :visible.sync="dialogEditFormVisible">
           <el-form :model="form" label-width="150px" style="width:500px;" v-loading="dialogEditLoading">
             <el-form-item label="会员编号">
               <el-input v-model="form.baseInfo.USER_NAME" :disabled="true"></el-input>
@@ -134,7 +134,7 @@
             <el-form-item label="提现金额">
               <el-input v-model="form.amount" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="Estimated date of payment"> <!-- 预计付款日期 -->
+            <el-form-item label="Estimated date of payment" label-width="180"> <!-- 预计付款日期 -->
               <el-date-picker
                       v-model="form.planPaidAt"
                       type="date"
@@ -152,13 +152,13 @@
             <el-button @click="dialogEditFormVisible = false">Cancel<!-- 取 消 --></el-button>
             <el-button type="primary" @click.native="handleEdit">Edit<!-- 修 改 --></el-button>
           </div>
-        </el-dialog>
+        </el-dialog><!--修改提现信息-->
         <el-dialog title="Review withdrawal info" :visible.sync="dialogAuditFormVisible"> <!-- 审核提现信息 -->
           <el-alert
                   :title="auditForm.auditTips"
                   type="warning" :closable="false">
           </el-alert>
-          <el-form :model="auditForm" label-width="150px" style="width:500px;" v-loading="dialogAuditLoading">
+          <el-form :model="auditForm" label-width="180px" style="width:500px;" v-loading="dialogAuditLoading">
             <el-form-item label="Estimated date of payment" v-show="filterStatus==='2' || filterStatus==='4'"> <!-- 预计付款日期 -->
               <el-date-picker
                       v-model="auditForm.planPaidAt"
@@ -219,6 +219,7 @@ export default {
       totalPages: 1,
       totalCount: 1,
       pageSize: 20,
+      pageSizes:  [1, 2, 5, 10, 20, 50, 100],
       tool: tool,
       permission: permission,
       regTypes: baseInfo.regTypes(),
@@ -318,7 +319,7 @@ export default {
     handleMuli (command) {
       if (this.multipleSelection.length < 1) {
         this.$message({
-          message: '请选择要操作的记录',
+          message: 'Select the record to operate on', // 请选择要操作的记录
           type: 'warning'
         })
         return;
@@ -328,15 +329,15 @@ export default {
     handleAudit (row = null, status) {
       let title = ''
       if (status === '2') {
-        title = '确定要通过审核？备注：'
+        title = 'Be sure to pass the review？Note：'// 确定要通过审核？备注：
       }else if(status === '3') {
-        title = '确定要设为待付款？备注：'
+        title = 'Be sure to unpaid the review？Note：'// 确定要设为待付款？备注：
       }else if(status === '4') {
-        title = '确定要设为付款失败？备注：'
+        title = 'Be sure to payment failure the review？Note：'// 确定要设为付款失败？备注：
       }else if(status === '6') {
-        title = '确定要设为已付款？备注：'
+        title = 'Be sure to paid the review？Note：'// 确定要设为已付款？备注：
       }else if(status === '7') {
-        title = '确定要设为已退回？备注：'
+        title = 'Be sure to return the review？Note：'//确定要设为已退回？备注：
       }
       this.handleStatusShow(row,status,title);
     },
@@ -354,8 +355,8 @@ export default {
         filterData.selectedIds = selectedIds
       }
       this.$confirm('Are you sure you want to export the current data？', 'Hint', {
-        confirmButtonText: 'confirm', // 确定
-        cancelButtonText: 'cancel', // 取消
+        confirmButtonText: 'Confirm', // 确定
+        cancelButtonText: 'Cancel', // 取消
         type: 'warning'
       }).then(() => {
         return network.getData('finance/withdraw-export', filterData)
@@ -388,7 +389,7 @@ export default {
     handleEdit () {
       this.dialogEditFormVisible = false
       this.$message({
-        message: '正在修改数据',
+        message: 'Modifying data',//正在修改数据
         type: 'info'
       })
       this.loading = true
@@ -420,7 +421,7 @@ export default {
       }
       if (this.auditForm.selectedIds.length === 0) {
         this.$message({
-          message: '请选择数据',
+          message: 'Select the record to operate on',// 请选择数据
           type: 'warning'
         })
         return
@@ -434,8 +435,8 @@ export default {
       network.postData('finance/mult-point', {opType: 2}).then(response => {
         this.auditForm.withdrawAudit = response.withdrawAudit
         this.$confirm('Are you sure to change the state of the selected data?', 'Hint', { // 确定要对所选数据修改状态吗？
-          confirmButtonText: 'confirm', // 确定
-          cancelButtonText: 'cancel', // 取消
+          confirmButtonText: 'Confirm', // 确定
+          cancelButtonText: 'Cancel', // 取消
           type: 'warning'
         }).then(() => {
           return network.postData('finance/withdraw-status', this.auditForm)

backendEle/src/views/reconsume/change-audit-list.vue

@@ -204,7 +204,7 @@
       handleMuli(command) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请选择要操作的记录',
+            message: 'Select the record to operate on', // '请选择要操作的记录',
             type: 'warning'
           })
           return;

backendEle/src/views/user/reg-info-audit.vue

@@ -401,7 +401,7 @@
       handleMuli(command) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请选择要操作的记录',
+            message: 'Select the record to operate on', // '请选择要操作的记录',
             type: 'warning'
           })
           return;

backendEle/src/views/user/status-audit-list.vue

@@ -158,7 +158,7 @@
       handleMuli(command) {
         if (this.multipleSelection.length < 1) {
           this.$message({
-            message: '请选择要操作的记录',
+            message: 'Select the record to operate on', // '请选择要操作的记录',
             type: 'warning'
           })
           return;

common/helpers/user/Balance.php

@@ -269,8 +269,9 @@ class Balance {
             $periodNum = $params['PERIOD_NUM'];
         }
         $calcYearMonth = $period->getYearMonth($periodNum);
-        // 汇率
-        $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0);
+        // TODO: 汇率
+//        $exchangeRate = floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 0);
+        $exchangeRate = 1;
         // redis加锁（防止并发余额数值不准确出错）
         switch ($type) {
             case 'BONUS':

common/models/Withdraw.php

@@ -134,7 +134,7 @@ class Withdraw extends \common\components\ActiveRecord {
             'CREATED_AT' => '创建时间',
             'UPDATED_AT' => '修改时间',
             'AUDITED_AT' => '审核时间',
-            'PLAN_PAID_AT' => '预计付款时间',
+            'PLAN_PAID_AT' => 'Estimated time of payment',  // 预计付款时间
             'PAID_AT' => '付款时间',
             'PAID_FAIL_REMARK' => '付款失败备注',
             'PAID_FAIL_AT' => '付款失败时间',

frontendApi/config/menu.php

@@ -83,7 +83,7 @@ return [
            // ['name'=>'房产积分', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'fc-point', 'routePath'=>'bonus/fc-point', 'show'=>1,],
 //            ['name'=>'报单中心补助明细查询', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-bt', 'routePath'=>'bonus/flow-bt', 'show'=>1,],
 //            ['name'=>'报单中心货补追溯', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-fl', 'routePath'=>'bonus/trace-fl', 'show'=>1,],
-            ['name'=>'Withdrawal details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>1,],//提现明细
+            ['name'=>'Withdrawal details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>0,],//提现明细
             ['name'=>'申请提现', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-add', 'routePath'=>'finance/withdraw-add', 'show'=>0,],
             ['name'=>'Recharge details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,],//充值明细
             ['name'=>'Apply for recharge', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-add', 'routePath'=>'finance/recharge-add', 'show'=>0,], // 申请充值

frontendApi/modules/v1/controllers/DashboardController.php

@@ -123,7 +123,7 @@ class DashboardController extends BaseController
             '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'=>'Period '.$periodNum.' ，'.$curYM['CALC_MONTH'].'月第'.$wkrd.'周，共'.$weeks.'周',
-            'periodNum'=>$periodNum.' ，'.$wkrd.' period  of '. $monthArray[$curYM['CALC_MONTH']],
+            'periodNum'=>$periodNum.' ，'.$wkrd.' PC of '. $monthArray[$curYM['CALC_MONTH']],
             'myRemainPv'=>$totalRemainPv,
             'activeEnd'=>$activeEnd
         ]);

frontendEle/src/App.vue

@@ -18,4 +18,18 @@ export default {
     padding: 0;
     background: #f4f6f8;
   }
+  .el-table__body-wrapper::-webkit-scrollbar {
+    width: 12px; /*滚动条宽度*/
+    height: 10px; /*滚动条高度*/
+  }
+  .el-table__body-wrapper::-webkit-scrollbar-track {
+    border-radius: 10px; /*滚动条的背景区域的圆角*/
+    -webkit-box-shadow: inset 0 0 15px rgba(238,238,238, 0.3);
+    background-color: #eeeeee; /*滚动条的背景颜色*/
+  }
+  .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    border-radius: 10px; /*滚动条的圆角*/
+    -webkit-box-shadow: inset 0 0 15px rgba(145, 143, 0143, 0.3);
+    background-color: rgb(145, 143, 143); /*滚动条的背景颜色*/
+  }
 </style>

frontendEle/src/views/dashboard/index.vue

@@ -17,7 +17,7 @@
                   :key="key" v-if="myEmpLv['ICON_TYPE']>0">-->
               </el-col><!--聘级-->
               <el-col :xs="24" :sm="24" :md="24" :lg="4" :xl="12">Member Level：{{decLvName}}</el-col><!--会员级别-->
-              <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="12">Current Period：{{periodNum}}</el-col><!--当前业绩期-->
+              <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="12">Current Pay Cycle：{{periodNum}}</el-col><!--当前业绩期-->
               <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="12">Remain BV：{{myRemainPv}}</el-col><!--剩余的PV-->
               <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="12">Active Deadline Date：{{activeEnd}}</el-col><!--活跃日期截止-->
             </el-row>