diff --git a/src/views/modules/communityParty/brilliantActivity/index.vue b/src/views/modules/communityParty/brilliantActivity/index.vue
index ba736c709..4569d1f16 100644
--- a/src/views/modules/communityParty/brilliantActivity/index.vue
+++ b/src/views/modules/communityParty/brilliantActivity/index.vue
@@ -15,7 +15,7 @@
               <el-option label="已下线" value="2" />
             </el-select>
           </el-form-item>
-          <el-form-item label="活动时间" prop="timeRange">
+          <el-form-item label="活动时间">
             <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss"
                             format="yyyy-MM-dd HH:mm:ss" end-placeholder="结束日期">
             </el-date-picker>
@@ -33,24 +33,28 @@
       </div>
       <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading" style="width: 100%;margin-top:16px">
         <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="标题" width="180"></el-table-column>
-        <el-table-column prop="coverPic" header-align="center" align="center" label="封面图片" width="180"></el-table-column>
-        <el-table-column prop="releaseTime" header-align="center" align="center" label="发布时间" width="230"></el-table-column>
-        <el-table-column prop="content" header-align="center" align="center" label="活动内容" width="230"></el-table-column>
-        <el-table-column prop="top" header-align="center" align="center" label="是否置顶" width="230">
+        <el-table-column prop="title" header-align="center" align="center" label="标题名称" width="260"></el-table-column>
+        <el-table-column prop="coverPic" header-align="center" align="center" label="图片" width="180">
+          <template slot-scope="scope">
+            <el-image :src="scope.row.coverPic" style="width: 40px;height: 40px;" :preview-src-list="srcList" @click="imageClick(scope.row.coverPic)"></el-image>
+          </template>
+        </el-table-column>
+        <el-table-column prop="releaseTime" header-align="center" align="center" label="发布时间" width="160"></el-table-column>
+        <el-table-column prop="content" header-align="center" align="center" label="活动内容" width="260"></el-table-column>
+        <el-table-column prop="top" header-align="center" align="center" label="是否置顶" width="120">
           <template slot-scope="scope">
             <span v-if="scope.row.top === 0">否</span>
             <span v-if="scope.row.top === 1">是</span>
           </template>
         </el-table-column>
-        <el-table-column prop="status" header-align="center" align="center" label="发布状态" width="230">
+        <el-table-column prop="status" header-align="center" align="center" label="发布状态" width="120">
           <template slot-scope="scope">
             <span v-if="scope.row.status === 0">待发布</span>
             <span v-if="scope.row.status === 1">已上线</span>
             <span v-if="scope.row.status === 2">已下线</span>
           </template>
         </el-table-column>
-        <el-table-column prop="agencyName" header-align="center" align="center" label="发布单位" width="230"></el-table-column>
+        <el-table-column prop="agencyName" header-align="center" align="center" label="发布单位" width="240"></el-table-column>
         <el-table-column label="操作" fixed="right" width="230" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
@@ -78,13 +82,26 @@
         <el-form-item v-if="lookDetail" label="标题名称">
           <div>{{addForm.title}}</div>
         </el-form-item>
-        <el-form-item v-if="!lookDetail" label="时间" prop="value11">
+        <el-form-item v-if="!lookDetail" label="发布时间" prop="value11">
             <el-date-picker v-model="addForm.releaseTime" type="datetime" placeholder="选择时间" value-format="yyyy-MM-dd HH:mm:ss"
                             format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
         <el-form-item v-if="lookDetail" label="发布时间">
           <div>{{addForm.releaseTime}}</div>
         </el-form-item>
+        <!-- 发布状态 -->
+        <el-form-item v-if="!lookDetail" label="发布状态">
+          <el-select v-model="addForm.status" placeholder="请选择" clearable>
+            <el-option label="待发布" value="0" />
+            <el-option label="已上线" value="1" />
+            <el-option label="已下线" value="2" />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="lookDetail" label="发布状态">
+          <div v-if="addForm.status=='0'">待发布</div>
+          <div v-if="addForm.status=='1'">已上线</div>
+          <div v-if="addForm.status=='2'">已下线</div>
+        </el-form-item>
         <!-- 上传图片（单张） -->
         <el-form-item v-if="!lookDetail" label="上传图片" prop="image">
           <el-upload :headers="$getElUploadHeaders()" class="image-uploader" :action="uploadUrl" list-type="picture-card" :file-list="addForm.coverPic"
@@ -115,19 +132,6 @@
           <div v-if="addForm.top=='0'">否</div>
           <div v-if="addForm.top=='1'">是</div>
         </el-form-item>
-        <!-- 发布状态 -->
-        <el-form-item v-if="!lookDetail" label="发布状态">
-          <el-select v-model="addForm.status" placeholder="请选择" clearable>
-            <el-option label="待发布" value="0" />
-            <el-option label="已上线" value="1" />
-            <el-option label="已下线" value="2" />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-if="lookDetail" label="发布状态">
-          <div v-if="addForm.status=='0'">待发布</div>
-          <div v-if="addForm.status=='1'">已上线</div>
-          <div v-if="addForm.status=='2'">已下线</div>
-        </el-form-item>
         <!-- 底部按钮 -->
         <el-form-item v-if="!lookDetail" style="text-align: right;margin-top: 10px">
           <el-button @click="handleCancel">取消</el-button>
@@ -154,6 +158,7 @@ export default {
   },
   data () {
     return {
+      srcList: [],
       loading: false,
       total: 0,
       pageSize: 10,
@@ -165,7 +170,6 @@ export default {
       unitList: [],
       typeList:[],//活动类型
       corganizerList:[],//协办方list
-      timeRange: [],
       value1: [],
       value11: [],
       formData: {
@@ -237,6 +241,10 @@ export default {
     this.communityActivityList()
   },
   methods: {
+    imageClick(val){
+      this.srcList = []
+      this.srcList.push(val)
+    },
     async communityActivityList() {
       const url = "/actual/base/partyActivity/page";
       let params = {
@@ -384,7 +392,6 @@ export default {
     },
     //重置搜索条件
     resetSearch () {
-      this.timeRange = []
       this.formData = {
         title: "",
         status: "",
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 7e49f3131..0c5a8e79a 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -1,983 +1,592 @@
 <template>
-  <div v-if="pageLoading"
-       class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
-      <div class="">
-        <el-form ref="searchForm"
-                 :inline="true"
-                 :model="searchForm"
-                 class="demo-form-inline">
-          <el-form-item label="所属网格"
-                        prop="gridId">
-            <el-select v-model.trim="searchForm.gridId"
-                       filterable
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in optionsG"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
+  <div class="g-main">
+    <div class="m-search">
+      <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+        <div>
+          <el-form-item label="标题名称" prop="activityName">
+            <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable
+                      placeholder="请输入关键字">
+            </el-input>
           </el-form-item>
-          <el-form-item label="分类类别"
-                        prop="categoryId">
-            <el-select v-model.trim="searchForm.categoryId"
-                       filterable
-                       placeholder="请选择"
-                       clearable>
-              <el-option v-for="item in optionsC"
-                         :key="item.categoryId"
-                         :label="item.categoryName"
-                         :value="item.categoryId">
-              </el-option>
-            </el-select>
+          <el-form-item label="党员姓名" prop="activityName">
+            <el-input v-model.trim="formData.partyMemberName" size="small" class="item_width_1" clearable
+                      placeholder="请输入关键字">
+            </el-input>
           </el-form-item>
-          <el-form-item label="党员姓名"
-                        prop="name">
-            <!-- <el-select v-model.trim="searchForm.name" filterable placeholder="请选择" clearable>
-              <el-option
-                v-for="item in demandOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select> -->
-            <el-input v-model.trim="searchForm.name"
-                      placeholder="请输入"
-                      class="input-width"
-                      clearable></el-input>
+          <el-form-item label="上架状态" prop="activityName">
+            <el-select v-model="formData.status" placeholder="请选择" clearable>
+              <el-option label="待发布" value="0" />
+              <el-option label="已上线" value="1" />
+              <el-option label="已下线" value="2" />
+            </el-select>
           </el-form-item>
-          <el-form-item label="主要事迹"
-                        prop="mainDeed">
-            <el-input v-model.trim="searchForm.mainDeed"
-                      placeholder="请输入"
-                      class="input-width"
-                      clearable></el-input>
+          <el-form-item label="发布时间">
+            <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss"
+                            format="yyyy-MM-dd HH:mm:ss" end-placeholder="结束日期">
+            </el-date-picker>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--white"
-                       size="small"
-                       @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--blue"
-                       size="small"
-                       @click="resetForm('searchForm')">重置</el-button>
-           
-         
+            <el-button style="margin-left:10px" @click="handleSearch" type="primary">查询</el-button>
+            <el-button style="margin-left:10px" @click="resetSearch" type="primary">重置</el-button>
           </el-form-item>
-        </el-form>
-      </div>
-    </el-card>
-    <el-card class="resi-card-table">
-
-      <div class="resi-row-btn">
-        <el-button class="diy-button--blue"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
-        <el-button class="diy-button--white"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
-                   ref="upload"
-                   class="upload-demo"
-                   action="uploadUlr"
-                   :limit="1"
-                   :accept="'.xls,.xlsx'"
-                   :with-credentials="true"
-                   :show-file-list="false"
-                   :auto-upload="true"
-                   :on-success="handleExcelSuccess"
-                   :before-upload="beforeExcelUpload"
-                   :http-request="uploadHttpRequest">
-          <el-button size="small"
-                     class="diy-button--blue"
-                     :loading="importLoading">{{importBtnTitle}}</el-button>
-        </el-upload>
-        <el-button class="diy-button--white"
-                   size="small"
-                   :loading="exportBtn"
-                   @click="handleExport">{{ exportBtnTitle }}</el-button>
-
+        </div>
+      </el-form>
+    </div>
+    <div class="m-table">
+      <div class="div_btn">
+        <el-button style="" class="diy-button--add" size="small" @click="handleInitAdd">+ 新增</el-button>
       </div>
-
-      <el-table :data="tableData"
-                row-key="id"
-                v-loading="tableLoading"
-                border
-                :height="tableHeight"
-                style="width: 100%"
-                class="resi-table">
-        <el-table-column label="序号"
-                         type="index"
-                         align="center"
-                         width="50">
+      <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading" style="width: 100%;margin-top:16px">
+        <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
+        <el-table-column prop="title" header-align="center" align="center" label="标题名称" width="260"></el-table-column>
+        <el-table-column prop="coverPic" header-align="center" align="center" label="图片" width="180">
+          <template slot-scope="scope">
+            <el-image :src="scope.row.coverPic" style="width: 40px;height: 40px;" :preview-src-list="srcList" @click="imageClick(scope.row.coverPic)"></el-image>
+          </template>
         </el-table-column>
-        <el-table-column v-for="item in tableHeader"
-                         :key="item.columnName"
-                         :prop="item.columnName"
-                         :label="item.label"
-                         :align="item.align"
-                         :width="item.width">
+        <el-table-column prop="partyMemberName" header-align="center" align="center" label="党员姓名" width="260"></el-table-column>
+        <el-table-column prop="releaseTime" header-align="center" align="center" label="发布时间" width="160"></el-table-column>
+        <el-table-column prop="top" header-align="center" align="center" label="是否置顶" width="120">
           <template slot-scope="scope">
-            <div class="div-content">{{ handleFilterSpan(scope.row, item) }}</div>
+            <span v-if="scope.row.top === 0">否</span>
+            <span v-if="scope.row.top === 1">是</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作"
-                         align="center"
-                         width="200">
+        <el-table-column prop="status" header-align="center" align="center" label="发布状态" width="120">
           <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)"
-                       type="text"
-                       size="small"
-                       class="btn-color-look">查看</el-button>
-            <el-button @click="handleEdit(scope.row, 'edit')"
-                       type="text"
-                       size="small"
-                       class="btn-color-edit">编辑</el-button>
-            <el-popconfirm title="删除之后无法恢复，确认删除？"
-                           @onConfirm="handleDel(scope.row)">
-              <el-button slot="reference"
-                         type="text"
-                         size="small"
-                         class="btn-color-del">删除</el-button>
-            </el-popconfirm>
+            <span v-if="scope.row.status === 0">待发布</span>
+            <span v-if="scope.row.status === 1">已上线</span>
+            <span v-if="scope.row.status === 2">已下线</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="agencyName" header-align="center" align="center" label="发布单位" width="240"></el-table-column>
+        <el-table-column label="操作" fixed="right" width="230" header-align="center" align="center" class="operate">
+          <template slot-scope="scope">
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button v-if="scope.row.status === 0" type="text" style="color:#1C6AFD;" size="small" @click="handleSumm(scope.row,'1')">上架</el-button>
+            <el-button v-if="scope.row.status === 1" type="text" style="color:#1C6AFD;" size="small" @click="handleSumm(scope.row,'2')">下架</el-button>
+            <el-button v-if="scope.row.status === 2" type="text" style="color:#1C6AFD;" size="small" @click="handleSumm(scope.row,'1')">上架</el-button>
+            <el-button type="text" style="color:rgb(28, 106, 253);" size="small" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="currentPage"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+                       :page-sizes="[10, 20, 50]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
         </el-pagination>
       </div>
-    </el-card>
-
-    <el-dialog title="党员风采"
-               :visible.sync="dialogVisible"
-               width="50%"
-               top="5vh"
-               class="dialog-h"
-               append-to-body
-               :close-on-click-modal="false"
-               :before-close="handlerCancle">
-      <el-form v-if="dialogVisible"
-               label-width="100px"
-               :model="form"
-               :rules="rules"
-               ref="ruleForm"
-               class="form-wr dialog-h-content scroll-h">
-        <el-form-item label="所属网格"
-                      prop="gridId">
-          <el-select v-model.trim="form.gridId"
-                     filterable
-                     :disabled="disabled"
-                     placeholder="请选择"
-                     class="input-width"
-                     clearable>
-            <el-option v-for="item in optionsEditG"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
+    </div>
+    <el-dialog :visible.sync="detailShow" v-if="detailShow" formShow :close-on-click-modal="false"
+               :close-on-press-escape="false" :title="'活动详情'" width="950px" top="5vh" @closed="detailClosed">
+      <el-form ref="addFormRef" :model="addForm" :rules="formRules" label-width="140px" class="add-form">
+        <!-- 标题名称 -->
+        <el-form-item v-if="!lookDetail" label="标题名称" prop="title">
+          <el-input v-model="addForm.title" placeholder="请输入" style="width: 80%;"/>
         </el-form-item>
-        <el-form-item v-if="disabled"
-                      label="分类类别"
-                      prop="categoryId">
-          <el-select v-model.trim="form.categoryId"
-                     filterable
-                     :disabled="disabled"
-                     placeholder="请选择"
-                     class="input-width"
-                     clearable>
-            <el-option v-for="item in optionsC"
-                       :key="item.categoryId"
-                       :label="item.categoryName"
-                       :value="item.categoryId">
-            </el-option>
-          </el-select>
+        <el-form-item v-if="lookDetail" label="标题名称">
+          <div>{{addForm.title}}</div>
+        </el-form-item>
+        <el-form-item v-if="!lookDetail" label="发布时间" prop="value11">
+          <el-date-picker v-model="addForm.releaseTime" type="datetime" placeholder="选择时间" value-format="yyyy-MM-dd HH:mm:ss"
+                          format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        </el-form-item>
+        <el-form-item v-if="lookDetail" label="发布时间">
+          <div>{{addForm.releaseTime}}</div>
         </el-form-item>
-        <el-form-item v-else
-                      label="分类类别"
-                      prop="categoryId">
-          <el-select v-model.trim="form.categoryId"
-                     filterable
-                     :disabled="disabled"
-                     placeholder="请选择"
-                     class="input-width"
-                     clearable>
-            <el-option v-for="item in optionsEditC"
-                       :key="item.categoryId"
-                       :label="item.categoryName"
-                       :value="item.categoryId">
-            </el-option>
+        <!-- 发布状态 -->
+        <el-form-item v-if="!lookDetail" label="发布状态">
+          <el-select v-model="addForm.status" placeholder="请选择" clearable>
+            <el-option label="待发布" value="0" />
+            <el-option label="已上线" value="1" />
+            <el-option label="已下线" value="2" />
           </el-select>
         </el-form-item>
-        <el-form-item label="党员姓名"
-                      prop="name">
-          <el-input v-model.trim="form.name"
-                    placeholder="请输入"
-                    :disabled="disabled"
-                    class="input-width"
-                    clearable></el-input>
+        <el-form-item v-if="lookDetail" label="发布状态">
+          <div v-if="addForm.status=='0'">待发布</div>
+          <div v-if="addForm.status=='1'">已上线</div>
+          <div v-if="addForm.status=='2'">已下线</div>
         </el-form-item>
-        <el-form-item label="主要事迹"
-                      prop="mainDeed">
-          <el-input v-model.trim="form.mainDeed"
-                    :autosize="{ minRows: 10, maxRows: 10}"
-                    :disabled="disabled"
-                    type="textarea"
-                    clearable
-                    class="input-width-textarea"
-                    placeholder="请输入内容"></el-input>
+        <!-- 上传图片（单张） -->
+        <el-form-item v-if="!lookDetail" label="上传图片" prop="image">
+          <el-upload :headers="$getElUploadHeaders()" class="image-uploader" :action="uploadUrl" list-type="picture-card" :file-list="addForm.coverPic"
+                     :data="{ customerId: customerId }" :before-upload="beforeUploadImage"
+                     :on-preview="handlePreview" :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :on-success="handleAvatarSuccess">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <!-- 图片预览弹窗 -->
+          <el-dialog :visible.sync="previewVisible" title="图片预览">
+            <img :src="previewImage" style="width: 100%;" />
+          </el-dialog>
         </el-form-item>
-        <!-- <el-form-item label="状态">
-          <el-switch v-model.trim="form.usableFlag"></el-switch>
-        </el-form-item> -->
-        <el-form-item label="照片">
-          <div class="imsg-list">
-            <div v-for="(item, index) in form.imageList"
-                 :key="index"
-                 class="imgs-item">
-              <el-image style="width: 100px; height: 100px"
-                        :src="item"
-                        fit="fill"
-                        :preview-src-list="form.imageList"></el-image>
-              <i class="el-icon-delete"
-                 @click="handleDelimg(item, index)"></i>
-            </div>
-            <el-upload :headers="$getElUploadHeaders()"
-                       class="avatar-uploader"
-                       v-if="form.imageList.length < 3 && !disabled"
-                       :action="uploadUlr"
-                       :data="{customerId:customerId}"
-                       :show-file-list="false"
-                       :disabled="disabled"
-                       :on-progress="handleProgress"
-                       :on-success="handleImgSuccess"
-                       :before-upload="beforeImgUpload">
-              <el-progress v-if="uploading"
-                           :width="100"
-                           type="circle"
-                           :percentage="unloadPencent"></el-progress>
-              <i v-else
-                 class="el-icon-plus avatar-uploader-icon"></i>
-
-            </el-upload>
-          </div>
+        <el-form-item v-if="lookDetail" label="图片">
+          <el-image :src="addForm.coverPic" style="height: 100px;" />
+        </el-form-item>
+        <!-- 详细内容（富文本编辑器） -->
+        <el-form-item v-if="!lookDetail" label="详细内容" prop="content">
+          <quill-editor v-model="addForm.content" :options="quillOptions" class="my-quill-editor"/>
+        </el-form-item>
+        <el-form-item v-if="lookDetail" label="详细内容">
+          <div>{{addForm.content}}</div>
+        </el-form-item>
+        <!-- 是否置顶 -->
+        <el-form-item v-if="!lookDetail" label="是否置顶">
+          <el-switch v-model="addForm.top" active-color="#3493fd" inactive-color="#e2e2e3" :active-value="1" :inactive-value="0" />
+        </el-form-item>
+        <el-form-item v-if="lookDetail" label="是否置顶">
+          <div v-if="addForm.top=='0'">否</div>
+          <div v-if="addForm.top=='1'">是</div>
+        </el-form-item>
+        <!-- 底部按钮 -->
+        <el-form-item v-if="!lookDetail" style="text-align: right;margin-top: 10px">
+          <el-button @click="handleCancel">取消</el-button>
+          <el-button type="primary" @click="handleSubmit">确定</el-button>
         </el-form-item>
       </el-form>
-      <div class="resi-btns">
-        <el-button size="small"
-                   @click="handlerCancle">取消</el-button>
-        <el-button v-if="!disabled"
-                   type="primary"
-                   size="small"
-                   :loading="btnLoading"
-                   @click="handleSUbmit">提交</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 详情弹出框 -->
-    <el-dialog :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'党员风采详情'"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailFormCancle">
-      <detail-form ref="ref_form_detail"
-                   @diaDetailClose="detailFormCancle"></detail-form>
     </el-dialog>
-
   </div>
 </template>
-
 <script>
-import axios from 'axios'
+// 引入富文本编辑器及样式
+import { quillEditor } from 'vue-quill-editor'
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
+
+import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
-import detailForm from "./detail";
 
+let loading // 加载动画
 export default {
-  components: { detailForm },
+  components: {
+    quillEditor // 注册富文本组件
+  },
   data () {
     return {
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
-      importBtnTitle: '导入',
-      importLoading: false,
-      exportBtn: false,
-      exportBtnTitle: '导出',
+      srcList: [],
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 0,
       tableLoading: false,
-      btnLoading: false,
-      uploading: false,
-      disabled: false,
-      pageLoading: false,
-      dialogVisible: false,
-      currentPage: 1,
-      pageSize:window.localStorage.getItem('pageSize') || 20,
-      total: null,
+      lookDetail: false,
+      agencyId: '',
+      gridList: [],//所属网格
+      unitList: [],
+      typeList:[],//活动类型
+      corganizerList:[],//协办方list
+      value1: [],
+      value11: [],
+      formData: {
+        title: "",
+        partyMemberName: '',
+        status: "",
+        startTime: '',
+        endTime: '',
+      },
       tableData: [],
-      searchH: 0,
-      unloadPencent: 0,
-      addLevel: '1',
-      addType: 'add',
-      value: '',
-      optionsEditG: [],
-      optionsG: [],
-      optionsC: [],
-      optionsEditC: [],
-      options: [
-        {
-          label: '是',
-          value: 1
-        }, {
-          label: '否',
-          value: 2
-        }
-      ],
-      demandOptions: [],
-      tableHeader: [
-        {
-          label: '党员姓名',
-          columnName: 'name',
-          align: 'center',
-          width: '160',
-          options: []
-        }, {
-          label: '所属网格',
-          align: 'center',
-          columnName: 'gridName',
-          width: '200',
-          options: []
-        }, {
-          label: '分类类别',
-          align: 'center',
-          columnName: 'categoryName',
-          width: '160',
-          options: []
-        }, {
-          label: '主要事迹',
-          columnName: 'mainDeed',
-          align: 'center',
-          width: '',
-          options: []
-        }
-      ],
-      customerId: '',
-      searchForm: {
-        gridId: '',
-        categoryId: '',
-        mainDeed: '',
-        name: ''
+      formTitle: '新增活动',
+      detailShow: false,
+      detail:{},
+      // 表单数据
+      addForm: {
+        title: "",
+        coverPic: [], // 上传图片的文件列表
+        content: "",
+        releaseTime: '',
+        top: 0, // 默认置顶
+        status: '',
+        startTime: '',
+        endTime: '',
       },
-      form: {
-        agencyId: '',
-        gridId: '',
-        name: '',
-        categoryId: '',
-        mainDeed: '',
-        imageList: []
+      // 表单验证规则
+      formRules: {
+        title: [
+          { required: true, message: "请输入标题名称", trigger: "blur" }
+        ],
+        image: [
+          { required: true, validator: this.validateImage, trigger: "change" }
+        ],
+        content: [
+          { required: true, message: "请输入详细内容", trigger: "blur" }
+        ]
       },
-      rules: {
-        gridId: [{ required: true, message: '网格不能为空', trigger: 'blur' }],
-        categoryId: [{ required: true, message: '分类类别不能为空', trigger: 'blur' }],
-        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
-        mainDeed: [{ required: true, message: '主要事迹不能为空', trigger: 'blur' }],
+      // 富文本配置
+      quillOptions: {
+        placeholder: '请输入内容...',
+        theme: 'snow',
+        modules: {
+          toolbar: [
+            ['bold', 'italic', 'underline', 'strike'],
+            ['blockquote', 'code-block'],
+            [{ 'header': 1 }, { 'header': 2 }],
+            [{ 'list': 'ordered' }, { 'list': 'bullet' }],
+            [{ 'script': 'sub' }, { 'script': 'super' }],
+            [{ 'indent': '-1' }, { 'indent': '+1' }],
+            [{ 'direction': 'rtl' }],
+            [{ 'size': ['small', false, 'large', 'huge'] }],
+            [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+            [{ 'color': [] }, { 'background': [] }],
+            [{ 'font': [] }],
+            [{ 'align': [] }],
+            ['clean'],
+            ['link', 'image', 'video']
+          ],
+        }
       },
-      detailShow: false,
-    }
-  },
-  computed: {
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-    tableHeight () {
-      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
-      const _h = this.clientHeight - 280 - this.searchH
-      return this.$store.state.inIframe ? h : _h
+      // 图片上传相关
+      uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+      customerId: localStorage.getItem('customerId'),
+      previewVisible: false,
+      previewImage: ""
     }
   },
-  async created () {
-    this.customerId = localStorage.getItem('customerId')
-    // setTimeout(() => {
-    //   this.getTableData()
-    //   this.getGridList('query')
-    //   this.getGridList('addorupdate')
-    //   this.getCateList('query')
-    //   this.getCateList('addorupdate')
-    // }, 200)
-    this.getTableData()
-    this.getGridList('query')
-    this.getGridList('addorupdate')
-    this.getCateList('query')
-    this.getCateList('addorupdate')
-    this.pageLoading = true
-
-    // this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
-  },
-
-  mounted () {
-
-    this.$nextTick(() => {
-      this.searchH = this.$refs.searchCard.$el.offsetHeight
-      console.log('tableHeight', this.tableHeight)
-    })
-
+  async mounted () {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    this.communityActivityList()
   },
   methods: {
-    handleSizeChange (val) {
-      
-      this.pageSize = val
-      this.getTableData()
+    imageClick(val){
+      this.srcList = []
+      this.srcList.push(val)
     },
-    handleCurrentChange (val) {
-      
-      this.currentPage = val
-      this.getTableData()
+    async communityActivityList() {
+      const url = "/actual/base/partyMemberStyle/page";
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData,
+      };
+      let { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+      } else {
+        this.$message.error(msg)
+      }
     },
-    handleFilterSpan (row, item) {
-      let _val = ''
-      if (item.options && item.options.length > 0) {
-        item.options.forEach((n) => {
-          if (n.value === row[item.columnName]) _val = n.label
-        })
+    async handleSearch () {
+      if(this.value1){
+        if(this.value1.length==2){
+          this.formData.startTime = this.value1[0]
+          this.formData.endTime = this.value1[1]
+        }
+      }else {
+        this.formData.startTime = ''
+        this.formData.endTime = ''
       }
-      return _val || row[item.columnName]
+      this.communityActivityList()
     },
-    // 上传大图标成功
-    handleExcelSuccess (res, file) {
-      if (res.code === 0 && res.msg === 'success') {
-
-        console.log('resss---ppp', res)
-
+    detailClosed () {
+      this.detailShow = false
+    },
+    async handleDetail (row) {
+      this.lookDetail = true
+      const url = "/actual/base/partyActivity/"+row.id;
+      let params = {};
+      let data = await requestPost(url, params);
+      console.log(data,"1111111111111")
+      if (data.code === 0) {
+        this.addForm = data.data
       } else {
-        this.$message.error(res.msg)
+        this.$message.error(data.msg)
       }
+      this.detailShow = true
+      this.formTitle = '详情'
     },
-    handleProgress (event, file, fileList) {
-      console.log('percentage', event, file.percentage)
-      this.uploading = true
-      this.unloadPencent = Number(file.percentage.toFixed(0))
-    },
-    download (data, fileName) {
-      
-      if (!data) {
-        return
+    async handleEdit (row) {
+      this.resetForm()
+      this.lookDetail = false
+
+      const url = "/actual/base/partyActivity/"+row.id;
+      let params = {};
+      let data = await requestPost(url, params);
+      console.log(data,"1111111111111")
+      if (data.code === 0) {
+        this.addForm.id = data.data.id
+        this.addForm.title = data.data.title
+        this.addForm.coverPic = [{name: new Date(), url: data.data.coverPic}]
+        this.addForm.releaseTime = data.data.releaseTime
+        this.addForm.content = data.data.content
+        this.addForm.top = data.data.top
+        if(data.data.status){
+          this.addForm.status = parseInt(data.data.status)
+        }
+        this.addForm.agencyName = data.data.agencyName
+      } else {
+        this.$message.error(data.msg)
       }
 
-      var csvData = new Blob([data])
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName)
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement('a')
-        document.body.appendChild(a)
-        a.style = 'display: none'
-        var url = window.URL.createObjectURL(csvData)
-        a.href = url
-        a.download = fileName
-        a.click()
-        a.remove()
-        window.URL.revokeObjectURL(url)
-      }
+      this.formTitle = '修改'
+      this.detailShow = true
     },
-    async handleExportModule () {
-      let url = "/resi/partymember/icpartymemberstyle/import/template-download"
-
-
-      let params = {}
-      // app.ajax.exportFilePost(
-      //   url,
-      //   params,
-      //   (data, rspMsg) => {
+    async handleSumm(row, val){
+      //上架
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then( async () => {
+        const url = "/actual/base/partyActivity/updateStatus"
+        const { data, code, msg } = await requestPost(url, { id: row.id, top: row.top, status: val })
+        if (code === 0) {
+          this.$message({
+            type: "success",
+            message: "操作成功"
+          });
+          this.communityActivityList()
+        } else {
+          this.$message.error(msg)
+        }
+      }).catch(err => {
 
-      //     this.download(data, 'a.xls')
-      //   },
-      //   (rspMsg, data) => {
-      //     this.$message.error(rspMsg);
-      //   }
-      // );
-      await this.$http({
-        method: 'POST',
-        url,
-        responseType: 'blob',
-        data: params
-      })
-        .then(res => {
-          console.log('res-------dd', res)
-          if (res.headers["content-disposition"]) {
-            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-            this.download(res.data, fileName)
-            // console.log('filename', fileName)
-            // let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-            // var url = window.URL.createObjectURL(blob)
-            // var aLink = document.createElement('a')
-            // aLink.style.display = 'none'
-            // aLink.href = url
-            // aLink.setAttribute('download', fileName)
-            // document.body.appendChild(aLink)
-            // aLink.click()
-            // document.body.removeChild(aLink) //下载完成移除元素
-            // window.URL.revokeObjectURL(url) //释放掉blob对象
-          } else this.$message.error('下载失败')
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
-        })
+      });
     },
-    beforeExcelUpload (file) {
-      console.log('file', file)
-      const isType = file.type === 'application/vnd.ms-excel'
-      const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      const fileType = isType || isTypeComputer
-      const isLt1M = (file.size / 1024 / 1024) < 10
-      if (!fileType) {
-        this.$message.error('上传文件只能是xls/xlsx格式！')
-      }
-
-      if (!isLt1M) {
-        this.$message.error('上传文件大小不能超过 10MB!')
+    resetForm(){
+      this.addForm = {
+        title: "",
+        coverPic: [], // 上传图片的文件列表
+        content: "",
+        releaseTime: '',
+        top: 0, // 默认置顶
+        status: '',
+        startTime: '',
+        endTime: '',
       }
-      return fileType && isLt1M
     },
-    async uploadHttpRequest (file) {
-      this.importLoading = true
-      this.importBtnTitle = '正在上传中...'
-      this.$message({
-				showClose: true,
-				dangerouslyUseHTMLString: true,
-				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-        duration: 3000
-			});
-			let than = this
-			document.getElementById('clickA').addEventListener('click',function(){
-				than.$router.replace('/main/importRecord-index');
-			})
-      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
-      formData.append('file', file.file) //添加文件对象
-      this.$http
-        .post('/resi/partymember/icpartymemberstyle/import', formData).then(res => {
-          console.log('res-up', res)
-          if (res.data.code == 0 && res.data.msg == 'success') {
-            // this.$message.success('导入成功')
-            this.getTableData()
-          } else {
-            this.$message.error(res.data.msg)
-          }
-        }).catch(err => {
-          console.log('失败', err)
-          file.onError() //上传失败的文件会从文件列表中删除
-          // this.$message.error('导入失败')
-        })
-      // await axios({
-      //   url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/import',
-      //   method: 'post',
-      //   data: formData,
-      //   responseType: 'blob'
-      // })
-      // .then((res) => {
-      //   // this.importLoading = false
-      //   // this.importBtnTitle = '导入人员数据'
-      //   // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-      //   //   console.log('filename', fileName)
-      //   // let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-      //   // var url = window.URL.createObjectURL(blob)
-      //   // var aLink = document.createElement('a')
-      //   // aLink.style.display = 'none'
-      //   // aLink.href = url
-      //   // aLink.setAttribute('download', fileName)
-      //   // document.body.appendChild(aLink)
-      //   // aLink.click()
-      //   // document.body.removeChild(aLink) //下载完成移除元素
-      //   // window.URL.revokeObjectURL(url) //释放掉blob对象
-      //   this.getTableData()
-      // })
-      // .catch( err => {
-      //     console.log('失败', err)
-      //     file.onError() //上传失败的文件会从文件列表中删除
-      //     this.$message.error('导入失败')
-      // })
-      this.importLoading = false
-      this.importBtnTitle = '导入'
-      this.$refs.upload.clearFiles()
+    handleInitAdd (e) {
+      this.resetForm()
+      this.lookDetail = false
+      this.formTitle = '新增'
+      this.detailShow = true
     },
-    async handleExport () {
-      this.exportBtn = true
-      this.exportBtnTitle = '正在导出...'
-      let params = {
-        agencyId: this.$store.state.user.agencyId,
-        pageSize: 9999,
-        pageNo: this.currentPage
+    strToArrStr(str, separator = ",") {
+      // 空值处理：避免空字符串转成"[]"以外的错误格式
+      if (!str || typeof str !== "string") {
+        return "[]";
       }
-      // .post('epmetuser/icresiuser/exportExcel', params)
-      await axios({
-        url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/export',
-        // url: 'epmetuser/icresiuser/exportExcel',
-        method: 'post',
-        data: params,
-        responseType: 'blob'
-      })
-        .then(res => {
-          console.log('resllll', res)
-          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-          console.log('filename', fileName)
-          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-          var url = window.URL.createObjectURL(blob)
-          var aLink = document.createElement('a')
-          aLink.style.display = 'none'
-          aLink.href = url
-          aLink.setAttribute('download', fileName)
-          document.body.appendChild(aLink)
-          aLink.click()
-          document.body.removeChild(aLink) //下载完成移除元素
-          window.URL.revokeObjectURL(url) //释放掉blob对象
-        })
-        .catch((err) => {
-          
-          this.$message.error('获取导出失败')
-        })
-      this.exportBtn = false
-      this.exportBtnTitle = '导出'
+      // 1. 按分隔符分割成数组
+      const arr = str.split(separator);
+      // 2. 给每个元素加引号，再拼接成数组字符串
+      const arrStr = arr.map(item => `"${item.trim()}"`).join(",");
+      // 3. 包裹数组括号
+      return `[${arrStr}]`;
     },
-    beforeImgUpload (file) {
-      const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')
-      const isLt1M = file.size / 1024 / 1024 < 10
+    async handleDelete (row) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then( async () => {
+        const url = "/actual/base/partyActivity/delete"
+        const { data, code, msg } = await requestPost(url, this.strToArrStr(row.id),{
+          'Content-Type': 'application/json' // 关键：改为后端支持的类型
+        })
+        if (code === 0) {
+          this.$message({
+            type: "success",
+            message: "删除成功"
+          });
+          this.communityActivityList()
+        } else {
+          this.$message.error(msg)
+        }
+      }).catch(err => {
 
-      if (!isPNG) {
-        this.$message.error('上传图片只能是 PNG 或 JPEG 格式!')
-      }
-      if (!isLt1M) {
-        this.$message.error('上传图片大小不能超过 10MB!')
+      });
+    },
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+        title: "",
+        partyMemberName: '',
+        status: "",
+        startTime: '',
+        endTime: '',
       }
-      return isPNG && isLt1M
+      this.pageSize = 10
+      this.pageNo = 1
+      // this.loadTable()
+      this.communityActivityList()
     },
-    handleImgSuccess (res, file) {
-      if (res.code === 0 && res.msg === 'success') {
-
-        console.log('res.data.url', res.data.url)
-        this.uploading = false
-        this.unloadPencent = 0
-        this.form.imageList.push(res.data.url)
-
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      // this.loadTable()
+      this.communityActivityList()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      // this.loadTable()
+      this.communityActivityList()
+    },
+    // 自定义图片验证（判断是否上传了图片）
+    validateImage(rule, value, callback) {
+      if (this.addForm.coverPic.length === 0) {
+        callback(new Error("请上传图片"));
       } else {
-        this.$message.error(res.msg)
+        callback();
       }
     },
-    handleDelimg (item, index) {
-      this.form.imageList.splice(index, 1)
-    },
-    handleSearch (val) {
-      console.log('searchhh--', val)
-      this.currentPage = 1
-      this.getTableData()
+    // 图片上传前校验（可选：限制格式、大小）
+    beforeUploadImage(file) {
+      const isJPG = file.type === "image/jpeg" || file.type === "image/png";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      if (!isJPG) {
+        this.$message.error("只能上传JPG/PNG格式的图片");
+      }
+      if (!isLt2M) {
+        this.$message.error("图片大小不能超过2MB");
+      }
+      return isJPG && isLt2M;
     },
-    resetForm (formName) {
-      this.$refs[formName].resetFields()
-      this.handleSearch()
+    handleAvatarSuccess(res, file, fileList){
+      console.log(res,"++++++++++res")
+      console.log(file,"++++++++++file")
+      console.log(fileList,"++++++++++fileList")
+      this.addForm.coverPic.push(res.data);
     },
-    handleAdd () {
-
-      this.dialogVisible = true
+    // 图片预览
+    handlePreview(file) {
+      this.previewImage = file.url;
+      this.previewVisible = true;
     },
-
-    handlerCancle () {
-      for (const n in this.form) {
-        this.form[n] = ''
-        if (n === 'imageList') this.form[n] = []
-      }
-      this.disabled = false
-      this.dialogVisible = false
+    // 移除已上传的图片
+    handleRemove(file, fileList) {
+      this.addForm.coverPic = fileList;
     },
-    async handleLook (row) {
-      await this.getDetail(row.id, 'detail')
-
-
-
-
+    // 超过上传数量限制
+    handleExceed(files, fileList) {
+      this.$message.warning("只能上传1张图片");
     },
-
-    detailFormCancle () {
-
+    // 取消按钮：重置表单
+    handleCancel() {
+      this.resetForm()
       this.detailShow = false
     },
-
-    async handleEdit (row, addType) {
-      // this.form = { ...row }
-      await this.getDetail(row.id)
-      // this.dialogVisible = true
-    },
-    async addNew () {
-      const { user } = await this.$store.state
-      const _form = {
-        ...this.form,
-        agencyId: user.agencyId
+    // 确定按钮：提交表单
+    handleSubmit() {
+      console.log(this.addForm,"++++++++++++addForm")
+      if(this.value11.length==2){
+        this.addForm.startTime = this.value11[0]
+        this.addForm.endTime = this.value11[1]
       }
-      await this.$http
-        .post('/resi/partymember/icpartymemberstyle/save', _form)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.$message.success('操作成功')
-            this.handlerCancle()
-            this.getTableData()
-          }
-        })
-        .catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
-        })
-      this.btnLoading = false
-    },
-    handleSUbmit () {
-      this.$refs.ruleForm.validate(async (valid) => {
+      this.addForm.coverPic = this.addForm.coverPic[0].url;
+      this.$refs.addFormRef.validate(async (valid) => {
         if (valid) {
-          this.btnLoading = true
-          this.addNew()
+          // 表单验证通过，这里写提交接口的逻辑
+          // 示例：this.$api.addData(this.addForm).then(res => { ... })
+
+          if(this.addForm.id){
+            const url = "/actual/base/partyActivity/update";
+            let data = await requestPost(url, this.addForm);
+            console.log(data,"1111111111111")
+            if (data.code === 0) {
+              this.detailShow = false
+              this.communityActivityList()
+              this.$message.success("操作成功！");
+            } else {
+              this.$message.error(data.msg)
+            }
+          }else {
+            const url = "/actual/base/partyActivity/save";
+            let data = await requestPost(url, this.addForm);
+            console.log(data,"1111111111111")
+            if (data.code === 0) {
+              this.detailShow = false
+              this.communityActivityList()
+              this.$message.success("操作成功！");
+            } else {
+              this.$message.error(data.msg)
+            }
+          }
+
+          // 提交后重置表单
+          this.resetSearch()
         } else {
-          console.log('error submit!!');
+          this.$message.error("请完善必填项！");
           return false;
         }
       });
-
-    },
-    handleDel (row) {
-      let params = {
-        id: row.id
-      }
-      
-      this.$http
-        .post('/resi/partymember/icpartymemberstyle/delete', params)
-        .then(({ data: res }) => {
-          
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            
-            this.$message.success('删除成功')
-            this.getTableData()
-          }
-        })
-        .catch((err) => {
-          
-          return this.$message.error('网络错误')
-        })
-    },
-    async getDetail (id, type) {
-      let params = {
-        id,
-      }
-      this.$http
-        .post('/resi/partymember/icpartymemberstyle/detail', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.form = { ...res.data }
-            const _arr = this.optionsEditC.map(item => item.categoryId)
-
-            if (!_arr.includes(res.data.categoryId) && !this.disabled) this.form.categoryId = ''
-            // this.optionsEditC.forEach(item => {
-            //   if (item.categoryId === res.data.categoryId) 
-            // })
-            if (type === 'detail') {
-              this.detailShow = true
-              this.$nextTick(() => {
-                this.$refs.ref_form_detail.initForm(this.form)
-              })
-            } else {
-              this.dialogVisible = true
-            }
-
-          }
-        })
-        .catch((err) => {
-          
-          return this.$message.error('网络错误')
-        })
+    }
+  },
+  computed: {
+    tableHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
     },
-    async getGridList (type, agencyId) {
-      const { user } = await this.$store.state
-      
-      // addorupdate  query
-      await this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: agencyId || user.agencyId, purpose: type })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            
 
-            if (type === 'query') this.optionsG = res.data
-            else this.optionsEditG = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    async getCateList (type) {
-      const { user } = await this.$store.state
-      
-      const params = {
-        customerId: this.customerId,
-        type
-      }
-      // addorupdate  query
-      await this.$http
-        .post('/resi/partymember/stylecategorydict/select-list', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
 
-            if (type === 'query') this.optionsC = res.data
-            else this.optionsEditC = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    async getTableData () {
-      this.tableLoading = true
-      const { user } = await this.$store.state
-      let params = {
-        ...this.searchForm,
-        agencyId: user.agencyId,
-        pageNo: this.currentPage,
-        pageSize: this.pageSize
-      }
-      await this.$http
-        .post('/resi/partymember/icpartymemberstyle/list', params)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            this.tableData = res.data.list
-            this.total = res.data.total
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-      this.tableLoading = false
-    }
+  },
+  props: {
 
   }
 }
 </script>
+<style lang="scss" scoped >
+.g-main {
+  width: 100%;
+}
 
-<style lang="scss" scoped>
-@import "@/assets/scss/buttonstyle.scss";
+.m-search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 24px 10px 10px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  margin: 20px 7px 7px;
+}
 
-.resi-container .resi-card-table {
-  // ::v-deep .el-table th {
-  //   color: #fff;
-  //   background-color: rgba(33, 149, 254, 1);
-  //   // border-right: 1px solid rgba(33, 149, 254, 1);
+// .item_width_1 {
+//   width: 260px;
+// }
+
+// .item_width_2 {
+//   width: 495px;
+// }
+
+.m-table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  padding: 24px 16px 10px;
+  margin: 16px 7px 7px;
+
+  // .table {
+  //   margin-top: 20px;
   // }
 }
-.form-wr {
-  .input-width {
-    width: 260px;
-  }
-  .input-width-textarea {
-    width: 500px;
-  }
-  .imsg-list {
-    display: flex;
-    align-items: center;
-    .imgs-item {
-      position: relative;
-      margin-right: 10px;
-      .el-icon-delete {
-        position: absolute;
-        top: 0;
-        right: 0;
-        font-size: 18px;
-        color: red;
-        z-index: 3;
-        cursor: pointer;
-      }
-    }
-  }
-}
-.div-content {
-  width: 100%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+
+.div_btn {
+  display: flex;
+  justify-content: space-between;
 }
-</style>
 
-<style lang="scss" scoped>
-.resi-row-btn {
+.el-row {
+  /* margin-bottom: 20px; */
   display: flex;
-  margin-bottom: 13px;
-  ::v-deep .el-button {
-    // margin-left: 10px;
-    border: 0;
-  }
-  ::v-deep .el-select {
-    margin-right: 10px;
-  }
-  .el-button--success {
-    background: rgba(34, 193, 195, 1);
-  }
-  .el-button {
-    margin-left: 10px;
-    border: 0;
-  }
-  .el-button--success {
-    background: rgba(34, 193, 195, 1);
-  }
-  .el-button--warning {
-    background: rgba(254, 179, 73, 1);
-  }
-  .el-button--danger {
-    background: rgba(254, 98, 82, 1);
-  }
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
 }
-.avatar-uploader {
-  ::v-deep .el-upload {
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-  .el-upload:hover {
-    border-color: #409eff;
-  }
-  .avatar {
-    width: 100px;
-    height: 100px;
-    display: block;
-  }
-  .avatar-uploader-icon {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    font-size: 28px;
-    color: #8c939d;
-    width: 100px;
-    height: 100px;
-    line-height: 100px;
-    text-align: center;
-  }
+.add-form {
+  //padding: 20px;
 }
-
-.resi-btns {
-  margin-top: 20px;
-  text-align: center;
+.image-uploader .el-upload--picture-card {
+  width: 150px;
+  height: 150px;
 }
-.btn-color-del{
-  margin-left: 10px;
+/* 穿透scoped，针对quill内部容器设置高度 */
+/* Vue2中深度选择器：/deep/ 或 ::v-deep（兼容不同预处理器） */
+/deep/ .my-quill-editor .ql-container {
+  height: 260px !important;  /* !important 覆盖默认样式 */
+}
+
+/* 可选：调整编辑区的最小高度，防止内容过少时高度塌陷 */
+/deep/ .my-quill-editor .ql-editor {
+  min-height: 260px;
 }
 </style>