diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
deleted file mode 100644
index 9799caf..0000000
--- a/admin-web-master/dist.zip
+++ /dev/null
diff --git a/admin-web-master/src/api/information.js b/admin-web-master/src/api/information.js
index ed4353b..6c98018 100644
--- a/admin-web-master/src/api/information.js
+++ b/admin-web-master/src/api/information.js
@@ -106,3 +106,24 @@ export  function statistical(data) {
     data
   })
 }
+
+// 商户导入管理模板
+export const excelAdd = (data = {}) => {
+  return request({
+    url: '/cereBasicInformationShop/excelAdd',
+    method: 'post',
+    data,
+    headers: {
+      'Content-type': 'multipart/form-data'
+    }
+  })
+}
+
+// 租赁信息
+export  function zulxin(data) {
+  return request({
+    url: `cereBasicInformationShop/${data.venueNumber}`,
+    method: 'get',
+    data
+  })
+}
diff --git a/admin-web-master/src/api/kefuServeBao.js b/admin-web-master/src/api/kefuServeBao.js
index c83cd71..565bb82 100644
--- a/admin-web-master/src/api/kefuServeBao.js
+++ b/admin-web-master/src/api/kefuServeBao.js
@@ -16,6 +16,14 @@ export function ReportDel(data) {
     data
   })
 }
+// 报修修改
+export function Reportedit(data) {
+  return request({
+    url: '/cereReportIssuesRepairs/edit',
+    method: 'post',
+    data
+  })
+}
 // 投诉
 export function ComplaintGetAll(data) {
   return request({
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index a0a7758..d56ef2c 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -15,7 +15,7 @@ let hostall = window.location.href;
 // const baseURL = 'http://192.168.2.38:9003';
 let baseURL =  ''
 // || host === 'localhost:9528'
-if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528') {
+if(host === 'localhost:8080' || host === 'localhost:8081'|| host === 'localhost:9528' || host === '192.168.31.45:9528'|| host === '192.168.31.45:9529') {
   // baseURL = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server';
   baseURL = 'http://172.16.61.125:9004';
 } else {
diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue
index a83757c..729068a 100644
--- a/admin-web-master/src/views/serve/MarkActivity/index.vue
+++ b/admin-web-master/src/views/serve/MarkActivity/index.vue
@@ -1,20 +1,30 @@
 <template>
   <div style="background-color:#f7f7f7;padding:10px 10px;">
-    <div class="zhuti" v-if="onaction == '1'">
+    <div class="zhuti">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">营销推广活动</span></div>
       </div>
-      <!-- 线上 -->
       <div>
         <!-- 搜索 -->
         <div class="formSearch">
-          <el-form :inline="true" :model="pagequery">
-            <el-form-item label="名称">
-              <el-input v-model="pagequery.name" placeholder="请输入" style="width:168px;" />
+          <el-form :inline="true" :model="formSel">
+            <el-form-item label="活动标题">
+              <el-input v-model="formSel.title" placeholder="请输入" style="width:168px;" />
             </el-form-item>
-          </el-form>
 
+            <el-form-item label="联系人">
+              <el-input v-model="formSel.contactPerson" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="联系电话">
+              <el-input v-model="formSel.contactPhone" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+            <el-form-item label="起止时间">
+              <el-select v-model="formSel.startTime" placeholder="请选择" style="width:168px;margin-right: 15px">
+                <el-option label="" value="" />
+              </el-select>
+            </el-form-item>
+          </el-form>
           <div>
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
             </el-button>
@@ -23,277 +33,696 @@
             </el-button>
           </div>
         </div>
-      <div style="margin-bottom:20px;">
-        <el-button @click="removeonaction('2')" icon="el-icon-circle-plus-outline" style="background-color: #3F9B6A;color: #fff;">新增
-        </el-button>
-      </div>
+        <div style="margin-bottom: 20px;width:20%">
+          <div>
+            <el-button
+            style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" icon="el-icon-circle-plus-outline"
+              @click="ggXin = true">新增</el-button>
+          </div>
+        </div>
         <!-- 表格 -->
 
-        <el-table :data="tableData"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="序号" width="50">
-            <template slot-scope="scope">
-              {{scope.$index + 1}}
-            </template>
+        <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+         >
+          <el-table-column label="序号" min-width="150">
+              <template slot-scope="scope">
+                {{scope.$index +1 }}
+                 </template>
           </el-table-column>
-          <el-table-column label="活动标题" prop="title">
+          <el-table-column label="活动标题" min-width="200" prop="title">
           </el-table-column>
-          <el-table-column label="场地名称"  prop="venue">
+          <el-table-column label="场地名称" min-width="150" prop="venue">
           </el-table-column>
-          <el-table-column label="起止时间" prop="startTime" >
+          <el-table-column label="起止时间" prop="startTime" min-width="250">
           </el-table-column>
-          <el-table-column label="联系人" prop="contactPerson" >
+          <el-table-column label="联系人" prop="contactPerson" min-width="150">
 
           </el-table-column>
-          <el-table-column label="联系电话" prop="contactPhone" >
+          <el-table-column label="联系电话" prop="contactPhone" min-width="150">
 
           </el-table-column>
-          <el-table-column label="已参与报名人数" prop="registeredCount" >
+          <el-table-column label="已参与报名人数" prop="registeredCount" min-width="150">
           </el-table-column>
-          <el-table-column prop="createdAt" label="创建时间" >
+          <el-table-column prop="createdAt" label="创建时间" min-width="250">
 
           </el-table-column>
-          <el-table-column label="创建人" prop="createdBy" >
-          </el-table-column>
-          <el-table-column prop="reviewStatus" label="状态" >
+
+          <el-table-column prop="reviewStatus" label="状态" min-width="150">
              <template slot-scope="scope">
                {{scope.row.reviewStatus=='1'?'未发布':'已发布'}}
                 </template>
           </el-table-column>
-          <el-table-column label="操作" fixed="right">
+          <el-table-column label="操作" min-width="350" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <!-- <div @click="openyujingSet(scope.row)" class="tableBtn greens">审核</div> -->
+              <div @click="fabu(scope.row,'2')" class="tableBtn greens" v-if="scope.row.reviewStatus=='1'">发布</div>
+              <div @click="fabu(scope.row,'1')" class="tableBtn greens" v-if="scope.row.reviewStatus=='2'">下架</div>
+              <div @click="zhongzhi(scope.row)" class="tableBtn greens" v-if="scope.row.reviewStatus =='1'">编辑</div>
+              <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.reviewStatus!='1'">报名名单</div>
+              <div @click="deltab(scope.row)" class="tableBtn greens" v-if="scope.row.reviewStatus =='1'">删除</div>
+              <div @click="Qcode(scope.row)" class="tableBtn greens" >活动二维码</div>
             </template>
           </el-table-column>
         </el-table>
-        <div style="display: flex;justify-content: space-between;" class="bom">
-          <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
-          <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
-            background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
-            @current-change="handleCurrentChange">
-          </el-pagination>
+        <div class="fenye">
+          <el-pagination :hide-on-single-page='flag' background small size="mini" :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]" layout="prev, pager, next,total" :total="total "
+            @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
-
       </div>
 
     </div>
-
-
-
-
-
-
-    <el-dialog title="审核" :visible.sync="yujingSet" style="padding: 0;" width="60%" center :close-on-click-modal="false" :show-close="false" top="20vh">
-      <div>
-        <div style="margin-bottom: 20px;">
-          <el-form ref="form" :model="detailsinfo" label-width="120px">
-            <el-form-item label="审核状态" prop="checkState">
-              <el-select v-model="detailsinfo.checkState" placeholder="请选择" style="width: 100%;">
-                <!-- <el-option label="待审核" value="1"></el-option> -->
-                <el-option label="同意" value="2"></el-option>
-                <el-option label="拒绝" value="3"></el-option>
-              </el-select>
+    <!-- 详情框 -->
+    <el-dialog :visible.sync="detbox" custom-class='tongyong_css' style="padding: 0;" width="65%" center
+      :close-on-click-modal="false" :show-close="false">
+      <div style="padding:20px;">
+        <div style="font-size: 14px;padding-bottom: 20px;color: #000;">详情页</div>
+        <div>
+
+          <el-form ref="form" :model="xiangData" label-width="120px">
+            <el-form-item label="营销活动标题" prop="title">
+              <el-input placeholder="请输入"  v-model="xiangData.title" :disabled="edit" ></el-input>
             </el-form-item>
-            <el-form-item label="审核意见">
-              <el-input maxlength="200" show-word-limit rows="4" v-model="detailsinfo.checkOpinion" placeholder="请输入审核意见" type="textarea" />
+            <el-form-item label="内容" prop="content" tyle="width: 100%;">
+              <wang-editor v-model="xiangData.content" ref="editor" :height="200" v-if="!edit"></wang-editor>
+              <div v-html="xiangData.content" style="line-height:40px" v-else></div>
             </el-form-item>
           </el-form>
-
+          <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
+                 <div style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
+                   <div>场地选择</div>
+                   <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true" v-if="!edit">
+                     添加
+                   </div>
+                 </div>
+                 <div style="padding:20px;">
+                   <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+                     :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                  >
+                     <el-table-column label="序号" width="80" >
+                       <template slot-scope="scope">
+                         {{scope.$index + 1}}
+                       </template>
+                     </el-table-column>
+
+                     </el-table-column>
+                     <el-table-column label="场地名称"   prop="venueName"
+          width="150">
+
+                     </el-table-column>
+                     <el-table-column label="所属区域" prop="district" min-width="150">
+                     </el-table-column>
+                     <el-table-column label="场地类型"  prop="venueType"  width="150">
+
+                     </el-table-column>
+                     <el-table-column label="详细位置" prop="detailedLocation" min-width="150">
+                     </el-table-column>
+
+                   </el-table>
+                 </div>
+               </div>
+               <el-form ref="form" :model="xiangData" label-width="120px">
+                 <el-form-item label="起止时间">
+                   <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss" :disabled="edit"
+                     type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+                   </el-date-picker>
+                 </el-form-item>
+                 <el-form-item label="联系人" prop="contactPerson">
+                   <el-input placeholder="请输入"  v-model="xiangData.contactPerson"  :disabled="edit"></el-input>
+                 </el-form-item>
+                 <el-form-item label="联系电话"  prop="contactPhone">
+                   <el-input placeholder="请输入"  v-model="xiangData.contactPhone"  :disabled="edit"></el-input>
+                 </el-form-item>
+                 <el-form-item label="封面图片" prop="coverImage">
+                   <upimg v-model="xiangData.coverImage" :limit="1" :fileSize="1" :isShowTip="false" v-if="!edit"></upimg>
+                   <img :src="xiangData.coverImage" alt="" v-else>
+                 </el-form-item>
+
+               </el-form>
         </div>
-        <div style="display: flex;justify-content: flex-end;">
-          <el-button @click="yuclose" class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
-          <el-button @click="yuChenk" style="background-color: #3F9B6A;color: #fff">确定</el-button>
+
+        <div style="padding-top:20px;display:flex;justify-content: flex-end;">
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="closeFn(2)">返回</el-button>
+          <el-button @click="edit = false" style="background-color: #3F9B6A;color: #fff" v-if="edit && xiangData.reviewStatus!='2'">编辑</el-button>
+          <el-button @click="addbuss(2)" style="background-color: #3F9B6A;color: #fff" v-else>确认</el-button>
+
+
         </div>
       </div>
+
     </el-dialog>
-    <div class="zhuti" v-if="onaction == '2'">
-      <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>营销推广活动</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">新增</span></div>
-      </div>
 
-      <div style="padding: 20px 20px 20px 0;">
-        <add @removeonaction="removeonaction"></add>
+    <!-- 新增 -->
+    <el-dialog title="新增" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="50%"
+      class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false">
+      <div style="margin-bottom: 20px;">
+        <el-form ref="form" :model="formInline" label-width="120px">
+          <el-form-item label="营销活动标题" prop="title">
+            <el-input placeholder="请输入"  v-model="formInline.title" ></el-input>
+          </el-form-item>
+          <el-form-item label="内容" prop="content" tyle="width: 100%;">
+            <wang-editor v-model="formInline.content" ref="editor" :height="200"></wang-editor>
+          </el-form-item>
+        </el-form>
       </div>
-    </div>
-    <div class="zhuti" v-if="onaction == '3'">
-      <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>营销推广活动</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">查看</span></div>
+
+      <div style="border:1px solid #DCDFE6;font-size:14px;margin-bottom:10px;">
+        <div style="padding: 10px 20px;border-bottom: 1px solid #DCDFE6;display: flex;justify-content: space-between;">
+          <div>场地选择</div>
+          <div style="color: #3F9B6A;margin-left: 10px;" @click="addziyuan = true">
+            添加
+          </div>
+        </div>
+        <div style="padding:20px;">
+          <el-table :data="addziyuanData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
+            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+         >
+            <el-table-column label="序号" width="80" >
+              <template slot-scope="scope">
+                {{scope.$index + 1}}
+              </template>
+            </el-table-column>
+
+
+            <el-table-column label="场地名称"   prop="venueName"
+ width="150">
+
+            </el-table-column>
+            <el-table-column label="所属区域" prop="district" min-width="150">
+            </el-table-column>
+            <el-table-column label="场地类型"  prop="venueType"  width="150">
+
+            </el-table-column>
+            <el-table-column label="详细位置" prop="detailedLocation" min-width="150">
+            </el-table-column>
+            <el-table-column label="操作"  min-width="150">
+              <template slot-scope="scope">
+              <div class="tableBtn greens" @click="addziyuanData = []" >删除</div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </div>
-      <div>
-        <merchantInformation :info="detailsinfo" @removeonaction="removeonaction"></merchantInformation>
+      <el-form ref="form" :model="formInline" label-width="120px">
+        <el-form-item label="起止时间">
+          <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="联系人" prop="currentStage">
+          <el-input placeholder="请输入"  v-model="formInline.contactPerson" ></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input placeholder="请输入"  v-model="formInline.contactPhone" ></el-input>
+        </el-form-item>
+        <el-form-item label="封面图片">
+          <upimg v-model="formInline.coverImage" :limit="1" :fileSize="1" :isShowTip="false"></upimg>
+        </el-form-item>
+
+      </el-form>
+      <div style="display: flex;justify-content: flex-end;">
+        <el-button @click="closeFn(1)" class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
+        <el-button @click="addCheck(4)" style="background-color: #3F9B6A;color: #fff">确定</el-button>
       </div>
-      <!-- <div>
-        <el-button class="buttonHover"
-          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
-          @click="removeonaction('1')">返回</el-button>
-      </div> -->
-    </div>
+      <!-- 场地选择 -->
+      <el-dialog :visible.sync="addziyuan" custom-class='XDD_css' style="padding: 0;" width="50%"
+        append-to-body center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+        <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+          <div>添加</div>
+        </div>
+        <div style="padding: 15px;width:100%">
+
+          <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+            <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+              <div>选择场地</div>
+            </div>
+            <div style="padding: 15px;">
+              <div style="padding: 0px 20px 0px 0px">
+                <el-table :data="ziyuanData"
+                highlight-current-row
+                    @current-change="handleSelectionChange"
+                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                  >
+
+                  <el-table-column label="序号"  min-width="8%" >
+                    <template slot-scope="scope">
+                      {{scope.$index + 1}}
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column label="场地名称" prop="venueName" min-width="15%">
+
+                  </el-table-column>
+                  <el-table-column label="场地类型"  prop="venueType" min-width="15%">
+
+                  </el-table-column>
+                  <!-- <el-table-column prop="notes" label="对应策略" min-width="15%">
+                  </el-table-column> -->
+                </el-table>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
+          <el-button  @click="mingClose" class="buttonHover"
+                style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
+          </el-button>
+          <el-button  @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
+          </el-button>
+
+        </div>
+      </el-dialog>
+
+    </el-dialog>
+    <el-dialog :visible.sync="showQF" custom-class='tongyong_css' style="padding: 0;" width="25%" center
+          :close-on-click-modal="false" :show-close="false">
+          <div style="padding:20px;">
+            <div style="font-size: 14px;padding-bottom: 20px;color: #000;">活动二维码</div>
+            <div style="padding:20px;">
+               <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
+                 <el-image
+                     style="width:200px; height: 200px"
+                     :src="qfUrl"
+                     fit="fill"></el-image>
+            </div>
+            <div style="padding-top:20px;display:flex;justify-content: flex-end;">
+              <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                @click="showQF =false">返回</el-button>
+            </div>
+          </div>
 
+        </el-dialog>
+        <!-- 报名名单 -->
+        <el-dialog :visible.sync="baoming" custom-class='tongyong_css' style="padding: 0;" width="55%" center
+              :close-on-click-modal="false" :show-close="false">
+              <div style="padding:20px;">
+                <div style="font-size: 14px;padding-bottom: 20px;color: #000;">报名名单</div>
+                <div style="padding:20px;">
+                   <el-table :data="mingList"
+                     :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                    >
+                     <el-table-column label="序号" min-width="150">
+                         <template slot-scope="scope">
+                           {{scope.$index +1 }}
+                            </template>
+                     </el-table-column>
+                     <el-table-column label="联系人" prop="userName" min-width="150">
+
+                     </el-table-column>
+                     <el-table-column label="联系电话" prop="userPhone" min-width="150">
+
+                     </el-table-column>
+                   </el-table>
+                </div>
+                <div style="padding-top:20px;display:flex;justify-content: flex-end;">
+                  <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+                    @click="baoming =false">返回</el-button>
+                </div>
+              </div>
+
+            </el-dialog>
   </div>
-  <!-- </div> -->
+
 
 </template>
 
 <script>
-  import add from '@/components/add/addMarkActivity.vue'
   import {
-    MarkGetAll,
-    MarkAdd,
-    MarkEdit,
-    MarkDel,
-    QRcode,
-    Registration
+    async
+  } from 'q'
+  import axios from 'axios'
+  import wangEditor from "@/components/editor/index";
+  import {
+   MarkGetAll,
+   MarkAdd,
+   MarkEdit,
+   MarkDel,
+   QRcode,
+   Registration
   } from '../../../api/MarkActivity.js'
-  import merchantInformation from '../../../components/merchantInformation/index.vue'
-  import wangEditor from "@/components/editor/index"
+  import upimg from "@/components/ImageUpload/index"
+  import {
+   changAlls
+  } from '../../../api/information.js'
+
   export default {
+    components: {
+      upimg,
+      wangEditor
+    },
     data() {
       return {
-        zhong: {
-
-        },
-        yujingSet: false,
-        detailsinfo: {},
-        pagequery: {
-          pageNumber: 0,
-          pageSize: 10,
-          checkState:'2',
-          name: '',
-
+        hetongBox: false,
+        detbox: false, //详情
+        leixing: true, //切换
+        currentPage: 1,
+        total: 10,
+        flag: false,
+        pageSize: 10,
+        ggXin: false,
+        formInline: {
+          title:'',
+          content:'',
+          venue:'',
+          contactPerson:'',
+          contactPhone:'',
+          coverImage:'',
+          registeredCount:'',
         },
+        plan_Time:[],
+        followUpTime:[],
         tableData: [],
-        total: 0,
-        onaction: '1',
-        info: {}
+        secondData: {},
+        formSel: {
+         title:'',
+         venue:'',
+         contactPerson:'',
+         contactPhone:'',
+        },
+        pageindex: {
+      pageNumber: 1,
+      pageSize: 10,
+        },
+        bianjiBox: 1,
+        chengeTatle: 1,
+        zhong: {},
+        edit: true, //编辑切换
+        xiangTabs:'first',
+        addkehu:false,
+        addziyuan:false,
+        ziyuanData:[],//资源
+        addziyuanData:[],
+        multipleSelection:[],
+        xiangData:{},
+        showQF:false,
+        qfUrl:'',
+        baoming:false,
+        mingList:[]
       }
     },
-    components: {
-      add,
-      merchantInformation,
-      wangEditor
-    },
     created() {
       this.getAll()
+    },
+    computed: {
 
     },
     methods: {
-      calculateDaysUntilExpiration(endDateString) {
-            const endDate = new Date(endDateString);
-            const today = new Date();
-            const timeDifference = endDate - today;
-            const daysDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
-            return daysDifference >= 0 ? daysDifference : '已过期';
-        },
-      yuclose() {
-        this.yujingSet = false
-      },
-      yuChenk() {
-        console.error(this.detailsinfo)
-        cerePlatformMerchantedit(this.detailsinfo).then(res => {
-          console.error(res)
-          if (res.code == 200) {
-            this.$message({
-              message: '处理成功',
-              type: 'success'
-            })
-            this.yujingSet = false
-          } else {
-            this.$message({
-              message: '处理失败',
-              type: 'error'
-            })
+      // 获取时间
+      currentTime() {
+        let date = new Date();
+        let year = date.getFullYear(); //月份从0~11，所以加一
+        let month = date.getMonth();
+        let dateArr = [date.getMonth() + 1, date.getDate(), date.getHours()]
+        for (let i = 0; i < dateArr.length; i++) {
+          if (dateArr[i] >= 1 && dateArr[i] <= 9) {
+            dateArr[i] = '0' + dateArr[i]
           }
-        })
-        
-      },
-      openyujingSet(row) {
-        // cereReminderSet({
-        //   reminderType: '1'
-        // }).then(res => {
-        //   console.error(res)
-        //   this.zhong = res.data
-        // })
-        this.detailsinfo = JSON.parse(JSON.stringify(row))
-        this.yujingSet = true
+        }
+        let strDate = year + '-' + dateArr[0] + '-' + dateArr[1]
+        return strDate
       },
-      details(row) {
-        this.detailsinfo = row
-        this.onaction = '3'
+      chenge(val) {
+        this.formSel = {
+          title:'',
+         venue:'',
+         contactPerson:'',
+         contactPhone:'',}
+        this.leixing = !this.leixing
+        this.chengeTatle = val
       },
-      biangeng(row) {
-        alert(`合同变更 - 店铺ID: ${row.id}`);
+      async getAll() {
+        const res = await MarkGetAll(this.pageindex)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+        const ziyuan =  await changAlls(this.pageindex)
+        this.ziyuanData = [...ziyuan.data.content]
+
       },
-      xuyue(row) {
-        alert(`合同续约 - 店铺ID: ${row.id}`);
+
+      // 新增确定按钮
+      async addCheck(val) {
+        if(this.addziyuanData.length !=0){
+          this.formInline.venue  = this.addziyuanData.map(item => item.id).join(',');
+        }
+        if(this.plan_Time.length !=0){
+          this.formInline.startTime =  this.plan_Time[0]
+          this.formInline.endTime = this.plan_Time[1]
+        }
+        this.formInline.reviewStatus = '2'
+        this.formInline.createdAt = this.currentTime()
+        await MarkAdd(this.formInline)
+        this.ggXin = false
+        this.formInline =  {
+            title:'',
+            content:'',
+            venue:'',
+            contactPerson:'',
+            contactPhone:'',
+            coverImage:'',
+            registeredCount:'',
+
+        }
+
+        this.plan_Time =[]
+        this.addziyuanData =[]
+        this.getAll()
       },
-      zhongzhi(row) {
-        alert(`合同终止 - 店铺ID: ${row.id}`);
+      // 获取时间
+      currentTime() {
+       let date = new Date();
+        let year = date.getFullYear();
+        let month = date.getMonth() + 1; // 月份从0~11，所以加一
+        let day = date.getDate();
+        let hours = date.getHours();
+        let minutes = date.getMinutes();
+        let seconds = date.getSeconds();
+
+        // 为月、日、小时、分钟和秒添加前导零（如果需要）
+        month = month < 10 ? '0' + month : month;
+        day = day < 10 ? '0' + day : day;
+        hours = hours < 10 ? '0' + hours : hours;
+        minutes = minutes < 10 ? '0' + minutes : minutes;
+        seconds = seconds < 10 ? '0' + seconds : seconds;
+
+        // 返回格式化的日期和时间字符串
+        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
       },
-      async getAll() {
-        const res = await MarkGetAll(this.pagequery)
-        this.tableData = res.data.content
-        this.total = res.data.totalElements
+
+      //详情
+       details(item) {
+         this.plan_Time[0] = item.startTime
+         this.plan_Time[1] = item.endTime
+        this.edit = true
+        this.xiangData = item
+        this.detbox = true
+      let ids=  []
+      ids = item.venue.split(',')
+      ids.map(res=>{
+        changAlls({id:res,pageNumber: 1,pageSize: 10,}).then(item=>{
+          console.log(item)
+          item.data.content.map(ids=>{
+               this.addziyuanData.push(ids)
+          })
+
+        })
+      })
+
+
+
+
       },
-      removeonaction(e) {
-        console.error(e)
-        this.onaction = e
-        this.onSubmit()
+      zhongzhi(item){
+        this.edit = false
+        this.xiangData = item
+        this.detbox = true
+ this.plan_Time[0] = item.startTime
+        this.plan_Time[1] = item.endTime
       },
-      handleCurrentChange(val) {
-        this.pagequery.pageNumber = val - 1
+     async addbuss() {
+       if(this.plan_Time.length !=0){
+         this.xiangData.startTime =  this.plan_Time[0]
+         this.xiangData.endTime = this.plan_Time[1]
+       }
+
+       await MarkEdit(this.xiangData)
+       this.plan_Time = []
+        this.detbox = false
         this.getAll()
       },
       handleSizeChange(val) {
-        this.pagequery.pageSize = val
+        this.pageSize = val
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+      },
+
+      closeFn(val) {
+        this.plan_Time =[]
+        this.addziyuanData =[]
+ this.formInline =  {
+            title:'',
+            content:'',
+            venue:'',
+            contactPerson:'',
+            contactPhone:'',
+            coverImage:'',
+            registeredCount:'',
+
+        }
+        this.bianjiBox = 1
+        if (val == 1) {
+          this.ggXin = false
+        } else {
+          this.detbox = false
+        }
+      },
+      //查看合同
+      lookHetong(val) {
+        this.hetongBox = true
       },
       // 查询按钮
       async onSubmit() {
-        this.pagequery.pageNumber = 0
-        this.getAll()
+      this.formSel.pageNumber = 1
+      this.formSel.pageSize = 10
+       const res =  await MarkGetAll(this.formSel)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+ this.formSel = {
+          title:'',
+         venue:'',
+         contactPerson:'',
+         contactPhone:'',
+         }
       },
       //重置按钮
       resetting() {
-        this.pagequery = {
-            pageNumber: 0,
-            pageSize: 10,
-            checkState:'2',
-            name: ''
-          },
+        this.formSel = {
+          title:'',
+         venue:'',
+         contactPerson:'',
+         contactPhone:'',}
           this.getAll()
       },
-    }
 
+  minSev() {
+        this.addziyuanData = this.multipleSelection
+        this.addziyuan = false
+        this.multipleSelection =[]
+      },
+      mingClose(){
+        this.multipleSelection =[]
+        this.addziyuan = false
+      },
+      handleSelectionChange(val) {
+
+        this.multipleSelection.push(val)
+      },
+      deltab(item){
+            const h = this.$createElement;
+                    this.$msgbox({
+                      title: '消息',
+                      message: h('p', null, [
+                        h('span', null, '是否删除 '),
+                      ]),
+                      showCancelButton: true,
+                      showClose:false,
+                      confirmButtonText: '确定',
+                      cancelButtonText: '取消',
+                      customClass:'oe-dialog-btn',
+                      beforeClose: (action, instance, done) => {
+                        if (action === 'confirm') {
+                          MarkDel({id:item.id}).then(res=>{
+                             this.getAll()
+                            done();
+                          })
+                        } else {
+                          done();
+                        }
+          }
+          })
+      },
+      fabu(item,val){
+        const h = this.$createElement;
+                  this.$msgbox({
+                    title: '消息',
+                    message: h('p', null, [
+                      h('span', null, '是否处理'),
+                    ]),
+                    showCancelButton: true,
+                    showClose:false,
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    customClass:'oe-dialog-btn',
+                    beforeClose: (action, instance, done) => {
+                      if (action === 'confirm') {
+                        MarkEdit({id:item.id,reviewStatus:val}).then(res=>{
+                           this.getAll()
+                          done();
+                        })
+                      } else {
+                        done();
+                      }
+        }
+        })
+
+      },
+      Qcode(items){
+        this.showQF = true
+        let pgs={
+           scene:`item='${items.id}'`,
+           // scene:items,
+           page:"pages/marketing/marketingDetail/marketingDetail"
+        }
+         QRcode(pgs).then(res=>{
+            this.qfUrl = res.data
+         })
+      },
+     async getMing(ids){
+       let page={
+         activityId:ids
+       }
+      const res =  await Registration(page)
+      this.mingList = res.data
+        this.baoming = true
+
+      }
+
+    }
   }
 </script>
 
 <style scoped>
   .zhuti {
-    padding: 0  20px 20px 20px;
+    padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
     background-color: #Fff;
 
   }
-  .chengeXia{
-    border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
+
+  .chengeXia {
+    border-bottom: 6px solid #3F9B6A;
+    padding-bottom: 4px;
+    color: #3F9B6A;
   }
 
   /deep/ .el-form-item__content {
-    /* line-height: 0; */
+    line-height: 0;
   }
 
- 
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+    color: #ACACAC;
+  }
 
   .formSearch {
     display: flex;
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
-    padding-bottom: 10px;
-
   }
 
   .greens {
@@ -302,8 +731,8 @@
 
   /deep/ .el-table__row {
     font-size: 14px;
-    color:#000000e6;
-    height:42px;
+    color: #000000e6;
+    height: 42px;
   }
 
   .fenye {
@@ -354,21 +783,25 @@
     background: #fff;
     height: 50px;
   }
-    /deep/ .bg-purple[data-v-3bebae82]{
+
+  /deep/ .bg-purple[data-v-3bebae82] {
     background: #fff;
     height: 50px;
   }
 
-::v-deep .bg-purple{
+  ::v-deep .bg-purple {
     background: #fff;
     height: 50px;
   }
+
   /deep/ .el-form--label-top .el-form-item__label {
     padding: 0;
   }
-::v-deep .el-form-item{
-  margin-bottom:16px;
-}
+
+  ::v-deep .el-form-item {
+    margin-bottom: 16px;
+  }
+
   .device-form .el-form-item__label::after {
     content: "*";
     color: #1A1A1A;
@@ -382,133 +815,162 @@
       background-color: #FAFAFA;
     }
   }
- ::v-deep .el-input__inner:focus {
-      border: #3F9B6A 1px solid;
-   }
+
+  ::v-deep .el-input__inner:focus {
+    border: #3F9B6A 1px solid;
+  }
+
   .dialog-footer {
     display: flex;
     justify-content: flex-end;
     border-top: solid rgba(209, 209, 209, 0.2) 2px;
     padding-top: 20px;
   }
- ::v-deep .el-input__inner:focus {
-      border: #3F9B6A 1px solid;
-   }
-   ::v-deep .el-input__inner:hover {
-        border: #3F9B6A 1px solid;
-     }
-     ::v-deep .el-select .el-input.is-focus .el-input__inner{
-         border-color:#3F9B6A
-     }
-::v-deep .btn .el-button:focus,
-.el-button:hover {
-  border: 1px solid #3F9B6A;
-}
-.el-select-dropdown__item.selected{
+
+  ::v-deep .el-input__inner:focus {
+    border: #3F9B6A 1px solid;
+  }
+
+  ::v-deep .el-input__inner:hover {
+    border: #3F9B6A 1px solid;
+  }
+
+  ::v-deep .el-select .el-input.is-focus .el-input__inner {
+    border-color: #3F9B6A
+  }
+
+  .el-select-dropdown__item.selected {
     color: #3F9B6A;
-}
+  }
 
-.el-pagination__sizes .el-input .el-input__inner:hover{
+  .el-pagination__sizes .el-input .el-input__inner:hover {
     border-color: #3F9B6A;
-}
-::v-deep .el-dialog__wrapper{
+  }
 
-  .dialog_css{
+  ::v-deep .el-dialog__wrapper {
+
+    .dialog_css {
       margin-right: 12px;
-      margin-top:61px !important;
+      margin-top: 61px !important;
+
       .el-dialog__title {
         font-size: 16px !important;
         font-weight: 600;
         color: #000;
       }
+    }
+
+    .diaslog_zhong {
+      margin-left: 25%;
+      margin-top: 61px !important;
+    }
+
+  }
+
+  ::v-deep .diaslog_zhong {
+    margin-left: 20%;
+    margin-top: 61px !important;
+
+    .el-dialog__header {
+      background-color: #fff;
+      border-bottom: 1px solid #EFEFEF;
+
+      .el-dialog__title {
+        font-size: 14px;
+        color: #000000e6;
+      }
+    }
+
+    .el-dialog__body {
+      padding: 10px 30px 30px 20px
+    }
   }
-  .diaslog_zhong{
-     margin-left: 20%;
-     margin-top:61px !important;
-  }
-
-}
- ::v-deep .diaslog_zhong{
-     margin-left: 20%;
-     margin-top:61px !important;
-     .el-dialog__header{
-       background-color:#fff;
-       border-bottom:1px solid #EFEFEF;
-       .el-dialog__title{
-         font-size: 14px;
-          color: #000000e6;
-       }
-     }
-     .el-dialog__body{
-       padding:10px 20px 30px 20px
-     }
+
+  /deep/ .el-table_1_column_8 .hetong {
+    color: #7DBB9A;
+    text-decoration: underline;
   }
 
- /deep/ .el-table_1_column_8 .hetong{
-   color:#7DBB9A;
-   text-decoration: underline;
-}
-/deep/ .first-column-bg {
+  /deep/ .first-column-bg {
     background-color: #FAFAFA !important;
   }
 
-.el-table tr{
-  height:56px;
-}
+  ::v-deep .textarea {
+    width: 85%;
 
-::v-deep .table3{
-  .el-table__empty-block{
-    display:none;
+    .el-textarea__inner {
+      width: 100%;
+    }
   }
-}
-::v-deep .textarea{
-  width: 85%;
-   .el-textarea__inner{
+
+  ::v-deep .pass_input {
     width: 100%;
+
+    .el-input__inner {
+      border: none;
+      padding: 0;
+    }
   }
-}
-::v-deep .el-button--mini{
-  padding: 7px 10px;
-}
-::v-deep .pass_input{
+
+  ::v-deep .pass_select {
     width: 100%;
+
     .el-input__inner {
       border: none;
-       padding:0;
-       }
-  }
-::v-deep .pass_select{
-  width: 100%;
- .el-input__inner {
-   border: none;
-   padding:0;
+      padding: 0;
     }
-  .el-icon-arrow-up:before{
-    content:''
-  }
 
-}
- /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
-  background-color: #fff;
-}
+    .el-icon-arrow-up:before {
+      content: ''
+    }
 
+  }
 
+  /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell {
+    background-color: #fff;
+  }
 </style>
 <style lang="scss" scoped>
-  ::v-deep .bian_css{
-    .el-dialog__header{
-      padding:0px;
+  ::v-deep .bian_css {
+    .el-dialog__header {
+      padding: 0px;
+    }
+
+    .el-input__inner {
+      height: 18px;
+      border: 0px;
+      margin-top: 0px;
+    }
+
+    .el-input__inner:hover {
+      border: 0px;
+    }
+
+    .el-input__inner:focus {
+      border: 0px;
     }
   }
-  ::v-deep .buttonHover:hover{
-    color:#3f9b6a !important;
+
+  ::v-deep .buttonHover:hover {
+    color: #3f9b6a !important;
     border-color: #c5e1d2 !important;
     background-color: #ecf5f0 !important;
     outline: none;
   }
-  ::v-deep .el-pagination__total{
-        position: absolute;
-        left: 33px;
+
+  ::v-deep .el-pagination__total {
+    position: absolute;
+    left: 33px;
   }
-</style>
 
+  ::v-deep .diaslog_zhong {
+    .el-dialog__body {
+      padding: 10px 20px 20px 20px;
+    }
+
+    .el-upload--picture-card {
+      width: 130px;
+      height: 130px;
+    }
+  }
+</style>
diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue
index 55d32b1..cad13b7 100644
--- a/admin-web-master/src/views/serve/Merchant/index.vue
+++ b/admin-web-master/src/views/serve/Merchant/index.vue
@@ -12,9 +12,7 @@
             <el-form-item label="商务合作标题">
               <el-input v-model="formSel.title" placeholder="请输入" style="width:168px;" />
             </el-form-item>
-            <el-form-item label="场地名称">
-              <el-input v-model="formSel.venue" placeholder="请输入" style="width:168px;" />
-            </el-form-item>
+
             <el-form-item label="联系人">
               <el-input v-model="formSel.contactPerson" placeholder="请输入" style="width:168px;" />
             </el-form-item>
@@ -30,7 +28,7 @@
               </el-select>
             </el-form-item>
           </el-form>
-          <div>
+          <div style="width:20%">
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
             </el-button>
             <el-button @click="resetting" class="buttonHover"
@@ -69,17 +67,14 @@
           </el-table-column>
           <el-table-column label="邮箱" prop="email" min-width="150">
           </el-table-column>
-          <el-table-column prop="caretTime" label="创建时间" min-width="250">
 
-          </el-table-column>
-          <el-table-column label="创建人" prop="caretUser" min-width="150">
-          </el-table-column>
+
           <el-table-column prop="status" label="发布状态" min-width="150">
              <template slot-scope="scope">
                {{scope.row.status=='2'?'未发布':'已发布'}}
                 </template>
           </el-table-column>
-          <el-table-column label="操作" min-width="300">
+          <el-table-column label="操作" min-width="300" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div @click="fabu(scope.row,'1')" class="tableBtn greens" v-if="scope.row.status=='2'">发布</div>
@@ -129,10 +124,6 @@
                          {{scope.$index + 1}}
                        </template>
                      </el-table-column>
-                     <el-table-column label="资源编号" prop="id" width="150">
-
-                     </el-table-column>
-                     </el-table-column>
                      <el-table-column label="场地名称"   prop="venueName"
           width="150">
 
@@ -195,7 +186,7 @@
     </el-dialog>
 
     <!-- 新增 -->
-    <el-dialog title="新增" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="50%"
+    <el-dialog title="新增" :visible.sync="ggXin" custom-class="diaslog_zhong" style="padding: 0;" width="70%"
       class="dialog_css_Xq" center :close-on-click-modal="false" :show-close="false">
       <div style="margin-bottom: 20px;">
         <el-form ref="form" :model="formInline" label-width="120px">
@@ -241,7 +232,7 @@
             </el-table-column>
             <el-table-column label="操作"  min-width="150">
               <template slot-scope="scope">
-              <div class="tableBtn greens" @click="addziyuanData = []" >删除</div>
+              <div class="tableBtn greens" @click="handleDelete(scope.$index)" >删除</div>
               </template>
             </el-table-column>
           </el-table>
@@ -593,6 +584,9 @@
         }
         })
 
+      },
+      handleDelete(index){
+          this.addziyuanData.splice(index, 1)
       }
     }
   }
diff --git a/admin-web-master/src/views/serve/PerWorkstation/index.vue b/admin-web-master/src/views/serve/PerWorkstation/index.vue
index 08c95a5..5cac5bb 100644
--- a/admin-web-master/src/views/serve/PerWorkstation/index.vue
+++ b/admin-web-master/src/views/serve/PerWorkstation/index.vue
@@ -42,17 +42,20 @@
           </el-table-column>
           <el-table-column label="标题" prop="title" width="auto" min-width="12%" />
           <el-table-column label="接收商家" prop="receiverMerchant" width="auto" min-width="12%" />
-          <el-table-column label="发布类型" prop="postType" width="auto" min-width="12%" />
-          <el-table-column label="发布时间" prop="publishTime" width="auto" min-width="12%" />
+        <!--  <el-table-column label="发布类型" prop="postType" width="auto" min-width="12%" />
+          <el-table-column label="发布时间" prop="publishTime" width="auto" min-width="12%" /> -->
           <el-table-column label="发布状态" prop="status" width="auto" min-width="12%" />
-          <el-table-column label="创建人" prop="creator" width="auto" min-width="12%" />
+
           <el-table-column label="创建时间" prop="createdAt" width="auto" min-width="12%" />
 
-          <el-table-column label="操作" width="auto" min-width="17%">
+          <el-table-column label="操作" width="auto" min-width="25%">
             <template slot-scope="scope">
-              <div class="tableBtn greens" @click="handleEditForm(scope.row)">
-                查看
+       <!--       <div class="tableBtn greens" @click="handleEditForm(scope.row,1)">
+                消息提醒查看
               </div>
+              <div class="tableBtn greens" @click="handleEditForm(scope.row,2)" >
+               推送提醒查看
+              </div> -->
               <!-- <div class="tableBtn greens">
                 再次发布
               </div> -->
@@ -74,7 +77,7 @@
               padding: 0 20px;
               line-height: 42px;
             ">
-            详情
+            查看
           </div>
           <div style="padding: 0 20px">
             <div style="
@@ -86,12 +89,12 @@
                   <el-form-item label="标题">
                     <el-input v-model="secondData.title"  disabled style="width: 90%;" />
                   </el-form-item>
-                  <el-form-item label="接收商家">
+                  <el-form-item label="接收商家" v-if="xian ==1">
                     <el-select v-model="secondData.receiverMerchant" style="width: 90%;" disabled>
                       <el-option label="电商商家" value="电商商家" />
                     </el-select>
                   </el-form-item>
-                  <el-form-item label="发布类型">
+                  <el-form-item label="发布类型"  v-if="xian ==1">
                       <el-radio-group v-model="secondData.postType"  @input="radioClick" disabled>
                         <el-radio label="立即发布">立即发布</el-radio>
                         <!-- <el-radio label="定时发布">定时发布</el-radio> -->
@@ -244,6 +247,7 @@
           pageSize: 10,
         },
         fabutype:'1',
+        xian:1,
       }
     },
 
@@ -264,7 +268,7 @@
         const minutes = now.getMinutes().toString().padStart(2, '0');
         const seconds = now.getSeconds().toString().padStart(2, '0');
 
-        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        return `${year}-${month}-${day} ${hours}:${minutes}`;
       },
       handleSelectionChange(val) {
         this.multipleSelection = val;
@@ -304,10 +308,11 @@
       },
 
       // 详情点击
-       handleEditForm(item) {
+       handleEditForm(item,val) {
         this.secondData = item
         this.detbox = true
         this.msgid = item.id
+        this.xian = val
       },
       // 详情编辑确定
       async msgeditS() {
@@ -331,9 +336,9 @@
       async addCheck() {
         this.ruleForm.publishTime = this.updateCurrentTime()
         this.ruleForm.createdAt = this.updateCurrentTime()
-        if(this.ruleForm.postType == '立即发布'){
-          this.ruleForm.publishTime = ''
-        }
+        // if(this.ruleForm.postType == '立即发布'){
+        //   this.ruleForm.publishTime = ''
+        // }
         const res = await ManaAdd(this.ruleForm)
         this.getAll();
         this.ggXin = false;
@@ -418,7 +423,10 @@
     width: 80%;
   }
 
-  
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+  }
 
   .formSearch {
     display: flex;
diff --git a/admin-web-master/src/views/serve/actSp.vue b/admin-web-master/src/views/serve/actSp.vue
index 817a3d0..743703b 100644
--- a/admin-web-master/src/views/serve/actSp.vue
+++ b/admin-web-master/src/views/serve/actSp.vue
@@ -58,7 +58,7 @@
             </template>
 
           </el-table-column>
-          <el-table-column label="操作" min-width="250" >
+          <el-table-column label="操作" min-width="250" fixed="right">
             <template slot-scope="scope">
               <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
               <div @click="shenhe(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">审核</div>
@@ -451,7 +451,11 @@
                              <div style="padding:20px;">
                                <div style="font-size: 14px;padding-bottom: 20px;color: #000;">活动二维码</div>
                                <div style="padding:20px;">
-                                  <img :src="qfUrl" alt="" style="height:330px;width:80%">
+                                  <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
+                                  <el-image
+                                      style="width:200px; height: 200px"
+                                      :src="qfUrl"
+                                      fit="fill"></el-image>
                                </div>
                                <div style="padding-top:20px;display:flex;justify-content: flex-end;">
                                  <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
@@ -623,7 +627,10 @@ this.total = res.data.content.length
     line-height: 3;
   }
 
-  
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+  }
 
 
 
diff --git a/admin-web-master/src/views/serve/kefuServe/index.vue b/admin-web-master/src/views/serve/kefuServe/index.vue
index 49da243..30ac5a0 100644
--- a/admin-web-master/src/views/serve/kefuServe/index.vue
+++ b/admin-web-master/src/views/serve/kefuServe/index.vue
@@ -7,23 +7,15 @@
       </div>
       <!-- 搜索 -->
       <!-- <div class="formSearch">
-        <el-form :inline="true" :model="formSel">
-          <el-form-item label="标题">
-            <el-input v-model="formSel.title" placeholder="请输入" style="width:168px;" />
-          </el-form-item>
-        </el-form>
         <div>
-          <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
-          </el-button>
-          <el-button @click="resetting" class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+          <el-button @click="setPei" style="background-color: #3F9B6A;color: #fff">报修流程配置
           </el-button>
         </div>
       </div> -->
       <div>
         <!-- 搜索 -->
         <div style="margin-bottom:20px;">
-            保修记录
+            报修记录
         </div>
 
         <!-- 表格 -->
@@ -39,20 +31,27 @@
               {{scope.$index+1}}
             </template>
           </el-table-column>
-          <el-table-column label="保修类型" prop="deviceType" width="auto" min-width="12%" />
+          <el-table-column label="报修类型" prop="deviceType" width="auto" min-width="12%" />
           <el-table-column label="问题描述" prop="warrantyIssue" width="auto" min-width="12%" />
 <el-table-column label="设备名称" prop="deviceName" width="auto" min-width="12%" />
           <el-table-column label="备注" prop="memo" width="auto" min-width="12%" />
 
-          <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
 
+          <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
+          <el-table-column label="报修到期时间" prop="repairEndTime" width="auto" min-width="12%" />
+          <el-table-column label="报修人" prop="repairman" width="auto" min-width="12%" />
+<!-- <el-table-column label="状态" prop="repairStatus" width="auto" min-width="12%" >
+  <template slot-scope="scope">
+        {{scope.row.repairStatus==0?'暂未派单':scope.row.repairStatus==1?'已派单':scope.row.repairStatus==2?'已完成':scope.row.repairStatus==3?'已过期':''}}
+    </template>
+  </el-table-column> -->
           <el-table-column label="操作" width="auto" min-width="17%">
             <template slot-scope="scope">
               <div class="tableBtn greens" @click="handleEditForm(scope.row)">
                 查看
               </div>
-              <!-- <div class="tableBtn greens">
-                再次发布
+<!-- <div class="tableBtn greens" @click="setPei(scope.row)">
+                报修流程配置
               </div> -->
               <div class="tableBtn greens" @click="delGuan(scope.row,1)">
                 删除
@@ -86,6 +85,7 @@
           <el-table-column label="问题描述" prop="problemDescription" width="auto" min-width="12%" />
           <el-table-column label="备注" prop="remark" width="auto" min-width="12%" />
           <el-table-column label="申请时间" prop="applicationTime" width="auto" min-width="12%" />
+
           <el-table-column label="操作" width="auto" min-width="17%">
             <template slot-scope="scope">
               <div class="tableBtn greens" @click="handleEditForm(scope.row)">
@@ -158,6 +158,31 @@
 
       </div>
     </div>
+    <el-dialog :visible.sync="setPeiShow" custom-class='bian_css' style="padding: 0;" width="45%"
+      :close-on-press-escape="false" center :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
+      <div style="padding:20px;">
+        <div style="font-size: 14px;padding-bottom: 20px;color: #000;">报修流程配置</div>
+          <el-form label-position="right" ref="jibenFrom" :model="peiForm"  label-width="140px"
+            style="position: relative">
+            <el-form-item label="报修到期时间" class="grid-content bg-purple device-from" prop="repairEndTime">
+              <el-date-picker style="width:240px;margin-right:5px" v-model="peiForm.repairEndTime"
+                value-format="yyyy-MM-dd HH:mm:ss"    type="datetime" prefix-icon="none" >
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item label="报修人" class="grid-content bg-purple device-from" prop="repairman">
+              <el-input v-model="peiForm.repairman" placeholder="请输入" style="margin-top:5px;" maxlength="20"/>
+            </el-form-item>
+            </el-form>
+        <div style="padding-top:20px;display:flex;justify-content: flex-end;">
+          <el-button  style="background-color: #3F9B6A;color: #fff"
+            @click="peiCheck">确定</el-button>
+          <el-button @click="setPeiShow = false"  style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" class="buttonHover">取消</el-button>
+
+        </div>
+
+      </div>
+
+    </el-dialog>
   </div>
 </template>
 
@@ -172,6 +197,7 @@
     ReportDel,
     ComplaintGetAll,
     ComplaintDel,
+    Reportedit
   } from '../../../api/kefuServeBao.js'
 
   export default {
@@ -210,6 +236,15 @@
           pageSize: 10,
         },
         fabutype:'1',
+        setPeiShow:false,
+        peiForm:{
+        repairEndTime:'',
+        repairman:'',
+        peiId:'',
+        id:''
+        }
+
+
       }
     },
 
@@ -359,7 +394,26 @@
       },
       radioClick(tiem){
         this.ruleForm.time =''
-      }
+      },
+      setPei(item){
+        this.peiForm = {
+        repairEndTime:'',
+        repairman:'',
+        id:'',
+        }
+
+      this.peiForm.id= item.id
+        this.setPeiShow = true
+      },
+     async peiCheck(){
+         if (this.peiForm.repairEndTime) {
+             this.peiForm.repairEndTime = new Date(this.peiForm.repairEndTime);
+             }
+       await Reportedit(this.peiForm)
+       this.setPeiShow = false
+       this.getAll()
+
+      },
     }
   };
 </script>
@@ -378,7 +432,10 @@
     width: 80%;
   }
 
-  
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+  }
 
   .formSearch {
     display: flex;
diff --git a/admin-web-master/src/views/serve/procedure.vue b/admin-web-master/src/views/serve/procedure.vue
index 7da1d3b..9b684a5 100644
--- a/admin-web-master/src/views/serve/procedure.vue
+++ b/admin-web-master/src/views/serve/procedure.vue
@@ -42,19 +42,19 @@
             width="auto"
             min-width="12%"
           />
-
           <el-table-column
-            label="创建时间"
-            prop="releaseTime"
+            label="信息类型"
+            prop="informationType"
             width="auto"
             min-width="12%"
           />
           <el-table-column
-            label="创建人"
-            prop="publisher"
+            label="创建时间"
+            prop="releaseTime"
             width="auto"
             min-width="12%"
           />
+
           <el-table-column label="操作" width="auto" min-width="17%">
             <template slot-scope="scope">
               <div class="tableBtn greens" @click="handleEditForm(scope.row)">
@@ -165,6 +165,49 @@
                               "
                             >
                               <span style="font-size: 14px; color: #000"
+                                >信息类型</span
+                              >
+                            </div>
+                            <div
+                              v-if="edit"
+                              style="
+                                height: 38px;
+                                line-height: 38px;
+                                border: 1px solid #ebeef5;
+                                padding: 0 20px;
+                                font-size: 14px;
+                              "
+                            >
+                            {{secondData.informationType}}
+                            </div>
+                  <el-select v-model="secondData.informationType" placeholder="请选择"  v-else>
+                    <el-option label="通知" value="通知" />
+                    <el-option label="热点租赁信息" value="热点租赁信息" />
+                    <el-option label="广告信息" value="广告信息" />
+                    <el-option label="活动信息" value="活动信息" />
+                  </el-select>
+                          </el-form-item>
+                        </el-form>
+                      </el-col>
+                    </el-row>
+                    <el-row style="height: 38px; margin-bottom: 15px">
+                      <el-col :span="24">
+                        <el-form
+
+                          :inline="true"
+                          label-width="100px"
+                        >
+                          <el-form-item prop="name" style="width: 100%">
+                            <div
+                              slot="label"
+                              style="
+                                text-align: left;
+                                height: 38px;
+                                line-height: 38px;
+                                padding-left: 10px;
+                              "
+                            >
+                              <span style="font-size: 14px; color: #000"
                                 >公告内容</span
                               >
                             </div>
@@ -249,6 +292,14 @@
                   size="mini"
                 />
               </el-form-item>
+              <el-form-item label="信息类型"  prop="informationType">
+                <el-select v-model="ruleForm.informationType" placeholder="请选择" style="width: 168px;">
+                  <el-option label="通知" value="通知" />
+                  <el-option label="热点租赁信息" value="热点租赁信息" />
+                  <el-option label="广告信息" value="广告信息" />
+                  <el-option label="活动信息" value="活动信息" />
+                </el-select>
+              </el-form-item>
               <el-form-item label="公告内容">
                 <div style="border: 1px solid #ccc">
                   <wang-editor v-model="ruleForm.announcementContent" ref="editor"></wang-editor>
@@ -321,6 +372,7 @@ export default {
       },
       ruleForm: {
        announcementTitle:'',//公告标题
+       informationType:'',
        announcementContent:'',//公告内容
        releaseTime:''//时间
       },
@@ -472,7 +524,10 @@ export default {
   width: 80%;
 }
 
-
+.tableBtn {
+  display: inline-block;
+  margin-right: 10px;
+}
 
 .formSearch {
     display: flex;
diff --git a/admin-web-master/src/views/serve/salesStatistics.vue b/admin-web-master/src/views/serve/salesStatistics.vue
index 3fb4a73..5d883ab 100644
--- a/admin-web-master/src/views/serve/salesStatistics.vue
+++ b/admin-web-master/src/views/serve/salesStatistics.vue
@@ -362,7 +362,10 @@ option && myChart.setOption(option);
   line-height: 0;
 }
 
-
+.tableBtn {
+  display: inline-block;
+  margin-right: 10px;
+}
 
 .formSearch {
   position: relative;