webapp / GreenwayWeb

Commit 981fc108e2902fdaaacfe27f3431ef7bab5a6883

Authored by 杨鑫
2 parents 6c268f28 e94be901

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 20 changed files with 1744 additions and 546 deletions
admin-web-master/public/index.html
  View file @981fc10
... ... @@ -6,6 +6,8 @@
6 6 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
7 7  
8 8 <title><%= webpackConfig.name %></title>
  9 + <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU&libraries=geometry"></script>
  10 + <script src='https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU&libraries=tools'></script>
9 11 </head>
10 12 <body>
11 13 <noscript>
... ...
admin-web-master/src/components/Tinymce/components/EditorImage.vue
  View file @981fc10
... ... @@ -12,7 +12,7 @@
12 12 :on-success="handleSuccess"
13 13 :before-upload="beforeUpload"
14 14 class="editor-slide-upload"
15   - action="https://httpbin.org/post"
  15 + :action="action"
16 16 list-type="picture-card"
17 17 >
18 18 <el-button size="small" type="primary">
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <script>
33 33 // import { getToken } from 'api/qiniu'
34   -
  34 +import { upUrl } from '@/utils/request'
35 35 export default {
36 36 name: 'EditorSlideUpload',
37 37 props: {
... ... @@ -44,7 +44,8 @@ export default {
44 44 return {
45 45 dialogVisible: false,
46 46 listObj: {},
47   - fileList: []
  47 + fileList: [],
  48 + action:upUrl
48 49 }
49 50 },
50 51 methods: {
... ... @@ -67,7 +68,7 @@ export default {
67 68 const objKeyArr = Object.keys(this.listObj)
68 69 for (let i = 0, len = objKeyArr.length; i < len; i++) {
69 70 if (this.listObj[objKeyArr[i]].uid === uid) {
70   - this.listObj[objKeyArr[i]].url = response.files.file
  71 + this.listObj[objKeyArr[i]].url =this.$baseURL+response.data
71 72 this.listObj[objKeyArr[i]].hasSuccess = true
72 73 return
73 74 }
... ...
admin-web-master/src/components/buscha/busChanew.vue
  View file @981fc10
... ... @@ -328,6 +328,7 @@
328 328 message: '处理成功',
329 329 type: 'success'
330 330 })
  331 + this.setmsg()
331 332 this.newinfo.status = this.radio
332 333 this.$emit('removeonaction', '1')
333 334 } else {
... ... @@ -338,6 +339,22 @@
338 339 }
339 340 })
340 341 },
  342 + async setmsg() {
  343 + let t4 = this.reviewComments?this.reviewComments:'暂无'
  344 + let t1 = this.newinfo.contractType=='0'?'退租':this.newinfo.contractType=='1'?'续租':'-'
  345 + let t2 = '很抱歉，您的'+t1+'申请未通过审核。原因说明：'+t4+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
  346 + let t3 = '您的'+t1+'申请已通过审核。原因说明：'+t4+'。'
  347 + let info = {
  348 + type: '通知消息',
  349 + phone: this.shop.phone,
  350 + content: {
  351 + type: '1',
  352 + title: this.radio == '2' ?(t1+'申请已通过' ): this.radio == '3' ? (t1+'申请未通过') : '-',
  353 + content: this.radio == '2' ?t3: this.radio == '3' ?t2: '-'
  354 + },
  355 + }
  356 + await this.$setmsg(info);
  357 + },
341 358 removeonaction() {
342 359 this.type = '1'
343 360 },
... ...
admin-web-master/src/components/chakan/ggsh.vue
  View file @981fc10
... ... @@ -362,6 +362,7 @@
362 362 message: '处理成功',
363 363 type: 'success'
364 364 })
  365 + this.setmsg()
365 366 this.info.auditStatus = this.radio
366 367 } else {
367 368 this.$message({
... ... @@ -371,6 +372,22 @@
371 372 }
372 373 })
373 374 },
  375 + async setmsg() {
  376 + let t4 = this.auditComments?this.auditComments:'暂无'
  377 + let t1 = this.info.cereAdvertisingInformation.id?this.info.cereAdvertisingInformation.advertisingName:'资源'
  378 + let t2 = '很抱歉，您的'+t1+'租赁申请未通过审核。原因说明：'+t4+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
  379 + let t3 = '您申请的'+t1+'资源申请已通过。'
  380 + let info = {
  381 + type: '通知消息',
  382 + phone: this.shopMsg.phone,
  383 + content: {
  384 + type: '1',
  385 + title: this.radio == '2' ?'租赁审核申请已通过': this.radio == '3' ?'租赁审核申请未通过': '-',
  386 + content: this.radio == '2' ?t3: this.radio == '3' ?t2: '-'
  387 + },
  388 + }
  389 + await this.$setmsg(info);
  390 + },
374 391 openfile(e) {
375 392 if (e) {
376 393 const fullUrl = this.$baseURL + e;
... ...
admin-web-master/src/components/chakan/zl.vue
  View file @981fc10
... ... @@ -393,9 +393,9 @@
393 393 <div style="padding: 20px;">
394 394 <el-form :model="info" label-width="130px" class="demo-ruleForm">
395 395 <el-form-item label="状态">
396   - <el-radio v-model="radio" label="2">同意</el-radio>
397   - <el-radio v-model="radio" label="3">拒绝</el-radio>
398   - </el-form-item>
  396 + <el-radio v-model="radio" label="2">同意</el-radio>
  397 + <el-radio v-model="radio" label="3">拒绝</el-radio>
  398 + </el-form-item>
399 399 <el-form-item label="审核意见">
400 400 <el-input maxlength="200" show-word-limit rows="4" v-model="info.auditSuggestions" placeholder="请输入审核意见"
401 401 type="textarea" />
... ... @@ -553,6 +553,7 @@
553 553 message: '处理成功',
554 554 type: 'success'
555 555 })
  556 + this.setmsg()
556 557 this.info.auditStatus = this.radio
557 558 this.$emit('removeonaction', '1')
558 559 } else {
... ... @@ -563,6 +564,22 @@
563 564 }
564 565 })
565 566 },
  567 + async setmsg() {
  568 + let t4 = this.info.auditSuggestions?this.info.auditSuggestions:'暂无'
  569 + let t1 = this.info.cereBasicInformationShop.id?this.info.cereBasicInformationShop.shopName:this.info.cereBasicInformationVenue.id?this.info.cereBasicInformationVenue.venueName:'资源'
  570 + let t2 = '很抱歉，您的'+t1+'申请未通过审核。原因说明：'+t4+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
  571 + let t3 = '您申请的'+t1+'资源申请已通过，请前往“我的-我租赁的资产”中设置您的店铺信息。'
  572 + let info = {
  573 + type: '通知消息',
  574 + phone: this.shopMsg.phone,
  575 + content: {
  576 + type: '1',
  577 + title: this.radio == '2' ?'租赁审核申请已通过': this.radio == '3' ?'租赁审核申请未通过': '-',
  578 + content: this.radio == '2' ?t3: this.radio == '3' ?t2: '-'
  579 + },
  580 + }
  581 + await this.$setmsg(info);
  582 + },
566 583 openfile(e) {
567 584 if (e) {
568 585 const fullUrl = this.$baseURL + e;
... ...
admin-web-master/src/components/merchantInformation/index.vue
  View file @981fc10
... ... @@ -1122,13 +1122,15 @@
1122 1122 })
1123 1123 },
1124 1124 async setmsg() {
  1125 + let t1 = '您已正式成为平台商家，祝您生意兴隆。'
  1126 + let t2 = '很抱歉，您的商家入驻申请未通过审核。原因说明：'+(this.checkOpinion?this.checkOpinion:'暂无')+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
1125 1127 let info = {
1126 1128 type: '通知消息',
1127 1129 phone: this.info.phone,
1128 1130 content: {
1129 1131 type: '1',
1130   - title: this.radio == '2' ? '商家审核已通过' : this.radio == '3' ? '商家审核已驳回' : '商家',
1131   - content: this.checkOpinion
  1132 + title: this.radio == '2' ? '商家入驻审核已通过' : this.radio == '3' ? '商家入驻审核已驳回' : '-',
  1133 + content: this.radio == '2'?t1: this.radio == '3'?t2: '-'
1132 1134 },
1133 1135 }
1134 1136 await this.$setmsg(info);
... ...
admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue
  View file @981fc10
... ... @@ -111,7 +111,7 @@
111 111 </div>
112 112  
113 113 <div style="padding: 20px 20px 20px 0;">
114   - <add :info="formInline" @removeonaction="removeonaction"></add>
  114 + <add :info="formInline" @removeonaction="removeonaction" :isdel="'1'"></add>
115 115 </div>
116 116 </div>
117 117 <div class="zhuti" v-if="onaction == '3'">
... ... @@ -303,6 +303,20 @@
303 303  
304 304 })
305 305 },
  306 + async setmsg(item) {
  307 + let t1 = item.cereAdvertisingInformation.id?item.cereAdvertisingInformation.advertisingName:'资源'
  308 + let t2 = '很抱歉，您未签订合约，'+t1+'租赁申请已被终止。'
  309 + let info = {
  310 + type: '通知消息',
  311 + phone: item.applicant,
  312 + content: {
  313 + type: '1',
  314 + title:'租赁申请通知',
  315 + content: t2
  316 + },
  317 + }
  318 + await this.$setmsg(info);
  319 + },
306 320 removeinfozz(row, e, tit) {
307 321 let that = this
308 322 this.$confirm('确定要' + tit + '吗？', '提示', {
... ... @@ -320,6 +334,7 @@
320 334 message: tit + '成功',
321 335 type: 'success'
322 336 })
  337 + this.setmsg(row)
323 338 this.removeonaction('1')
324 339  
325 340 } else {
... ...
admin-web-master/src/views/detect/admap.vue
  View file @981fc10
... ... @@ -566,10 +566,10 @@
566 566 const budao = await gongyuan()
567 567 this.gongyuanList = budao.data.concat(gongyua.data)
568 568 this.getAll()
569   - this.changepublishStatus()
570   - this.changebelongingGreenwaySection()
571   - this.changebelongingParkTrail()
572   - this.changetype()
  569 + // this.changepublishStatus()
  570 + // this.changebelongingGreenwaySection()
  571 + // this.changebelongingParkTrail()
  572 + // this.changetype()
573 573 },
574 574 methods: {
575 575 gettypeShopList(code) {
... ...
admin-web-master/src/views/rent/audit/index.vue
  View file @981fc10
... ... @@ -315,10 +315,24 @@
315 315 this.detailsinfo = row
316 316 this.onaction = '3'
317 317 },
  318 + async setmsg(item) {
  319 + let t1 = item.cereBasicInformationShop.id?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue.id?item.cereBasicInformationVenue.venueName:'资源'
  320 + let t2 = '很抱歉，您未签订合约，'+t1+'租赁申请已被终止。'
  321 + let info = {
  322 + type: '通知消息',
  323 + phone: item.applicant,
  324 + content: {
  325 + type: '1',
  326 + title:'租赁申请通知',
  327 + content: t2
  328 + },
  329 + }
  330 + await this.$setmsg(info);
  331 + },
318 332 zhongzhi(item,val){
319 333  
320 334 let that = this
321   - this.$confirm('确定要当前记录吗？', '提示', {
  335 + this.$confirm('确定要终止吗？', '提示', {
322 336 confirmButtonText: '确定',
323 337 cancelButtonText: '取消',
324 338 type: 'warning'
... ... @@ -331,6 +345,7 @@
331 345 message: '处理成功',
332 346 type: 'success'
333 347 })
  348 + this.setmsg(item)
334 349 this.getAll()
335 350 } else {
336 351 this.$message({
... ...
admin-web-master/src/views/serve/actSp copy.vue 0 → 100644
  View file @981fc10
  1 +<template>
  2 + <div style="background-color:#f7f7f7;padding:10px 10px;">
  3 + <div class="zhuti" v-if="xiang == false&&actSpye==false">
  4 + <div style="height:58px;line-height:58px;">
  5 + <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
  6 + style="color:#000000e6">活动审核</span></div>
  7 + </div>
  8 + <div>
  9 + <!-- 搜索 -->
  10 + <div class="formSearch">
  11 + <div class="demo-input-suffix">
  12 + <div style="width: 68px;height:36px;line-height:32px;">活动时间</div>
  13 + <el-date-picker style="width:200px;margin-right:15px;" v-model="plan_Time"
  14 + value-format="yyyy-MM-dd HH:mm:ss" prefix-icon="none" type="datetimerange" range-separator="-"
  15 + start-placeholder="开始日期" end-placeholder="结束日期">
  16 + </el-date-picker>
  17 + <div style="width: 68px;height:36px;line-height:32px;">举办区域</div>
  18 + <el-input v-model="formSel.region" placeholder="请输入" style="width:168px;" />
  19 + </div>
  20 + <div>
  21 + <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
  22 + </el-button>
  23 + <el-button @click="resetting" class="buttonHover"
  24 + style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
  25 + </el-button>
  26 + </div>
  27 + </div>
  28 + <!-- 表格 -->
  29 + <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
  30 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  31 + <el-table-column label="序号" width="100">
  32 + <template slot-scope="scope">
  33 + {{scope.$index + 1}}
  34 + </template>
  35 + </el-table-column>
  36 + <el-table-column label="活动名称" prop="activityName" min-width="200">
  37 +
  38 + </el-table-column>
  39 + <el-table-column label="活动时间" prop="implementationTime" min-width="350">
  40 + <template slot-scope="scope">
  41 + {{scope.row.startTime}}至{{scope.row.endTime}}
  42 + </template>
  43 + </el-table-column>
  44 + <el-table-column label="活动类型" prop="activityType" min-width="120">
  45 + </el-table-column>
  46 + <el-table-column prop="region" label="举办区域" min-width="150">
  47 + </el-table-column>
  48 + <el-table-column prop="maxParticipants" label="可参与人数" min-width="150">
  49 + </el-table-column>
  50 + <el-table-column prop="createDate" label="创建时间" min-width="250">
  51 + </el-table-column>
  52 + <el-table-column prop="auditStatus" label="状态" min-width="150">
  53 + <template slot-scope="scope">
  54 + {{scope.row.auditStatus =='1'?'待提交':scope.row.auditStatus =='2'?'待审核':scope.row.auditStatus =='3'?'审核通过':scope.row.auditStatus =='4'?'审核驳回':''}}
  55 + </template>
  56 + </el-table-column>
  57 + <el-table-column label="操作" min-width="200" fixed="right">
  58 + <template slot-scope="scope">
  59 + <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
  60 + <div @click="shenhe(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">审核</div>
  61 + <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.auditStatus =='3'">报名名单</div>
  62 + <div @click="Qcode(scope.row)" class="tableBtn greens">活动二维码</div>
  63 + </template>
  64 + </el-table-column>
  65 + </el-table>
  66 + <div class="fenye">
  67 + <div style="line-height: 200%;">共{{total}}条</div>
  68 + <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
  69 + :page-sizes="[10, 20, 50, 100]" layout="prev, pager,next" :total="total " @size-change="handleSizeChange"
  70 + @current-change="handleCurrentChange" />
  71 + </div>
  72 + </div>
  73 + </div>
  74 +
  75 + <div class="zhuti" v-if='xiang'>
  76 + <div style="height:58px;line-height:58px;">
  77 + <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
  78 + style="color:#000000e6">查看</span></div>
  79 + </div>
  80 + <div style="margin-top: 30px;" class="editcss">
  81 + <TitleWithCircle title="活动信息"></TitleWithCircle>
  82 + <div style="padding: 20px;">
  83 + <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
  84 + <el-row :gutter="20">
  85 + <el-col :span="12">
  86 + <el-form-item label="活动名称" prop="activityName">
  87 + <div class="duiqi">{{secondData.activityName}}</div>
  88 + </el-form-item>
  89 + </el-col>
  90 + <el-col :span="12">
  91 + <el-form-item label="活动类型" prop="activityType">
  92 + <div class="duiqi">{{secondData.activityType}}</div>
  93 +
  94 + </el-form-item>
  95 +
  96 + </el-col>
  97 + </el-row>
  98 + <el-row :gutter="20">
  99 + <el-col :span="12">
  100 + <el-form-item label="活动开始时间" prop="startTime">
  101 + <div class="duiqi">{{secondData.startTime}}</div>
  102 + </el-form-item>
  103 +
  104 + </el-col>
  105 + <el-col :span="12">
  106 + <el-form-item label="活动结束时间" prop="endTime">
  107 + <div class="duiqi">{{secondData.endTime}}</div>
  108 + </el-form-item>
  109 + </el-col>
  110 + </el-row>
  111 +
  112 + <el-row :gutter="20">
  113 + <el-col :span="12">
  114 + <el-form-item label="可参与人数" prop="maxParticipants">
  115 + <div class="duiqi">{{secondData.maxParticipants}}</div>
  116 + </el-form-item>
  117 + </el-col>
  118 + <el-col :span="12">
  119 + <el-form-item label="举办区域" prop="region">
  120 + <div class="duiqi">{{secondData.region}}</div>
  121 + </el-form-item>
  122 + </el-col>
  123 + </el-row>
  124 + <el-row :gutter="20">
  125 +
  126 + <el-col :span="12">
  127 + <el-form-item label="活动内容" prop="content">
  128 + <div class="duiqi">{{secondData.content}}</div>
  129 + </el-form-item>
  130 + </el-col>
  131 + <el-col :span="12">
  132 + <el-form-item label="审核状态" prop="businessScope">
  133 +
  134 + <div class="duiqi">
  135 + {{secondData.auditStatus =='1'?'待提交':secondData.auditStatus =='2'?'待审核':secondData.auditStatus =='3'?'审核通过':secondData.auditStatus =='4'?'审核驳回':''}}
  136 + </div>
  137 + </el-form-item>
  138 + </el-col>
  139 + </el-row>
  140 + <el-row :gutter="20">
  141 + <el-col :span="12">
  142 + <el-form-item label="活动照片" prop="coverImage">
  143 + <!-- {{idCardPhotoFront}} -->
  144 + <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
  145 + <div style="display: flex;">
  146 + <allimg v-if="item" :src="item" fit="contain" v-for="item in secondData.coverImage.split(',')"
  147 + style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
  148 + </div>
  149 + </el-form-item>
  150 + </el-col>
  151 + </el-row>
  152 + </el-form>
  153 + </div>
  154 + </div>
  155 + <el-row :gutter="20">
  156 + <el-col :span="12">
  157 + <div style="padding-left:160px;">
  158 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  159 + @click="xiang = false">取消</el-button>
  160 + </div>
  161 +
  162 + </el-col>
  163 + </el-row>
  164 + </div>
  165 + <div class="zhuti" v-if='actSpye'>
  166 + <div style="height:58px;line-height:58px;">
  167 + <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
  168 + style="color:#000000e6">审核</span></div>
  169 + </div>
  170 + <div style="margin-top: 30px;" class="editcss">
  171 + <TitleWithCircle title="活动信息"></TitleWithCircle>
  172 + <div style="padding: 20px;">
  173 + <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
  174 + <el-row :gutter="20">
  175 + <el-col :span="12">
  176 + <el-form-item label="活动名称" prop="activityName">
  177 + <div class="duiqi">{{secondData.activityName}}</div>
  178 + </el-form-item>
  179 + </el-col>
  180 + <el-col :span="12">
  181 + <el-form-item label="活动类型" prop="activityType">
  182 + <div class="duiqi">{{secondData.activityType}}</div>
  183 +
  184 + </el-form-item>
  185 +
  186 + </el-col>
  187 + </el-row>
  188 + <el-row :gutter="20">
  189 + <el-col :span="12">
  190 + <el-form-item label="活动开始时间" prop="startTime">
  191 + <div class="duiqi">{{secondData.startTime}}</div>
  192 + </el-form-item>
  193 +
  194 + </el-col>
  195 + <el-col :span="12">
  196 + <el-form-item label="活动结束时间" prop="endTime">
  197 + <div class="duiqi">{{secondData.endTime}}</div>
  198 + </el-form-item>
  199 + </el-col>
  200 + </el-row>
  201 +
  202 + <el-row :gutter="20">
  203 + <el-col :span="12">
  204 + <el-form-item label="可参与人数" prop="maxParticipants">
  205 + <div class="duiqi">{{secondData.maxParticipants}}</div>
  206 + </el-form-item>
  207 + </el-col>
  208 + <el-col :span="12">
  209 + <el-form-item label="举办区域" prop="region">
  210 + <div class="duiqi">{{secondData.region}}</div>
  211 + </el-form-item>
  212 + </el-col>
  213 + </el-row>
  214 + <el-row :gutter="20">
  215 +
  216 + <el-col :span="12">
  217 + <el-form-item label="活动内容" prop="content">
  218 + <div class="duiqi">{{secondData.content}}</div>
  219 + </el-form-item>
  220 + </el-col>
  221 +
  222 + </el-row>
  223 + <el-row :gutter="20">
  224 + <el-col :span="12">
  225 + <el-form-item label="活动照片" prop="coverImage">
  226 + <!-- {{idCardPhotoFront}} -->
  227 + <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
  228 + <div style="display: flex;">
  229 + <allimg v-if="item" :src="item" fit="contain" v-for="item in secondData.coverImage.split(',')"
  230 + style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
  231 + </div>
  232 + </el-form-item>
  233 + </el-col>
  234 + </el-row>
  235 + <el-row :gutter="20">
  236 + <el-col :span="12">
  237 + <el-form-item label="审核状态" prop="businessScope">
  238 + <el-radio-group v-model="liuYe" style="line-height:40px">
  239 + <el-radio :label="3">通过</el-radio>
  240 + <el-radio :label="4">不通过</el-radio>
  241 + </el-radio-group>
  242 +
  243 + </el-form-item>
  244 + </el-col>
  245 + </el-row>
  246 +
  247 + </el-form>
  248 + </div>
  249 + </div>
  250 + <el-row :gutter="20">
  251 + <el-col :span="12">
  252 + <div style="padding-left:160px;">
  253 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  254 + @click="actSpye = false">取消</el-button>
  255 + <el-button @click="OAshen" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  256 + </div>
  257 +
  258 + </el-col>
  259 + </el-row>
  260 + </div>
  261 +
  262 + <el-dialog :visible.sync="showQF" title="活动二维码" style="padding: 0;" width="25%" center :close-on-click-modal="false"
  263 + :show-close="false">
  264 + <div style="padding:20px;">
  265 +
  266 + <div style="padding:20px;">
  267 + <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
  268 + <!-- <el-image
  269 + style="width:200px; height: 200px"
  270 + :src="$baseURL+qfUrl"
  271 + fit="fill"></el-image> -->
  272 + <div style="display: flex;">
  273 + <allimg v-if="item" :src="item" fit="contain" v-for="item in qfUrl.split(',')"
  274 + style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
  275 + </div>
  276 + </div>
  277 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  278 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  279 + @click="showQF =false">返回</el-button>
  280 + </div>
  281 + </div>
  282 +
  283 + </el-dialog>
  284 + <!-- 报名名单 -->
  285 + <el-dialog :visible.sync="baoming" title="报名名单" style="padding: 0;" width="55%" center :close-on-click-modal="false"
  286 + :show-close="false">
  287 + <div style="padding:20px;">
  288 + <div style="padding:20px;">
  289 + <el-table :data="mingList"
  290 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  291 + <el-table-column label="序号" min-width="150">
  292 + <template slot-scope="scope">
  293 + {{scope.$index +1 }}
  294 + </template>
  295 + </el-table-column>
  296 + <el-table-column label="联系人" prop="signUpName" min-width="150">
  297 +
  298 + </el-table-column>
  299 + <el-table-column label="联系电话" prop="signUpPhone" min-width="150">
  300 +
  301 + </el-table-column>
  302 + <el-table-column label="报名时间" prop="signUpTime" min-width="150">
  303 +
  304 + </el-table-column>
  305 + </el-table>
  306 + <div class="fenye">
  307 + <div style="line-height: 200%;">共{{mingtotal}}条</div>
  308 + <el-pagination :hide-on-single-page='flag' background :current-page="actPage.pageNumber"
  309 + layout="prev, pager, next" :total="mingtotal" @current-change="mingChange" />
  310 + </div>
  311 + </div>
  312 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  313 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  314 + @click="baoming =false">返回</el-button>
  315 + </div>
  316 + </div>
  317 +
  318 + </el-dialog>
  319 +
  320 + </div>
  321 +</template>
  322 +
  323 +<script>
  324 + import {
  325 + actSpAll,
  326 + actSpAdd,
  327 + actSpEdit,
  328 + actSpDel,
  329 + QRcode,
  330 + Registration
  331 + } from '../../api/actSp.js'
  332 + import wangEditor from "@/components/editor/index"
  333 + import upimg from "@/components/ImageUpload/index"
  334 + import TitleWithCircle from '@/components/top/index';
  335 + import {
  336 + uploadUrl
  337 + } from '@/utils/request'
  338 + import allimg from '@/components/chakan/allimg.vue';
  339 + export default {
  340 + components: {
  341 + wangEditor,
  342 + upimg,
  343 + TitleWithCircle,
  344 + allimg
  345 + },
  346 + data() {
  347 + return {
  348 + upload: uploadUrl,
  349 + plan_Time: [],
  350 + formSel: {
  351 + region: '',
  352 + pageNumber: 0,
  353 + pageSize: 10,
  354 + orderingRule: 3
  355 + },
  356 + secondData: {},
  357 + xiangqing: 0,
  358 + xiang: false,
  359 + currentPage: 1,
  360 + total: 0,
  361 + flag: false,
  362 + pageSize: 10,
  363 + tableData: [
  364 +
  365 + ],
  366 + pageindex: {
  367 + pageNumber: 0,
  368 + pageSize: 10,
  369 + orderingRule: 3
  370 + },
  371 + fileList: [],
  372 + actSpye: false, // 审核
  373 + actCard: '1',
  374 + MsgSp: false,
  375 + index: 0,
  376 + liuYe: 3, //3通过or4驳回
  377 + Liunie: false,
  378 + showQF: false,
  379 + qfUrl: '',
  380 + mingList: [],
  381 + mingtotal: 0,
  382 + baoming: false,
  383 + actPage: {
  384 + activityApplicationId: '',
  385 + pageNumber: 0,
  386 + pageSize: 10,
  387 + }
  388 +
  389 + }
  390 + },
  391 +
  392 + created() {
  393 + this.getAll()
  394 +
  395 + },
  396 + mounted() {
  397 +
  398 + },
  399 +
  400 + methods: {
  401 + //查询全数据
  402 + async getAll() {
  403 + const res = await actSpAll(this.pageindex)
  404 + this.tableData = res.data.content
  405 + this.total = res.data.content.length
  406 + },
  407 +
  408 + //查询
  409 + async onSubmit() {
  410 +
  411 + if (this.plan_Time.length != 0) {
  412 + this.formSel.startTime = this.plan_Time[0]
  413 + this.formSel.endTime = this.plan_Time[1]
  414 + }
  415 +
  416 + const res = await actSpAll(this.formSel)
  417 + this.tableData = res.data.content
  418 + this.total = res.data.content.length
  419 + },
  420 + //详情点击
  421 + handleEditForm(item, val) {
  422 + this.secondData = item
  423 + this.xiang = true
  424 + },
  425 + handleCurrentChange(val) {
  426 + this.currentPage = val
  427 + },
  428 + handleSizeChange(val) {
  429 + this.pageSize = val
  430 + },
  431 + closexaing(val) {
  432 + this.xiang = false
  433 + },
  434 + handleClick() {
  435 +
  436 + },
  437 + //重置按钮
  438 + resetting() {
  439 + this.formSel = {
  440 + region: '',
  441 + pageNumber: 1,
  442 + pageSize: 10,
  443 + }
  444 + this.plan_Time = []
  445 + this.getAll()
  446 + },
  447 + shenhe(item) {
  448 + this.actSpye = true
  449 + this.secondData = item
  450 + },
  451 + MsgShen(val) {
  452 + this.index = val
  453 + this.MsgSp = true
  454 + },
  455 + LiuYes(val) {
  456 + this.liuYe = val
  457 + this.Liunie = true
  458 + },
  459 + async OAshen() {
  460 + await actSpEdit({
  461 + id: this.secondData.id,
  462 + auditStatus: this.liuYe
  463 + })
  464 + this.actSpye = false
  465 + this.getAll()
  466 + },
  467 + Qcode(items) {
  468 + this.showQF = true
  469 + let pgs = {
  470 + scene: `item='${items.id}'`,
  471 + page: "pages/activityDetail/activityDetail"
  472 + }
  473 + QRcode(pgs).then(res => {
  474 + this.qfUrl = res.data
  475 + })
  476 + },
  477 + async getMing(ids) {
  478 + this.actPage.activityApplicationId = ids
  479 + this.actPage.pageNumber = 0
  480 + const res = await Registration(this.actPage)
  481 + this.mingList = res.data.content
  482 + this.mingtotal = res.data.totalElements
  483 +
  484 + this.baoming = true
  485 +
  486 + },
  487 + async mingChange(val) {
  488 + this.actPage.pageNumber = val
  489 + const res = await Registration(this.actPage)
  490 + this.mingList = res.data.content
  491 + this.mingtotal = res.data.totalElements
  492 +
  493 + }
  494 + }
  495 + }
  496 +</script>
  497 +<style scoped>
  498 + /deep/ .first-column-bg {
  499 + background-color: #f4f4f5 !important;
  500 + }
  501 +
  502 + .zhuti {
  503 + padding: 0 20px 20px 20px;
  504 + min-height: calc(100vh - 50px - 20px);
  505 + background-color: #Fff;
  506 +
  507 + }
  508 +
  509 + /deep/ .el-form-item__content {
  510 + line-height: 0;
  511 + }
  512 +
  513 + ::v-deep .xinForm .el-form-item__content {
  514 + line-height: 3;
  515 + }
  516 +
  517 + .tableBtn {
  518 + display: inline-block;
  519 + margin-right: 10px;
  520 + }
  521 +
  522 +
  523 +
  524 + .greens {
  525 + color: #3F9B6A;
  526 + }
  527 +
  528 +
  529 + .fenye {
  530 + margin-top: 20px;
  531 + display: flex;
  532 + justify-content: space-between;
  533 + position: relative;
  534 + }
  535 +
  536 + /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
  537 + background-color: #3F9B6A;
  538 + }
  539 +
  540 + .el-row {
  541 + margin-bottom: 20px;
  542 + }
  543 +
  544 + :last-child {
  545 + margin-bottom: 0;
  546 + }
  547 +
  548 + .el-col {
  549 + border-radius: 4px;
  550 + }
  551 +
  552 + .bg-purple-dark {
  553 + background: #99a9bf;
  554 + }
  555 +
  556 + .bg-purple {
  557 + /* background: #d3dce6; */
  558 + }
  559 +
  560 + .bg-purple-light {
  561 + background: #e5e9f2;
  562 + }
  563 +
  564 + .grid-content {
  565 + border-radius: 4px;
  566 + min-height: 36px;
  567 + }
  568 +
  569 + .row-bg {
  570 + padding: 10px 0;
  571 + background-color: #f9fafc;
  572 + }
  573 +
  574 + /deep/ .bg-purple[data-v-0e3fe4ec] {
  575 + background: #fff;
  576 + height: 50px;
  577 + }
  578 +
  579 + /deep/ .el-form--label-top .el-form-item__label {
  580 + padding: 0;
  581 + }
  582 +
  583 + .demo-input-suffix {
  584 + display: flex;
  585 + margin-right: 20px;
  586 + width: 83%;
  587 + }
  588 +
  589 + .pagination {
  590 + text-align: right;
  591 + line-height: 20px;
  592 + }
  593 +
  594 + /deep/ .el-pagination__total {
  595 + margin-top: 4px;
  596 + }
  597 +
  598 +
  599 + /deep/ .dialog_css {
  600 + margin-top: 11vh;
  601 + margin-left: 13%;
  602 + padding: 0px;
  603 +
  604 + .el-dialog__title {
  605 + font-size: 12px;
  606 + }
  607 + }
  608 +
  609 + /deep/.el-dialog__body {
  610 + padding: 0px;
  611 + }
  612 +
  613 + /deep/ .el-dialog__header {
  614 + background-color: #fff;
  615 + }
  616 +
  617 + /deep/.el-dialog__title {
  618 + color: #000;
  619 + }
  620 +
  621 + .el-row {
  622 + margin-bottom: 20px;
  623 +
  624 + &:last-child {
  625 + margin-bottom: 0;
  626 + }
  627 + }
  628 +
  629 + /deep/ .avatar-uploader .el-upload {
  630 + border: 1px dashed #d9d9d9;
  631 + border-radius: 6px;
  632 + cursor: pointer;
  633 + position: relative;
  634 + overflow: hidden;
  635 + }
  636 +
  637 + .avatar-uploader .el-upload:hover {
  638 + border-color: #409EFF;
  639 + }
  640 +
  641 + .avatar-uploader-icon {
  642 + font-size: 28px;
  643 + color: #8c939d;
  644 + width: 108px;
  645 + height: 108px;
  646 + line-height: 108px;
  647 + /*text-align: center;*/
  648 + }
  649 +
  650 + .avatar {
  651 + width: 108px;
  652 + height: 108px;
  653 + display: block;
  654 + }
  655 +
  656 + ::v-deep .el-tabs__item.is-active {
  657 + color: #3F9B6A;
  658 + opacity: 1;
  659 + }
  660 +
  661 + /deep/ .el-tabs__nav-wrap::after {
  662 + background-color: #fff;
  663 + }
  664 +
  665 + ::v-deep .el-tabs__item:hover {
  666 + color: #3F9B6A;
  667 + cursor: pointer;
  668 + opacity: 1;
  669 + }
  670 +
  671 + /deep/ .el-tabs__active-bar {
  672 + background-color: #389865;
  673 + }
  674 +
  675 + /deep/ .el-table_2_column_13 {
  676 + font-weight: 100;
  677 + }
  678 +
  679 + ::v-deep .el-input__inner:focus {
  680 + border: #3F9B6A 1px solid;
  681 + }
  682 +
  683 + ::v-deep .el-input__inner:hover {
  684 + border: #3F9B6A 1px solid;
  685 + }
  686 +
  687 + ::v-deep .el-select .el-input.is-focus .el-input__inner {
  688 + border-color: #3F9B6A
  689 + }
  690 +
  691 + ::v-deep .el-step__icon-inner {
  692 + line-height: 0
  693 + }
  694 +
  695 +
  696 +
  697 + ::v-deep .el-date-editor .el-range-separator {
  698 + line-height: 24px;
  699 + }
  700 +</style>
  701 +<style lang="scss" scoped>
  702 + ::v-deep .bian_css {
  703 + .el-dialog__header {
  704 + padding: 10px 20px 20px 20px;
  705 + }
  706 +
  707 + .el-dialog__body {
  708 + padding: 5px;
  709 + }
  710 + }
  711 +
  712 + ::v-deep .xinFrom {
  713 + .el-input--mini .el-input__inner {
  714 + height: 36px;
  715 + line-height: 36px;
  716 + }
  717 +
  718 + .el-range-editor--mini.el-input__inner {
  719 + height: 36px;
  720 + width: 100%;
  721 + }
  722 + }
  723 +
  724 + ::v-deep .buttonHover:hover {
  725 + color: #3f9b6a !important;
  726 + border-color: #c5e1d2 !important;
  727 + background-color: #ecf5f0 !important;
  728 + outline: none;
  729 + }
  730 +
  731 + ::v-deep .el-pagination__total {
  732 + position: absolute;
  733 + left: 10px;
  734 + }
  735 +
  736 + .formSearch {
  737 + display: flex;
  738 + width: 100%;
  739 + font-size: 14px;
  740 + justify-content: space-between;
  741 + margin-bottom: 20px;
  742 + }
  743 +
  744 + ::v-deep .shen_steps1 {
  745 + .is-process {
  746 + /* 待执行步骤颜色 */
  747 + color: #3F9B6A;
  748 + border: none;
  749 +
  750 + .el-step__icon {
  751 + background-color: #3F9B6A;
  752 + }
  753 +
  754 + .el-step__icon-inner {
  755 + color: #fff;
  756 + }
  757 +
  758 + .el-step__line {
  759 + background-color: #3F9B6A;
  760 + }
  761 +
  762 + }
  763 +
  764 + .is-finish {
  765 + color: #3F9B6A;
  766 + border: none;
  767 +
  768 + .el-step__icon {
  769 + background-color: #3F9B6A;
  770 + }
  771 +
  772 + .el-step__icon-inner {
  773 + color: #fff;
  774 + }
  775 +
  776 + .el-step__line {
  777 + background-color: #3F9B6A;
  778 + }
  779 + }
  780 +
  781 + }
  782 +
  783 + ::v-deep .liu_steps {
  784 + .step_start {
  785 + flex-basis: 15% !important;
  786 +
  787 + .is-finish {
  788 + border: none;
  789 + color: #3F9B6A;
  790 +
  791 + .el-step__icon {
  792 + background-color: #D3E6CC;
  793 + }
  794 +
  795 + .el-step__icon .is-text {
  796 + border: 2px solid #3F9B6A;
  797 + }
  798 +
  799 + .el-step__icon-inner {
  800 + display: none;
  801 + }
  802 +
  803 + .el-step__line {
  804 + border-color: #3F9B6A;
  805 + }
  806 + }
  807 +
  808 + .is-wait {
  809 +
  810 + border: none;
  811 + color: #000;
  812 +
  813 + .el-step__icon {
  814 + background-color: #fff;
  815 + }
  816 +
  817 + .el-step__icon .is-text {
  818 + border: 2px solid #000;
  819 + }
  820 +
  821 + .el-step__icon-inner {
  822 + display: none;
  823 + }
  824 +
  825 + .el-step__line {
  826 + background-color: #000;
  827 + }
  828 +
  829 + }
  830 +
  831 + .is-process {
  832 + border: none;
  833 + color: #000;
  834 +
  835 + .el-step__icon {
  836 + background-color: #fff;
  837 + }
  838 +
  839 + .el-step__icon .is-text {
  840 + border: 2px solid #000;
  841 + }
  842 +
  843 + .el-step__icon-inner {
  844 + display: none;
  845 + }
  846 +
  847 + .el-step__line {
  848 + background-color: #000;
  849 + }
  850 + }
  851 + }
  852 +
  853 + .step_buen {
  854 + flex-basis: 25% !important;
  855 +
  856 + .is-process {
  857 + .el-step__icon {
  858 + padding: 10px;
  859 + border-radius: 10px;
  860 + width: 120px;
  861 + height: 70px;
  862 + margin-top: -24px;
  863 + position: relative;
  864 + border: 2px solid #FABB41;
  865 + font-size: 12px;
  866 + }
  867 +
  868 + .el-step__icon .is-text {
  869 + padding: 10px;
  870 + border-radius: 10px;
  871 + border: 2px solid #FABB41;
  872 + font-size: 12px;
  873 + }
  874 + }
  875 +
  876 + .is-wait {
  877 + .el-step__icon {
  878 + padding: 10px;
  879 + border-radius: 10px;
  880 + width: 120px;
  881 + height: 70px;
  882 + margin-top: -24px;
  883 + position: relative;
  884 + border: 2px solid #C0C4CC;
  885 + font-size: 12px;
  886 + }
  887 +
  888 + .el-step__icon .is-text {
  889 + padding: 10px;
  890 + border-radius: 10px;
  891 + border: 2px solid #C0C4CC;
  892 + font-size: 12px;
  893 + }
  894 + }
  895 +
  896 + .is-finish {
  897 + .el-step__icon {
  898 + padding: 10px;
  899 + border-radius: 10px;
  900 + width: 120px;
  901 + height: 70px;
  902 + margin-top: -24px;
  903 + position: relative;
  904 + border: 2px solid #3F9B6A;
  905 + background-color: #D3E6CC;
  906 + font-size: 12px;
  907 + color: #3F9B6A;
  908 + }
  909 +
  910 + .el-step__icon .is-text {
  911 + padding: 10px;
  912 + border-radius: 10px;
  913 + border: 2px solid #3F9B6A;
  914 + font-size: 12px;
  915 + }
  916 +
  917 + .el-step__line {
  918 + background-color: #3F9B6A;
  919 + }
  920 + }
  921 + }
  922 +
  923 + ::v-deep .xiang_steps {
  924 + .is-process {
  925 + /* 待执行步骤颜色 */
  926 + color: #3F9B6A;
  927 + border: none;
  928 +
  929 + .el-step__icon {
  930 + background-color: #3F9B6A;
  931 + }
  932 +
  933 + .el-step__icon-inner {
  934 + color: #fff;
  935 + }
  936 +
  937 + .el-step__line {
  938 + background-color: #3F9B6A;
  939 + }
  940 +
  941 + }
  942 +
  943 + .is-finish {
  944 + color: #3F9B6A;
  945 + border: none;
  946 +
  947 + .el-step__icon {
  948 + background-color: #3F9B6A;
  949 + }
  950 +
  951 + .el-step__icon-inner {
  952 + color: #fff;
  953 + }
  954 +
  955 + .el-step__line {
  956 + border-color: #3F9B6A;
  957 + }
  958 + }
  959 +
  960 +
  961 + }
  962 + }
  963 +</style>
... ...
admin-web-master/src/views/serve/actSp.vue
  View file @981fc10
... ... @@ -10,9 +10,9 @@
10 10 <div class="formSearch">
11 11 <div class="demo-input-suffix">
12 12 <div style="width: 68px;height:36px;line-height:32px;">活动时间</div>
13   - <el-date-picker style="width:200px;margin-right:15px;" v-model="plan_Time" value-format="yyyy-MM-dd HH:mm:ss" prefix-icon="none"
14   - type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
15   - >
  13 + <el-date-picker style="width:200px;margin-right:15px;" v-model="plan_Time"
  14 + value-format="yyyy-MM-dd HH:mm:ss" prefix-icon="none" type="datetimerange" range-separator="-"
  15 + start-placeholder="开始日期" end-placeholder="结束日期">
16 16 </el-date-picker>
17 17 <div style="width: 68px;height:36px;line-height:32px;">举办区域</div>
18 18 <el-input v-model="formSel.region" placeholder="请输入" style="width:168px;" />
... ... @@ -27,22 +27,21 @@
27 27 </div>
28 28 <!-- 表格 -->
29 29 <el-table :data="tableData.slice((currentPage - 1) * pageSize, currentPage * pageSize)"
30   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
31   - >
  30 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
32 31 <el-table-column label="序号" width="100">
33 32 <template slot-scope="scope">
34 33 {{scope.$index + 1}}
35   - </template>
  34 + </template>
36 35 </el-table-column>
37   - <el-table-column label="活动名称" prop="activityName" min-width="200" >
  36 + <el-table-column label="活动名称" prop="activityName" min-width="200">
38 37  
39 38 </el-table-column>
40   - <el-table-column label="活动时间" prop="implementationTime" min-width="350" >
41   -<template slot-scope="scope">
  39 + <el-table-column label="活动时间" prop="implementationTime" min-width="350">
  40 + <template slot-scope="scope">
42 41 {{scope.row.startTime}}至{{scope.row.endTime}}
43   - </template>
  42 + </template>
44 43 </el-table-column>
45   - <el-table-column label="活动类型" prop="activityType" min-width="120" >
  44 + <el-table-column label="活动类型" prop="activityType" min-width="120">
46 45 </el-table-column>
47 46 <el-table-column prop="region" label="举办区域" min-width="150">
48 47 </el-table-column>
... ... @@ -59,273 +58,277 @@
59 58 <template slot-scope="scope">
60 59 <div @click="handleEditForm(scope.row,1)" class="tableBtn greens">查看</div>
61 60 <div @click="shenhe(scope.row)" class="tableBtn greens" v-if="scope.row.auditStatus =='2'">审核</div>
62   - <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.auditStatus =='3'">报名名单</div>
63   - <div @click="Qcode(scope.row)" class="tableBtn greens" >活动二维码</div>
  61 + <div @click="getMing(scope.row.id)" class="tableBtn greens" v-if="scope.row.auditStatus =='3'">报名名单</div>
  62 + <div @click="Qcode(scope.row)" class="tableBtn greens">活动二维码</div>
64 63 </template>
65 64 </el-table-column>
66 65 </el-table>
67 66 <div class="fenye">
68   - <div style="line-height: 200%;">共{{total}}条</div>
  67 + <div style="line-height: 200%;">共{{total}}条</div>
69 68 <el-pagination class="pagination" :hide-on-single-page="flag" background small :current-page="currentPage"
70   - :page-sizes="[10, 20, 50, 100]" layout="prev, pager,next" :total="total "
71   - @size-change="handleSizeChange" @current-change="handleCurrentChange" />
  69 + :page-sizes="[10, 20, 50, 100]" layout="prev, pager,next" :total="total " @size-change="handleSizeChange"
  70 + @current-change="handleCurrentChange" />
72 71 </div>
73 72 </div>
74 73 </div>
75 74  
76   -<div class="zhuti" v-if='xiang'>
77   - <div style="height:58px;line-height:58px;">
78   - <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
79   - style="color:#000000e6">查看</span></div>
80   - </div>
81   - <div style="margin-top: 30px;" class="editcss">
82   - <TitleWithCircle title="活动信息"></TitleWithCircle>
83   - <div style="padding: 20px;">
84   - <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
85   - <el-row :gutter="20">
86   - <el-col :span="12">
87   - <el-form-item label="活动名称" prop="activityName">
88   - <div class="duiqi">{{secondData.activityName}}</div>
89   - </el-form-item>
90   - </el-col>
91   - <el-col :span="12">
92   - <el-form-item label="活动类型" prop="activityType">
93   - <div class="duiqi">{{secondData.activityType}}</div>
94   -
95   - </el-form-item>
96   -
97   - </el-col>
98   - </el-row>
99   - <el-row :gutter="20">
100   - <el-col :span="12">
101   - <el-form-item label="活动开始时间" prop="startTime">
102   - <div class="duiqi">{{secondData.startTime}}</div>
103   - </el-form-item>
104   -
105   - </el-col>
106   - <el-col :span="12">
107   - <el-form-item label="活动结束时间" prop="endTime">
108   - <div class="duiqi">{{secondData.endTime}}</div>
109   - </el-form-item>
110   - </el-col>
111   - </el-row>
112   -
113   - <el-row :gutter="20">
114   - <el-col :span="12">
115   - <el-form-item label="可参与人数" prop="maxParticipants">
116   - <div class="duiqi">{{secondData.maxParticipants}}</div>
117   - </el-form-item>
118   - </el-col>
119   -<el-col :span="12">
120   - <el-form-item label="举办区域" prop="region">
121   - <div class="duiqi">{{secondData.region}}</div>
122   - </el-form-item>
123   - </el-col>
124   - </el-row>
125   - <el-row :gutter="20">
126   -
127   - <el-col :span="12">
128   - <el-form-item label="活动内容" prop="content">
129   - <div class="duiqi">{{secondData.content}}</div>
130   - </el-form-item>
131   - </el-col>
132   - <el-col :span="12">
133   - <el-form-item label="审核状态" prop="businessScope">
134   -
135   - <div class="duiqi">{{secondData.auditStatus =='1'?'待提交':secondData.auditStatus =='2'?'待审核':secondData.auditStatus =='3'?'审核通过':secondData.auditStatus =='4'?'审核驳回':''}}</div>
136   - </el-form-item>
137   - </el-col>
138   - </el-row>
139   - <el-row :gutter="20">
140   - <el-col :span="12">
141   - <el-form-item label="活动照片" prop="coverImage">
142   - <!-- {{idCardPhotoFront}} -->
143   - <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
144   - <div style="display: flex;">
145   - <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;"/>
146   - </div>
147   - </el-form-item>
148   - </el-col>
149   - </el-row>
150   - </el-form>
151   - </div>
152   - </div>
153   - <el-row :gutter="20">
154   - <el-col :span="12">
155   - <div style="padding-left:160px;">
156   - <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
157   - @click="xiang = false">取消</el-button>
158   - </div>
159   -
160   - </el-col>
161   - </el-row>
162   - </div>
163   - <div class="zhuti" v-if='actSpye'>
164   - <div style="height:58px;line-height:58px;">
165   - <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
166   - style="color:#000000e6">审核</span></div>
  75 + <div class="zhuti" v-if='xiang'>
  76 + <div style="height:58px;line-height:58px;">
  77 + <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
  78 + style="color:#000000e6">查看</span></div>
  79 + </div>
  80 + <div style="margin-top: 30px;" class="editcss">
  81 + <TitleWithCircle title="活动信息"></TitleWithCircle>
  82 + <div style="padding: 20px;">
  83 + <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
  84 + <el-row :gutter="20">
  85 + <el-col :span="12">
  86 + <el-form-item label="活动名称" prop="activityName">
  87 + <div class="duiqi">{{secondData.activityName}}</div>
  88 + </el-form-item>
  89 + </el-col>
  90 + <el-col :span="12">
  91 + <el-form-item label="活动类型" prop="activityType">
  92 + <div class="duiqi">{{secondData.activityType}}</div>
  93 +
  94 + </el-form-item>
  95 +
  96 + </el-col>
  97 + </el-row>
  98 + <el-row :gutter="20">
  99 + <el-col :span="12">
  100 + <el-form-item label="活动开始时间" prop="startTime">
  101 + <div class="duiqi">{{secondData.startTime}}</div>
  102 + </el-form-item>
  103 +
  104 + </el-col>
  105 + <el-col :span="12">
  106 + <el-form-item label="活动结束时间" prop="endTime">
  107 + <div class="duiqi">{{secondData.endTime}}</div>
  108 + </el-form-item>
  109 + </el-col>
  110 + </el-row>
  111 +
  112 + <el-row :gutter="20">
  113 + <el-col :span="12">
  114 + <el-form-item label="可参与人数" prop="maxParticipants">
  115 + <div class="duiqi">{{secondData.maxParticipants}}</div>
  116 + </el-form-item>
  117 + </el-col>
  118 + <el-col :span="12">
  119 + <el-form-item label="举办区域" prop="region">
  120 + <div class="duiqi">{{secondData.region}}</div>
  121 + </el-form-item>
  122 + </el-col>
  123 + </el-row>
  124 + <el-row :gutter="20">
  125 +
  126 + <el-col :span="12">
  127 + <el-form-item label="活动内容" prop="content">
  128 + <div class="duiqi">{{secondData.content}}</div>
  129 + </el-form-item>
  130 + </el-col>
  131 + <el-col :span="12">
  132 + <el-form-item label="审核状态" prop="businessScope">
  133 +
  134 + <div class="duiqi">
  135 + {{secondData.auditStatus =='1'?'待提交':secondData.auditStatus =='2'?'待审核':secondData.auditStatus =='3'?'审核通过':secondData.auditStatus =='4'?'审核驳回':''}}
  136 + </div>
  137 + </el-form-item>
  138 + </el-col>
  139 + </el-row>
  140 + <el-row :gutter="20">
  141 + <el-col :span="12">
  142 + <el-form-item label="活动照片" prop="coverImage">
  143 + <!-- {{idCardPhotoFront}} -->
  144 + <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
  145 + <div style="display: flex;">
  146 + <allimg v-if="item" :src="item" fit="contain" v-for="item in secondData.coverImage.split(',')"
  147 + style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
167 148 </div>
168   - <div style="margin-top: 30px;" class="editcss">
169   - <TitleWithCircle title="活动信息"></TitleWithCircle>
170   - <div style="padding: 20px;">
171   - <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
172   - <el-row :gutter="20">
173   - <el-col :span="12">
174   - <el-form-item label="活动名称" prop="activityName">
175   - <div class="duiqi">{{secondData.activityName}}</div>
176   - </el-form-item>
177   - </el-col>
178   - <el-col :span="12">
179   - <el-form-item label="活动类型" prop="activityType">
180   - <div class="duiqi">{{secondData.activityType}}</div>
181   -
182   - </el-form-item>
183   -
184   - </el-col>
185   - </el-row>
186   - <el-row :gutter="20">
187   - <el-col :span="12">
188   - <el-form-item label="活动开始时间" prop="startTime">
189   - <div class="duiqi">{{secondData.startTime}}</div>
190   - </el-form-item>
191   -
192   - </el-col>
193   - <el-col :span="12">
194   - <el-form-item label="活动结束时间" prop="endTime">
195   - <div class="duiqi">{{secondData.endTime}}</div>
196   - </el-form-item>
197   - </el-col>
198   - </el-row>
199   -
200   - <el-row :gutter="20">
201   - <el-col :span="12">
202   - <el-form-item label="可参与人数" prop="maxParticipants">
203   - <div class="duiqi">{{secondData.maxParticipants}}</div>
204   - </el-form-item>
205   - </el-col>
  149 + </el-form-item>
  150 + </el-col>
  151 + </el-row>
  152 + </el-form>
  153 + </div>
  154 + </div>
  155 + <el-row :gutter="20">
206 156 <el-col :span="12">
207   - <el-form-item label="举办区域" prop="region">
208   - <div class="duiqi">{{secondData.region}}</div>
209   - </el-form-item>
210   - </el-col>
211   - </el-row>
212   - <el-row :gutter="20">
213   -
214   - <el-col :span="12">
215   - <el-form-item label="活动内容" prop="content">
216   - <div class="duiqi">{{secondData.content}}</div>
217   - </el-form-item>
218   - </el-col>
219   -
220   - </el-row>
221   - <el-row :gutter="20">
222   - <el-col :span="12">
223   - <el-form-item label="活动照片" prop="coverImage">
224   - <!-- {{idCardPhotoFront}} -->
225   - <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
226   - <div style="display: flex;">
227   - <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;"/>
228   - </div>
229   - </el-form-item>
230   - </el-col>
231   - </el-row>
232   - <el-row :gutter="20">
233   - <el-col :span="12">
234   - <el-form-item label="审核状态" prop="businessScope">
235   - <el-radio-group v-model="liuYe" style="line-height:40px">
236   - <el-radio :label="3">通过</el-radio>
237   - <el-radio :label="4">不通过</el-radio>
238   - </el-radio-group>
239   -
240   - </el-form-item>
241   - </el-col>
242   - </el-row>
243   -
244   - </el-form>
245   - </div>
246   - </div>
  157 + <div style="padding-left:160px;">
  158 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  159 + @click="xiang = false">取消</el-button>
  160 + </div>
  161 +
  162 + </el-col>
  163 + </el-row>
  164 + </div>
  165 + <div class="zhuti" v-if='actSpye'>
  166 + <div style="height:58px;line-height:58px;">
  167 + <div style="color:#0006"> <span>客服服务管理</span> <span style="padding:0 5px;">></span> <span
  168 + style="color:#000000e6">审核</span></div>
  169 + </div>
  170 + <div style="margin-top: 30px;" class="editcss">
  171 + <TitleWithCircle title="活动信息"></TitleWithCircle>
  172 + <div style="padding: 20px;">
  173 + <el-form :model="secondData" ref="ruleForm" label-width="150px" class="demo-ruleForm">
  174 + <el-row :gutter="20">
  175 + <el-col :span="12">
  176 + <el-form-item label="活动名称" prop="activityName">
  177 + <div class="duiqi">{{secondData.activityName}}</div>
  178 + </el-form-item>
  179 + </el-col>
  180 + <el-col :span="12">
  181 + <el-form-item label="活动类型" prop="activityType">
  182 + <div class="duiqi">{{secondData.activityType}}</div>
  183 +
  184 + </el-form-item>
  185 +
  186 + </el-col>
  187 + </el-row>
  188 + <el-row :gutter="20">
  189 + <el-col :span="12">
  190 + <el-form-item label="活动开始时间" prop="startTime">
  191 + <div class="duiqi">{{secondData.startTime}}</div>
  192 + </el-form-item>
  193 +
  194 + </el-col>
  195 + <el-col :span="12">
  196 + <el-form-item label="活动结束时间" prop="endTime">
  197 + <div class="duiqi">{{secondData.endTime}}</div>
  198 + </el-form-item>
  199 + </el-col>
  200 + </el-row>
  201 +
247 202 <el-row :gutter="20">
248   - <el-col :span="12">
249   - <div style="padding-left:160px;">
250   - <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
251   - @click="actSpye = false">取消</el-button>
252   - <el-button @click="OAshen"
253   - style="background-color: #3F9B6A;color: #fff;">确定</el-button>
254   - </div>
255   -
256   - </el-col>
257   - </el-row>
258   - </div>
259   -
260   - <el-dialog :visible.sync="showQF" title="活动二维码" style="padding: 0;" width="25%" center
261   - :close-on-click-modal="false" :show-close="false">
262   - <div style="padding:20px;">
263   -
264   - <div style="padding:20px;">
265   - <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
266   - <!-- <el-image
  203 + <el-col :span="12">
  204 + <el-form-item label="可参与人数" prop="maxParticipants">
  205 + <div class="duiqi">{{secondData.maxParticipants}}</div>
  206 + </el-form-item>
  207 + </el-col>
  208 + <el-col :span="12">
  209 + <el-form-item label="举办区域" prop="region">
  210 + <div class="duiqi">{{secondData.region}}</div>
  211 + </el-form-item>
  212 + </el-col>
  213 + </el-row>
  214 + <el-row :gutter="20">
  215 +
  216 + <el-col :span="12">
  217 + <el-form-item label="活动内容" prop="content">
  218 + <div class="duiqi">{{secondData.content}}</div>
  219 + </el-form-item>
  220 + </el-col>
  221 +
  222 + </el-row>
  223 + <el-row :gutter="20">
  224 + <el-col :span="12">
  225 + <el-form-item label="活动照片" prop="coverImage">
  226 + <!-- {{idCardPhotoFront}} -->
  227 + <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
  228 + <div style="display: flex;">
  229 + <allimg v-if="item" :src="item" fit="contain" v-for="item in secondData.coverImage.split(',')"
  230 + style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
  231 + </div>
  232 + </el-form-item>
  233 + </el-col>
  234 + </el-row>
  235 + </el-form>
  236 + </div>
  237 + </div>
  238 + <TitleWithCircle title="审核情况"></TitleWithCircle>
  239 + <div style="padding: 20px;">
  240 + <el-form :model="info" label-width="130px" class="demo-ruleForm">
  241 + <el-form-item label="审核状态">
  242 + <el-radio v-model="liuYe" :label="3">同意</el-radio>
  243 + <el-radio v-model="liuYe" :label="4">拒绝</el-radio>
  244 + </el-form-item>
  245 + <el-form-item label="审核意见">
  246 + <el-input maxlength="200" show-word-limit rows="4" v-model="auditOpinion" placeholder="请输入审核意见"
  247 + type="textarea" />
  248 + </el-form-item>
  249 + </el-form>
  250 + </div>
  251 + <el-row :gutter="20">
  252 + <el-col :span="12">
  253 + <div style="padding-left:160px;">
  254 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  255 + @click="actSpye = false">取消</el-button>
  256 + <el-button @click="OAshen" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
  257 + </div>
  258 +
  259 + </el-col>
  260 + </el-row>
  261 + </div>
  262 +
  263 + <el-dialog :visible.sync="showQF" title="活动二维码" style="padding: 0;" width="25%" center :close-on-click-modal="false"
  264 + :show-close="false">
  265 + <div style="padding:20px;">
  266 +
  267 + <div style="padding:20px;">
  268 + <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
  269 + <!-- <el-image
267 270 style="width:200px; height: 200px"
268 271 :src="$baseURL+qfUrl"
269 272 fit="fill"></el-image> -->
270   - <div style="display: flex;">
271   - <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;"/>
272   - </div>
273   - </div>
274   - <div style="padding-top:20px;display:flex;justify-content: flex-end;">
275   - <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
276   - @click="showQF =false">返回</el-button>
277   - </div>
278   - </div>
279   -
280   - </el-dialog>
281   - <!-- 报名名单 -->
282   - <el-dialog :visible.sync="baoming" title="报名名单" style="padding: 0;" width="55%" center
283   - :close-on-click-modal="false" :show-close="false">
284   - <div style="padding:20px;">
285   - <div style="padding:20px;">
286   - <el-table :data="mingList"
287   - :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
288   - <el-table-column label="序号" min-width="150">
289   - <template slot-scope="scope">
290   - {{scope.$index +1 }}
291   - </template>
292   - </el-table-column>
293   - <el-table-column label="联系人" prop="signUpName" min-width="150">
294   -
295   - </el-table-column>
296   - <el-table-column label="联系电话" prop="signUpPhone" min-width="150">
297   -
298   - </el-table-column>
299   - <el-table-column label="报名时间" prop="signUpTime" min-width="150">
300   -
301   - </el-table-column>
302   - </el-table>
303   - <div class="fenye">
304   - <div style="line-height: 200%;">共{{mingtotal}}条</div>
305   - <el-pagination :hide-on-single-page='flag' background :current-page="actPage.pageNumber"
306   - layout="prev, pager, next" :total="mingtotal"
307   - @current-change="mingChange" />
308   - </div>
309   - </div>
310   - <div style="padding-top:20px;display:flex;justify-content: flex-end;">
311   - <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
312   - @click="baoming =false">返回</el-button>
313   - </div>
314   - </div>
315   -
316   - </el-dialog>
317   -
  273 + <div style="display: flex;">
  274 + <allimg v-if="item" :src="item" fit="contain" v-for="item in qfUrl.split(',')"
  275 + style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;" />
  276 + </div>
  277 + </div>
  278 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  279 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  280 + @click="showQF =false">返回</el-button>
  281 + </div>
  282 + </div>
  283 +
  284 + </el-dialog>
  285 + <!-- 报名名单 -->
  286 + <el-dialog :visible.sync="baoming" title="报名名单" style="padding: 0;" width="55%" center :close-on-click-modal="false"
  287 + :show-close="false">
  288 + <div style="padding:20px;">
  289 + <div style="padding:20px;">
  290 + <el-table :data="mingList"
  291 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
  292 + <el-table-column label="序号" min-width="150">
  293 + <template slot-scope="scope">
  294 + {{scope.$index +1 }}
  295 + </template>
  296 + </el-table-column>
  297 + <el-table-column label="联系人" prop="signUpName" min-width="150">
  298 +
  299 + </el-table-column>
  300 + <el-table-column label="联系电话" prop="signUpPhone" min-width="150">
  301 +
  302 + </el-table-column>
  303 + <el-table-column label="报名时间" prop="signUpTime" min-width="150">
  304 +
  305 + </el-table-column>
  306 + </el-table>
  307 + <div class="fenye">
  308 + <div style="line-height: 200%;">共{{mingtotal}}条</div>
  309 + <el-pagination :hide-on-single-page='flag' background :current-page="actPage.pageNumber"
  310 + layout="prev, pager, next" :total="mingtotal" @current-change="mingChange" />
  311 + </div>
  312 + </div>
  313 + <div style="padding-top:20px;display:flex;justify-content: flex-end;">
  314 + <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
  315 + @click="baoming =false">返回</el-button>
  316 + </div>
  317 + </div>
  318 +
  319 + </el-dialog>
  320 +
318 321 </div>
319 322 </template>
320 323  
321 324 <script>
322 325 import {
323   - actSpAll,
324   - actSpAdd,
325   - actSpEdit,
326   - actSpDel,
327   - QRcode,
328   - Registration
  326 + actSpAll,
  327 + actSpAdd,
  328 + actSpEdit,
  329 + actSpDel,
  330 + QRcode,
  331 + Registration
329 332 } from '../../api/actSp.js'
330 333 import wangEditor from "@/components/editor/index"
331 334 import upimg from "@/components/ImageUpload/index"
... ... @@ -335,20 +338,26 @@
335 338 } from '@/utils/request'
336 339 import allimg from '@/components/chakan/allimg.vue';
337 340 export default {
338   - components: { wangEditor ,upimg,TitleWithCircle,allimg},
  341 + components: {
  342 + wangEditor,
  343 + upimg,
  344 + TitleWithCircle,
  345 + allimg
  346 + },
339 347 data() {
340 348 return {
341   - upload:uploadUrl,
342   - plan_Time:[],
  349 + auditOpinion:'',
  350 + upload: uploadUrl,
  351 + plan_Time: [],
343 352 formSel: {
344   - region:'',
345   - pageNumber:0,
  353 + region: '',
  354 + pageNumber: 0,
346 355 pageSize: 10,
347   - orderingRule:3
  356 + orderingRule: 3
348 357 },
349 358 secondData: {},
350   - xiangqing:0,
351   - xiang:false,
  359 + xiangqing: 0,
  360 + xiang: false,
352 361 currentPage: 1,
353 362 total: 0,
354 363 flag: false,
... ... @@ -359,26 +368,26 @@
359 368 pageindex: {
360 369 pageNumber: 0,
361 370 pageSize: 10,
362   - orderingRule:3
  371 + orderingRule: 3
363 372 },
364 373 fileList: [],
365 374 actSpye: false, // 审核
366   - actCard:'1',
367   - MsgSp:false,
368   - index:0,
369   - liuYe:3,//3通过or4驳回
370   - Liunie:false,
371   - showQF:false,
372   - qfUrl:'',
373   - mingList:[],
374   - mingtotal:0,
375   - baoming:false,
376   - actPage:{
377   - activityApplicationId:'',
378   - pageNumber:0,
379   - pageSize:10,
380   - }
381   -
  375 + actCard: '1',
  376 + MsgSp: false,
  377 + index: 0,
  378 + liuYe: 3, //3通过or4驳回
  379 + Liunie: false,
  380 + showQF: false,
  381 + qfUrl: '',
  382 + mingList: [],
  383 + mingtotal: 0,
  384 + baoming: false,
  385 + actPage: {
  386 + activityApplicationId: '',
  387 + pageNumber: 0,
  388 + pageSize: 10,
  389 + }
  390 +
382 391 }
383 392 },
384 393  
... ... @@ -401,17 +410,17 @@
401 410 //查询
402 411 async onSubmit() {
403 412  
404   - if(this.plan_Time.length != 0){
405   - this.formSel.startTime = this.plan_Time[0]
406   - this.formSel.endTime = this.plan_Time[1]
  413 + if (this.plan_Time.length != 0) {
  414 + this.formSel.startTime = this.plan_Time[0]
  415 + this.formSel.endTime = this.plan_Time[1]
407 416 }
408 417  
409   - const res= await actSpAll(this.formSel)
410   - this.tableData = res.data.content
411   -this.total = res.data.content.length
  418 + const res = await actSpAll(this.formSel)
  419 + this.tableData = res.data.content
  420 + this.total = res.data.content.length
412 421 },
413 422 //详情点击
414   - handleEditForm(item,val) {
  423 + handleEditForm(item, val) {
415 424 this.secondData = item
416 425 this.xiang = true
417 426 },
... ... @@ -421,7 +430,7 @@ this.total = res.data.content.length
421 430 handleSizeChange(val) {
422 431 this.pageSize = val
423 432 },
424   - closexaing(val){
  433 + closexaing(val) {
425 434 this.xiang = false
426 435 },
427 436 handleClick() {
... ... @@ -430,57 +439,77 @@ this.total = res.data.content.length
430 439 //重置按钮
431 440 resetting() {
432 441 this.formSel = {
433   - region:'',
  442 + region: '',
434 443 pageNumber: 1,
435 444 pageSize: 10,
436 445 }
437 446 this.plan_Time = []
438   - this.getAll()
  447 + this.getAll()
439 448 },
440   - shenhe(item){
441   - this.actSpye = true
442   - this.secondData = item
  449 + shenhe(item) {
  450 + this.actSpye = true
  451 + this.secondData = item
443 452 },
444   - MsgShen(val){
445   - this.index = val
446   - this.MsgSp =true
  453 + MsgShen(val) {
  454 + this.index = val
  455 + this.MsgSp = true
447 456 },
448   - LiuYes(val){
  457 + LiuYes(val) {
449 458 this.liuYe = val
450 459 this.Liunie = true
451 460 },
452   - async OAshen(){
453   - await actSpEdit({id:this.secondData.id,auditStatus:this.liuYe})
  461 + async OAshen() {
  462 + await actSpEdit({
  463 + id: this.secondData.id,
  464 + auditStatus: this.liuYe,
  465 + auditOpinion:this.auditOpinion
  466 + })
454 467 this.actSpye = false
  468 + this.setmsg()
455 469 this.getAll()
456 470 },
457   - Qcode(items){
  471 + async setmsg() {
  472 +
  473 + let t2 = '您的'+this.secondData.activityName+'活动申请已通过，祝您生意兴隆'
  474 + let t3 = '很抱歉，您的'+this.secondData.activityName+'活动申请未通过审核。原因说明：'+this.auditOpinion+'。请您根据审核意见修改资料后重新提交申请，感谢您的配合。'
  475 + let info = {
  476 + type: '通知消息',
  477 + phone: this.secondData.createUser,
  478 + content: {
  479 + type: '1',
  480 + title: this.liuYe == '3' ?'活动申请已通过': this.liuYe == '4' ?'活动申请未通过': '-',
  481 + content: this.liuYe == '3' ?t2: this.liuYe == '4' ?t3: '-'
  482 + },
  483 + }
  484 + await this.$setmsg(info);
  485 + },
  486 + Qcode(items) {
458 487 this.showQF = true
459   - let pgs={
460   - scene:`item='${items.id}'`,
461   - page:"pages/activityDetail/activityDetail"
  488 + let pgs = {
  489 + scene: `item='${items.id}'`,
  490 + page: "pages/activityDetail/activityDetail"
462 491 }
463   - QRcode(pgs).then(res=>{
464   - this.qfUrl = res.data
465   - })
  492 + QRcode(pgs).then(res => {
  493 + this.qfUrl = res.data
  494 + })
  495 + },
  496 + async getMing(ids) {
  497 + this.actPage.activityApplicationId = ids
  498 + this.actPage.pageNumber = 0
  499 + const res = await Registration(this.actPage)
  500 + this.mingList = res.data.content
  501 + this.mingtotal = res.data.totalElements
  502 +
  503 + this.baoming = true
  504 +
466 505 },
467   - async getMing(ids) {
468   - this.actPage.activityApplicationId=ids
469   - this.actPage.pageNumber = 0
470   - const res = await Registration(this.actPage)
471   - this.mingList = res.data.content
472   - this.mingtotal = res.data.totalElements
473   -
474   - this.baoming = true
475   -
476   - },
477   - async mingChange(val){
478   - this.actPage.pageNumber = val
479   - const res = await Registration(this.actPage)
480   - this.mingList = res.data.content
481   - this.mingtotal = res.data.totalElements
482   -
483   - }
  506 + async mingChange(val) {
  507 + this.actPage.pageNumber = val
  508 + const res = await Registration(this.actPage)
  509 + this.mingList = res.data.content
  510 + this.mingtotal = res.data.totalElements
  511 +
  512 + }
484 513 }
485 514 }
486 515 </script>
... ... @@ -496,13 +525,13 @@ this.total = res.data.content.length
496 525  
497 526 }
498 527  
499   - /deep/ .el-form-item__content {
  528 + /* /deep/ .el-form-item__content {
500 529 line-height: 0;
501 530 }
502 531  
503 532 ::v-deep .xinForm .el-form-item__content {
504 533 line-height: 3;
505   - }
  534 + } */
506 535  
507 536 .tableBtn {
508 537 display: inline-block;
... ... @@ -586,15 +615,15 @@ this.total = res.data.content.length
586 615 }
587 616  
588 617  
589   - /deep/ .dialog_css {
590   - margin-top: 11vh;
591   - margin-left: 13%;
592   - padding: 0px;
  618 + /deep/ .dialog_css {
  619 + margin-top: 11vh;
  620 + margin-left: 13%;
  621 + padding: 0px;
593 622  
594   - .el-dialog__title {
595   - font-size: 12px;
596   - }
597   - }
  623 + .el-dialog__title {
  624 + font-size: 12px;
  625 + }
  626 + }
598 627  
599 628 /deep/.el-dialog__body {
600 629 padding: 0px;
... ... @@ -687,221 +716,266 @@ this.total = res.data.content.length
687 716 ::v-deep .el-date-editor .el-range-separator {
688 717 line-height: 24px;
689 718 }
690   -
691 719 </style>
692 720 <style lang="scss" scoped>
693 721 ::v-deep .bian_css {
694 722 .el-dialog__header {
695   - padding: 10px 20px 20px 20px;
  723 + padding: 10px 20px 20px 20px;
  724 + }
  725 +
  726 + .el-dialog__body {
  727 + padding: 5px;
696 728 }
697   - .el-dialog__body{
698   - padding:5px;
699   - }
700 729 }
701 730  
702   - ::v-deep .xinFrom{
703   - .el-input--mini .el-input__inner{
704   - height:36px;
705   - line-height:36px;
  731 + ::v-deep .xinFrom {
  732 + .el-input--mini .el-input__inner {
  733 + height: 36px;
  734 + line-height: 36px;
706 735 }
707   - .el-range-editor--mini.el-input__inner{
708   - height:36px;
709   - width:100%;
  736 +
  737 + .el-range-editor--mini.el-input__inner {
  738 + height: 36px;
  739 + width: 100%;
710 740 }
711 741 }
712   - ::v-deep .buttonHover:hover{
713   - color:#3f9b6a !important;
  742 +
  743 + ::v-deep .buttonHover:hover {
  744 + color: #3f9b6a !important;
714 745 border-color: #c5e1d2 !important;
715 746 background-color: #ecf5f0 !important;
716 747 outline: none;
717 748 }
718   -::v-deep .el-pagination__total {
  749 +
  750 + ::v-deep .el-pagination__total {
719 751 position: absolute;
720 752 left: 10px;
721 753 }
722   -.formSearch {
  754 +
  755 + .formSearch {
723 756 display: flex;
724 757 width: 100%;
725 758 font-size: 14px;
726 759 justify-content: space-between;
727   - margin-bottom:20px;
  760 + margin-bottom: 20px;
728 761 }
  762 +
729 763 ::v-deep .shen_steps1 {
730   - .is-process { /* 待执行步骤颜色 */
731   - color: #3F9B6A;
732   - border:none;
733   - .el-step__icon{
734   - background-color: #3F9B6A;
735   - }
736   - .el-step__icon-inner{
737   - color:#fff;
738   - }
739   - .el-step__line{
740   - background-color: #3F9B6A;
741   - }
  764 + .is-process {
  765 + /* 待执行步骤颜色 */
  766 + color: #3F9B6A;
  767 + border: none;
  768 +
  769 + .el-step__icon {
  770 + background-color: #3F9B6A;
  771 + }
  772 +
  773 + .el-step__icon-inner {
  774 + color: #fff;
  775 + }
  776 +
  777 + .el-step__line {
  778 + background-color: #3F9B6A;
  779 + }
742 780  
743 781 }
744   - .is-finish{
  782 +
  783 + .is-finish {
745 784 color: #3F9B6A;
746   - border:none;
747   - .el-step__icon{
748   - background-color: #3F9B6A;
  785 + border: none;
  786 +
  787 + .el-step__icon {
  788 + background-color: #3F9B6A;
749 789 }
750   - .el-step__icon-inner{
751   - color:#fff;
  790 +
  791 + .el-step__icon-inner {
  792 + color: #fff;
752 793 }
753   - .el-step__line{
  794 +
  795 + .el-step__line {
754 796 background-color: #3F9B6A;
755 797 }
756 798 }
757 799  
758 800 }
759 801  
760   - ::v-deep .liu_steps{
761   - .step_start{
762   - flex-basis:15% !important;
763   - .is-finish{
  802 + ::v-deep .liu_steps {
  803 + .step_start {
  804 + flex-basis: 15% !important;
  805 +
  806 + .is-finish {
764 807 border: none;
765   - color: #3F9B6A;
766   - .el-step__icon{
767   - background-color: #D3E6CC;
768   - }
769   - .el-step__icon .is-text{
770   - border: 2px solid #3F9B6A;
771   - }
772   - .el-step__icon-inner{
773   - display: none;
774   - }
775   - .el-step__line{
776   - border-color: #3F9B6A;
777   - }
778   - }
779   - .is-wait{
780   -
781   - border: none;
782   - color: #000;
783   - .el-step__icon{
784   - background-color: #fff;
785   - }
786   - .el-step__icon .is-text{
787   - border: 2px solid #000;
788   - }
789   - .el-step__icon-inner{
790   - display: none;
791   - }
792   - .el-step__line{
793   - background-color: #000;
794   - }
795   -
796   - }
797   - .is-process{
  808 + color: #3F9B6A;
  809 +
  810 + .el-step__icon {
  811 + background-color: #D3E6CC;
  812 + }
  813 +
  814 + .el-step__icon .is-text {
  815 + border: 2px solid #3F9B6A;
  816 + }
  817 +
  818 + .el-step__icon-inner {
  819 + display: none;
  820 + }
  821 +
  822 + .el-step__line {
  823 + border-color: #3F9B6A;
  824 + }
  825 + }
  826 +
  827 + .is-wait {
  828 +
798 829 border: none;
799   - color: #000;
800   - .el-step__icon{
801   - background-color: #fff;
802   - }
803   - .el-step__icon .is-text{
804   - border: 2px solid #000;
805   - }
806   - .el-step__icon-inner{
807   - display: none;
808   - }
809   - .el-step__line{
810   - background-color: #000;
811   - }
812   - }
813   - }
814   - .step_buen{
815   - flex-basis:25% !important;
816   - .is-process{
817   - .el-step__icon{
818   - padding: 10px;
819   - border-radius:10px;
820   - width:120px;
821   - height:70px;
822   - margin-top:-24px;
823   - position: relative;
824   - border: 2px solid #FABB41;
825   - font-size: 12px;
826   - }
827   - .el-step__icon .is-text{
828   - padding: 10px;
829   - border-radius:10px;
830   - border: 2px solid #FABB41;
831   - font-size: 12px;
832   - }
  830 + color: #000;
  831 +
  832 + .el-step__icon {
  833 + background-color: #fff;
833 834 }
834   - .is-wait{
835   - .el-step__icon{
836   - padding: 10px;
837   - border-radius:10px;
838   - width:120px;
839   - height:70px;
840   - margin-top:-24px;
841   - position: relative;
842   - border: 2px solid #C0C4CC;
843   - font-size: 12px;
844   - }
845   - .el-step__icon .is-text{
846   - padding: 10px;
847   - border-radius:10px;
848   - border: 2px solid #C0C4CC;
849   - font-size: 12px;
850   - }
  835 +
  836 + .el-step__icon .is-text {
  837 + border: 2px solid #000;
851 838 }
852   - .is-finish{
853   - .el-step__icon{
854   - padding: 10px;
855   - border-radius:10px;
856   - width:120px;
857   - height:70px;
858   - margin-top:-24px;
859   - position: relative;
860   - border: 2px solid #3F9B6A;
861   - background-color: #D3E6CC;
862   - font-size: 12px;
863   - color: #3F9B6A;
864   - }
865   - .el-step__icon .is-text{
866   - padding: 10px;
867   - border-radius:10px;
868   - border: 2px solid #3F9B6A;
869   - font-size: 12px;
870   - }
871   - .el-step__line{
872   - background-color: #3F9B6A;
873   - }
874   - }
875   - }
876   - ::v-deep .xiang_steps{
877   - .is-process{ /* 待执行步骤颜色 */
878   - color: #3F9B6A;
879   - border:none;
880   - .el-step__icon{
881   - background-color: #3F9B6A;
  839 +
  840 + .el-step__icon-inner {
  841 + display: none;
882 842 }
883   - .el-step__icon-inner{
884   - color:#fff;
  843 +
  844 + .el-step__line {
  845 + background-color: #000;
885 846 }
886   - .el-step__line{
887   - background-color: #3F9B6A;
  847 +
  848 + }
  849 +
  850 + .is-process {
  851 + border: none;
  852 + color: #000;
  853 +
  854 + .el-step__icon {
  855 + background-color: #fff;
  856 + }
  857 +
  858 + .el-step__icon .is-text {
  859 + border: 2px solid #000;
888 860 }
889 861  
  862 + .el-step__icon-inner {
  863 + display: none;
  864 + }
  865 +
  866 + .el-step__line {
  867 + background-color: #000;
  868 + }
  869 + }
890 870 }
891   - .is-finish{
892   - color: #3F9B6A;
893   - border:none;
894   - .el-step__icon{
895   - background-color: #3F9B6A;
  871 +
  872 + .step_buen {
  873 + flex-basis: 25% !important;
  874 +
  875 + .is-process {
  876 + .el-step__icon {
  877 + padding: 10px;
  878 + border-radius: 10px;
  879 + width: 120px;
  880 + height: 70px;
  881 + margin-top: -24px;
  882 + position: relative;
  883 + border: 2px solid #FABB41;
  884 + font-size: 12px;
  885 + }
  886 +
  887 + .el-step__icon .is-text {
  888 + padding: 10px;
  889 + border-radius: 10px;
  890 + border: 2px solid #FABB41;
  891 + font-size: 12px;
  892 + }
896 893 }
897   - .el-step__icon-inner{
898   - color:#fff;
  894 +
  895 + .is-wait {
  896 + .el-step__icon {
  897 + padding: 10px;
  898 + border-radius: 10px;
  899 + width: 120px;
  900 + height: 70px;
  901 + margin-top: -24px;
  902 + position: relative;
  903 + border: 2px solid #C0C4CC;
  904 + font-size: 12px;
  905 + }
  906 +
  907 + .el-step__icon .is-text {
  908 + padding: 10px;
  909 + border-radius: 10px;
  910 + border: 2px solid #C0C4CC;
  911 + font-size: 12px;
  912 + }
899 913 }
900   - .el-step__line{
901   - border-color: #3F9B6A;
  914 +
  915 + .is-finish {
  916 + .el-step__icon {
  917 + padding: 10px;
  918 + border-radius: 10px;
  919 + width: 120px;
  920 + height: 70px;
  921 + margin-top: -24px;
  922 + position: relative;
  923 + border: 2px solid #3F9B6A;
  924 + background-color: #D3E6CC;
  925 + font-size: 12px;
  926 + color: #3F9B6A;
  927 + }
  928 +
  929 + .el-step__icon .is-text {
  930 + padding: 10px;
  931 + border-radius: 10px;
  932 + border: 2px solid #3F9B6A;
  933 + font-size: 12px;
  934 + }
  935 +
  936 + .el-step__line {
  937 + background-color: #3F9B6A;
  938 + }
902 939 }
903 940 }
904 941  
  942 + ::v-deep .xiang_steps {
  943 + .is-process {
  944 + /* 待执行步骤颜色 */
  945 + color: #3F9B6A;
  946 + border: none;
  947 +
  948 + .el-step__icon {
  949 + background-color: #3F9B6A;
  950 + }
  951 +
  952 + .el-step__icon-inner {
  953 + color: #fff;
  954 + }
  955 +
  956 + .el-step__line {
  957 + background-color: #3F9B6A;
  958 + }
  959 +
  960 + }
  961 +
  962 + .is-finish {
  963 + color: #3F9B6A;
  964 + border: none;
  965 +
  966 + .el-step__icon {
  967 + background-color: #3F9B6A;
  968 + }
  969 +
  970 + .el-step__icon-inner {
  971 + color: #fff;
  972 + }
  973 +
  974 + .el-step__line {
  975 + border-color: #3F9B6A;
  976 + }
  977 + }
  978 +
905 979  
906 980 }
907 981 }
... ...
admin-web-master/src/views/shopRental/rentTermination/add.vue
  View file @981fc10
... ... @@ -12,7 +12,8 @@
12 12 <el-input v-model="formInline.outstandingRent" placeholder="请输入"></el-input>
13 13 </el-form-item>
14 14 <el-form-item label="退租须知" prop="exitNotice">
15   - <wang-editor v-model="formInline.exitNotice" ref="editor" :height="200"></wang-editor>
  15 + <!-- <wang-editor v-model="formInline.exitNotice" ref="editor" :height="200"></wang-editor> -->
  16 + <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.exitNotice" placeholder="请输入" type="textarea" />
16 17 </el-form-item>
17 18 <el-row :gutter="20">
18 19 <el-col :span="12">
... ...
admin-web-master/src/views/shopRental/rentalMan/add.vue
  View file @981fc10
... ... @@ -12,7 +12,8 @@
12 12 <el-input v-model="formInline.outstandingRent" placeholder="请输入"></el-input>
13 13 </el-form-item> -->
14 14 <el-form-item label="入驻须知" prop="exitNotice">
15   - <wang-editor v-model="formInline.exitNotice" ref="editor" :height="200"></wang-editor>
  15 + <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.exitNotice" placeholder="请输入" type="textarea" />
  16 + <!-- <wang-editor v-model="formInline.exitNotice" ref="editor" :height="200"></wang-editor> -->
16 17 </el-form-item>
17 18 <el-row :gutter="20">
18 19 <el-col :span="12">
... ...
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
  View file @981fc10
... ... @@ -275,7 +275,7 @@
275 275 "pageSize": 10,
276 276 pageNumber: 0,
277 277 phone: uni.getStorageSync('user').phone
278   - }).then(res => {
  278 + },1).then(res => {
279 279 if (res.data.code == '20004' || res.data.code == '20003') {
280 280 uni.navigateTo({
281 281 url: '/pages/login/login'
... ...
lvdao-miniapp/pages/details/details.vue
  View file @981fc10
... ... @@ -429,7 +429,7 @@
429 429 "pageSize": 10,
430 430 pageNumber: 0,
431 431 phone: uni.getStorageSync('user').phone
432   - }).then(res => {
  432 + },1).then(res => {
433 433 if (res.data.code == '20004' || res.data.code == '20003') {
434 434 uni.navigateTo({
435 435 url: '/pages/login/login'
... ...
lvdao-miniapp/pages/message/message.vue
  View file @981fc10
... ... @@ -58,7 +58,7 @@
58 58 </view>
59 59 </view>
60 60 <view class="more">
61   - <view class="more-num" v-if="tzlist.length>0">{{tzlist.length}}</view>
  61 + <view class="more-num" v-if="tzlist.length>0&&tzlist[0].isRead == '0'">{{tzlist.length}}</view>
62 62 <view class="icon-more" v-if="tzlist.length>0">{{formatDateTime(tzlist[0]?tzlist[0].createTime:'')}}</view>
63 63 </view>
64 64 </view>
... ... @@ -83,7 +83,7 @@
83 83 </view>
84 84 </view>
85 85 <view class="more">
86   - <view class="more-num" v-if="wylist.length>0">{{wylist.length}}</view>
  86 + <view class="more-num" v-if="wylist.length>0&&wylist[0].isRead == '0'">{{wylist.length}}</view>
87 87 <view class="icon-more" v-if="wylist.length>0">{{formatDateTime(wylist[0]?wylist[0].createTime:'')}}</view>
88 88 </view>
89 89 </view>
... ... @@ -108,7 +108,7 @@
108 108 </view>
109 109 </view>
110 110 <view class="more">
111   - <view class="more-num" v-if="zjlist.length>0">{{zjlist.length}}</view>
  111 + <view class="more-num" v-if="zjlist.length>0&&zjlist[0].isRead == '0'">{{zjlist.length}}</view>
112 112 <view class="icon-more" v-if="zjlist.length>0">{{formatDateTime(zjlist[0]?zjlist[0].createTime:'')}}</view>
113 113 </view>
114 114 </view>
... ... @@ -133,7 +133,7 @@
133 133 </view>
134 134 </view>
135 135 <view class="more">
136   - <view class="more-num" v-if="zllist.length>0">{{zllist.length}}</view>
  136 + <view class="more-num" v-if="zllist.length>0&&zllist[0].isRead == '0'">{{zllist.length}}</view>
137 137 <view class="icon-more" v-if="zllist.length>0">{{formatDateTime(zllist[0]?zllist[0].createTime:'')}}</view>
138 138 </view>
139 139 </view>
... ... @@ -177,7 +177,7 @@
177 177 })
178 178 } else {
179 179  
180   - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
  180 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => {
181 181 if(res.data.code == '20004' || res.data.code == '20003'){
182 182 uni.navigateTo({
183 183 url: '/pages/login/login'
... ... @@ -210,7 +210,10 @@
210 210 // phone:'18121815598',
211 211 isRead:'0'
212 212 }
213   -
  213 + let info1 = {
  214 + phone:uni.getStorageSync('user').phone,
  215 + isRead:'1'
  216 + }
214 217 this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租赁提醒'},1).then(res => {
215 218 let obj = res.data.data
216 219 for(let prop in obj) {
... ... @@ -220,6 +223,18 @@
220 223 }
221 224 }
222 225 this.zllist.reverse()
  226 + if(this.zllist.length == 0){
  227 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,messageType:'租赁提醒'},1).then(res => {
  228 + let obj = res.data.data
  229 + for(let prop in obj) {
  230 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  231 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  232 + this.zllist.push(obj[prop][0])
  233 + }
  234 + }
  235 + this.zllist.reverse()
  236 + })
  237 + }
223 238 })
224 239 this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'通知消息'},1).then(res => {
225 240 let obj = res.data.data
... ... @@ -230,7 +245,18 @@
230 245 }
231 246 }
232 247 this.tzlist.reverse()
233   - console.error(this.tzlist)
  248 + if(this.tzlist.length == 0){
  249 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,messageType:'通知消息'},1).then(res => {
  250 + let obj = res.data.data
  251 + for(let prop in obj) {
  252 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  253 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  254 + this.tzlist.push(obj[prop][0])
  255 + }
  256 + }
  257 + this.tzlist.reverse()
  258 + })
  259 + }
234 260 })
235 261 this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租金缴费通知'},1).then(res => {
236 262 let obj = res.data.data
... ... @@ -241,7 +267,18 @@
241 267 }
242 268 }
243 269 this.zjlist.reverse()
244   - console.error(this.zjlist)
  270 + if(this.zjlist.length == 0){
  271 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,messageType:'租金缴费通知'},1).then(res => {
  272 + let obj = res.data.data
  273 + for(let prop in obj) {
  274 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  275 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  276 + this.zjlist.push(obj[prop][0])
  277 + }
  278 + }
  279 + this.zjlist.reverse()
  280 + })
  281 + }
245 282 })
246 283 this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'物业缴费通知'},1).then(res => {
247 284 let obj = res.data.data
... ... @@ -252,7 +289,18 @@
252 289 }
253 290 }
254 291 this.wylist.reverse()
255   - console.error(this.wylist)
  292 + if(this.wylist.length == 0){
  293 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info1,messageType:'物业缴费通知'},1).then(res => {
  294 + let obj = res.data.data
  295 + for(let prop in obj) {
  296 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  297 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  298 + this.wylist.push(obj[prop][0])
  299 + }
  300 + }
  301 + this.wylist.reverse()
  302 + })
  303 + }
256 304 })
257 305 },
258 306 formatDateTime(dateTimeString) {
... ...
lvdao-miniapp/pages/workbench/workbench.vue
  View file @981fc10
... ... @@ -292,7 +292,7 @@
292 292 "pageSize": 10,
293 293 pageNumber: 0,
294 294 phone: uni.getStorageSync('user').phone
295   - }).then(res => {
  295 + },1).then(res => {
296 296 if (res.data.code == '20004' || res.data.code == '20003') {
297 297 uni.navigateTo({
298 298 url: '/pages/login/login'
... ... @@ -329,7 +329,7 @@
329 329 "pageSize": 10,
330 330 pageNumber: 0,
331 331 phone: uni.getStorageSync('user').phone
332   - }).then(res => {
  332 + },1).then(res => {
333 333 if (res.data.code == '20004' || res.data.code == '20003') {
334 334 uni.navigateTo({
335 335 url: '/pages/login/login'
... ... @@ -382,7 +382,7 @@
382 382 "pageSize": 10,
383 383 pageNumber: 0,
384 384 phone: uni.getStorageSync('user').phone
385   - }).then(res => {
  385 + },1).then(res => {
386 386 if (res.data.code == '20004' || res.data.code == '20003') {
387 387 uni.navigateTo({
388 388 url: '/pages/login/login'
... ...
lvdao-miniapp/pagesA/leaseAdd/leaseAdd.vue
  View file @981fc10
... ... @@ -6,10 +6,10 @@
6 6 <u-form-item label="经营者姓名" prop="name" borderBottom>
7 7 <u-input v-model="model1.name"></u-input>
8 8 </u-form-item>
9   - <!-- <u-form-item label="手机号" prop="phone" borderBottom>
  9 + <!-- <u-form-item label="手机号" prop="phone" borderBottom>
10 10 <u-input v-model="model1.phone"></u-input>
11 11 </u-form-item> -->
12   - <!-- <u-form-item label="证件类型" prop="idCardType" borderBottom>
  12 + <!-- <u-form-item label="证件类型" prop="idCardType" borderBottom>
13 13 <u-input v-model="model1.idCardType" type="select" @click="IdtypeShow = true"
14 14 placeholder='请选择类型' />
15 15 </u-form-item> -->
... ... @@ -30,8 +30,8 @@
30 30 <text>点击上传证件人像面</text>
31 31 </view>
32 32 <view class="img-deom">
33   - <u-upload :action="url" @on-choose-complete="onsuccess2" :auto-upload="false" :custom-btn="true" :max-count="1"
34   - ref="idPhotoBack">
  33 + <u-upload :action="url" @on-choose-complete="onsuccess2" :auto-upload="false"
  34 + :custom-btn="true" :max-count="1" ref="idPhotoBack">
35 35 <view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover"
36 36 hover-stay-time="150">
37 37 <u-image width="304rpx" height="182rpx" :src="$imgUrl('/uploadID2.png')"></u-image>
... ... @@ -117,7 +117,7 @@
117 117 });
118 118 return false;
119 119 }
120   -
  120 +
121 121 this.model1.applyTime = this.getCurrentTime()
122 122 this.model1.idCardFrontImage = this.fileList1.join(',')
123 123 this.model1.idCardBackImage = this.fileList2.join(',')
... ... @@ -140,6 +140,28 @@
140 140 console.error({
141 141 ...this.model1
142 142 })
  143 + let info = {
  144 + "content": JSON.stringify({
  145 + type: '1',
  146 + title: '商家入驻审核申请',
  147 + content: '您的商家入驻申请已提交（申请时间：' + this.model1.applyTime +
  148 + '），正在审核中，审核通过后，我们将通过系统消息通知您，请保持关注；'
  149 + }), // 消息内容
  150 + "messageClass": 1, // 消息类型（1:指定用户发送）
  151 + "messageType": '通知消息', // 消息类型描述
  152 + "cereMessageReceipts": [ // 接收人列表
  153 + {
  154 + "phone": uni.getStorageSync('user').phone, // 用户ID
  155 + "messageType": '通知消息', // 消息类型
  156 + "content": JSON.stringify({
  157 + type: '1',
  158 + title: '商家入驻审核申请',
  159 + content: '您的商家入驻申请已提交（申请时间：' + this.model1.applyTime +
  160 + '），正在审核中，审核通过后，我们将通过系统消息通知您，请保持关注；'
  161 + }) // 消息内容
  162 + }
  163 + ]
  164 + }
143 165 // return
144 166 this.$http.sendRequest('/cerePlatformMerchant/add', 'POST', this.model1, 2).then(res => {
145 167 console.error(res)
... ... @@ -148,6 +170,9 @@
148 170 icon: 'none',
149 171 title: '提交申请成功'
150 172 })
  173 + this.$http.sendRequest('/cereMessage/sendToUser', 'POST', info, 1).then(res => {
  174 + console.error(res)
  175 + })
151 176 setTimeout(() => {
152 177 uni.navigateBack()
153 178 }, 1000);
... ... @@ -159,7 +184,7 @@
159 184 }
160 185 })
161 186 },
162   - onup(e,e1) {
  187 + onup(e, e1) {
163 188 uni.uploadFile({
164 189 url: this.$upload, // 仅为示例，请替换为您的服务器上传接口
165 190 filePath: e,
... ... @@ -187,13 +212,13 @@
187 212 onsuccess1(e) {
188 213 console.error(e)
189 214 this.fileList1 = []
190   - this.onup(e[0].url,'fileList1')
  215 + this.onup(e[0].url, 'fileList1')
191 216 },
192 217 onsuccess2(e) {
193 218 console.error(e)
194 219 this.fileList2 = []
195   - this.onup(e[0].url,'fileList2')
196   -
  220 + this.onup(e[0].url, 'fileList2')
  221 +
197 222 },
198 223 IdtypeChange(e) {
199 224 this.model1.idCardType = e[0].label;
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue
  View file @981fc10
... ... @@ -223,7 +223,7 @@
223 223 },
224 224 onLoad(options) {
225 225 this.imgurl = this.$img
226   - const item = JSON.parse(options.item)
  226 + const item = JSON.parse(decodeURIComponent(options.item))
227 227 this.heData = item || {}
228 228 this.record = item
229 229 let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
... ...
lvdao-miniapp/utils/request.js
  View file @981fc10
... ... @@ -18,7 +18,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
18 18 if(baseUrl == 1){
19 19 // bases = 'http://128.10.249.22:9003' + url;
20 20 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
21   - // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
  21 + // bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' + url;
22 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23  
24 24 bases = 'http://128.10.249.21:9003'+ url;
... ... @@ -28,7 +28,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
28 28  
29 29 }else if(baseUrl == 3){
30 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
31   - // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
  31 + // bases = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api' + url;
32 32 // bases = 'http://128.10.249.22:9003:9007' + url;
33 33 bases = 'http://128.10.249.21:9007' + url;
34 34 // bases = c1 + 'cdwlMall/meserver/api' + url;
... ...