会员端翻译

frontendEle/src/components/FilteTransfer.vue

@@ -31,7 +31,7 @@
       </el-select>
     </div>
 
-    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilterTransfer">筛选</el-button>
+    <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilterTransfer">Select</el-button>
   </div>
 </template>
 
@@ -183,4 +183,4 @@ export default {
       display: none;
     }
   }
-</style>
+</style>

frontendEle/src/router/index.js

@@ -110,7 +110,7 @@ export const constantRouterMap = [
                     title: '商品详情',
                     breadcrumb: [
                         {title: 'Dashboard', path: '/dashboard/index'},
-                        {title: '商城管理', path: '/shop/dec-order-list'},
+                        {title: 'Shopping Mall', path: '/shop/dec-order-list'},
                     ],
                 },
             },
@@ -176,8 +176,8 @@ export const constantRouterMap = [
         meta: {
           title: '上传身份证',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Member management', path: '/user/index'},
           ],
         },
       },
@@ -188,8 +188,8 @@ export const constantRouterMap = [
         meta: {
           title: '开拓会员列表',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Member management', path: '/user/index'},
           ],
         },
       },
@@ -200,8 +200,8 @@ export const constantRouterMap = [
         meta: {
           title: '点位绑定列表',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Member management', path: '/user/index'},
           ],
         },
       },
@@ -213,8 +213,8 @@ export const constantRouterMap = [
           title: '点位绑定编辑',
           highLight: '/user/bind',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '会员管理', path: '/user/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Member management', path: '/user/index'},
             {title: '点位绑定列表', path: '/user/bind'},
           ],
         },
@@ -258,7 +258,7 @@ export const constantRouterMap = [
                 meta: {
                     title: '安置网络',
                     breadcrumb: [
-                        {title: '首页', path: '/dashboard/index'},
+                        {title: 'Dashboard', path: '/dashboard/index'},
                         {title: '网络图谱', path: '/atlas/network'},
                     ],
                 },
@@ -289,8 +289,8 @@ export const constantRouterMap = [
         meta: {
           title: '最新奖金',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Bonus management', path: '/bonus/index'},
           ],
         },
       },
@@ -301,7 +301,7 @@ export const constantRouterMap = [
         meta: {
           title: 'Previous bonus',//往期奖金
           breadcrumb: [
-            {title: 'Dashboard', path: '/dashboard/index'},//首页
+            {title: 'Dashboard', path: '/dashboard/index'},//Dashboard
             {title: 'Bonus management', path: '/bonus/index'},//奖金管理
           ],
         },
@@ -313,8 +313,8 @@ export const constantRouterMap = [
         meta: {
           title: '实时业绩',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Bonus management', path: '/bonus/index'},
           ],
         },
       },
@@ -325,8 +325,8 @@ export const constantRouterMap = [
         meta: {
           title: '房产积分',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '奖金管理', path: '/bonus/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Bonus management', path: '/bonus/index'},
           ],
         },
       },
@@ -346,7 +346,7 @@ export const constantRouterMap = [
           title: 'Article List',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},
-            {title: 'Articla Management', path: '/article/list'},
+            {title: 'Article Management', path: '/article/list'},
           ],
         },
       },
@@ -358,7 +358,7 @@ export const constantRouterMap = [
           title: 'Article Detail',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},
-            {title: 'Articla Management', path: '/article/list'},
+            {title: 'Article Management', path: '/article/list'},
           ],
         },
       },
@@ -376,7 +376,7 @@ export const constantRouterMap = [
         meta: {
           title: '站内信列表',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
             {title: '站内信', path: '/message/list'},
           ],
         },
@@ -388,7 +388,7 @@ export const constantRouterMap = [
         meta: {
           title: '站内信详情',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
             {title: '站内信', path: '/message/list'},
           ],
         },
@@ -407,8 +407,8 @@ export const constantRouterMap = [
         meta: {
           title: '会员复销池余额流水',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '财务管理', path: '/finance/withdraw'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Financial management', path: '/finance/withdraw'},
           ],
         },
       },
@@ -420,7 +420,7 @@ export const constantRouterMap = [
           title: 'Withdrawal details',//提现明细
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
-            {title: 'financial management', path: '/finance/index'},//财务管理
+            {title: 'Financial management', path: '/finance/index'},//财务管理
           ],
         },
       },
@@ -433,7 +433,7 @@ export const constantRouterMap = [
           highLight: '/finance/withdraw',
           breadcrumb: [
             {title: 'Dashboard', path: '/dashboard/index'},//首页
-            {title: 'financial management', path: '/finance/index'},//财务管理
+            {title: 'Financial management', path: '/finance/index'},//财务管理
             {title: 'Withdrawal details', path: '/finance/withdraw'},//提现明细
           ],
         },
@@ -445,8 +445,8 @@ export const constantRouterMap = [
         meta: {
           title: '报单订货单列表',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '财务管理', path: '/finance/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Financial management', path: '/finance/index'},
           ],
         },
       },
@@ -457,8 +457,8 @@ export const constantRouterMap = [
         meta: {
           title: '转账记录',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '财务管理', path: '/finance/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Financial management', path: '/finance/index'},
           ],
         },
       },
@@ -470,8 +470,8 @@ export const constantRouterMap = [
           title: '我要转账',
           highLight: '/finance/transfer-list',
           breadcrumb: [
-            {title: '首页', path: '/dashboard/index'},
-            {title: '财务管理', path: '/finance/index'},
+            {title: 'Dashboard', path: '/dashboard/index'},
+            {title: 'Financial management', path: '/finance/index'},
             {title: '转账记录', path: '/finance/transfer-list'},
           ],
         },

frontendEle/src/utils/config_development_example.js

@@ -1,4 +1,4 @@
-const APP_NAME = '奖金结算系统'
+const APP_NAME = 'Member Management System'
 const SERVER_API_DOMAIN = '16.163.228.151:8026'
 const SERVER_API_HTTP_TYPE = 'http://'
 const SERVER_API_PORT = ''  // ':8026'

frontendEle/src/utils/region.js

@@ -27,7 +27,7 @@ const initRegion = function (vueObj) {
     // code转汉字大对象
 // 汉字转code大对象
     const rootCode = '234'
-    vueObj.$set(store.state.regionInfo.CodeToText, '', '全部')
+    vueObj.$set(store.state.regionInfo.CodeToText, '', 'All')
 
 // 计算省
     for (const prop in ANRAN_REGION_DATA[rootCode]) {
@@ -39,7 +39,7 @@ const initRegion = function (vueObj) {
       store.state.regionInfo.TextToCode[ANRAN_REGION_DATA[rootCode][prop]] = {
         code: prop
       }
-      store.state.regionInfo.TextToCode[ANRAN_REGION_DATA[rootCode][prop]]['全部'] = {
+      store.state.regionInfo.TextToCode[ANRAN_REGION_DATA[rootCode][prop]]['All'] = {
         code: ''
       }
     }
@@ -58,7 +58,7 @@ const initRegion = function (vueObj) {
         store.state.regionInfo.TextToCode[provinceText][ANRAN_REGION_DATA[provinceCode][prop]] = {
           code: prop
         }
-        store.state.regionInfo.TextToCode[provinceText][ANRAN_REGION_DATA[provinceCode][prop]]['全部'] = {
+        store.state.regionInfo.TextToCode[provinceText][ANRAN_REGION_DATA[provinceCode][prop]]['All'] = {
           code: ''
         }
       }
@@ -124,7 +124,7 @@ const initRegion = function (vueObj) {
     store.state.regionInfo.regionDataPlus = cloneArray(store.state.regionInfo.regionData)
     store.state.regionInfo.regionDataPlus.unshift({
       value: '',
-      label: '全部'
+      label: 'All'
     })
     /*for (let i = 0, len = store.state.regionInfo.regionDataPlus.length; i < len; i++) {
       const province = store.state.regionInfo.regionDataPlus[i].children

frontendEle/src/views/bonus/trace-fl.vue

@@ -7,7 +7,7 @@
             <el-option v-for="(item,key) in periodNums" :label="`${tool.formatDate(item.END_TIME,false)}`" :value="item.PERIOD_NUM" :key="key"></el-option>
           </el-select>
         </div>
-        <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">筛选</el-button>
+        <el-button class="filter-item filter-filter-btn" type="primary" @click="handleFilter">Select</el-button>
       </div>
       <el-table class="table-box" ref="multipleTable" :data="tableData" stripe show-summary style="width: 100%;">
         <el-table-column label="报单编号" prop="DEC_SN"></el-table-column>
@@ -153,4 +153,4 @@
     margin-right: 0;
     margin-bottom: 0;
   }
-</style>
+</style>

frontendEle/src/views/config/base.vue

@@ -48,9 +48,9 @@ export default {
       if(val===true){
         title=`开启复销短信提醒，每月扣除${this.smsFee}元。是否继续？`
       }
-      this.$confirm(title, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
+      this.$confirm(title, 'Notice', {
+        confirmButtonText: 'Confirm',
+        cancelButtonText: 'Cancel',
         type: 'warning'
       }).then(() => {
         this.loading = true
@@ -85,4 +85,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

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

@@ -3,7 +3,7 @@
     <div class="white-box">
       <el-form ref="form"  label-width="250px" class="form-page">
         <el-form-item label="Currency">
-          <el-select v-model="form.currency" placeholder="请选择">
+          <el-select v-model="form.currency" placeholder="Select">
             <el-option
               v-for="item in currencyList"
               :key="item.value"

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

@@ -145,8 +145,8 @@ export default {
             this.form.transferCode = response.transferCode
 
             this.$prompt('请输入支付密码', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+                confirmButtonText: 'Confirm',
+                cancelButtonText: 'Cancel',
                 inputType: 'password',
                 inputPattern: /\S+/,
                 inputErrorMessage: '请输入支付密码',
@@ -187,4 +187,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

frontendEle/src/views/finance/withdraw.vue

@@ -17,17 +17,10 @@
           <template slot-scope="scope">
             {{scope.row.IS_AUTO_WITHDRAW==='1'?'Automatic withdrawal':'Manual withdrawal'}} 自动体现：手动体现
           </template>
-<<<<<<< HEAD
         </el-table-column>-->
-        <el-table-column label="Withdrawal Amoun" prop="AMOUNT" width="200px"></el-table-column><!-- 提现金额 -->
+        <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> --><!-- 手续费 -->
         <!-- <el-table-column label="Actual amount" prop="REAL_AMOUNT" width="120"></el-table-column> --><!-- 实际到账金额 -->
-=======
-        </el-table-column>
-        <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;-->
->>>>>>> master
         <el-table-column label="Date" width="120"><!-- 提现时间 -->
           <template slot-scope="scope">
             {{tool.formatDate(scope.row.CREATED_AT)}}

frontendEle/src/views/login/modify-password.vue

@@ -18,7 +18,7 @@
               <el-input v-model="passwordInfo.verifyPassword" show-password></el-input>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="modifyPasswordButtonStat">确认修改</el-button>
+              <el-button type="primary" @click="handleModifyPasswordSubmit" :loading="modifyPasswordButtonStat">Confirm</el-button>
             </el-form-item>
           </el-form>
         </div>

frontendEle/src/views/message/detail.vue

@@ -10,7 +10,7 @@
       <el-divider content-position="left" v-if="attachment">附件</el-divider>
       <ul v-if="attachment">
         <li v-for="(item,key) in attachment" :key="key">
-          <a :href="item" target="_blank">附件{{key+1}}</a>
+          <a :href="item" target="_blank">Appendix{{key+1}}</a>
         </li>
       </ul>
     </div>
@@ -58,4 +58,4 @@ export default {
 <style scoped>
 .white-box-title span{color: #999}
 .white-box-content{font-size: 16px;padding: 15px 0;line-height: 2;}
-</style>
+</style>

frontendEle/src/views/user/bind-edit.vue

@@ -2,7 +2,7 @@
   <div v-loading="loading">
     <div class="white-box">
         <el-form ref="form" :model="form" label-width="150px" style="width:500px;">
-          <el-form-item label="会员编号">
+          <el-form-item label="Member Code">
             是否主会员
           </el-form-item>
           <el-form-item v-for="(item,index) in userBinds" :key="index" :label="item.USER_NAME">
@@ -76,4 +76,4 @@
 
 <style scoped>
 
-</style>
+</style>