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

up

Browse Source
This commit is contained in:
陈彬
2020-07-09 08:50:24 +08:00
parent 13d25f4707
commit c523462b82
1818 changed files with 174940 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSplash.lua
View File

@@ -87,16 +87,18 @@ do
-- 加载hud alert
function CLLPSplash.addAlertHud()
local onGetObj = function(name, AlertRoot, orgs)
AlertRoot.transform.parent = CLUIInit.self.uiPublicRoot
AlertRoot.transform.localPosition = Vector3.zero
AlertRoot.transform.localScale = Vector3.one
NGUITools.SetActive(AlertRoot, true)
end
CLUIOtherObjPool.borrowObjAsyn("AlertRoot", onGetObj)
-- local onGetObj = function(name, AlertRoot, orgs)
-- AlertRoot.transform.parent = CLUIInit.self.uiPublicRoot
-- AlertRoot.transform.localPosition = Vector3.zero
-- AlertRoot.transform.localScale = Vector3.one
-- NGUITools.SetActive(AlertRoot, true)
-- end
-- CLUIOtherObjPool.borrowObjAsyn("ToastRoot", onGetObj)
getPanelAsy("ToastRoot", doShowPanel)
end
function CLLPSplash.hideFirstPanel()
do return end
---@type Coolape.CLPanelLua
local p = CLPanelManager.getPanel(MyMain.self.firstPanel)
if (p ~= nil and p.gameObject.activeInHierarchy) then

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

@@ -209,7 +209,7 @@ function CLLPStart.doEnterGame()
end
end
if useOldCurrGroup then
getPanelAsy("PanelConnect", onLoadedPanel)
getPanelAsy("PanelConnect", onLoadedPanelTT)
else
---@type _ParamTRPSelectGroup
local d = {}

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

@@ -105,7 +105,7 @@ function CSPMine.onGetLocation(locInfor)
)
getPanelAsy("PanelWebView", onLoadedPanelTT, {url = url})
else
CLAlert.add(location.msg, Color.yellow, 1)
CLAlert.add(location.msg, Color.white, 1)
if code == 8 or code == 9 or code == 5 then
-- 打开gps
MyLocation.self:guidSwitchGps()

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

@@ -82,7 +82,7 @@ function TRPConnect.getDataFromServer()
end,
5
)
-- NetProto.send.announcement_query()
NetProto.send.announcement_query()
-- NetProto.send.booking_query()
-- NetProto.send.replenish_query()
end

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

@@ -37,6 +37,7 @@ function TRPCustList:show()
uiobjs.InputSeachKey.value = ""
self:refreshFilterBtnStatus()
self:showList({})
showHotWheel()
NetProto.send.list_customers(self.filterValue, "", 1)
end
@@ -196,11 +197,11 @@ function TRPCustList:onSetFilter(filters, queryKey)
queryKey = trim(queryKey)
showHotWheel()
self.filterValue = self:getFilterStr()
-- if oldqueryKey == queryKey then
NetProto.send.list_customers(self.filterValue, queryKey, 1)
-- else
-- 会触发input的onChange事件
-- end
if oldqueryKey == queryKey then
NetProto.send.list_customers(self.filterValue, queryKey, 1)
else
-- 会触发input的onChange事件
end
end
-- 处理ui上的事件，例如点击等

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

@@ -113,7 +113,7 @@ function TRPLogin:setEventDelegate()
end
end,
function()
CLAlert.add("登录失败，请确保网络通畅！", Color.yellow, 1)
CLAlert.add("登录失败，请确保网络通畅！", Color.white, 1)
end
)
end,

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

@@ -59,7 +59,7 @@ function TRPModifyFiled:setEventDelegate()
ButtonOkay = function()
local err = uiobjs.element:checkValid()
if not isNilOrEmpty(err) then
CLAlert.add(err, Color.yellow, 1)
CLAlert.add(err, Color.white, 1)
return
end
Utl.doCallback(self.mdata.callback, self.mdata.key, uiobjs.Input.value)

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

@@ -44,7 +44,7 @@ function TRPNewCust:setData(paras)
else
self.isNewCust = true
self.mdata = {}
self.mdata.dealflag = "0"
self.mdata.dealFlag = "0"
self.mdata.custType = "0"
self.mdata.custFrom = "0"
self.mdata.serviceNo = NetProto.loginNo
@@ -240,7 +240,7 @@ function TRPNewCust:onPopupFieldValChg(go)
if isNilOrEmpty(err) then
self:sendModifymsg(el.jsonKey, el.value, false)
else
CLAlert.add(err, Color.yellow, 1)
MyUtl.toastW(err)
end
end
end
@@ -293,7 +293,7 @@ function TRPNewCust:sendModifymsg(key, val, isExtend)
else
self.mdata[key] = val
end
CLAlert.add("修改成功", Color.white, 1)
MyUtl.toastS("修改成功")
end
end
)
@@ -312,7 +312,7 @@ function TRPNewCust:onPopupFieldValChg4Extend(go)
-- 有修改，发送数据
self:sendModifymsg(el.jsonKey, el.value, true)
else
CLAlert.add(err, Color.yellow, 1)
MyUtl.toastE(err)
end
end
end
@@ -352,7 +352,7 @@ function TRPNewCust:setEventDelegate()
local err = uiobjs.DetailRoot:checkValid()
err = joinStr(err, uiobjs.ExtendFormRoot:checkValid())
if not isNilOrEmpty(err) then
CLAlert.add(err, Color.yellow, 1)
MyUtl.toastE(err)
return
end

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

@@ -62,7 +62,7 @@ end
function TRPResetPasswordStep3:procNetwork(cmd, succ, msg, paras)
if (succ == NetSuccess) then
if cmd == NetProto.cmds.updateLoginNoPwd then
CLAlert.add("密码修改成功", Color.green, 1)
CLAlert.add("密码修改成功", Color.green, 0)
hideTopPanel()
hideTopPanel()
hideTopPanel()

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

@@ -92,7 +92,7 @@ function TRPSelectCompany:setEventDelegate()
self.EventDelegate = {
ButtonRight = function()
if selectedCompany == nil then
CLAlert.add("请选择要进入的公司", Color.white, 1)
CLAlert.add("请选择要进入的公司", Color.white, 0)
return
end
-- 缓存一下，下次进来后就不用再先公司了