shish 5 лет назад
Родитель
Сommit
f2eefc2ba2

+ 7 - 7
ghs/src/views/staff/list.vue

@@ -6,7 +6,7 @@
 				<i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
 			</template>
 			<template #table-column-avatar="{scope}">
-				<cl-avatar shape="circle" :size="24" :src="scope.row.avatarUrl" :style="{ margin: 'auto' }"></cl-avatar>
+				<cl-avatar shape="circle" :size="24" :src="scope.row.avatar" :style="{ margin: 'auto' }"></cl-avatar>
 			</template>
 
 			<template #table-column-incomeNotice="{scope}">
@@ -67,8 +67,8 @@
 		>
 			<div class="ad-modal-content">
 				<el-form :model="adForm" :rules="ruleForm" ref="adForm" label-width="100px" class="demo-form">
-					<el-form-item label="姓名" prop="adminName">
-						<el-input v-model="adForm.adminName" placeholder="请输入姓名" size="small"></el-input>
+					<el-form-item label="姓名" prop="name">
+						<el-input v-model="adForm.name" placeholder="请输入姓名" size="small"></el-input>
 					</el-form-item>
 					<el-form-item label="角色" prop="roleId">
 						<el-select v-model="adForm.roleName" size="small" placeholder="请选择角色" @change="selRoleFn">
@@ -130,7 +130,7 @@ export default {
 			showMiniCode: false,
 			miniCodeSrc: '',
 			adForm: {
-				adminName: '',
+				name: '',
 				roleId: '',
 				roleName: '',
 				remind: '1',
@@ -140,7 +140,7 @@ export default {
 				status: '1'
 			},
 			ruleForm: {
-				adminName: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+				name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
 				roleName: [{ required: true, message: '请选择角色', trigger: 'change' }],
 				//userId: [{ required: true, message: '请选择会员', trigger: 'blur' }],
 				password: { required: true, message: '请输入密码', trigger: 'blur' }
@@ -218,7 +218,7 @@ export default {
 			this.memberData = {};
 
 			this.adForm = {
-				adminName: '',
+				name: '',
 				roleId: '',
 				roleName: '',
 				remind: '1',
@@ -322,7 +322,7 @@ export default {
 							width: 130
 						},
 						{
-							prop: 'adminName',
+							prop: 'name',
 							label: '姓名',
 							align: 'center'
 						},

+ 1 - 1
ghsApp/src/admin/staff/achieve.vue

@@ -106,7 +106,7 @@ export default {
 			columns: [
 				{
 					name: "姓名",
-					dataIndex: "adminName",
+					dataIndex: "name",
 					color: "info"
 				},
 				{

+ 4 - 4
ghsApp/src/admin/staff/add.vue

@@ -7,10 +7,10 @@
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title required">姓名</div>
             <input
-              v-model="form.adminName"
+              v-model="form.name"
               placeholder-class="phcolor"
               class="tui-input"
-              name="adminName"
+              name="name"
               placeholder="请输入姓名"
               maxlength="50"
               type="text"
@@ -113,7 +113,7 @@ export default {
   data() {
     return {
       form: {
-        adminName: "",
+        name: "",
         //mobile: '',
         roleId: "",
         remind: 1,
@@ -261,7 +261,7 @@ export default {
       // 表单规则
       let rules = [
         {
-          name: "adminName",
+          name: "name",
           rule: ["required"],
           msg: ["请输入姓名"]
         },

+ 4 - 3
ghsApp/src/admin/staff/list.vue

@@ -13,9 +13,10 @@
 						<div class="list-det">
 							<div class="list-det-left">
 								<div>
-									<span class="staff-name">{{ item.adminName }}</span>
-									<span>{{ item.roleName }}</span>
+									<span class="staff-name">{{ item.name }}</span>
+									<span>{{ item.mobile }}</span>
 								</div>
+								<div></div>
 								<div class="flex-center">
 									<div class="status-list">
 										<i class="iconfont icondagou" :class="[item.remind == 1 ? 'app-color-1' : '' ]"></i>
@@ -89,7 +90,7 @@
 								<div class="axis-det">
 									<div>ID:{{ item.id }}</div>
 									<div>IP:{{ item.ip }}</div>
-									<div>操作者:{{ item.adminName }}</div>
+									<div>操作者:{{ item.name }}</div>
 									<div>操作时间:{{ item.addTime | formatTime }}</div>
 								</div>
 							</template>

+ 8 - 8
hd/src/views/staff/list.vue

@@ -6,7 +6,7 @@
 				<i class="el-icon-success" v-else style="color:#C0C4CC;font-size:19px;"></i>
 			</template>
 			<template #table-column-avatar="{scope}">
-				<cl-avatar shape="circle" :size="24" :src="scope.row.avatarUrl" :style="{ margin: 'auto' }"></cl-avatar>
+				<cl-avatar shape="circle" :size="24" :src="scope.row.avatar" :style="{ margin: 'auto' }"></cl-avatar>
 			</template>
 
 			<template #table-column-incomeNotice="{scope}">
@@ -78,8 +78,8 @@
 		>
 			<div class="ad-modal-content">
 				<el-form :model="adForm" :rules="ruleForm" ref="adForm" label-width="100px" class="demo-form">
-					<el-form-item label="姓名" prop="adminName">
-						<el-input v-model="adForm.adminName" placeholder="请输入姓名" size="small"></el-input>
+					<el-form-item label="姓名" prop="name">
+						<el-input v-model="adForm.name" placeholder="请输入姓名" size="small"></el-input>
 					</el-form-item>
 					<el-form-item label="角色" prop="roleId">
 						<el-select v-model="adForm.roleName" size="small" placeholder="请选择角色" @change="selRoleFn">
@@ -165,7 +165,7 @@ export default {
 			showMiniCode: false,
 			miniCodeSrc: '',
 			adForm: {
-				adminName: '',
+				name: '',
 				roleId: '',
 				roleName: '',
 				remind: '1',
@@ -175,7 +175,7 @@ export default {
 				status: '1'
 			},
 			ruleForm: {
-				adminName: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+				name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
 				roleName: [{ required: true, message: '请选择角色', trigger: 'change' }],
 				//userId: [{ required: true, message: '请选择会员', trigger: 'blur' }],
 				password: { required: true, message: '请输入密码', trigger: 'blur' }
@@ -254,7 +254,7 @@ export default {
 			this.memberData = {};
 
 			this.adForm = {
-				adminName: '',
+				name: '',
 				roleId: '',
 				roleName: '',
 				remind: '1',
@@ -361,11 +361,11 @@ export default {
 							}
 						},
 						{
-							prop: 'adminName',
+							prop: 'name',
 							label: '姓名',
 							align: 'center',
 							formatter: row => {
-								return row.adminBaseInfo.adminName;
+								return row.adminBaseInfo.name;
 							}
 						},
 						{

+ 1 - 1
hdApp/src/admin/staff/achieve.vue

@@ -106,7 +106,7 @@ export default {
 			columns: [
 				{
 					name: "姓名",
-					dataIndex: "adminName",
+					dataIndex: "name",
 					color: "info"
 				},
 				{

+ 4 - 4
hdApp/src/admin/staff/add.vue

@@ -7,10 +7,10 @@
           <tui-list-cell class="line-cell" :hover="false">
             <div class="tui-title required">姓名</div>
             <input
-              v-model="form.adminName"
+              v-model="form.name"
               placeholder-class="phcolor"
               class="tui-input"
-              name="adminName"
+              name="name"
               placeholder="请输入姓名"
               maxlength="50"
               type="text"
@@ -135,7 +135,7 @@ export default {
   data() {
     return {
       form: {
-        adminName: "",
+        name: "",
         //mobile: '',
         roleId: "",
         remind: 1,
@@ -283,7 +283,7 @@ export default {
       // 表单规则
       let rules = [
         {
-          name: "adminName",
+          name: "name",
           rule: ["required"],
           msg: ["请输入姓名"]
         },

+ 3 - 3
hdApp/src/admin/staff/list.vue

@@ -13,8 +13,8 @@
 						<div class="list-det">
 							<div class="list-det-left">
 								<div>
-									<span class="staff-name">{{ item.adminName }}</span>
-									<span>{{ item.roleName }}</span>
+									<span class="staff-name">{{ item.name }}</span>
+									<span>{{ item.mobile }}</span>
 								</div>
 								<div class="flex-center">
 									<div class="status-list">
@@ -89,7 +89,7 @@
 								<div class="axis-det">
 									<div>ID:{{ item.id }}</div>
 									<div>IP:{{ item.ip }}</div>
-									<div>操作者:{{ item.adminName }}</div>
+									<div>操作者:{{ item.name }}</div>
 									<div>操作时间:{{ item.addTime | formatTime }}</div>
 								</div>
 							</template>

+ 1 - 1
pt/vue.config.js

@@ -2,7 +2,7 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
-//http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
+//http和https切换请修改这里,修改后需要重新运行 npm run serve 即可 shish 2021.4.12
 const proxyTarget =
 	process.env.NODE_ENV == 'local' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';