修改磁贴图尺寸

suishenbang-admin/src/main/resources/templates/login.html

@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
     
-    <title>金佰利一体化采购平台</title>
-    <meta name="description" content="金佰利一体化采购平台">
+    <title>立邦随身邦管理平台</title>
+    <meta name="description" content="立邦随身邦管理平台">
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
     <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>
@@ -27,7 +27,7 @@
     <div class="signinTop">
         <div>
             <img th:src="@{/favicon.ico}">
-            金佰利一体化采购平台
+            立邦随身邦管理平台
         </div>
     </div>
     <div class="signinpanel">

suishenbang-wxportal/suishenbang-wxportal-common/src/main/resources/mapper/wxportal/WxMagnetMapper.xml

@@ -163,6 +163,7 @@
         LEFT JOIN sys_role ro on ur.role_id = ro.role_id
         <where>
             ur.user_id = #{userId}
+            and m.visible = "0"
         </where>
         order by  m.order_num
 	</select>

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/banner/uploadImg.html

@@ -45,7 +45,7 @@ $(window).load(function() {
     var options = {
         thumbBox: '.thumbBox_L',
         spinner: '.spinner',
-        imgSrc: $.common.isEmpty(imgUrl) ? ctx + 'img/profile.jpg' : imgUrl
+        imgSrc: $.common.isEmpty(imgUrl) ? ctx + 'img/profile.jpg' : ctx +imgUrl
     }
     cropper = $('.imageBox').cropbox(options);
     $('#avatar').on('change', function() {

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/add.html

@@ -4,23 +4,23 @@
 	<th:block th:include="include :: header('新增磁贴')" />
     <style>
         .bg-sm{
-            width: 120px;
-            height: 110px;
-            font-size: 90px;
+            width: 124px;
+            height: 109px;
+            font-size: 75px;
             color: black;
             text-align: center
         }
         .bg-md{
             width: 180px;
             height: 150px;
-            font-size: 90px;
+            font-size: 105px;
             color: black;
             text-align: center
          }
         .bg-lg{
-            width: 360px;
-            height: 200px;
-            font-size: 90px;
+            width: 365px;
+            height: 160px;
+            font-size: 115px;
             color: black;
             text-align: center
         }
@@ -137,9 +137,13 @@
     function bgUpload() {
         var size = $("#sel_magnetSize").val();
         var bgUrl = $("#input_bgUrl").val();
+        var w = 500;
+        if(size=="L"){
+            w= 900;
+        }
         var options = {
             title: "上传背景图像",
-            width: 500,
+            width: w,
             height: 600,
             url:  ctx + 'wxportal/magnet/bgUpload?size='+size+"&bgUrl="+bgUrl,
             btn:["上传","取消"],

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/bgUpload.html

@@ -9,10 +9,10 @@
             position: absolute;
             top: 50%;
             left: 50%;
-            width: 120px;
-            height: 110px;
-            margin-top: -55px;
-            margin-left: -60px;
+            width: 238px;
+            height: 218px;
+            margin-left: -119px;
+            margin-top: -109px;
             box-sizing: border-box;
             border: 1px solid rgb(102, 102, 102);
             box-shadow: 0 0 0 1000px rgba(0, 0, 0, 0.5);
@@ -22,10 +22,10 @@
             position: absolute;
             top: 50%;
             left: 50%;
-            width: 180px;
-            height: 150px;
-            margin-top: -75px;
-            margin-left:-90px;
+            width: 360px;
+            height: 300px;
+            margin-left:-180px;
+            margin-top: -150px;
             box-sizing: border-box;
             border: 1px solid rgb(102, 102, 102);
             box-shadow: 0 0 0 1000px rgba(0, 0, 0, 0.5);
@@ -35,20 +35,32 @@
             position: absolute;
             top: 50%;
             left: 50%;
-            width: 360px;
-            height: 200px;
-            margin-top: -100px;
-            margin-left: -180px;
+            width: 730px;
+            height: 320px;
+            margin-left: -365px;
+            margin-top: -160px;
             box-sizing: border-box;
             border: 1px solid rgb(102, 102, 102);
             box-shadow: 0 0 0 1000px rgba(0, 0, 0, 0.5);
             background: none repeat scroll 0% 0% transparent;
         }
+        .imageBox_S{
+            margin: 0 auto;
+            width: 400px;
+        }
+        .imageBox_M{
+            margin: 0 auto;
+            width: 400px;
+        }
+        .imageBox_L{
+            margin: 0 auto;
+            width: 800px;
+        }
     </style>
 </head>
 <body class="white-bg">
-<div class="container">
-    <div class="imageBox" style="margin: 0 auto;">
+<div class="container" style="width: 100%;">
+    <div th:class="@{'imageBox imageBox_'+${size}}" >
         <div th:class="@{'thumbBox_'+${size}}" ></div>
         <div class="spinner" style="display: none">Loading...</div>
     </div>
@@ -72,7 +84,7 @@
         var options = {
             thumbBox: '.thumbBox_'+size,
             spinner: '.spinner',
-            imgSrc: $.common.isEmpty(bgUrl) ? ctx + 'img/profile.jpg' : bgUrl
+            imgSrc: $.common.isEmpty(bgUrl) ? ctx + 'img/profile.jpg' : ctx+bgUrl
         }
         cropper = $('.imageBox').cropbox(options);
         $('#avatar').on('change', function() {

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/edit.html

@@ -4,23 +4,23 @@
 	<th:block th:include="include :: header('修改磁贴')" />
     <style>
         .bg-sm{
-            width: 120px;
-            height: 110px;
-            font-size: 90px;
+            width: 124px;
+            height: 109px;
+            font-size: 75px;
             color: black;
             text-align: center
         }
         .bg-md{
             width: 180px;
             height: 150px;
-            font-size: 90px;
+            font-size: 105px;
             color: black;
             text-align: center
         }
         .bg-lg{
-            width: 360px;
-            height: 200px;
-            font-size: 90px;
+            width: 365px;
+            height: 160px;
+            font-size: 115px;
             color: black;
             text-align: center
         }
@@ -140,9 +140,15 @@
         function bgUpload() {
             var size = $("#sel_magnetSize").val();
             var bgUrl = $("#input_bgUrl").val();
+            //bgUrl = bgUrl.substring(1,bgUrl.length);
+
+            var w = 500;
+            if(size=="L"){
+                w= 900;
+            }
             var options = {
                 title: "上传背景图像",
-                width: 500,
+                width: w,
                 height: 600,
                 url:  ctx + 'wxportal/magnet/bgUpload?size='+size+"&bgUrl="+bgUrl,
                 btn:["上传","取消"],

suishenbang-wxportal/suishenbang-wxportal-manager/src/main/resources/templates/wxportal/magnet/wxMagnet.html

@@ -5,17 +5,17 @@
     <style>
         .tableImage_s{
             border-radius:2px;
-            width:35px;
-            height: 32px;
+            width: 24px;
+            height: 22px;
         }
         .tableImage_m{
             border-radius:2px;
-            width:38px;
-            height: 32px;
+            width: 36px;
+            height: 30px;
         }
         .tableImage_l{
             border-radius:2px;
-            width:57px;
+            width: 73px;
             height: 32px;
         }
     </style>
@@ -46,7 +46,7 @@
 			</div>
                 
             <div class="btn-group-sm" id="toolbar" role="group">
-		        <a class="btn btn-success" onclick="$.operate.add(0)" shiro:hasPermission="wxportal:magnet:add">
+		        <a class="btn btn-success" onclick="addNew()" shiro:hasPermission="wxportal:magnet:add">
                     <i class="fa fa-plus"></i> 新增
                 </a>
                 <!--<a class="btn btn-primary" onclick="$.operate.editFull()" shiro:hasPermission="wxportal:magnet:edit">-->
@@ -101,11 +101,11 @@
                             str = ctx+value;
                         }
                         if(row.magnetSize=="S"){
-                            return $.table.imageView(str,200,200,"tableImage_s img-view");
+                            return $.table.imageView(str,218,237,"tableImage_s img-view");
                         }else if(row.magnetSize=="M"){
-                            return $.table.imageView(str,200,300,"tableImage_m img-view");
+                            return $.table.imageView(str,300,360,"tableImage_m img-view");
                         }else if(row.magnetSize=="L"){
-                            return $.table.imageView(str,200,600,"tableImage_l img-view");
+                            return $.table.imageView(str,320,730,"tableImage_l img-view");
                         }
                     }
 		        },
@@ -148,7 +148,7 @@
 		            align: "left",
 		            formatter: function(value, row, index) {
 		                var actions = [];
-		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.magnetId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="editMagnet(\'' + row.magnetId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.magnetId + '\')"><i class="fa fa-trash"></i>删除</a>');
 		                return actions.join('');
 		            }
@@ -156,6 +156,25 @@
 		    };
 		    $.table.init(options);
 		});
+
+
+        function addNew(){
+            //$.modal.open("添加" + $.table._option.modalName, );
+            $.modal.open("添加" + $.table._option.modalName, $.operate.addUrl(0),950,700);
+            // var options = {
+            //     title: "添加" + $.table._option.modalName,
+            //     width: 950,
+            //     height: 700,
+            //     url:  $.operate.addUrl()
+            // };
+            // $.modal.openOptions(options);
+        }
+
+        function editMagnet(id){
+
+            $.modal.open("修改" + $.table._option.modalName, $.operate.editUrl(id),950,700);
+
+        }
 	</script>
 </body>
 </html>