From e94be90147ede9510357d6985660db845ed17174 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Wed, 9 Apr 2025 18:02:54 +0800
Subject: [PATCH] 1

---
 admin-web-master/public/index.html                                               |    2 ++
 admin-web-master/src/components/Tinymce/components/EditorImage.vue               |    9 +++++----
 admin-web-master/src/components/buscha/busChanew.vue                             |   17 +++++++++++++++++
 admin-web-master/src/components/chakan/ggsh.vue                                  |   17 +++++++++++++++++
 admin-web-master/src/components/chakan/zl.vue                                    |   23 ++++++++++++++++++++---
 admin-web-master/src/components/merchantInformation/index.vue                    |    6 ++++--
 admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue |   17 ++++++++++++++++-
 admin-web-master/src/views/rent/audit/index.vue                                  |   17 ++++++++++++++++-
 admin-web-master/src/views/serve/actSp copy.vue                                  |  963 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/views/serve/actSp.vue                                       | 1080 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 admin-web-master/src/views/shopRental/rentTermination/add.vue                    |    3 ++-
 admin-web-master/src/views/shopRental/rentalMan/add.vue                          |    3 ++-
 lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue                  |    2 +-
 lvdao-miniapp/pages/details/details.vue                                          |    2 +-
 lvdao-miniapp/pages/message/message.vue                                          |    2 +-
 lvdao-miniapp/pages/workbench/workbench.vue                                      |    6 +++---
 lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue                                       |   43 ++++++++++++++++++++++++++++++++++---------
 lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue                                 |    2 +-
 lvdao-miniapp/utils/request.js                                                   |   16 ++++++++--------
 19 files changed, 1690 insertions(+), 540 deletions(-)
 create mode 100644 admin-web-master/src/views/serve/actSp copy.vue

diff --git a/admin-web-master/public/index.html b/admin-web-master/public/index.html
index 17083f0..a729462 100644
--- a/admin-web-master/public/index.html
+++ b/admin-web-master/public/index.html
@@ -6,6 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
     <title><%= webpackConfig.name %></title>
+    <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU&libraries=geometry"></script>
+    <script src='https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU&libraries=tools'></script>
   </head>
   <body>
     <noscript>
diff --git a/admin-web-master/src/components/Tinymce/components/EditorImage.vue b/admin-web-master/src/components/Tinymce/components/EditorImage.vue
index 854d1cf..1a9f94c 100644
--- a/admin-web-master/src/components/Tinymce/components/EditorImage.vue
+++ b/admin-web-master/src/components/Tinymce/components/EditorImage.vue
@@ -12,7 +12,7 @@
         :on-success="handleSuccess"
         :before-upload="beforeUpload"
         class="editor-slide-upload"
-        action="https://httpbin.org/post"
+        :action="action"
         list-type="picture-card"
       >
         <el-button size="small" type="primary">
@@ -31,7 +31,7 @@
 
 <script>
 // import { getToken } from 'api/qiniu'
-
+import { upUrl } from '@/utils/request'
 export default {
   name: 'EditorSlideUpload',
   props: {
@@ -44,7 +44,8 @@ export default {
     return {
       dialogVisible: false,
       listObj: {},
-      fileList: []
+      fileList: [],
+      action:upUrl
     }
   },
   methods: {
@@ -67,7 +68,7 @@ export default {
       const objKeyArr = Object.keys(this.listObj)
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
-          this.listObj[objKeyArr[i]].url = response.files.file
+          this.listObj[objKeyArr[i]].url =this.$baseURL+response.data
           this.listObj[objKeyArr[i]].hasSuccess = true
           return
         }
diff --git a/admin-web-master/src/components/buscha/busChanew.vue b/admin-web-master/src/components/buscha/busChanew.vue
index a502651..87472fc 100644
--- a/admin-web-master/src/components/buscha/busChanew.vue
+++ b/admin-web-master/src/components/buscha/busChanew.vue
@@ -328,6 +328,7 @@
               message: '处理成功',
               type: 'success'
             })
+            this.setmsg()
             this.newinfo.status = this.radio
             this.$emit('removeonaction', '1')
           } else {
@@ -338,6 +339,22 @@
           }
         })
       },
+      async setmsg() {
+        let t4 = this.reviewComments?this.reviewComments:'暂无'
+        let t1 = this.newinfo.contractType=='0'?'退租':this.newinfo.contractType=='1'?'续租':'-'
+        let t2 = '很抱歉，您的'+t1+'申请未通过审核。原因说明：'+t4+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
+        let t3 = '您的'+t1+'申请已通过审核。原因说明：'+t4+'。'
+        let info = {
+          type: '通知消息',
+          phone: this.shop.phone,
+          content: {
+            type: '1',
+            title: this.radio == '2' ?(t1+'申请已通过' ): this.radio == '3' ? (t1+'申请未通过') : '-',
+            content: this.radio == '2' ?t3: this.radio == '3' ?t2: '-'
+          },
+        }
+        await this.$setmsg(info);
+      },
       removeonaction() {
         this.type = '1'
       },
diff --git a/admin-web-master/src/components/chakan/ggsh.vue b/admin-web-master/src/components/chakan/ggsh.vue
index b92675e..446739a 100644
--- a/admin-web-master/src/components/chakan/ggsh.vue
+++ b/admin-web-master/src/components/chakan/ggsh.vue
@@ -362,6 +362,7 @@
               message: '处理成功',
               type: 'success'
             })
+            this.setmsg()
             this.info.auditStatus = this.radio
           } else {
             this.$message({
@@ -371,6 +372,22 @@
           }
         })
       },
+      async setmsg() {
+        let t4 = this.auditComments?this.auditComments:'暂无'
+        let t1 = this.info.cereAdvertisingInformation.id?this.info.cereAdvertisingInformation.advertisingName:'资源'
+        let t2 = '很抱歉，您的'+t1+'租赁申请未通过审核。原因说明：'+t4+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
+        let t3 = '您申请的'+t1+'资源申请已通过。'
+        let info = {
+          type: '通知消息',
+          phone: this.shopMsg.phone,
+          content: {
+            type: '1',
+            title: this.radio == '2' ?'租赁审核申请已通过': this.radio == '3' ?'租赁审核申请未通过': '-',
+            content: this.radio == '2' ?t3: this.radio == '3' ?t2: '-'
+          },
+        }
+        await this.$setmsg(info);
+      },
       openfile(e) {
         if (e) {
           const fullUrl = this.$baseURL + e;
diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue
index 96713a3..41cb6da 100644
--- a/admin-web-master/src/components/chakan/zl.vue
+++ b/admin-web-master/src/components/chakan/zl.vue
@@ -393,9 +393,9 @@
       <div style="padding: 20px;">
         <el-form :model="info" label-width="130px" class="demo-ruleForm">
           <el-form-item label="状态">
-          <el-radio v-model="radio" label="2">同意</el-radio>
-          <el-radio v-model="radio" label="3">拒绝</el-radio>
-        </el-form-item>
+            <el-radio v-model="radio" label="2">同意</el-radio>
+            <el-radio v-model="radio" label="3">拒绝</el-radio>
+          </el-form-item>
           <el-form-item label="审核意见">
             <el-input maxlength="200" show-word-limit rows="4" v-model="info.auditSuggestions" placeholder="请输入审核意见"
               type="textarea" />
@@ -553,6 +553,7 @@
               message: '处理成功',
               type: 'success'
             })
+            this.setmsg()
             this.info.auditStatus = this.radio
 			  this.$emit('removeonaction', '1')
           } else {
@@ -563,6 +564,22 @@
           }
         })
       },
+      async setmsg() {
+        let t4 = this.info.auditSuggestions?this.info.auditSuggestions:'暂无'
+        let t1 = this.info.cereBasicInformationShop.id?this.info.cereBasicInformationShop.shopName:this.info.cereBasicInformationVenue.id?this.info.cereBasicInformationVenue.venueName:'资源'
+        let t2 = '很抱歉，您的'+t1+'申请未通过审核。原因说明：'+t4+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
+        let t3 = '您申请的'+t1+'资源申请已通过，请前往“我的-我租赁的资产”中设置您的店铺信息。'
+        let info = {
+          type: '通知消息',
+          phone: this.shopMsg.phone,
+          content: {
+            type: '1',
+            title: this.radio == '2' ?'租赁审核申请已通过': this.radio == '3' ?'租赁审核申请未通过': '-',
+            content: this.radio == '2' ?t3: this.radio == '3' ?t2: '-'
+          },
+        }
+        await this.$setmsg(info);
+      },
       openfile(e) {
         if (e) {
           const fullUrl = this.$baseURL + e;
diff --git a/admin-web-master/src/components/merchantInformation/index.vue b/admin-web-master/src/components/merchantInformation/index.vue
index ffe0556..e511cc0 100644
--- a/admin-web-master/src/components/merchantInformation/index.vue
+++ b/admin-web-master/src/components/merchantInformation/index.vue
@@ -1122,13 +1122,15 @@
         })
       },
       async setmsg() {
+        let t1 = '您已正式成为平台商家，祝您生意兴隆。'
+        let t2 = '很抱歉，您的商家入驻申请未通过审核。原因说明：'+(this.checkOpinion?this.checkOpinion:'暂无')+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
         let info = {
           type: '通知消息',
           phone: this.info.phone,
           content: {
             type: '1',
-            title: this.radio == '2' ? '商家审核已通过' : this.radio == '3' ? '商家审核已驳回' : '商家',
-            content: this.checkOpinion
+            title: this.radio == '2' ? '商家入驻审核已通过' : this.radio == '3' ? '商家入驻审核已驳回' : '-',
+            content: this.radio == '2'?t1: this.radio == '3'?t2: '-'
           },
         }
         await this.$setmsg(info);
diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
index d1f1a3d..4e86afd 100644
--- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
+++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
@@ -111,7 +111,7 @@
       </div>
 
       <div style="padding: 20px 20px 20px 0;">
-        <add :info="formInline" @removeonaction="removeonaction"></add>
+        <add :info="formInline" @removeonaction="removeonaction" :isdel="'1'"></add>
       </div>
     </div>
     <div class="zhuti" v-if="onaction == '3'">
@@ -303,6 +303,20 @@
 
           })
       },
+      async setmsg(item) {
+        let t1 = item.cereAdvertisingInformation.id?item.cereAdvertisingInformation.advertisingName:'资源'
+        let t2 = '很抱歉，您未签订合约，'+t1+'租赁申请已被终止。'
+        let info = {
+          type: '通知消息',
+          phone: item.applicant,
+          content: {
+            type: '1',
+            title:'租赁申请通知',
+            content: t2
+          },
+        }
+        await this.$setmsg(info);
+      },
       removeinfozz(row, e, tit) {
         let that = this
         this.$confirm('确定要' + tit + '吗？', '提示', {
@@ -320,6 +334,7 @@
                 message: tit + '成功',
                 type: 'success'
               })
+              this.setmsg(row)
               this.removeonaction('1')
 			  
             } else {
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index 208435c..1bc3031 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -315,10 +315,24 @@
         this.detailsinfo = row
         this.onaction = '3'
       },
+      async setmsg(item) {
+        let t1 = item.cereBasicInformationShop.id?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue.id?item.cereBasicInformationVenue.venueName:'资源'
+        let t2 = '很抱歉，您未签订合约，'+t1+'租赁申请已被终止。'
+        let info = {
+          type: '通知消息',
+          phone: item.applicant,
+          content: {
+            type: '1',
+            title:'租赁申请通知',
+            content: t2
+          },
+        }
+        await this.$setmsg(info);
+      },
 	  zhongzhi(item,val){
 		  
 		    let that = this
-		    this.$confirm('确定要当前记录吗？', '提示', {
+		    this.$confirm('确定要终止吗？', '提示', {
 		      confirmButtonText: '确定',
 		      cancelButtonText: '取消',
 		      type: 'warning'
@@ -331,6 +345,7 @@
 		        message: '处理成功',
 		        type: 'success'
 		      })
+          this.setmsg(item)
 			  this.getAll()
 		    } else {
 		      this.$message({
diff --git a/admin-web-master/src/views/serve/actSp copy.vue b/admin-web-master/src/views/serve/actSp copy.vue
new file mode 100644
index 0000000..0311479
--- /dev/null
+++ b/admin-web-master/src/views/serve/actSp copy.vue
@@ -0,0 +1,963 @@
+<template>
+  <div style="background-color:#f7f7f7;padding:10px 10px;">
+    <div class="zhuti" v-if="xiang == false&&actSpye==false">
+      <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">
+          <div class="demo-input-suffix">
+            <div style="width: 68px;height:36px;line-height:32px;">活动时间</div>
+            <el-date-picker style="width:200px;margin-right:15px;" v-model="plan_Time"
+              value-format="yyyy-MM-dd HH:mm:ss" prefix-icon="none" type="datetimerange" range-separator="-"
+              start-placeholder="开始日期" end-placeholder="结束日期">
+            </el-date-picker>
+            <div style="width: 68px;height:36px;line-height:32px;">举办区域</div>
+            <el-input v-model="formSel.region" placeholder="请输入" style="width:168px;" />
+          </div>
+          <div>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
+            </el-button>
+          </div>
+        </div>
+        <!-- 表格 -->
+        <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="序号" width="100">
+            <template slot-scope="scope">
+              {{scope.$index + 1}}
+            </template>
+          </el-table-column>
+          <el-table-column label="活动名称" prop="activityName" min-width="200">
+
+          </el-table-column>
+          <el-table-column label="活动时间" prop="implementationTime" min-width="350">
+            <template slot-scope="scope">
+              {{scope.row.startTime}}至{{scope.row.endTime}}
+            </template>
+          </el-table-column>
+          <el-table-column label="活动类型" prop="activityType" min-width="120">
+          </el-table-column>
+          <el-table-column prop="region" label="举办区域" min-width="150">
+          </el-table-column>
+          <el-table-column prop="maxParticipants" label="可参与人数" min-width="150">
+          </el-table-column>
+          <el-table-column prop="createDate" label="创建时间" min-width="250">
+          </el-table-column>
+          <el-table-column prop="auditStatus" label="状态" min-width="150">
+            <template slot-scope="scope">
+              {{scope.row.auditStatus =='1'?'待提交':scope.row.auditStatus =='2'?'待审核':scope.row.auditStatus =='3'?'审核通过':scope.row.auditStatus =='4'?'审核驳回':''}}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="200" 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>
+              <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.auditStatus =='3'">报名名单</div>
+              <div @click="Qcode(scope.row)" class="tableBtn greens">活动二维码</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="fenye">
+          <div style="line-height: 200%;">共{{total}}条</div>
+          <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
+            :page-sizes="[10, 20, 50, 100]" layout="prev, pager,next" :total="total " @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
+        </div>
+      </div>
+    </div>
+
+    <div class="zhuti" v-if='xiang'>
+      <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="margin-top: 30px;" class="editcss">
+        <TitleWithCircle title="活动信息"></TitleWithCircle>
+        <div style="padding: 20px;">
+          <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动名称" prop="activityName">
+                  <div class="duiqi">{{secondData.activityName}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="活动类型" prop="activityType">
+                  <div class="duiqi">{{secondData.activityType}}</div>
+
+                </el-form-item>
+
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动开始时间" prop="startTime">
+                  <div class="duiqi">{{secondData.startTime}}</div>
+                </el-form-item>
+
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="活动结束时间" prop="endTime">
+                  <div class="duiqi">{{secondData.endTime}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="可参与人数" prop="maxParticipants">
+                  <div class="duiqi">{{secondData.maxParticipants}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="举办区域" prop="region">
+                  <div class="duiqi">{{secondData.region}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+
+              <el-col :span="12">
+                <el-form-item label="活动内容" prop="content">
+                  <div class="duiqi">{{secondData.content}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="审核状态" prop="businessScope">
+
+                  <div class="duiqi">
+                    {{secondData.auditStatus =='1'?'待提交':secondData.auditStatus =='2'?'待审核':secondData.auditStatus =='3'?'审核通过':secondData.auditStatus =='4'?'审核驳回':''}}
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动照片" prop="coverImage">
+                  <!-- {{idCardPhotoFront}} -->
+                  <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain" v-for="item in secondData.coverImage.split(',')"
+                      style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <div style="padding-left:160px;">
+            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+              @click="xiang = false">取消</el-button>
+          </div>
+
+        </el-col>
+      </el-row>
+    </div>
+    <div class="zhuti" v-if='actSpye'>
+      <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="margin-top: 30px;" class="editcss">
+        <TitleWithCircle title="活动信息"></TitleWithCircle>
+        <div style="padding: 20px;">
+          <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动名称" prop="activityName">
+                  <div class="duiqi">{{secondData.activityName}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="活动类型" prop="activityType">
+                  <div class="duiqi">{{secondData.activityType}}</div>
+
+                </el-form-item>
+
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动开始时间" prop="startTime">
+                  <div class="duiqi">{{secondData.startTime}}</div>
+                </el-form-item>
+
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="活动结束时间" prop="endTime">
+                  <div class="duiqi">{{secondData.endTime}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="可参与人数" prop="maxParticipants">
+                  <div class="duiqi">{{secondData.maxParticipants}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="举办区域" prop="region">
+                  <div class="duiqi">{{secondData.region}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+
+              <el-col :span="12">
+                <el-form-item label="活动内容" prop="content">
+                  <div class="duiqi">{{secondData.content}}</div>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动照片" prop="coverImage">
+                  <!-- {{idCardPhotoFront}} -->
+                  <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain" v-for="item in secondData.coverImage.split(',')"
+                      style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="审核状态" prop="businessScope">
+                  <el-radio-group v-model="liuYe" style="line-height:40px">
+                    <el-radio :label="3">通过</el-radio>
+                    <el-radio :label="4">不通过</el-radio>
+                  </el-radio-group>
+
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+          </el-form>
+        </div>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <div style="padding-left:160px;">
+            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+              @click="actSpye = false">取消</el-button>
+            <el-button @click="OAshen" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+          </div>
+
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-dialog :visible.sync="showQF" title="活动二维码" style="padding: 0;" width="25%" center :close-on-click-modal="false"
+      :show-close="false">
+      <div style="padding:20px;">
+
+        <div style="padding:20px;">
+          <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
+          <!-- <el-image
+                                      style="width:200px; height: 200px"
+                                      :src="$baseURL+qfUrl"
+                                      fit="fill"></el-image> -->
+          <div style="display: flex;">
+            <allimg v-if="item" :src="item" fit="contain" v-for="item in qfUrl.split(',')"
+              style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+          </div>
+        </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" title="报名名单" style="padding: 0;" width="55%" center :close-on-click-modal="false"
+      :show-close="false">
+      <div style="padding:20px;">
+        <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="signUpName" min-width="150">
+
+            </el-table-column>
+            <el-table-column label="联系电话" prop="signUpPhone" min-width="150">
+
+            </el-table-column>
+            <el-table-column label="报名时间" prop="signUpTime" min-width="150">
+
+            </el-table-column>
+          </el-table>
+          <div class="fenye">
+            <div style="line-height: 200%;">共{{mingtotal}}条</div>
+            <el-pagination :hide-on-single-page='flag' background :current-page="actPage.pageNumber"
+              layout="prev, pager, next" :total="mingtotal" @current-change="mingChange" />
+          </div>
+        </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>
+</template>
+
+<script>
+  import {
+    actSpAll,
+    actSpAdd,
+    actSpEdit,
+    actSpDel,
+    QRcode,
+    Registration
+  } from '../../api/actSp.js'
+  import wangEditor from "@/components/editor/index"
+  import upimg from "@/components/ImageUpload/index"
+  import TitleWithCircle from '@/components/top/index';
+  import {
+    uploadUrl
+  } from '@/utils/request'
+  import allimg from '@/components/chakan/allimg.vue';
+  export default {
+    components: {
+      wangEditor,
+      upimg,
+      TitleWithCircle,
+      allimg
+    },
+    data() {
+      return {
+        upload: uploadUrl,
+        plan_Time: [],
+        formSel: {
+          region: '',
+          pageNumber: 0,
+          pageSize: 10,
+          orderingRule: 3
+        },
+        secondData: {},
+        xiangqing: 0,
+        xiang: false,
+        currentPage: 1,
+        total: 0,
+        flag: false,
+        pageSize: 10,
+        tableData: [
+
+        ],
+        pageindex: {
+          pageNumber: 0,
+          pageSize: 10,
+          orderingRule: 3
+        },
+        fileList: [],
+        actSpye: false, // 审核
+        actCard: '1',
+        MsgSp: false,
+        index: 0,
+        liuYe: 3, //3通过or4驳回
+        Liunie: false,
+        showQF: false,
+        qfUrl: '',
+        mingList: [],
+        mingtotal: 0,
+        baoming: false,
+        actPage: {
+          activityApplicationId: '',
+          pageNumber: 0,
+          pageSize: 10,
+        }
+
+      }
+    },
+
+    created() {
+      this.getAll()
+
+    },
+    mounted() {
+
+    },
+
+    methods: {
+      //查询全数据
+      async getAll() {
+        const res = await actSpAll(this.pageindex)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+      },
+
+      //查询
+      async onSubmit() {
+
+        if (this.plan_Time.length != 0) {
+          this.formSel.startTime = this.plan_Time[0]
+          this.formSel.endTime = this.plan_Time[1]
+        }
+
+        const res = await actSpAll(this.formSel)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
+      },
+      //详情点击
+      handleEditForm(item, val) {
+        this.secondData = item
+        this.xiang = true
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+      },
+      handleSizeChange(val) {
+        this.pageSize = val
+      },
+      closexaing(val) {
+        this.xiang = false
+      },
+      handleClick() {
+
+      },
+      //重置按钮
+      resetting() {
+        this.formSel = {
+          region: '',
+          pageNumber: 1,
+          pageSize: 10,
+        }
+        this.plan_Time = []
+        this.getAll()
+      },
+      shenhe(item) {
+        this.actSpye = true
+        this.secondData = item
+      },
+      MsgShen(val) {
+        this.index = val
+        this.MsgSp = true
+      },
+      LiuYes(val) {
+        this.liuYe = val
+        this.Liunie = true
+      },
+      async OAshen() {
+        await actSpEdit({
+          id: this.secondData.id,
+          auditStatus: this.liuYe
+        })
+        this.actSpye = false
+        this.getAll()
+      },
+      Qcode(items) {
+        this.showQF = true
+        let pgs = {
+          scene: `item='${items.id}'`,
+          page: "pages/activityDetail/activityDetail"
+        }
+        QRcode(pgs).then(res => {
+          this.qfUrl = res.data
+        })
+      },
+      async getMing(ids) {
+        this.actPage.activityApplicationId = ids
+        this.actPage.pageNumber = 0
+        const res = await Registration(this.actPage)
+        this.mingList = res.data.content
+        this.mingtotal = res.data.totalElements
+
+        this.baoming = true
+
+      },
+      async mingChange(val) {
+        this.actPage.pageNumber = val
+        const res = await Registration(this.actPage)
+        this.mingList = res.data.content
+        this.mingtotal = res.data.totalElements
+
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .first-column-bg {
+    background-color: #f4f4f5 !important;
+  }
+
+  .zhuti {
+    padding: 0 20px 20px 20px;
+    min-height: calc(100vh - 50px - 20px);
+    background-color: #Fff;
+
+  }
+
+  /deep/ .el-form-item__content {
+    line-height: 0;
+  }
+
+  ::v-deep .xinForm .el-form-item__content {
+    line-height: 3;
+  }
+
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+  }
+
+
+
+  .greens {
+    color: #3F9B6A;
+  }
+
+
+  .fenye {
+    margin-top: 20px;
+    display: flex;
+    justify-content: space-between;
+    position: relative;
+  }
+
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #3F9B6A;
+  }
+
+  .el-row {
+    margin-bottom: 20px;
+  }
+
+  :last-child {
+    margin-bottom: 0;
+  }
+
+  .el-col {
+    border-radius: 4px;
+  }
+
+  .bg-purple-dark {
+    background: #99a9bf;
+  }
+
+  .bg-purple {
+    /* background: #d3dce6; */
+  }
+
+  .bg-purple-light {
+    background: #e5e9f2;
+  }
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
+  }
+
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
+  }
+
+  /deep/ .bg-purple[data-v-0e3fe4ec] {
+    background: #fff;
+    height: 50px;
+  }
+
+  /deep/ .el-form--label-top .el-form-item__label {
+    padding: 0;
+  }
+
+  .demo-input-suffix {
+    display: flex;
+    margin-right: 20px;
+    width: 83%;
+  }
+
+  .pagination {
+    text-align: right;
+    line-height: 20px;
+  }
+
+  /deep/ .el-pagination__total {
+    margin-top: 4px;
+  }
+
+
+  /deep/ .dialog_css {
+    margin-top: 11vh;
+    margin-left: 13%;
+    padding: 0px;
+
+    .el-dialog__title {
+      font-size: 12px;
+    }
+  }
+
+  /deep/.el-dialog__body {
+    padding: 0px;
+  }
+
+  /deep/ .el-dialog__header {
+    background-color: #fff;
+  }
+
+  /deep/.el-dialog__title {
+    color: #000;
+  }
+
+  .el-row {
+    margin-bottom: 20px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  /deep/ .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 108px;
+    height: 108px;
+    line-height: 108px;
+    /*text-align: center;*/
+  }
+
+  .avatar {
+    width: 108px;
+    height: 108px;
+    display: block;
+  }
+
+  ::v-deep .el-tabs__item.is-active {
+    color: #3F9B6A;
+    opacity: 1;
+  }
+
+  /deep/ .el-tabs__nav-wrap::after {
+    background-color: #fff;
+  }
+
+  ::v-deep .el-tabs__item:hover {
+    color: #3F9B6A;
+    cursor: pointer;
+    opacity: 1;
+  }
+
+  /deep/ .el-tabs__active-bar {
+    background-color: #389865;
+  }
+
+  /deep/ .el-table_2_column_13 {
+    font-weight: 100;
+  }
+
+  ::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 .el-step__icon-inner {
+    line-height: 0
+  }
+
+
+
+  ::v-deep .el-date-editor .el-range-separator {
+    line-height: 24px;
+  }
+</style>
+<style lang="scss" scoped>
+  ::v-deep .bian_css {
+    .el-dialog__header {
+      padding: 10px 20px 20px 20px;
+    }
+
+    .el-dialog__body {
+      padding: 5px;
+    }
+  }
+
+  ::v-deep .xinFrom {
+    .el-input--mini .el-input__inner {
+      height: 36px;
+      line-height: 36px;
+    }
+
+    .el-range-editor--mini.el-input__inner {
+      height: 36px;
+      width: 100%;
+    }
+  }
+
+  ::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: 10px;
+  }
+
+  .formSearch {
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+    margin-bottom: 20px;
+  }
+
+  ::v-deep .shen_steps1 {
+    .is-process {
+      /* 待执行步骤颜色 */
+      color: #3F9B6A;
+      border: none;
+
+      .el-step__icon {
+        background-color: #3F9B6A;
+      }
+
+      .el-step__icon-inner {
+        color: #fff;
+      }
+
+      .el-step__line {
+        background-color: #3F9B6A;
+      }
+
+    }
+
+    .is-finish {
+      color: #3F9B6A;
+      border: none;
+
+      .el-step__icon {
+        background-color: #3F9B6A;
+      }
+
+      .el-step__icon-inner {
+        color: #fff;
+      }
+
+      .el-step__line {
+        background-color: #3F9B6A;
+      }
+    }
+
+  }
+
+  ::v-deep .liu_steps {
+    .step_start {
+      flex-basis: 15% !important;
+
+      .is-finish {
+        border: none;
+        color: #3F9B6A;
+
+        .el-step__icon {
+          background-color: #D3E6CC;
+        }
+
+        .el-step__icon .is-text {
+          border: 2px solid #3F9B6A;
+        }
+
+        .el-step__icon-inner {
+          display: none;
+        }
+
+        .el-step__line {
+          border-color: #3F9B6A;
+        }
+      }
+
+      .is-wait {
+
+        border: none;
+        color: #000;
+
+        .el-step__icon {
+          background-color: #fff;
+        }
+
+        .el-step__icon .is-text {
+          border: 2px solid #000;
+        }
+
+        .el-step__icon-inner {
+          display: none;
+        }
+
+        .el-step__line {
+          background-color: #000;
+        }
+
+      }
+
+      .is-process {
+        border: none;
+        color: #000;
+
+        .el-step__icon {
+          background-color: #fff;
+        }
+
+        .el-step__icon .is-text {
+          border: 2px solid #000;
+        }
+
+        .el-step__icon-inner {
+          display: none;
+        }
+
+        .el-step__line {
+          background-color: #000;
+        }
+      }
+    }
+
+    .step_buen {
+      flex-basis: 25% !important;
+
+      .is-process {
+        .el-step__icon {
+          padding: 10px;
+          border-radius: 10px;
+          width: 120px;
+          height: 70px;
+          margin-top: -24px;
+          position: relative;
+          border: 2px solid #FABB41;
+          font-size: 12px;
+        }
+
+        .el-step__icon .is-text {
+          padding: 10px;
+          border-radius: 10px;
+          border: 2px solid #FABB41;
+          font-size: 12px;
+        }
+      }
+
+      .is-wait {
+        .el-step__icon {
+          padding: 10px;
+          border-radius: 10px;
+          width: 120px;
+          height: 70px;
+          margin-top: -24px;
+          position: relative;
+          border: 2px solid #C0C4CC;
+          font-size: 12px;
+        }
+
+        .el-step__icon .is-text {
+          padding: 10px;
+          border-radius: 10px;
+          border: 2px solid #C0C4CC;
+          font-size: 12px;
+        }
+      }
+
+      .is-finish {
+        .el-step__icon {
+          padding: 10px;
+          border-radius: 10px;
+          width: 120px;
+          height: 70px;
+          margin-top: -24px;
+          position: relative;
+          border: 2px solid #3F9B6A;
+          background-color: #D3E6CC;
+          font-size: 12px;
+          color: #3F9B6A;
+        }
+
+        .el-step__icon .is-text {
+          padding: 10px;
+          border-radius: 10px;
+          border: 2px solid #3F9B6A;
+          font-size: 12px;
+        }
+
+        .el-step__line {
+          background-color: #3F9B6A;
+        }
+      }
+    }
+
+    ::v-deep .xiang_steps {
+      .is-process {
+        /* 待执行步骤颜色 */
+        color: #3F9B6A;
+        border: none;
+
+        .el-step__icon {
+          background-color: #3F9B6A;
+        }
+
+        .el-step__icon-inner {
+          color: #fff;
+        }
+
+        .el-step__line {
+          background-color: #3F9B6A;
+        }
+
+      }
+
+      .is-finish {
+        color: #3F9B6A;
+        border: none;
+
+        .el-step__icon {
+          background-color: #3F9B6A;
+        }
+
+        .el-step__icon-inner {
+          color: #fff;
+        }
+
+        .el-step__line {
+          border-color: #3F9B6A;
+        }
+      }
+
+
+    }
+  }
+</style>
diff --git a/admin-web-master/src/views/serve/actSp.vue b/admin-web-master/src/views/serve/actSp.vue
index 35eb551..0f1b164 100644
--- a/admin-web-master/src/views/serve/actSp.vue
+++ b/admin-web-master/src/views/serve/actSp.vue
@@ -10,9 +10,9 @@
         <div class="formSearch">
           <div class="demo-input-suffix">
             <div style="width: 68px;height:36px;line-height:32px;">活动时间</div>
-            <el-date-picker style="width:200px;margin-right:15px;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss" prefix-icon="none"
-              type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-            >
+            <el-date-picker style="width:200px;margin-right:15px;" v-model="plan_Time"
+              value-format="yyyy-MM-dd HH:mm:ss" prefix-icon="none" type="datetimerange" range-separator="-"
+              start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
             <div style="width: 68px;height:36px;line-height:32px;">举办区域</div>
             <el-input v-model="formSel.region" placeholder="请输入" style="width:168px;" />
@@ -27,22 +27,21 @@
         </div>
         <!-- 表格 -->
         <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-         >
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
           <el-table-column label="序号" width="100">
             <template slot-scope="scope">
               {{scope.$index + 1}}
-               </template>
+            </template>
           </el-table-column>
-          <el-table-column label="活动名称" prop="activityName" min-width="200" >
+          <el-table-column label="活动名称" prop="activityName" min-width="200">
 
           </el-table-column>
-          <el-table-column label="活动时间" prop="implementationTime" min-width="350" >
-<template slot-scope="scope">
+          <el-table-column label="活动时间" prop="implementationTime" min-width="350">
+            <template slot-scope="scope">
               {{scope.row.startTime}}至{{scope.row.endTime}}
-               </template>
+            </template>
           </el-table-column>
-          <el-table-column label="活动类型" prop="activityType" min-width="120" >
+          <el-table-column label="活动类型" prop="activityType" min-width="120">
           </el-table-column>
           <el-table-column prop="region" label="举办区域" min-width="150">
           </el-table-column>
@@ -59,273 +58,277 @@
             <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>
-			  <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.auditStatus =='3'">报名名单</div>
-              <div @click="Qcode(scope.row)" class="tableBtn greens"  >活动二维码</div>
+              <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.auditStatus =='3'">报名名单</div>
+              <div @click="Qcode(scope.row)" class="tableBtn greens">活动二维码</div>
             </template>
           </el-table-column>
         </el-table>
         <div class="fenye">
-			<div style="line-height: 200%;">共{{total}}条</div>
+          <div style="line-height: 200%;">共{{total}}条</div>
           <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
-            :page-sizes="[10, 20, 50, 100]"  layout="prev, pager,next" :total="total "
-            @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+            :page-sizes="[10, 20, 50, 100]" layout="prev, pager,next" :total="total " @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
         </div>
       </div>
     </div>
 
-<div class="zhuti" v-if='xiang'>
-          <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="margin-top: 30px;" class="editcss">
-                <TitleWithCircle title="活动信息"></TitleWithCircle>
-                <div style="padding: 20px;">
-                  <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="活动名称" prop="activityName">
-                          <div  class="duiqi">{{secondData.activityName}}</div>
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-form-item label="活动类型" prop="activityType">
-                          <div  class="duiqi">{{secondData.activityType}}</div>
-
-                        </el-form-item>
-
-                      </el-col>
-                    </el-row>
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="活动开始时间" prop="startTime">
-                          <div  class="duiqi">{{secondData.startTime}}</div>
-                        </el-form-item>
-
-                      </el-col>
-                      <el-col :span="12">
-                           <el-form-item label="活动结束时间" prop="endTime">
-                             <div  class="duiqi">{{secondData.endTime}}</div>
-                           </el-form-item>
-                      </el-col>
-                    </el-row>
-
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-form-item label="可参与人数" prop="maxParticipants">
-                            <div  class="duiqi">{{secondData.maxParticipants}}</div>
-                        </el-form-item>
-                      </el-col>
-<el-col :span="12">
-                  <el-form-item label="举办区域" prop="region">
-                      <div  class="duiqi">{{secondData.region}}</div>
-                  </el-form-item>
-                </el-col>
-                    </el-row>
-              <el-row :gutter="20">
-
-                <el-col :span="12">
-                  <el-form-item label="活动内容" prop="content">
-                      <div  class="duiqi">{{secondData.content}}</div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="审核状态" prop="businessScope">
-
-                    <div  class="duiqi">{{secondData.auditStatus =='1'?'待提交':secondData.auditStatus =='2'?'待审核':secondData.auditStatus =='3'?'审核通过':secondData.auditStatus =='4'?'审核驳回':''}}</div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row :gutter="20">
-                <el-col :span="12">
-                  <el-form-item label="活动照片" prop="coverImage">
-                    <!-- {{idCardPhotoFront}} -->
-                    <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
-                    <div style="display: flex;">
-                      <allimg v-if="item" :src="item" fit="contain"  v-for="item in secondData.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
-                    </div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-                  </el-form>
-                </div>
-              </div>
-    <el-row :gutter="20">
-                        <el-col :span="12">
-                            <div style="padding-left:160px;">
-                             <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                               @click="xiang = false">取消</el-button>
-                            </div>
-
-                        </el-col>
-                      </el-row>
-        </div>
-        <div class="zhuti" v-if='actSpye'>
-                  <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 class="zhuti" v-if='xiang'>
+      <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="margin-top: 30px;" class="editcss">
+        <TitleWithCircle title="活动信息"></TitleWithCircle>
+        <div style="padding: 20px;">
+          <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动名称" prop="activityName">
+                  <div class="duiqi">{{secondData.activityName}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="活动类型" prop="activityType">
+                  <div class="duiqi">{{secondData.activityType}}</div>
+
+                </el-form-item>
+
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动开始时间" prop="startTime">
+                  <div class="duiqi">{{secondData.startTime}}</div>
+                </el-form-item>
+
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="活动结束时间" prop="endTime">
+                  <div class="duiqi">{{secondData.endTime}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="可参与人数" prop="maxParticipants">
+                  <div class="duiqi">{{secondData.maxParticipants}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="举办区域" prop="region">
+                  <div class="duiqi">{{secondData.region}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+
+              <el-col :span="12">
+                <el-form-item label="活动内容" prop="content">
+                  <div class="duiqi">{{secondData.content}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="审核状态" prop="businessScope">
+
+                  <div class="duiqi">
+                    {{secondData.auditStatus =='1'?'待提交':secondData.auditStatus =='2'?'待审核':secondData.auditStatus =='3'?'审核通过':secondData.auditStatus =='4'?'审核驳回':''}}
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动照片" prop="coverImage">
+                  <!-- {{idCardPhotoFront}} -->
+                  <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain" v-for="item in secondData.coverImage.split(',')"
+                      style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
                   </div>
-                      <div style="margin-top: 30px;" class="editcss">
-                        <TitleWithCircle title="活动信息"></TitleWithCircle>
-                        <div style="padding: 20px;">
-                          <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
-                            <el-row :gutter="20">
-                              <el-col :span="12">
-                                <el-form-item label="活动名称" prop="activityName">
-                                  <div  class="duiqi">{{secondData.activityName}}</div>
-                                </el-form-item>
-                              </el-col>
-                              <el-col :span="12">
-                                <el-form-item label="活动类型" prop="activityType">
-                                  <div  class="duiqi">{{secondData.activityType}}</div>
-
-                                </el-form-item>
-
-                              </el-col>
-                            </el-row>
-                            <el-row :gutter="20">
-                              <el-col :span="12">
-                                <el-form-item label="活动开始时间" prop="startTime">
-                                  <div  class="duiqi">{{secondData.startTime}}</div>
-                                </el-form-item>
-
-                              </el-col>
-                              <el-col :span="12">
-                                   <el-form-item label="活动结束时间" prop="endTime">
-                                     <div  class="duiqi">{{secondData.endTime}}</div>
-                                   </el-form-item>
-                              </el-col>
-                            </el-row>
-
-                            <el-row :gutter="20">
-                              <el-col :span="12">
-                                <el-form-item label="可参与人数" prop="maxParticipants">
-                                    <div  class="duiqi">{{secondData.maxParticipants}}</div>
-                                </el-form-item>
-                              </el-col>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <el-row :gutter="20">
         <el-col :span="12">
-                          <el-form-item label="举办区域" prop="region">
-                              <div  class="duiqi">{{secondData.region}}</div>
-                          </el-form-item>
-                        </el-col>
-                            </el-row>
-                      <el-row :gutter="20">
-
-                        <el-col :span="12">
-                          <el-form-item label="活动内容" prop="content">
-                              <div  class="duiqi">{{secondData.content}}</div>
-                          </el-form-item>
-                        </el-col>
-
-                      </el-row>
-                      <el-row :gutter="20">
-                        <el-col :span="12">
-                          <el-form-item label="活动照片" prop="coverImage">
-                            <!-- {{idCardPhotoFront}} -->
-                            <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
-                            <div style="display: flex;">
-                              <allimg v-if="item" :src="item" fit="contain"  v-for="item in secondData.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
-                            </div>
-                          </el-form-item>
-                        </el-col>
-                      </el-row>
-                      <el-row :gutter="20">
-                        <el-col :span="12">
-                          <el-form-item label="审核状态" prop="businessScope">
-                                 <el-radio-group v-model="liuYe" style="line-height:40px">
-                                    <el-radio :label="3">通过</el-radio>
-                                    <el-radio :label="4">不通过</el-radio>
-                                  </el-radio-group>
-
-                          </el-form-item>
-                        </el-col>
-                      </el-row>
-
-                          </el-form>
-                        </div>
-                      </div>
+          <div style="padding-left:160px;">
+            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+              @click="xiang = false">取消</el-button>
+          </div>
+
+        </el-col>
+      </el-row>
+    </div>
+    <div class="zhuti" v-if='actSpye'>
+      <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="margin-top: 30px;" class="editcss">
+        <TitleWithCircle title="活动信息"></TitleWithCircle>
+        <div style="padding: 20px;">
+          <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动名称" prop="activityName">
+                  <div class="duiqi">{{secondData.activityName}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="活动类型" prop="activityType">
+                  <div class="duiqi">{{secondData.activityType}}</div>
+
+                </el-form-item>
+
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动开始时间" prop="startTime">
+                  <div class="duiqi">{{secondData.startTime}}</div>
+                </el-form-item>
+
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="活动结束时间" prop="endTime">
+                  <div class="duiqi">{{secondData.endTime}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
             <el-row :gutter="20">
-                                <el-col :span="12">
-                                    <div style="padding-left:160px;">
-                                     <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                                       @click="actSpye = false">取消</el-button>
-                                       <el-button  @click="OAshen"
-                                         style="background-color: #3F9B6A;color: #fff;">确定</el-button>
-                                    </div>
-
-                                </el-col>
-                              </el-row>
-                </div>
-
-                       <el-dialog :visible.sync="showQF" title="活动二维码"  style="padding: 0;" width="25%" center
-                             :close-on-click-modal="false" :show-close="false">
-                             <div style="padding:20px;">
-
-                               <div style="padding:20px;">
-                                  <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
-                                  <!-- <el-image
+              <el-col :span="12">
+                <el-form-item label="可参与人数" prop="maxParticipants">
+                  <div class="duiqi">{{secondData.maxParticipants}}</div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="举办区域" prop="region">
+                  <div class="duiqi">{{secondData.region}}</div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+
+              <el-col :span="12">
+                <el-form-item label="活动内容" prop="content">
+                  <div class="duiqi">{{secondData.content}}</div>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="活动照片" prop="coverImage">
+                  <!-- {{idCardPhotoFront}} -->
+                  <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain" v-for="item in secondData.coverImage.split(',')"
+                      style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+                  </div>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </div>
+      <TitleWithCircle title="审核情况"></TitleWithCircle>
+      <div style="padding: 20px;">
+        <el-form :model="info" label-width="130px" class="demo-ruleForm">
+          <el-form-item label="审核状态">
+            <el-radio v-model="liuYe" :label="3">同意</el-radio>
+            <el-radio v-model="liuYe" :label="4">拒绝</el-radio>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <el-input maxlength="200" show-word-limit rows="4" v-model="auditOpinion" placeholder="请输入审核意见"
+              type="textarea" />
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <div style="padding-left:160px;">
+            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+              @click="actSpye = false">取消</el-button>
+            <el-button @click="OAshen" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+          </div>
+
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-dialog :visible.sync="showQF" title="活动二维码" style="padding: 0;" width="25%" center :close-on-click-modal="false"
+      :show-close="false">
+      <div style="padding:20px;">
+
+        <div style="padding:20px;">
+          <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
+          <!-- <el-image
                                       style="width:200px; height: 200px"
                                       :src="$baseURL+qfUrl"
                                       fit="fill"></el-image> -->
-                                      <div style="display: flex;">
-                                        <allimg v-if="item" :src="item" fit="contain"  v-for="item in qfUrl.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
-                                      </div>
-                               </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" title="报名名单"  style="padding: 0;" width="55%" center
-						     :close-on-click-modal="false" :show-close="false">
-						     <div style="padding:20px;">
-						       <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="signUpName" min-width="150">
-						   
-						           </el-table-column>
-						           <el-table-column label="联系电话" prop="signUpPhone" min-width="150">
-						   
-						           </el-table-column>
-								   <el-table-column label="报名时间" prop="signUpTime" min-width="150">
-								   						   
-								   </el-table-column>
-						         </el-table>
-						         <div class="fenye">
-									 <div style="line-height: 200%;">共{{mingtotal}}条</div>
-						           <el-pagination :hide-on-single-page='flag' background  :current-page="actPage.pageNumber"
-						             layout="prev, pager, next" :total="mingtotal"
-						             @current-change="mingChange" />
-						         </div>
-						       </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 style="display: flex;">
+            <allimg v-if="item" :src="item" fit="contain" v-for="item in qfUrl.split(',')"
+              style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
+          </div>
+        </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" title="报名名单" style="padding: 0;" width="55%" center :close-on-click-modal="false"
+      :show-close="false">
+      <div style="padding:20px;">
+        <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="signUpName" min-width="150">
+
+            </el-table-column>
+            <el-table-column label="联系电话" prop="signUpPhone" min-width="150">
+
+            </el-table-column>
+            <el-table-column label="报名时间" prop="signUpTime" min-width="150">
+
+            </el-table-column>
+          </el-table>
+          <div class="fenye">
+            <div style="line-height: 200%;">共{{mingtotal}}条</div>
+            <el-pagination :hide-on-single-page='flag' background :current-page="actPage.pageNumber"
+              layout="prev, pager, next" :total="mingtotal" @current-change="mingChange" />
+          </div>
+        </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>
 </template>
 
 <script>
   import {
-   actSpAll,
-   actSpAdd,
-   actSpEdit,
-   actSpDel,
-   QRcode,
-   Registration
+    actSpAll,
+    actSpAdd,
+    actSpEdit,
+    actSpDel,
+    QRcode,
+    Registration
   } from '../../api/actSp.js'
   import wangEditor from "@/components/editor/index"
   import upimg from "@/components/ImageUpload/index"
@@ -335,20 +338,26 @@
   } from '@/utils/request'
   import allimg from '@/components/chakan/allimg.vue';
   export default {
-   components: { wangEditor ,upimg,TitleWithCircle,allimg},
+    components: {
+      wangEditor,
+      upimg,
+      TitleWithCircle,
+      allimg
+    },
     data() {
       return {
-        upload:uploadUrl,
-        plan_Time:[],
+        auditOpinion:'',
+        upload: uploadUrl,
+        plan_Time: [],
         formSel: {
-          region:'',
-          pageNumber:0,
+          region: '',
+          pageNumber: 0,
           pageSize: 10,
-          orderingRule:3
+          orderingRule: 3
         },
         secondData: {},
-        xiangqing:0,
-        xiang:false,
+        xiangqing: 0,
+        xiang: false,
         currentPage: 1,
         total: 0,
         flag: false,
@@ -359,26 +368,26 @@
         pageindex: {
           pageNumber: 0,
           pageSize: 10,
-          orderingRule:3
+          orderingRule: 3
         },
         fileList: [],
         actSpye: false, // 审核
-        actCard:'1',
-        MsgSp:false,
-       index:0,
-         liuYe:3,//3通过or4驳回
-       Liunie:false,
-       showQF:false,
-       qfUrl:'',
-	   mingList:[],
-	   mingtotal:0,
-	   baoming:false,
-	   actPage:{
-		   activityApplicationId:'',
-		   pageNumber:0,
-		   pageSize:10,
-	   }
-	   
+        actCard: '1',
+        MsgSp: false,
+        index: 0,
+        liuYe: 3, //3通过or4驳回
+        Liunie: false,
+        showQF: false,
+        qfUrl: '',
+        mingList: [],
+        mingtotal: 0,
+        baoming: false,
+        actPage: {
+          activityApplicationId: '',
+          pageNumber: 0,
+          pageSize: 10,
+        }
+
       }
     },
 
@@ -401,17 +410,17 @@
       //查询
       async onSubmit() {
 
-        if(this.plan_Time.length != 0){
-         this.formSel.startTime =  this.plan_Time[0]
-         this.formSel.endTime =  this.plan_Time[1]
+        if (this.plan_Time.length != 0) {
+          this.formSel.startTime = this.plan_Time[0]
+          this.formSel.endTime = this.plan_Time[1]
         }
 
-      const res= await actSpAll(this.formSel)
-       this.tableData = res.data.content
-this.total = res.data.content.length
+        const res = await actSpAll(this.formSel)
+        this.tableData = res.data.content
+        this.total = res.data.content.length
       },
       //详情点击
-      handleEditForm(item,val) {
+      handleEditForm(item, val) {
         this.secondData = item
         this.xiang = true
       },
@@ -421,7 +430,7 @@ this.total = res.data.content.length
       handleSizeChange(val) {
         this.pageSize = val
       },
-      closexaing(val){
+      closexaing(val) {
         this.xiang = false
       },
       handleClick() {
@@ -430,57 +439,77 @@ this.total = res.data.content.length
       //重置按钮
       resetting() {
         this.formSel = {
-          region:'',
+          region: '',
           pageNumber: 1,
           pageSize: 10,
         }
         this.plan_Time = []
-          this.getAll()
+        this.getAll()
       },
-      shenhe(item){
-           this.actSpye = true
-           this.secondData = item
+      shenhe(item) {
+        this.actSpye = true
+        this.secondData = item
       },
-      MsgShen(val){
-         this.index = val
-         this.MsgSp =true
+      MsgShen(val) {
+        this.index = val
+        this.MsgSp = true
       },
-      LiuYes(val){
+      LiuYes(val) {
         this.liuYe = val
         this.Liunie = true
       },
-      async OAshen(){
-       await actSpEdit({id:this.secondData.id,auditStatus:this.liuYe})
+      async OAshen() {
+        await actSpEdit({
+          id: this.secondData.id,
+          auditStatus: this.liuYe,
+          auditOpinion:this.auditOpinion
+        })
         this.actSpye = false
+        this.setmsg()
         this.getAll()
       },
-      Qcode(items){
+      async setmsg() {
+     
+        let t2 = '您的'+this.secondData.activityName+'活动申请已通过，祝您生意兴隆'
+        let t3 = '很抱歉，您的'+this.secondData.activityName+'活动申请未通过审核。原因说明：'+this.auditOpinion+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
+        let info = {
+          type: '通知消息',
+          phone: this.secondData.createUser,
+          content: {
+            type: '1',
+            title: this.liuYe == '3' ?'活动申请已通过': this.liuYe == '4' ?'活动申请未通过': '-',
+            content: this.liuYe == '3' ?t2: this.liuYe == '4' ?t3: '-'
+          },
+        }
+        await this.$setmsg(info);
+      },
+      Qcode(items) {
         this.showQF = true
-        let pgs={
-           scene:`item='${items.id}'`,
-           page:"pages/activityDetail/activityDetail"
+        let pgs = {
+          scene: `item='${items.id}'`,
+          page: "pages/activityDetail/activityDetail"
         }
-         QRcode(pgs).then(res=>{
-            this.qfUrl = res.data
-         })
+        QRcode(pgs).then(res => {
+          this.qfUrl = res.data
+        })
+      },
+      async getMing(ids) {
+        this.actPage.activityApplicationId = ids
+        this.actPage.pageNumber = 0
+        const res = await Registration(this.actPage)
+        this.mingList = res.data.content
+        this.mingtotal = res.data.totalElements
+
+        this.baoming = true
+
       },
-	  async getMing(ids) {
-	    this.actPage.activityApplicationId=ids
-		this.actPage.pageNumber = 0
-	    const res = await Registration(this.actPage)
-	    this.mingList = res.data.content
-	    this.mingtotal = res.data.totalElements
-		  
-	    this.baoming = true
-	  
-	  },
-	  async mingChange(val){
-		  this.actPage.pageNumber = val
-		  const res = await Registration(this.actPage)
-		  this.mingList = res.data.content
-		  this.mingtotal = res.data.totalElements
-		  
-	  }
+      async mingChange(val) {
+        this.actPage.pageNumber = val
+        const res = await Registration(this.actPage)
+        this.mingList = res.data.content
+        this.mingtotal = res.data.totalElements
+
+      }
     }
   }
 </script>
@@ -496,13 +525,13 @@ this.total = res.data.content.length
 
   }
 
-  /deep/ .el-form-item__content {
+  /* /deep/ .el-form-item__content {
     line-height: 0;
   }
 
   ::v-deep .xinForm .el-form-item__content {
     line-height: 3;
-  }
+  } */
 
   .tableBtn {
     display: inline-block;
@@ -586,15 +615,15 @@ this.total = res.data.content.length
   }
 
 
- /deep/ .dialog_css {
-   margin-top: 11vh;
-   margin-left: 13%;
-   padding: 0px;
+  /deep/ .dialog_css {
+    margin-top: 11vh;
+    margin-left: 13%;
+    padding: 0px;
 
-   .el-dialog__title {
-     font-size: 12px;
-   }
- }
+    .el-dialog__title {
+      font-size: 12px;
+    }
+  }
 
   /deep/.el-dialog__body {
     padding: 0px;
@@ -687,221 +716,266 @@ this.total = res.data.content.length
   ::v-deep .el-date-editor .el-range-separator {
     line-height: 24px;
   }
-
 </style>
 <style lang="scss" scoped>
   ::v-deep .bian_css {
     .el-dialog__header {
-     padding: 10px 20px 20px 20px;
+      padding: 10px 20px 20px 20px;
+    }
+
+    .el-dialog__body {
+      padding: 5px;
     }
-  .el-dialog__body{
-    padding:5px;
-  }
   }
 
-  ::v-deep .xinFrom{
-    .el-input--mini .el-input__inner{
-      height:36px;
-      line-height:36px;
+  ::v-deep .xinFrom {
+    .el-input--mini .el-input__inner {
+      height: 36px;
+      line-height: 36px;
     }
-    .el-range-editor--mini.el-input__inner{
-        height:36px;
-        width:100%;
+
+    .el-range-editor--mini.el-input__inner {
+      height: 36px;
+      width: 100%;
     }
   }
-  ::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 {
+
+  ::v-deep .el-pagination__total {
     position: absolute;
     left: 10px;
   }
-.formSearch {
+
+  .formSearch {
     display: flex;
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
-    margin-bottom:20px;
+    margin-bottom: 20px;
   }
+
   ::v-deep .shen_steps1 {
-     .is-process { /* 待执行步骤颜色 */
-       color: #3F9B6A;
-       border:none;
-        .el-step__icon{
-           background-color: #3F9B6A;
-        }
-        .el-step__icon-inner{
-          color:#fff;
-        }
-        .el-step__line{
-          background-color: #3F9B6A;
-        }
+    .is-process {
+      /* 待执行步骤颜色 */
+      color: #3F9B6A;
+      border: none;
+
+      .el-step__icon {
+        background-color: #3F9B6A;
+      }
+
+      .el-step__icon-inner {
+        color: #fff;
+      }
+
+      .el-step__line {
+        background-color: #3F9B6A;
+      }
 
     }
-   .is-finish{
+
+    .is-finish {
       color: #3F9B6A;
-      border:none;
-      .el-step__icon{
-         background-color: #3F9B6A;
+      border: none;
+
+      .el-step__icon {
+        background-color: #3F9B6A;
       }
-      .el-step__icon-inner{
-        color:#fff;
+
+      .el-step__icon-inner {
+        color: #fff;
       }
-      .el-step__line{
+
+      .el-step__line {
         background-color: #3F9B6A;
       }
     }
 
   }
 
-  ::v-deep .liu_steps{
-    .step_start{
-      flex-basis:15% !important;
-      .is-finish{
+  ::v-deep .liu_steps {
+    .step_start {
+      flex-basis: 15% !important;
+
+      .is-finish {
         border: none;
-         color: #3F9B6A;
-         .el-step__icon{
-            background-color: #D3E6CC;
-         }
-         .el-step__icon .is-text{
-           border: 2px solid #3F9B6A;
-         }
-         .el-step__icon-inner{
-           display: none;
-         }
-         .el-step__line{
-           border-color: #3F9B6A;
-         }
-       }
-       .is-wait{
-
-              border: none;
-               color: #000;
-               .el-step__icon{
-                  background-color: #fff;
-               }
-               .el-step__icon .is-text{
-                 border: 2px solid #000;
-               }
-               .el-step__icon-inner{
-                 display: none;
-               }
-               .el-step__line{
-                 background-color: #000;
-               }
-
-       }
-   .is-process{
+        color: #3F9B6A;
+
+        .el-step__icon {
+          background-color: #D3E6CC;
+        }
+
+        .el-step__icon .is-text {
+          border: 2px solid #3F9B6A;
+        }
+
+        .el-step__icon-inner {
+          display: none;
+        }
+
+        .el-step__line {
+          border-color: #3F9B6A;
+        }
+      }
+
+      .is-wait {
+
         border: none;
-         color: #000;
-         .el-step__icon{
-            background-color: #fff;
-         }
-         .el-step__icon .is-text{
-           border: 2px solid #000;
-         }
-         .el-step__icon-inner{
-           display: none;
-         }
-         .el-step__line{
-           background-color: #000;
-         }
-       }
-    }
-    .step_buen{
-      flex-basis:25% !important;
-        .is-process{
-          .el-step__icon{
-            padding: 10px;
-              border-radius:10px;
-              width:120px;
-              height:70px;
-              margin-top:-24px;
-              position: relative;
-            border: 2px solid #FABB41;
-            font-size: 12px;
-          }
-          .el-step__icon .is-text{
-              padding: 10px;
-              border-radius:10px;
-            border: 2px solid #FABB41;
-            font-size: 12px;
-          }
+        color: #000;
+
+        .el-step__icon {
+          background-color: #fff;
         }
-        .is-wait{
-          .el-step__icon{
-            padding: 10px;
-              border-radius:10px;
-              width:120px;
-              height:70px;
-              margin-top:-24px;
-              position: relative;
-            border: 2px solid #C0C4CC;
-            font-size: 12px;
-          }
-          .el-step__icon .is-text{
-              padding: 10px;
-              border-radius:10px;
-            border: 2px solid #C0C4CC;
-            font-size: 12px;
-          }
+
+        .el-step__icon .is-text {
+          border: 2px solid #000;
         }
-         .is-finish{
-           .el-step__icon{
-             padding: 10px;
-               border-radius:10px;
-               width:120px;
-               height:70px;
-               margin-top:-24px;
-               position: relative;
-             border: 2px solid #3F9B6A;
-             background-color: #D3E6CC;
-             font-size: 12px;
-             color: #3F9B6A;
-           }
-           .el-step__icon .is-text{
-               padding: 10px;
-               border-radius:10px;
-             border: 2px solid #3F9B6A;
-             font-size: 12px;
-           }
-           .el-step__line{
-             background-color: #3F9B6A;
-           }
-         }
-    }
-    ::v-deep .xiang_steps{
-     .is-process{ /* 待执行步骤颜色 */
-       color: #3F9B6A;
-       border:none;
-        .el-step__icon{
-           background-color: #3F9B6A;
+
+        .el-step__icon-inner {
+          display: none;
         }
-        .el-step__icon-inner{
-          color:#fff;
+
+        .el-step__line {
+          background-color: #000;
         }
-        .el-step__line{
-          background-color: #3F9B6A;
+
+      }
+
+      .is-process {
+        border: none;
+        color: #000;
+
+        .el-step__icon {
+          background-color: #fff;
+        }
+
+        .el-step__icon .is-text {
+          border: 2px solid #000;
         }
 
+        .el-step__icon-inner {
+          display: none;
+        }
+
+        .el-step__line {
+          background-color: #000;
+        }
+      }
     }
-   .is-finish{
-      color: #3F9B6A;
-      border:none;
-      .el-step__icon{
-         background-color: #3F9B6A;
+
+    .step_buen {
+      flex-basis: 25% !important;
+
+      .is-process {
+        .el-step__icon {
+          padding: 10px;
+          border-radius: 10px;
+          width: 120px;
+          height: 70px;
+          margin-top: -24px;
+          position: relative;
+          border: 2px solid #FABB41;
+          font-size: 12px;
+        }
+
+        .el-step__icon .is-text {
+          padding: 10px;
+          border-radius: 10px;
+          border: 2px solid #FABB41;
+          font-size: 12px;
+        }
       }
-      .el-step__icon-inner{
-        color:#fff;
+
+      .is-wait {
+        .el-step__icon {
+          padding: 10px;
+          border-radius: 10px;
+          width: 120px;
+          height: 70px;
+          margin-top: -24px;
+          position: relative;
+          border: 2px solid #C0C4CC;
+          font-size: 12px;
+        }
+
+        .el-step__icon .is-text {
+          padding: 10px;
+          border-radius: 10px;
+          border: 2px solid #C0C4CC;
+          font-size: 12px;
+        }
       }
-      .el-step__line{
-        border-color: #3F9B6A;
+
+      .is-finish {
+        .el-step__icon {
+          padding: 10px;
+          border-radius: 10px;
+          width: 120px;
+          height: 70px;
+          margin-top: -24px;
+          position: relative;
+          border: 2px solid #3F9B6A;
+          background-color: #D3E6CC;
+          font-size: 12px;
+          color: #3F9B6A;
+        }
+
+        .el-step__icon .is-text {
+          padding: 10px;
+          border-radius: 10px;
+          border: 2px solid #3F9B6A;
+          font-size: 12px;
+        }
+
+        .el-step__line {
+          background-color: #3F9B6A;
+        }
       }
     }
 
+    ::v-deep .xiang_steps {
+      .is-process {
+        /* 待执行步骤颜色 */
+        color: #3F9B6A;
+        border: none;
+
+        .el-step__icon {
+          background-color: #3F9B6A;
+        }
+
+        .el-step__icon-inner {
+          color: #fff;
+        }
+
+        .el-step__line {
+          background-color: #3F9B6A;
+        }
+
+      }
+
+      .is-finish {
+        color: #3F9B6A;
+        border: none;
+
+        .el-step__icon {
+          background-color: #3F9B6A;
+        }
+
+        .el-step__icon-inner {
+          color: #fff;
+        }
+
+        .el-step__line {
+          border-color: #3F9B6A;
+        }
+      }
+
 
     }
   }
diff --git a/admin-web-master/src/views/shopRental/rentTermination/add.vue b/admin-web-master/src/views/shopRental/rentTermination/add.vue
index 3515421..792cb7e 100644
--- a/admin-web-master/src/views/shopRental/rentTermination/add.vue
+++ b/admin-web-master/src/views/shopRental/rentTermination/add.vue
@@ -12,7 +12,8 @@
         <el-input v-model="formInline.outstandingRent" placeholder="请输入"></el-input>
       </el-form-item>
       <el-form-item label="退租须知" prop="exitNotice">
-        <wang-editor v-model="formInline.exitNotice" ref="editor" :height="200"></wang-editor>
+        <!-- <wang-editor v-model="formInline.exitNotice" ref="editor" :height="200"></wang-editor> -->
+        <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.exitNotice" placeholder="请输入" type="textarea" />
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/admin-web-master/src/views/shopRental/rentalMan/add.vue b/admin-web-master/src/views/shopRental/rentalMan/add.vue
index 95c0974..03ccd86 100644
--- a/admin-web-master/src/views/shopRental/rentalMan/add.vue
+++ b/admin-web-master/src/views/shopRental/rentalMan/add.vue
@@ -12,7 +12,8 @@
         <el-input v-model="formInline.outstandingRent" placeholder="请输入"></el-input>
       </el-form-item> -->
       <el-form-item label="入驻须知" prop="exitNotice">
-        <wang-editor v-model="formInline.exitNotice" ref="editor" :height="200"></wang-editor>
+        <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.exitNotice" placeholder="请输入" type="textarea" />
+        <!-- <wang-editor v-model="formInline.exitNotice" ref="editor" :height="200"></wang-editor> -->
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
diff --git a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
index 0278ac9..7e5316d 100644
--- a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
+++ b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
@@ -275,7 +275,7 @@
 					"pageSize": 10,
 					pageNumber: 0,
 					phone: uni.getStorageSync('user').phone
-				}).then(res => {
+				},1).then(res => {
 					if (res.data.code == '20004' || res.data.code == '20003') {
 						uni.navigateTo({
 							url: '/pages/login/login'
diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue
index 5a94a0b..d902a0a 100644
--- a/lvdao-miniapp/pages/details/details.vue
+++ b/lvdao-miniapp/pages/details/details.vue
@@ -429,7 +429,7 @@
 					"pageSize": 10,
 					pageNumber: 0,
 					phone: uni.getStorageSync('user').phone
-				}).then(res => {
+				},1).then(res => {
 					if (res.data.code == '20004' || res.data.code == '20003') {
 						uni.navigateTo({
 							url: '/pages/login/login'
diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue
index 856c7ad..9dd1ec4 100644
--- a/lvdao-miniapp/pages/message/message.vue
+++ b/lvdao-miniapp/pages/message/message.vue
@@ -177,7 +177,7 @@
 				})
 			} else {
 				
-				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
 					 if(res.data.code == '20004' || res.data.code == '20003'){
 						 uni.navigateTo({
 						 	url: '/pages/login/login'
diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue
index c226b47..f516510 100644
--- a/lvdao-miniapp/pages/workbench/workbench.vue
+++ b/lvdao-miniapp/pages/workbench/workbench.vue
@@ -292,7 +292,7 @@
 					"pageSize": 10,
 					pageNumber: 0,
 					phone: uni.getStorageSync('user').phone
-				}).then(res => {
+				},1).then(res => {
 					if (res.data.code == '20004' || res.data.code == '20003') {
 						uni.navigateTo({
 							url: '/pages/login/login'
@@ -329,7 +329,7 @@
 					"pageSize": 10,
 					pageNumber: 0,
 					phone: uni.getStorageSync('user').phone
-				}).then(res => {
+				},1).then(res => {
 					if (res.data.code == '20004' || res.data.code == '20003') {
 						uni.navigateTo({
 							url: '/pages/login/login'
@@ -382,7 +382,7 @@
 					"pageSize": 10,
 					pageNumber: 0,
 					phone: uni.getStorageSync('user').phone
-				}).then(res => {
+				},1).then(res => {
 					if (res.data.code == '20004' || res.data.code == '20003') {
 						uni.navigateTo({
 							url: '/pages/login/login'
diff --git a/lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue b/lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue
index 1e88c5f..fd39657 100644
--- a/lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue
+++ b/lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue
@@ -6,10 +6,10 @@
 					<u-form-item label="经营者姓名" prop="name" borderBottom>
 						<u-input v-model="model1.name"></u-input>
 					</u-form-item>
-			<!-- 		<u-form-item label="手机号" prop="phone" borderBottom>
+					<!-- 		<u-form-item label="手机号" prop="phone" borderBottom>
 						<u-input v-model="model1.phone"></u-input>
 					</u-form-item> -->
-		<!-- 			<u-form-item label="证件类型" prop="idCardType" borderBottom>
+					<!-- 			<u-form-item label="证件类型" prop="idCardType" borderBottom>
 						<u-input v-model="model1.idCardType" type="select" @click="IdtypeShow = true"
 							placeholder='请选择类型' />
 					</u-form-item> -->
@@ -30,8 +30,8 @@
 							<text>点击上传证件人像面</text>
 						</view>
 						<view class="img-deom">
-							<u-upload :action="url" @on-choose-complete="onsuccess2" :auto-upload="false" :custom-btn="true" :max-count="1"
-								ref="idPhotoBack">
+							<u-upload :action="url" @on-choose-complete="onsuccess2" :auto-upload="false"
+								:custom-btn="true" :max-count="1" ref="idPhotoBack">
 								<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover"
 									hover-stay-time="150">
 									<u-image width="304rpx" height="182rpx" :src="$imgUrl('/uploadID2.png')"></u-image>
@@ -117,7 +117,7 @@
 					});
 					return false;
 				}
-	
+
 				this.model1.applyTime = this.getCurrentTime()
 				this.model1.idCardFrontImage = this.fileList1.join(',')
 				this.model1.idCardBackImage = this.fileList2.join(',')
@@ -140,6 +140,28 @@
 				console.error({
 					...this.model1
 				})
+				let info = {
+					"content": JSON.stringify({
+						type: '1',
+						title: '商家入驻审核申请',
+						content: '您的商家入驻申请已提交（申请时间：' + this.model1.applyTime +
+							'），正在审核中，审核通过后，我们将通过系统消息通知您，请保持关注；'
+					}), // 消息内容
+					"messageClass": 1, // 消息类型（1:指定用户发送）
+					"messageType": '通知消息', // 消息类型描述
+					"cereMessageReceipts": [ // 接收人列表
+						{
+							"phone": uni.getStorageSync('user').phone, // 用户ID
+							"messageType": '通知消息', // 消息类型
+							"content": JSON.stringify({
+								type: '1',
+								title: '商家入驻审核申请',
+								content: '您的商家入驻申请已提交（申请时间：' + this.model1.applyTime +
+									'），正在审核中，审核通过后，我们将通过系统消息通知您，请保持关注；'
+							}) // 消息内容
+						}
+					]
+				}
 				// return
 				this.$http.sendRequest('/cerePlatformMerchant/add', 'POST', this.model1, 2).then(res => {
 					console.error(res)
@@ -148,6 +170,9 @@
 							icon: 'none',
 							title: '提交申请成功'
 						})
+						this.$http.sendRequest('/cereMessage/sendToUser', 'POST', info, 1).then(res => {
+							console.error(res)
+						})
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 1000);
@@ -159,7 +184,7 @@
 					}
 				})
 			},
-			onup(e,e1) {
+			onup(e, e1) {
 				uni.uploadFile({
 					url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
 					filePath: e,
@@ -187,13 +212,13 @@
 			onsuccess1(e) {
 				console.error(e)
 				this.fileList1 = []
-				this.onup(e[0].url,'fileList1')
+				this.onup(e[0].url, 'fileList1')
 			},
 			onsuccess2(e) {
 				console.error(e)
 				this.fileList2 = []
-				this.onup(e[0].url,'fileList2')
-				
+				this.onup(e[0].url, 'fileList2')
+
 			},
 			IdtypeChange(e) {
 				this.model1.idCardType = e[0].label;
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
index 9f77b5a..eea82f7 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
@@ -223,7 +223,7 @@
 		},
 		onLoad(options) {
 			this.imgurl = this.$img
-			const item = JSON.parse(options.item)
+			const item = JSON.parse(decodeURIComponent(options.item))
 			this.heData = item || {}
 			this.record = item
 			let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 7e55a91..3b440d5 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -18,17 +18,17 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	if(baseUrl == 1){
 		// bases = 'http://128.10.249.22:9003' + url;
 		// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
-		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
-		bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
+		// bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' + url;
+		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
 		
 		// bases = 'http://128.10.249.25:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		
-		// bases = c1 + 'cdwlMall/meserver/admin-server' + url; 
+		bases = c1 + 'cdwlMall/meserver/admin-server' + url; 
 		
 	}else if(baseUrl == 3){
-		bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
-		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
+		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
+		// bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api' + url;
 		// bases = 'http://128.10.249.22:9003:9007' + url;
 		// bases = 'http://128.10.249.25:9007' + url;
 		// bases = c1 + 'cdwlMall/meserver/api' + url;
@@ -37,11 +37,11 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'http://128.10.249.22:9004' + url;
 		// bases = 'http://172.16.61.48/business-server' + url;
 		// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
-		bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
-		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
+		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
+		// bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server' + url;
 		// bases = 'http://128.10.249.25:9004' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
-		// bases = c1 + 'cdwlMall/business-server' + url;
+		bases = c1 + 'cdwlMall/business-server' + url;
 		
 	}
 	var token = uni.getStorageSync('token') || '';
--
libgit2 0.21.4