菜单页面调整

frontendApi/config/menu.php

@@ -135,7 +135,7 @@ return [
         'show'=>1,
         'child'=>[
 //            ['name'=>'个人设置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'base', 'routePath'=>'config/base', 'show'=>1,],
-            ['name'=>'Receiving address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1,],//收货地址管理
+            ['name'=>'Shipping Address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1,],//收货地址管理
         ]
     ],
 ];

frontendApi/modules/v1/controllers/BonusController.php

@@ -74,8 +74,8 @@ class BonusController extends BaseController {
         $wallet[] = ['walletType' => 'cash', 'walletName' => 'Member balance', 'amount' => Tool::formatPrice($data['CASH'])];//会员余额
 //        $wallet[] = ['walletType' => 'point', 'walletName' => '会员积分', 'amount' => Tool::formatPrice($data['RECONSUME_POINTS'])];
         $wallet[] = ['walletType' => 'exchange', 'walletName' => 'Exchange points', 'amount' => Tool::formatPrice($data['EXCHANGE_POINTS'])];//兑换点数
-        $wallet[] = ['walletType' => 'travel_points', 'walletName' => 'Travel bonus', 'amount' => Tool::formatPrice($data['TOURISM_POINTS'])];//旅游积分
-        $wallet[] = ['walletType' => 'car_points', 'walletName' => 'Car House bonus', 'amount' => Tool::formatPrice($data['GARAGE_POINTS'])];//名车积分
+        $wallet[] = ['walletType' => 'tourism_points', 'walletName' => 'Travel points', 'amount' => Tool::formatPrice($data['TOURISM_POINTS'])];//旅游积分
+        $wallet[] = ['walletType' => 'garage_points', 'walletName' => 'Car/Villa points', 'amount' => Tool::formatPrice($data['GARAGE_POINTS'])];//名车积分
 //        if ($showCFLX) {
 //            $wallet[] = ['walletType' => 'cf', 'walletName' => '福利积分一', 'amount' => Tool::formatPrice($data['CF'])];
 //            $wallet[] = ['walletType' => 'lx', 'walletName' => '福利积分二', 'amount' => Tool::formatPrice($data['LX'])];

frontendApi/modules/v1/controllers/FinanceController.php

@@ -218,6 +218,7 @@ class FinanceController extends BaseController {
             'content' => $oneData['CONTENT'] ?? '',
             'withdrawFee'=>$fee,
             'minAmount' => $minAmount,
+            'exchangeRate' => floatval(Cache::getSystemConfig()['exchangeRate']['VALUE'] ?? 1),
         ]);
     }
 

frontendEle/src/router/index.js

@@ -502,7 +502,7 @@ export const constantRouterMap = [
         component: _import('config/receive-address-list'),
         name: 'config_receive-address-list',
         meta: {
-          title: 'Receiving address',//收货地址管理
+          title: 'Shipping Address',//收货地址管理
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
             {title: 'Setting', path: '/config/base'},//设置
@@ -519,7 +519,7 @@ export const constantRouterMap = [
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
             {title: 'Setting', path: '/config/base'},//设置
-            {title: 'Receiving address', path: '/config/receive-address-list'},//收货地址管理
+            {title: 'Shipping Address', path: '/config/receive-address-list'},//收货地址管理
           ],
         },
       },
@@ -533,7 +533,7 @@ export const constantRouterMap = [
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
             {title: 'Setting', path: '/config/base'},//设置
-            {title: 'Receiving address', path: '/config/receive-address-list'},//收货地址管理
+            {title: 'Shipping Address', path: '/config/receive-address-list'},//收货地址管理
           ],
         },
       },

frontendEle/src/views/bonus/other.vue

@@ -14,10 +14,10 @@
         </el-table-column>
         <el-table-column label="Quarter Pool Bank(GPB)" prop="ORI_BONUS_QUARTER.value" width="190px"><!-- 季度分红 -->
         </el-table-column>
-        <el-table-column label="Travel" prop="BONUS_TOURISM.value"><!-- 旅游奖 -->
-        </el-table-column>
-        <el-table-column label="Car House" prop="BONUS_GARAGE.value"><!-- 豪宅奖 -->
-        </el-table-column>
+<!--        <el-table-column label="Travel" prop="BONUS_TOURISM.value">&lt;!&ndash; 旅游奖 &ndash;&gt;-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="Car/Villa" prop="BONUS_GARAGE.value">&lt;!&ndash; 豪宅奖 &ndash;&gt;-->
+<!--        </el-table-column>-->
         <el-table-column label="Total bonus" prop="BONUS_TOTAL.value" width="100"><!-- 合计 -->
         </el-table-column>
         <el-table-column label="Actual bonus" prop="BONUS_REAL.value" width="110"><!-- 实发 -->
@@ -40,8 +40,8 @@
           <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><!-- 季度分红 -->
-          <el-descriptions-item class="bonus-item" label="Travel">{{newData.BONUS_TRAVEL.value}}</el-descriptions-item><!-- 旅游奖 -->
-          <el-descriptions-item class="bonus-item" label="Car House">{{newData.BONUS_GARAGE.value}}</el-descriptions-item><!-- 车房奖 -->
+<!--          <el-descriptions-item class="bonus-item" label="Travel">{{newData.BONUS_TRAVEL.value}}</el-descriptions-item>&lt;!&ndash; 旅游奖 &ndash;&gt;-->
+<!--          <el-descriptions-item class="bonus-item" label="Car House">{{newData.BONUS_GARAGE.value}}</el-descriptions-item>&lt;!&ndash; 车房奖 &ndash;&gt;-->
           <el-descriptions-item class="bonus-item" label="Total bonus">{{newData.BONUS_TOTAL.value}}</el-descriptions-item><!-- 合计 -->
 
           <el-descriptions-item class="bonus-item" label="Actual bonus">{{newData.BONUS_REAL.value}}</el-descriptions-item><!-- 实发奖金 -->

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

@@ -4,7 +4,7 @@
       <el-table class="table-box" ref="multipleTable" :data="tableData" stripe style="width: 100%;">
         <el-table-column label="Consignee" prop="CONSIGNEE" width="150"></el-table-column><!-- 收货人 -->
         <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="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="180"></el-table-column>
         <el-table-column label="State" prop="PROVINCE_NAME" width="150"></el-table-column>
@@ -13,11 +13,11 @@
             {{scope.row.IS_DEFAULT === '1' ? 'YES' : 'NO'}}<!-- 是：否 -->
           </template>
         </el-table-column>
-        <el-table-column fixed="right" label="operation" width="180"><!-- 操作 -->
+        <el-table-column fixed="right" label="Edit/Delete" width="180"><!-- 操作 -->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
-                Operate on this data<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
+                Edit/Delete<!-- 操作该数据 --><i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="edit" @click.native="handleUpdate(scope.row)">Edit<!-- 编辑 --></el-dropdown-item>

frontendEle/src/views/finance/withdraw-add.vue

@@ -2,8 +2,8 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-form ref="form" :model="form" label-width="200px" style="width:500px;">
-        <el-form-item label="Currently available bonus"><!-- 当前可用奖金 -->
-          <el-tag type="success">{{balance}}$</el-tag>
+        <el-form-item label="Available bonus"><!-- 当前可用奖金 -->
+          <el-tag type="success">{{balance}} </el-tag>
         </el-form-item>
         <!--<el-form-item label="当前提现比例">-->
           <!--<el-tag type="info">{{withdrawProp}}%</el-tag>-->
@@ -12,18 +12,18 @@
           <!--<el-tag type="info">{{maxAmount}}元</el-tag>-->
         <!--</el-form-item>-->
         <el-form-item label="Minimum withdrawal amount"><!-- 最小提现金额 -->
-          <el-tag type="info">{{minAmount}}$</el-tag>
+          <el-tag type="info">{{minAmount}}</el-tag>
         </el-form-item>
-        <el-form-item label="Withdrawal charge"><!-- 提现手续费 -->
-          <el-tag type="info">{{withdrawFee}}%</el-tag>
-        </el-form-item>
-        <el-form-item label="Cash withdrawal amount"><!-- 提现金额 -->
+<!--        <el-form-item label="Withdrawal charge">&lt;!&ndash; 提现手续费 &ndash;&gt;-->
+<!--          <el-tag type="info">{{withdrawFee}}%</el-tag>-->
+<!--        </el-form-item>-->
+        <el-form-item label="Withdrawal Amount"><!-- 提现金额 -->
           <el-input v-model="form.applyAmount" type="number" :min="minAmount" :max="maxAmount"></el-input>
         </el-form-item>
-        <el-form-item label="" v-if="isPact==='1'">
-          <el-checkbox v-model="checked"> Agreed to</el-checkbox><!-- 同意 -->
-          <a @click="dialogVisible = true" href="javascript:void(0)">《Service contract》</a><!-- 服务协议 -->
-        </el-form-item>
+<!--        <el-form-item label="" v-if="isPact==='1'">-->
+<!--          <el-checkbox v-model="checked"> Agreed to</el-checkbox>&lt;!&ndash; 同意 &ndash;&gt;-->
+<!--          <a @click="dialogVisible = true" href="javascript:void(0)">《Service contract》</a>&lt;!&ndash; 服务协议 &ndash;&gt;-->
+<!--        </el-form-item>-->
         <el-form-item>
           <el-button type="primary" @click="onSubmit" :loading="submitButtonStat" :disabled="!checked">Confirm</el-button><!-- 确定 -->
         </el-form-item>
@@ -94,6 +94,7 @@
         minAmount: 0,
         withdrawFee: 0,
         idCardInfoQrCodeUrl:'',
+        exchangeRate: 1,
       }
     },
     methods: {
@@ -111,7 +112,7 @@
           this.isPact = response.isPact
           this.checked=this.chkAgree()
           this.content = response.content
-          this.minAmount = response.minAmount
+          this.minAmount = Math.round(response.minAmount * response.exchangeRate * 100) / 100
           this.withdrawFee = response.withdrawFee
             this.getBalance()
         }).catch(() => {

frontendEle/src/views/finance/withdraw.vue

@@ -18,30 +18,30 @@
             {{scope.row.IS_AUTO_WITHDRAW==='1'?'Automatic withdrawal':'Manual withdrawal'}}<!-- 自动体现：手动体现 -->
           </template>
         </el-table-column>
-        <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"><!-- 提现时间 -->
+        <el-table-column label="Withdrawal Amount" prop="AMOUNT" width="200px"></el-table-column><!-- 提现金额 -->
+<!--        <el-table-column label="Service charge" prop="FEES" width="120"></el-table-column>&lt;!&ndash; 手续费 &ndash;&gt;-->
+<!--        <el-table-column label="Actual amount" prop="REAL_AMOUNT" width="120"></el-table-column>&lt;!&ndash; 实际到账金额 &ndash;&gt;-->
+        <el-table-column label="Date" width="120"><!-- 提现时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}
           </template>
         </el-table-column>
-        <el-table-column label="Withdraw state" width="120"><!-- 提现状态 -->
+        <el-table-column label="Status" width="120"><!-- 提现状态 -->
           <template slot-scope="scope">
             <el-tag :type="tool.statusType(scope.row.AUDIT_STATUS)">{{scope.row.STATUS_NAME}}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="Note" width="120"><!-- 备注 -->
+        <el-table-column label="Remark" width="120"><!-- 备注 -->
           <template slot-scope="scope">
             <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="220"><!-- 提现退回备注 -->
+        <el-table-column label="Remark 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>
         </el-table-column>
-        <el-table-column label="Payment time" width="180"><!-- 付款时间 -->
+        <el-table-column label="Date" width="180"><!-- 付款时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.PAID_AT)}}
           </template>

frontendEle/src/views/shop/dec-order-list.vue

@@ -11,7 +11,7 @@
                 <el-table-column width="120" label="Order code" prop="ORDER_SN"></el-table-column><!--订单编号-->
                 <el-table-column width="120" label="Member code" prop="USER_NAME"></el-table-column><!--会员编号-->
                 <el-table-column width="120" label="Menber name" prop="REAL_NAME"></el-table-column><!--会员姓名-->
-                <el-table-column width="150" label="Receiving address" prop="ADDRESS"></el-table-column><!--收货地址-->
+                <el-table-column width="150" label="Shipping Address" prop="ADDRESS"></el-table-column><!--收货地址-->
                 <el-table-column width="120" label="Sponsor code" prop="CON_USER_NAME"></el-table-column><!--接点人编号-->
                 <el-table-column width="150" label="Created time"><!--创建时间-->
                     <template slot-scope="scope">

frontendEle/src/views/shop/order-list.vue

@@ -22,7 +22,7 @@
                 <el-table-column width="120" label="Member Name" prop="REAL_NAME"></el-table-column><!--会员姓名-->
                 <el-table-column width="130" label="Recipient name" prop="CONSIGNEE"></el-table-column><!--收货人-->
                 <el-table-column width="120" label="Phone number" prop="MOBILE"></el-table-column><!--收货电话-->
-                <el-table-column width="150" label="Receiving address" prop="FULL_ADDRESS"></el-table-column><!--收货地址-->
+                <el-table-column width="150" label="Shipping Address" prop="FULL_ADDRESS"></el-table-column><!--收货地址-->
                 <el-table-column label="支付方式" prop="PAY_TYPE"></el-table-column>
                 <el-table-column width="120" label="Created time" prop="PAY_AT"></el-table-column><!--支付时间-->
                 <el-table-column label="订单状态" prop="STATUS"></el-table-column>