diff --git a/src/views/business/userInfo/index.vue b/src/views/business/userInfo/index.vue
index 3bce90c..51386fc 100755
--- a/src/views/business/userInfo/index.vue
+++ b/src/views/business/userInfo/index.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.merchant.userInfoBus.account')" prop="account" label-width="120">
-        <el-input v-model="queryParams.account" :placeholder="$t('business.merchant.userInfoBus.accountPlaceholder')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('business.userManager.userInfo.account')" prop="account" label-width="120">
+        <el-input v-model="queryParams.account" :placeholder="$t('business.userManager.userInfo.accountPlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.merchant.userInfoBus.idCard')" prop="idCard">
-        <el-input v-model="queryParams.idCard" :placeholder="$t('business.merchant.userInfoBus.idCardPlaceholder')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('business.userManager.userInfo.idCard')" prop="idCard">
+        <el-input v-model="queryParams.idCard" :placeholder="$t('business.userManager.userInfo.idCardPlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item :label="$t('business.merchant.userInfoBus.phone')" prop="phone">
-        <el-input v-model="queryParams.phone" :placeholder="$t('business.merchant.userInfoBus.phonePlaceholder')" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('business.userManager.userInfo.phone')" prop="phone">
+        <el-input v-model="queryParams.phone" :placeholder="$t('business.userManager.userInfo.phonePlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.button.search') }}</el-button>
@@ -30,25 +30,25 @@
 
     <el-table v-loading="loading" :data="userInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('business.merchant.userInfoBus.account')" align="center" prop="account" />
-      <el-table-column :label="$t('business.merchant.userInfoBus.name')" align="center" prop="name" />
-      <el-table-column :label="$t('business.merchant.userInfoBus.gender')" align="center" prop="gender" >
+      <el-table-column :label="$t('business.userManager.userInfo.account')" align="center" prop="account" />
+      <el-table-column :label="$t('business.userManager.userInfo.name')" align="center" prop="name" />
+      <el-table-column :label="$t('business.userManager.userInfo.gender')" align="center" prop="gender" >
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.gender == '1'">{{ $t('common.dic.male') }}</el-tag>
-          <el-tag v-if="scope.row.gender == '0'">{{ $t('common.dic.female') }}</el-tag>
+          <el-tag v-if="scope.row.gender == '1'">{{ $t('common.dict.male') }}</el-tag>
+          <el-tag v-if="scope.row.gender == '0'">{{ $t('common.dict.female') }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('business.merchant.userInfoBus.idCard')" align="center" prop="idCard" />
-      <el-table-column :label="$t('business.merchant.userInfoBus.phone')" align="center" prop="phone" />
-      <el-table-column :label="$t('business.merchant.userInfoBus.age')" align="center" prop="age" />
-      <el-table-column :label="$t('business.merchant.userInfoBus.addr')" align="center" prop="addr" />
-      <el-table-column :label="$t('business.merchant.userInfoBus.status')" align="center" prop="status">
+      <el-table-column :label="$t('business.userManager.userInfo.idCard')" align="center" prop="idCard" />
+      <el-table-column :label="$t('business.userManager.userInfo.phone')" align="center" prop="phone" />
+      <el-table-column :label="$t('business.userManager.userInfo.age')" align="center" prop="age" />
+      <el-table-column :label="$t('business.userManager.userInfo.addr')" align="center" prop="addr" />
+      <el-table-column :label="$t('business.userManager.userInfo.status')" align="center" prop="status">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.status == '0'">{{ $t('business.merchant.userInfoBus.statusNormal') }}</el-tag>
-          <el-tag type="danger" v-if="scope.row.status == '1'">{{ $t('business.merchant.userInfoBus.statusDisabled') }}</el-tag>
+          <el-tag v-if="scope.row.status == '0'">{{ $t('business.userManager.userInfo.statusNormal') }}</el-tag>
+          <el-tag type="danger" v-if="scope.row.status == '1'">{{ $t('business.userManager.userInfo.statusDisabled') }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('common.button.operation')" align="center" width="200" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('common.tableMsg.operation')" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['business:userInfo:edit']">{{ $t('common.button.edit') }}</el-button>
@@ -62,27 +62,27 @@
     <!-- 添加或修改用户信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
-        <el-form-item :label="$t('business.merchant.userInfoBus.name')" prop="name">
-          <el-input v-model="form.name" :placeholder="$t('business.merchant.userInfoBus.namePlaceholder')" />
+        <el-form-item :label="$t('business.userManager.userInfo.name')" prop="name">
+          <el-input v-model="form.name" :placeholder="$t('business.userManager.userInfo.namePlaceholder')" />
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.gender')" prop="gender">
+        <el-form-item :label="$t('business.userManager.userInfo.gender')" prop="gender">
           <el-radio-group v-model="form.gender">
-            <el-radio :label="1">{{ $t('common.dic.male') }}</el-radio>
-            <el-radio :label="0">{{ $t('common.dic.female') }}</el-radio>
+            <el-radio :label="1">{{ $t('common.dict.male') }}</el-radio>
+            <el-radio :label="0">{{ $t('common.dict.female') }}</el-radio>
           </el-radio-group>
-<!--          <el-input v-model="form.gender" :placeholder="$t('business.merchant.userInfoBus.genderPlaceholder')" />-->
+<!--          <el-input v-model="form.gender" :placeholder="$t('business.userManager.userInfo.genderPlaceholder')" />-->
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.idCard')" prop="idCard">
-          <el-input v-model="form.idCard" :placeholder="$t('business.merchant.userInfoBus.idCardPlaceholder')" />
+        <el-form-item :label="$t('business.userManager.userInfo.idCard')" prop="idCard">
+          <el-input v-model="form.idCard" :placeholder="$t('business.userManager.userInfo.idCardPlaceholder')" />
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.phone')" prop="phone">
-          <el-input v-model="form.phone" :placeholder="$t('business.merchant.userInfoBus.phonePlaceholder')" />
+        <el-form-item :label="$t('business.userManager.userInfo.phone')" prop="phone">
+          <el-input v-model="form.phone" :placeholder="$t('business.userManager.userInfo.phonePlaceholder')" />
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.age')" prop="age">
-          <el-input v-model="form.age" :placeholder="$t('business.merchant.userInfoBus.agePlaceholder')" />
+        <el-form-item :label="$t('business.userManager.userInfo.age')" prop="age">
+          <el-input v-model="form.age" :placeholder="$t('business.userManager.userInfo.agePlaceholder')" />
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.addr')" prop="addr">
-          <el-input v-model="form.addr" :placeholder="$t('business.merchant.userInfoBus.addrPlaceholder')" />
+        <el-form-item :label="$t('business.userManager.userInfo.addr')" prop="addr">
+          <el-input v-model="form.addr" :placeholder="$t('business.userManager.userInfo.addrPlaceholder')" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -94,25 +94,25 @@
     <!-- 用户信息详情 -->
     <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
       <el-form ref="form" :model="form" label-width="auto">
-        <el-form-item :label="$t('business.merchant.userInfoBus.detailUserId')">
+        <el-form-item :label="$t('business.userManager.userInfo.detailUserId')">
           {{form.userCode}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.detailName')">
+        <el-form-item :label="$t('business.userManager.userInfo.detailName')">
           {{form.name}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.detailGender')">
+        <el-form-item :label="$t('business.userManager.userInfo.detailGender')">
           {{form.gender}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.detailIdCard')">
+        <el-form-item :label="$t('business.userManager.userInfo.detailIdCard')">
           {{form.idCard}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.detailPhone')">
+        <el-form-item :label="$t('business.userManager.userInfo.detailPhone')">
           {{form.phone}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.detailAge')">
+        <el-form-item :label="$t('business.userManager.userInfo.detailAge')">
           {{form.age}}
         </el-form-item>
-        <el-form-item :label="$t('business.merchant.userInfoBus.detailAddr')">
+        <el-form-item :label="$t('business.userManager.userInfo.detailAddr')">
           {{form.addr}}
         </el-form-item>
       </el-form>
@@ -182,22 +182,22 @@
         // 表单校验
         rules: {
           name: [
-            { required: true, message: this.$t('business.merchant.userInfoBus.nameRequired'), trigger: "blur" }
+            { required: true, message: this.$t('business.userManager.userInfo.nameRequired'), trigger: "blur" }
           ],
           gender: [
-            { required: true, message: this.$t('business.merchant.userInfoBus.genderRequired'), trigger: "blur" }
+            { required: true, message: this.$t('business.userManager.userInfo.genderRequired'), trigger: "blur" }
           ],
           idCard: [
-            { required: true,pattern: /^\d+$/, message: "身份证号只能为数字", trigger: "blur" }
+            { required: true,pattern: /^\d+$/, message: this.$t('business.userManager.userInfo.idCardRequired'), trigger: "blur" }
           ],
           phone: [
-            { required: true,pattern: /^\d+$/, message: "手机号只能为数字", trigger: "blur" }
+            { required: true,pattern: /^\d+$/, message: this.$t('business.userManager.userInfo.phoneRequired') , trigger: "blur" }
           ],
           age: [
-            { required: true,pattern: /^\d+$/, message: "年龄只能为数字", trigger: "blur" }
+            { required: true,pattern: /^\d+$/, message: this.$t('business.userManager.userInfo.ageRequired') , trigger: "blur" }
           ],
           addr: [
-            { required: true, message: this.$t('business.merchant.userInfoBus.addrRequired'), trigger: "change" }
+            { required: true, message: this.$t('business.userManager.userInfo.addrRequired'), trigger: "change" }
           ]
         }
       };
@@ -268,7 +268,7 @@
       handleAdd() {
         this.reset();
         this.open = true;
-        this.title = this.$t('business.merchant.userInfoBus.addTitle');
+        this.title = this.$t('business.userManager.userInfo.addTitle');
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
@@ -279,7 +279,7 @@
           this.loading = false;
           this.form = response.data;
           this.open = true;
-          this.title = this.$t('business.merchant.userInfoBus.editTitle');
+          this.title = this.$t('business.userManager.userInfo.editTitle');
         });
       },
       /** 提交按钮 */