diff --git a/src/api/xq/areaCode.js b/src/api/xq/areaCode.js
index be49d99..b40d0d0 100644
--- a/src/api/xq/areaCode.js
+++ b/src/api/xq/areaCode.js
@@ -17,6 +17,15 @@ export function getAreaCode(code) {
})
}
+// 查询行政区划详细
+export function getTreeAreaCode() {
+ return request({
+ url: '/xq/areaCode/tree',
+ method: 'get'
+ })
+}
+
+
// 新增行政区划
export function addAreaCode(data) {
return request({
diff --git a/src/components/CaiDictTag/index.vue b/src/components/CaiDictTag/index.vue
index de174f4..dabd49d 100644
--- a/src/components/CaiDictTag/index.vue
+++ b/src/components/CaiDictTag/index.vue
@@ -4,11 +4,13 @@
{{ item.label }}
+ >
+ {{ item.label }}
+ {{splitValue}}
+
parseInt(str));
}
return split;
diff --git a/src/constant/statusMap.js b/src/constant/statusMap.js
index 1c36358..1adb927 100644
--- a/src/constant/statusMap.js
+++ b/src/constant/statusMap.js
@@ -300,8 +300,6 @@ export const userCompanyNatureList = [
]
-/** 用户 - 为谁征婚 */
-
export const systemPushGroupIdList = [
{ value: 0, label: '单个用户'},
{ value: 1, label: '全部用户'},
@@ -336,6 +334,7 @@ export const systemPushTypeList = [
{ value: 4, label: '纯图文消息',listClass: listClass.warning},
]
+/** 用户 - 为谁征婚 */
export const userForPersonalsList = [
{ value: 1, label: '为自己征婚'},
{ value: 2, label: '为子女征婚' },
@@ -596,3 +595,84 @@ export const userSignList = [
{ value: 11, label: '水瓶座'},
{ value: 12, label: '双鱼座'},
]
+
+export const finishStatusList = [
+ { value: 1, label: '已完成',listClass: listClass.primary},
+ { value: 0, label: '未完成',listClass: listClass.warning},
+]
+
+export const appUserTypeList = [
+ { value: 0, label: '正常用户',listClass: listClass.primary},
+ { value: 1, label: '内部用户',listClass: listClass.warning},
+]
+
+
+export const professionList = [
+ { value: '运动员', label: '运动员'},
+ { value: '教师', label: '教师'},
+ { value: '教授', label: '教授'},
+ { value: '学生', label: '学生'},
+ { value: '董事长', label: '董事长'},
+ { value: '总经理', label: '总经理'},
+ { value: '副总/总监', label: '副总/总监'},
+ { value: '部门经理', label: '部门经理'},
+ { value: '中层管理', label: '中层管理'},
+ { value: '企业家', label: '企业家'},
+ { value: '个体老板', label: '个体老板'},
+ { value: '干部', label: '干部'},
+ { value: '公务员', label: '公务员'},
+ { value: '律师', label: '律师'},
+ { value: '医生', label: '医生'},
+ { value: '护士', label: '护士'},
+ { value: '专家学者', label: '专家学者'},
+ { value: '工程师', label: '工程师'},
+ { value: '设计师', label: '设计师'},
+ { value: '艺术家', label: '艺术家'},
+ { value: '文员', label: '文员'},
+ { value: '主播', label: '主播'},
+ { value: '会计', label: '会计'},
+ { value: '技术员', label: '技术员'},
+ { value: '服务员', label: '服务员'},
+ { value: '普通工人', label: '普通工人'},
+ { value: '自由职业', label: '自由职业'},
+ { value: '美容业', label: '美容业'},
+ { value: '培训师', label: '培训师'},
+ { value: '媒体工作者', label: '媒体工作者'},
+ { value: '摄影师', label: '摄影师'},
+ { value: '咨询师', label: '咨询师'},
+ { value: '银行', label: '银行'},
+ { value: '保险', label: '保险'},
+ { value: '房产销售', label: '房产销售'},
+ { value: '军人', label: '军人'},
+ { value: '消防员', label: '消防员'},
+ { value: '警察', label: '警察'},
+ { value: '国企职员', label: '国企职员'},
+ { value: '司机', label: '司机'},
+ { value: '种养殖', label: '种养殖'},
+ { value: '销售', label: '销售'},
+ { value: '教培老师', label: '教培老师'},
+ { value: '建筑施工', label: '建筑施工'},
+ { value: '辅警安保', label: '辅警安保'},
+ { value: '程序员', label: '程序员'},
+ { value: '婚庆主持', label: '婚庆主持'},
+ { value: '机构负责人', label: '机构负责人'},
+ { value: '医技', label: '医技'},
+ { value: '项目管理', label: '项目管理'},
+ { value: '电子商务', label: '电子商务'},
+ { value: '带货主播', label: '带货主播'},
+ { value: '鉴定员', label: '鉴定员'},
+ { value: '编辑', label: '编辑'},
+ { value: '记者', label: '记者'},
+ { value: '物流', label: '物流'},
+ { value: '装修工', label: '装修工'},
+ { value: '工程主管', label: '工程主管'},
+ { value: '金融投资', label: '金融投资'},
+ { value: '客服', label: '客服'},
+ { value: '空乘', label: '空乘'},
+ { value: '财务', label: '财务'},
+ { value: '翻译', label: '翻译'},
+ { value: '事业单位', label: '事业单位'},
+ { value: '招商', label: '招商'},
+ { value: '厨师', label: '厨师'},
+ { value: '幼教', label: '幼教'},
+]
diff --git a/src/views/xq/user/add-user-dialog.vue b/src/views/xq/user/add-user-dialog.vue
new file mode 100644
index 0000000..1341138
--- /dev/null
+++ b/src/views/xq/user/add-user-dialog.vue
@@ -0,0 +1,299 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/xq/user/index.vue b/src/views/xq/user/index.vue
index fdd0b5b..c72a4e3 100644
--- a/src/views/xq/user/index.vue
+++ b/src/views/xq/user/index.vue
@@ -66,6 +66,11 @@
+
+
+
+
+
@@ -106,7 +111,7 @@
详情
更多
@@ -135,6 +140,8 @@
/>
+
+
@@ -150,16 +157,20 @@ import {
userResetNickname,
userLock, userUnlock
} from '@/api/xq/user'
-import { genderList, userStatusList } from '@/constant/statusMap'
+import { appUserTypeList, genderList, userStatusList } from '@/constant/statusMap'
import BindInviteDialog from '@/views/xq/user/bind-invite-dialog.vue'
+import UserInfoDialog from '@/views/xq/user/user-info-dialog.vue'
+import AddUserDialog from '@/views/xq/user/add-user-dialog.vue'
export default {
name: "User",
- components: {BindInviteDialog},
+ components: { BindInviteDialog,UserInfoDialog,AddUserDialog},
data() {
return {
- userStatusList,genderList,
+ userStatusList,genderList,appUserTypeList,
bindInviteDialogVisible: false,
+ userInfoDialogVisible: false,
+ addUserDialogVisible: false,
// 遮罩层
loading: true,
// 选中数组
@@ -216,9 +227,20 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
+ this.addUserDialogVisible = true
+ this.$nextTick(() => {
+ this.$refs.addUserDialog.init()
+ })
},
/** 修改按钮操作 */
handleUpdate(row) {
+
+ },
+ handleInfo(row) {
+ this.userInfoDialogVisible = true
+ this.$nextTick(() => {
+ this.$refs.userInfoDialog.init(row.id)
+ })
},
handleUserResetAvatar(row){
this.$modal.confirm('是否确认重置用户"' + row.nickname + '"的头像？').then(() => {
diff --git a/src/views/xq/user/user-info-dialog.vue b/src/views/xq/user/user-info-dialog.vue
index 8c5d4a6..aadbcdc 100644
--- a/src/views/xq/user/user-info-dialog.vue
+++ b/src/views/xq/user/user-info-dialog.vue
@@ -15,6 +15,9 @@
{{info.user.nickname}}
+
+
+
@@ -27,111 +30,176 @@
{{info.user.birthday}}
-
-
+
+
+
+ {{info.user.height}}
+
+
+ {{info.user.weight}}
+
- {{info.user.city}}
+ {{info.user.residenceName}}
-
-
+
+ {{info.user.addressName}}
-
-
+
+
+
+
+
+
+
+ {{info.user.profession}}
+
+
+
-
- {{info.userInfo.lastLoginIp}}
+ {{info.userLogin.lastLoginIp}}
- {{info.userInfo.lastLoginTime}}
+ {{info.userLogin.lastLoginTime}}
- {{info.userInfo.lastLocation}}
+ {{info.userLogin.lastLocation}}
- {{info.userInfo.regIp}}
+ {{info.userLogin.regIp}}
- {{info.userInfo.regTime}}
+ {{info.userLogin.regTime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{info.user.wxCode}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{info.userInfo.nation}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{info.userInfo.graduateSchool}}
+
+
+ {{info.userInfo.hobbys}}
+
+
+ {{info.user.remark}}
+
+
+
+
+
+
+ {{info.userInfo.filterAge}}
+
+
+ {{info.userInfo.filterHeight}}
+
+
+
+
+
+
+
+
+
+
+
+ {{info.userInfo.filterResidence}}
+
+
+
+
+
+
+
+
+
+
+
+
-
- {{info.account.coin}}
-
-
+
{{info.account.incomeCoin}}
-
- {{info.account.totalBuyMoney}}
+
+ {{info.account.wxTransNum}}
-
- {{info.account.totalBuyCoin}}
+
+ {{info.account.consumeTotal}}
-
-
-
-
-
-
- {{info.userMember.expireDate}}
-
-
-
-
-
-
-
-
-
- {{info.anchor.price}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{info.anchor.giveScore}}
-
-
- {{info.anchor.serviceCount}}
-
-
- {{info.anchor.serviceTime}}
-
-
- {{info.anchor.videoRate}}
-
-
- {{info.anchor.guardRate}}
-
-
- {{info.anchor.giftRate}}
-
-
-
-
+