From 56b5d3c53b55756d9f24050a7c1f7d8de23894d3 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Wed, 24 Oct 2018 09:48:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dbmapper/RmGroupMemberMapper.xml          |  3 ++-
 .../src/main/resources/mapping/reqmapping.xml |  4 ++--
 .../js/rmgroupmember/rmgroupmemberlist.js     | 24 ++++++++++++++++---
 .../tpl/rmgroupmember/rmgroupmemberadd.html   |  8 +++----
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/skyeye-web/src/main/resources/dbmapper/RmGroupMemberMapper.xml b/skyeye-web/src/main/resources/dbmapper/RmGroupMemberMapper.xml
index d77e71e9b..68c13e608 100644
--- a/skyeye-web/src/main/resources/dbmapper/RmGroupMemberMapper.xml
+++ b/skyeye-web/src/main/resources/dbmapper/RmGroupMemberMapper.xml
@@ -29,7 +29,8 @@
 	<select id="queryRmGroupMemberISTop" parameterType="java.util.Map" resultType="java.util.Map">
 		SELECT
 			a.id,
-			a.prints_pic_url printsPicUrl
+			a.prints_pic_url printsPicUrl,
+			a.sort
 		FROM
 			rm_group_member a
 		ORDER BY a.sort DESC LIMIT 1
diff --git a/skyeye-web/src/main/resources/mapping/reqmapping.xml b/skyeye-web/src/main/resources/mapping/reqmapping.xml
index 18aadec23..fde09c31e 100644
--- a/skyeye-web/src/main/resources/mapping/reqmapping.xml
+++ b/skyeye-web/src/main/resources/mapping/reqmapping.xml
@@ -227,9 +227,9 @@
 		<property id="rmTypeId" name="rmTypeId" ref="required" var="小程序分类id"/>
 		<property id="rmGroupId" name="rmGroupId" ref="required" var="小程序分组id"/>
 		<property id="htmlContent" name="htmlContent" ref="required" var="html内容"/>
-		<property id="htmlJsContent" name="htmlJsContent" ref="required" var="html对应的js内容"/>
+		<property id="htmlJsContent" name="htmlJsContent" ref="" var="html对应的js内容"/>
 		<property id="wxmlContent" name="wxmlContent" ref="required" var="wxml内容"/>
-		<property id="wxmlJsContent" name="wxmlJsContent" ref="required" var="wxml对应的js内容"/>
+		<property id="wxmlJsContent" name="wxmlJsContent" ref="" var="wxml对应的js内容"/>
 		<property id="img" name="img" ref="required" var="小程序分组id"/>
 	</url>
 	
diff --git a/skyeye-web/src/main/webapp/js/rmgroupmember/rmgroupmemberlist.js b/skyeye-web/src/main/webapp/js/rmgroupmember/rmgroupmemberlist.js
index 2876e6a2f..356867e98 100644
--- a/skyeye-web/src/main/webapp/js/rmgroupmember/rmgroupmemberlist.js
+++ b/skyeye-web/src/main/webapp/js/rmgroupmember/rmgroupmemberlist.js
@@ -62,19 +62,27 @@ layui.config({
 	    cols: [[
 	        { title: '序号', type: 'numbers'},
 	        { field: 'printsPicUrl', title: '效果图', width: 200, align: 'center', templet: function(d){
-	        	return '<img src="' + fileBasePath + d.printsPicUrl + '" style="width:100%;height:auto">';
+	        	return '<img src="' + fileBasePath + d.printsPicUrl + '" style="width:100%;height:auto" class="cursor" lay-event="printsPicUrl">';
 	        }},
 	        { field: 'id', title: 'HTML内容', width: 150, align: 'center', templet: function(d){
 	        	return '<i class="fa fa-fw fa-html5 cursor" lay-event="htmlContent"></i>';
 	        }},
 	        { field: 'id', title: 'HTML-JS内容', width: 150, align: 'center', templet: function(d){
-	        	return '<i class="fa fa-fw fa-html5 cursor" lay-event="htmlJsContent"></i>';
+	        	if(!isNull(d.htmlJsContent)){
+	        		return '<i class="fa fa-fw fa-html5 cursor" lay-event="htmlJsContent"></i>';
+	        	}else{
+	        		return '无';
+	        	}
 	        }},
 	        { field: 'id', title: 'WXML内容', width: 150, align: 'center', templet: function(d){
 	        	return '<i class="fa fa-fw fa-html5 cursor" lay-event="wxmlContent"></i>';
 	        }},
 	        { field: 'id', title: 'WXML-JS内容', width: 150, align: 'center', templet: function(d){
-	        	return '<i class="fa fa-fw fa-html5 cursor" lay-event="wxmlJsContent"></i>';
+	        	if(!isNull(d.wxmlJsContent)){
+	        		return '<i class="fa fa-fw fa-html5 cursor" lay-event="wxmlJsContent"></i>';
+	        	}else{
+	        		return '无';
+	        	}
 	        }},
 	        { field: 'typeName', title: '所属分类', width: 120 },
 	        { field: 'groupName', title: '所属分组', width: 120 },
@@ -131,6 +139,16 @@ layui.config({
 	            area: ['500px', '300px'],
 	            content: '<xmp style="white-space:normal;">' + data.wxmlJsContent + '</xmp>',
 	        });
+        }else if (layEvent === 'printsPicUrl') { //图片预览
+        	layer.open({
+        		type:1,
+        		title:false,
+        		closeBtn:0,
+        		skin:'layui-layer-nobg',
+        		shadeClose:true,
+        		content:'<img src="' + fileBasePath + data.printsPicUrl + '" style="max-height:600px;max-width:100%;">',
+        		scrollbar:false
+            });
         }
     });
 	
diff --git a/skyeye-web/src/main/webapp/tpl/rmgroupmember/rmgroupmemberadd.html b/skyeye-web/src/main/webapp/tpl/rmgroupmember/rmgroupmemberadd.html
index 80e6573f7..7c283432a 100644
--- a/skyeye-web/src/main/webapp/tpl/rmgroupmember/rmgroupmemberadd.html
+++ b/skyeye-web/src/main/webapp/tpl/rmgroupmember/rmgroupmemberadd.html
@@ -36,9 +36,9 @@
                 </div>
 	        </div>
 	        <div class="layui-form-item">
-	            <label class="layui-form-label">HTML-JS内容<i class="red">*</i></label>
+	            <label class="layui-form-label">HTML-JS内容</label>
 	            <div class="layui-input-block">
-                	<textarea id="htmlJsContent" name="htmlJsContent" win-verify="required" placeholder="请填写代码块" class="layui-textarea" style="height: 100px;"></textarea>
+                	<textarea id="htmlJsContent" name="htmlJsContent" placeholder="请填写代码块" class="layui-textarea" style="height: 100px;"></textarea>
                 </div>
 	        </div>
 	        <div class="layui-form-item">
@@ -70,9 +70,9 @@
                 </div>
 	        </div>
 	        <div class="layui-form-item">
-	            <label class="layui-form-label">WXML-JS内容<i class="red">*</i></label>
+	            <label class="layui-form-label">WXML-JS内容</label>
 	            <div class="layui-input-block">
-                	<textarea id="wxmlJsContent" name="wxmlJsContent" win-verify="required" placeholder="请填写代码块" class="layui-textarea" style="height: 100px;"></textarea>
+                	<textarea id="wxmlJsContent" name="wxmlJsContent" placeholder="请填写代码块" class="layui-textarea" style="height: 100px;"></textarea>
                 </div>
 	        </div>
 	        <div class="layui-form-item">
-- 
GitLab