我的券页面调整;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java

@@ -53,7 +53,8 @@ public class CandyMgtCouponAdminController extends BaseController {
 
     @RequiresPermissions("candy:coupon:mgt:view")
     @GetMapping()
-    public String coupon(@RequestParam int couType) {
+    public String coupon(@RequestParam int couType, ModelMap mmap) {
+        mmap.put("couType", couType);
         return prefix + "/coupon" + couType;
     }
 
@@ -76,7 +77,7 @@ public class CandyMgtCouponAdminController extends BaseController {
                     list.stream().forEach(r->{
                         couponRuleList.forEach(cr -> {
                             if (r.getCouponId().equals(cr.getCouponId())) {
-                                r.setCouponRuleScopeName(cr.getComment());
+                                r.setCouponRuleScopeName(cr.getBusiName());
                             }
                         });
                     });

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon1.html

@@ -10,7 +10,7 @@
 				<form id="coupon-form">
 					<div class="select-list">
 						<ul>
-							<input type="hidden" name="couType" value="1" />
+							<input type="hidden" name="couType" th:value="${couType}" />
 							<li>
 								<input type="text" name="keyword" placeholder="搜索"/>
 							</li>
@@ -36,7 +36,7 @@
 			</div>
 		
 			<div class="btn-group-sm" id="toolbar" role="group">
-				<a class="btn btn-success" onclick="$.operate.addTab(1)" shiro:hasPermission="candy:coupon:mgt:add">
+				<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
 	                <i class="fa fa-plus"></i> 新增
 	            </a>
 	        </div>
@@ -60,9 +60,10 @@
 		        // exportUrl: prefix + "/export",
 		        sortName: "createdAt",
 		        modalName: "代金券",
-		        columns: [{
-		            checkbox: true
-		        },
+		        columns: [
+				// {
+		        //     checkbox: true
+		        // },
 		        {
 		            field: 'valFace',
 		            title: '金额'

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon2.html

@@ -10,7 +10,7 @@
 			<form id="coupon-form">
 				<div class="select-list">
 					<ul>
-						<input type="hidden" name="couType" value="1" />
+						<input type="hidden" name="couType" th:value="${couType}" />
 						<li>
 							<input type="text" name="keyword" placeholder="搜索"/>
 						</li>
@@ -36,7 +36,7 @@
 		</div>
 
 		<div class="btn-group-sm" id="toolbar" role="group">
-			<a class="btn btn-success" onclick="$.operate.addTab(2)" shiro:hasPermission="candy:coupon:mgt:add">
+			<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
 				<i class="fa fa-plus"></i> 新增
 			</a>
 		</div>
@@ -60,9 +60,10 @@
 			// exportUrl: prefix + "/export",
 			sortName: "createdAt",
 			modalName: "满减券",
-			columns: [{
-				checkbox: true
-			},
+			columns: [
+				// {
+				// 	checkbox: true
+				// },
 				{
 					field: 'valFace',
 					title: '金额'

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon3.html

@@ -10,7 +10,7 @@
 			<form id="coupon-form">
 				<div class="select-list">
 					<ul>
-						<input type="hidden" name="couType" value="1" />
+						<input type="hidden" name="couType" th:value="${couType}" />
 						<li>
 							<input type="text" name="keyword" placeholder="搜索"/>
 						</li>
@@ -36,7 +36,7 @@
 		</div>
 
 		<div class="btn-group-sm" id="toolbar" role="group">
-			<a class="btn btn-success" onclick="$.operate.addTab(3)" shiro:hasPermission="candy:coupon:mgt:add">
+			<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
 				<i class="fa fa-plus"></i> 新增
 			</a>
 		</div>
@@ -60,9 +60,10 @@
 			// exportUrl: prefix + "/export",
 			sortName: "createdAt",
 			modalName: "兑换券",
-			columns: [{
-				checkbox: true
-			},
+			columns: [
+				// {
+				// 	checkbox: true
+				// },
 				{
 					field: 'couponRuleScopeName',
 					title: '适用演出'

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/coupon4.html

@@ -10,7 +10,7 @@
 			<form id="coupon-form">
 				<div class="select-list">
 					<ul>
-						<input type="hidden" name="couType" value="1" />
+						<input type="hidden" name="couType" th:value="${couType}" />
 						<li>
 							<input type="text" name="keyword" placeholder="搜索"/>
 						</li>
@@ -36,7 +36,7 @@
 		</div>
 
 		<div class="btn-group-sm" id="toolbar" role="group">
-			<a class="btn btn-success" onclick="$.operate.addTab(4)" shiro:hasPermission="candy:coupon:mgt:add">
+			<a class="btn btn-success" th:onclick="$.operate.addTab([[${couType}]])" shiro:hasPermission="candy:coupon:mgt:add">
 				<i class="fa fa-plus"></i> 新增
 			</a>
 		</div>
@@ -60,12 +60,16 @@
 			// exportUrl: prefix + "/export",
 			sortName: "createdAt",
 			modalName: "折扣券",
-			columns: [{
-				checkbox: true
-			},
+			columns: [
+				// {
+				// 	checkbox: true
+				// },
 				{
 					field: 'discount',
-					title: '折扣'
+					title: '折扣',
+					formatter: function (value, row, index) {
+						return '<span class="nav-label">' + value*10 + '折</span>';
+					}
 				},
 				{
 					field: 'eventAmt',