david hace 2 años
padre
commit
f72a6de0e9
Se han modificado 3 ficheros con 168 adiciones y 168 borrados
  1. 2 2
      .env.development
  2. 165 165
      src/lang/en.js
  3. 1 1
      vue.config.js

+ 2 - 2
.env.development

@@ -2,11 +2,11 @@
 ENV='development'
 
 # api请求地址
-VUE_APP_BASE_API='http://172.19.189.191:9970'
+VUE_APP_BASE_API='http://172.17.151.248:9970'
 # 文件下载地址
 VUE_APP_BASE_DO_API='http://local.ng.backend.api.com'
 # CDN文件地址
-VUE_APP_CDN_API='http://172.19.189.191:9970'
+VUE_APP_CDN_API='http://172.17.151.248:9970'
 # 页面地址
 VUE_APP_BASE_WEBSITE='http://local.ng.backend.ele.com'
 # 会员端地址

+ 165 - 165
src/lang/en.js

@@ -66,14 +66,14 @@ export default {
     // 以下是meta,
     memberListMeta:'Member List',
     emptyOrderOperation:'Empty Order Operation',
-    adminRoleList:'管理员角色列表',
-    addRole:'添加角色',
-    editRole:'编辑角色',
-    rolePermission:'角色权限',
+    adminRoleList:'List of administrator roles',
+    addRole:'Add roles',
+    editRole:'Edit roles',
+    rolePermission:'Role Permissions',
     resetPwd:'Reset password',
-    adminList:'管理员列表',
-    addAdmin:'添加管理员',
-    editAdmin:'编辑管理员',
+    adminList:'Administrator list',
+    addAdmin:'Add administrator',
+    editAdmin:'Edit administrator',
     memberBalanceAuditList:'Member Ecoin adjustment list',
     changeBalanceOpt:'Apply for adjustment of member Ecoin',
     transferList:'Transfer record list',
@@ -109,11 +109,11 @@ export default {
     metaAdEdit:'Ad Edit',
     metaAdAdd:'Ad Add',
     metaFileExport:'Export file',
-    metaAdminLogin:'管理员登录日志',
+    metaAdminLogin:'Admin login log',
     metaUserLogin:'Member login log',
-    metaAdminHandle:'管理员操作日志',
+    metaAdminHandle:'Administrator operation log',
     metaUserHandle:'Member operation log',
-    metaSystemLog:'系统日志',
+    metaSystemLog:'System log',
   },
   navbar: {
     dashboard: 'Dashboard',
@@ -213,17 +213,17 @@ export default {
     settlementDate: 'Settlement Date',
     networkConnectionTime: 'Network connection time',
     closurePeriod: 'Closure period',
-    logRefresh: '日志刷新',
-    actionTime: '操作时间(WAT)',
-    logContent: '日志内容',
-    autoCalculation: '自动计算',
-    createPerformanceSheet: '生成业绩单',
-    initializeBasicData: '初始化基础数据',
-    generationPeriodPerformance: '生成期业绩',
-    pullPeriodPerformance: '拉取期业绩',
-    calculationOfBonus: '计算奖金',
-    pullBonusData: '拉取奖金数据',
-    bulkWithdrawal: '批量提现',
+    logRefresh: 'Log refresh',
+    actionTime: 'Operating time(WAT)',
+    logContent: 'Log content',
+    autoCalculation: 'Automatic calculation',
+    createPerformanceSheet: 'Generate performance sheet',
+    initializeBasicData: 'Initialize basic data',
+    generationPeriodPerformance: 'Generation period performance',
+    pullPeriodPerformance: 'Pull period performance',
+    calculationOfBonus: 'Calculate bonus',
+    pullBonusData: 'Pull Bonus Data',
+    bulkWithdrawal: 'Batch withdrawal',
     periodNum: 'Number of periods',
     year: 'Bonus Year',
     month: 'Bonus Month',
@@ -357,20 +357,20 @@ export default {
     uploadHints: 'Uploading, please hold on. Do not close the window!',
     canNotBeBlank: ' cannot be blank',
     require: 'is required',
-    createdAt: '创建时间',
-    updatedAt: '更新时间',
-    updatedAdmin: '更新人',
-    actionThisData: '操作该数据',
-    selectType: '筛选类型',
-    selectFunction: '筛选方式',
-    selectDate: '选择日期',
-    selectMonth: '选择月份',
-    pleaseInputContent: '请输入内容',
-    relation: '关系',
-    reset: '重置',
+    createdAt: 'Creation time',
+    updatedAt: 'Update time',
+    updatedAdmin: 'Updater',
+    actionThisData: 'Manipulate the data',
+    selectType: 'Filter type',
+    selectFunction: 'Filter method', 
+    selectDate: 'Select date',
+    selectMonth: 'Select month',
+    pleaseInputContent: 'Please enter content',
+    relation: 'relation',
+    reset: 'Reset',
     exportExcel: 'Export Excel',
     exportPDF: 'Export PDF',
-    desc: '描述',
+    desc: 'Describe',
     upload: 'Upload',
     modifyData: 'Modifying data',
     hide: 'Hide',
@@ -386,34 +386,34 @@ export default {
 
   filter: {
     memberSelect: 'Select',
-    memberNumber: '会员编号',
-    name: '姓名',
-    idNumber: '证件号码',
-    phoneNumber: '手机号码',
-    memberLevel: '会员级别',
-    level: '级别',
-    confirmSelect: '确认筛选',
-    memberName: '会员姓名',
-    ID: '身份证',
-    addAt: '加入时间',
-    pleaseSelectDecLevel: '请选择报单级别',
-    pleaseSelectEmpLevel: '请选择级别',
-    eq: '等于',
-    like: '包含',
-    noeq: '不等于',
-    nolike: '不包含',
-    moreThan: '大于',
-    moreThanEq: '大于等于',
-    less: '小于',
-    lessThan: '小于等于',
-    and: '并且',
-    or: '或者',
-    selectContentNotice: '请填写完整筛选内容',
-    areaSelectNotice: '地区仅限于"等于"的筛选方式'
+    memberNumber: 'Member code',
+    name: 'Name',
+    idNumber: 'ID number',
+    phoneNumber: 'Phone number',
+    memberLevel: 'Number level',
+    level: 'Level',
+    confirmSelect: 'Confirm select',
+    memberName: 'Member name',
+    ID: 'ID',
+    addAt: 'Join time',
+    pleaseSelectDecLevel: 'Please select order level',
+    pleaseSelectEmpLevel: 'Please select level',
+    eq: 'Equal',
+    like: 'Include',
+    noeq: 'Not equal to',
+    nolike: 'Does not contain',
+    moreThan: 'More than',
+    moreThanEq: 'Greater or equal to',
+    less: 'Less than',
+    lessThan: 'less than or equal to',
+    and: 'and',
+    or: 'or',
+    selectContentNotice: 'Please fill in the complete selected content',
+    areaSelectNotice: 'Regions are limited to "equal to" filters'
   },
 
   menu: {
-    // 一级菜单
+    // First level menu
     dashboard: 'Dashboard',
     shoppingMall: 'Shopping Mall',
     memberManagement: 'Member Management',
@@ -426,23 +426,23 @@ export default {
     adManagement: 'Ad Management',
     logManagement: 'Log Management',
     settingManagement: 'Setting Management',
-    // 二级菜单/接口-shoppingMall
+    //Second level menu/interface-shoppingMall
     productsList: 'Products List',
     orderList: 'Order List',
     remainBV: 'Remain BV',
     remainBVFlow: 'Remain BV Flow',
     externalMallOrderList: 'External Mall Order List',
     externalMallEntryList: 'External Mall Entry List',
-    // 二级菜单/接口-memberManagement
+    // Second level menu/interface-memberManagement
     memberList: 'Member List',
     emptyOrderOperation: 'Empty Order Operation',
     moveNetworkManagement: 'Move Network Management',
     memberLevelAdjustmentList: 'Member Level Adjustment List',
     modifyStockistLevel: 'Modify Stockist Level',
-    // 二级菜单/接口-networkChart
+    // Second level menu/interface-networkChart
     placementNetwork: 'Placement Network',
     sponsorNetwork: 'Sponsor Network',
-    // 二级菜单/接口-bonusManagement
+    // Second level menu/interface-bonusManagement
     closurePeriod: 'Closure Period',
     memberBonusBalance: 'Member Bonus Balance',
     memberBonus: 'Member Bonus',
@@ -452,40 +452,40 @@ export default {
     periodPerformance: 'Period Performance',
     monthlyPerformance: 'Monthly Performance',
     adjustPerformance: 'Adjust Performance',
-    // 二级菜单/接口-financialManagement
+    // Second level menu/interface-financialManagement
     memberEcoinAdjustmentList: 'Member Ecoin Adjustment List',
     transferRecordList: 'Transfer Record List',
     withdrawalManagement: 'Withdrawal Management',
-    dealTypeManagement: '交易类型管理',
+    dealTypeManagement: 'Transaction Type Management',
     historicalBonusBalance: 'Historical Bonus Balance',
     rechargeManagement: 'Recharge Management',
-    // 二级菜单/接口-articleManagement
+    // Second level menu/interface-articleManagement
     categoryManagement: 'Category Management',
-    // 二级菜单/接口-fileManagement
+    // Second level menu/interface-fileManagement
     exportFile: 'Export File',
-    // 二级菜单/接口-administrator
-    administratorRoleList: '管理员角色列表',
-    administratorList: '管理员列表',
+    // Second level menu/interface-administrator
+    administratorRoleList: 'List of administrator roles',
+    administratorList: 'Administrator list',
     resetPassword: 'Reset Password',
-    // 二级菜单/接口-logManagement
-    administratorLoginLog: '管理员登录日志',
+    // Second level menu/interface-logManagement
+    administratorLoginLog: 'Admin login log',
     memberLoginLog: 'Member login log',
-    administratorOperationLog: '管理员操作日志',
+    administratorOperationLog: 'Administrator operation log',
     memberOperationLog: 'Member operation log',
-    systemLog: '系统日志',
-    // 二级菜单/接口-settingManagement
-    siteConfig: '站点设置',
-    bonusConfig: '奖金设置',
-    scoreConfig: '积分配置',
-    transferConfig: '转账配置',
-    exchangeRateConfig: '汇率配置',
-    otherConfig: '其他配置',
-    decLevelConfig: '会员级别配置',
-    empLevelConfig: '会员聘级配置',
-    decRoleConfig: '报单中心级别配置'
+    systemLog: 'System log',
+    // Second level menu/interface-settingManagement
+    siteConfig: 'Site settings',
+    bonusConfig: 'Bonus settings',
+    scoreConfig: 'Points configuration',
+    transferConfig: 'Transfer configuration',
+    exchangeRateConfig: 'Exchange rate configuration',
+    otherConfig: 'Other configuration',
+    decLevelConfig: 'Member level configuration',
+    empLevelConfig: 'Member rank level configuration',
+    decRoleConfig: 'Stockist level configuration'
   },
 
-  // 会员
+  // Member
   member: {
     memberCode: 'Member Code',
     memberName: 'Member Name',
@@ -591,66 +591,66 @@ export default {
     exportDataHint: 'Are you sure you want to export the current data?'
   },
 
-  // 网络
+  // Network
   network: {
     placementNetwork: 'Placement Network',
     sponsorNetwork: 'Sponsor Network'
   },
 
-  // 配置
+  // Configuration
   config: {
-    refreshShopPrice: '刷新商品价格',
-    refreshShopNaraPriceThenSave: '保存后根据新汇率刷新上架商品奈拉价格',
-    confirmToChangeExchangeRate: '是否确认修改汇率?',
-    levelName: '级别名称',
+    refreshShopPrice: 'Refresh product price',
+    refreshShopNaraPriceThenSave: 'After saving, refresh the Naira price of the listed products according to the new exchange rate',
+    confirmToChangeExchangeRate: 'Whether to confirm to modify the exchange rate?',
+    levelName: 'Level name',
     sort: 'Sort',
-    modifiedStockist: '修改报单中心',
-    openTransfer: '开启转账功能',
-    walletType: '转出/转入钱包类型',
-    lowerLimitAmountTransferOut: '转出金额下限',
-    upperLimitAmountTransferOut: '转出金额上限',
-    serviceCharge: '手续费%',
-    lowerLimitServiceCharge: '手续费下限',
-    upperLimitServiceCharge: '手续费上限',
-    periodUpperLimitAmountTransferOut: '期转出总额上限',
-    monthUpperLimitAmountTransferOut: '结算月转出总额上限',
-    whetherEnable: '是否启用',
-    pour: '',
-    periodTotalAmountTransferOut: '期转出总额上限是指该转账规则一期之内会员最多可以转账的总金额',
-    monthTotalAmountTransferOut: '结算月转出总额上限是指该转账规则一个结算月内会员最多可转账的总金额',
-    ifNullRestrict: '填写空则为不限制',
-    needPerf: '所需业绩(BV)',
-    enterNumber: '请输入正整数数字',
-    enterZeroIsHoleSite: '输入0代表无观察期,即全站升级单为全额升级',
-    updatePeriodUnderObservation: '更新观察期',
-    baseConfig: '基本配置',
-    repeatAbout: '复消相关',
-    teamBonusConfig: '团队奖配置',
-    bonusPercent: '拿奖比例',
-    capBonus: '个人封顶值',
-    manageStarConfig: '管理星级配置',
-    manageBonusPercent: '蓝星奖比例',
-    tourBonusPercent: '旅游奖比例',
-    carFundBonusPercent: '车奖比例',
-    villaFundBonusPercent: '房奖比例',
-    achieveMemberNo: '推荐会员达标数',
-    achievePerfBV: '推荐达标及格获奖BV',
-    achieveBV: '推荐达标不及格获奖BV',
-    crownStarConfig: '皇冠星级配置',
-    levelScore: '级别分数(BV)',
-    upgradeScore: '升级分数(BV)',
-    score: '',
-    bonusAmount: '奖金金额',
-    saleAmountCap: '销售额条件',
-    memberAbout: '会员相关',
-    homeAbout: '前台相关',
-    withdrawalAbout: '提现相关',
-    otherAbout: '其他'
+    modifiedStockist: 'Modify stockist',
+    openTransfer: 'Turn on the transfer function',
+    walletType: 'Transfer-out/transfer-in wallet type',
+    lowerLimitAmountTransferOut: 'Minimum transfer amount',
+    upperLimitAmountTransferOut: 'Maximum transfer amount',
+    serviceCharge: 'Service charge%',
+    lowerLimitServiceCharge: 'Minimum service charge',
+    upperLimitServiceCharge: 'Maximum service charge',
+    periodUpperLimitAmountTransferOut: 'Maximum of the total amount transferred out of a PC',
+    monthUpperLimitAmountTransferOut: 'Maximum of the total amount transferred out in the settlement month',
+    whetherEnable: 'Whether to enable',
+    pour: 'Note',
+    periodTotalAmountTransferOut: 'Maximum of the total transfer amount refers to the maximum total amount that members can transfer within one period of the transfer rule',
+    monthTotalAmountTransferOut: 'Maximum of the total amount transferred out in the settlement month refers to the maximum total amount that members can transfer in one settlement month according to the transfer rule',
+    ifNullRestrict: 'If you fill in the blank, there is no limit',
+    needPerf: 'Required performance(BV)',
+    enterNumber: 'Please enter a positive integer number',
+    enterZeroIsHoleSite: 'Entering 0 means there is no observation period, that is, the whole site upgrade order is a full upgrade33',
+    updatePeriodUnderObservation: 'Update observation period',
+    baseConfig: 'Basic configuration',
+    repeatAbout: 'Repurchase-correlation',
+    teamBonusConfig: 'Team Bonus Configuration',
+    bonusPercent: 'Bonus ratio',
+    capBonus: 'Personal cap',
+    manageStarConfig: 'Manage star configuration',
+    manageBonusPercent: 'Proportion of Director Bonus',
+    tourBonusPercent: 'Travel Fund Ratio',
+    carFundBonusPercent: 'Car Fund Ratio',
+    villaFundBonusPercent: 'Villa Fund ratio',
+    achieveMemberNo: 'The number of recommended members reaching the standard',
+    achievePerfBV: 'Recommended to meet the standard and pass the bonus BV',
+    achieveBV: 'Awarded for failing to meet the recommended standards BV',
+    crownStarConfig: 'Crown star configuration',
+    levelScore: 'Level points(BV)',
+    upgradeScore: 'Upgrade points(BV)',
+    score: 'point',
+    bonusAmount: 'Bonus amount',
+    saleAmountCap: 'Sales conditions',
+    memberAbout: 'Member related',
+    homeAbout: 'Member management related',
+    withdrawalAbout: 'Withdrawal related',
+    otherAbout: 'Others'
   },
 
-  // 财务管理
+  // Financial Management
   financial: {
-    serviceCharge: '服务费(%)',
+    serviceCharge: 'Service charge(%)',
     all: 'All',
     toBeReviewed: 'To be reviewed',
     toBePaid: 'To be paid',
@@ -688,10 +688,10 @@ export default {
     memberCode: 'Member code',
     memberName: 'Member name',
     memberLevel: 'Member level',
-    idCardNumber: '身份证号',
-    registerType: '注册类型',
-    pleaseSelectRegisterType: '请选择注册类型',
-    withdrawAmount: '提现金额',
+    idCardNumber: 'ID number',
+    registerType: 'Registration type',
+    pleaseSelectRegisterType: 'Please select a registration type',
+    withdrawAmount: 'Withdrawal amount',
     estimatedDatePayment: 'Estimated date of payment',
     selectDate: 'Select date',
     accountType: 'Account type',
@@ -728,7 +728,7 @@ export default {
     changeStateSelectedDataNotice: 'Are you sure to change the state of the selected data'
   },
 
-  // 网络管理
+  // Network management
   atlas: {
     exportNotice: 'Are you sure you want to export the current data?',
     sponsorNetworkDiagram: 'Sponsor Network Diagram',
@@ -751,7 +751,7 @@ export default {
     placementNetworkList: 'Placement network list'
   },
 
-  // 商品管理
+  // Products management
   shop: {
     onSale: 'On sale',
     soldOut: 'Sold out',
@@ -785,37 +785,37 @@ export default {
     courierNumber: 'courier number',
     selectOrderExportNotice: 'Please select an order to export',
     pdfOnlyOneOrderExported: 'Only one order can be exported at a time',
-    sureDeleteOrder: '确定要删除订单吗?订单编号:'
+    sureDeleteOrder: 'Are you sure to delete the order? Order number:'
   },
 
-  // 管理员管理
+  // Administrator management
   Administrator: {
-    role: '角色',
-    remark: '备注',
-    creatUser: '创建人',
-    creatAt: '创建时间',
-    updateUser: '修改人',
-    updateAt: '修改时间',
-    addRole: '添加角色',
-    selectData: '所选数据',
-    roleName: '角色名称',
-    module: '模块',
-    loginAccount: '登录账号',
-    name: '姓名',
-    pleaseSelectRole: '请选择角色',
+    role: 'role',
+    remark: 'remark',
+    creatUser: 'Founder',
+    creatAt: 'Creation time',
+    updateUser: 'Edited by',
+    updateAt: 'Edit time',
+    addRole: 'Add role',
+    selectData: 'Selected data',
+    roleName: 'Role Name',
+    module: 'Module',
+    loginAccount: 'Login account',
+    name: 'Name',
+    pleaseSelectRole: 'Please select a role',
     password: 'password',
     confirmPassword: 'Confirm password',
-    bindIp: '绑定IP',
-    pleaseInputContent: '请输入内容',
-    bindIpNotice: '一行一个IP;可指定ip段,如: 192.168.0.1-255',
-    isEnable: '是否启用',
-    isModifyPwd: '是否修改密码',
+    bindIp: 'Bind IP',
+    pleaseInputContent: 'Please enter content',
+    bindIpNotice: 'One IP per line; IP segment can be specified, such as: 192.168.0.1-255',
+    isEnable: 'Whether to enable',
+    isModifyPwd: 'Whether to change the password',
     filterBtnName: 'Select',
-    loginTimes: '登录次数',
-    lastLoginIp: '最后登录IP',
-    lastLoginAt: '最后登录时间',
+    loginTimes: 'Logins',
+    lastLoginIp: 'Last login IP',
+    lastLoginAt: 'last login time',
     selectData: 'Selected data',
-    addAdmin: '添加管理员',
-    delNotice: '确定删除选定的数据?'
+    addAdmin: 'Add administrator',
+    delNotice: 'Determine to delete the selected data'
   },
 }

+ 1 - 1
vue.config.js

@@ -39,7 +39,7 @@ module.exports = {
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]:{
-        target:"http://172.19.189.191:9970",
+        target:"http://172.17.151.248:9970",
         changeOrigin:true,
         pathRewrite:{
           ["^" + process.env.VUE_APP_BASE_API] : ""