Browse Source

提示修改

Enford 5 years ago
parent
commit
9611ecd922

+ 4 - 4
src/main/java/com/jeeplus/modules/wexintheorder/Utils/OrderUtils.java

@@ -202,10 +202,10 @@ public class OrderUtils {
 
     //提示拼接
     public static String getMsg(TheOrder theOrder,String addOrMinusDayString){
-        String msg1 = "预订("+addOrMinusDayString+")工作餐成功。";
-        String msg4 = "("+theOrder.getTeam()+")团队,";
-        String msg5 = "("+theOrder.getDepartment()+")部门";
-        String msg2 = "("+theOrder.getDepartment()+"/"+theOrder.getSpecific()+")部门。";
+        String msg1 = "预订<span style = 'font-weight:bold'>"+addOrMinusDayString+"</span>工作餐成功。";
+        String msg4 = "<span style = 'font-weight:bold'>"+theOrder.getTeam()+"</span>团队,";
+        String msg5 = "<span style = 'font-weight:bold'>"+theOrder.getDepartment()+"</span>部门";
+        String msg2 = "<span style = 'font-weight:bold'>"+theOrder.getDepartment()+"/"+theOrder.getSpecific()+"</span>部门。";
         String msg3 = "提示:团队部门可取消预订后</br>重新修改,再次预订";
         String msg = "";
         if (null!=theOrder.getDepartment()&&!"".equals(theOrder.getDepartment())){

+ 16 - 7
src/main/webapp/webpage/modules/weixin/theorder/orderMeal.jsp

@@ -352,14 +352,23 @@
 
     //取消订餐
     function cancelPlan() {
-        $.post("/weXin/theOrder/cancelTem",$('#subForm').serialize(),function(data){
-            if(data.success){
-                $.toast(data.msg);
-                window.location.reload();
-            }else{
-                $.toast(data.msg, "cancel");
+        $.confirm({
+            title: '取消订餐',
+            text: '您已预订过第二天的用餐,确定取消该订餐?',
+            onOK: function () {
+                $.post("/weXin/theOrder/cancelTem",$('#subForm').serialize(),function(data){
+                    if(data.success){
+                        $.toast(data.msg);
+                        window.location.reload();
+                    }else{
+                        $.toast(data.msg, "cancel");
+                    }
+                })
+            },
+            onCancel: function () {
             }
-        })
+        });
+
     }
     //时间预定方法
     function baDatePlan(){