up

2020-07-26 11:12:32 +08:00
parent 67a1f974bf
commit 53e9c8d4ce
69 changed files with 15012 additions and 105 deletions
--- a/Assets/CoolapeFrameData/verControl/.resModifyDate.v
+++ b/Assets/CoolapeFrameData/verControl/.resModifyDate.v
@@ -7,7 +7,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/sound.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/things.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas.meta,132289129800000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/.DS_Store,132389408480000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/.DS_Store,132401183160000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/coolape.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust.meta,132370050250000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/guid.meta,132387593500000000
@@ -222,6 +222,18 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/add.png.meta,132389409210000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/close.png,132384986880000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/close.png.meta,132389409210000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_1.png,132400537720000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_1.png.meta,132401517690000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_2.png,132400537720000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_2.png.meta,132401517690000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_3.png,132400537720000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_3.png.meta,132401517690000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_4.png,132400537720000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_4.png.meta,132401517690000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_5.png,132400537720000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_5.png.meta,132401517690000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_6.png,132400537720000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_6.png.meta,132401517690000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt.png,132385002260000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt.png.meta,132389409210000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/ipt_bg.png,132385002400000000
@@ -301,7 +313,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua.meta,132289129810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/www.meta,132352746190000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132400734290000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab,132402066750000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab.meta,132289129810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt,132385110800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/localization/Chinese.txt.meta,132289129810000000
@@ -387,7 +399,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua.meta,132371159480000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua,132394484680000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua.meta,132289129810000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132399667510000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua,132401540890000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua.meta,132289221090000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png,132289129810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/curve-families.png.meta,132289129810000000
@@ -443,10 +455,12 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua.meta,132394685710000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua,132369454510000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellMessageGroup.lua.meta,132368777750000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua,132399719590000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua,132401498220000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellOrderList.lua.meta,132397024660000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellPopCheckbox.lua,132379832580000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellPopCheckbox.lua.meta,132378928680000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua,132401606510000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua.meta,132401496380000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua,132398108750000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductList.lua.meta,132390392540000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProductSelected.lua,132391745710000000
@@ -464,7 +478,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/.DS_Store,132289134230000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPBackplate.lua,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPBackplate.lua.meta,132289129800000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua,132399541870000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua,132400752070000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua.meta,132372977860000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua,132385986530000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua.meta,132289129800000000
@@ -504,7 +518,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConfirm2.lua.meta,132389285830000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua,132399715490000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPConnect.lua.meta,132367521030000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132400306090000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua,132401169540000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua.meta,132372871250000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua,132399684500000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua.meta,132370115140000000
@@ -534,9 +548,11 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua.meta,132388537450000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua,132397067400000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua.meta,132395119260000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132395565070000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua,132401446590000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua.meta,132388185120000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua,132400343730000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua,132402065770000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua.meta,132401163640000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua,132401170870000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua.meta,132395326130000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua,132381390070000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPPlaySoundRecord.lua.meta,132373879180000000
@@ -580,7 +596,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab.meta,132378243900000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab,132395500660000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab.meta,132378243860000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab,132395500650000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab,132401577650000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab.meta,132378243880000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab,132398858230000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputTime.prefab.meta,132398789220000000
@@ -596,7 +612,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBackplate.prefab.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab,132400528000000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelBindPhone.prefab.meta,132400498270000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab,132400508000000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab,132400739350000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab.meta,132372971640000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab,132399685140000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelComFilter.prefab.meta,132370155540000000
@@ -606,7 +622,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm2.prefab.meta,132389286040000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab,132395124770000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConnect.prefab.meta,132367521230000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132399733230000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab,132401417390000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab.meta,132372671680000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab,132397067510000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab.meta,132370116810000000
@@ -630,7 +646,7 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMask4Panel.prefab.meta,132289129800000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab,132396077150000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab.meta,132290983200000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab,132395124950000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab,132400740970000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab.meta,132375465810000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab,132395124950000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab.meta,132373063990000000
@@ -648,13 +664,15 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta,132395131650000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab,132395497470000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab.meta,132388185850000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab,132401612250000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab.meta,132401163870000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab,132399685140000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta,132395326430000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab,132395124930000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab.meta,132373879390000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab,132395125200000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab.meta,132378946840000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab,132395124920000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab,132400744210000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab.meta,132372993660000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab,132398858240000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopTime.prefab.meta,132398741890000000
@@ -662,11 +680,11 @@
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelProductDetail.prefab.meta,132398113520000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelProductList.prefab,132398127210000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelProductList.prefab.meta,132398104410000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab,132400734290000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab,132400745310000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab.meta,132357319780000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab,132395124910000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab,132400745300000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab.meta,132357323920000000
-/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab,132395124910000000
+/Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab,132400745310000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab.meta,132357326010000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSceneManager.prefab,132395124900000000
 /Users/chenbin/Documents/working/devSpace/u3d/tianrunCRM/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSceneManager.prefab.meta,132289129800000000
--- a/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v
+++ b/Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v
--- a/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v
+++ b/Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v
@@ -1,10 +1,12 @@
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendField.lua,dba644a81c6214e4804eaebc0931382f
 trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
 trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderDetail.unity3d,ba4004bf08f5dca76086707d91278c39
 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a
 trCRM/upgradeRes/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
 trCRM/upgradeRes/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c
 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82
 trCRM/upgradeRes/other/uiAtlas/order/Android/add.unity3d,bf6728a3e41783ee7d63c130107a16e1
-trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,2dd00dde001dd24d01df96a841ce2f91
+trCRM/upgradeRes/other/uiAtlas/order/Android/icon_5.unity3d,b6c45607f279eff0f963b63ea63f8255
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015
 trCRM/upgradeRes/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be
 trCRM/upgradeRes/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb
@@ -12,21 +14,23 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustFilterGroup.lua,93cdb67f51a62110
 trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm.unity3d,cc945b5bffde4fec044e5660d2a5fe82
 trCRM/upgradeRes/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14
-trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,a662261e3fd155f94337506d37a8b723
+trCRM/upgradeRes/priority/atlas/Android/atlasAllReal.unity3d,bf31ec77859261007d3752c27b76c9a5
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52
 trCRM/upgradeRes/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473cff5bfd8f1443b8a7
 trCRM/upgradeRes/priority/ui/panel/Android/PanelPopTime.unity3d,a07ebf15db9eb6f77473491afcd95a57
 trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381
-trCRM/upgradeRes/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a
+trCRM/upgradeRes/other/uiAtlas/order/Android/icon_3.unity3d,4107b5fcc1b5ad0d073bf480cf35383b
 trCRM/upgradeRes/priority/ui/panel/Android/PanelOrderList.unity3d,5dd7ac6a2fe56c5335b9d8ca90861289
 trCRM/upgradeRes/priority/lua/db/DBRoot.lua,2de10366932579d84506e9ca7aff0971
 trCRM/upgradeRes/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6
 trCRM/upgradeRes/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099
 trCRM/upgradeRes/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc7c1734c79206bd0962e0
 trCRM/upgradeRes/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514
 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,01edf3085f83b233b61ca948bc0e1b0b
 trCRM/upgradeRes/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d
 trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d
-trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,5663378b77289e7d351bdf90a6aabcc2
+trCRM/upgradeRes/priority/lua/ui/panel/CLLPCalender.lua,06ea21012958c4b42ca8122d1515ed1f
 trCRM/upgradeRes/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d
 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe
 trCRM/upgradeRes/priority/lua/toolkit/LuaUtl.lua,cde8ec272382f95abe0320714201b387
@@ -37,13 +41,17 @@ trCRM/upgradeRes/priority/lua/net/NetProtoUsermgrClient.lua,f65df462666ca9fca7f1
 trCRM/upgradeRes/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c40ebcc427a5c05e8
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833
 trCRM/upgradeRes/priority/ui/other/Android/InputToggles.unity3d,847a6d2cbf79b767094155404ef708b1
 trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
 trCRM/upgradeRes/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellProccessHis.lua,aa71710425778f3c33471a2cc00e5d7b
 trCRM/upgradeRes/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c
 trCRM/upgradeRes/priority/ui/other/Android/InputTime.unity3d,a448a640c08bd93fff4605cb5f73dde9
 trCRM/upgradeRes/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c856c6082beb3559e3
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa
 trCRM/upgradeRes/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
 trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowFilter.unity3d,04f6dc42d3bd121bb06cfbf3703fecff
 trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSetting.lua,6d7ee047a01c11be7f117b434a39db1a
 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
 trCRM/upgradeRes/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
@@ -59,11 +67,13 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/important.unity3d,17f0d1ab4133e3a654
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform1.lua,d31b42aa50089defb22bde59b5c0474d
 trCRM/upgradeRes/priority/lua/ui/panel/TRPConfirm2.lua,bd0ea9f50708dedd598b517c1dfc739f
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069716943cc112a2946b22efddd
 trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0
 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
 trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f
 trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd
 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,c3f8563afb97d79992a35de8c3ee9ba6
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524
 trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf
 trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,cd2044775611a8ff79fafca8694d981c
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,756c08832a0f69ec66e386da4fd35ca7
@@ -82,7 +92,7 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6ee
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b
 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680
 trCRM/upgradeRes/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836
-trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,b02e9a081f66dc6b25ff39c64c896fe4
+trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,1c34bab7feeb2efde0ca860eb30d6029
 trCRM/upgradeRes/priority/ui/panel/Android/PanelComFilter.unity3d,3d4cb175f54b68fde13d37ff20e2e722
 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderMonth.lua,a0528f4babd35af565034c810be1c101
 trCRM/upgradeRes/priority/lua/db/DBTextures.lua,fd2b6a27eee4bcec69b1fd1b4bec92ba
@@ -97,7 +107,6 @@ trCRM/upgradeRes/priority/lua/toolkit/CLLPrintEx.lua,86d891ec4d8bfa5533704c142fc
 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep1.lua,65a7251f84d25114372f7b50d5c9d84f
 trCRM/upgradeRes/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e79ce2e03f2fed3baea
 trCRM/upgradeRes/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea
 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
 trCRM/upgradeRes/other/uiAtlas/mine/Android/sms.unity3d,9d63dc8f82de2f772e544b8c8518021b
 trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe
 trCRM/upgradeRes/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40
@@ -120,7 +129,8 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914bcfcd0ca9
 trCRM/upgradeRes/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118
 trCRM/upgradeRes/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3
-trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd
+trCRM/upgradeRes/other/uiAtlas/order/Android/icon_4.unity3d,cb33f3103d8fb3c77e2f1683b1c89a3d
 trCRM/upgradeRes/priority/ui/panel/Android/PanelPopList.unity3d,1683cd2993884b1b11244d1f5ee700f4
 trCRM/upgradeRes/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1
 trCRM/upgradeRes/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501
@@ -131,10 +141,9 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelNewOrder.unity3d,068f97e365e79ae
 trCRM/upgradeRes/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a880c223d677605faf4
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellFollowList.lua,0939d88d43a38ddad4dfdfdad7fc2136
 trCRM/upgradeRes/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a
-trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893
+trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,f5affe00dd461e9a299bd64ce3fc80bb
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowSimple.lua,720f3ff97d9b71a9108fd949bf779b30
-trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa
+trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3
 trCRM/upgradeRes/priority/ui/other/Android/Frame2.unity3d,d057ea60bdf5dd821705a9f7e67e5171
 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2bc7180f9d280014726814ec8b9fe
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3
@@ -144,17 +153,18 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellOrderList.lua,4dc48eddbf96438192abc8f1e6dff153
 trCRM/upgradeRes/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e
 trCRM/upgradeRes/priority/lua/ui/panel/TRPComFilter.lua,5eee71df7de0501de9f9c5ea030ea334
 trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,eab2f8ce29ba9910d376a04371876765
 trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowList.lua,29858c124459a8e71aace8ebff600c04
 trCRM/upgradeRes/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
 trCRM/upgradeRes/priority/lua/db/DBOrder.lua,8e8be2e549257d747b99e5149681ab19
 trCRM/upgradeRes/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244
 trCRM/upgradeRes/priority/lua/ui/panel/TRPLogin.lua,e18549cd43b8e476b5c2d1414594c592
 trCRM/upgradeRes/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7
 trCRM/upgradeRes/other/uiAtlas/order/Android/icon_2.unity3d,21a6309f8a86dcd7c2f90ece3e525f74
 trCRM/upgradeRes/priority/ui/other/Android/InputCheckboxs.unity3d,a929e8a7fd7ba3bc89bdda0686b6d7dd
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0
-trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,0c9076d943ba5d1b3ac4da7726e7b73a
+trCRM/upgradeRes/priority/lua/ui/panel/TRPNewOrder.lua,686c73773d7c66f72e12518789752d31
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
 trCRM/upgradeRes/priority/lua/ui/panel/TRPMyInfor.lua,be7a258652e4f573ef52224b6fdfc105
 trCRM/upgradeRes/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
@@ -163,14 +173,14 @@ trCRM/upgradeRes/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e2237709
 trCRM/upgradeRes/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
 trCRM/upgradeRes/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad
 trCRM/upgradeRes/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8
-trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1
+trCRM/upgradeRes/priority/ui/panel/Android/PanelModifyFiled.unity3d,bba5eea285cdb4d112f91b8c72524093
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMyInfor.unity3d,94f1b88c66705acd7f798affef48c540
 trCRM/upgradeRes/priority/lua/ui/panel/TRPProductList.lua,17c97e4927cb90121178558f48513b07
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSetting.unity3d,8de8cb431ae2daf23d4d8ff940e5ef81
 trCRM/upgradeRes/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee
 trCRM/upgradeRes/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef
-trCRM/upgradeRes/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52
+trCRM/upgradeRes/other/uiAtlas/order/Android/icon_6.unity3d,8b322b9a8ef8b6d91d677c61eb98ab30
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,c38ffa7d9111dc4bedeaba97a6d5a661
 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustList.unity3d,3fb44d3955035fb3c7d7caaeb8e669ad
@@ -192,7 +202,6 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/screen.unity3d,b488e337b72f2cd07dadd
 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_about.unity3d,3da9c9416127c69bc20c281f44520f6e
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustStar.lua,ed39330cf68d1e1e062bc8311d1e8d44
 trCRM/upgradeRes/other/uiAtlas/logo/Android/512.unity3d,c51445206c8f94af0fcbbe4befa8ae05
 trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,8ce0b645f948233e6328b20a07a5999c
 trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
@@ -206,7 +215,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustProc.lua,3f9f33de3630a0346395205
 trCRM/upgradeRes/priority/ui/panel/Android/PanelProductList.unity3d,3a775b6ec87e8293ff7e730ab7ed17d8
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f
 trCRM/upgradeRes/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d
-trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,79cec1c89fa7c63a5c598b97776345ff
+trCRM/upgradeRes/priority/lua/toolkit/MyUtl.lua,220a6a0d59283c92de5c5189ac5d189b
 trCRM/upgradeRes/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81
 trCRM/upgradeRes/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40
@@ -216,15 +225,15 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua,d49fda1549fd63822105fc7c
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3420fa9377a23db86a
 trCRM/upgradeRes/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19
 trCRM/upgradeRes/priority/ui/panel/Android/PanelBindPhone.unity3d,b4aca0f337304fefc9997c00886e75c1
-trCRM/upgradeRes/priority/ui/panel/Android/PanelFollowFilter.unity3d,04f6dc42d3bd121bb06cfbf3703fecff
+trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e
-trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,2f18b6d6198b1678ba10a72dcdd1fbaa
+trCRM/upgradeRes/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,092e641f83eef5ea9d25007ffcc73c32
 trCRM/upgradeRes/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21
 trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
 trCRM/upgradeRes/other/uiAtlas/order/Android/sort.unity3d,76c7bda76e065beeb8fd930e8f7d2fc8
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
 trCRM/upgradeRes/priority/lua/ui/panel/CSPTasks.lua,2f0072451a922be026f9192dee40c7a2
-trCRM/upgradeRes/priority/lua/ui/panel/TRPResetPasswordStep2.lua,01edf3085f83b233b61ca948bc0e1b0b
+trCRM/upgradeRes/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
 trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua,07bca83a32baeab61818e02f878007e1
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSceneManager.unity3d,c83769673e1c0793d88547c05d20a82e
 trCRM/upgradeRes/other/uiAtlas/cust/Android/funnel.unity3d,cb6f2a2b14c53ed86c122a4da2c3984b
@@ -242,7 +251,7 @@ trCRM/upgradeRes/other/uiAtlas/main/Android/icon_news.unity3d,3a1afa79dbc710c3dd
 trCRM/upgradeRes/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectCompany.lua,28ca57d169af022ec621dece879bdcfc
 trCRM/upgradeRes/other/uiAtlas/cust/Android/border.unity3d,bf2cd1f2bdb27efc9c2e27943dcb8974
-trCRM/upgradeRes/priority/lua/bio/BioInputStream.lua,b3f94b1017db307427c6e39a8ee4d60e
+trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_set2.unity3d,e528f24899ef583c113ca69bbb510ebd
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPConfirm.lua,e652190d378dc120a0805230692f0fc9
 trCRM/upgradeRes/other/uiAtlas/public/Android/radio.unity3d,4f2c80de666b97ea02084f059d2a5ed0
@@ -251,7 +260,6 @@ trCRM/upgradeRes/other/uiAtlas/cust/Android/play2.unity3d,0b6ede536ea7b5084a1de2
 trCRM/upgradeRes/other/uiAtlas/cust/Android/check.unity3d,aa21836aaae62d8f719a930aefe37ea7
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellSysMessageList.lua,1ce46f4b3a1a8b728e447c12e7df1831
 trCRM/upgradeRes/priority/lua/json/rpc.lua,28c2f09ceb729d01052d8408eed0b57a
 trCRM/upgradeRes/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,896c4b35a6cd0d4f86ed5c0ba532ea00
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,47ac1164b1ffb27397953ccb032fd2d7
 trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,d461935432083ba62e8176bd4a212409
@@ -259,7 +267,7 @@ trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c31
 trCRM/upgradeRes/priority/lua/net/NetProto.lua,ffbb542d7a01231611661e26dcc38931
 trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e
-trCRM/upgradeRes/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
+trCRM/upgradeRes/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f
 trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_data.unity3d,70dd24370cd051acb45bab65464459ee
 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollowTask.unity3d,34c682a1e2b1d13643fb9bcef8cfbf29
 trCRM/upgradeRes/priority/lua/toolkit/CLLUpdateUpgrader.lua,bfff3548aa7cd983c3de46e5defae423
@@ -270,22 +278,22 @@ trCRM/upgradeRes/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d
 trCRM/upgradeRes/priority/lua/ui/panel/TRPCustList.lua,75c4f8568af9d7c5a72437d42097e64f
 trCRM/upgradeRes/priority/ui/panel/Android/PanelMine.unity3d,08da3fb9aee4ab666acb8b15eb1b01bf
 trCRM/upgradeRes/priority/lua/cfg/DBCfg.lua,3d0e60dbcdaa61b8553eee17f4d68b32
 trCRM/upgradeRes/priority/lua/ui/panel/CSPMine.lua,2dd00dde001dd24d01df96a841ce2f91
 trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0ce363c5a8e2a
-trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
+trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
 trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
 trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,069e9d7a4f265817731ac790a228dce0
 trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
 trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29
 trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
 trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderDetail.lua,387d5f91b0a77e929f26bc6b2bb5b755
 trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14ac42561ab0a01
 trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
 trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14
 trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b
-trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,8af659fb0156386d86542db4fd483a7c
+trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,a9a94ffc96bcd3c438fce72680aedb8e
-trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,4424391a3b707f82c3cc0c5307adffe0
+trCRM/upgradeRes/priority/ui/panel/Android/PanelCalender.unity3d,d4ff9ac61c52d900f7b0613b50fecbef
 trCRM/upgradeRes/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38
 trCRM/upgradeRes/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
@@ -293,7 +301,6 @@ trCRM/upgradeRes/priority/lua/ui/panel/TRPSysMsgDetail.lua,6266494c653deda1b5a39
 trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectProduct.lua,827ce406521163bc4719c10adf4b7b38
 trCRM/upgradeRes/other/uiAtlas/cust/Android/get.unity3d,04bf77dfe50c327c85966f9fdd1350c6
 trCRM/upgradeRes/other/uiAtlas/cust/Android/more.unity3d,f05eafb34336f1fcb5d614ad30217011
 trCRM/upgradeRes/priority/ui/panel/Android/PanelCustListProc.unity3d,5d32d590b8c5383f6c523b06132fb12f
 trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/hotWheel_prog.unity3d,0c507387d1167154fe67f1719c3531bd
 trCRM/upgradeRes/priority/lua/ui/panel/TRPProductDetail.lua,cba4b2f5ee3df14ce326ed032d987e81
 trCRM/upgradeRes/other/uiAtlas/cust/Android/search.unity3d,7420a0a7cc725ff494761009ebe811d7
@@ -307,27 +314,29 @@ trCRM/upgradeRes/priority/ui/panel/Android/PanelHotWheel.unity3d,7a3ae06303e65f5
 trCRM/upgradeRes/priority/ui/panel/Android/PanelProductDetail.unity3d,3045ed5f70cc023771da5631dc0abbc1
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/password.unity3d,ae473953dbd84c6f9a4e736f5101f4a2
 trCRM/upgradeRes/other/uiAtlas/mine/Android/log_bg.unity3d,fd1470749300ec31bcbe7f59686152d7
-trCRM/upgradeRes/other/uiAtlas/cust/Android/suc.unity3d,0ec570e88b0dfc2b82a4f8e5bb84edc0
+trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
 trCRM/upgradeRes/priority/lua/net/CLLNet.lua,947abdf2c019f44a26211acf6f31e2dd
 trCRM/upgradeRes/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a87fb6668333774da19a6
 trCRM/upgradeRes/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua,035626bac75e16f15bc825f6e0ded212
 trCRM/upgradeRes/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
-trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
+trCRM/upgradeRes/priority/lua/db/DBRoot.lua,2de10366932579d84506e9ca7aff0971
 trCRM/upgradeRes/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f
 trCRM/upgradeRes/priority/lua/ui/panel/TRPPlaySoundRecord.lua,ded1f35f04bd0d84bfa8fd74ddf926aa
 trCRM/upgradeRes/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c
 trCRM/upgradeRes/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af
 trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_task.unity3d,a4f148630912414f1d5e94d5a6a02e2d
 trCRM/upgradeRes/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad680f4e8a0f7e71223
 trCRM/upgradeRes/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a
 trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectProduct.unity3d,9a4225d5443f6caad4b35b68313325d8
-trCRM/upgradeRes/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
+trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderList.lua,bf87fb3cfa24b582826b3b4dfc62312a
 trCRM/upgradeRes/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58
 trCRM/upgradeRes/other/uiAtlas/order/Android/icon_1.unity3d,47e903d836aa8bc08317cdc45d61907e
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8
 trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e
 trCRM/upgradeRes/other/uiAtlas/order/Android/shut.unity3d,7a13d4859459f052143028b0656aef43
 trCRM/upgradeRes/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
 trCRM/upgradeRes/priority/lua/ui/panel/TRPFollowFilter.lua,56e4e5ba6ec4f9c368e5c1f2f724a994
-trCRM/upgradeRes/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
+trCRM/upgradeRes/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e
 trCRM/upgradeRes/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
-trCRM/upgradeRes/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
+trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
 trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua,604691a3a96bbdb9cf88f20e2adf027c
--- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v
+++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v
--- a/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v
+++ b/Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v
@@ -1,10 +1,11 @@
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendField.lua,dba644a81c6214e4804eaebc0931382f
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d,ba4004bf08f5dca76086707d91278c39
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off.unity3d,69b1b8dfdfc0afecdd9fdd9dbd5fb98a
 trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/icon_26_no.unity3d,c16242cb394b0720d1c2e1e0289c1c4a
 trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo.unity3d,849e7b3d08491890c6e021896c8ec39c
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_2.unity3d,3ce2779b6bfbaef177e0446661ec2f82
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/add.unity3d,bf6728a3e41783ee7d63c130107a16e1
-trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc
+trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_5.unity3d,b6c45607f279eff0f963b63ea63f8255
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_5.unity3d,7edfb781be444c18d010e53386334015
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/limt.unity3d,d48f498211748b192a7b10a932aec8be
 trCRM/upgradeRes4Publish/priority/lua/toolkit/BitUtl.lua,82e46240625342d5afe8ea68a609c9cb
@@ -13,12 +14,14 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d,cc945b5b
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/oean.unity3d,3cea16f73014b0b19797a3213467af0a
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellRecord.lua,ca94ed9775ca9f03569e49d4ad1f3e14
-trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,a662261e3fd155f94337506d37a8b723
+trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d,bf31ec77859261007d3752c27b76c9a5
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52
 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputMultText.unity3d,e4554fe97f92473cff5bfd8f1443b8a7
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopTime.unity3d,a07ebf15db9eb6f77473491afcd95a57
 trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_people.unity3d,7ff36c94c74e4a8e09e1896978c13381
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d,4107b5fcc1b5ad0d073bf480cf35383b
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderList.unity3d,5dd7ac6a2fe56c5335b9d8ca90861289
 trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,2de10366932579d84506e9ca7aff0971
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/choose.unity3d,e31379a28ab86046414db1fb23cd2bf6
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/position.unity3d,e60132eb1d8cfbc71046611111fd3099
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/bg.unity3d,37a58d5a79d3691b2c32a74422721ee7
@@ -26,7 +29,7 @@ trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMsg.unity3d,e0d5c4eb46bc
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_unread.unity3d,f1b29d8592cdd49f3a526be6b524ad9f
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLToastRoot.lua,5809bbdd4b059a64e8129c55b146b514
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d,2e0769c464e38c238cbf8e734f45303d
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,5663378b77289e7d351bdf90a6aabcc2
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua,06ea21012958c4b42ca8122d1515ed1f
 trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/1.unity3d,7654268e7c4bc7cea47f584d306f503d
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_1.unity3d,aca2dfb1fbece45c7333447195bc7efe
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_visible.unity3d,884f69f0dd0c2a58af5ad891f23e985e
@@ -38,6 +41,7 @@ trCRM/upgradeRes4Publish/priority/lua/toolkit/CLLVerManager.lua,39b154e796d60c2c
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/button.unity3d,efe93bdf676ef2d5195d52abe42ab833
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua,cba4b2f5ee3df14ce326ed032d987e81
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellWWWProgress.lua,ec0258e77f76c8b681d0f02e7a5ff342
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua,aa71710425778f3c33471a2cc00e5d7b
 trCRM/upgradeRes4Publish/priority/lua/public/CLLPool.lua,3e6a97eb07cfdff7c399eb3e956ba77c
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductDetail.unity3d,3045ed5f70cc023771da5631dc0abbc1
 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputTime.unity3d,a448a640c08bd93fff4605cb5f73dde9
@@ -45,8 +49,8 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/msg.unity3d,7f98a936769044c8
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_bg_20.unity3d,8e81d4a650273e24b7f129d1f814f5fa
 trCRM/upgradeRes4Publish/priority/ui/other/Android/Frame1.unity3d,622d3ea7e4f9aa1d11f6492cabffa445
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_check.unity3d,d9092d78af855e769abff1223f650a9d
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,be7a258652e4f573ef52224b6fdfc105
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d,068f97e365e79ae11418ff16a1cf2f89
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSetting.lua,6d7ee047a01c11be7f117b434a39db1a
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_news2.unity3d,a35e85b68569bf1adc16bdee3a609fdd
 trCRM/upgradeRes4Publish/priority/ui/other/Android/AlertRoot.unity3d,c30044a6e7bf14ddb7a87c4f51d1f073
@@ -66,7 +70,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/right.unity3d,b991891eb2939a
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,c3f8563afb97d79992a35de8c3ee9ba6
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,eab2f8ce29ba9910d376a04371876765
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,bf87fb3cfa24b582826b3b4dfc62312a
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,cd2044775611a8ff79fafca8694d981c
 trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,87bcfc58c6d99be6fe89102d7323c95e
@@ -84,7 +88,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSceneManager.lua,b1b848791df3
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/full_star.unity3d,6f6aa242a0a793b6eea6edc8c8de437d
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/ToastRoot.unity3d,412c3557a187689acaa1d79d7d555836
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,b02e9a081f66dc6b25ff39c64c896fe4
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d,1c34bab7feeb2efde0ca860eb30d6029
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelComFilter.unity3d,3d4cb175f54b68fde13d37ff20e2e722
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderMonth.lua,a0528f4babd35af565034c810be1c101
 trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua,fd2b6a27eee4bcec69b1fd1b4bec92ba
@@ -114,6 +118,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee8
 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProductList.lua,078920175f85f04660584bddb359b7ab
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_enterprise.unity3d,59d7dae785dea4fa88b52f40a8d167cf
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc75bdbeaeeceb39
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8
@@ -123,7 +128,8 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/play.unity3d,ae412dff53c914b
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWWWProgress.unity3d,d9cbe9d08670eedbee77ba97330f4118
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/ipt.unity3d,68e98b41456c62324871a1c86caefafc
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform3.lua,f83300f176e1c35d62e00e69539998f3
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,a0ba753b0deecff9a85c8cd2b60013dd
+trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d,cb33f3103d8fb3c77e2f1683b1c89a3d
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d,1683cd2993884b1b11244d1f5ee700f4
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua,24f616b9384dc0eefa9955fabb1d05f1
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConnect.unity3d,f80a29df002dc606e21fd69fbea40021
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellPopCheckbox.lua,25adbf58789186d43c15cfe65d2e8501
@@ -135,7 +141,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMine.lua,2dd00dde001dd24d01df9
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua,0939d88d43a38ddad4dfdfdad7fc2136
 trCRM/upgradeRes4Publish/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/follow.unity3d,fffb80792073e4f2849c743d061d685a
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,c3e2e353bd7e604e384a3e9e35d37893
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d,f5affe00dd461e9a299bd64ce3fc80bb
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_2.unity3d,3bcd13c7b2003a1bcf92aaa4d2dbf6fe
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua,720f3ff97d9b71a9108fd949bf779b30
 trCRM/upgradeRes4Publish/priority/lua/public/CLLQueue.lua,065303c980678b25b11854bfec1690f3
@@ -144,37 +150,37 @@ trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/hotWheel_bg.unity3d,b5d2
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellMessageGroup.lua,14a960604f49e2b34e0c115561bb45a3
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d,fd4ee0f1eee52f71f6827985ccdca38a
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_set.unity3d,c53cddeef8f62d67a2a4110447466536
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69
+trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellOrderList.lua,4dc48eddbf96438192abc8f1e6dff153
 trCRM/upgradeRes4Publish/priority/lua/city/CLLCity.lua,b7ee9fffacb28d09ab08728a49dedc8e
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPComFilter.lua,5eee71df7de0501de9f9c5ea030ea334
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopCheckBoxs.unity3d,d3a8693784b6cc7ff00ee50fc8625f69
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua,29858c124459a8e71aace8ebff600c04
 trCRM/upgradeRes4Publish/priority/lua/public/CLLStack.lua,579069654d88a15e43c818a6b8079b15
 trCRM/upgradeRes4Publish/priority/lua/db/DBOrder.lua,8e8be2e549257d747b99e5149681ab19
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua,f72d285313cb63ff775722473af9a5f9
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_head_bg.unity3d,20f535a454df3fff37230bbcc3bc8244
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPLogin.lua,e18549cd43b8e476b5c2d1414594c592
 trCRM/upgradeRes4Publish/priority/lua/cfg/DBCfgTool.lua,a6760e05dcc5f91202e3659179a464e7
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d,21a6309f8a86dcd7c2f90ece3e525f74
 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputCheckboxs.unity3d,a929e8a7fd7ba3bc89bdda0686b6d7dd
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellGuidPage.lua,7b3c3f567c3e0d92065913101b08ddd0
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,0c9076d943ba5d1b3ac4da7726e7b73a
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua,686c73773d7c66f72e12518789752d31
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPLoginCoolape.lua,5873be60edc8f1407dc9fb53ec567ebf
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMyInfor.lua,be7a258652e4f573ef52224b6fdfc105
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e
 trCRM/upgradeRes4Publish/priority/lua/bio/BioOutputStream.lua,84fd65eb0d1a166e77447f61254d62b5
 trCRM/upgradeRes4Publish/priority/lua/db/DBMessage.lua,a80d8448cfdaebb072b3d7ec5f40bb60
 trCRM/upgradeRes4Publish/priority/lua/db/DBStatistics.lua,e64ad532dabb2cb70c4053e223770969
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCusFilter.lua,f0452e3d6cfa59244dc7b9dd8f5a475d
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/company_bg.unity3d,2153c725242937cf5fce727da9626dad
 trCRM/upgradeRes4Publish/priority/lua/public/CLLPrefs.lua,1719d57c97fe0d8f2c9d1596cb6e2ac8
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,331f7d063411e0c231eaeccee4df73d1
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d,bba5eea285cdb4d112f91b8c72524093
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMyInfor.unity3d,94f1b88c66705acd7f798affef48c540
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua,17c97e4927cb90121178558f48513b07
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSetting.unity3d,8de8cb431ae2daf23d4d8ff940e5ef81
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm2.unity3d,d199779b559cef259ebbfe686ba42703
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_peo.unity3d,9c9562e576e93bacb7f2a0d0f08523ee
 trCRM/upgradeRes4Publish/priority/lua/bio/BioUtl.lua,f64afdd9ccdf943f5d4ba2fc3c3241ef
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSysMsgDetail.unity3d,91e06baebc3ec7e9b2a5c108ced50b52
+trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d,8b322b9a8ef8b6d91d677c61eb98ab30
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMask4Panel.unity3d,ed5e0d7cc2ba83e33435bddc760b5f9d
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua,c38ffa7d9111dc4bedeaba97a6d5a661
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustList.unity3d,3fb44d3955035fb3c7d7caaeb8e669ad
@@ -185,6 +191,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/remove.unity3d,b460d3a275be8
 trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772
 trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,9f02607d08c63b2818e5d5bd97545914
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,dc088058987b435c998a9709297a88e6
 trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
@@ -199,7 +206,7 @@ trCRM/upgradeRes4Publish/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSplash.lua,8ce0b645f948233e6328b20a07a5999c
 trCRM/upgradeRes4Publish/priority/ui/other/Android/reportform2.unity3d,de5097255fc8126d368e9693106347dc
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
-trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,9f02607d08c63b2818e5d5bd97545914
+trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
 trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_work.unity3d,8a889dc1fe3b56bff4435f441ce5580e
 trCRM/upgradeRes4Publish/other/uiAtlas/guid/Android/2.unity3d,6b83b2d5a2dfc1f08744077e669c3ed0
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_order.unity3d,26bc3076031940af6069ef5a9143fb5a
@@ -208,7 +215,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/task.unity3d,737ce6fdd55d764
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductList.unity3d,3a775b6ec87e8293ff7e730ab7ed17d8
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/close.unity3d,1b49cc4db64de50d13ee029447a3d49d
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/on_off_bg.unity3d,96fcd3ce2ee9ffa2941973cefea6511d
-trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,79cec1c89fa7c63a5c598b97776345ff
+trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua,220a6a0d59283c92de5c5189ac5d189b
 trCRM/upgradeRes4Publish/priority/lua/net/CLLNetSerialize.lua,30c24f11d46d7b887bf32177acb92c81
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/button.unity3d,ff51e79201ecbd61247f8db792009aff
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellEmptySpace.lua,a009d0f2c20eb5239f430d2b30ecef40
@@ -220,7 +227,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua,518461e7bf8f3b3
 trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/phone.unity3d,8a7c9fe465edfd39de5ac774c6795b19
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelBindPhone.unity3d,b4aca0f337304fefc9997c00886e75c1
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/order.unity3d,0b796b27d351f49010fb3c3921f1a843
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,2f18b6d6198b1678ba10a72dcdd1fbaa
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d,092e641f83eef5ea9d25007ffcc73c32
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua,afbf445995d42e012635f3d355ce6d9e
 trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/user.unity3d,dc5411391ea0beae4ecc9a4541f1cb21
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep3.lua,0d3be662e0a236b709d8f1f9d6b3321e
@@ -274,16 +281,18 @@ trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed4
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
 trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollow.unity3d,069e9d7a4f265817731ac790a228dce0
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLCellServer.lua,1e9de9f0b4bbc703296808c1ba179c29
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua,387d5f91b0a77e929f26bc6b2bb5b755
 trCRM/upgradeRes4Publish/priority/ui/other/Android/InputText.unity3d,7b419ca2ec17017ed14ac42561ab0a01
 trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewCust.unity3d,059a6d8bc6830d6eea05685f17829c14
-trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,8af659fb0156386d86542db4fd483a7c
+trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua,a9a94ffc96bcd3c438fce72680aedb8e
-trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,4424391a3b707f82c3cc0c5307adffe0
+trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d,d4ff9ac61c52d900f7b0613b50fecbef
 trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/del.unity3d,453d38d3af66e108db0d2bb827426bd7
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPWebView.lua,093deec807e28be04df4d593bcff9e38
 trCRM/upgradeRes4Publish/priority/lua/json/json.lua,a2914572290611d3da35f4a7eec92022
@@ -311,7 +320,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/coolape/Android/logo.unity3d,c712e48e071a
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICalenderDay.lua,6e7400e2dd535ced93960c1e18fa2458
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua,035626bac75e16f15bc825f6e0ded212
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPPopCheckBoxs.lua,508171a924c113573b01a396e8217cc2
-trCRM/upgradeRes4Publish/priority/lua/db/DBRoot.lua,2de10366932579d84506e9ca7aff0971
+trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/news_bg_num1.unity3d,2ed88c277f983b8d1a3dedf73d735239
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check.unity3d,d11f6d5b126c6a0fbf34ced5734cb66f
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/check_full.unity3d,282038ef4b24e802b0c936877871200c
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/380bg.unity3d,0634e3823e2492d32424733dd05779af
@@ -320,10 +329,10 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPBackplate.lua,ae946f1cec5baad
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectProduct.unity3d,9a4225d5443f6caad4b35b68313325d8
 trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/radio_full.unity3d,299e73e63c854e9d88dc63f1c19a45f9
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPEditPrice.lua,ceb906ae12222324b9a61f4b83ec7e58
 trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d,47e903d836aa8bc08317cdc45d61907e
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133fd4da0f2bf01316f91cf67fb8
 trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPAbout.lua,ded7b5021b8837a537e426614cc2171e
 trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
 trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
 trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
-trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
+trCRM/upgradeRes4Publish/priority/ui/other/Android/EmptySpace.unity3d,b9f173d21c2bc1854fb84e50f11dbed8
 trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua,604691a3a96bbdb9cf88f20e2adf027c
--- a/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab
+++ b/Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab
@@ -46,7 +46,7 @@ MonoBehaviour:
  material: {fileID: 0}
  mSprites: []
  mPixelSize: 1
-  mReplacement: {fileID: 0}
+  mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
  mCoordinates: 0
  sprites: []
  _isBorrowSpriteMode: 1
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_1.png
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_1.png
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_1.png.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_1.png.meta
@@ -0,0 +1,88 @@
 fileFormatVersion: 2
 guid: 55de5b3a45fb24f2f9137d41a1bdfba6
 TextureImporter:
  fileIDToRecycleName: {}
  externalObjects: {}
  serializedVersion: 9
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
    mipMapsPreserveCoverage: 0
    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
    filterMode: 2
    aniso: 1
    mipBias: -100
    wrapU: 1
    wrapV: 1
    wrapW: 1
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
  spriteMode: 0
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
  spriteTessellationDetail: -1
  textureType: 2
  textureShape: 1
  singleChannelComponent: 0
  maxTextureSizeSet: 0
  compressionQualitySet: 0
  textureFormatSet: 0
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
    physicsShape: []
    bones: []
    spriteID: 
    vertices: []
    indices: 
    edges: []
    weights: []
  spritePackingTag: 
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_2.png
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_2.png
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_2.png.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_2.png.meta
@@ -0,0 +1,88 @@
 fileFormatVersion: 2
 guid: 05f2aea7876ca48cd8a1038c97c4ed10
 TextureImporter:
  fileIDToRecycleName: {}
  externalObjects: {}
  serializedVersion: 9
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
    mipMapsPreserveCoverage: 0
    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
    filterMode: 2
    aniso: 1
    mipBias: -100
    wrapU: 1
    wrapV: 1
    wrapW: 1
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
  spriteMode: 0
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
  spriteTessellationDetail: -1
  textureType: 2
  textureShape: 1
  singleChannelComponent: 0
  maxTextureSizeSet: 0
  compressionQualitySet: 0
  textureFormatSet: 0
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
    physicsShape: []
    bones: []
    spriteID: 
    vertices: []
    indices: 
    edges: []
    weights: []
  spritePackingTag: 
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_3.png
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_3.png
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_3.png.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_3.png.meta
@@ -0,0 +1,88 @@
 fileFormatVersion: 2
 guid: c7cf272529f1142b3a2e48d02961a512
 TextureImporter:
  fileIDToRecycleName: {}
  externalObjects: {}
  serializedVersion: 9
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
    mipMapsPreserveCoverage: 0
    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
    filterMode: 2
    aniso: 1
    mipBias: -100
    wrapU: 1
    wrapV: 1
    wrapW: 1
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
  spriteMode: 0
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
  spriteTessellationDetail: -1
  textureType: 2
  textureShape: 1
  singleChannelComponent: 0
  maxTextureSizeSet: 0
  compressionQualitySet: 0
  textureFormatSet: 0
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
    physicsShape: []
    bones: []
    spriteID: 
    vertices: []
    indices: 
    edges: []
    weights: []
  spritePackingTag: 
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_4.png
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_4.png
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_4.png.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_4.png.meta
@@ -0,0 +1,88 @@
 fileFormatVersion: 2
 guid: 9126246ff84b74e539dffc954f53c53e
 TextureImporter:
  fileIDToRecycleName: {}
  externalObjects: {}
  serializedVersion: 9
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
    mipMapsPreserveCoverage: 0
    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
    filterMode: 2
    aniso: 1
    mipBias: -100
    wrapU: 1
    wrapV: 1
    wrapW: 1
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
  spriteMode: 0
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
  spriteTessellationDetail: -1
  textureType: 2
  textureShape: 1
  singleChannelComponent: 0
  maxTextureSizeSet: 0
  compressionQualitySet: 0
  textureFormatSet: 0
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
    physicsShape: []
    bones: []
    spriteID: 
    vertices: []
    indices: 
    edges: []
    weights: []
  spritePackingTag: 
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_5.png
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_5.png
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_5.png.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_5.png.meta
@@ -0,0 +1,88 @@
 fileFormatVersion: 2
 guid: a822972ea31fb475ba4308f59709120a
 TextureImporter:
  fileIDToRecycleName: {}
  externalObjects: {}
  serializedVersion: 9
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
    mipMapsPreserveCoverage: 0
    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
    filterMode: 2
    aniso: 1
    mipBias: -100
    wrapU: 1
    wrapV: 1
    wrapW: 1
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
  spriteMode: 0
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
  spriteTessellationDetail: -1
  textureType: 2
  textureShape: 1
  singleChannelComponent: 0
  maxTextureSizeSet: 0
  compressionQualitySet: 0
  textureFormatSet: 0
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
    physicsShape: []
    bones: []
    spriteID: 
    vertices: []
    indices: 
    edges: []
    weights: []
  spritePackingTag: 
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_6.png
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_6.png
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_6.png.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_6.png.meta
@@ -0,0 +1,88 @@
 fileFormatVersion: 2
 guid: 82af88f0c98194d739c921f2d404b170
 TextureImporter:
  fileIDToRecycleName: {}
  externalObjects: {}
  serializedVersion: 9
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
    mipMapsPreserveCoverage: 0
    alphaTestReferenceValue: 0.5
    mipMapFadeDistanceStart: 1
    mipMapFadeDistanceEnd: 3
  bumpmap:
    convertToNormalMap: 0
    externalNormalMap: 0
    heightScale: 0.25
    normalMapFilter: 0
  isReadable: 0
  streamingMipmaps: 0
  streamingMipmapsPriority: 0
  grayScaleToAlpha: 0
  generateCubemap: 6
  cubemapConvolution: 0
  seamlessCubemap: 0
  textureFormat: 1
  maxTextureSize: 2048
  textureSettings:
    serializedVersion: 2
    filterMode: 2
    aniso: 1
    mipBias: -100
    wrapU: 1
    wrapV: 1
    wrapW: 1
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
  spriteMode: 0
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 100
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
  alphaIsTransparency: 1
  spriteTessellationDetail: -1
  textureType: 2
  textureShape: 1
  singleChannelComponent: 0
  maxTextureSizeSet: 0
  compressionQualitySet: 0
  textureFormatSet: 0
  platformSettings:
  - serializedVersion: 2
    buildTarget: DefaultTexturePlatform
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
    textureCompression: 1
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
    overridden: 0
    androidETC2FallbackOverride: 0
  spriteSheet:
    serializedVersion: 2
    sprites: []
    outline: []
    physicsShape: []
    bones: []
    spriteID: 
    vertices: []
    indices: 
    edges: []
    weights: []
  spritePackingTag: 
  pSDRemoveMatte: 0
  pSDShowRemoveMatteOption: 0
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab
@@ -1893,6 +1893,90 @@ MonoBehaviour:
    paddingTop: 0
    paddingBottom: 0
    path: trCRM/upgradeRes4Dev/other/uiAtlas/mine/sms.png
  - name: order_icon_3
    x: 0
    y: 0
    width: 54
    height: 54
    borderLeft: 0
    borderRight: 0
    borderTop: 0
    borderBottom: 0
    paddingLeft: 0
    paddingRight: 0
    paddingTop: 0
    paddingBottom: 0
    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_3.png
  - name: order_icon_4
    x: 0
    y: 0
    width: 60
    height: 60
    borderLeft: 0
    borderRight: 0
    borderTop: 0
    borderBottom: 0
    paddingLeft: 0
    paddingRight: 0
    paddingTop: 0
    paddingBottom: 0
    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_4.png
  - name: order_icon_5
    x: 0
    y: 0
    width: 40
    height: 40
    borderLeft: 0
    borderRight: 0
    borderTop: 0
    borderBottom: 0
    paddingLeft: 0
    paddingRight: 0
    paddingTop: 0
    paddingBottom: 0
    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_5.png
  - name: order_icon_6
    x: 0
    y: 0
    width: 66
    height: 70
    borderLeft: 0
    borderRight: 0
    borderTop: 0
    borderBottom: 0
    paddingLeft: 0
    paddingRight: 0
    paddingTop: 0
    paddingBottom: 0
    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_6.png
  - name: order_icon_2
    x: 0
    y: 0
    width: 54
    height: 54
    borderLeft: 0
    borderRight: 0
    borderTop: 0
    borderBottom: 0
    paddingLeft: 0
    paddingRight: 0
    paddingTop: 0
    paddingBottom: 0
    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_2.png
  - name: order_icon_1
    x: 0
    y: 0
    width: 54
    height: 54
    borderLeft: 0
    borderRight: 0
    borderTop: 0
    borderBottom: 0
    paddingLeft: 0
    paddingRight: 0
    paddingTop: 0
    paddingBottom: 0
    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/icon_1.png
  mPixelSize: 1
  mReplacement: {fileID: 0}
  mCoordinates: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
@@ -8,6 +8,8 @@ local _TopHeight_ = 132
 local _BottomHeight_ = 147
 local _ContentRect
 local _sizeAdjust
 ---@return UnityEngine.Vector4
 MyUtl.getUIContent = function(panel, top, bottom, forceCal)
    -- if _ContentRect and (not forceCal) then
    --     return _ContentRect
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua
@@ -0,0 +1,58 @@
 -- xx单元
 local _cell = {}
 ---@type Coolape.CLCellLua
 local csSelf = nil
 local transform = nil
 local mData = nil
 local uiobjs = {}
 -- 初始化，只调用一次
 function _cell.init(csObj)
    csSelf = csObj
    transform = csSelf.transform
    ---@type CLUIFormRoot
    uiobjs.formRoot = csSelf:GetComponent("CLUIFormRoot")
    ---@type UIPopupList
    uiobjs.LabelServerNo = getCC(transform, "LabelServerNo", "UIPopupList")
    uiobjs.SpriteHeadIcon = getCC(transform, "SpriteHeadBg/SpriteHeadIcon", "UITexture")
    ---@type UISprite
    uiobjs.SpriteLine2 = getChild(transform, "SpriteLine2")
 end
 -- 显示，
 -- 注意，c#侧不会在调用show时，调用refresh
 function _cell.show(go, data)
    mData = data
    local optionInfor = DBUser.getPopList(DBUser.FilterGroup.user)
    uiobjs.LabelServerNo:refreshItems(optionInfor.options, optionInfor.values)
    uiobjs.formRoot:setValue(mData)
    ---@type _DBUser
    local user = DBUser.getUserById(mData.loginNo)
    if user then
        DBUser.getIcon(
            mData.loginNo,
            function(texture)
                if texture and texture.name == user.imageUrl then
                    uiobjs.SpriteHeadIcon.mainTexture = texture
                end
            end
        )
    end
    if csSelf.name == "000000" then
        SetActive(uiobjs.SpriteLine2.gameObject, false)
    else
        SetActive(uiobjs.SpriteLine2.gameObject, true)
    end
 end
 -- 取得数据
 function _cell.getData()
    return mData
 end
 --------------------------------------------
 return _cell
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellProccessHis.lua.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: d79c3efc1f6bf4c05b6825694fa9d500
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPCalender.lua
@@ -291,9 +291,6 @@ function PanelCalender.setSelectDate(cell, year, month, day)
            )
        end
        LabelSelectDate.text = dataStr
        curYear = selectedYear
        curMonth = selectedMonth
        PanelCalender.refreshDays()
    else
        local dataStr =
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
@@ -360,6 +360,7 @@ function TRPCustDetail:showOrders()
    else
        showHotWheel()
        -- //TODO:
        MyUtl.toastW("TODO:取何取得单个客户的订单？？？")
        NetProto.send.query_cust_calllog(self.mdata.phoneNo, nil, 1)
        uiobjs.OrderRoot:setList({}, self:wrapFunc(self.initOrderCell))
    end
@@ -425,6 +426,7 @@ end
 ---@param el CLUIElement
 function TRPCustDetail:onClickMoreProc(el)
    MyUtl.toastW("TODO:" .. el.jsonKey)
    if el.jsonKey == "follows" then
        -- 跟进记录
    elseif el.jsonKey == "followTasks" then
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua
@@ -636,6 +636,7 @@ function TRPNewOrder:onGetImage(path)
            return
        end
    end
    MyUtl.toastW("TODO:上传附件还没有做！！！！")
    table.insert(self.images, {path = path, onDelete = self:wrapFunc(self.onDelImage)})
    self:showImages()
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
@@ -0,0 +1,439 @@
 ---@type IDBasePanel
 local TRBasePanel = require("ui.panel.TRBasePanel")
 ---@class TRPOrderDetail:TRBasePanel
 local TRPOrderDetail = class("TRPOrderDetail", TRBasePanel)
 local uiobjs = {}
 -- 初始化，只会调用一次
 function TRPOrderDetail:init(csObj)
    TRPOrderDetail.super.init(self, csObj)
    self:prepareMoreData()
    self:setEventDelegate()
    uiobjs.TogglesPanel = getCC(self.transform, "Top/SpriteToggle/Toggles", "UIPanel")
    local v4 = MyUtl.getUIContent(self.csSelf, 0, 0)
    ---@type UnityEngine.Vector4
    local baseClipRegion = uiobjs.TogglesPanel.baseClipRegion
    baseClipRegion.z = v4.z - 100
    uiobjs.TogglesPanel.baseClipRegion = baseClipRegion
    ---@type UIScrollView
    uiobjs.TogglesScroll = uiobjs.TogglesPanel:GetComponent("UIScrollView")
    ---@type UIGrid
    uiobjs.ToggleGrid = getCC(uiobjs.TogglesPanel.transform, "Grid", "UIGrid")
    ---@type UIToggle
    uiobjs.ToggleDetail = getCC(uiobjs.ToggleGrid.transform, "ToggleDetail", "UIToggle")
    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 160 + 30, 0)
    ---@type UIScrollView
    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
    ---@type UITable
    uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable")
    ---@type CLUIFormRoot
    uiobjs.DetailRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLCellLua")
    uiobjs.ExtendRoot = getCC(uiobjs.Table.transform, "ExtendRoot", "CLCellLua")
    uiobjs.ProductRoot = getCC(uiobjs.Table.transform, "ProductRoot", "UITable")
    uiobjs.ProductPrefab = getChild(uiobjs.ProductRoot.transform, "00000").gameObject
    ---@type Coolape.CLUILoopGrid
    uiobjs.Records = getCC(uiobjs.Table.transform, "Records", "CLUILoopGrid")
    uiobjs.ButtonEndList = getChild(uiobjs.Records.transform, "ButtonEndList")
    uiobjs.AttachmentRoot = getCC(uiobjs.Table.transform, "AttachmentRoot", "CLCellLua")
    uiobjs.FinanceRoot = getCC(uiobjs.Table.transform, "FinanceRoot", "CLCellLua")
    ---@type Coolape.CLUILoopGrid
    uiobjs.SubOrders = getCC(uiobjs.Table.transform, "SubOrders", "CLUILoopGrid")
    uiobjs.ButtonEndListSub = getChild(uiobjs.SubOrders.transform, "ButtonEndList")
 end
 function TRPOrderDetail:prepareMoreData()
    self.baseFileds = {}
    ---@type _ParamFieldAttr
    local attr = {}
    attr.id = "id"
    attr.attrName = "订单ID"
    attr.attrType = DBCust.FieldType.text
    attr.ifMust = 0
    attr.height = 160
    attr.donotJoinKey = true
    table.insert(self.baseFileds, attr)
    attr = {}
    attr.id = "title"
    attr.attrName = "订单名称"
    attr.attrType = DBCust.FieldType.text
    attr.ifMust = 0
    attr.height = 160
    attr.donotJoinKey = true
    table.insert(self.baseFileds, attr)
    attr = {}
    attr.id = "templetName"
    attr.attrName = "订单模板"
    attr.attrType = DBCust.FieldType.text
    attr.ifMust = 0
    attr.height = 160
    attr.donotJoinKey = true
    table.insert(self.baseFileds, attr)
    attr = {}
    attr.id = "urgency"
    attr.attrName = "紧急程度"
    attr.attrType = DBCust.FieldType.popuplist
    attr.ifMust = 0
    attr.height = 160
    attr.donotJoinKey = true
    local popInfor = DBOrder.getPopupList(DBOrder.PopListGroup.urgencyLevels)
    attr.popOptions = popInfor.options
    attr.popValues = popInfor.values
    table.insert(self.baseFileds, attr)
    attr = {}
    attr.id = "custName"
    attr.attrName = "客户名称"
    attr.attrType = DBCust.FieldType.text
    attr.ifMust = 0
    attr.height = 160
    attr.donotJoinKey = true
    table.insert(self.baseFileds, attr)
    attr = {}
    attr.id = "_phoneNo"
    attr.attrName = "联系方式"
    attr.attrType = DBCust.FieldType.text
    attr.ifMust = 0
    attr.height = 160
    attr.donotJoinKey = true
    table.insert(self.baseFileds, attr)
    attr = {}
    attr.id = "companyName"
    attr.attrName = "公司名称"
    attr.attrType = DBCust.FieldType.text
    attr.ifMust = 0
    attr.height = 160
    attr.donotJoinKey = true
    table.insert(self.baseFileds, attr)
    attr = {}
    attr.id = "address"
    attr.attrName = "联系地址"
    attr.attrType = DBCust.FieldType.text
    attr.ifMust = 0
    attr.height = 160
    attr.donotJoinKey = true
    table.insert(self.baseFileds, attr)
    attr = {}
    attr.id = "content"
    attr.attrName = "订单内容"
    attr.attrType = DBCust.FieldType.multext
    attr.ifMust = 0
    attr.height = 160
    attr.donotJoinKey = true
    table.insert(self.baseFileds, attr)
    --------------------------------------------
 end
 -- 设置数据
 ---@param paras _ParamTRPOrderDetail
 function TRPOrderDetail:setData(paras)
    self.mdata = paras
    self.mdata._phoneNo = MyUtl.hidePhone(self.mdata.phoneNo)
    if type(self.mdata.attrJson) == "string" then
        self.mdata.attrJson = json.decode(self.mdata.attrJson)
    end
    if type(self.mdata.prodJson) == "string" then
        self.mdata.prodJson = json.decode(self.mdata.prodJson)
    end
 end
 ---public 当有通用背板显示时的回调
 ---@param cs Coolape.CLPanelLua
 function TRPOrderDetail:onShowFrame(cs)
    if cs.frameObj then
        ---@type _BGFrame1Param
        local d = {}
        -- d.title = LGet(cs.titleKeyName)
        d.title = self.mdata.companyName
        d.panel = cs
        cs.frameObj:init(d)
    end
 end
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPOrderDetail:show()
    self.records = nil
    uiobjs.ToggleDetail:Set(true)
    self.currToggle = 1
    uiobjs.TogglesScroll:ResetPosition()
    self:showDetail()
 end
 function TRPOrderDetail:showDetail()
    self:release()
    SetActive(uiobjs.DetailRoot.gameObject, true)
    SetActive(uiobjs.FinanceRoot.gameObject, false)
    SetActive(uiobjs.Records.gameObject, false)
    SetActive(uiobjs.AttachmentRoot.gameObject, false)
    SetActive(uiobjs.SubOrders.gameObject, false)
    self:showBaseFileds()
    self:reposition()
 end
 function TRPOrderDetail:showProducts()
    if #self.mdata.prodJson > 0 then
        SetActive(uiobjs.ProductRoot.gameObject, true)
        CLUIUtl.resetList4Lua(
            uiobjs.ProductRoot,
            uiobjs.ProductPrefab,
            self.mdata.prodJson,
            self:wrapFunc(self.initProductCell)
        )
    else
        SetActive(uiobjs.ProductRoot.gameObject, false)
    end
    self:reposition()
 end
 function TRPOrderDetail:initProductCell(cell, data)
    local formRoot = cell:GetComponent("CLUIFormRoot")
    formRoot:setValue(data)
 end
 function TRPOrderDetail:reposition()
    uiobjs.Table:Reposition()
    uiobjs.scrollView.disableDragIfFits = true
    uiobjs.scrollView:ResetPosition()
 end
 function TRPOrderDetail:showBaseFileds()
    ---@type _ParamCellExtendFiledRoot
    local param = {}
    param.data = self.mdata or {}
    param.onFinish = function()
        self:showExtentFiles(self.mdata.templetId)
        self:showProducts()
        self:wrapFunc(self.reposition)
    end
    param.fields = {}
    local fields = self.baseFileds
    ---@type _ParamCellExtendFiled
    local filedInfor
    for i, v in ipairs(fields) do
        filedInfor = {}
        filedInfor.attr = v
        filedInfor.showMode = _FieldMode.showOnly
        table.insert(param.fields, filedInfor)
    end
    uiobjs.DetailRoot:init(param, nil)
 end
 ---public 显示扩展字段
 function TRPOrderDetail:showExtentFiles(templetId)
    ---@type _ParamCellExtendFiledRoot
    local param = {}
    param.data = self.mdata and self.mdata.attrJson or {}
    param.onFinish = self:wrapFunc(self.reposition)
    param.fields = {}
    local fields = DBCust.getFieldsByTask(templetId) or {}
    ---@type _ParamCellExtendFiled
    local filedInfor
    for i, v in ipairs(fields) do
        filedInfor = {}
        filedInfor.attr = v
        filedInfor.showMode = _FieldMode.showOnly
        table.insert(param.fields, filedInfor)
    end
    if #fields > 0 then
        SetActive(uiobjs.ExtendRoot.gameObject, true)
        uiobjs.ExtendRoot:init(param, nil)
    else
        SetActive(uiobjs.ExtendRoot.gameObject, false)
    end
 end
 function TRPOrderDetail:showAttachment()
    self:release()
    SetActive(uiobjs.DetailRoot.gameObject, false)
    SetActive(uiobjs.ExtendRoot.gameObject, false)
    SetActive(uiobjs.ProductRoot.gameObject, false)
    SetActive(uiobjs.AttachmentRoot.gameObject, true)
    SetActive(uiobjs.Records.gameObject, false)
    SetActive(uiobjs.FinanceRoot.gameObject, false)
    SetActive(uiobjs.SubOrders.gameObject, false)
    MyUtl.toastW("TODO:还没有附件数据")
    self:reposition()
 end
 function TRPOrderDetail:showRecords()
    self:release()
    SetActive(uiobjs.DetailRoot.gameObject, false)
    SetActive(uiobjs.ExtendRoot.gameObject, false)
    SetActive(uiobjs.ProductRoot.gameObject, false)
    SetActive(uiobjs.AttachmentRoot.gameObject, false)
    SetActive(uiobjs.Records.gameObject, true)
    SetActive(uiobjs.FinanceRoot.gameObject, false)
    SetActive(uiobjs.SubOrders.gameObject, false)
    if self.records then
        uiobjs.Records:setList(
            self.records.data or {},
            self:wrapFunc(self.initRecordCell),
            self:wrapFunc(self.onHeadList),
            self:wrapFunc(self.onEndList)
        )
    else
        showHotWheel()
        NetProto.send.query_cust_calllog(self.mdata.phoneNo, nil, 1)
        uiobjs.Records:setList({}, self:wrapFunc(self.initRecordCell))
    end
    MyUtl.toastW("TODO:流转记录接口还没有")
    self:reposition()
 end
 function TRPOrderDetail:initRecordCell(cell, data)
    cell:init(data, nil)
 end
 function TRPOrderDetail:onHeadList(head)
    printw("到最顶端了")
 end
 function TRPOrderDetail:onEndList(tail)
    printw("到最后了==" .. tail.name)
    if self.records and self.records.meta.current_page < self.records.meta.total_pages then
        showHotWheel()
        -- 取得下一页
        NetProto.send.query_cust_calllog(self.mdata.phoneNo, nil, self.records.meta.current_page + 1)
    else
        uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -270
        SetActive(uiobjs.ButtonEndList.gameObject, true)
    end
 end
 function TRPOrderDetail:showFinance()
    self:release()
    SetActive(uiobjs.DetailRoot.gameObject, false)
    SetActive(uiobjs.ExtendRoot.gameObject, false)
    SetActive(uiobjs.ProductRoot.gameObject, false)
    SetActive(uiobjs.AttachmentRoot.gameObject, false)
    SetActive(uiobjs.Records.gameObject, false)
    SetActive(uiobjs.FinanceRoot.gameObject, true)
    SetActive(uiobjs.SubOrders.gameObject, false)
    MyUtl.toastW("TODO:财务数据怎么来？？")
    self:reposition()
 end
 function TRPOrderDetail:showSubOrders()
    self:release()
    SetActive(uiobjs.DetailRoot.gameObject, false)
    SetActive(uiobjs.ExtendRoot.gameObject, false)
    SetActive(uiobjs.ProductRoot.gameObject, false)
    SetActive(uiobjs.AttachmentRoot.gameObject, false)
    SetActive(uiobjs.Records.gameObject, false)
    SetActive(uiobjs.FinanceRoot.gameObject, false)
    SetActive(uiobjs.SubOrders.gameObject, true)
    MyUtl.toastW("TODO:子订单数据怎么来？？")
    self:reposition()
 end
 -- 刷新
 function TRPOrderDetail:refresh()
 end
 function TRPOrderDetail:release()
    if uiobjs.ExtendRoot.luaTable then
        uiobjs.ExtendRoot.luaTable.release()
    end
    if uiobjs.DetailRoot.luaTable then
        uiobjs.DetailRoot.luaTable.release()
    end
 end
 -- 关闭页面
 function TRPOrderDetail:hide()
    self:release()
 end
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function TRPOrderDetail:procNetwork(cmd, succ, msg, paras)
    if (succ == NetSuccess) then
        if cmd == NetProto.cmds.query_cust_calllog then
            local result = paras.result
            if self.records == nil then
                self.records = result
            else
                if self.records.meta.current_page < result.meta.current_page then
                    self.records.meta = result.meta
                    for i, v in ipairs(result.data) do
                        table.insert(self.records.data, v)
                    end
                end
            end
            hideHotWheel()
            if self.records and uiobjs.Records.gameObject.activeInHierarchy then
                if self.records.meta.current_page == 1 then
                    self:showRecords()
                else
                    uiobjs.Records:appendList(result.data)
                end
            end
        end
    end
 end
 function TRPOrderDetail:setEventDelegate()
    self.EventDelegate = {
        ToggleDetail = function()
            self.currToggle = 1
            self:showDetail()
        end,
        ToggleAttachment = function()
            self.currToggle = 2
            self:showAttachment()
        end,
        ToggleProcessHis = function()
            self.currToggle = 3
            self:showRecords()
        end,
        ToggleFinance = function()
            self.currToggle = 4
            self:showFinance()
        end,
        ToggleSub = function()
            self.currToggle = 5
            self:showSubOrders()
        end,
        ButtonAddAttachment = function()
        end,
        ButtonAddMoney = function()
        end,
        ButtonAddLogistics = function()
        end,
        ButtonAdd = function()
        end
    }
 end
 -- 处理ui上的事件，例如点击等
 function TRPOrderDetail:uiEventDelegate(go)
    local func = self.EventDelegate[go.name]
    if func then
        func()
    end
 end
 -- 当顶层页面发生变化时回调
 function TRPOrderDetail:onTopPanelChange(topPanel)
 end
 --------------------------------------------
 return TRPOrderDetail
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: 6dbe0ef6ea22741c99c0fafb577fb647
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua
@@ -158,7 +158,7 @@ function TRPOrderList:initCell(cell, data)
 end
 function TRPOrderList:onClickCell(cell, data)
-    -- getPanelAsy("PanelCustDetail", onLoadedPanelTT, data)
+    getPanelAsy("PanelOrderDetail", onLoadedPanelTT, data)
 end
 function TRPOrderList:refreshFilterBtnStatus()
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCalender.prefab
@@ -1169,23 +1169,23 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  bottomAnchor:
-    target: {fileID: 0}
+    target: {fileID: 3677142684319551476}
    relative: 0
-    absolute: -50
+    absolute: -35
  topAnchor:
    target: {fileID: 0}
-    relative: 1
+    relative: 0
-    absolute: 50
+    absolute: 0
  updateAnchors: 1
  mColor: {r: 1, g: 1, b: 1, a: 1}
  mPivot: 4
  mWidth: 1025
-  mHeight: 1668
+  mHeight: 1667
  mDepth: -1
  autoResizeBoxCollider: 1
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.6145084
+  aspectRatio: 0.61487705
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -1212,7 +1212,7 @@ BoxCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 1025, y: 1668, z: 0}
+  m_Size: {x: 1025, y: 1667, z: 0}
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &100030
 GameObject:
@@ -1530,7 +1530,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 100288}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2, y: 0, z: 0}
+  m_LocalPosition: {x: -1, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 400032}
@@ -1567,7 +1567,7 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0, g: 0, b: 0, a: 0.6431373}
  mPivot: 4
-  mWidth: 1441
+  mWidth: 1129
  mHeight: 2308
  mDepth: -2
  autoResizeBoxCollider: 1
@@ -1600,7 +1600,7 @@ BoxCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 1441, y: 2308, z: 0}
+  m_Size: {x: 1129, y: 2308, z: 0}
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &11400458
 MonoBehaviour:
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelModifyFiled.prefab
@@ -166,7 +166,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 0
-  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
+  mColor: {r: 1, g: 1, b: 1, a: 1}
  mPivot: 4
  mWidth: 100
  mHeight: 50
@@ -174,7 +174,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -352,7 +352,7 @@ BoxCollider:
  m_IsTrigger: 1
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 1125, y: 159, z: 0}
+  m_Size: {x: 1025, y: 159, z: 0}
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &3413289893354422432
 MonoBehaviour:
@@ -385,13 +385,13 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 1, g: 1, b: 1, a: 1}
  mPivot: 4
-  mWidth: 1125
+  mWidth: 1025
  mHeight: 159
  mDepth: 0
  autoResizeBoxCollider: 1
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 7.075472
+  aspectRatio: 6.446541
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -404,7 +404,7 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: public__empty
+  mSpriteName: public_button
  mFillCenter: 1
  isGrayMode: 0
 --- !u!114 &8389777950540645783
@@ -454,7 +454,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  widget: {fileID: 3413289893354422432}
-  offset: 0
+  offset: 50
  sizeAdjust: 1
 --- !u!1 &4476806515245165190
 GameObject:
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: c2d7873c10c404488b047306d80475b7
 PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopList.prefab
@@ -306,7 +306,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3920714121603821296}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 9999, z: 0}
+  m_LocalPosition: {x: 0, y: -1152, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5163088768227076857}
@@ -557,7 +557,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 1
-  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
+  mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
  mPivot: 4
  mWidth: 100
  mHeight: 50
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep1.prefab
@@ -109,7 +109,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 0
-  mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 5
  mWidth: 168
  mHeight: 56
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep2.prefab
@@ -109,7 +109,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 0
-  mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 5
  mWidth: 168
  mHeight: 56
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelResetPasswordStep3.prefab
@@ -193,7 +193,7 @@ MonoBehaviour:
    relative: 1
    absolute: 0
  updateAnchors: 0
-  mColor: {r: 0.94509804, g: 0.3529412, b: 0.2901961, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 5
  mWidth: 112
  mHeight: 56
@@ -201,7 +201,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1
+  aspectRatio: 2
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_1.unity3d.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: 9ae1850a3edcd4fe2bd4145ec59282d9
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_2.unity3d.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: ed36701dac27e4d5d8a54758b64bc73c
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_3.unity3d.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: 19caf6b8bc88645a9826dca77f683c1e
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_4.unity3d.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: e578ce3b372744eda938b791f8ab6714
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_5.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_5.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_5.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_5.unity3d.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: f89993e7806224921b207b940a918942
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/icon_6.unity3d.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: 1a838ba2c196241e1a6513bedca4e322
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/atlas/Android/atlasAllReal.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellProccessHis.lua.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: c672adce06da64a3c92437bd234f9fd6
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPCalender.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewOrder.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: fcc61e962f3fb45efbdf4abcdce63033
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCalender.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelModifyFiled.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d.meta
@@ -0,0 +1,7 @@
 fileFormatVersion: 2
 guid: 54623cb3d417d46f581e43bb69fbf4a6
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPopList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep1.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep2.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelResetPasswordStep3.unity3d
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,1fec9577a10403ccd67a0c48fe1932ca8	%trCRM/resVer/Android/VerCtl/other.ver8,7d87c2e39edae94777427df11652a703
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,bc1f77c52931066b83cb003ec9e42a198	%trCRM/resVer/Android/VerCtl/other.ver8,b307d491dc62b32fe72c3899d2931bef
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver
		`@@ -1 +1 @@`
			`r8 (trCRM/resVer/Android/VerCtl/priority.ver8,1fec9577a10403ccd67a0c48fe1932ca8 %trCRM/resVer/Android/VerCtl/other.ver8,7d87c2e39edae94777427df11652a703`				`r8 (trCRM/resVer/Android/VerCtl/priority.ver8,bc1f77c52931066b83cb003ec9e42a198 %trCRM/resVer/Android/VerCtl/other.ver8,b307d491dc62b32fe72c3899d2931bef`