This commit is contained in:
2020-07-26 11:12:32 +08:00
parent 67a1f974bf
commit 53e9c8d4ce
69 changed files with 15012 additions and 105 deletions

View File

@@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@@ -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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

View File

@@ -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:

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d79c3efc1f6bf4c05b6825694fa9d500
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -291,9 +291,6 @@ function PanelCalender.setSelectDate(cell, year, month, day)
)
end
LabelSelectDate.text = dataStr
curYear = selectedYear
curMonth = selectedMonth
PanelCalender.refreshDays()
else
local dataStr =

View File

@@ -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

View File

@@ -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

View File

@@ -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为调用refreshshow和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

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6dbe0ef6ea22741c99c0fafb577fb647
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -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()

View File

@@ -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
absolute: 50
relative: 0
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:

View File

@@ -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:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c2d7873c10c404488b047306d80475b7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9ae1850a3edcd4fe2bd4145ec59282d9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ed36701dac27e4d5d8a54758b64bc73c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 19caf6b8bc88645a9826dca77f683c1e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e578ce3b372744eda938b791f8ab6714
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f89993e7806224921b207b940a918942
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1a838ba2c196241e1a6513bedca4e322
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c672adce06da64a3c92437bd234f9fd6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fcc61e962f3fb45efbdf4abcdce63033
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 54623cb3d417d46f581e43bb69fbf4a6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -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