Merge branch 'main' of http://192.168.0.60:3000/coin/fundHoldAdmin

src/views/business/userRegister/index.vue

@@ -1,18 +1,10 @@
 <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="用户id" prop="userId">
+      <el-form-item label="登录账号" prop="name">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="名字" prop="name">
         <el-input
           v-model="queryParams.name"
-          placeholder="请输入名字"
+          placeholder="请输入登录账号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -25,13 +17,25 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="密码" prop="passwd">
+      <el-form-item label="用户类型" prop="userType">
-        <el-input
+        <el-select v-model="form.userType" placeholder="请选择用户类型" >
-          v-model="queryParams.passwd"
+          <el-option
-          placeholder="请输入密码"
+            v-for="item in options_userType"
-          clearable
+            :key="item.value"
-          @keyup.enter.native="handleQuery"
+            :label="item.label"
-        />
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户级别" prop="userLevel">
+        <el-select v-model="form.userLevel" size="medium" placeholder="请选择用户级别" >
+          <el-option
+            v-for="item in options_userLevel"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -87,13 +91,11 @@
 
     <el-table v-loading="loading" :data="userRegisterList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一ID" align="center" prop="id" v-if="true"/>
-      <el-table-column label="用户id" align="center" prop="userId" />
       <el-table-column label="名字" align="center" prop="name" />
       <el-table-column label="电话" align="center" prop="phone" />
-      <el-table-column label="密码" align="center" prop="passwd" />
       <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="用户类型" align="center" prop="userType" />
+      <el-table-column label="用户级别" align="center" prop="userLevel" />
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -131,17 +133,37 @@
     <!-- 添加或修改用户注册对话框 -->
     <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="用户id" prop="userId">
+        <el-form-item label="登录账号" prop="name">
-          <el-input v-model="form.userId" placeholder="请输入用户id" />
-        </el-form-item>
-        <el-form-item label="名字" prop="name">
           <el-input v-model="form.name" placeholder="请输入名字" />
         </el-form-item>
-        <el-form-item label="电话" prop="phone">
+        <el-form-item label="联系电话" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入电话" />
         </el-form-item>
-        <el-form-item label="密码" prop="passwd">
+        <el-form-item label="用户类型" prop="userType">
-          <el-input v-model="form.passwd" placeholder="请输入密码" />
+          <el-select v-model="form.userType" placeholder="请选择用户类型" >
+            <el-option
+              v-for="item in options_userType"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用户级别" prop="userLevel">
+          <el-select v-model="form.userLevel" size="medium" placeholder="请选择用户级别" >
+            <el-option
+              v-for="item in options_userLevel"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="登录密码" prop="passwd">
+          <el-input v-model="form.passwd" show-password placeholder="请输入密码" />
+        </el-form-item>
+        <el-form-item label="确认密码" prop="passwd_re">
+          <el-input v-model="form.passwd_re" show-password placeholder="请输入密码" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -217,16 +239,39 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "唯一ID不能为空", trigger: "blur" }
-        ],
         name: [
           { required: true, message: "名字不能为空", trigger: "blur" }
         ],
         userType: [
           { required: true, message: "用户类型不能为空", trigger: "change" }
         ],
-      }
+        userLevel: [
+          { required: true, message: "用户级别不能为空", trigger: "change" }
+        ],
+        passwd: [
+          { required: true, message: "登录密码不能为空", trigger: "change" }
+        ],
+        passwd_re: [
+          { required: true, message: "登录密码确认不能为空", trigger: "change" }
+        ],
+      },
+      options_userType: [{
+        value: '0',
+        label: '普通用户'
+      }, {
+        value: '1',
+        label: '商企用户'
+      }],
+      options_userLevel: [{
+        value: '0',
+        label: '普通用户'
+      }, {
+        value: '1',
+        label: 'VIP用户'
+      }, {
+        value: '2',
+        label: '商企用户'
+      }]
     };
   },
   created() {