chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm

Browse Source
This commit is contained in:
陈彬
2020-08-06 22:56:33 +08:00
parent d8127ddae2
commit 113faa50ce
50 changed files with 1480 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopList.lua
View File

@@ -75,6 +75,9 @@ end
-- 当按了返回键时，关闭自己（返值为true时关闭）
function CLLPPopList.hideSelfOnKeyBack()
if NetProto and csSelf then
NetProto.removePanelListener(csSelf)
end
return true
end

3
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPPopTime.lua
View File

@@ -211,6 +211,9 @@ end
-- 当按了返回键时，关闭自己（返值为true时关闭）
function CLLPPopTime.hideSelfOnKeyBack()
if NetProto and csSelf then
NetProto.removePanelListener(csSelf)
end
return true
end

3
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPWebView.lua
View File

@@ -93,6 +93,9 @@ end
-- 当按了返回键时，关闭自己（返值为true时关闭）
function CLLPWebView.hideSelfOnKeyBack()
if NetProto and csSelf then
NetProto.removePanelListener(csSelf)
end
return true
end

18
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua
View File

@@ -48,6 +48,10 @@ function CSPMain.setBottomBtns()
CLUIUtl.resetList4Lua(objs.bottomGrid, objs.bottomCellPrefab, bottomBtns, CSPMain.initBottomBtn)
end
function CSPMain.refreshBtns()
CLUIUtl.resetList4Lua(objs.bottomGrid, objs.bottomCellPrefab, bottomBtns, CSPMain.initBottomBtn2)
end
function CSPMain.initBottomBtn(cell, data)
data.width = objs.bottomGrid.cellWidth
cell:init(data, CSPMain.onClickBottonBtn)
@@ -56,6 +60,10 @@ function CSPMain.initBottomBtn(cell, data)
end
end
function CSPMain.initBottomBtn2(cell, data)
cell:init(data, CSPMain.onClickBottonBtn)
end
function CSPMain.onClickBottonBtn(cell, data)
cell.luaTable.setSelected(true)
objs.LabelTitle.text = data.name
@@ -77,13 +85,11 @@ end
-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
function CSPMain.procNetwork(cmd, succ, msg, paras)
--[[
if(succ == 1) then
if(cmd == "xxx") then
-- TODO:
end
if (succ == NetSuccess) then
if cmd == NetProto.cmds.readNotice then
CSPMain.refreshBtns()
end
--]]
end
end
-- 处理ui上的事件，例如点击等

3
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRBasePanel.lua
View File

@@ -27,6 +27,9 @@ end
-- 当按了返回键时，关闭自己（返值为true时关闭）
function TRBasePanel:hideSelfOnKeyBack()
if NetProto and self.csSelf then
NetProto.removePanelListener(self.csSelf)
end
return true
end

11
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetailSimple.lua
View File

@@ -38,6 +38,8 @@ function TRPCustDetailSimple:init(csObj)
uiobjs.starGridPrefab2 = getChild(uiobjs.starGrid2.transform, "00000").gameObject
uiobjs.ExtendRoot = getCC(uiobjs.Table.transform, "ExtendRoot", "CLCellLua")
uiobjs.SysRoot = getCC(uiobjs.Table.transform, "SysRoot", "CLCellLua")
uiobjs.ButtonGet = getChild(self.transform, "AnchorBottom/offset/ButtonGet").gameObject
end
function TRPCustDetailSimple:prepareMoreData()
@@ -107,8 +109,9 @@ end
-- 设置数据
---@param paras _ParamTRPCustDetailSimple
function TRPCustDetailSimple:setData(paras)
self.isShowButtonGet = paras.isShowButtonGet
---@type _DBCust
self.mdata = paras
self.mdata = paras.cust
self.mdata._phoneNo = MyUtl.hidePhone(self.mdata.phoneNo)
if type(self.mdata.jsonStr) == "string" then
self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
@@ -130,6 +133,12 @@ end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPCustDetailSimple:show()
SetActive(uiobjs.ButtonGet, self.isShowButtonGet or false)
if self.isShowButtonGet then
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 40, 200)
else
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + 400 + 40, 0)
end
self.records = nil
self.orders = nil
local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList)

5
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua
View File

@@ -307,6 +307,11 @@ function TRPMyInfor:onGetImage(path)
function(content)
hideHotWheel()
if content and content.success then
local user = DBUser.getUserById(self.mdata.loginNo)
if user then
user.imageUrl = joinStr("file://", path)
self:setHeadInfor()
end
NetProto.send.personal_data_query()
MyUtl.toastS("头像更改成功")
else

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua
View File

@@ -396,7 +396,7 @@ function TRPNewCust:setEventDelegate()
cust,
function(content)
if content.success then
getPanelAsy("PanelCustDetail", onLoadedPanel, cust)
getPanelAsy("PanelCustDetail", onLoadedPanel, content.result)
end
hideHotWheel()
end

32
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
View File

@@ -24,6 +24,7 @@ function TRPNewFollow:init(csObj)
uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable")
uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
uiobjs.ButtonCustDetail = getChild(self.transform, "ButtonCustDetail")
end
---public 当有通用背板显示时的回调
@@ -130,6 +131,18 @@ end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPNewFollow:show()
if self.isNewFollow then
SetActive(uiobjs.ButtonCustDetail.gameObject, false)
else
---@type Coolape.CLPanelLua
local panel = CLPanelManager.getPanel("PanelCustDetail")
if panel and panel.gameObject.activeInHierarchy then
SetActive(uiobjs.ButtonCustDetail.gameObject, false)
else
SetActive(uiobjs.ButtonCustDetail.gameObject, true)
end
end
self:refreshContent()
SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
@@ -245,6 +258,25 @@ function TRPNewFollow:setEventDelegate()
end,
InputTask = function()
self:showExtentFiles(uiobjs.InputTask.value)
end,
ButtonCustDetail = function()
showHotWheel()
NetProto.send.get_customerById(
self.mdata.custId,
function(content)
hideHotWheel()
if content.success then
local cust = content.result
if cust then
getPanelAsy(
"PanelCustDetailSimple",
onLoadedPanelTT,
{cust = cust, isShowButtonGet = false}
)
end
end
end
)
end
}
end

35
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua
View File

@@ -11,7 +11,7 @@ function TRPNewFollowTask:init(csObj)
TRPNewFollowTask.super.init(self, csObj)
self:initFiledsAttr()
self:setEventDelegate()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 0)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight, 190)
---@type UIScrollView
uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
@@ -24,6 +24,7 @@ function TRPNewFollowTask:init(csObj)
uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable")
uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
uiobjs.ButtonCustDetail = getChild(self.transform, "ButtonCustDetail")
end
function TRPNewFollowTask:initFiledsAttr()
@@ -94,9 +95,20 @@ function TRPNewFollowTask:onShowFrame(cs)
end
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPNewFollowTask:show()
if self.isNewFollow then
SetActive(uiobjs.ButtonCustDetail.gameObject, false)
else
---@type Coolape.CLPanelLua
local panel = CLPanelManager.getPanel("PanelCustDetail")
if panel and panel.gameObject.activeInHierarchy then
SetActive(uiobjs.ButtonCustDetail.gameObject, false)
else
SetActive(uiobjs.ButtonCustDetail.gameObject, true)
end
end
self:refreshContent()
SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
@@ -244,6 +256,25 @@ function TRPNewFollowTask:setEventDelegate()
end
end
)
end,
ButtonCustDetail = function()
showHotWheel()
NetProto.send.get_customerById(
self.mdata.custId,
function(content)
hideHotWheel()
if content.success then
local cust = content.result
if cust then
getPanelAsy(
"PanelCustDetailSimple",
onLoadedPanelTT,
{cust = cust, isShowButtonGet = false}
)
end
end
end
)
end
}
end

5
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
View File

@@ -576,16 +576,17 @@ function TRPNewOrder:setEventDelegate()
order.wfType = "0" -- 0：正常工单，1：退货工单
-- 附件
local wfOptions = {}
if self.images and #(self.images) > 0 then
order.wfOptions = {}
for i, v in ipairs(self.images) do
table.insert(order.wfOptions, v.uploadInfor)
table.insert(wfOptions, v.uploadInfor)
end
end
-----------------------------------
showHotWheel()
NetProto.send.createWfInfo(
order,
wfOptions,
function(content)
if content.success then
MyUtl.toastS("订单创建成功")

8
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua
View File

@@ -9,7 +9,11 @@ function TRPOceanList:init(csObj)
TRPOceanList.super.init(self, csObj)
self:setEventDelegate()
self:initFilters()
MyUtl.setContentView(getChild(self.transform, "PanelContent"), MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40, 0)
MyUtl.setContentView(
getChild(self.transform, "PanelContent"),
MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 40,
0
)
uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
@@ -165,7 +169,7 @@ function TRPOceanList:onClickCell(cell, data)
if content.success then
local cust = content.result
if cust then
getPanelAsy("PanelCustDetailSimple", onLoadedPanelTT, cust)
getPanelAsy("PanelCustDetailSimple", onLoadedPanelTT, {cust = cust, isShowButtonGet = true})
end
end
end

3
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectProduct.lua
View File

@@ -65,7 +65,8 @@ function TRPSelectProduct:initCell(cell, data)
end
function TRPSelectProduct:onClickCell(cell, data)
getPanelAsy("PanelProductDetail", onLoadedPanelTT, data.data)
-- getPanelAsy("PanelProductDetail", onLoadedPanelTT, data.data)
cell.luaTable.selected(not data.isSelected)
end
function TRPSelectProduct:onEndList(tail)

8
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua
View File

@@ -71,6 +71,9 @@ function TRPSetting:setEventDelegate()
function()
Prefs.setCurrGroup(Prefs.getUserName(), "")
Prefs.setUserPsd("")
if DBUser then
DBUser.clean()
end
hideTopPanel(self.csSelf)
hideTopPanel()
hideTopPanel()
@@ -91,7 +94,10 @@ function TRPSetting:setEventDelegate()
pcall(releaseRes4GC, true)
end
--- 释放资源结束-------------------------------
if DBUser then
DBUser.clean()
end
--//TODO: 还要把已经下载了的附件也删除掉
pcall(cleanRes)

19
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua
View File

@@ -91,15 +91,18 @@ end
---@param data _DBMessage
function TRPSysMsgList:onClickCell(cell, data)
if data.NOTICETYPE == DBMessage.MsgType.Sys then
NetProto.send.readNotice(
data.ID,
function(content)
if content.success then
data.READFLAG = DBMessage.ReadFlag.readed
self.uiobjs.LoopTable:refreshContentOnly()
if data.READFLAG == DBMessage.ReadFlag.unread then
-- 通知已读了
NetProto.send.readNotice(
data.ID,
function(content)
if content.success then
data.READFLAG = DBMessage.ReadFlag.readed
self.uiobjs.LoopTable:refreshContentOnly()
end
end
end
)
)
end
getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
elseif data.NOTICETYPE == DBMessage.MsgType.Task4Cust then
getPanelAsy("PanelCustListProc", onLoadedPanelTT, data)