init

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({

src/components/CaiDictTag/index.vue

@@ -4,11 +4,13 @@
     <template v-if="values && values.length > 0" v-for="(item, index) in options">
       <template v-if="values.includes(item.value)">
         <span
-          v-if="item.listClass === 'default' || !item.listClass "
+          v-if="item.listClass === 'default' || !item.listClass"
           :key="item.value"
           :index="index"
-          >{{ item.label }}</span
           >
+          {{ item.label }}
+          <span v-if="splitValue">{{splitValue}}</span>
+        </span>
         <el-tag
           v-else
           :disable-transitions="true"
@@ -64,8 +66,11 @@ export default {
   },
   methods: {
     stringToArray(data,splitValue,splitValueType){
+      if(data === undefined || data === '') {
+        return [];
+      }
       let split = data.split(splitValue)
-      if(splitValueType && splitValueType === 'int'){
+      if(splitValueType && splitValueType !== '' && splitValueType === 'int'){
         return split.map(str => parseInt(str));
       }
       return split;

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: '幼教'},
+]

src/views/xq/user/add-user-dialog.vue

@@ -0,0 +1,299 @@
+<template>
+  <el-dialog title="新增用户" :close-on-click-modal="false" :visible.sync="open" width="800px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="用户类型" prop="userType">
+            <el-select v-model="form.userType" clearable size="small" style="width: 95%">
+              <el-option
+                  v-for="dict in appUserTypeList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="手机号" prop="mobile">
+            <el-input v-model="form.mobile" maxlength="11" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="昵称" prop="nickname">
+            <el-input v-model="form.nickname" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="头像" prop="avatar">
+            <image-upload2 v-model="form.avatar"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="性别" prop="gender">
+            <el-select v-model="form.gender" clearable size="small" style="width: 95%">
+              <el-option
+                  v-for="dict in genderList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="生日" prop="birthday" style="width: 95%">
+            <el-date-picker
+                v-model="form.birthday"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="身高(cm)" prop="height">
+            <el-input-number v-model="form.height" controls-position="right" :min="100" style="width: 95%"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="体重(kg)" prop="weight">
+            <el-input-number v-model="form.weight" controls-position="right" :min="30" style="width: 95%"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="居住地" prop="residenceCode">
+            <treeselect v-model="form.residenceCode" :normalizer="normalizer" :options="areaOption" :show-count="true" :disable-branch-nodes="true" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="户籍地" prop="addressCode">
+            <treeselect v-model="form.addressCode" :normalizer="normalizer"  :options="areaOption" :show-count="true" :disable-branch-nodes="true" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="学历" prop="education">
+            <el-select v-model="form.education" clearable size="small" style="width: 95%">
+              <el-option
+                  v-for="dict in userEducationList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="婚况" prop="marriage">
+            <el-select v-model="form.marriage" clearable size="small" style="width: 95%">
+              <el-option
+                  v-for="dict in userMarriageList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="职业" prop="profession">
+            <el-select v-model="form.profession" clearable size="small" style="width: 95%">
+              <el-option
+                  v-for="dict in professionList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="年收入" prop="annualIncome">
+            <el-select v-model="form.annualIncome" clearable size="small" style="width: 95%">
+              <el-option
+                  v-for="dict in userAnnualIncomeList"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="open = false">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {
+  appUserTypeList,
+  booleanList,
+  finishStatusList,
+  genderList,
+  memberTypeList,
+  onlineStatusList,
+  professionList,
+  userAnnualIncomeList,
+  userCarStatusList,
+  userChildStatusList,
+  userCompanyNatureList,
+  userDrinkStatusList,
+  userEducationList,
+  userFamilyBackgroundList,
+  userFamilyRankingList,
+  userFindTagList,
+  userForPersonalsList,
+  userHousingStatusList,
+  userLiveAtParentList,
+  userLoveAtDistanceList,
+  userMarriageList,
+  userSignList,
+  userSmokeStatusList,
+  userSomatotypeList,
+  userStatusList,
+  userWantChildList,
+  userWhenMarriageList,
+  userZodiacList,
+  videoStatusList
+} from '@/constant/statusMap'
+import Treeselect from '@riophae/vue-treeselect'
+import { getTreeAreaCode } from '@/api/xq/areaCode'
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { addBanner } from '@/api/xq/banner'
+import { addUser } from '@/api/xq/user'
+
+export default {
+  name: "UserInfo",
+  components: { Treeselect },
+  data() {
+    return {
+      genderList,userStatusList,finishStatusList,userSomatotypeList,userZodiacList,userSignList,
+      userEducationList,userCompanyNatureList,userAnnualIncomeList,userForPersonalsList,
+      userHousingStatusList,userCarStatusList,userSmokeStatusList,userMarriageList,
+      userDrinkStatusList,userChildStatusList,userFamilyBackgroundList,userFamilyRankingList,
+      userLoveAtDistanceList,userWhenMarriageList,userWantChildList,userLiveAtParentList,
+      userFindTagList,appUserTypeList,professionList,
+      videoStatusList,onlineStatusList,memberTypeList,
+      booleanList,
+      open:false,
+      buttonLoading: false,
+      form:{
+        annualIncome: undefined,
+        profession: undefined,
+        marriage: undefined,
+        education: undefined,
+        addressCode: undefined,
+        residenceCode: undefined,
+        weight: undefined,
+        height: undefined,
+        birthday: undefined,
+        gender: undefined,
+        avatar: undefined,
+        nickname: undefined,
+        mobile: undefined,
+        userType: undefined,
+      },
+      rules:{
+        annualIncome: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        profession: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        marriage: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        education: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        addressCode: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        residenceCode: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        weight: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        height: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        birthday: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        gender: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        avatar: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        nickname: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        mobile: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        userType: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+      },
+      areaOption: [],
+    };
+  },
+  created() {
+    getTreeAreaCode().then(response => {
+      this.areaOption = response.data
+    })
+  },
+  methods: {
+    normalizer(node){
+      return {
+        id: node.id,
+        label: node.label,
+        children: node.children && node.children.length > 0 ? node.children : 0,
+      }
+    },
+    options(){
+      getTreeAreaCode().then(response => {
+        return response.data
+      })
+    },
+    init(){
+      this.open = true;
+      this.$nextTick(() => {
+        this.$refs['form'].resetFields();
+        // getTreeAreaCode().then(response => {
+        //   this.areaOption = response.data
+        // })
+      })
+    },
+    submitForm(){
+      addUser(this.form).then(data => {
+        this.$modal.msgSuccess("新增用户成功");
+        this.buttonLoading = false;
+        this.open = false
+        this.$emit('refreshDataList')
+      }).finally(() => {
+        this.buttonLoading = false;
+      });
+    }
+  }
+};
+</script>

src/views/xq/user/index.vue

@@ -66,6 +66,11 @@
 
     <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户类型" align="center" prop="userType" >
+        <template v-slot="scope">
+          <cai-dict-tag :options="appUserTypeList" :value="scope.row.type" />
+        </template>
+      </el-table-column>
       <el-table-column label="编号" align="center" prop="usercode" />
       <el-table-column label="昵称" align="center" prop="nickname" />
       <el-table-column label="手机号" align="center" prop="mobile" />
@@ -106,7 +111,7 @@
           <el-button
             size="mini"
             type="text"
-            @click="handleDelete(scope.row)"
+            @click="handleInfo(scope.row)"
           >详情</el-button>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
@@ -135,6 +140,8 @@
     />
 
     <bind-invite-dialog v-if="bindInviteDialogVisible" ref="bindInviteDialog" @refreshDataList="getList" />
+    <user-info-dialog v-if="userInfoDialogVisible" ref="userInfoDialog" />
+    <add-user-dialog v-if="addUserDialogVisible" ref="addUserDialog" />
   </div>
 </template>
 
@@ -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(() => {

src/views/xq/user/user-info-dialog.vue

@@ -15,6 +15,9 @@
           <el-descriptions-item label="昵称">
             {{info.user.nickname}}
           </el-descriptions-item>
+          <el-descriptions-item label="用户类型">
+            <cai-dict-tag :options="appUserTypeList" :value="info.user.type" />
+          </el-descriptions-item>
           <el-descriptions-item label="头像">
             <image-avatar :src="info.user.avatar" />
           </el-descriptions-item>
@@ -27,111 +30,176 @@
           <el-descriptions-item label="生日">
             {{info.user.birthday}}
           </el-descriptions-item>
-          <el-descriptions-item label="资料完成">
+          <el-descriptions-item label="基础资料是否完成">
-            <cai-dict-tag :options="authList" :value="info.user.finishStatus" />
+            <cai-dict-tag :options="finishStatusList" :value="info.user.finishBaseStatus" />
           </el-descriptions-item>
           <el-descriptions-item label="相册" :span="3" v-if="info.userAlbums">
             <span v-for='val in info.userAlbums'>
               <image-preview :src="val.url" height="45px" width="45px"  /> &nbsp;&nbsp;
             </span>
           </el-descriptions-item>
+          <el-descriptions-item label="身高">
+            {{info.user.height}}
+          </el-descriptions-item>
+          <el-descriptions-item label="体重">
+            {{info.user.weight}}
+          </el-descriptions-item>
           <el-descriptions-item label="居住地">
-            {{info.user.city}}
+            {{info.user.residenceName}}
           </el-descriptions-item>
-          <el-descriptions-item label="住房情况">
+          <el-descriptions-item label="户籍地">
-            <cai-dict-tag :options="userHousingStatusList" :value="info.user.housingStatus" />
+            {{info.user.addressName}}
           </el-descriptions-item>
-          <el-descriptions-item label="购车情况">
+          <el-descriptions-item label="学历">
-            <cai-dict-tag :options="userCarStatusList" :value="info.user.carStatus" />
+            <cai-dict-tag :options="userEducationList" :value="info.user.education" />
+          </el-descriptions-item>
+          <el-descriptions-item label="婚况">
+            <cai-dict-tag :options="userMarriageList" :value="info.user.marriage" />
+          </el-descriptions-item>
+          <el-descriptions-item label="职业">
+            {{info.user.profession}}
+          </el-descriptions-item>
+          <el-descriptions-item label="年收入">
+            <cai-dict-tag :options="userAnnualIncomeList" :value="info.user.annualIncome" />
           </el-descriptions-item>
           <el-descriptions-item label="状态">
             <cai-dict-tag :options="userStatusList" :value="info.user.status" />
           </el-descriptions-item>
-
           <el-descriptions-item label="最后登录IP">
-            {{info.userInfo.lastLoginIp}}
+            {{info.userLogin.lastLoginIp}}
           </el-descriptions-item>
           <el-descriptions-item label="最后登录时间">
-            {{info.userInfo.lastLoginTime}}
+            {{info.userLogin.lastLoginTime}}
           </el-descriptions-item>
           <el-descriptions-item label="最后登录位置">
-            {{info.userInfo.lastLocation}}
+            {{info.userLogin.lastLocation}}
           </el-descriptions-item>
           <el-descriptions-item label="注册IP">
-            {{info.userInfo.regIp}}
+            {{info.userLogin.regIp}}
           </el-descriptions-item>
           <el-descriptions-item label="注册时间">
-            {{info.userInfo.regTime}}
+            {{info.userLogin.regTime}}
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+      <el-collapse-item title="详细信息" name="fullInfo">
+        <el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
+          <el-descriptions-item label="体型">
+            <cai-dict-tag :options="userSomatotypeList" :value="info.user.somatotype" />
+          </el-descriptions-item>
+          <el-descriptions-item label="生肖">
+            <cai-dict-tag :options="userZodiacList" :value="info.user.zodiac" />
+          </el-descriptions-item>
+          <el-descriptions-item label="星座">
+            <cai-dict-tag :options="userSignList" :value="info.user.sign" />
+          </el-descriptions-item>
+          <el-descriptions-item label="公司性质">
+            <cai-dict-tag :options="userCompanyNatureList" :value="info.user.companyNature" />
+          </el-descriptions-item>
+          <el-descriptions-item label="为谁征婚">
+            <cai-dict-tag :options="userForPersonalsList" :value="info.user.forPersonals" />
+          </el-descriptions-item>
+          <el-descriptions-item label="微信号">
+            {{info.user.wxCode}}
+          </el-descriptions-item>
+          <el-descriptions-item label="住房情况">
+            <cai-dict-tag :options="userHousingStatusList" :value="info.userInfo.housingStatus" />
+          </el-descriptions-item>
+          <el-descriptions-item label="购车情况">
+            <cai-dict-tag :options="userCarStatusList" :value="info.userInfo.carStatus" />
+          </el-descriptions-item>
+          <el-descriptions-item label="是否吸烟">
+            <cai-dict-tag :options="userSmokeStatusList" :value="info.userInfo.smokeStatus" />
+          </el-descriptions-item>
+          <el-descriptions-item label="是否喝酒">
+            <cai-dict-tag :options="userDrinkStatusList" :value="info.userInfo.drinkStatus" />
+          </el-descriptions-item>
+          <el-descriptions-item label="民族">
+            {{info.userInfo.nation}}
+          </el-descriptions-item>
+          <el-descriptions-item label="有没有小孩">
+            <cai-dict-tag :options="userChildStatusList" :value="info.userInfo.childStatus" />
+          </el-descriptions-item>
+          <el-descriptions-item label="家庭背景">
+            <cai-dict-tag :options="userFamilyBackgroundList" :value="info.userInfo.familyBackground" />
+          </el-descriptions-item>
+          <el-descriptions-item label="家中排行">
+            <cai-dict-tag :options="userFamilyRankingList" :value="info.userInfo.familyRanking" />
+          </el-descriptions-item>
+          <el-descriptions-item label="是否接受异地恋">
+            <cai-dict-tag :options="userLoveAtDistanceList" :value="info.userInfo.loveAtDistance" />
+          </el-descriptions-item>
+          <el-descriptions-item label="何时结婚">
+            <cai-dict-tag :options="userWhenMarriageList" :value="info.userInfo.whenMarriage" />
+          </el-descriptions-item>
+          <el-descriptions-item label="是否要小孩">
+            <cai-dict-tag :options="userCarStatusList" :value="info.userInfo.wantChild" />
+          </el-descriptions-item>
+          <el-descriptions-item label="愿与对方父母同住">
+            <cai-dict-tag :options="userLiveAtParentList" :value="info.userInfo.liveAtParent" />
+          </el-descriptions-item>
+          <el-descriptions-item label="交友目的">
+            <cai-dict-tag :options="userFindTagList" :value="info.userInfo.findTag" />
+          </el-descriptions-item>
+          <el-descriptions-item label="毕业院校">
+            {{info.userInfo.graduateSchool}}
+          </el-descriptions-item>
+          <el-descriptions-item label="兴趣爱好">
+            {{info.userInfo.hobbys}}
+          </el-descriptions-item>
+          <el-descriptions-item label="自我描述">
+            {{info.user.remark}}
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-collapse-item>
+      <el-collapse-item title="择偶条件" name="filter">
+        <el-descriptions :contentStyle="CS" :label-style="LS " class="margin-top" :column="3" size="medium" border>
+          <el-descriptions-item label="择偶条件-年龄">
+            {{info.userInfo.filterAge}}
+          </el-descriptions-item>
+          <el-descriptions-item label="择偶条件-身高">
+            {{info.userInfo.filterHeight}}
+          </el-descriptions-item>
+          <el-descriptions-item label="择偶条件-体型">
+            <cai-dict-tag :options="userSomatotypeList" :value="info.userInfo.filterSomatotype" empty-value="-" split-value="&"/>
+          </el-descriptions-item>
+          <el-descriptions-item label="择偶条件-婚况">
+            <cai-dict-tag :options="userMarriageList" :value="info.userInfo.filterMarriage" empty-value="-" split-value="&"/>
+          </el-descriptions-item>
+          <el-descriptions-item label="择偶条件-学历">
+            <cai-dict-tag :options="userEducationList" :value="info.userInfo.filterEducation" />
+          </el-descriptions-item>
+          <el-descriptions-item label="择偶条件-地区">
+            {{info.userInfo.filterResidence}}
+          </el-descriptions-item>
+          <el-descriptions-item label="择偶条件-年收入">
+            <cai-dict-tag :options="userAnnualIncomeList" :value="info.userInfo.filterAnnualIncome" />
+          </el-descriptions-item>
+          <el-descriptions-item label="择偶条件-小孩情况">
+            <cai-dict-tag :options="userChildStatusList" :value="info.userInfo.filterChildStatus" />
+          </el-descriptions-item>
+          <el-descriptions-item label="择偶条件-住房情况">
+            <cai-dict-tag :options="userHousingStatusList" :value="info.userInfo.filterHousingStatus" />
+          </el-descriptions-item>
+          <el-descriptions-item label="择偶条件-购车情况">
+            <cai-dict-tag :options="userCarStatusList" :value="info.userInfo.filterCarStatus" />
           </el-descriptions-item>
         </el-descriptions>
       </el-collapse-item>
       <el-collapse-item title="钱包" name="account">
         <el-descriptions :contentStyle="CS" :label-style="LS" class="margin-top" :column="2" size="medium" border>
-          <el-descriptions-item label="余额">
+          <el-descriptions-item label="收益的余额">
-            {{info.account.coin}}
-          </el-descriptions-item>
-          <el-descriptions-item label="收益">
             {{info.account.incomeCoin}}
           </el-descriptions-item>
-          <el-descriptions-item label="充值总额">
+          <el-descriptions-item label="交换微信次数">
-            {{info.account.totalBuyMoney}}
+            {{info.account.wxTransNum}}
           </el-descriptions-item>
-          <el-descriptions-item label="充值总币">
+          <el-descriptions-item label="消费统计">
-            {{info.account.totalBuyCoin}}
+            {{info.account.consumeTotal}}
           </el-descriptions-item>
         </el-descriptions>
       </el-collapse-item>
-      <el-collapse-item title="会员" name="userMember" v-if="info.userMember">
+<!--      <el-collapse-item title="在线状态" name="userOnline" v-if="info.userOnline">
-        <el-descriptions :contentStyle="CS" :label-style="LS" class="margin-top" :column="3" size="medium" border>
-          <el-descriptions-item label="类型">
-            <cai-dict-tag :options="memberTypeList" :value="info.userMember.memberType" />
-          </el-descriptions-item>
-          <el-descriptions-item label="过期时间">
-            {{info.userMember.expireDate}}
-          </el-descriptions-item>
-          <el-descriptions-item label="会员状态">
-            <cai-dict-tag :options="memberStatusList" :value="info.userMember.status" />
-          </el-descriptions-item>
-        </el-descriptions>
-      </el-collapse-item>
-      <el-collapse-item title="详细信息" name="anchor" v-if="info.anchor">
-        <el-descriptions :contentStyle="CS" :label-style="LS" class="margin-top" :column="3" size="medium" border>
-          <el-descriptions-item label="价格">
-            {{info.anchor.price}}
-          </el-descriptions-item>
-          <el-descriptions-item label="开启视频接听">
-            <cai-dict-tag :options="openVideoStatusList" :value="info.anchor.openVideoStatus" />
-          </el-descriptions-item>
-          <el-descriptions-item label="视频状态">
-            <cai-dict-tag :options="videoStatusList" :value="info.anchor.videoStatus" />
-          </el-descriptions-item>
-          <el-descriptions-item label="隐藏接单">
-            <cai-dict-tag :options="orderSwitchList" :value="info.anchor.orderSwitch" />
-          </el-descriptions-item>
-          <el-descriptions-item label="首页展示">
-            <cai-dict-tag :options="indexDisplayList" :value="info.anchor.indexDisplay" />
-          </el-descriptions-item>
-          <el-descriptions-item label="用户评分">
-            {{info.anchor.giveScore}}
-          </el-descriptions-item>
-          <el-descriptions-item label="服务总次数">
-            {{info.anchor.serviceCount}}
-          </el-descriptions-item>
-          <el-descriptions-item label="服务总时长">
-            {{info.anchor.serviceTime}}
-          </el-descriptions-item>
-          <el-descriptions-item label="视频分成比例">
-            {{info.anchor.videoRate}}
-          </el-descriptions-item>
-          <el-descriptions-item label="守护分成比例">
-            {{info.anchor.guardRate}}
-          </el-descriptions-item>
-          <el-descriptions-item label="礼物分成比列">
-            {{info.anchor.giftRate}}
-          </el-descriptions-item>
-        </el-descriptions>
-      </el-collapse-item>
-      <el-collapse-item title="在线状态" name="userOnline" v-if="info.userOnline">
         <el-descriptions :contentStyle="CS" :label-style="LS" class="margin-top" :column="2" size="medium" border>
           <el-descriptions-item label="在线状态">
             <cai-dict-tag :options="onlineStatusList" :value="info.userOnline.status" />
@@ -140,25 +208,41 @@
             {{info.userOnline.lastLiveTime}}
           </el-descriptions-item>
         </el-descriptions>
-      </el-collapse-item>
+      </el-collapse-item>-->
     </el-collapse>
   </el-dialog>
 </template>
 
 <script>
 import {
-  authList,
+  appUserTypeList,
+  booleanList,
+  finishStatusList,
   genderList,
-  userStatusList,
-  isAnchorList,
-  videoStatusList,
-  onlineStatusList,
   memberTypeList,
-  memberStatusList,
+  onlineStatusList,
-  openVideoStatusList,
+  userAnnualIncomeList,
-  orderSwitchList,
+  userCarStatusList,
-  indexDisplayList,
+  userChildStatusList,
-  booleanList, userCarStatusList, userHousingStatusList
+  userCompanyNatureList,
+  userDrinkStatusList,
+  userEducationList,
+  userFamilyBackgroundList,
+  userFamilyRankingList,
+  userFindTagList,
+  userForPersonalsList,
+  userHousingStatusList,
+  userLiveAtParentList,
+  userLoveAtDistanceList,
+  userMarriageList,
+  userSignList,
+  userSmokeStatusList,
+  userSomatotypeList,
+  userStatusList,
+  userWantChildList,
+  userWhenMarriageList,
+  userZodiacList,
+  videoStatusList
 } from '@/constant/statusMap'
 import { getFullUser } from '@/api/xq/user'
 
@@ -166,11 +250,14 @@ export default {
   name: "UserInfo",
   data() {
     return {
-      genderList,userStatusList,
+      genderList,userStatusList,finishStatusList,userSomatotypeList,userZodiacList,userSignList,
-      userHousingStatusList,userCarStatusList,
+      userEducationList,userCompanyNatureList,userAnnualIncomeList,userForPersonalsList,
-      isAnchorList,authList,videoStatusList,onlineStatusList,memberTypeList,
+      userHousingStatusList,userCarStatusList,userSmokeStatusList,userMarriageList,
+      userDrinkStatusList,userChildStatusList,userFamilyBackgroundList,userFamilyRankingList,
+      userLoveAtDistanceList,userWhenMarriageList,userWantChildList,userLiveAtParentList,
+      userFindTagList,appUserTypeList,
+      videoStatusList,onlineStatusList,memberTypeList,
       booleanList,
-      systemName: process.env.VUE_APP_SYSTEM_HOME,
       activeName:['base','account','userAlbums'],
       CS: {
         'text-align': 'center',  //文本居中