From 558feb30f4fa82adfa94c004c295c90e42479798 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Tue, 23 Apr 2024 02:08:17 +0800
Subject: [PATCH] init

---
 src/views/xq/user/add-user-dialog.vue    | 53 +++++++++++++++++++++++-
 src/views/xq/user/update-user-dialog.vue | 52 +++++++++++++++++++++++
 vue.config.js                            |  4 +-
 3 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/src/views/xq/user/add-user-dialog.vue b/src/views/xq/user/add-user-dialog.vue
index 1a57e8c..67a58de 100644
--- a/src/views/xq/user/add-user-dialog.vue
+++ b/src/views/xq/user/add-user-dialog.vue
@@ -26,6 +26,20 @@
             <el-input v-model="form.nickname" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="为谁征婚" prop="forPersonals">
+            <el-select v-model="form.forPersonals" clearable size="small" style="width: 95%">
+              <el-option
+                v-for="dict in userForPersonalsList"
+                :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="avatar">
             <image-upload2 v-model="form.avatar"/>
@@ -133,6 +147,32 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="购车情况" prop="carStatus">
+            <el-select v-model="form.carStatus" clearable size="small" style="width: 95%">
+              <el-option
+                v-for="dict in userCarStatusList"
+                :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="housingStatus">
+            <el-select v-model="form.housingStatus" clearable size="small" style="width: 95%">
+              <el-option
+                v-for="dict in userHousingStatusList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="24">
           <el-form-item label="照片" prop="pictures">
@@ -183,7 +223,6 @@ import {
 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 {
@@ -216,6 +255,9 @@ export default {
         nickname: undefined,
         mobile: undefined,
         type: undefined,
+        forPersonals: undefined,
+        carStatus: undefined,
+        housingStatus: undefined,
         pictures: undefined
       },
       rules:{
@@ -261,6 +303,15 @@ export default {
         type: [
           { required: true, message: "数据不能为空", trigger: "blur" }
         ],
+        forPersonals: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        carStatus: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        housingStatus: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
       },
       areaOption: [],
     };
diff --git a/src/views/xq/user/update-user-dialog.vue b/src/views/xq/user/update-user-dialog.vue
index 713a755..ac3f006 100644
--- a/src/views/xq/user/update-user-dialog.vue
+++ b/src/views/xq/user/update-user-dialog.vue
@@ -26,6 +26,20 @@
             <el-input v-model="form.nickname" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="为谁征婚" prop="forPersonals">
+            <el-select v-model="form.forPersonals" clearable size="small" style="width: 95%">
+              <el-option
+                v-for="dict in userForPersonalsList"
+                :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="avatar">
             <image-upload2 v-model="form.avatar"/>
@@ -133,6 +147,32 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="购车情况" prop="carStatus">
+            <el-select v-model="form.carStatus" clearable size="small" style="width: 95%">
+              <el-option
+                v-for="dict in userCarStatusList"
+                :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="housingStatus">
+            <el-select v-model="form.housingStatus" clearable size="small" style="width: 95%">
+              <el-option
+                v-for="dict in userHousingStatusList"
+                :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>
@@ -209,6 +249,9 @@ export default {
         nickname: undefined,
         mobile: undefined,
         type: undefined,
+        forPersonals: undefined,
+        carStatus: undefined,
+        housingStatus: undefined,
       },
       rules:{
         annualIncome: [
@@ -253,6 +296,15 @@ export default {
         type: [
           { required: true, message: "数据不能为空", trigger: "blur" }
         ],
+        forPersonals: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        carStatus: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
+        housingStatus: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
       },
       areaOption: [],
     };
diff --git a/vue.config.js b/vue.config.js
index 8d48eee..3d89d0c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,8 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
-        // target: `http://xq.qiqizl.com/prod-api`,
+        // target: `http://localhost:8080`,
+        target: `http://xq.qiqizl.com/prod-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''