Merge branch 'feature/3223-reconsume-mod' into dev-ngds

src/lang/zh.js

@@ -82,7 +82,7 @@ export default {
     profile: '个人中心',
     theme: '换肤',
     size: '布局大小',
-    visitPreviousVersion: '进入旧版',
+    visitPreviousVersion: '进入旧版'
   },
   menu: {
     // 一级菜单
@@ -102,6 +102,7 @@ export default {
     welcomePack: '报单管理',
     welcomePackList: '报单列表',
     memberUpgrade: '升级管理',
+    reconsume: '复消商品',
     orderList: '订单列表',
     brandAmbassador: 'BA会员',
     BAOrderList: 'BA订单',
@@ -126,7 +127,7 @@ export default {
     // 二级菜单/接口-articleManagement
     systemNotification: '系统通知',
     // 二级菜单/接口-setting
-    shippingAddress: '收货地址',
+    shippingAddress: '收货地址'
   },
   login: {
     title: '欢迎',
@@ -231,7 +232,7 @@ export default {
   },
   empLevels: {
     // 级别配置
-    '67BE1C6C21F81B32E055736AECE8644D':  '无级别',
+    '67BE1C6C21F81B32E055736AECE8644D': '无级别',
     'E121497617216708615': '1星经理',
     '67BE5FE7857C216AE055736AECE8644D': '2星经理',
     'E121497617216708616': '3星经理',
@@ -249,7 +250,7 @@ export default {
     '8ACAEA736F5331B79283C895F36084E5': '4星皇冠',
     'CE46B39D07633217AA5711438649D1D6': '5星皇冠',
     '24396B85E74A3005947F1F90EBA5F5CF': '6星皇冠',
-    '8C253968EB6F3F3FA5BE84F63136FFFA': '7星皇冠',
+    '8C253968EB6F3F3FA5BE84F63136FFFA': '7星皇冠'
   },
   decLvs: {
     // 等级配置
@@ -270,7 +271,7 @@ export default {
   currency: {
     unit: '奈拉',
     sign: '₦',
-    naira: 'NGN',
+    naira: 'NGN'
   },
   common: {
     save: '保存',
@@ -298,7 +299,7 @@ export default {
     websiteTitle: '会员管理系统',
     uploadHints: '正在上传，请稍后。请勿关闭窗口！',
     canNotBeBlank: '不能为空',
-    require: '必须填写',
+    require: '必须填写'
   },
   shop: {
     product: '商品',
@@ -354,6 +355,14 @@ export default {
     paymentError: '支付方式或账户类型错误',
     successOrderTips: '订单支付成功',
     paymentMethod: '支付方式',
+    customerInfo: '会员信息',
+    reconsumeUserCode: '复消用户编号',
+    mobile: '手机号',
+    province: 'State',
+    lgaName: 'Local Government Area',
+    cityName: 'City',
+    address: '详细地址',
+    memberNotFound: '找不到这个用户'
   },
   user: {
     email: '电子邮箱',
@@ -369,7 +378,7 @@ export default {
     BAUpgrade: 'BA会员升级',
     entryLevel: '报单级别',
     selectEntryLevel: '请选择报单级别',
-    stockistCode: '报单中心编号',
+    stockistCode: '报单中心编号'
   },
 
   atlas: {
@@ -388,7 +397,7 @@ export default {
     memberCode: '会员编号',
     name: '姓名',
     level: '级别',
-    location: '区位',
+    location: '区位'
   },
 
   config: {
@@ -399,7 +408,7 @@ export default {
     state: '地区',
     default: '默认地址',
     createAddress: '添加地址',
-    editAddress: '修改地址',
+    editAddress: '修改地址'
   },
   profile: {
     personalInformation: '个人资料',
@@ -428,13 +437,13 @@ export default {
     loginPasswordSuccessTips: '登录密码已修改成功',
     paymentPasswordSuccessTips: '支付密码已修改成功',
     enterLoginPassword: '请输入登录密码',
-    enterPaymentPassword: '请支付登录密码',
+    enterPaymentPassword: '请支付登录密码'
   },
   article: {
     title: '标题',
     createTime: '发布时间',
     category: '类型',
-    systemNotification: '系统通知',
+    systemNotification: '系统通知'
   },
   bonus: {
     payCycle: '期数',
@@ -466,7 +475,7 @@ export default {
     PGS: '累计业绩',
     teamDetails: '团队情况',
     latestCalculationTime: '最新计算时间',
-    totalBV: '合计',
+    totalBV: '合计'
   },
   finance: {
     applyTransfer: '转账',
@@ -508,6 +517,6 @@ export default {
     viewVoucher: '查看',
     bankInformation: '银行信息',
     selectBank: '请选择开户行',
-    accountName: '开户支行',
-  },
+    accountName: '开户支行'
+  }
 }