upgrade

Assets/trCRM/upgradeRes4Dev/priority/lua/battle.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a52b70505ac2042b794323c3d45cd60a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua

@@ -762,7 +762,7 @@ end
 
 NetProto.send.wforder_cancel_reminder = function(id, callback, timeOutSec)
     local content = {}
-    content.action = NetProto.cmds.readNotice
+    content.action = NetProto.cmds.wforder_cancel_reminder
     content.orderId = id
     content.groupId = NetProto.groupId
     NetProto.sendSocket(content, callback, timeOutSec)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua

@@ -33,7 +33,7 @@ function _cell.show(go, data)
     uiobjs.Background.spriteName = mData.Background
     uiobjs.Checkmark.spriteName = mData.Checkmark
     if mData.id == 1 then
-        local unreadNum = DBMessage.getUnreadNum(DBMessage.MsgType.Sys)
+        local unreadNum = DBMessage.getUnreadNum(DBMessage.MsgType.Sys) + DBMessage.getUnreadNum(DBMessage.MsgType.Timeout)
         _cell.setReddotNum(unreadNum)
     else
         _cell.setReddotNum(0)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua

@@ -86,7 +86,7 @@ end
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function CSPMain.procNetwork(cmd, succ, msg, paras)
     if (succ == NetSuccess) then
-        if cmd == NetProto.cmds.readNotice then
+        if cmd == NetProto.cmds.readNotice or cmd == NetProto.cmds.wforder_cancel_reminder then
             CSPMain.refreshBtns()
         end
     end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua

@@ -79,6 +79,7 @@ function CSPMsg.onDragEnd()
     if offset.y < -50 then
         -- 刷数据
         NetProto.send.announcement_query()
+        NetProto.send.wforder_expiry_reminder()
     end
     if isShowdDragFrefresh then
         CSPMsg.repositon()
@@ -108,7 +109,7 @@ end
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function CSPMsg.procNetwork(cmd, succ, msg, paras)
     if (succ == NetSuccess) then
-        if cmd == NetProto.cmds.readNotice then
+        if cmd == NetProto.cmds.readNotice or cmd == NetProto.cmds.wforder_cancel_reminder then
             CSPMsg.setList()
         end
     end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua

@@ -120,7 +120,12 @@ function TRPSysMsgList:onClickCell(cell, data)
                 end
             end
         )
-        getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
+        NetProto.send.workFlowQuery({wfId = data.wfId}, "", 1, 
+        function(params)
+            if(params.result and params.result.data) then
+                getPanelAsy("PanelOrderDetail", onLoadedPanelTT, params.result.data[1])
+            end
+        end)
     else
         printw("没有处理该消息类型", data.NOTICETYPE)
     end