From 2ee052764f200422a7fd3b4c2c90f731e614d0d2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 May 2021 10:34:13 +0800
Subject: [PATCH] 20210525 申诉单
---
src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java | 5 +++--
src/main/resources/templates/febs/views/modules/otc/otcAppealList.html | 12 ++++++++++--
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcServiceImpl.java | 5 ++++-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcServiceImpl.java
index 483779c..bf070e3 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcServiceImpl.java
@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.otc.service.impl;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -25,6 +26,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -149,7 +151,8 @@
String reason = otcOrderAppealEntity.getReason();
otcAppealInfoVo.setReason(reason);
String content = otcOrderAppealEntity.getContent();
- otcAppealInfoVo.setContent(content);
+ List arr = Arrays.asList(content.split(","));
+ otcAppealInfoVo.setContent(arr);
}
//获取对应的订单详情
long orderId = otcOrderAppealEntity.getOrderId();
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java
index 69edb1f..b8520f4 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/OtcAppealInfoVo.java
@@ -6,6 +6,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
@Data
@ApiModel(value = "OtcAppealInfoVo", description = "参数返回类")
@@ -51,8 +52,8 @@
//申诉原因
private String reason;
- //申诉内容
- private String content;
+ //申诉图片
+ private List<String> content;
}
diff --git a/src/main/resources/templates/febs/views/modules/otc/otcAppealList.html b/src/main/resources/templates/febs/views/modules/otc/otcAppealList.html
index 02b4fc9..8e2e7e0 100644
--- a/src/main/resources/templates/febs/views/modules/otc/otcAppealList.html
+++ b/src/main/resources/templates/febs/views/modules/otc/otcAppealList.html
@@ -49,6 +49,14 @@
<a lay-event="edit" shiro:hasPermission="user:update"><i
class="layui-icon febs-edit-area febs-blue"></i></a>
</script>
+<script id="showScreenhost" type="text/html">
+ {{# var srr=d.content.split(",");
+ for(var j in srr) { srr[j] }}
+ <div style="margin:0 10px; display:inline-block !important; display:inline; max-width:70px; max-height:50px;">
+ <img style=" max-width:70px; max-height:50px;" src="{{srr[j]}}" />
+ </div>
+ {{# } }}
+</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
// 引入组件并初始化
@@ -124,7 +132,7 @@
{field: 'realName', title: '姓名', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 80,align:'center'},
{field: 'reason', title: '申诉原因', minWidth: 80,align:'center'},
- {field: 'content', title: '申诉内容', minWidth: 80,align:'center'},
+ {field: 'content', title: '申诉内容', minWidth: 80,templet: '#showScreenhost',align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -138,7 +146,7 @@
}
}, minWidth: 80,align:'center'},
{field: 'orderNo', title: '订单编号',minWidth: 100,align:'center'},
- {field: 'nikename', title: '商户昵称',minWidth: 100,align:'center'},
+ // {field: 'nikename', title: '商户昵称',minWidth: 100,align:'center'},
{title: '操作',templet: function (d) {
if(d.status === 1){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="dealIng" shiro:hasPermission="user:update">查看详情</button>'
--
Gitblit v1.9.1