init

src/views/xq/agreementSetting/index.vue

@@ -7,11 +7,11 @@
         <div v-if="!userAgreement" v-html="form.userAgreement" style="width: 98%" />
         <wang-edit v-if="userAgreement" v-model="form.userAgreement" :min-height="800" />
       </el-tab-pane>
-      <el-tab-pane label="主播入驻协议" name="anchorJoinAgreement">
+      <el-tab-pane label="VIP协议" name="vipAgreement">
-        <el-button type="primary" size="mini" v-hasPermi="['cai:agreementSetting:edit']" v-if="!anchorJoinAgreement" @click="showEdit('anchorJoinAgreement')">编辑</el-button>
+        <el-button type="primary" size="mini" v-hasPermi="['cai:agreementSetting:edit']" v-if="!vipAgreement" @click="showEdit('vipAgreement')">编辑</el-button>
-        <el-button :loading="buttonLoading" v-if="anchorJoinAgreement" type="primary" size="mini" @click="submitForm2('anchorJoinAgreement')">保存</el-button>
+        <el-button :loading="buttonLoading" v-if="vipAgreement" type="primary" size="mini" @click="submitForm2('vipAgreement')">保存</el-button>
-        <div v-if="!anchorJoinAgreement" v-html="form.anchorJoinAgreement" style="width: 98%" />
+        <div v-if="!vipAgreement" v-html="form.vipAgreement" style="width: 98%" />
-        <editor v-if="anchorJoinAgreement" v-model="form.anchorJoinAgreement" :min-height="192"></editor>
+        <editor v-if="vipAgreement" v-model="form.vipAgreement" :min-height="192"></editor>
       </el-tab-pane>
       <el-tab-pane label="隐私协议" name="privacyAgreement">
         <el-button type="primary" size="mini" v-hasPermi="['cai:agreementSetting:edit']" v-if="!privacyAgreement" @click="showEdit('privacyAgreement')">编辑</el-button>
@@ -40,7 +40,7 @@ export default {
       form: {
         id: undefined,
         userAgreement:undefined,
-        anchorJoinAgreement:undefined,
+        vipAgreement:undefined,
         privacyAgreement: undefined,
       },
       activeName:'loansAgreement',
@@ -49,7 +49,7 @@ export default {
       },
       formDisable:true,
       userAgreement:false,
-      anchorJoinAgreement:false,
+      vipAgreement:false,
       privacyAgreement: false,
     };
   },

src/views/xq/user/index.vue

@@ -25,6 +25,14 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="城市" prop="residenceCityName">
+        <el-input
+          v-model="queryParams.residenceCityName"
+          placeholder="请输入城市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -201,6 +209,7 @@ export default {
         nickname: undefined,
         id: undefined,
         mobile: undefined,
+        residenceCityName: undefined,
       }
     };
   },

src/views/xq/userInfo/index.vue

@@ -25,6 +25,14 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="城市" prop="residenceCityName">
+        <el-input
+          v-model="queryParams.residenceCityName"
+          placeholder="请输入城市"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -326,34 +334,11 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        nickname: undefined,
-        mobile: undefined,
         usercode: undefined,
-        housingStatus: undefined,
+        nickname: undefined,
-        carStatus: undefined,
+        id: undefined,
-        smokeStatus: undefined,
+        mobile: undefined,
-        drinkStatus: undefined,
+        residenceCityName: undefined,
-        nation: undefined,
-        childStatus: undefined,
-        familyBackground: undefined,
-        familyRanking: undefined,
-        loveAtDistance: undefined,
-        whenMarriage: undefined,
-        wantChild: undefined,
-        liveAtParent: undefined,
-        findTag: undefined,
-        graduateSchool: undefined,
-        hobbys: undefined,
-        filterAge: undefined,
-        filterHeight: undefined,
-        filterSomatotype: undefined,
-        filterMarriage: undefined,
-        filterEducation: undefined,
-        filterResidence: undefined,
-        filterAnnualIncome: undefined,
-        filterChildStatus: undefined,
-        filterHousingStatus: undefined,
-        filterCarStatus: undefined
       },
     };
   },

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://localhost:8080`,
-        target: `http://xq-admin.mubai8888.com/prod-api`,
+        // target: `http://xq-admin.mubai8888.com/prod-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''