add file open

2020-08-07 22:40:04 +08:00
parent c1e3f992aa
commit f9bedd2c62
115 changed files with 9835 additions and 1096 deletions
--- a/Assets/trCRM/Scripts/xLua/XluaGenCodeConfig.cs
+++ b/Assets/trCRM/Scripts/xLua/XluaGenCodeConfig.cs
@@ -57,6 +57,8 @@ public static class XluaGenCodeConfig
 		typeof(Screen),
 		typeof(PlayerPrefs),
 		typeof(Shader),
+		typeof(Texture),
+		typeof(Texture2D),

 		//NGUI
        typeof(UIRoot),
@@ -204,6 +206,8 @@ public static class XluaGenCodeConfig
 		typeof(MyGallery),
 		typeof(NativeCamera),
 		typeof(MyCamera),
+		typeof(MyFileOpen),
+		typeof(TextureFormat),
 	};

 	//C#静态调用Lua的配置（包括事件的原型），仅可以配delegate，interface
@@ -222,6 +226,7 @@ public static class XluaGenCodeConfig
 	public static List<List<string>> BlackList = new List<List<string>>() {
 		new List<string>(){ "UnityEngine.WWW", "movie" },
 		new List<string>(){ "UnityEngine.Texture2D", "alphaIsTransparency" },
+		new List<string>(){ "UnityEngine.Texture", "imageContentsHash" },
 		new List<string>(){ "UnityEngine.Security", "GetChainOfTrustValue" },
 		new List<string>(){ "UnityEngine.CanvasRenderer", "onRequestRebuild" },
 		new List<string>(){ "UnityEngine.Light", "areaSize" },
--- a/Assets/trCRM/serversCfg/servers.json
+++ b/Assets/trCRM/serversCfg/servers.json
@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"548ff6dfae5542ce8141633822af86f3", "port":29006, "androidVer":"264ba6c950fe927e208f8c89d684ecff", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"548ff6dfae5542ce8141633822af86f3", "port":29000, "androidVer":"264ba6c950fe927e208f8c89d684ecff", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"548ff6dfae5542ce8141633822af86f3", "port":29004, "androidVer":"264ba6c950fe927e208f8c89d684ecff", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"548ff6dfae5542ce8141633822af86f3", "port":29006, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"548ff6dfae5542ce8141633822af86f3", "port":29000, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"548ff6dfae5542ce8141633822af86f3", "port":29004, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":0}}}
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/img-icon.png
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/img-icon.png
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/img-icon.png.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/img-icon.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: c62e16f7df0a04d28a9e3627a98eb7b4
+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/work/wenjian-icon.png
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/wenjian-icon.png
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/wenjian-icon.png.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/wenjian-icon.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 9d087f415eef24466aadea7584b844fa
+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/work/xiazai-icon.png
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/xiazai-icon.png
--- a/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/xiazai-icon.png.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/uiAtlas/work/xiazai-icon.png.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: b2aa6f92222d347e7b01d6a6111545a3
+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
@@ -2005,6 +2005,48 @@ MonoBehaviour:
    paddingTop: 0
    paddingBottom: 0
    path: trCRM/upgradeRes4Dev/other/uiAtlas/cust/icon-right2.png
+  - name: work_xiazai-icon
+    x: 0
+    y: 0
+    width: 52
+    height: 52
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/work/xiazai-icon.png
+  - name: work_img-icon
+    x: 0
+    y: 0
+    width: 84
+    height: 68
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/work/img-icon.png
+  - name: work_wenjian-icon
+    x: 0
+    y: 0
+    width: 84
+    height: 68
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/work/wenjian-icon.png
  mPixelSize: 1
  mReplacement: {fileID: 0}
  mCoordinates: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua
@@ -120,27 +120,15 @@ function DBTextures.download(name, url, callback)
    if File.Exists(localPath) then
        _url = Path.Combine("file://", localPath)
    end
-    local assetType
-    if MyUtl.isImage(name) then
-        assetType = CLAssetType.texture
-    else
-        assetType = CLAssetType.bytes
-    end
-
    local www =
        WWWEx.get(
        _url,
        nil,
-        CLAssetType.texture,
+        CLAssetType.bytes,
        function(content, orgs)
            isDownoading[name] = nil
            if content then
-                local bytes
-                if assetType == CLAssetType.texture then
-                    bytes = content:GetRawTextureData()
-                else
-                    bytes = content
-                end
+                local bytes = content
                Directory.CreateDirectory(Path.GetDirectoryName(localPath))
                File.WriteAllBytes(localPath, bytes)
                Utl.doCallback(downloadCallback[name], content, localPath)
@@ -162,6 +150,7 @@ function DBTextures.download(name, url, callback)
        2
    )
    isDownoading[name] = www
+    return www
 end

 return DBTextures
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
@@ -114,14 +114,14 @@ end

 -- 上传头像
 NetProto.uploadUserHeadIcon = function(path, finishCallback)
-    NetProto._uploadFile("updateUserImg", path, "", finishCallback)
+    NetProto._uploadFile("updateUserImg", path, "", MyUtl.CompressImage(path, 512), finishCallback)
 end

 NetProto.uploadFile = function(path, uploadPath, finishCallback)
-    NetProto._uploadFile("uploadFile", path, uploadPath, finishCallback)
+    NetProto._uploadFile("uploadFile", path, uploadPath, File.ReadAllBytes(path), finishCallback)
 end

-NetProto._uploadFile = function(methord, path, uploadPath, finishCallback)
+NetProto._uploadFile = function(methord, path, uploadPath, bytes, finishCallback)
    local params = {
        operator = NetProto.loginNo,
        uploadPath = uploadPath
@@ -134,7 +134,7 @@ NetProto._uploadFile = function(methord, path, uploadPath, finishCallback)
        NetProto.httpHeader,
        "uploadFile",
        Path.GetFileName(path),
-        File.ReadAllBytes(path),
+        bytes,
        CLAssetType.text,
        function(content, orgs)
            content = json.decode(content)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua
@@ -270,6 +270,17 @@ MyGallery = CS.MyGallery
 NativeCamera = CS.NativeCamera
 ---@type MyCamera
 MyCamera = CS.MyCamera
+---@type UnityEngine.Texture
+Texture = CS.UnityEngine.Texture
+---@type UnityEngine.Texture2D
+Texture2D = CS.UnityEngine.Texture2D
+---@type MyFileOpen
+MyFileOpen = CS.MyFileOpen
+---@type UnityEngine.TextureFormat
+TextureFormat = CS.UnityEngine.TextureFormat
+---@type UnityEngine.ImageConversion
+ImageConversion = CS.UnityEngine.ImageConversion
+
 -------------------------------------------------------

 -------------------------------------------------------
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
@@ -118,7 +118,9 @@ function MyUtl.setIsHidePhone(val)
 end

 MyUtl.hidePhone = function(phone)
-    if not phone then return end
+    if not phone then
+        return
+    end
    if not MyUtl.isHidePhone then
        return phone
    end
@@ -135,7 +137,8 @@ MyUtl.Images = {
    [".PNG"] = true,
    [".PDF"] = true,
    [".BMP"] = true,
-    [".GIF"] = true,
+    [".TGA"] = true,
+    [".GIF"] = true
 }

 ---public 是图片
@@ -143,4 +146,24 @@ MyUtl.isImage = function(path)
    local extension = Path.GetExtension(path)
    return MyUtl.Images[string.upper(extension)] or false
 end
+
+---@param oldTexture UnityEngine.Texture2D
+MyUtl.CompressImage = function(imgPath, maxSize, quality)
+    if not File.Exists(imgPath) then
+        printe("文件不存在==".. imgPath)
+        return
+    end
+    -- int quality = 80;//图片压缩质量（1-100）
+    quality = quality or 75
+
+    local bytes = File.ReadAllBytes(imgPath)
+    ---@type UnityEngine.Texture2D
+    local texture = Texture2D(2, 2)
+    ImageConversion.LoadImage(texture, bytes)
+    texture = MyFileOpen.ResizeTexture(texture, maxSize, MyFileOpen.ImageFilterMode.Average)
+
+    local newBytes = ImageConversion.EncodeToJPG(texture, quality)
+    return newBytes
+end
+
 return MyUtl
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua
@@ -15,7 +15,7 @@ function _cell.init(csObj)
    uiobjs.Label = getCC(transform, "Label", "UILabel")
    uiobjs.ButtonDel = getChild(transform, "ButtonDel").gameObject
    uiobjs.SpriteIcon = getCC(transform, "SpriteIcon", "UISprite")
-
+    uiobjs.SpriteRight = getChild(transform, "SpriteRight").gameObject
    uiobjs.ButtonDownload = getChild(transform, "ButtonDownload").gameObject
    uiobjs.DownloadProgress = getChild(transform, "DownloadProgress")
    uiobjs.DownloadProgressLb = getCC(uiobjs.DownloadProgress, "Label", "UILabel")
@@ -28,15 +28,19 @@ function _cell.show(go, data)
    SetActive(uiobjs.ButtonDel, false)
    uiobjs.Label.text = mData.name
    if MyUtl.isImage(mData.name) then
-        --//TODO:
+        uiobjs.SpriteIcon.spriteName = "work_img-icon"
    else
+        uiobjs.SpriteIcon.spriteName = "work_wenjian-icon"
    end
+    SetActive(uiobjs.DownloadProgress.gameObject, false)

    --//TODO:权限判断，如果有权限的可以考虑直接显示图片
    if DBTextures.hadDownloaded(mData.name) then
        SetActive(uiobjs.ButtonDownload, false)
+        SetActive(uiobjs.SpriteRight, true)
    else
        SetActive(uiobjs.ButtonDownload, true)
+        SetActive(uiobjs.SpriteRight, false)
    end
 end

@@ -62,6 +66,7 @@ function _cell.download()
            if content and localPath then
                -- 附件下载完成
                MyUtl.toastS(joinStr("附件已保存本地：" .. localPath))
+                SetActive(uiobjs.SpriteRight, true)
            else
                SetActive(uiobjs.ButtonDownload, true)
            end
@@ -77,17 +82,11 @@ function _cell.refreshProgress()
    else
        SetActive(uiobjs.DownloadProgress.gameObject, true)
        local progressVal = www.downloadProgress or 0 -- downloadProgress uploadProgress
-        uiobjs.LabelPersent.text = joinStr(math.floor(progressVal * 100), "%")
+        uiobjs.DownloadProgressLb.text = joinStr(math.floor(progressVal * 100), "%")
    end

    csSelf:invoke4Lua(_cell.refreshProgress, 0.1)
 end

-function _cell.uiEventDelegate(go)
-    if go.name == "ButtonDownload" then
-        _cell.download()
-    end
-end
-
 --------------------------------------------
 return _cell
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua
@@ -66,7 +66,10 @@ end
 function _cell.uiEventDelegate(go)
    local goName = go.name
    if goName == "ButtonFollow" then
-        getPanelAsy("PanelNewFollow", onLoadedPanelTT, mData)
+        ---@type _ParamTRPNewFollow
+        local param = {}
+        param.cust = mData
+        getPanelAsy("PanelNewFollow", onLoadedPanelTT, param)
    elseif goName == "ButtonTask" then
        getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, mData)
    elseif goName == "ButtonContact" then
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellFollowList.lua
@@ -26,6 +26,10 @@ end
 -- 注意，c#侧不会在调用show时，调用refresh
 function _cell.show(go, data)
    mData = data
+    mData._phoneNo = MyUtl.hidePhone(mData.phone)
+    if isNilOrEmpty(mData.custName) then
+        mData.custName = mData._phoneNo
+    end
    local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.followUpTypeList)
    uiobjs.LabelStatus:refreshItems(optionInfor.options, optionInfor.values)
    local optionInfor = DBUser.getPopList(DBUser.FilterGroup.user)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellTaskList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellTaskList.lua
@@ -23,12 +23,14 @@ end
 -- 注意，c#侧不会在调用show时，调用refresh
 function _cell.show(go, data)
    mData = data
-    -- mData.money = mData.prodNum * mData.salePrice
+    -- 修改数据
    mData._phoneNo = MyUtl.hidePhone(mData.phoneNo)
+    if isNilOrEmpty(mData.custName) then
+        mData.custName = mData._phoneNo
+    end
    local optionInfor = DBUser.getPopList(DBUser.FilterGroup.user)
    uiobjs.LabelServerNo:refreshItems(optionInfor.options, optionInfor.values)

-    uiobjs.formRoot:setValue(mData)
    if tonumber(mData.bookingDone) == 1 then
        uiobjs.SpriteStatus.color = ColorEx.getColor(0xff27ae60)
    else
@@ -36,11 +38,13 @@ function _cell.show(go, data)
        if DateTime.Now:ToFileTime() > bookingTime:ToFileTime() then
            --- 超时
            uiobjs.SpriteStatus.color = ColorEx.getColor(0xfff15a4a)
+            mData.bookingDone = -1 --超时是特殊出来的
        else
            uiobjs.SpriteStatus.color = ColorEx.getColor(0xff999999)
        end
    end

+    uiobjs.formRoot:setValue(mData)
    _cell.setHeadIcon()
 end

--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPConfirm.lua
@@ -86,8 +86,14 @@ do
            ButtonOK.localPosition = pos
            SetActive(Spriteline2.gameObject, false)
        else
-            ButtonCancel.localPosition = buttonCancelOrgPositon
-            ButtonOK.localPosition = buttonOkOrgPositon
+            local pos = ButtonCancel.localPosition
+            pos.x = buttonCancelOrgPositon.x
+            ButtonCancel.localPosition = pos
+            
+            local pos = ButtonOK.localPosition
+            pos.x = buttonOkOrgPositon.x
+            ButtonOK.localPosition = pos
+
            NGUITools.SetActive(ButtonCancel.gameObject, true)
            lbButtonCancel.text = lbbutton2
            SetActive(Spriteline2.gameObject, true)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
@@ -1,4 +1,9 @@
---@type IDBasePanel
+---@class _ParamTRPCustDetail
+---@field cust
+---@field bookingData
+---@field needShowMore
+
+---@type IDBasePanel
 local TRBasePanel = require("ui.panel.TRBasePanel")
 ---@class TRPCustDetail:TRBasePanel 邮件列表
 local TRPCustDetail = class("TRPCustDetail", TRBasePanel)
@@ -36,6 +41,8 @@ function TRPCustDetail:init(csObj)
    uiobjs.SpriteToggle.cellWidth = width
    ---@type UIToggle
    uiobjs.ToggleDetail = getCC(uiobjs.SpriteToggle.transform, "ToggleDetail", "UIToggle")
+    ---@type UIToggle
+    uiobjs.ToggleMore = getCC(uiobjs.SpriteToggle.transform, "ToggleMore", "UIToggle")
    ---@type CLUIFormRoot
    uiobjs.DetailRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLUIFormRoot")
    uiobjs.InputTask = getCC(uiobjs.DetailRoot.transform, "InputTask", "UIPopupList")
@@ -154,25 +161,27 @@ function TRPCustDetail:prepareMoreData()
    attr.donotJoinKey = true
    table.insert(self.sysFields, attr)
    ---@type _ParamFieldAttr
-    attr = {}
-    attr.id = "followupTime"
-    attr.attrName = "下次跟进"
-    attr.attrType = DBCust.FieldType.text
-    attr.ifMust = 0
-    attr.height = 180
-    attr.donotJoinKey = true
-    table.insert(self.sysFields, attr)
+    -- attr = {}
+    -- attr.id = "followupTime"
+    -- attr.attrName = "下次跟进"
+    -- attr.attrType = DBCust.FieldType.text
+    -- attr.ifMust = 0
+    -- attr.height = 180
+    -- attr.donotJoinKey = true
+    -- table.insert(self.sysFields, attr)
 end

 -- 设置数据
 ---@param paras _ParamTRPCustDetail
 function TRPCustDetail:setData(paras)
    ---@type _DBCust
-    self.mdata = paras
+    self.mdata = paras.cust
    self.mdata._phoneNo = MyUtl.hidePhone(self.mdata.phoneNo)
    if type(self.mdata.jsonStr) == "string" then
        self.mdata.jsonStr = json.decode(self.mdata.jsonStr)
    end
+    self.bookingData = paras.bookingData
+    self.needShowMore = paras.needShowMore
 end

 ---public 当有通用背板显示时的回调
@@ -190,6 +199,7 @@ end

 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPCustDetail:show()
+    -- SetActive(uiobjs.ToggleMore.gameObject, self.needShowMore)
    self.records = nil
    self.orders = nil
    local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList)
@@ -448,10 +458,10 @@ end
 function TRPCustDetail:onClickMoreProc(el)
    if el.jsonKey == "follows" then
        -- 跟进记录
-        getPanelAsy("PanelFollowList", onLoadedPanelTT, {custId = self.mdata.custId})
+        getPanelAsy("PanelFollowList4Cust", onLoadedPanelTT, {custId = self.mdata.custId})
    elseif el.jsonKey == "followTasks" then
        -- 预约记录
-        getPanelAsy("PanelTaskList", onLoadedPanelTT, {custId = self.mdata.custId})
+        getPanelAsy("PanelTaskList4Cust", onLoadedPanelTT, {custId = self.mdata.custId})
    elseif el.jsonKey == "smsList" then
        -- 短信记录
    elseif el.jsonKey == "opList" then
@@ -561,7 +571,11 @@ function TRPCustDetail:setEventDelegate()
            self:showMore()
        end,
        ButtonNewFollow = function()
-            getPanelAsy("PanelNewFollow", onLoadedPanelTT, self.mdata)
+            ---@type _ParamTRPNewFollow
+            local param = {}
+            param.cust = self.mdata
+            param.bookingData = self.bookingData
+            getPanelAsy("PanelNewFollow", onLoadedPanelTT, param)
        end,
        ButtonNewTask = function()
            getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, self.mdata)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua
@@ -168,7 +168,12 @@ function TRPCustList:initCell(cell, data)
 end

 function TRPCustList:onClickCell(cell, data)
-    getPanelAsy("PanelCustDetail", onLoadedPanelTT, data)
+    ---@type _ParamTRPCustDetail
+    local param = {}
+    param.cust = data
+    param.bookingData = nil
+    param.needShowMore = true
+    getPanelAsy("PanelCustDetail", onLoadedPanelTT, param)
 end

 function TRPCustList:refreshFilterBtnStatus()
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua
@@ -166,7 +166,10 @@ function TRPFollowList:initCell(cell, data)
 end

 function TRPFollowList:onClickCell(cell, data)
-    getPanelAsy("PanelNewFollow", onLoadedPanelTT, data)
+    ---@type _ParamTRPNewFollow
+    local param = {}
+    param.followData = data
+    getPanelAsy("PanelNewFollow", onLoadedPanelTT, param)
 end

 function TRPFollowList:refreshFilterBtnStatus()
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua
@@ -396,7 +396,12 @@ function TRPNewCust:setEventDelegate()
                cust,
                function(content)
                    if content.success then
-                        getPanelAsy("PanelCustDetail", onLoadedPanel, content.result)
+                        ---@type _ParamTRPCustDetail
+                        local param = {}
+                        param.cust = content.result
+                        param.bookingData = nil
+                        param.needShowMore = true
+                        getPanelAsy("PanelCustDetail", onLoadedPanel, param)
                    end
                    hideHotWheel()
                end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
@@ -1,4 +1,9 @@
---@type IDBasePanel
+---@class _ParamTRPNewFollow
+---@field cust
+---@field followData
+---@field bookingData
+
+---@type IDBasePanel
 local TRBasePanel = require("ui.panel.TRBasePanel")
 ---@class TRPNewFollow:TRBasePanel 邮件列表
 local TRPNewFollow = class("TRPNewFollow", TRBasePanel)
@@ -111,14 +116,17 @@ end
 -- 设置数据
 ---@param paras _ParamTRPNewFollow
 function TRPNewFollow:setData(paras)
-    if paras.recordingTime then
-        self.mdata = paras
+    self.cust = paras.cust
+    self.mdata = paras.followData
+    self.bookingData = paras.bookingData
+
+    if self.mdata and self.mdata.recordingTime then
        self.isNewFollow = false
    else
        self.mdata = {}
-        self.mdata.custId = paras.custId
-        self.mdata.taskId = paras.taskId
-        self.mdata.custName = paras.custName
+        self.mdata.custId = self.cust.custId
+        self.mdata.taskId = self.cust.taskId
+        self.mdata.custName = self.cust.custName

        self.mdata.opportunity = "0"
        self.mdata.followUpType = "0"
@@ -244,12 +252,19 @@ function TRPNewFollow:setEventDelegate()
                return
            end
            self.mdata = uiobjs.DetailFromRoot:getValue(self.mdata, true)
+            if self.bookingData then
+                self.mdata.bookingId = self.bookingData.bookingId
+            end
            showHotWheel()
            NetProto.send.create_followUp_record(
                self.mdata,
                function(content)
                    hideHotWheel()
                    if content.success then
+                        if self.bookingData then
+                            -- 刷新预约的状态
+                            self.bookingData.bookingDone = "1"
+                        end
                        MyUtl.toastS("保存成功")
                        hideTopPanel(self.csSelf)
                    end
@@ -267,12 +282,14 @@ function TRPNewFollow:setEventDelegate()
                    hideHotWheel()
                    if content.success then
                        local cust = content.result
+
+                        ---@type _ParamTRPCustDetail
+                        local param = {}
+                        param.cust = cust
+                        param.bookingData = self.mdata
+                        param.needShowMore = false
                        if cust then
-                            getPanelAsy(
-                                "PanelCustDetailSimple",
-                                onLoadedPanelTT,
-                                {cust = cust, isShowButtonGet = false}
-                            )
+                            getPanelAsy("PanelCustDetail", onLoadedPanelTF, param)
                        end
                    end
                end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua
@@ -25,6 +25,7 @@ function TRPNewFollowTask:init(csObj)

    uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
    uiobjs.ButtonCustDetail = getChild(self.transform, "ButtonCustDetail")
+    uiobjs.ButtonNewFollow = getChild(self.transform, "ButtonNewFollow")
 end

 function TRPNewFollowTask:initFiledsAttr()
@@ -99,13 +100,16 @@ end
 function TRPNewFollowTask:show()
    if self.isNewFollow then
        SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+        SetActive(uiobjs.ButtonNewFollow.gameObject, false)
    else
        ---@type Coolape.CLPanelLua
        local panel = CLPanelManager.getPanel("PanelCustDetail")
        if panel and panel.gameObject.activeInHierarchy then
            SetActive(uiobjs.ButtonCustDetail.gameObject, false)
+            SetActive(uiobjs.ButtonNewFollow.gameObject, false)
        else
            SetActive(uiobjs.ButtonCustDetail.gameObject, true)
+            SetActive(uiobjs.ButtonNewFollow.gameObject, true)
        end
    end

@@ -232,6 +236,8 @@ function TRPNewFollowTask:procNetwork(cmd, succ, msg, paras)
    if (succ == NetSuccess) then
        if cmd == NetProto.cmds.update_customer then
            self:refreshContent()
+        elseif cmd == NetProto.cmds.create_followUp_record then
+            self:refreshContent()
        end
    end
 end
@@ -245,6 +251,12 @@ function TRPNewFollowTask:setEventDelegate()
                return
            end
            self.mdata = uiobjs.DetailFromRoot:getValue(self.mdata, true)
+            -- 时间处理
+            local setDt = DateTime.Parse( self.mdata.bookingTime)
+            if setDt:ToFileTime() < DateTime.Now:ToFileTime() then
+                MyUtl.toastW("预约时间已过，请选择未来的预约时间")
+                return
+            end
            showHotWheel()
            NetProto.send.create_followUp_task(
                self.mdata,
@@ -266,15 +278,27 @@ function TRPNewFollowTask:setEventDelegate()
                    if content.success then
                        local cust = content.result
                        if cust then
+                            ---@type _ParamTRPCustDetail
+                            local param = {}
+                            param.cust = cust
+                            param.bookingData = self.mdata
+                            param.needShowMore = false
                            getPanelAsy(
-                                "PanelCustDetailSimple",
-                                onLoadedPanelTT,
-                                {cust = cust, isShowButtonGet = false}
+                                "PanelCustDetail",
+                                onLoadedPanelTF,
+                                param
                            )
                        end
                    end
                end
            )
+        end,
+        ButtonNewFollow = function()
+            ---@type _ParamTRPNewFollow
+            local param = {}
+            param.cust = self.mdata
+            param.bookingData = self.mdata
+            getPanelAsy("PanelNewFollow", onLoadedPanelTT, param)
        end
    }
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
@@ -252,7 +252,7 @@ function TRPOrderDetail:showExtentFiles(templetId)
    param.data = self.mdata and self.mdata.attrJson or {}
    param.onFinish = self:wrapFunc(self.reposition)
    param.fields = {}
-    local fields = DBCust.getFieldsByTask(templetId) or {}
+    local fields = DBOrder.getFields(templetId) or {}
    ---@type _ParamCellExtendFiled
    local filedInfor
    for i, v in ipairs(fields) do
@@ -301,13 +301,15 @@ function TRPOrderDetail:onClickAttachment(cell, data)
            false,
            "打开",
            function()
-                Application.OpenURL(joinStr("file://", path))
+                -- Application.OpenURL(joinStr("file://", path))
+                MyFileOpen.open(path)
            end,
            "取消",
            nil
        )
    else
-        MyUtl.toastW("附件未下载完成，暂时无法查看")
+        cell.luaTable.download()
+        -- MyUtl.toastW("附件未下载完成，暂时无法查看")
    end
 end

--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep2.lua
@@ -103,9 +103,15 @@ function TRPResetPasswordStep2:setEventDelegate()
                    data,
                    function(content)
                        if content.success then
+                            MyUtl.toastS("绑定手机号成功")
+                            Prefs.setUserName(self.mData.phone)
                            hideTopPanel(self.csSelf)
                            hideTopPanel()
-                            MyUtl.toastS("绑定手机号成功")
+                            hideTopPanel()
+                            hideTopPanel()
+                            hideTopPanel()
+                            hideTopPanel()
+                            getPanelAsy("PanelLogin", onLoadedPanel)
                        end
                    end
                )
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPTaskList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPTaskList.lua
@@ -242,6 +242,8 @@ function TRPTaskList:procNetwork(cmd, succ, msg, paras)
            uiobjs.Grid:refreshContentOnly()
        elseif cmd == NetProto.cmds.save_customer then
            self:refreshList()
+        elseif cmd == NetProto.cmds.create_followUp_record then
+            uiobjs.Grid:refreshContentOnly()
        end
    end
 end
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab
@@ -426,7 +426,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 80.5
+  aspectRatio: 0.77403843
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -596,7 +596,7 @@ MonoBehaviour:
  startingRenderQueue: 3004
  mClipTexture: {fileID: 0}
  mAlpha: 1
-  mClipping: 3
+  mClipping: 4
  mClipRange: {x: 0, y: 189, z: 678, w: 360}
  mClipSoftness: {x: 1, y: 5}
  mDepth: 2
@@ -1551,7 +1551,7 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
  mPivot: 4
-  mWidth: 224
+  mWidth: 18
  mHeight: 55
  mDepth: 5
  autoResizeBoxCollider: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab
@@ -2346,7 +2346,7 @@ MonoBehaviour:
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u5BA2\u6237\u540D\u79F0/\u7535\u8BDD/\u516C\u53F8\u540D\u79F0"
+  mText: "\u8DDF\u8FDB\u5185\u5BB9"
  mFontSize: 48
  mFontStyle: 0
  mAlignment: 0
@@ -2681,7 +2681,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: companyName
+  jsonKey: custName
  formatValue: "[999999]\u6765\u81EA\u5BA2\u6237\uFF1A[-][4c4c4c]{0}[-]"
  labeName: {fileID: 0}
  defaultName: 
@@ -2999,7 +2999,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  jsonKey: FollowUpContent
+  jsonKey: followUpContent
  formatValue: 
  labeName: {fileID: 0}
  defaultName: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList4Cust.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList4Cust.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList4Cust.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList4Cust.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: edde92055d1764bdc8e17e5ff5e6c685
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelGuid.prefab
@@ -99,7 +99,7 @@ MonoBehaviour:
  iOSDragEmulation: 1
  scrollWheelFactor: 0.25
  momentumAmount: 35
-  dampenStrength: 9
+  dampenStrength: 5
  horizontalScrollBar: {fileID: 0}
  verticalScrollBar: {fileID: 0}
  showScrollBars: 1
@@ -453,7 +453,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ddc557079ce844e7c935ca3f8bf4a6c5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  speed: 1.5
+  speed: 2
  moveCurve:
    serializedVersion: 2
    m_Curve:
@@ -504,7 +504,7 @@ MonoBehaviour:
  oldParentClipOffset: {x: 0, y: 0}
  isLimitless: 0
  isReverse: 0
-  dragSensitivity: 5
+  dragSensitivity: 3
  page1: {fileID: 8203674786200340029}
  page2: {fileID: 3901995379544073836}
  page3: {fileID: 6126386713007076957}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab
@@ -491,7 +491,6 @@ GameObject:
  - component: {fileID: 7487699256290532919}
  - component: {fileID: 1283151448246207708}
  - component: {fileID: 3696125885157695568}
-  - component: {fileID: 4144100815855023860}
  m_Layer: 5
  m_Name: ButtonCustDetail
  m_TagString: Untagged
@@ -507,7 +506,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5113059414826645774}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1042, z: 0}
+  m_LocalPosition: {x: -258, y: -1042, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5950202487608235859}
@@ -525,7 +524,7 @@ BoxCollider:
  m_IsTrigger: 1
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 1025, y: 160, z: 0}
+  m_Size: {x: 511, y: 160, z: 0}
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &1283151448246207708
 MonoBehaviour:
@@ -539,7 +538,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  tweenTarget: {fileID: 0}
+  tweenTarget: {fileID: 5113059414826645774}
  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
@@ -574,13 +573,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 5592195152047375516}
    relative: 0
-    absolute: 0
+    absolute: 50
  rightAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
+    target: {fileID: 5592195152047375516}
+    relative: 0.5
+    absolute: -1
  bottomAnchor:
    target: {fileID: 5592195152047375516}
    relative: 0
@@ -590,15 +589,15 @@ MonoBehaviour:
    relative: 0
    absolute: 190
  updateAnchors: 0
-  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
-  mWidth: 1025
+  mWidth: 511
  mHeight: 160
  mDepth: 8
  autoResizeBoxCollider: 1
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 6.40625
+  aspectRatio: 3.19375
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -611,24 +610,109 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: public_button
+  mSpriteName: news_news_bg2
  mFillCenter: 1
  isGrayMode: 0
--- !u!114 &4144100815855023860
+--- !u!1 &6106908705012866600
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2664336086781033549}
+  - component: {fileID: 3029394721680617477}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2664336086781033549
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6106908705012866600}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 336100135953998016}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3029394721680617477
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5113059414826645774}
+  m_GameObject: {fileID: 6106908705012866600}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  widget: {fileID: 3696125885157695568}
-  offset: 50
-  sizeAdjust: 1
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 200
+  mHeight: 50
+  mDepth: 9
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u65B0\u5EFA\u8DDF\u8FDB"
+  mFontSize: 50
+  mFontStyle: 0
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 2
+  mMaterial: {fileID: 0}
+  mApplyGradient: 0
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
 --- !u!1 &6655210489690858908
 GameObject:
  m_ObjectHideFlags: 0
@@ -662,6 +746,7 @@ Transform:
  - {fileID: 85942781782062204}
  - {fileID: 4329241472409898579}
  - {fileID: 7490712211079302417}
+  - {fileID: 336100135953998016}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -790,6 +875,140 @@ MonoBehaviour:
  hideInactive: 1
  keepWithinPanel: 0
  padding: {x: 0, y: 30}
+--- !u!1 &8512893132494291470
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 336100135953998016}
+  - component: {fileID: 1462863090955398542}
+  - component: {fileID: 6852593968432127851}
+  - component: {fileID: 2540085604597852893}
+  m_Layer: 5
+  m_Name: ButtonNewFollow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &336100135953998016
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8512893132494291470}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 256, y: -1042, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2664336086781033549}
+  m_Father: {fileID: 5592195152047375516}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1462863090955398542
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8512893132494291470}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 511, y: 160, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &6852593968432127851
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8512893132494291470}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 8512893132494291470}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 0
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick:
+  - mTarget: {fileID: 6003453472346918249}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &2540085604597852893
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8512893132494291470}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0.5
+    absolute: 1
+  rightAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 1
+    absolute: -50
+  bottomAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0
+    absolute: 30
+  topAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0
+    absolute: 190
+  updateAnchors: 0
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
+  mPivot: 4
+  mWidth: 511
+  mHeight: 160
+  mDepth: 8
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 3.475
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: news_news_bg3
+  mFillCenter: 1
+  isGrayMode: 0
 --- !u!1 &9049775882809917633
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
@@ -1167,8 +1167,6 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 1360912303918495723}
-  - component: {fileID: 3834450592202181646}
-  - component: {fileID: 8497169072743663993}
  - component: {fileID: 8198695786030183274}
  m_Layer: 5
  m_Name: ButtonDownload
@@ -1184,60 +1182,13 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 505517071713258037}
-  m_LocalRotation: {x: 0, y: 0, z: 1, w: -0.00000004371139}
-  m_LocalPosition: {x: 88, y: -88, z: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 486, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1467516596806451442}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &3834450592202181646
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 505517071713258037}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 260, y: 260, z: 0}
-  m_Center: {x: 88.91, y: -88.6, z: 0}
--- !u!114 &8497169072743663993
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 505517071713258037}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  tweenTarget: {fileID: 505517071713258037}
-  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
-  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
-  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
-  duration: 0.2
-  skipColorEffect: 1
-  dragHighlight: 0
-  hoverSprite: 
-  pressedSprite: 
-  disabledSprite: 
-  hoverSprite2D: {fileID: 0}
-  pressedSprite2D: {fileID: 0}
-  disabledSprite2D: {fileID: 0}
-  pixelSnap: 0
-  onClick:
-  - mTarget: {fileID: 5746343202289990627}
-    mMethodName: uiEventDelegate
-    mParameters:
-    - obj: {fileID: 0}
-      field: 
-      name: go
-    oneShot: 0
 --- !u!114 &8198695786030183274
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -1251,13 +1202,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  rightAnchor:
-    target: {fileID: 0}
+    target: {fileID: 1467516596806451442}
    relative: 1
-    absolute: 0
+    absolute: -102
+  rightAnchor:
+    target: {fileID: 1467516596806451442}
+    relative: 1
+    absolute: -50
  bottomAnchor:
    target: {fileID: 0}
    relative: 0
@@ -1266,16 +1217,16 @@ MonoBehaviour:
    target: {fileID: 0}
    relative: 1
    absolute: 0
-  updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  updateAnchors: 0
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 4
-  mWidth: 60
+  mWidth: 52
  mHeight: 60
  mDepth: 7
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1
+  aspectRatio: 0.033333335
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -1288,7 +1239,7 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: order_upload
+  mSpriteName: work_xiazai-icon
  mFillCenter: 1
  isGrayMode: 0
 --- !u!1 &565501314856477289
@@ -1354,8 +1305,8 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 4
-  mWidth: 200
-  mHeight: 200
+  mWidth: 140
+  mHeight: 140
  mDepth: 5
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
@@ -1388,7 +1339,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: cf6484591c9cb0e409f5c53c6978a95d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  rotationsPerSecond: {x: 0, y: 0, z: 0.1}
+  rotationsPerSecond: {x: 0, y: 0, z: -0.5}
  ignoreTimeScale: 0
 --- !u!1 &704041659391080358
 GameObject:
@@ -1967,7 +1918,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4713050183387073493
 Transform:
  m_ObjectHideFlags: 0
@@ -2011,12 +1962,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  arrangement: 0
+  arrangement: 1
  sorting: 1
  pivot: 1
-  maxPerLine: 4
-  cellWidth: 283.74
-  cellHeight: 420
+  maxPerLine: 0
+  cellWidth: 0
+  cellHeight: 200
  animateSmoothly: 0
  hideInactive: 1
  keepWithinPanel: 0
@@ -2248,7 +2199,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1217192100569320354}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -181.5, z: 0}
+  m_LocalPosition: {x: -382, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1467516596806451442}
@@ -2267,13 +2218,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 1467516596806451442}
    relative: 0
-    absolute: 0
+    absolute: 180
  rightAnchor:
-    target: {fileID: 0}
+    target: {fileID: 1467516596806451442}
    relative: 1
-    absolute: 0
+    absolute: -150
  bottomAnchor:
    target: {fileID: 0}
    relative: 0
@@ -2282,16 +2233,16 @@ MonoBehaviour:
    target: {fileID: 0}
    relative: 1
    absolute: 0
-  updateAnchors: 1
+  updateAnchors: 0
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
-  mPivot: 4
-  mWidth: 245
+  mPivot: 3
+  mWidth: 795
  mHeight: 84
  mDepth: 6
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2.9166667
+  aspectRatio: 9.464286
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -2305,7 +2256,7 @@ MonoBehaviour:
  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
  mSymbols: 1
  mEffectDistance: {x: 1, y: 1}
-  mOverflow: 1
+  mOverflow: 0
  mMaterial: {fileID: 0}
  mApplyGradient: 0
  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
@@ -3753,6 +3704,90 @@ BoxCollider:
  serializedVersion: 2
  m_Size: {x: 1125, y: 1984, z: 0}
  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &2570466832924189985
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7861898011708102283}
+  - component: {fileID: 3050944533235166757}
+  m_Layer: 5
+  m_Name: SpriteRight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7861898011708102283
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2570466832924189985}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1467516596806451442}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3050944533235166757
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2570466832924189985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 1467516596806451442}
+    relative: 1
+    absolute: -70
+  rightAnchor:
+    target: {fileID: 1467516596806451442}
+    relative: 1
+    absolute: -50
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 20
+  mHeight: 36
+  mDepth: 7
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.5555556
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: cust_icon-right2
+  mFillCenter: 1
+  isGrayMode: 0
 --- !u!1 &2599912929479197627
 GameObject:
  m_ObjectHideFlags: 0
@@ -8380,13 +8415,14 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 707187227634174975}
+  - component: {fileID: 2939650569000075829}
  m_Layer: 5
  m_Name: DownloadProgress
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &707187227634174975
 Transform:
  m_ObjectHideFlags: 0
@@ -8395,7 +8431,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5432750105014609252}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 478, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 3074807661475435551}
@@ -8403,6 +8439,44 @@ Transform:
  m_Father: {fileID: 1467516596806451442}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2939650569000075829
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5432750105014609252}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 1467516596806451442}
+    relative: 1
+    absolute: -134
+  rightAnchor:
+    target: {fileID: 1467516596806451442}
+    relative: 1
+    absolute: -34
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 100
+  mHeight: 100
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
 --- !u!1 &5505984191990585591
 GameObject:
  m_ObjectHideFlags: 0
@@ -8430,7 +8504,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5505984191990585591}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 117, y: 117, z: 0}
+  m_LocalPosition: {x: 554, y: 82, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1467516596806451442}
@@ -9075,8 +9149,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5734003362335122161}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1}
+  m_LocalPosition: {x: -470, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1467516596806451442}
  m_RootOrder: 2
@@ -9094,13 +9168,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  leftAnchor:
-    target: {fileID: 0}
+    target: {fileID: 1467516596806451442}
    relative: 0
-    absolute: 0
+    absolute: 50
  rightAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
+    target: {fileID: 1467516596806451442}
+    relative: 0
+    absolute: 134
  bottomAnchor:
    target: {fileID: 0}
    relative: 0
@@ -9109,16 +9183,16 @@ MonoBehaviour:
    target: {fileID: 0}
    relative: 1
    absolute: 0
-  updateAnchors: 1
-  mColor: {r: 1, g: 0.73178554, b: 0.0047169924, a: 1}
+  updateAnchors: 0
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
  mPivot: 4
-  mWidth: 88
-  mHeight: 94
+  mWidth: 84
+  mHeight: 68
  mDepth: 2
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 0.9361702
+  aspectRatio: 1.2352941
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -9131,7 +9205,7 @@ MonoBehaviour:
  topType: 1
  atlasName: atlasAllReal
  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: mine_me_opinion
+  mSpriteName: work_img-icon
  mFillCenter: 1
  isGrayMode: 0
 --- !u!1 &5937965850347534896
@@ -10389,18 +10463,18 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
  mPivot: 4
-  mWidth: 86
-  mHeight: 32
+  mWidth: 82
+  mHeight: 30
  mDepth: 6
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2.6875
+  aspectRatio: 3.9047618
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
  mText: 100%
-  mFontSize: 32
+  mFontSize: 30
  mFontStyle: 1
  mAlignment: 0
  mEncoding: 1
@@ -12147,6 +12221,7 @@ GameObject:
  - component: {fileID: 615197027365497756}
  - component: {fileID: 7895627072394526223}
  - component: {fileID: 1528664928413975126}
+  - component: {fileID: 6994380934354179318}
  m_Layer: 5
  m_Name: 00000
  m_TagString: Untagged
@@ -12170,6 +12245,7 @@ Transform:
  - {fileID: 593301531348764212}
  - {fileID: 707187227634174975}
  - {fileID: 1360912303918495723}
+  - {fileID: 7861898011708102283}
  m_Father: {fileID: 4713050183387073493}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -12213,7 +12289,7 @@ BoxCollider:
  m_IsTrigger: 0
  m_Enabled: 1
  serializedVersion: 2
-  m_Size: {x: 250, y: 250, z: 0}
+  m_Size: {x: 1125, y: 180, z: 0}
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &1528664928413975126
 MonoBehaviour:
@@ -12246,13 +12322,13 @@ MonoBehaviour:
  updateAnchors: 1
  mColor: {r: 1, g: 1, b: 1, a: 1}
  mPivot: 4
-  mWidth: 250
-  mHeight: 250
+  mWidth: 1125
+  mHeight: 180
  mDepth: 0
  autoResizeBoxCollider: 1
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 1
+  aspectRatio: 6.25
  mType: 0
  mFillDirection: 4
  mFillAmount: 1
@@ -12274,6 +12350,21 @@ MonoBehaviour:
  mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
  mBorder: {x: 0, y: 0, z: 0, w: 0}
  mFixedAspect: 0
+--- !u!114 &6994380934354179318
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7988814047750342368}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 1528664928413975126}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &8087873310069033674
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTaskList.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTaskList.prefab
@@ -912,9 +912,11 @@ MonoBehaviour:
  items:
  - "\u672A\u5F00\u59CB"
  - "\u5DF2\u5904\u7406"
+  - "\u5DF2\u8D85\u65F6"
  valueItems:
  - 0
  - 1
+  - -1
  padding: {x: 4, y: 4}
  textColor: {r: 1, g: 1, b: 1, a: 1}
  backgroundColor: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTaskList4Cust.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTaskList4Cust.prefab
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTaskList4Cust.prefab.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTaskList4Cust.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6c98a1e46f04048eaab422443d17ddba
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/img-icon.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/img-icon.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/img-icon.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/img-icon.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b1aa2d42df0484a94aa9ec4d6f4f7fed
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/wenjian-icon.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/wenjian-icon.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/wenjian-icon.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/wenjian-icon.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d5a5e232426c34bcc987f385c76d3f80
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/xiazai-icon.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/xiazai-icon.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/xiazai-icon.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/xiazai-icon.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e1fda8ee5986e4564be86450af3b9368
+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/db/DBTextures.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua
--- 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/TRCellAttachment.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellTaskList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellTaskList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPConfirm.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/TRPCustList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPFollowList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollow.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowTask.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/TRPResetPasswordStep2.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPResetPasswordStep2.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPTaskList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelConfirm.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList4Cust.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList4Cust.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList4Cust.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelFollowList4Cust.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1e2484092aa1d4732ace06d6614b2cd3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelGuid.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowTask.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/PanelTaskList.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList4Cust.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList4Cust.unity3d
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList4Cust.unity3d.meta
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTaskList4Cust.unity3d.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 73452f0cdac2a412a80355b598ffb91d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- 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,38c6707a912481e1f76d5f6edf95c1fa8	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,048ea73ad033153969ebfc46a363c56d8	%trCRM/resVer/Android/VerCtl/other.ver8,0a763b03453ce762f67786f8d8aee352
--- 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
--- a/Assets/trCRM/xRes/test.jpg
+++ b/Assets/trCRM/xRes/test.jpg
--- a/Assets/trCRM/xRes/test.jpg.meta
+++ b/Assets/trCRM/xRes/test.jpg.meta
@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: bf092fe679bca4a6e82970073f981faf
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    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: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  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: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: