Merge branch 'master' of http://dzgogs.hw.hongweisoft.com/tourism_project/tourism_merchant_ui

# Conflicts:
#	src/views/system/user/index.vue

src/api/system/role.js

@@ -47,7 +47,7 @@ export function dataScope(data) {
 // 角色状态修改
 export function changeRoleStatus(roleId, status) {
   const data = {
-    roleId,
+    id,
     status
   }
   return request({

src/api/system/user.js

@@ -58,9 +58,9 @@ export function resetUserPwd(userId, password) {
 }
 
 // 用户状态修改
-export function changeUserStatus(userId, status) {
+export function changeUserStatus(id, status) {
   const data = {
-    userId,
+    id,
     status
   }
   return request({

src/views/system/role/index.vue

@@ -397,7 +397,7 @@ export default {
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
       this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
-        return changeRoleStatus(row.roleId, row.status);
+        return changeRoleStatus(row.id, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {

src/views/system/user/index.vue

@@ -120,7 +120,6 @@
               icon="el-icon-upload2"
               size="mini"
               @click="handleImport"
-              v-if="false" 
               v-hasPermi="['system:user:import']"
             >导入</el-button>
           </el-col>
@@ -185,9 +184,7 @@
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                     v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                  v-if="false"  
-                  v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -430,9 +427,6 @@ export default {
           { required: true, message: "用户名称不能为空", trigger: "blur" },
           { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
-        name: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" }
-        ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
@@ -501,7 +495,7 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.name + '"用户吗？').then(function() {
         return changeUserStatus(row.id, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");