diff --git a/src/api/xq/activityShop.js b/src/api/xq/activityShop.js
index 7437b9e..24e1a5e 100644
--- a/src/api/xq/activityShop.js
+++ b/src/api/xq/activityShop.js
@@ -35,6 +35,14 @@ export function updateActivityShop(data) {
   })
 }
 
+export function updateActivityShopUser(data) {
+  return request({
+    url: '/xq/activityShop/user',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除相亲会
 export function delActivityShop(id) {
   return request({
diff --git a/src/views/xq/activityShop/add-activity-shop-dialog.vue b/src/views/xq/activityShop/add-activity-shop-dialog.vue
new file mode 100644
index 0000000..ddecc54
--- /dev/null
+++ b/src/views/xq/activityShop/add-activity-shop-dialog.vue
@@ -0,0 +1,287 @@
+<template>
+  <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="900px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="活动标题" prop="activityTitle">
+            <el-input v-model="form.activityTitle" placeholder="请输入活动标题" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="活动编码" prop="activityCode">
+            <el-input v-model="form.activityCode" placeholder="请输入活动编码" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="展示图片" prop="activityBanner">
+        <image-upload2 v-model="form.activityBanner" />
+      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker clearable
+                            v-model="form.startTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="请选择开始时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker clearable
+                            v-model="form.endTime"
+                            type="datetime"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            placeholder="请选择结束时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="城市" prop="cityCode">
+            <el-cascader v-model="form.cityCode" :props="{'value':'id'}" :options="areaOption" filterable style="width: 95%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="详细地址" prop="address">
+            <el-input v-model="form.address" placeholder="请输入详细地址" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="女生上限" prop="womenMaxNum">
+            <el-input-number :min="0" v-model="form.womenMaxNum" placeholder="请输入女生人数上限"  style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="男生上限" prop="manMaxNum">
+            <el-input-number :min="0" v-model="form.manMaxNum" placeholder="请输入男生人数上限"  style="width: 100%" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-form-item label="费用说明" prop="priceText">
+          <el-input v-model="form.priceText" placeholder="请输入费用说明" />
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="女生价格" prop="joinWomenPrice">
+            <el-input-number :min="0" v-model="form.joinWomenPrice" placeholder="请输入女生参与价格" style="width: 100%"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="男生价格" prop="joinManPrice">
+            <el-input-number :min="0" v-model="form.joinManPrice" placeholder="请输入男生参与价格"  style="width: 100%" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="强制会员" prop="mustVip">
+            <el-radio-group v-model="form.mustVip" size="mini">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="强制实名用" prop="mustAuth">
+            <el-radio-group v-model="form.mustAuth" size="mini">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="详细说明" prop="activityText">
+        <el-input  v-model="form.activityText" type="textarea" :autosize="{ minRows: 2, maxRows: 8}" placeholder="请输入内容" />
+      </el-form-item>
+    </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 { enableStatusList } from '@/constant/statusMap'
+import { getTreeAreaCode } from '@/api/xq/areaCode'
+import { addActivityShop, getActivityShop, updateActivityShop } from '@/api/xq/activityShop'
+import { addBanner, getBanner } from '@/api/xq/banner'
+
+export default {
+  components: {
+  },
+  data () {
+    return {
+      enableStatusList,
+      open: false,
+      title: '新增相亲会',
+      form:{
+        id: undefined,
+        activityCode: undefined,
+        activityTitle: undefined,
+        activityBanner: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        cityName: undefined,
+        cityCode: undefined,
+        address: undefined,
+        activityText: undefined,
+        womenMaxNum: undefined,
+        manMaxNum: undefined,
+        joinWomenNum: undefined,
+        joinManNum: undefined,
+        handManNum: undefined,
+        handWomenNum: undefined,
+        joinWomenPrice: undefined,
+        joinManPrice: undefined,
+        mustVip: undefined,
+        mustAuth: undefined,
+        priceText: undefined,
+        createTime: undefined,
+        updateTime: undefined
+      },
+      // 表单校验
+      rules: {
+        activityCode: [
+          { required: true, message: "活动编码不能为空", trigger: "blur" }
+        ],
+        activityTitle: [
+          { required: true, message: "活动标题不能为空", trigger: "blur" }
+        ],
+        activityBanner: [
+          { required: true, message: "活动展示图片不能为空", trigger: "blur" }
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" }
+        ],
+        endTime: [
+          { required: true, message: "结束时间不能为空", trigger: "blur" }
+        ],
+        cityName: [
+          { required: true, message: "城市名称不能为空", trigger: "blur" }
+        ],
+        cityCode: [
+          { required: true, message: "城市编码不能为空", trigger: "blur" }
+        ],
+        address: [
+          { required: true, message: "详细地址不能为空", trigger: "blur" }
+        ],
+        activityText: [
+          { required: true, message: "活动详细说明不能为空", trigger: "blur" }
+        ],
+        womenMaxNum: [
+          { required: true, message: "女生人数上限不能为空", trigger: "blur" }
+        ],
+        manMaxNum: [
+          { required: true, message: "男生人数上限不能为空", trigger: "blur" }
+        ],
+        joinWomenNum: [
+          { required: true, message: "报名参加女生人数不能为空", trigger: "blur" }
+        ],
+        joinManNum: [
+          { required: true, message: "报名参加男生人数不能为空", trigger: "blur" }
+        ],
+        handManNum: [
+          { required: true, message: "手动调整男生人数不能为空", trigger: "blur" }
+        ],
+        handWomenNum: [
+          { required: true, message: "手动调整女生人数不能为空", trigger: "blur" }
+        ],
+        joinWomenPrice: [
+          { required: true, message: "女生参与价格不能为空", trigger: "blur" }
+        ],
+        joinManPrice: [
+          { required: true, message: "男生参与价格不能为空", trigger: "blur" }
+        ],
+        mustVip: [
+          { required: true, message: "必须强制会员参与不能为空", trigger: "blur" }
+        ],
+        mustAuth: [
+          { required: true, message: "必须强制实名用户参与不能为空", trigger: "blur" }
+        ],
+        priceText: [
+          { required: true, message: "费用说明不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+      areaOption: [],
+    }
+  },
+  created() {
+    this.options();
+  },
+  methods: {
+    init (id) {
+      this.form.id = id || undefined;
+      this.title = (id ? "修改" : "新增") + "相亲会";
+      this.open = true;
+      this.$nextTick(() => {
+        this.$refs['form'].resetFields();
+        if(this.form.id){
+          getActivityShop(id).then(response => {
+            this.form = response.data;
+          });
+        }
+      })
+    },
+    options(){
+      getTreeAreaCode().then(response => {
+        response.data.forEach(city => {
+          let cityList = city.children;
+          cityList.forEach(no => {
+            no.children = undefined
+          })
+        })
+        this.areaOption = response.data
+      })
+    },
+    // 表单提交
+    submitForm () {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.buttonLoading = true;
+          addActivityShop({
+            ...this.form,
+            cityCode: this.getCode(this.form.cityCode),
+          }).then(data => {
+            this.$modal.msgSuccess("新增成功");
+            this.buttonLoading = false;
+            this.open = false
+            this.$emit('refreshDataList')
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }else{
+          updateActivityShop({
+            ...this.form,
+            cityCode: this.getCode(this.form.cityCode),
+          }).then(data => {
+            this.$modal.msgSuccess("修改成功");
+            this.buttonLoading = false;
+            this.open = false
+            this.$emit('refreshDataList')
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      })
+    },
+    getCode(code){
+      if(!code){
+        return code;
+      }
+      if(Array.isArray(code)){
+        return code[code.length-1]
+      }
+      return code;
+    }
+  }
+}
+</script>
diff --git a/src/views/xq/activityShop/index.vue b/src/views/xq/activityShop/index.vue
index d6c6d4d..35aa20b 100644
--- a/src/views/xq/activityShop/index.vue
+++ b/src/views/xq/activityShop/index.vue
@@ -9,146 +9,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="活动展示图片" prop="activityBanner">
-        <el-input
-          v-model="queryParams.activityBanner"
-          placeholder="请输入活动展示图片"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker clearable
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择开始时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker clearable
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择结束时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="城市名称" prop="cityName">
+      <el-form-item label="城市" prop="cityName">
         <el-input
           v-model="queryParams.cityName"
-          placeholder="请输入城市名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="城市编码" prop="cityCode">
-        <el-input
-          v-model="queryParams.cityCode"
-          placeholder="请输入城市编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="详细地址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入详细地址"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="活动详细说明" prop="activityText">
-        <el-input
-          v-model="queryParams.activityText"
-          placeholder="请输入活动详细说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="女生人数上限" prop="womenMaxNum">
-        <el-input
-          v-model="queryParams.womenMaxNum"
-          placeholder="请输入女生人数上限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="男生人数上限" prop="manMaxNum">
-        <el-input
-          v-model="queryParams.manMaxNum"
-          placeholder="请输入男生人数上限"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="报名参加女生人数" prop="joinWomenNum">
-        <el-input
-          v-model="queryParams.joinWomenNum"
-          placeholder="请输入报名参加女生人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="报名参加男生人数" prop="joinManNum">
-        <el-input
-          v-model="queryParams.joinManNum"
-          placeholder="请输入报名参加男生人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手动调整男生人数" prop="handManNum">
-        <el-input
-          v-model="queryParams.handManNum"
-          placeholder="请输入手动调整男生人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="手动调整女生人数" prop="handWomenNum">
-        <el-input
-          v-model="queryParams.handWomenNum"
-          placeholder="请输入手动调整女生人数"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="女生参与价格" prop="joinWomenPrice">
-        <el-input
-          v-model="queryParams.joinWomenPrice"
-          placeholder="请输入女生参与价格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="男生参与价格" prop="joinManPrice">
-        <el-input
-          v-model="queryParams.joinManPrice"
-          placeholder="请输入男生参与价格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="必须强制会员参与" prop="mustVip">
-        <el-input
-          v-model="queryParams.mustVip"
-          placeholder="请输入必须强制会员参与"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="必须强制实名用户参与" prop="mustAuth">
-        <el-input
-          v-model="queryParams.mustAuth"
-          placeholder="请输入必须强制实名用户参与"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="费用说明" prop="priceText">
-        <el-input
-          v-model="queryParams.priceText"
-          placeholder="请输入费用说明"
+          placeholder="请输入城市"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -192,49 +56,46 @@
           v-hasPermi="['xq:activityShop:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['xq:activityShop:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="activityShopList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="" align="center" prop="id" v-if="true"/>
-      <el-table-column label="活动标题" align="center" prop="activityTitle" />
-      <el-table-column label="活动展示图片" align="center" prop="activityBanner" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="活动标题" align="center" prop="activityTitle" show-overflow-tooltip/>
+      <el-table-column label="活动展示图片" align="center" prop="activityBanner" >
+        <template v-slot="scope">
+          <image-preview :src="scope.row.activityBanner" :height="75" :width="120"/>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="时间" align="center" prop="startTime" >
+        <template v-slot="scope">
+          <span style="font-weight: bold">开始时间:</span><span>{{scope.row.startTime}}</span> <br>
+          <span style="font-weight: bold">结束时间:</span><span>{{scope.row.endTime}}</span><br>
         </template>
       </el-table-column>
       <el-table-column label="城市名称" align="center" prop="cityName" />
-      <el-table-column label="城市编码" align="center" prop="cityCode" />
-      <el-table-column label="详细地址" align="center" prop="address" />
-      <el-table-column label="活动详细说明" align="center" prop="activityText" />
-      <el-table-column label="女生人数上限" align="center" prop="womenMaxNum" />
-      <el-table-column label="男生人数上限" align="center" prop="manMaxNum" />
-      <el-table-column label="报名参加女生人数" align="center" prop="joinWomenNum" />
-      <el-table-column label="报名参加男生人数" align="center" prop="joinManNum" />
-      <el-table-column label="手动调整男生人数" align="center" prop="handManNum" />
-      <el-table-column label="手动调整女生人数" align="center" prop="handWomenNum" />
-      <el-table-column label="女生参与价格" align="center" prop="joinWomenPrice" />
-      <el-table-column label="男生参与价格" align="center" prop="joinManPrice" />
-      <el-table-column label="必须强制会员参与" align="center" prop="mustVip" />
-      <el-table-column label="必须强制实名用户参与" align="center" prop="mustAuth" />
-      <el-table-column label="费用说明" align="center" prop="priceText" />
+      <el-table-column label="详细地址" align="center" prop="address" show-overflow-tooltip/>
+      <el-table-column label="人数" align="center" prop="womenMaxNum" >
+        <template v-slot="scope">
+          <span style="font-weight: bold">男生上限:</span><span>{{scope.row.manMaxNum}}</span> <span style="font-weight: bold">女生上限:</span><span>{{scope.row.womenMaxNum}}</span><br>
+          <span style="font-weight: bold">已报名(男):</span><span>{{scope.row.joinManNum}}</span> <span style="font-weight: bold">已报名(女):</span><span>{{scope.row.joinWomenNum}}</span><br>
+          <span style="font-weight: bold">人工调整(男):</span><span>{{scope.row.handManNum}}</span> <span style="font-weight: bold">人工调整(女):</span><span>{{scope.row.handWomenNum}}</span><br>
+          <span style="font-weight: bold">显示人数(男):</span><span>{{scope.row.joinManNum+scope.row.handManNum}}</span> <span style="font-weight: bold">显示人数(女):</span><span>{{scope.row.joinWomenNum+scope.row.handWomenNum}}</span><br>
+        </template>
+      </el-table-column>
+      <el-table-column label="价格" align="center" prop="joinWomenPrice" >
+        <template v-slot="scope">
+          <span style="font-weight: bold">男生价格:</span><span>{{scope.row.joinManPrice}}</span> <span style="font-weight: bold">女生价格:</span><span>{{scope.row.joinWomenPrice}}</span><br>
+          <span style="font-weight: bold">费用说明:</span><span>{{scope.row.priceText}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="权限" align="center" prop="joinWomenPrice" >
+        <template v-slot="scope">
+          <span style="font-weight: bold">强制会员:</span><span>{{scope.row.mustVip===1?'强制':'不强制'}}</span> <br>
+          <span style="font-weight: bold">强制实名:</span><span>{{scope.row.mustAuth===1?'强制':'不强制'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="活动详细说明" align="center" prop="activityText" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -244,6 +105,13 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['xq:activityShop:edit']"
           >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdateUser(scope.row)"
+            v-hasPermi="['xq:activityShop:edit']"
+          >人数调整</el-button>
           <el-button
             size="mini"
             type="text"
@@ -262,97 +130,26 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-    <!-- 添加或修改相亲会对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="活动标题" prop="activityTitle">
-          <el-input v-model="form.activityTitle" placeholder="请输入活动标题" />
-        </el-form-item>
-        <el-form-item label="活动展示图片" prop="activityBanner">
-          <el-input v-model="form.activityBanner" placeholder="请输入活动展示图片" />
-        </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker clearable
-            v-model="form.startTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker clearable
-            v-model="form.endTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择结束时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="城市名称" prop="cityName">
-          <el-input v-model="form.cityName" placeholder="请输入城市名称" />
-        </el-form-item>
-        <el-form-item label="城市编码" prop="cityCode">
-          <el-input v-model="form.cityCode" placeholder="请输入城市编码" />
-        </el-form-item>
-        <el-form-item label="详细地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入详细地址" />
-        </el-form-item>
-        <el-form-item label="活动详细说明" prop="activityText">
-          <el-input v-model="form.activityText" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="女生人数上限" prop="womenMaxNum">
-          <el-input v-model="form.womenMaxNum" placeholder="请输入女生人数上限" />
-        </el-form-item>
-        <el-form-item label="男生人数上限" prop="manMaxNum">
-          <el-input v-model="form.manMaxNum" placeholder="请输入男生人数上限" />
-        </el-form-item>
-        <el-form-item label="报名参加女生人数" prop="joinWomenNum">
-          <el-input v-model="form.joinWomenNum" placeholder="请输入报名参加女生人数" />
-        </el-form-item>
-        <el-form-item label="报名参加男生人数" prop="joinManNum">
-          <el-input v-model="form.joinManNum" placeholder="请输入报名参加男生人数" />
-        </el-form-item>
-        <el-form-item label="手动调整男生人数" prop="handManNum">
-          <el-input v-model="form.handManNum" placeholder="请输入手动调整男生人数" />
-        </el-form-item>
-        <el-form-item label="手动调整女生人数" prop="handWomenNum">
-          <el-input v-model="form.handWomenNum" placeholder="请输入手动调整女生人数" />
-        </el-form-item>
-        <el-form-item label="女生参与价格" prop="joinWomenPrice">
-          <el-input v-model="form.joinWomenPrice" placeholder="请输入女生参与价格" />
-        </el-form-item>
-        <el-form-item label="男生参与价格" prop="joinManPrice">
-          <el-input v-model="form.joinManPrice" placeholder="请输入男生参与价格" />
-        </el-form-item>
-        <el-form-item label="必须强制会员参与" prop="mustVip">
-          <el-input v-model="form.mustVip" placeholder="请输入必须强制会员参与" />
-        </el-form-item>
-        <el-form-item label="必须强制实名用户参与" prop="mustAuth">
-          <el-input v-model="form.mustAuth" placeholder="请输入必须强制实名用户参与" />
-        </el-form-item>
-        <el-form-item label="费用说明" prop="priceText">
-          <el-input v-model="form.priceText" placeholder="请输入费用说明" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+    <add-activity-shop-dialog v-if="addActivityShopDialogVisible" ref="addActivityShopDialog" @refreshDataList="getList" />
+    <update-activity-shop-user-dialog v-if="updateUserActivityShopDialogVisible" ref="updateUserActivityShopDialog" @refreshDataList="getList" />
   </div>
 </template>
 
 <script>
-import { listActivityShop, getActivityShop, delActivityShop, addActivityShop, updateActivityShop } from "@/api/xq/activityShop";
+import { delActivityShop, listActivityShop } from '@/api/xq/activityShop'
+import AddActivityShopDialog from '@/views/xq/activityShop/add-activity-shop-dialog.vue'
+import UpdateActivityShopUserDialog from '@/views/xq/activityShop/update-activity-shop-user-dialog.vue'
 
 export default {
   name: "ActivityShop",
+  components: { AddActivityShopDialog,UpdateActivityShopUserDialog},
   data() {
     return {
-      // 按钮loading
-      buttonLoading: false,
       // 遮罩层
       loading: true,
+      addActivityShopDialogVisible: false,
+      updateActivityShopDialogVisible: false,
+      updateUserActivityShopDialogVisible: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -365,102 +162,13 @@ export default {
       total: 0,
       // 相亲会表格数据
       activityShopList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         activityTitle: undefined,
-        activityBanner: undefined,
-        startTime: undefined,
-        endTime: undefined,
         cityName: undefined,
-        cityCode: undefined,
-        address: undefined,
-        activityText: undefined,
-        womenMaxNum: undefined,
-        manMaxNum: undefined,
-        joinWomenNum: undefined,
-        joinManNum: undefined,
-        handManNum: undefined,
-        handWomenNum: undefined,
-        joinWomenPrice: undefined,
-        joinManPrice: undefined,
-        mustVip: undefined,
-        mustAuth: undefined,
-        priceText: undefined,
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
-        activityTitle: [
-          { required: true, message: "活动标题不能为空", trigger: "blur" }
-        ],
-        activityBanner: [
-          { required: true, message: "活动展示图片不能为空", trigger: "blur" }
-        ],
-        startTime: [
-          { required: true, message: "开始时间不能为空", trigger: "blur" }
-        ],
-        endTime: [
-          { required: true, message: "结束时间不能为空", trigger: "blur" }
-        ],
-        cityName: [
-          { required: true, message: "城市名称不能为空", trigger: "blur" }
-        ],
-        cityCode: [
-          { required: true, message: "城市编码不能为空", trigger: "blur" }
-        ],
-        address: [
-          { required: true, message: "详细地址不能为空", trigger: "blur" }
-        ],
-        activityText: [
-          { required: true, message: "活动详细说明不能为空", trigger: "blur" }
-        ],
-        womenMaxNum: [
-          { required: true, message: "女生人数上限不能为空", trigger: "blur" }
-        ],
-        manMaxNum: [
-          { required: true, message: "男生人数上限不能为空", trigger: "blur" }
-        ],
-        joinWomenNum: [
-          { required: true, message: "报名参加女生人数不能为空", trigger: "blur" }
-        ],
-        joinManNum: [
-          { required: true, message: "报名参加男生人数不能为空", trigger: "blur" }
-        ],
-        handManNum: [
-          { required: true, message: "手动调整男生人数不能为空", trigger: "blur" }
-        ],
-        handWomenNum: [
-          { required: true, message: "手动调整女生人数不能为空", trigger: "blur" }
-        ],
-        joinWomenPrice: [
-          { required: true, message: "女生参与价格不能为空", trigger: "blur" }
-        ],
-        joinManPrice: [
-          { required: true, message: "男生参与价格不能为空", trigger: "blur" }
-        ],
-        mustVip: [
-          { required: true, message: "必须强制会员参与不能为空", trigger: "blur" }
-        ],
-        mustAuth: [
-          { required: true, message: "必须强制实名用户参与不能为空", trigger: "blur" }
-        ],
-        priceText: [
-          { required: true, message: "费用说明不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-      }
     };
   },
   created() {
@@ -476,39 +184,6 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        activityTitle: undefined,
-        activityBanner: undefined,
-        startTime: undefined,
-        endTime: undefined,
-        cityName: undefined,
-        cityCode: undefined,
-        address: undefined,
-        activityText: undefined,
-        womenMaxNum: undefined,
-        manMaxNum: undefined,
-        joinWomenNum: undefined,
-        joinManNum: undefined,
-        handManNum: undefined,
-        handWomenNum: undefined,
-        joinWomenPrice: undefined,
-        joinManPrice: undefined,
-        mustVip: undefined,
-        mustAuth: undefined,
-        priceText: undefined,
-        createTime: undefined,
-        updateTime: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -527,46 +202,23 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加相亲会";
+      this.addActivityShopDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.addActivityShopDialog.init()
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getActivityShop(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改相亲会";
-      });
+      this.addActivityShopDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.addActivityShopDialog.init(row.id)
+      })
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateActivityShop(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addActivityShop(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
+    handleUpdateUser(row) {
+      this.updateUserActivityShopDialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.updateUserActivityShopDialog.init(row.id)
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
@@ -583,12 +235,17 @@ export default {
         this.loading = false;
       });
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('xq/activityShop/export', {
-        ...this.queryParams
-      }, `activityShop_${new Date().getTime()}.xlsx`)
-    }
   }
 };
 </script>
+<style lang="scss" scoped>
+.font-red {
+  color: red;
+}
+.font-green {
+  color: green;
+}
+.font-blue {
+  color: blue;
+}
+</style>
diff --git a/src/views/xq/activityShop/update-activity-shop-user-dialog.vue b/src/views/xq/activityShop/update-activity-shop-user-dialog.vue
new file mode 100644
index 0000000..cc4cb25
--- /dev/null
+++ b/src/views/xq/activityShop/update-activity-shop-user-dialog.vue
@@ -0,0 +1,159 @@
+<template>
+  <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="900px" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row>
+        <el-form-item label="活动标题" prop="activityTitle">
+          <el-input v-model="form.activityTitle" disabled placeholder="请输入活动标题" />
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="女生上限" prop="womenMaxNum">
+            <el-input-number :min="0" v-model="form.womenMaxNum" placeholder="请输入女生人数上限"  disabled style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="男生上限" prop="manMaxNum">
+            <el-input-number :min="0" v-model="form.manMaxNum" placeholder="请输入男生人数上限" disabled style="width: 100%" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="女生已报名" prop="joinWomenNum">
+            <el-input-number :min="0" v-model="form.joinWomenNum" placeholder="请输入女生人数上限" disabled  style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="男生已报名" prop="joinManNum">
+            <el-input-number :min="0" v-model="form.joinManNum" placeholder="请输入男生人数上限" disabled style="width: 100%" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="女生调整" prop="handWomenNum">
+            <el-input-number :min="0" v-model="form.handWomenNum" placeholder="请输入女生人数调整"  style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="男生调整" prop="handManNum">
+            <el-input-number :min="0" v-model="form.handManNum" placeholder="请输入男生人数调整" style="width: 100%" />
+          </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 { enableStatusList } from '@/constant/statusMap'
+import { getTreeAreaCode } from '@/api/xq/areaCode'
+import { addActivityShop, getActivityShop, updateActivityShop, updateActivityShopUser } from '@/api/xq/activityShop'
+import { addBanner, getBanner } from '@/api/xq/banner'
+
+export default {
+  components: {
+  },
+  data () {
+    return {
+      enableStatusList,
+      open: false,
+      title: '调整相亲会报名人数',
+      form:{
+        id: undefined,
+        activityCode: undefined,
+        activityTitle: undefined,
+        activityBanner: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        cityName: undefined,
+        cityCode: undefined,
+        address: undefined,
+        activityText: undefined,
+        womenMaxNum: undefined,
+        manMaxNum: undefined,
+        joinWomenNum: undefined,
+        joinManNum: undefined,
+        handManNum: undefined,
+        handWomenNum: undefined,
+        joinWomenPrice: undefined,
+        joinManPrice: undefined,
+        mustVip: undefined,
+        mustAuth: undefined,
+        priceText: undefined,
+        createTime: undefined,
+        updateTime: undefined
+      },
+      // 表单校验
+      rules: {
+        handManNum: [
+          { required: true, message: "手动调整男生人数不能为空", trigger: "blur" }
+        ],
+        handWomenNum: [
+          { required: true, message: "手动调整女生人数不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+      areaOption: [],
+    }
+  },
+  created() {
+    this.options();
+  },
+  methods: {
+    init (id) {
+      this.form.id = id || undefined;
+      this.open = true;
+      this.$nextTick(() => {
+        this.$refs['form'].resetFields();
+        if(this.form.id){
+          getActivityShop(id).then(response => {
+            this.form = response.data;
+          });
+        }
+      })
+    },
+    options(){
+      getTreeAreaCode().then(response => {
+        response.data.forEach(city => {
+          let cityList = city.children;
+          cityList.forEach(no => {
+            no.children = undefined
+          })
+        })
+        this.areaOption = response.data
+      })
+    },
+    // 表单提交
+    submitForm () {
+      this.$refs['form'].validate((valid) => {
+          updateActivityShopUser({
+            ...this.form,
+            cityCode: this.getCode(this.form.cityCode),
+          }).then(data => {
+            this.$modal.msgSuccess("修改成功");
+            this.buttonLoading = false;
+            this.open = false
+            this.$emit('refreshDataList')
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+      })
+    },
+    getCode(code){
+      if(!code){
+        return code;
+      }
+      if(Array.isArray(code)){
+        return code[code.length-1]
+      }
+      return code;
+    }
+  }
+}
+</script>