修改账号

src/apis/service/operate/account/index.js

@@ -16,7 +16,7 @@ export default {
   // 删除
   delete: (data, params) => http(api + 'userCompanyBasicDelete', data, 'post', params),
   // 修改密码
-  setpwd: (data, params) => http(api + 'userCompanyBasicPassword', data, 'post', params),
+  setpwd: (data, params) => http('admin/user/edit', data, 'post', params),
   // 修改状态
   status: (data, params) => http(api + 'userCompanyBasicStatus', data, 'post', params),
 
@@ -24,7 +24,7 @@ export default {
   setRole: (data,params) => http(api + "setrole", data, "post", params),
 
   // 注册
-  register: (data, params) => http(loginAPI + 'register', data, 'post', params),
+  register: (data, params) => http('api/wechat/loginByMobile', data, 'post', params),
   //获取不分页角色列表
   roleQuery : (data,params) => http(roleAPI + "query", data, "post", params)
 }

src/views/operate/account/addEdit.vue

@@ -34,16 +34,18 @@
               />
             </el-form-item>
 
-            <el-form-item label="验证码" prop="code">
+            <el-form-item label="验证码" prop="code" v-if="id === 'add'">
               <el-input
                 v-model="ruleForm.code"
                 :placeholder="'验证码'"
                 maxlength="6"
                 :disabled="isDetail"
               >
-                <el-button slot="append" :disabled="numbers > 60" @click="codeTap">{{
-                  numbers === 60 ? "获取验证码" : numbers + "s后重试"
-                }}</el-button>
+                <send-verification-code
+                  slot="append"
+                  :mobile="ruleForm.mobile"
+                  @phoneErr="phoneErr"
+                />
               </el-input>
             </el-form-item>
           </el-form>
@@ -105,11 +107,8 @@ export default {
       is_mainoptions: [],
       isIndeterminate: false,
       ruleForm: {
-        password: "",
-        username: "",
-        nickname: "", // 账号名
         mobile: "", //手机号
-        role_id: "", //角色id
+        code: "",
       },
       platformoptions: [],
       rules: {
@@ -135,6 +134,7 @@ export default {
       this.showModelThis = val;
       if (val) {
         this.initForm();
+        console.log(this.ruleForm);
       }
     },
     showModelThis(val) {
@@ -145,9 +145,11 @@ export default {
   },
   mounted() {},
   methods: {
-    itemidChange(e) {
-      this.ruleForm.itemid = e;
-      this.$refs.ruleForm.validateField("itemid");
+  
+    phoneErr(e) {
+      if (!e) {
+        this.$refs.ruleForm.validateField("mobile");
+      }
     },
     async initForm() {
       this.loading = true;
@@ -239,6 +241,7 @@ export default {
               username: username || "",
               nickname: nickname || "",
               mobile: mobile || "",
+              code: "",
             };
           } else {
             this.ruleForm = {
@@ -247,6 +250,7 @@ export default {
               username: "",
               nickname: "", // 账号名
               mobile: "",
+              code: "",
             };
           }
         }
@@ -257,7 +261,7 @@ export default {
         if (valid) {
           if (!this.loading) {
             this.loading = true;
-            const { username, nickname, password, mobile, email, id } = JSON.parse(
+            const { username, nickname, password, mobile, email, id,code } = JSON.parse(
               JSON.stringify(this.ruleForm)
             );
 
@@ -268,6 +272,7 @@ export default {
               mobile,
               email,
               id,
+              code
             };
 
             let res = {};

src/views/operate/account/components/setRoleModal.vue

@@ -1,8 +1,8 @@
 <template>
   <el-dialog title="设置角色" :visible="visible" @close="handleClose" :close-on-click-modal="false"> 
     <el-form label-width="80px" v-if="info" :rules="rules" :model="ruleForm" ref="ruleForm">
-      <el-form-item label="昵称">
-        <el-input disabled v-model="info.nickname" placeholder="昵称" />
+      <el-form-item label="手机号">
+        <el-input disabled v-model="info.mobile" placeholder="手机号" />
       </el-form-item>
 
       <el-form-item label="角色" prop="role_id">

src/views/operate/account/index.vue

@@ -46,25 +46,6 @@
                     />
                   </el-select>
                 </el-col>
-                <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
-                  <el-input
-                    :size="searchSize"
-                    v-model="parmValue.nickname"
-                    clearable
-                    :maxlength="40"
-                    placeholder="账号名"
-                    @blur="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                    @clear="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              searchList();
-            "
-                  />
-                </el-col>
                 <el-col :span="4" style="width: 160px; padding: 0 0 0 10px">
                   <el-input
                     :size="searchSize"
@@ -102,7 +83,7 @@
                   </el-button>
                 </el-col>
                 <el-col :span="3" style="width: 125px; float: right">
-                  <el-button type="primary" size="mini"  @click="openModal('add', false, {})">注册</el-button>
+                  <el-button type="success" size="mini"  @click="openModal('add', false, {})">新建</el-button>
                   <el-button
                     :size="searchSize"
                     type="primary"
@@ -142,14 +123,15 @@
           ></el-tag>
         </template>
         <template #operation="{ scope }">
-          <el-tooltip
+           <el-tooltip
+            v-if="powers.some((i) => i == '002')"
             effect="dark"
-            content="详情"
+            content="重置密码"
             placement="top"
           >
             <i
-              class="el-icon-view tb-icon"
-              @click="openModal(scope.row.id, true, scope.row)"
+              class="el-icon-refresh-left tb-icon"
+              @click="openPasswordModal(scope.row.id, false)"
             ></i>
           </el-tooltip>
           <el-tooltip
@@ -198,7 +180,6 @@
         @cancel="passwordModel = false"
       />
     </div>
-  </div>
 </template>
 <script>
 import asyncRequest from "@/apis/service/operate/account";
@@ -208,12 +189,13 @@ import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import addEdit from "./addEdit";
 import SetRoleModal from "./components/setRoleModal.vue"
-
+import resetPassword from "./resetPassword";
 export default {
   name: "account",
   components: {
     addEdit,
-    SetRoleModal
+    SetRoleModal,
+    resetPassword
   },
   mixins: [mixinPage, resToken],
   computed: {
@@ -266,15 +248,11 @@ export default {
           prop: "mobile",
           label: "联系电话",
         },
-        {
-          prop: "nickname",
-          label: "昵称",
-        },
+      
         {
           prop: "status",
           label: "状态",
           _slot_: "status",
-          width: "70px",
         },
         {
           prop:'role_name',

src/views/operate/account/resetPassword.vue

@@ -61,7 +61,7 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/interest/account";
+import asyncRequest from "@/apis/service/operate/account";
 import { isnumber, isAlphanumeric, validAlphabets } from "@/utils/validate";
 import resToken from "@/mixins/resToken";
 export default {