Преглед изворни кода

修改PDF页面的那些东西

root пре 3 година
родитељ
комит
5570d0bbb0

+ 1 - 1
backendApi/config/menu.php

@@ -42,7 +42,7 @@ return [
             // 新添加的商品操作 ---stop
             ['name'=>'商品列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-list-export', 'routePath'=>'shop/goods-list-export', 'show'=>0,],
             ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
-            ['name'=>'Entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
+            ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             ['name'=>'报单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list-export', 'routePath'=>'shop/dec-order-list-export', 'show'=>0,],
             ['name'=>'order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
             ['name'=>'订单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list-export', 'routePath'=>'shop/order-list-export', 'show'=>0,],

+ 5 - 5
backendApi/modules/v1/models/lists/shop/DecOrderList.php

@@ -16,7 +16,7 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
      * @return string
      */
     public function getListName(){
-        return 'Entry list';//报单列表
+        return 'Welcome Pack Listing';//报单列表
     }
 
     /**
@@ -72,11 +72,11 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                     'headerOther' => ['width' => '150'],
                 ],
                 'ID_CARD' => [
-                    'header' => 'Membership id number',//会员身份证号
+                    'header' => 'Identity No.',//会员身份证号
                     'headerOther' => ['width' => '150'],
                 ],
                 'MOBILE' => [
-                    'header' => 'Member mobile Phone Number',//会员手机号
+                    'header' => 'Member Phone Number',//会员手机号
                     'headerOther' => ['width' => '150'],
                 ],
                 'DEC_LV_NAME' => [
@@ -238,8 +238,8 @@ class DecOrderList extends \common\libs\dataList\DataList implements DataListInt
                 'TO_USER_NAME'=> ['name'=> 'Entry Member code'],//被报单人
                 'REAL_NAME'=> ['name'=> 'Member name'],//会员姓名
                 'DEC_REAL_NAME'=> ['name'=> 'Entry name'],//报单中心姓名
-                'ID_CARD'=> ['name'=> 'Membership id number'],//会员身份证号
-                'MOBILE'=> ['name'=> 'Member mobile Phone Number'],//会员手机号
+                'ID_CARD'=> ['name'=> 'Identity No.'],//会员身份证号
+                'MOBILE'=> ['name'=> 'Member Phone Number'],//会员手机号
                 'DEC_LV_NAME'=> ['name'=> 'Member Levels', 'other'=> 'decLevel'],//会员级别
                 'DEC_AMOUNT'=> ['name'=> 'Entry amount'],//报单金额
                 'DEC_PV'=> ['name'=> 'Entry BV'],//报单BV

+ 2 - 2
backendApi/modules/v1/models/lists/user/IndexList.php

@@ -214,7 +214,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                 'ID_TYPE' => [
                     'header' => 'Document type',//证件类型
                     'value' => function($row) {
-                        return $row['ID_TYPE'] == 0 ? 'ID' : '';//'身份证' : ''
+                        return $row['ID_TYPE'] == 0 ? 'Identity No.' : '';//'身份证' : ''
                     },
                 ],
                 'ID_CARD' => [
@@ -250,7 +250,7 @@ class IndexList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '120'],
                 ],
                 'TEL' => [
-                    'header' => 'Alternate mobile number',//备用手机号码
+                    'header' => 'Alternate Phone number​',//备用手机号码
                     'value' => function($row) {
                         return "\t".$row['TEL'];
                     },

+ 1 - 1
backendEle/src/router/index.js

@@ -46,7 +46,7 @@ export const constantRouterMap = [
         component: _import('shop/dec-order-list'),
         name: 'shop_dec-order-list',
         meta: {
-          title: 'Entry list',//报单列表
+          title: 'Welcome Pack Listing',//报单列表
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
             {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理

+ 1 - 1
backendEle/src/views/user/index.vue

@@ -215,7 +215,7 @@
         <el-form-item label="Member name"><!-- 会员姓名 -->
           <el-input v-model="formModifyProfile.realName"></el-input>
         </el-form-item>
-        <el-form-item label="ID"><!-- 身份证号 -->
+        <el-form-item label="Identity No."><!-- 身份证号 -->
           <el-input v-model="formModifyProfile.idCard"></el-input>
         </el-form-item>
         <el-form-item label="phone number"><!-- 手机号 -->

+ 3 - 3
backendEle/src/views/user/user-add-opt.vue

@@ -89,7 +89,7 @@
             <el-form-item>
               <template slot="label">
                 <span class="text-danger">*</span>
-                ID<!-- 身份证号 -->
+                Identity No.<!-- 身份证号 -->
               </template>
               <el-input v-model="form.idCard" maxlength="18" @change="handleChkBirth"></el-input>
             </el-form-item>
@@ -125,13 +125,13 @@
                   </el-date-picker>
                 </el-form-item>
 
-                <el-form-item label="Alternate mobile number" v-show="false"><!-- 备用手机号 -->
+                <el-form-item label="Alternate Phone number​" v-show="false"><!-- 备用手机号 -->
                   <el-input v-model="form.tel" maxlength="11"></el-input>
                 </el-form-item>
 
                 <div class="hr-tip"><span>Bank information<!-- 银行信息 --></span></div>
 
-                <el-form-item label="Bank of deposit"><!-- 开户行 -->
+                <el-form-item label="Bank Name"><!-- 开户行 -->
                   <el-select v-model="form.openBank" placeholder="Please select the Bank of deposit"><!-- 请选择开户行 -->
                     <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                                :value="item.BANK_CODE"></el-option>

+ 1 - 1
common/models/ShopGoods.php

@@ -35,7 +35,7 @@ class ShopGoods extends \common\components\ActiveRecord
     const SALE_TYPE = [
         1 => [
             'id' => 1,
-            'name' => 'Balance payment', //余额购买
+            'name' => 'Account Balance', //余额购买
             'label' => 'cash',
         ],
 //        2 => [

+ 1 - 1
common/models/forms/AdminAddUserForm.php

@@ -107,7 +107,7 @@ class AdminAddUserForm extends Model {
             'idCard' => 'ID',//身份证号
             'mobile' => 'phone number',//手机号
             'address' => 'address',//地址
-            'openBank' => 'Bank of deposit',//开户行
+            'openBank' => 'Bank Name',//开户行
             'bankAddress' => 'Account opening sub branch',//开户支行
             'bankNo' => 'bank account',//银行账号
             'bankAreaSelected' => 'Banking region',//银行地区

+ 1 - 1
common/models/forms/DeclarationForm.php

@@ -159,7 +159,7 @@ class DeclarationForm extends Model
             'recUid' => 'Pioneer member ID',//'开拓人会员ID
             'location' => 'market',//市场
             'consignee' => 'consignee',//收货人
-            'acceptMobile' => 'Consignee is mobile phone',//收货人手机
+            'acceptMobile' => 'Consignee is phone number',//收货人手机
             'province' => 'Receiving Province',//收货省
             'city' => 'Receiving City',//收货市
             'county' => 'Receiving area / county',//收货区县

+ 3 - 3
frontendApi/config/menu.php

@@ -29,7 +29,7 @@ return [
         'child'=>[
             ['name'=>'Products list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'index', 'routePath'=>'shop/index', 'show'=>1,],//商品列表
             ['name'=>'Repeat sales products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1,'allow'=>'studio'],//复消商品
-            ['name'=>'Entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
+            ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
         ]
     ],
@@ -49,7 +49,7 @@ return [
 //            ['name'=>'点位绑定编辑', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'bind-edit', 'routePath'=>'user/bind-edit', 'show'=>0,],
             ['name'=>'Reset Password', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'password', 'routePath'=>'user/password', 'show'=>1],
             ['name'=>'Upgrade management', 'class'=>'', 'icon'=>'', 'controller'=>'upgrade', 'action'=>'dec', 'routePath'=>'user/upgrade', 'show'=>1,'allow'=>'declarer',],//升级管理
-            ['name'=>'Entry Management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer',],
+            ['name'=>'Welcome Pack management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer',],
         ]
     ],
     'atlas'=>[
@@ -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,],//收货地址管理
         ]
     ],
 ];

+ 1 - 1
frontendApi/modules/v1/controllers/ShopController.php

@@ -285,7 +285,7 @@ class ShopController extends BaseController {
      */
     public function actionReconsumeCart(){
         $userId = \Yii::$app->user->id;
-        $payList = ['cash'=>['name'=>'Balance payment'],];//余额支付
+        $payList = ['cash'=>['name'=>'Account Balance'],];//余额支付
         $userBalance = [
             'points' => 0,
             'cash' => 0

+ 5 - 5
frontendEle/src/router/index.js

@@ -47,7 +47,7 @@ export const constantRouterMap = [
                 component: _import('shop/dec-order-list'),
                 name: 'shop_dec-order-list',
                 meta: {
-                    title: 'Entry list',//报单列表
+                    title: 'Welcome Pack Listing',//报单列表
                     breadcrumb: [
                         {title: 'Dashboard', path: '/dashboard/index'},//首页
                         {title: 'Products Management', path: '/shop/dec-order-list'},//商城管理
@@ -212,7 +212,7 @@ export const constantRouterMap = [
         component: _import('user/dec'),
         name: 'user_dec',
         meta: {
-          title: ' Entry Management',//报单管理
+          title: 'Welcome Pack management',//报单管理
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
             {title: 'Member management', path: '/user/index'},//会员管理
@@ -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'},//收货地址管理
           ],
         },
       },

+ 3 - 3
frontendEle/src/views/bonus/index.vue

@@ -4,9 +4,9 @@
       <el-table class="table-box" :data="walletData" stripe style="width: 100%;">
         <el-table-column label="Account type" prop="walletName"></el-table-column><!-- 账户类型 -->
         <el-table-column label="Account balance" prop="amount"></el-table-column><!-- 账户余额 -->
-        <el-table-column label="Trading record"><!-- 交易记录 -->
+        <el-table-column label="History"><!-- 交易记录 -->
           <template slot-scope="scope">
-            <el-button type="primary" v-show="dealSwitch==1" size="small" @click.native="showFlow(scope.row.walletType,scope.row.walletName)">View Trading record</el-button><!-- 查看交易记录 -->
+            <el-button type="primary" v-show="dealSwitch==1" size="small" @click.native="showFlow(scope.row.walletType,scope.row.walletName)">View record</el-button><!-- 查看交易记录 -->
           </template>
         </el-table-column>
       </el-table>
@@ -208,4 +208,4 @@
 <style>
   .dialog-footer:after{content: '';
     clear: both;display: table;}
-</style>
+</style>

+ 3 - 3
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>

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

@@ -2,7 +2,7 @@
   <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-form-item label="Available bonus"><!-- 当前可用奖金 -->
           <el-tag type="success">{{balance}}$</el-tag>
         </el-form-item>
         <!--<el-form-item label="当前提现比例">-->
@@ -14,18 +14,18 @@
         <el-form-item label="Minimum withdrawal amount"><!-- 最小提现金额 -->
           <el-tag type="info">{{minAmount}}$</el-tag>
         </el-form-item>
-        <el-form-item label="Withdrawal charge"><!-- 提现手续费 -->
+        <!--<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>-->
+        <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>同意 
+          <a @click="dialogVisible = true" href="javascript:void(0)">《Service contract》</a>服务协议 
+        </el-form-item>-->
         <el-form-item>
-          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat" :disabled="!checked">Confirm</el-button><!-- 确定 -->
+          <el-button type="primary" @click="onSubmit" :loading="submitButtonStat" >Confirm</el-button><!-- 确定 -->
         </el-form-item>
       </el-form>
     </div>

+ 10 - 10
frontendEle/src/views/finance/withdraw.vue

@@ -13,30 +13,30 @@
             {{scope.row.REAL_NAME}}
           </template>
         </el-table-column>
-        <el-table-column label="Withdrawal way" width="140"><!-- 提现方式 -->
+       <!-- <el-table-column label="Withdrawal way" width="140"> 提现方式
           <template slot-scope="scope">
-            {{scope.row.IS_AUTO_WITHDRAW==='1'?'Automatic withdrawal':'Manual withdrawal'}}<!-- 自动体现:手动体现 -->
+            {{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>-->
+        <el-table-column label="Withdrawal Amoun" 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="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="Note" width="220"><!-- 提现退回备注 -->
           <template slot-scope="scope">
             <el-tag :type="tool.statusType(scope.row.BACK_REMARK)">{{scope.row.BACK_REMARK}}</el-tag>
           </template>

+ 1 - 1
frontendEle/src/views/shop/index.vue

@@ -46,7 +46,7 @@
                 </el-tab-pane>
             </el-tabs>
             <div class="white-box-footer">
-                <el-button @click="goToAccounts()">Settle accounts</el-button><!--去结算-->
+                <el-button @click="goToAccounts()">Check Out​</el-button><!--去结算-->
                 <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
             </div>
         </div>

+ 1 - 1
frontendEle/src/views/shop/order.vue

@@ -126,7 +126,7 @@
                 </div>
 
                 <div>
-                    <el-button type="primary" @click="goToAccounts()" :loading="submitButtonStat">Settle accounts</el-button><!--去结算-->
+                    <el-button type="primary" @click="goToAccounts()" :loading="submitButtonStat">Check Out​</el-button><!--去结算-->
                 </div>
               </div>
           </div>

+ 1 - 1
frontendEle/src/views/shop/reconsume-order.vue

@@ -138,7 +138,7 @@
                 </div>
             </div>
             <div>
-                <el-button @click="goToAccounts()" :loading="submitButtonStat">Settle accounts</el-button><!--去结算-->
+                <el-button @click="goToAccounts()" :loading="submitButtonStat">Pay​</el-button><!--去结算-->
             </div>
         </div>
     </div>

+ 1 - 1
frontendEle/src/views/shop/reconsume.vue

@@ -37,7 +37,7 @@
                 </el-table-column>
             </el-table>
             <div class="white-box-footer">
-                <el-button @click="goToAccounts()">Settle accounts</el-button><!-- 去结算 -->
+                <el-button @click="goToAccounts()">Check Out​</el-button><!-- 去结算 -->
                 <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
             </div>
         </div>

+ 19 - 19
frontendEle/src/views/user/dec.vue

@@ -1,33 +1,33 @@
 <template>
     <div v-loading="loading">
         <div class="white-box">
-            <el-form ref="form"  label-width="250px" class="form-page">
+            <el-form ref="form"  label-width="150px" class="form-page">
                 <div class="hr-tip"><span>Account Information<!--账号信息--></span></div>
 
-                <el-form-item label="Member code"><!--会员编号-->
+                <el-form-item label="New member code​"><!--会员编号-->
                     <el-input v-model="form.insertUserName"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <template slot="label">
-                        Current entry level<!--实时报单级别-->
+                        Entry level<!--实时报单级别-->
                     </template>
                     <el-select v-model="form.decLv" placeholder="Select entry level" @change="selectOne($event)">
                         <el-option v-for="(item,index) in allDecLevel" :key="index" :label="item.LEVEL_NAME"
                                    :value="item.ID"></el-option>
                     </el-select><!--请选择报单级别-->
                 </el-form-item>
-                <el-form-item label="Entry Center code"><!--报单中心编号-->
+                <el-form-item label="Stockist code"><!--报单中心编号-->
                     <el-input v-model="form.decUserName"></el-input>
                 </el-form-item>
 
 
                 <el-form-item>
                     <template slot="label">
-                        Select entry type<!--报单方式二选一-->
+                        Select Welcome Pack​<!--报单方式二选一-->
                     </template>
-                    <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 600px;">
+                    <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 1050px;">
                         <el-tab-pane name="1">
-                            <span slot="label">Select entry Kitting products</span><!--报单级别套餐-->
+                            <span slot="label">Welcome Pack</span><!--报单级别套餐-->
                             <el-table class="table-box" :data="_tableData" stripe style="width: 100%;" highlight-current-row @current-change="handleCurrentChange">
                                 <el-table-column
                                         type="index"
@@ -42,14 +42,14 @@
                         </span>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="Kit name" prop="PACKAGE_NAME"><!-- 套餐名称 -->
+                                <el-table-column label="Package Name " prop="PACKAGE_NAME"><!-- 套餐名称 -->
 
                                 </el-table-column>
-                                <el-table-column label="Kit price" prop="AMOUNT"><!-- 套餐金额 -->
+                                <el-table-column label="Price " prop="AMOUNT"><!-- 套餐金额 -->
 
                                 </el-table-column>
 
-                                <el-table-column label="Kit BV" prop="PV"><!-- 套餐PV -->
+                                <el-table-column label="BV" prop="PV"><!-- 套餐PV -->
 
                                     <template>
 
@@ -65,7 +65,7 @@
 
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="Kit products" prop="PACKAGE_CONTENT"><!-- 套餐内容 -->
+                                <el-table-column  width='500px' label="Details:" prop="PACKAGE_CONTENT"><!-- 套餐内容 -->
                                     <template >
 
                                     </template>
@@ -76,7 +76,7 @@
                                <el-button type="primary" @click="onclock" :loading="submitButton">保存</el-button>
                              </el-form-item>-->
                         </el-tab-pane>
-                        <el-tab-pane label="Select entry products" name="2"><!-- 商品报单 -->
+                        <el-tab-pane label="Product" name="2"><!-- 商品报单 -->
                             <el-table class="table-box" v-if="numList.length > 0" :data="tableDatas" stripe style="width: 100%;" highlight-current-row  @selection-change="handleSelectionChange">
                                 <el-table-column
                                         type="selection"
@@ -148,7 +148,7 @@
                 <el-form-item>
                     <template slot="label">
 
-                        Mobile number<!-- 会员手机 -->
+                        Phone number​<!-- 会员手机 -->
                     </template>
                     <el-input v-model="form.mobile"></el-input>
                 </el-form-item>
@@ -161,7 +161,7 @@
                 <el-form-item>
                     <template slot="label">
 
-                        ID<!-- 身份证号 -->
+                        Identity No.<!-- 身份证号 -->
                     </template>
                     <el-input v-model="form.insertUserIdCard" maxlength="18"></el-input>
                 </el-form-item>
@@ -232,24 +232,24 @@
 
                 <div class="hr-tip"><span>Bank Info<!-- 银行信息 --></span></div>
 
-                <el-form-item label="Bank of deposit"><!-- 开户行 -->
+                <el-form-item label="Bank Name"><!-- 开户行 -->
                     <el-select v-model="form.openBank" placeholder="Select Bank"><!-- 请选择开户行 -->
                         <el-option v-for="(item,index) in allOpenBank" :key="index" :label="item.BANK_NAME"
                                    :value="item.BANK_CODE"></el-option>
                     </el-select>
 
                 </el-form-item>
-                <el-form-item label="Bank area" prop="bankAreaSelected"><!-- 银行所在地区 -->
+               <!-- <el-form-item label="Bank area" prop="bankAreaSelected"> 银行所在地区
                     <el-cascader
                             size="large"
                             :options="regionData"
                             v-model="form.bankAreaSelected">
                     </el-cascader>
-                </el-form-item>
-                <el-form-item label="Account opening branch"><!-- 开户支行 -->
+                </el-form-item> -->
+                <el-form-item label="Account Name"><!-- 开户支行 -->
                     <el-input v-model="form.bankAddress"></el-input>
                 </el-form-item>
-                <el-form-item label="Bank account No"><!-- 银行账号 -->
+                <el-form-item label="Account Number​"><!-- 银行账号 -->
                     <el-input v-model="form.bankNo" maxlength="19"></el-input>
                 </el-form-item>
                 <el-form-item>

+ 1 - 1
frontendEle/src/views/user/index.vue

@@ -16,7 +16,7 @@
             <el-form-item label="Member name"><!-- 会员姓名 -->
               <el-input v-model="infoData.REAL_NAME" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="ID"><!-- 身份证号 -->
+            <el-form-item label="Identity No."><!-- 身份证号 -->
               <el-input v-model="infoData.ID_CARD" :disabled="true"></el-input>
             </el-form-item>
             <el-form-item label="Phone number"><!-- 手机号 -->

+ 3 - 3
frontendEle/src/views/user/upgrade.vue

@@ -5,8 +5,8 @@
                 <div class="hr-tip"><span>Member information<!-- 会员信息 --></span></div>
                 <el-form-item label="Member code" prop="insertUserName"><!-- 会员编号 -->
                     <el-input v-model="form.insertUserName"
-                    placeholder="Please enter the member number to be upgraded"
-                    :rules="{ required: true, message: 'Please enter the member number to be upgraded', trigger: 'blur' }"
+                    placeholder="Please enter member code."
+                    :rules="{ required: true, message: 'Please enter member code.', trigger: 'blur' }"
                     @blur="upgradeInfo()"
                     ><!-- 请输入升级的会员编号 -->
                     </el-input>
@@ -133,7 +133,7 @@
                 </el-form-item>
                 <el-form-item v-if="!isMax">
                     <template slot="label">
-                        Mobile phone<!-- 收货人手机 -->
+                         Phone number<!-- 收货人手机 -->
                     </template>
                     <el-input v-model="form.acceptMobile"></el-input>
                 </el-form-item>