From 83975e60f2fcb638a0a1724977273def77f080ba Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 20 四月 2022 15:34:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 2 +-
src/main/webapp/views/pack/pack.html | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index d5408bd..c63b08f 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -100,7 +100,7 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R packComb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
+ mobileService.packComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index 5207c2e..5ddf84f 100644
--- a/src/main/webapp/views/pack/pack.html
+++ b/src/main/webapp/views/pack/pack.html
@@ -54,19 +54,18 @@
<script type="text/html" id="settleTpl">
<span name="settle"
{{# if( d.settle === 1){ }}
- class="layui-badge layui-badge-red"
+ class="layui-badge layui-badge-red" >{{d.settle$}}</span>
{{# }else if(d.settle === 2){ }}
- class="layui-badge layui-badge-green"
+ class="layui-badge layui-badge-green" >涓嬬嚎甯墭</span>
{{# }else if(d.settle === 3){ }}
- class="layui-badge layui-badge-gray"
+ class="layui-badge layui-badge-gray" >{{d.settle$}}</span>
{{# }else if(d.settle === 4){ }}
- class="layui-badge layui-badge-blue"
+ class="layui-badge layui-badge-blue" >{{d.settle$}}</span>
{{# }else if(d.settle === 5){ }}
- class="layui-badge layui-badge-gray"
+ class="layui-badge layui-badge-gray" >{{d.settle$}}</span>
{{# }else if(d.settle === 6){ }}
- class="layui-badge layui-badge-gray"
+ class="layui-badge layui-badge-gray" >{{d.settle$}}</span>
{{# } }}
- >{{d.settle$}}</span>
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1