up

Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab

@@ -1809,6 +1809,20 @@ MonoBehaviour:
     paddingTop: 0
     paddingBottom: 0
     path: trCRM/upgradeRes4Dev/other/uiAtlas/order/system.png
+  - name: logo_512
+    x: 0
+    y: 0
+    width: 512
+    height: 512
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png
   mPixelSize: 1
   mReplacement: {fileID: 0}
   mCoordinates: 0

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBCust.lua

@@ -27,7 +27,8 @@ DBCust.FilterGroup = {
     custTypeList = "custTypeList", -- list 客户类型
     dealFlagList = "dealFlagList", -- list 客户状态
     loginNoList = "loginNoList", --  list 归属工号
-    taskList = "taskList" -- list 任务名称
+    taskList = "taskList", -- list 任务名称
+    followUpTypeList = "followUpTypeList" -- 跟进类型
 }
 
 DBCust.FieldType = {
@@ -37,7 +38,16 @@ DBCust.FieldType = {
     number = "数字文本框",
     dateTime = "时间文本框",
     text = "普通文本框",
-    phone = "电话号码框"
+    phone = "电话号码框",
+    empty ="empty"
+}
+---@class _FieldMode
+_FieldMode = {
+    inputOnly = 0, -- 纯输入
+    showOnly = 1, -- 纯展示模式
+    modifyOnly = 2, -- 修改模式
+    showAndModify = 3, -- 展示械式，同时也可以modify
+    button = 4, -- 类似按钮的功能
 }
 
 DBCust.onGetFilter = function(data)

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBRoot.lua

@@ -4,12 +4,14 @@ require "db.DBCust"
 require "db.DBStatistics"
 require "db.DBUser"
 require "db.DBOrder"
+require "db.DBTextures"
 
 ---@class DBRoot
 DBRoot = {}
 DBRoot.db = {}
 DBRoot.init = function()
     DBMessage.init()
+    DBTextures.init()
     NetProto.setReceiveCMDCallback(DBRoot.onReceiveData)
 end
 
@@ -18,6 +20,7 @@ DBRoot.clean = function()
     DBMessage.clean()
     DBCust.clean()
     DBStatistics.clean()
+    DBTextures.clean()
 end
 
 DBRoot.funcs = {

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua

@@ -0,0 +1,53 @@
+DBTextures = {}
+local db = {}
+
+function DBTextures.init()
+    InvokeEx.cancelInvoke(DBTextures.releaseTimeout)
+    InvokeEx.invoke(DBTextures.releaseTimeout, 60)
+end
+
+function DBTextures.clean()
+    InvokeEx.cancelInvoke(DBTextures.releaseTimeout)
+    for k, v in ipairs(db) do
+        GameObject.DestroyImmediate(v)
+    end
+    db = {}
+end
+
+function DBTextures.releaseTimeout()
+    for k, v in ipairs(db) do
+        if DateEx.nowMS - v.lastUseTime > 300000 then
+            GameObject.DestroyImmediate(v.texture)
+            db[k] = nil
+        end
+    end
+end
+
+---@return UnityEngine.UnityWebRequest
+function DBTextures.getByUrl(url, callback, orgs)
+    local tt = db[url]
+    if tt then
+        tt.lastUseTime = DateEx.nowMS
+        db[url] = tt
+        Utl.doCallback(callback, tt.texture, orgs)
+        return nil
+    end
+
+    local request =
+        WWWEx.get(
+        url,
+        nil,
+        CLAssetType.texture,
+        function(content)
+            db[url] = {texture = content, lastUseTime = DateEx.nowMS}
+            Utl.doCallback(callback, content, orgs)
+        end,
+        nil,
+        orgs,
+        true,
+        1
+    )
+    return request
+end
+
+return DBTextures

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua.meta

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

Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua

@@ -241,6 +241,7 @@ NetProto.cmds = {
     load_wfTicket_Settings = "load_WfTicket_Settings", -- 工单配置信息
     selectProductInfo = "selectProductInfo", -- 商品列表
     createWfInfo = "createWfInfo", -- 创建订单
+    create_followUp_task = "create_followUp_task", -- 创建跟进预约
 }
 ---------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------
@@ -566,5 +567,12 @@ NetProto.send.createWfInfo = function(workFlowInfo, callback, timeOutSec)
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 
+NetProto.send.create_followUp_task = function(followUpTaskJson, callback, timeOutSec)
+    local content = {}
+    content.action = NetProto.cmds.create_followUp_task
+    content.followUpTaskJson = followUpTaskJson
+    content.followUpTaskJson.groupId = NetProto.groupId
+    NetProto.sendSocket(content, callback, timeOutSec)
+end
 ------------------------------------------------------
 return NetProto

Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua

@@ -261,7 +261,13 @@ Mp3PlayerByUrl = CS.Mp3PlayerByUrl
 CLUICheckbox = CS.CLUICheckbox
 ---@type CLUIPopListPanel
 CLUIPopListPanel = CS.CLUIPopListPanel
-CLUIScrollViewWithEvent= CS.CLUIScrollViewWithEvent
+CLUIScrollViewWithEvent = CS.CLUIScrollViewWithEvent
+---@type MyGallery
+MyGallery = CS.MyGallery
+---@type NativeCamera
+NativeCamera = CS.NativeCamera
+---@type MyCamera
+MyCamera = CS.MyCamera
 -------------------------------------------------------
 json = require("json.json")
 

Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua

@@ -317,11 +317,13 @@ function hideTopPanel(p)
     end
 end
 
+---@param go UnityEngine.GameObject
 function SetActive(go, isActive)
     if (go == nil) then
         return
     end
-    NGUITools.SetActive(go, isActive)
+    -- NGUITools.SetActive(go, isActive)
+    go:SetActive(isActive)
 end
 
 function getCC(transform, path, com)

Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua

@@ -85,7 +85,7 @@ MyUtl.doCall = function(custId, phoneNo, cust)
             hideHotWheel()
             if content.success then
                 MyUtl.toastS("拨号成功！")
-                getPanelAsy("PanelNewFollow", onLoadedPanelTT, cust)
+                getPanelAsy("PanelNewFollowSimple", onLoadedPanelTT, cust)
             end
         end
     )

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua

@@ -67,6 +67,7 @@ function _cell.uiEventDelegate(go)
     local goName = go.name
     if goName == "ButtonFollow" then
     elseif goName == "ButtonTask" then
+        getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, mData)
     elseif goName == "ButtonContact" then
         MyUtl.callCust(mData)
     end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua

@@ -0,0 +1,30 @@
+-- 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 UIWidget
+    uiobjs.widget = csSelf:GetComponent("UIWidget")
+end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    uiobjs.widget.height = mData.height or 40
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+--------------------------------------------
+return _cell

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellEmptySpace.lua.meta

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

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendField.lua

@@ -1,17 +1,20 @@
 ---@class _ParamFieldAttr
+---@field id
 ---@field attrType
 ---@field ifMust boolean 1:true
+---@field ifTime boolean 1:true
+---@field cannotEdit
 ---@field attrName
 ---@field attrValue
----@field id
 ---@field checkMin
 ---@field checkMax
 ---@field popOptions
 ---@field popValues
 ---@field donotJoinKey boolean 是否要拼接key
+---@field height numb 高度，只有在emptyspace有用
 
 ---@class _ParamCellExtendFiled
----@field isEditMode boolean
+---@field showMode _FieldMode
 ---@field attr _ParamFieldAttr
 ---@field onSelect function 当选择了poplist
 ---@field onClick function 当点击了输入框
@@ -39,10 +42,6 @@ function _cell.init(csObj)
         uiobjs.spriteBg = getCC(transform, "Background", "UISprite")
     end
 
-    -- if uiobjs.spriteBg then
-    --     uiobjs.spriteBg.width = NumEx.getIntPart(CSPMain.contentRect.z)
-    -- end
-
     uiobjs.boxCollider = csSelf:GetComponent("BoxCollider")
     ---@type UIInput
     uiobjs.input = csSelf:GetComponent("UIInput")
@@ -67,35 +66,6 @@ function _cell.show(go, data)
     attr = mData.attr
     attr.ifMust = attr.ifMust or 0
 
-    if data.isEditMode then
-        _cell.enabeldObj(uiobjs.boxCollider, true)
-        if uiobjs.Label then
-            uiobjs.Label.text = uiobjs.inputLabel
-        end
-        if uiobjs.input then
-            uiobjs.input.defaultText = uiobjs.inputLabel
-        end
-        _cell.enabeldObj(uiobjs.Label4, true)
-        _cell.enabeldObj(uiobjs.SpriteRight, true)
-        if uiobjs.ButtonReset then
-            uiobjs.ButtonReset.disabled = false
-        end
-    else
-        _cell.enabeldObj(uiobjs.boxCollider, false)
-        if uiobjs.Label then
-            uiobjs.Label.text = ""
-        end
-        if uiobjs.input then
-            uiobjs.input.defaultText = ""
-        end
-        _cell.enabeldObj(uiobjs.Label4, false)
-        _cell.enabeldObj(uiobjs.SpriteRight, false)
-
-        if uiobjs.ButtonReset then
-            uiobjs.ButtonReset.disabled = true
-        end
-    end
-
     local jsonKey
     if attr.donotJoinKey then
         jsonKey = attr.id
@@ -114,7 +84,6 @@ function _cell.show(go, data)
         uiobjs.checkbox.labeName.text = attr.attrName
     end
 
-    _cell.enabeldObj(uiobjs.input, true)
     if attr.attrType == DBCust.FieldType.text then
         uiobjs.input.keyboardType = UIInput.KeyboardType.Default
     elseif attr.attrType == DBCust.FieldType.number then
@@ -126,14 +95,15 @@ function _cell.show(go, data)
     elseif attr.attrType == DBCust.FieldType.multext then
         uiobjs.input.keyboardType = UIInput.KeyboardType.Default
     elseif attr.attrType == DBCust.FieldType.dateTime then
-        _cell.enabeldObj(uiobjs.input, false)
+        local elementDate = csSelf:GetComponent("CLUIElementDate")
+        if elementDate then
+            elementDate.isSetTime = ((attr.ifTime and attr.ifTime == 1) and true or false)
+        end
     elseif attr.attrType == DBCust.FieldType.checkbox then
-        _cell.enabeldObj(uiobjs.input, false)
         local max = tonumber(attr.checkMax) or 0
         uiobjs.checkbox.isMultMode = (max > 1) or (max == 0)
         uiobjs.checkbox:init(attr)
     elseif attr.attrType == DBCust.FieldType.popuplist then
-        _cell.enabeldObj(uiobjs.input, false)
         if attr.popOptions then
             uiobjs.popList:refreshItems(attr.popOptions, attr.popValues)
         else
@@ -146,6 +116,9 @@ function _cell.show(go, data)
             uiobjs.popList:refreshItems(array, array)
         end
     end
+
+    -- 设置展示的模式
+    _cell.setElementMode(mData.showMode or _FieldMode.inputOnly)
 end
 
 function _cell.enabeldObj(obj, val)
@@ -154,6 +127,123 @@ function _cell.enabeldObj(obj, val)
     end
 end
 
+function _cell.setElementMode(mode)
+    local isPopList = uiobjs.popList
+    local isPopCheckbox = uiobjs.checkbox
+    ---@type UIInput
+    local input = uiobjs.input
+    local inputOnGUI = csSelf:GetComponent("UIInputOnGUI")
+    local boxcollider = uiobjs.boxCollider
+    local ButtonReset = uiobjs.ButtonReset
+
+    if mode == _FieldMode.inputOnly then
+        _cell.enabeldObj(boxcollider, true)
+        _cell.enabeldObj(inputOnGUI, true)
+        _cell.enabeldObj(input, true)
+        if uiobjs.Label2 then
+            uiobjs.Label2.color = ColorEx.getColor(0xff999999)
+        end
+        if uiobjs.ButtonReset then
+            uiobjs.ButtonReset.disabled = false
+        end
+        if uiobjs.Label then
+            uiobjs.Label.text = uiobjs.inputLabel
+        end
+        if uiobjs.input then
+            uiobjs.input.defaultText = uiobjs.inputLabel
+        end
+        _cell.enabeldObj(uiobjs.Label4, true) -- multext
+        if
+            attr.attrType == DBCust.FieldType.dateTime or attr.attrType == DBCust.FieldType.checkbox or
+                attr.attrType == DBCust.FieldType.popuplist
+         then
+            _cell.enabeldObj(uiobjs.SpriteRight, true)
+        else
+            _cell.enabeldObj(uiobjs.SpriteRight, false)
+        end
+    elseif mode == _FieldMode.showOnly then
+        _cell.enabeldObj(boxcollider, false)
+        _cell.enabeldObj(inputOnGUI, false)
+        _cell.enabeldObj(input, false)
+        if uiobjs.Label2 then
+            uiobjs.Label2.color = ColorEx.getColor(0xff999999)
+        end
+        if uiobjs.ButtonReset then
+            uiobjs.ButtonReset.disabled = true
+        end
+        if uiobjs.Label then
+            uiobjs.Label.text = ""
+        end
+        if uiobjs.input then
+            uiobjs.input.defaultText = ""
+        end
+        _cell.enabeldObj(uiobjs.Label4, false)
+        _cell.enabeldObj(uiobjs.SpriteRight, false)
+    elseif mode == _FieldMode.modifyOnly then
+        _cell.enabeldObj(boxcollider, true)
+        _cell.enabeldObj(inputOnGUI, false)
+        _cell.enabeldObj(input, false)
+        if uiobjs.Label2 then
+            uiobjs.Label2.color = ColorEx.getColor(0xff999999)
+        end
+        if uiobjs.ButtonReset then
+            uiobjs.ButtonReset.disabled = true
+        end
+        if uiobjs.Label then
+            uiobjs.Label.text = uiobjs.inputLabel
+        end
+        if uiobjs.input then
+            uiobjs.input.defaultText = uiobjs.inputLabel
+        end
+        _cell.enabeldObj(uiobjs.Label4, true)
+        _cell.enabeldObj(uiobjs.SpriteRight, true)
+    elseif mode == _FieldMode.showAndModify then
+        _cell.enabeldObj(boxcollider, true)
+        _cell.enabeldObj(inputOnGUI, false)
+        _cell.enabeldObj(input, false)
+        if uiobjs.Label2 then
+            uiobjs.Label2.color = ColorEx.getColor(0xff999999)
+        end
+        if uiobjs.ButtonReset then
+            uiobjs.ButtonReset.disabled = true
+        end
+        if uiobjs.Label then
+            uiobjs.Label.text = ""
+        end
+        if uiobjs.input then
+            uiobjs.input.defaultText = ""
+        end
+        _cell.enabeldObj(uiobjs.Label4, false)
+        _cell.enabeldObj(uiobjs.SpriteRight, true)
+    elseif mode == _FieldMode.button then
+        _cell.enabeldObj(boxcollider, true)
+        _cell.enabeldObj(inputOnGUI, false)
+        _cell.enabeldObj(input, false)
+        if uiobjs.Label2 then
+            uiobjs.Label2.color = ColorEx.getColor(0xff363636)
+        end
+        if uiobjs.ButtonReset then
+            uiobjs.ButtonReset.disabled = true
+        end
+        if uiobjs.Label then
+            uiobjs.Label.text = ""
+        end
+        if uiobjs.input then
+            uiobjs.input.defaultText = ""
+        end
+        _cell.enabeldObj(uiobjs.Label4, false)
+        _cell.enabeldObj(uiobjs.SpriteRight, true)
+    end
+
+    -- 再次修正input
+    if
+        attr.attrType == DBCust.FieldType.dateTime or attr.attrType == DBCust.FieldType.checkbox or
+            attr.attrType == DBCust.FieldType.popuplist
+     then
+        _cell.enabeldObj(input, false)
+    end
+end
+
 -- 取得数据
 function _cell.getData()
     return mData
@@ -164,12 +254,12 @@ function _cell.uiEventDelegate(go)
         -- 说明大文本框改变了
         NGUITools.AddWidgetCollider(csSelf.gameObject, false)
         uiobjs.Label4.enabled = (uiobjs.element.value == "" and true or false)
-        Utl.doCallback(mData.onMultTextInputChg, csSelf.gameObject)
+        Utl.doCallback(mData.onMultTextInputChg, uiobjs.element)
     elseif
         attr.attrType == DBCust.FieldType.number or attr.attrType == DBCust.FieldType.phone or
             attr.attrType == DBCust.FieldType.text
      then
-        Utl.doCallback(mData.onInputChange, csSelf.gameObject)
+        Utl.doCallback(mData.onInputChange, uiobjs.element)
     end
 end
 
@@ -178,9 +268,9 @@ function _cell.onNotifyLua(go)
         attr.attrType == DBCust.FieldType.popuplist or attr.attrType == DBCust.FieldType.checkbox or
             attr.attrType == DBCust.FieldType.dateTime
      then
-        Utl.doCallback(mData.onSelect, csSelf.gameObject)
+        Utl.doCallback(mData.onSelect, uiobjs.element)
     else
-        Utl.doCallback(mData.onClick, csSelf.gameObject)
+        Utl.doCallback(mData.onClick, uiobjs.element)
     end
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua

@@ -15,6 +15,7 @@ local uiobjs = {}
 local fieldsObjs = {}
 local queue = CLLQueue.new()
 local isLoading = false
+local count = 0
 
 -- 初始化，只调用一次
 function _cell.init(csObj)
@@ -36,18 +37,6 @@ function _cell.show(go, data)
 end
 
 function _cell.refresh()
-    --[[
-    local taskId = tostring(cust.taskId)
-    if (not isFieldLoading) or taskId ~= oldtaskId then
-        isFieldLoading = true
-        oldtaskId = taskId
-        fields = DBCust.getFieldsByTask(taskId)
-        if fields and #fields > 0 then
-            showHotWheel()
-            _cell.initField(1, taskId)
-        end
-    end
-    ]]
     if queue:size() == 0 then
         return
     end
@@ -56,7 +45,9 @@ function _cell.refresh()
     mData = queue:deQueue()
     if mData.fields and #(mData.fields) > 0 then
         showHotWheel()
-        _cell.initField(1)
+        for i, v in ipairs(mData.fields) do
+            _cell.initField(i)
+        end
     else
         _cell.onFinisInitFields()
     end
@@ -73,6 +64,8 @@ function _cell.initField(index)
         name = "InputMultText"
     elseif fileAttr.attrType == DBCust.FieldType.checkbox then
         name = "InputCheckboxs"
+    elseif fileAttr.attrType == DBCust.FieldType.empty then
+        name = "EmptySpace"
     else
         name = "InputText"
     end
@@ -82,36 +75,45 @@ end
 ---@param go UnityEngine.GameObject
 function _cell.onLoadField(name, go, orgs)
     local index = orgs
-    go.transform.parent = transform
-    go.transform.localScale = Vector3.one
-    go.transform.localEulerAngles = Vector3.zero
     ---@type _ParamCellExtendFiled
     local param = mData.fields[index]
     local cell = go:GetComponent("CLCellLua")
-    SetActive(go, true)
     if param.attr.attrType == DBCust.FieldType.multext then
         -- 要设置一次
         param.orgOnMultTextInputChg = param.onMultTextInputChg
         param.onMultTextInputChg = _cell.onMultTextInputChg
     end
     cell:init(param, nil)
-    table.insert(fieldsObjs, cell)
-    uiobjs.Table:Reposition()
+    fieldsObjs[index] = cell
+    count = count + 1
     Utl.doCallback(mData.onLoadOneField, cell)
-    if index == #(mData.fields) then
+    if count == #(mData.fields) then
         _cell.onFinisInitFields()
-    else
-        _cell.initField(index + 1)
     end
 end
 
 function _cell.onFinisInitFields()
-    isLoading = false
-    uiobjs.Table:Reposition()
+    for i, cell in ipairs(fieldsObjs) do
+        -- 在完成的时候时候再处理，是为了保证加进去的顺序不变
+        cell.transform.parent = transform
+        cell.transform.localScale = Vector3.one
+        cell.transform.localEulerAngles = Vector3.zero
+        SetActive(cell.gameObject, true)
+        uiobjs.Table:Reposition()
+    end
     uiobjs.formRoot:setValue(mData.data)
+    uiobjs.Table.repositionNow = true
     hideHotWheel()
-    Utl.doCallback(mData.onFinish, csSelf.gameObject)
-    _cell.refresh()
+
+    csSelf:invoke4Lua(
+        function()
+            Utl.doCallback(mData.onFinish, csSelf.gameObject)
+            isLoading = false
+            -- 再次处理
+            _cell.refresh()
+        end,
+        0.1
+    )
 end
 
 function _cell.release()
@@ -120,6 +122,7 @@ function _cell.release()
         CLUIOtherObjPool.returnObj(v.gameObject)
     end
     fieldsObjs = {}
+    count = 0
 end
 
 function _cell.onMultTextInputChg(go)
@@ -139,5 +142,11 @@ function _cell.getData()
     return mData
 end
 
+
+function _cell.OnDisable()
+    if #(fieldsObjs) > 0 then
+        printe("动态加载的字段没有释放")
+    end
+end
 --------------------------------------------
 return _cell

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua

@@ -0,0 +1,69 @@
+---@class _ParamCellImage
+---@field path string
+---@field onDelete function
+
+-- xx单元
+local _cell = {}
+---@type Coolape.CLCellLua
+local csSelf = nil
+local transform = nil
+---@type _ParamCellImage
+local mData = nil
+local uiobjs = {}
+
+-- 初始化，只调用一次
+function _cell.init(csObj)
+    csSelf = csObj
+    transform = csSelf.transform
+    ---@type UITexture
+    uiobjs.texture = csSelf:GetComponent("UITexture")
+end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    local url
+    if startswith(mData.path, "/") then
+        url = joinStr("file://", mData.path)
+    else
+        url = mData.path
+    end
+    print(url)
+    if uiobjs.texture.mainTexture and uiobjs.texture.mainTexture.name == mData.path then
+    else
+        _cell.release()
+        DBTextures.getByUrl(url, _cell.onGetTextue, mData.path)
+    end
+end
+
+function _cell.onGetTextue(content, orgs)
+    if mData.path ~= orgs then
+        GameObject.DestroyImmediate(content)
+        content = nil
+        return
+    end
+    _cell.release()
+    content.name = orgs
+    uiobjs.texture.mainTexture = content
+end
+
+function _cell.release()
+    if uiobjs.texture.mainTexture ~= nil then
+        uiobjs.texture.mainTexture = nil
+    end
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+function _cell.uiEventDelegate(go)
+    if go.name == "ButtonDel" then
+        Utl.doCallback(mData.onDelete, mData)
+    end
+end
+
+--------------------------------------------
+return _cell

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua.meta

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

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPStart.lua

@@ -43,7 +43,7 @@ function CLLPStart.setLuasAtBegainning()
     -- 日志监听
     if ReporterMessageReceiver.self and ReporterMessageReceiver.self.gameObject then
         -- if KKWhiteList.isWhiteName() then
-        ReporterMessageReceiver.self.gameObject:SetActive(false)
+        ReporterMessageReceiver.self.gameObject:SetActive(true)
     -- else
     --     ReporterMessageReceiver.self.gameObject:SetActive(false)
     -- end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua

@@ -80,6 +80,10 @@ function CSPMine.uiEventDelegate(go)
         MyLocation.self:getMyLocation(CSPMine.onGetLocation)
     elseif goName == "ButtonSetting" or goName == "ButtonMySetting" then
         getPanelAsy("PanelSetting", onLoadedPanelTT)
+    elseif goName == "SpriteTopBg" then
+        getPanelAsy("PanelMyInfor", onLoadedPanelTT)
+    elseif goName == "ButtonAbout" then
+        getPanelAsy("PanelAbout", onLoadedPanelTT)
     end
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPTasks.lua

@@ -154,9 +154,14 @@ function CSPTasks.setEventDelegate()
             getPanelAsy("PanelCustList", onLoadedPanelTT)
         end,
         ButtonRecord = function()
+            getPanelAsy("PanelFollowList", onLoadedPanelTT)
         end,
         ButtonCustOcean = function()
-        end
+        end,
+        ButtonOrder = function()
+            getPanelAsy("PanelOrderList", onLoadedPanelTT)
+        end,
+
     }
 end
 -- 处理ui上的事件，例如点击等

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua

@@ -0,0 +1,136 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPAbout:TRBasePanel 邮件列表
+local TRPAbout = class("TRPAbout", TRBasePanel)
+
+local uiobjs = {}
+-- 初始化，只会调用一次
+function TRPAbout:init(csObj)
+    TRPAbout.super.init(self, csObj)
+    self:initFiledsAttr()
+    self:setEventDelegate()
+
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 500, 0)
+    ---@type UIScrollView
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
+    ---@type UITable
+    uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable")
+    ---@type CLUIFormRoot
+    uiobjs.TableForm = uiobjs.Table:GetComponent("CLUIFormRoot")
+    ---@type Coolape.CLCellLua
+    uiobjs.TableLua = uiobjs.Table:GetComponent("CLCellLua")
+end
+
+function TRPAbout:initFiledsAttr()
+    ---@type _ParamFieldAttr
+    local attr
+    self.baseFiledsAttr = {}
+    attr = {}
+    attr.attrName = "更新动态"
+    attr.id = "upgrade"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "服务协议"
+    attr.id = "serviceAgreement"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "发布评价"
+    attr.id = "assess"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+end
+
+-- 设置数据
+---@param paras _ParamTRPAbout
+function TRPAbout:setData(paras)
+    self.mdata = {}
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPAbout:show()
+    ---@type _ParamCellExtendFiledRoot
+    local fieldRootInfor = {}
+    fieldRootInfor.fields = {}
+    fieldRootInfor.data = self.mdata
+    fieldRootInfor.onFinish = self:wrapFunc(self.reposition)
+    for i, v in ipairs(self.baseFiledsAttr) do
+        ---@type _ParamCellExtendFiled
+        local d = {}
+        d.attr = v
+        d.showMode = _FieldMode.button
+        d.onClick = self:wrapFunc(self.onClickField)
+        d.onSelect = self:wrapFunc(self.onSelectField)
+        table.insert(fieldRootInfor.fields, d)
+    end
+
+    uiobjs.TableLua:init(fieldRootInfor, nil)
+end
+
+---@param el CLUIElement
+function TRPAbout:onClickField(el)
+    if el.jsonKey == "upgrade" then
+        -- 更新
+    elseif el.jsonKey == "serviceAgreement" then
+        -- 显示协议
+    elseif el.jsonKey == "assess" then
+        -- 评价（这个做起来麻烦）
+    end
+end
+
+function TRPAbout:onSelectField(go)
+end
+
+function TRPAbout:reposition()
+    uiobjs.Table:Reposition()
+    uiobjs.Table.repositionNow = true
+    uiobjs.scrollView:ResetPosition()
+end
+
+-- 刷新
+function TRPAbout:refresh()
+    uiobjs.TableLua.luaTable.release()
+end
+
+-- 关闭页面
+function TRPAbout:hide()
+    uiobjs.TableLua.luaTable.release()
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPAbout:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+    --[[
+        if cmd == xx then
+        end
+        ]]
+    end
+end
+
+function TRPAbout:setEventDelegate()
+    self.EventDelegate = {}
+end
+
+-- 处理ui上的事件，例如点击等
+function TRPAbout:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func(go)
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPAbout:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPAbout

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPAbout.lua.meta

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

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua

@@ -246,6 +246,7 @@ function TRPCustDetail:setEventDelegate()
         ButtonNewFollow = function()
         end,
         ButtonNewTask = function()
+            getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, self.mdata)
         end,
         ButtonCall = function()
             MyUtl.callCust(self.mdata)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustFilter.lua

@@ -75,7 +75,7 @@ function TRPCustFilter:setData(paras)
         end
 
         d = {}
-        d.title = "任务类型"
+        d.title = "客户类型"
         d.key = DBCust.FilterGroup.custTypeList
         d.key2 = "custType"
         d.list = DBCust.getFilter(DBCust.FilterGroup.custTypeList)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua

@@ -0,0 +1,223 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPFollowList:TRBasePanel 邮件列表
+local TRPFollowList = class("TRPFollowList", TRBasePanel)
+
+local uiobjs = {}
+-- 初始化，只会调用一次
+function TRPFollowList:init(csObj)
+    TRPFollowList.super.init(self, csObj)
+    self:setEventDelegate()
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
+    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
+    uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
+    uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
+    ---@type CLUIScrollViewWithEvent
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "CLUIScrollViewWithEvent")
+    uiobjs.scrollView:init(
+        self:wrapFunc(self.onShowRefreshFlg),
+        self:wrapFunc(self.onhideRefreshFlg),
+        self:wrapFunc(self.refreshList)
+    )
+    ---@type Coolape.CLUILoopGrid
+    uiobjs.Grid = getCC(uiobjs.scrollView.transform, "Grid", "CLUILoopGrid")
+    uiobjs.ButtonEndList = getChild(uiobjs.Grid.transform, "ButtonEndList")
+    uiobjs.ButtonEndListLb = getCC(uiobjs.ButtonEndList, "Label", "UILabel")
+    uiobjs.ButtonHeadList = getChild(uiobjs.Grid.transform, "ButtonHeadList")
+end
+
+-- 设置数据
+---@param paras _ParamTRPFollowList
+function TRPFollowList:setData(paras)
+    self.mdata = paras
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPFollowList:show()
+    uiobjs.InputSeachKey.value = ""
+    self:refreshFilterBtnStatus()
+    self:showList({})
+    showHotWheel()
+    NetProto.send.list_customers(self.filterValue, "", 1)
+end
+
+function TRPFollowList:showList(list)
+    SetActive(uiobjs.ButtonHeadList.gameObject, false)
+    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    uiobjs.Grid:setList(
+        list or {},
+        self:wrapFunc(self.initCell),
+        self:wrapFunc(self.onHeadList),
+        self:wrapFunc(self.onEndList)
+    )
+    uiobjs.scrollView:ResetPosition()
+end
+
+function TRPFollowList:appList(list)
+    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    uiobjs.Grid:appendList(list)
+end
+
+function TRPFollowList:onShowRefreshFlg()
+    -- printe("TRPFollowList:onShowRefreshFlg")
+    uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 395, 0)
+    SetActive(uiobjs.ButtonHeadList.gameObject, true)
+end
+function TRPFollowList:onhideRefreshFlg()
+    -- printe("TRPFollowList:onhideRefreshFlg")
+    SetActive(uiobjs.ButtonHeadList.gameObject, false)
+end
+function TRPFollowList:refreshList()
+    local queryKey = uiobjs.InputSeachKey.value
+    showHotWheel()
+    NetProto.send.list_customers(self.filterValue, queryKey, 1)
+end
+
+function TRPFollowList:onHeadList(head)
+    printw("到最顶端了")
+    -- uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 250, 0)
+    -- SetActive(uiobjs.ButtonHeadList.gameObject, true)
+end
+
+function TRPFollowList:onEndList(tail)
+    printw("到最后了==" .. tail.name)
+    if self.pageInfo and self.pageInfo.current_page < self.pageInfo.total_pages then
+        local queryKey = uiobjs.InputSeachKey.value
+        showHotWheel()
+        -- 取得下一页
+        NetProto.send.list_customers(self.filterValue, queryKey, self.pageInfo.current_page + 1)
+    else
+        uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -335
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
+end
+
+function TRPFollowList:initCell(cell, data)
+    cell:init(data, self:wrapFunc(self.onClickCell))
+end
+
+function TRPFollowList:onClickCell(cell, data)
+    getPanelAsy("PanelCustDetail", onLoadedPanelTT, data)
+end
+
+function TRPFollowList:refreshFilterBtnStatus()
+    if self:hadFilterVal() then
+        uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff2990dc)
+        uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff2990dc)
+        uiobjs.ButtonFilterSp.spriteName = "cust_funnel"
+    else
+        uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff999999)
+        uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff999999)
+        uiobjs.ButtonFilterSp.spriteName = "cust_screen"
+    end
+end
+
+function TRPFollowList:hadFilterVal()
+    for i, v in ipairs(self.filters or {}) do
+        for j, f in ipairs(v.list) do
+            if f.selected then
+                return true
+            end
+        end
+    end
+    return false
+end
+-- 刷新
+function TRPFollowList:refresh()
+end
+
+-- 关闭页面
+function TRPFollowList:hide()
+    self.filterValue = nil
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPFollowList:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.list_customers then
+            local result = paras.result or {}
+            self.pageInfo = result.meta
+            if self.pageInfo and self.pageInfo.current_page > 1 then
+                self:appList(result.data)
+            else
+                self:showList(result.data)
+            end
+            hideHotWheel()
+        elseif cmd == NetProto.cmds.update_customer then
+            uiobjs.Grid:refreshContentOnly()
+        elseif cmd == NetProto.cmds.save_customer then
+            self:refreshList()
+        end
+    end
+end
+
+function TRPFollowList:setEventDelegate()
+    self.EventDelegate = {
+        ButtonAddCust = function()
+            getPanelAsy("PanelNewCust", onLoadedPanelTT)
+        end,
+        ButtonFilter = function()
+            getPanelAsy(
+                "PanelCustFilter",
+                onLoadedPanelTT,
+                {
+                    callback = self:wrapFunc(self.onSetFilter),
+                    queryKey = uiobjs.InputSeachKey.value,
+                    defautFilter = self.filters
+                }
+            )
+        end,
+        InputSeachKey = function()
+            local queryKey = uiobjs.InputSeachKey.value
+            NetProto.send.list_customers(self.filterValue, queryKey, 1)
+        end
+    }
+end
+
+function TRPFollowList:getFilterStr()
+    if not self.filters then
+        return ""
+    end
+    local ret = {}
+    for i, g in ipairs(self.filters) do
+        local list = {}
+        for j, f in ipairs(g.list) do
+            if f.selected and f.value ~= -1 then
+                table.insert(list, f.value)
+            end
+        end
+        ret[g.key2] = table.concat(list, ",")
+    end
+    return ret
+end
+
+function TRPFollowList:onSetFilter(filters, queryKey)
+    local oldqueryKey = uiobjs.InputSeachKey.value
+    uiobjs.InputSeachKey.value = queryKey
+    self.filters = filters
+    self:refreshFilterBtnStatus()
+    local queryKey = uiobjs.InputSeachKey.value
+    queryKey = trim(queryKey)
+    showHotWheel()
+    self.filterValue = self:getFilterStr()
+    if oldqueryKey == queryKey then
+        NetProto.send.list_customers(self.filterValue, queryKey, 1)
+    else
+        -- 会触发input的onChange事件
+    end
+end
+
+-- 处理ui上的事件，例如点击等
+function TRPFollowList:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func()
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPFollowList:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPFollowList

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua.meta

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

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua

@@ -0,0 +1,264 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPMyInfor:TRBasePanel 邮件列表
+local TRPMyInfor = class("TRPMyInfor", TRBasePanel)
+
+local uiobjs = {}
+-- 初始化，只会调用一次
+function TRPMyInfor:init(csObj)
+    TRPMyInfor.super.init(self, csObj)
+    self:initFiledsAttr()
+    self:setEventDelegate()
+
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 40 + 300, 0)
+    ---@type UIScrollView
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
+    ---@type UITable
+    uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable")
+    ---@type CLUIFormRoot
+    uiobjs.TableForm = uiobjs.Table:GetComponent("CLUIFormRoot")
+    ---@type Coolape.CLCellLua
+    uiobjs.TableLua = uiobjs.Table:GetComponent("CLCellLua")
+
+    ---@type CLUIFormRoot
+    uiobjs.Top = getCC(self.transform, "Top", "CLUIFormRoot")
+    ---@type UITexture
+    uiobjs.HeadIcon = getCC(uiobjs.Top.transform, "SpriteHeadBg/SpriteHeadIcon", "UITexture")
+end
+
+function TRPMyInfor:initFiledsAttr()
+    ---@type _ParamFieldAttr
+    local attr
+    self.baseFiledsAttr = {}
+    attr = {}
+    attr.attrName = "姓名"
+    attr.id = "loginName"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "工号"
+    attr.id = "loginNo"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.cannotEdit = true
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "部门"
+    attr.id = ""
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.cannotEdit = true
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "角色"
+    attr.id = ""
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.cannotEdit = true
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrType = DBCust.FieldType.empty
+    attr.height = 40
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "邮箱"
+    attr.id = ""
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.cannotEdit = true
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "手机"
+    attr.id = ""
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.cannotEdit = true
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "分机号"
+    attr.id = ""
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.cannotEdit = true
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+end
+
+-- 设置数据
+---@param paras _ParamTRPMyInfor
+function TRPMyInfor:setData(paras)
+    self.mdata = {}
+    -- 初始化顶部数据
+    local currGroup = Prefs.getCurrGroup(Prefs.getUserName())
+    local companyInfro = json.decode(currGroup)
+    local user = DBUser.getUserById(companyInfro.login_no)
+    self.mdata.company_id = companyInfro.company_id
+    self.mdata.company_name = companyInfro.company_name
+    if user then
+        self.mdata.loginNo = user.loginNo
+        self.mdata.loginName = user.loginName
+        self.mdata.imageUrl = user.imageUrl
+    else
+        printe("账号信息未取得！")
+    end
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPMyInfor:show()
+    ---@type _ParamCellExtendFiledRoot
+    local fieldRootInfor = {}
+    fieldRootInfor.fields = {}
+    fieldRootInfor.data = self.mdata
+    fieldRootInfor.onFinish = self:wrapFunc(self.reposition)
+    for i, v in ipairs(self.baseFiledsAttr) do
+        ---@type _ParamCellExtendFiled
+        local d = {}
+        d.attr = v
+        if d.attr.id == "loginNo" then
+            d.showMode = _FieldMode.showOnly
+        else
+            d.showMode = _FieldMode.showAndModify
+        end
+        d.onClick = self:wrapFunc(self.onClickField)
+        d.onSelect = self:wrapFunc(self.onSelectField)
+        table.insert(fieldRootInfor.fields, d)
+    end
+
+    uiobjs.TableLua:init(fieldRootInfor, nil)
+
+    self:setHeadInfor()
+end
+
+function TRPMyInfor:setHeadInfor()
+    DBUser.getIcon(
+        self.mdata.loginNo,
+        function(content)
+            uiobjs.HeadIcon.mainTexture = content
+        end
+    )
+end
+
+function TRPMyInfor:onClickField(go)
+    ---@type CLUIElement
+    local el = go:GetComponent("CLUIElement")
+    getPanelAsy(
+        "PanelModifyFiled",
+        onLoadedPanelTT,
+        {
+            label = el.labeName.text,
+            key = el.jsonKey,
+            value = el.value,
+            canNull = el.canNull,
+            callback = self:wrapFunc(self.onFinishSetField)
+        }
+    )
+end
+
+function TRPMyInfor:onFinishSetField(key, val)
+    if tostring(val) ~= tostring(self.mdata[key]) then
+        -- self:sendModifymsg(key, val, true)
+        --//TODO:
+    end
+end
+
+function TRPMyInfor:onSelectField(go)
+end
+
+function TRPMyInfor:reposition()
+    uiobjs.Table:Reposition()
+    uiobjs.Table.repositionNow = true
+    uiobjs.scrollView:ResetPosition()
+end
+
+-- 刷新
+function TRPMyInfor:refresh()
+end
+
+-- 关闭页面
+function TRPMyInfor:hide()
+    uiobjs.TableLua.luaTable.release()
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPMyInfor:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+    --[[
+        if cmd == xx then
+        end
+        ]]
+    end
+end
+
+function TRPMyInfor:setEventDelegate()
+    self.EventDelegate = {
+        SpriteTopbg = function(go)
+            -- 修改头像
+            ---@type UIPopupList
+            local popList = go:GetComponent("UIPopupList")
+            if popList.value == "1" then
+                -- 相机
+                local permission = MyCamera.getImage(self:wrapFunc(self.onGetImage))
+                if permission ~= NativeCamera.Permission.Granted then
+                    CLUIUtl.showConfirm(
+                        "没有使用相机的权限，打开设置允许使用相机",
+                        function()
+                            if not MyCamera.openSetting() then
+                                MyUtl.toastW("打开权限设置失败")
+                            end
+                        end,
+                        nil
+                    )
+                end
+            elseif popList.value == "2" then
+                local permission = MyGallery.getImage(self:wrapFunc(self.onGetImage))
+                if permission ~= NativeGallery.Permission.Granted then
+                    CLUIUtl.showConfirm(
+                        "没有使用相册的权限，打开设置允许使用相册",
+                        function()
+                            if not MyGallery.openSetting() then
+                                MyUtl.toastW("打开权限设置失败")
+                            end
+                        end,
+                        nil
+                    )
+                end
+            end
+        end
+    }
+end
+
+function TRPMyInfor:onGetImage(path)
+    if isNilOrEmpty(path) then
+        return
+    end
+    --//TODO:
+end
+
+-- 处理ui上的事件，例如点击等
+function TRPMyInfor:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func(go)
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPMyInfor:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPMyInfor

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua.meta

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

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua

@@ -137,7 +137,6 @@ function TRPNewCust:showExtentFiles(taskId)
     ---@type _ParamCellExtendFiledRoot
     local param = {}
     param.data = self.mdata and self.mdata.jsonStr or {}
-    -- param.isEditMode = true
     param.onFinish = self:wrapFunc(self.setExtendFieldsMode)
     param.fields = {}
     local fields = DBCust.getFieldsByTask(taskId) or {}
@@ -146,7 +145,7 @@ function TRPNewCust:showExtentFiles(taskId)
     for i, v in ipairs(fields) do
         filedInfor = {}
         filedInfor.attr = v
-        filedInfor.isEditMode = true
+        filedInfor.showMode = self.isNewCust and _FieldMode.inputOnly or _FieldMode.modifyOnly
         if not self.isNewCust then
             filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend)
             filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua

@@ -1,14 +1,14 @@
 ---@type IDBasePanel
 local TRBasePanel = require("ui.panel.TRBasePanel")
----@class TRPNewFollow:TRBasePanel 邮件列表
-local TRPNewFollow = class("TRPNewFollow", TRBasePanel)
+---@class TRPNewFollowSimple:TRBasePanel 邮件列表
+local TRPNewFollowSimple = class("TRPNewFollowSimple", TRBasePanel)
 
 local uiobjs = {}
 
 local stars = {}
 -- 初始化，只会调用一次
-function TRPNewFollow:init(csObj)
-    TRPNewFollow.super.init(self, csObj)
+function TRPNewFollowSimple:init(csObj)
+    TRPNewFollowSimple.super.init(self, csObj)
     self:initFiledsAttr()
     self:setEventDelegate()
     MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
@@ -25,7 +25,7 @@ function TRPNewFollow:init(csObj)
     uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
 end
 
-function TRPNewFollow:initFiledsAttr()
+function TRPNewFollowSimple:initFiledsAttr()
     ---@type _ParamFieldAttr
     local attr
     self.baseFiledsAttr = {}
@@ -35,6 +35,9 @@ function TRPNewFollow:initFiledsAttr()
     attr.attrType = DBCust.FieldType.popuplist
     attr.ifMust = 0
     attr.donotJoinKey = true
+    local popInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.followUpTypeList)
+    attr.popOptions = popInfor.options
+    attr.popValues = popInfor.values
     table.insert(self.baseFiledsAttr, attr)
 
     attr = {}
@@ -58,8 +61,8 @@ function TRPNewFollow:initFiledsAttr()
 end
 
 -- 设置数据
----@param paras _ParamTRPNewFollow
-function TRPNewFollow:setData(paras)
+---@param paras _ParamTRPNewFollowSimple
+function TRPNewFollowSimple:setData(paras)
     self.mdata = {}
     self.mdata.custId = paras.custId
     self.mdata.taskId = paras.taskId
@@ -68,19 +71,19 @@ function TRPNewFollow:setData(paras)
 end
 
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
-function TRPNewFollow:show()
+function TRPNewFollowSimple:show()
     self:refreshContent()
     SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
 
     uiobjs.scrollView:ResetPosition()
 end
 
-function TRPNewFollow:refreshContent()
+function TRPNewFollowSimple:refreshContent()
     self:showBaseFields()
     self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1)
 end
 
-function TRPNewFollow:showBaseFields()
+function TRPNewFollowSimple:showBaseFields()
     ---@type _ParamCellExtendFiledRoot
     local param = {}
     param.data = self.mdata or {}
@@ -104,10 +107,9 @@ function TRPNewFollow:showBaseFields()
 
     uiobjs.DetailRoot:init(param, nil)
 end
-function TRPNewFollow:onPopupFieldValChg(go)
+function TRPNewFollowSimple:onPopupFieldValChg(go)
     ---@type CLUIElement
     local el = go:GetComponent("CLUIElement")
-    printe(el.jsonKey)
     if el.jsonKey == "dealFlag" then
         if uiobjs.followUpContent and isNilOrEmpty(uiobjs.followUpContent.value) then
             local popList = go:GetComponent("UIPopupList")
@@ -116,12 +118,12 @@ function TRPNewFollow:onPopupFieldValChg(go)
     end
 end
 
-function TRPNewFollow:reposition()
+function TRPNewFollowSimple:reposition()
     uiobjs.DetailRootTabel.repositionNow = true
     uiobjs.Table.repositionNow = true
 end
 
-function TRPNewFollow:setExtendFieldsMode(root)
+function TRPNewFollowSimple:setExtendFieldsMode(root)
     local elements = root:GetComponentsInChildren(typeof(CLUIElement), true)
     for i = 0, elements.Length - 1 do
         self:setElementMode(elements[i])
@@ -133,7 +135,7 @@ function TRPNewFollow:setExtendFieldsMode(root)
     self:reposition()
 end
 
-function TRPNewFollow:setElementMode(el)
+function TRPNewFollowSimple:setElementMode(el)
     local isPopList = el:GetComponent("UIPopupList")
     local isPopCheckbox = el:GetComponent("CLUICheckbox")
     ---@type UIInput
@@ -174,18 +176,18 @@ function TRPNewFollow:setElementMode(el)
 end
 
 -- 刷新
-function TRPNewFollow:refresh()
+function TRPNewFollowSimple:refresh()
 end
 
 -- 关闭页面
-function TRPNewFollow:hide()
+function TRPNewFollowSimple:hide()
     if uiobjs.DetailRoot.luaTable then
         uiobjs.DetailRoot.luaTable.release()
     end
 end
 
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
-function TRPNewFollow:procNetwork(cmd, succ, msg, paras)
+function TRPNewFollowSimple:procNetwork(cmd, succ, msg, paras)
     if (succ == NetSuccess) then
         if cmd == NetProto.cmds.update_customer then
             self:refreshContent()
@@ -193,7 +195,7 @@ function TRPNewFollow:procNetwork(cmd, succ, msg, paras)
     end
 end
 
-function TRPNewFollow:setEventDelegate()
+function TRPNewFollowSimple:setEventDelegate()
     self.EventDelegate = {
         ButtonSave = function()
             local err = uiobjs.DetailFromRoot:checkValid()
@@ -217,7 +219,7 @@ function TRPNewFollow:setEventDelegate()
     }
 end
 -- 处理ui上的事件，例如点击等
-function TRPNewFollow:uiEventDelegate(go)
+function TRPNewFollowSimple:uiEventDelegate(go)
     local func = self.EventDelegate[go.name]
     if func then
         func()
@@ -225,8 +227,8 @@ function TRPNewFollow:uiEventDelegate(go)
 end
 
 -- 当顶层页面发生变化时回调
-function TRPNewFollow:onTopPanelChange(topPanel)
+function TRPNewFollowSimple:onTopPanelChange(topPanel)
 end
 
 --------------------------------------------
-return TRPNewFollow
+return TRPNewFollowSimple

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua

@@ -0,0 +1,229 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPNewFollowTask:TRBasePanel 
+local TRPNewFollowTask = class("TRPNewFollowTask", TRBasePanel)
+
+local uiobjs = {}
+
+local stars = {}
+-- 初始化，只会调用一次
+function TRPNewFollowTask:init(csObj)
+    TRPNewFollowTask.super.init(self, csObj)
+    self:initFiledsAttr()
+    self:setEventDelegate()
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132, 0)
+    ---@type UIScrollView
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
+    ---@type UITable
+    uiobjs.Table = getCC(uiobjs.scrollView.transform, "Table", "UITable")
+    ---@type CLUIFormRoot
+    uiobjs.DetailFromRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLUIFormRoot")
+    uiobjs.DetailRoot = getCC(uiobjs.Table.transform, "DetailRoot", "CLCellLua")
+    ---@type UITable
+    uiobjs.DetailRootTabel = uiobjs.DetailRoot:GetComponent("UITable")
+
+    uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
+end
+
+function TRPNewFollowTask:initFiledsAttr()
+    ---@type _ParamFieldAttr
+    local attr
+    self.baseFiledsAttr = {}
+    attr = {}
+    attr.attrName = "跟进内容"
+    attr.id = "bookingNote"
+    attr.attrType = DBCust.FieldType.multext
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "跟进时间"
+    attr.id = "FollowUpTime"
+    attr.attrType = DBCust.FieldType.dateTime
+    attr.ifTime = 1
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "跟进人员"
+    attr.id = "loginNo"
+    attr.attrType = DBCust.FieldType.popuplist
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+    local popList = DBCust.getFilter4Popup(DBCust.FilterGroup.loginNoList)
+    attr.popOptions = popList.options
+    attr.popValues = popList.values
+    table.insert(self.baseFiledsAttr, attr)
+end
+
+-- 设置数据
+---@param paras _ParamTRPNewFollowTask
+function TRPNewFollowTask:setData(paras)
+    self.mdata = {}
+    self.mdata.custId = paras.custId
+    self.mdata.taskId = paras.taskId
+
+    self.isNewFollow = true
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPNewFollowTask:show()
+    self:refreshContent()
+    SetActive(uiobjs.ButtonSave.gameObject, self.isNewFollow)
+
+    uiobjs.scrollView:ResetPosition()
+end
+
+function TRPNewFollowTask:refreshContent()
+    self:showBaseFields()
+    self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1)
+end
+
+function TRPNewFollowTask:showBaseFields()
+    ---@type _ParamCellExtendFiledRoot
+    local param = {}
+    param.data = self.mdata or {}
+    param.onFinish = self:wrapFunc(self.setExtendFieldsMode)
+    param.fields = {}
+    ---@type _ParamCellExtendFiled
+    local filedInfor
+
+    for i, v in ipairs(self.baseFiledsAttr) do
+        -- 工单模板
+        filedInfor = {}
+        filedInfor.attr = v
+        filedInfor.isEditMode = true
+        if filedInfor.attr.attrType == DBCust.FieldType.multext then
+            filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition)
+        end
+        filedInfor.onClick = nil
+        filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg)
+        table.insert(param.fields, filedInfor)
+    end
+
+    uiobjs.DetailRoot:init(param, nil)
+end
+function TRPNewFollowTask:onPopupFieldValChg(go)
+    ---@type CLUIElement
+    local el = go:GetComponent("CLUIElement")
+    if el.jsonKey == "dealFlag" then
+        if uiobjs.followUpContent and isNilOrEmpty(uiobjs.followUpContent.value) then
+            local popList = go:GetComponent("UIPopupList")
+            uiobjs.followUpContent.value = popList.selectedItem
+        end
+    end
+end
+
+function TRPNewFollowTask:reposition()
+    uiobjs.DetailRootTabel.repositionNow = true
+    uiobjs.Table.repositionNow = true
+end
+
+function TRPNewFollowTask:setExtendFieldsMode(root)
+    local elements = root:GetComponentsInChildren(typeof(CLUIElement), true)
+    for i = 0, elements.Length - 1 do
+        self:setElementMode(elements[i])
+        if elements[i].jsonKey == "followUpContent" then
+            ---@type CLUIElement
+            uiobjs.followUpContent = elements[i]
+        end
+    end
+    self:reposition()
+end
+
+function TRPNewFollowTask:setElementMode(el)
+    local isPopList = el:GetComponent("UIPopupList")
+    local isPopCheckbox = el:GetComponent("CLUICheckbox")
+    ---@type UIInput
+    local input = el:GetComponent("UIInput")
+    local inputOnGUI = el:GetComponent("UIInputOnGUI")
+    local boxcollider = el:GetComponent("BoxCollider")
+    local ButtonReset = getCC(el.transform, "ButtonReset", "MyInputReset")
+
+    if (not self.isNewFollow) and (el.jsonKey == "taskId" or el.jsonKey == "phoneNo") then
+        boxcollider.enabled = false
+    else
+        boxcollider.enabled = true
+    end
+
+    if ButtonReset then
+        ButtonReset.disabled = (not self.isNewFollow)
+    end
+    if input then
+        if isPopList or isPopCheckbox then
+            input.enabled = false
+            if inputOnGUI then
+                inputOnGUI.enabled = false
+            end
+        else
+            if self.isNewFollow then
+                input.enabled = true
+                if inputOnGUI then
+                    inputOnGUI.enabled = true
+                end
+            else
+                input.enabled = false
+                if inputOnGUI then
+                    inputOnGUI.enabled = false
+                end
+            end
+        end
+    end
+end
+
+-- 刷新
+function TRPNewFollowTask:refresh()
+end
+
+-- 关闭页面
+function TRPNewFollowTask:hide()
+    if uiobjs.DetailRoot.luaTable then
+        uiobjs.DetailRoot.luaTable.release()
+    end
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPNewFollowTask:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.update_customer then
+            self:refreshContent()
+        end
+    end
+end
+
+function TRPNewFollowTask:setEventDelegate()
+    self.EventDelegate = {
+        ButtonSave = function()
+            local err = uiobjs.DetailFromRoot:checkValid()
+            if not isNilOrEmpty(err) then
+                MyUtl.toastW(err)
+                return
+            end
+            self.mdata = uiobjs.DetailFromRoot:getValue(self.mdata, true)
+            showHotWheel()
+            NetProto.send.create_followUp_task(self.mdata, function(content)
+                hideHotWheel()
+                if content.success then
+                    MyUtl.toastS("创建成功")
+                    hideTopPanel(self.csSelf)
+                end
+            end)
+        end
+    }
+end
+-- 处理ui上的事件，例如点击等
+function TRPNewFollowTask:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func()
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPNewFollowTask:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPNewFollowTask

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua.meta

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

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewOrder.lua

@@ -33,6 +33,11 @@ function TRPNewOrder:init(csObj)
     uiobjs.InputNextLogino = getCC(uiobjs.StepRoot.transform, "InputNextLogino", "UIPopupList")
     uiobjs.gridProjects = getCC(uiobjs.Table.transform, "InputSelectProduct/Products", "UIGrid")
     uiobjs.gridProjectsPrefab = getChild(uiobjs.gridProjects.transform, "00000").gameObject
+
+    uiobjs.InputAttachment = getCC(uiobjs.Table.transform, "InputAttachment", "UIPopupList")
+    uiobjs.gridImages = getCC(uiobjs.InputAttachment.transform, "Grid", "UIGrid")
+    uiobjs.gridImagesPrefab = getChild(uiobjs.gridImages.transform, "00000").gameObject
+
     -- uiobjs.elements = uiobjs.DetailRoot.gameObject:GetComponentsInChildren(typeof(CLUIElement), true)
     uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
 end
@@ -138,7 +143,7 @@ function TRPNewOrder:setData(paras)
         ---@type _DBCust
         self.cust = nil
     else
-        --//TODO:初始值
+        -- 初始值
         self.isNewOrder = true
         ---@type _DBCust
         self.cust = paras
@@ -150,6 +155,7 @@ function TRPNewOrder:setData(paras)
         local templateInfor = DBOrder.getTemplateInfor(self.mdata.templetId)
         self.mdata.content = templateInfor.content
         self.selectedProducts = {}
+        self.images = {}
     end
 end
 
@@ -171,6 +177,10 @@ end
 
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
 function TRPNewOrder:show()
+    SetActive(uiobjs.gridProjects.transform.parent.gameObject, false)
+    SetActive(uiobjs.StepFormRoot.gameObject, false)
+    SetActive(uiobjs.ExtendRoot.gameObject, false)
+
     self:refreshContent()
     SetActive(uiobjs.ButtonSave.gameObject, self.isNewOrder)
 
@@ -180,8 +190,6 @@ end
 function TRPNewOrder:refreshContent()
     self:showBaseFields()
     self:showProducts()
-    local templetId = self.mdata and self.mdata.templetId or nil
-    self:showExtentFiles(templetId)
 
     self.csSelf:invoke4Lua(self:wrapFunc(self.reposition), 0.1)
 end
@@ -217,6 +225,8 @@ function TRPNewOrder:showBaseFields()
     local param = {}
     param.data = self.mdata or {}
     param.onFinish = function(go)
+        local templetId = self.mdata and self.mdata.templetId or nil
+        self:showExtentFiles(templetId)
         if self.cust then
             uiobjs.DetailFromRoot:setValue(self.cust, true)
         end
@@ -230,7 +240,7 @@ function TRPNewOrder:showBaseFields()
         -- 工单模板
         filedInfor = {}
         filedInfor.attr = v
-        filedInfor.isEditMode = true
+        filedInfor.showMode = self.isNewOrder and _FieldMode.inputOnly or _FieldMode.modifyOnly
         if filedInfor.attr.attrType == DBCust.FieldType.multext then
             filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition)
         end
@@ -260,7 +270,7 @@ function TRPNewOrder:showExtentFiles(templetId)
         for i, v in ipairs(fields) do
             filedInfor = {}
             filedInfor.attr = v
-            filedInfor.isEditMode = true
+            filedInfor.showMode = self.isNewOrder and _FieldMode.inputOnly or _FieldMode.modifyOnly
             if filedInfor.attr.attrType == DBCust.FieldType.multext then
                 filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition)
             end
@@ -299,11 +309,16 @@ function TRPNewOrder:showExtentFiles(templetId)
     local d = uiobjs.DetailFromRoot:getValue(true)
     d.content = cfgInfor.content
     uiobjs.DetailFromRoot:setValue(d)
-    -------
+    
+    -- 附件
+    self:showImages()
+    -----------------------------------
     uiobjs.StepRoot:Reposition()
 end
 
 function TRPNewOrder:reposition()
+    uiobjs.DetailRootTabel:Reposition()
+    uiobjs.Table:Reposition()
     uiobjs.DetailRootTabel.repositionNow = true
     uiobjs.Table.repositionNow = true
 end
@@ -566,12 +581,75 @@ function TRPNewOrder:setEventDelegate()
                 {selectedProducts = self.selectedProducts, callback = self:wrapFunc(self.onGetSelectedProducts)}
             )
         end,
-        InputAttachment = function()
+        InputAttachment = function(go)
             -- 添加附件
+            ---@type UIPopupList
+            local popList = go:GetComponent("UIPopupList")
+            if popList.value == "1" then
+                -- 相机
+                local permission = MyCamera.getImage(self:wrapFunc(self.onGetImage))
+                if permission ~= NativeCamera.Permission.Granted then
+                    CLUIUtl.showConfirm(
+                        "没有使用相机的权限，打开设置允许使用相机",
+                        function()
+                            if not MyCamera.openSetting() then
+                                MyUtl.toastW("打开权限设置失败")
+                            end
+                        end,
+                        nil
+                    )
+                end
+            elseif popList.value == "2" then
+                local permission = MyGallery.getImage(self:wrapFunc(self.onGetImage))
+                if permission ~= NativeGallery.Permission.Granted then
+                    CLUIUtl.showConfirm(
+                        "没有使用相册的权限，打开设置允许使用相册",
+                        function()
+                            if not MyGallery.openSetting() then
+                                MyUtl.toastW("打开权限设置失败")
+                            end
+                        end,
+                        nil
+                    )
+                end
+            end
         end
     }
 end
 
+function TRPNewOrder:onGetImage(path)
+    if isNilOrEmpty(path) then
+        return
+    end
+    for i, v in ipairs(self.images) do
+        if v.path == path then
+            MyUtl.toast("已在列表中")
+            return
+        end
+    end
+    table.insert(self.images, {path = path, onDelete = self:wrapFunc(self.onDelImage)})
+    self:showImages()
+end
+
+function TRPNewOrder:showImages()
+    CLUIUtl.resetList4Lua(uiobjs.gridImages, uiobjs.gridImagesPrefab, self.images, self:wrapFunc(self.initImageCell))
+end
+
+function TRPNewOrder:initImageCell(cell, data)
+    cell:init(data, nil)
+end
+
+---@type _ParamCellImage
+function TRPNewOrder:onDelImage(data)
+    for i, v in ipairs(self.images) do
+        if v.path == data.path then
+            table.remove(self.images, i)
+            break
+        end
+    end
+    self:showImages()
+end
+
 function TRPNewOrder:onGetSelectedProducts(list)
     self.selectedProducts = list
     self:showProducts()
@@ -581,7 +659,7 @@ end
 function TRPNewOrder:uiEventDelegate(go)
     local func = self.EventDelegate[go.name]
     if func then
-        func()
+        func(go)
     end
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua

@@ -0,0 +1,223 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPOrderList:TRBasePanel 邮件列表
+local TRPOrderList = class("TRPOrderList", TRBasePanel)
+
+local uiobjs = {}
+-- 初始化，只会调用一次
+function TRPOrderList:init(csObj)
+    TRPOrderList.super.init(self, csObj)
+    self:setEventDelegate()
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 40, 0)
+    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
+    uiobjs.ButtonFilterSp = getCC(self.transform, "Top/ButtonFilter", "UISprite")
+    uiobjs.ButtonFilterLb = getCC(uiobjs.ButtonFilterSp.transform, "Label", "UILabel")
+    ---@type CLUIScrollViewWithEvent
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "CLUIScrollViewWithEvent")
+    uiobjs.scrollView:init(
+        self:wrapFunc(self.onShowRefreshFlg),
+        self:wrapFunc(self.onhideRefreshFlg),
+        self:wrapFunc(self.refreshList)
+    )
+    ---@type Coolape.CLUILoopGrid
+    uiobjs.Grid = getCC(uiobjs.scrollView.transform, "Grid", "CLUILoopGrid")
+    uiobjs.ButtonEndList = getChild(uiobjs.Grid.transform, "ButtonEndList")
+    uiobjs.ButtonEndListLb = getCC(uiobjs.ButtonEndList, "Label", "UILabel")
+    uiobjs.ButtonHeadList = getChild(uiobjs.Grid.transform, "ButtonHeadList")
+end
+
+-- 设置数据
+---@param paras _ParamTRPOrderList
+function TRPOrderList:setData(paras)
+    self.mdata = paras
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPOrderList:show()
+    uiobjs.InputSeachKey.value = ""
+    self:refreshFilterBtnStatus()
+    self:showList({})
+    showHotWheel()
+    NetProto.send.list_customers(self.filterValue, "", 1)
+end
+
+function TRPOrderList:showList(list)
+    SetActive(uiobjs.ButtonHeadList.gameObject, false)
+    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    uiobjs.Grid:setList(
+        list or {},
+        self:wrapFunc(self.initCell),
+        self:wrapFunc(self.onHeadList),
+        self:wrapFunc(self.onEndList)
+    )
+    uiobjs.scrollView:ResetPosition()
+end
+
+function TRPOrderList:appList(list)
+    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    uiobjs.Grid:appendList(list)
+end
+
+function TRPOrderList:onShowRefreshFlg()
+    -- printe("TRPOrderList:onShowRefreshFlg")
+    uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 222, 0)
+    SetActive(uiobjs.ButtonHeadList.gameObject, true)
+end
+function TRPOrderList:onhideRefreshFlg()
+    -- printe("TRPOrderList:onhideRefreshFlg")
+    SetActive(uiobjs.ButtonHeadList.gameObject, false)
+end
+function TRPOrderList:refreshList()
+    local queryKey = uiobjs.InputSeachKey.value
+    showHotWheel()
+    NetProto.send.list_customers(self.filterValue, queryKey, 1)
+end
+
+function TRPOrderList:onHeadList(head)
+    printw("到最顶端了")
+    -- uiobjs.ButtonHeadList.transform.localPosition = Vector3(0, 250, 0)
+    -- SetActive(uiobjs.ButtonHeadList.gameObject, true)
+end
+
+function TRPOrderList:onEndList(tail)
+    printw("到最后了==" .. tail.name)
+    if self.pageInfo and self.pageInfo.current_page < self.pageInfo.total_pages then
+        local queryKey = uiobjs.InputSeachKey.value
+        showHotWheel()
+        -- 取得下一页
+        NetProto.send.list_customers(self.filterValue, queryKey, self.pageInfo.current_page + 1)
+    else
+        uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -235
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
+end
+
+function TRPOrderList:initCell(cell, data)
+    cell:init(data, self:wrapFunc(self.onClickCell))
+end
+
+function TRPOrderList:onClickCell(cell, data)
+    getPanelAsy("PanelCustDetail", onLoadedPanelTT, data)
+end
+
+function TRPOrderList:refreshFilterBtnStatus()
+    if self:hadFilterVal() then
+        uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff2990dc)
+        uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff2990dc)
+        uiobjs.ButtonFilterSp.spriteName = "cust_funnel"
+    else
+        uiobjs.ButtonFilterLb.color = ColorEx.getColor(0xff999999)
+        uiobjs.ButtonFilterSp.color = ColorEx.getColor(0xff999999)
+        uiobjs.ButtonFilterSp.spriteName = "cust_screen"
+    end
+end
+
+function TRPOrderList:hadFilterVal()
+    for i, v in ipairs(self.filters or {}) do
+        for j, f in ipairs(v.list) do
+            if f.selected then
+                return true
+            end
+        end
+    end
+    return false
+end
+-- 刷新
+function TRPOrderList:refresh()
+end
+
+-- 关闭页面
+function TRPOrderList:hide()
+    self.filterValue = nil
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPOrderList:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.list_customers then
+            local result = paras.result or {}
+            self.pageInfo = result.meta
+            if self.pageInfo and self.pageInfo.current_page > 1 then
+                self:appList(result.data)
+            else
+                self:showList(result.data)
+            end
+            hideHotWheel()
+        elseif cmd == NetProto.cmds.update_customer then
+            uiobjs.Grid:refreshContentOnly()
+        elseif cmd == NetProto.cmds.save_customer then
+            self:refreshList()
+        end
+    end
+end
+
+function TRPOrderList:setEventDelegate()
+    self.EventDelegate = {
+        ButtonAddCust = function()
+            getPanelAsy("PanelNewCust", onLoadedPanelTT)
+        end,
+        ButtonFilter = function()
+            getPanelAsy(
+                "PanelCustFilter",
+                onLoadedPanelTT,
+                {
+                    callback = self:wrapFunc(self.onSetFilter),
+                    queryKey = uiobjs.InputSeachKey.value,
+                    defautFilter = self.filters
+                }
+            )
+        end,
+        InputSeachKey = function()
+            local queryKey = uiobjs.InputSeachKey.value
+            NetProto.send.list_customers(self.filterValue, queryKey, 1)
+        end
+    }
+end
+
+function TRPOrderList:getFilterStr()
+    if not self.filters then
+        return ""
+    end
+    local ret = {}
+    for i, g in ipairs(self.filters) do
+        local list = {}
+        for j, f in ipairs(g.list) do
+            if f.selected and f.value ~= -1 then
+                table.insert(list, f.value)
+            end
+        end
+        ret[g.key2] = table.concat(list, ",")
+    end
+    return ret
+end
+
+function TRPOrderList:onSetFilter(filters, queryKey)
+    local oldqueryKey = uiobjs.InputSeachKey.value
+    uiobjs.InputSeachKey.value = queryKey
+    self.filters = filters
+    self:refreshFilterBtnStatus()
+    local queryKey = uiobjs.InputSeachKey.value
+    queryKey = trim(queryKey)
+    showHotWheel()
+    self.filterValue = self:getFilterStr()
+    if oldqueryKey == queryKey then
+        NetProto.send.list_customers(self.filterValue, queryKey, 1)
+    else
+        -- 会触发input的onChange事件
+    end
+end
+
+-- 处理ui上的事件，例如点击等
+function TRPOrderList:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func()
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPOrderList:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPOrderList

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua.meta

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

Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab

@@ -0,0 +1,103 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4016113218096866173
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5617798433501596391}
+  - component: {fileID: 7475180248637872789}
+  - component: {fileID: 5112765744569259920}
+  - component: {fileID: 114984807402381024}
+  m_Layer: 5
+  m_Name: EmptySpace
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5617798433501596391
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4016113218096866173}
+  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: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7475180248637872789
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4016113218096866173}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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: 1125
+  mHeight: 40
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 28.125
+--- !u!114 &5112765744569259920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4016113218096866173}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 7475180248637872789}
+  offset: 0
+  sizeAdjust: 1
+--- !u!114 &114984807402381024
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4016113218096866173}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellEmptySpace.lua
+  isNeedResetAtlase: 1

Assets/trCRM/upgradeRes4Dev/priority/ui/other/EmptySpace.prefab.meta

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

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputCheckboxs.prefab

@@ -337,7 +337,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 3135104635965478356}
   offset: 0
   sizeAdjust: 1
 --- !u!1 &5713654144068856770

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputDate.prefab

@@ -261,7 +261,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4366778029194131019}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3}
   m_Name: 
@@ -427,7 +427,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 4462264015671642074}
   offset: 0
   sizeAdjust: 1
 --- !u!1 &4634753059616572994

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputMultText.prefab

@@ -304,12 +304,12 @@ MonoBehaviour:
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 1
   mWidth: 1125
-  mHeight: 160
+  mHeight: 166
   mDepth: 0
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.5800562
+  aspectRatio: 5.2083335
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -337,7 +337,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 2839739815580303652}
   offset: 0
   sizeAdjust: 1
 --- !u!1 &3697089830196127904
@@ -479,7 +479,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4190302636056289163}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -83, z: 0}
+  m_LocalPosition: {x: 0, y: -89, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8914706348937367773}
@@ -553,6 +553,8 @@ GameObject:
   - component: {fileID: 2201719010312833371}
   - component: {fileID: 114036264039868146}
   - component: {fileID: 4159195424412484572}
+  - component: {fileID: 1282812251363180281}
+  - component: {fileID: 4763460103473277405}
   m_Layer: 5
   m_Name: InputMultText
   m_TagString: Untagged
@@ -593,7 +595,7 @@ BoxCollider:
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1125, y: 160, z: 0}
-  m_Center: {x: 0, y: -80, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &3278600689168548542
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -729,6 +731,59 @@ MonoBehaviour:
   onDrag: []
   onBecameVisible: []
   onBecameInvisible: []
+--- !u!114 &1282812251363180281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4384702830002398302}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 512
+  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: 1125
+  mHeight: 160
+  mDepth: 3
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 7.03125
+--- !u!114 &4763460103473277405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4384702830002398302}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 1282812251363180281}
+  offset: 0
+  sizeAdjust: 1
 --- !u!1 &4476086160367826707
 GameObject:
   m_ObjectHideFlags: 0
@@ -892,7 +947,7 @@ MonoBehaviour:
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 2
   mWidth: 720
-  mHeight: 46
+  mHeight: 52
   mDepth: 1
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputPoplist.prefab

@@ -254,6 +254,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &114097241059719580
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -281,7 +282,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 850321821054899805}
   offset: 0
   sizeAdjust: 1
 --- !u!1 &3752426191522449626

Assets/trCRM/upgradeRes4Dev/priority/ui/other/InputText.prefab

@@ -184,6 +184,90 @@ MonoBehaviour:
   mSpriteName: public__empty
   mFillCenter: 1
   isGrayMode: 0
+--- !u!1 &3779000128578336148
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3168767990445357510}
+  - component: {fileID: 8643254210907420438}
+  m_Layer: 5
+  m_Name: SpriteRight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3168767990445357510
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3779000128578336148}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 527, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2423944239439220864}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8643254210907420438
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3779000128578336148}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 2423944239439220864}
+    relative: 1
+    absolute: -49
+  rightAnchor:
+    target: {fileID: 2423944239439220864}
+    relative: 1
+    absolute: -21
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
+  mPivot: 4
+  mWidth: 28
+  mHeight: 40
+  mDepth: 2
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.05
+  mType: 0
+  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_right
+  mFillCenter: 1
+  isGrayMode: 0
 --- !u!1 &4625788788876681624
 GameObject:
   m_ObjectHideFlags: 0
@@ -364,6 +448,7 @@ Transform:
   - {fileID: 28764931924455384}
   - {fileID: 608007034948422929}
   - {fileID: 3889093227389003832}
+  - {fileID: 3168767990445357510}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -387,7 +472,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6259930685614177535}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: ac5060295fbd39b4a88d20d0c83d925e, type: 3}
   m_Name: 
@@ -580,7 +665,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  widget: {fileID: 0}
+  widget: {fileID: 1657931634484404253}
   offset: 0
   sizeAdjust: 1
 --- !u!1 &6856486077525911941

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelAbout.prefab.meta

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

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelConfirm.prefab

@@ -1505,7 +1505,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2628189625839598053
 Transform:
   m_ObjectHideFlags: 0
@@ -1552,7 +1552,7 @@ MonoBehaviour:
   mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
   mPivot: 4
   mWidth: 224
-  mHeight: 56
+  mHeight: 55
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
@@ -1561,7 +1561,7 @@ MonoBehaviour:
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u786E\u8BA4\u64CD\u4F5C"
+  mText: 
   mFontSize: 56
   mFontStyle: 0
   mAlignment: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab

@@ -905,6 +905,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!1 &330521499854047422
 GameObject:
   m_ObjectHideFlags: 0
@@ -4787,6 +4788,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &7645822589242098017
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5133,6 +5135,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &1137789232
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8160,6 +8163,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &49758580
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8973,6 +8977,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &538149441
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10208,6 +10213,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &1411711555
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10408,6 +10414,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &945366800
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustList.prefab

@@ -3514,6 +3514,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!1 &8799149260921359694
 GameObject:
   m_ObjectHideFlags: 0
@@ -3585,7 +3586,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: da6df6b770ac942ab8916dc960507b8f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  cellCount: 10
+  cellCount: 12
   isPlayTween: 0
   twType: 0
   tweenSpeed: 0.01

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustListProc.prefab

@@ -78,6 +78,9 @@ MonoBehaviour:
   itemList: []
   grid: {fileID: 0}
   panel: {fileID: 0}
+  OnShowHeadListCallbacks: []
+  OnHideHeadListCallbacks: []
+  OnEndListCallbacks: []
 --- !u!1 &556357319856344632
 GameObject:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelFollowList.prefab.meta

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

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMine.prefab

@@ -11,8 +11,10 @@ GameObject:
   - component: {fileID: 745552340}
   - component: {fileID: 745552342}
   - component: {fileID: 745552341}
+  - component: {fileID: 6219061445155327309}
+  - component: {fileID: 212392421651251280}
   m_Layer: 5
-  m_Name: Spritebg
+  m_Name: SpriteTopBg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -66,7 +68,7 @@ MonoBehaviour:
   mWidth: 1129
   mHeight: 370
   mDepth: 0
-  autoResizeBoxCollider: 0
+  autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
   aspectRatio: 3.0513513
@@ -100,6 +102,53 @@ MonoBehaviour:
   widget: {fileID: 745552342}
   offset: -2
   sizeAdjust: 1
+--- !u!65 &6219061445155327309
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 745552339}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1129, y: 370, z: 0}
+  m_Center: {x: 0, y: -185, z: 0}
+--- !u!114 &212392421651251280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 745552339}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e862f287df53bb64db191162f851a296, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onHoverOver: []
+  onHoverOut: []
+  onPress: []
+  onRelease: []
+  onSelect: []
+  onDeselect: []
+  onClick:
+  - mTarget: {fileID: 7860134391406953152}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+  onDoubleClick: []
+  onDragStart: []
+  onDragEnd: []
+  onDragOver: []
+  onDragOut: []
+  onDrag: []
+  onBecameVisible: []
+  onBecameInvisible: []
 --- !u!1 &1394948278
 GameObject:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMyInfor.prefab.meta

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

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewCust.prefab

@@ -688,6 +688,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &3423729636388972546
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3828,6 +3829,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &6561780794515061221
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4246,6 +4248,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &4653130227401068280
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6818,6 +6821,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &7163535886343167415
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7944,6 +7948,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &4220701522037042036
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowSimple.prefab

@@ -551,7 +551,7 @@ GameObject:
   - component: {fileID: 1907683157874330074}
   - component: {fileID: 7724873194386183766}
   m_Layer: 5
-  m_Name: PanelNewFollow
+  m_Name: PanelNewFollowSimple
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -633,7 +633,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isPause: 0
-  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollow.lua
+  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowSimple.lua
   isNeedBackplate: 1
   destroyWhenHide: 0
   isNeedResetAtlase: 1

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab

@@ -0,0 +1,649 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &328980738985470321
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8405719512336295725}
+  - component: {fileID: 4793665127037870931}
+  - component: {fileID: 4569404973647487988}
+  - component: {fileID: 2469722214568661231}
+  m_Layer: 5
+  m_Name: DetailRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8405719512336295725
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328980738985470321}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1, y: -30, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 8271564019481054745}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4793665127037870931
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328980738985470321}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  columns: 1
+  direction: 0
+  sorting: 0
+  pivot: 1
+  cellAlignment: 1
+  hideInactive: 1
+  keepWithinPanel: 0
+  padding: {x: 0, y: -1}
+--- !u!114 &4569404973647487988
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328980738985470321}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: 
+--- !u!114 &2469722214568661231
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 328980738985470321}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
+  isNeedResetAtlase: 1
+--- !u!1 &2405347686691609928
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 85942781782062204}
+  - component: {fileID: 3495134491120660627}
+  - component: {fileID: 2022783212242154028}
+  - component: {fileID: 5774097580592811788}
+  m_Layer: 5
+  m_Name: DragScroll
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &85942781782062204
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2405347686691609928}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -1, y: -66, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5592195152047375516}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3495134491120660627
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2405347686691609928}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 1
+    absolute: -132
+  updateAnchors: 1
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1125
+  mHeight: 2172
+  mDepth: 7
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.5179558
+--- !u!114 &2022783212242154028
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2405347686691609928}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 6376198817563156533}
+  draggablePanel: {fileID: 0}
+--- !u!65 &5774097580592811788
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2405347686691609928}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 2172, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4329241472409898578
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4329241472409898579}
+  - component: {fileID: 4329241472409898588}
+  m_Layer: 5
+  m_Name: Top
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4329241472409898579
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472409898578}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1152, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4329241472744673724}
+  m_Father: {fileID: 5592195152047375516}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4329241472409898588
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472409898578}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c8077b76001d36d489868d20d28bddb9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  uiCamera: {fileID: 0}
+  container: {fileID: 0}
+  side: 3
+  runOnlyOnce: 1
+  relativeOffset: {x: 0, y: 0}
+  pixelOffset: {x: 0, y: 0}
+  widgetContainer: {fileID: 0}
+--- !u!1 &4329241472744673715
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4329241472744673724}
+  - component: {fileID: 4329241472744673727}
+  - component: {fileID: 4329241472744673726}
+  - component: {fileID: 4329241472744673725}
+  m_Layer: 5
+  m_Name: ButtonSave
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4329241472744673724
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472744673715}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 510, y: -66, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4329241472409898579}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4329241472744673727
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472744673715}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 200, y: 100, z: 0}
+  m_Center: {x: -50, y: -0.22070312, z: 0}
+--- !u!114 &4329241472744673726
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472744673715}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 4329241472744673715}
+  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: 6003453472346918249}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &4329241472744673725
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4329241472744673715}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 1
+    absolute: -163
+  rightAnchor:
+    target: {fileID: 5592195152047375516}
+    relative: 1
+    absolute: -51
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.16078432, g: 0.5647059, b: 0.8627451, a: 1}
+  mPivot: 5
+  mWidth: 112
+  mHeight: 56
+  mDepth: 1
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: "\u4FDD\u5B58"
+  mFontSize: 56
+  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
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5592195152047375516}
+  - component: {fileID: 2458329485491688165}
+  - component: {fileID: 6003453472346918249}
+  m_Layer: 5
+  m_Name: PanelNewFollowTask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &5592195152047375516
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6655210489690858908}
+  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:
+  - {fileID: 5646390679247249172}
+  - {fileID: 85942781782062204}
+  - {fileID: 4329241472409898579}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2458329485491688165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6655210489690858908}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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
+  showInPanelTool: 1
+  generateNormals: 0
+  widgetsAreStatic: 0
+  cullWhileDragging: 1
+  alwaysOnScreen: 0
+  anchorOffset: 0
+  softBorderPadding: 1
+  renderQueue: 0
+  startingRenderQueue: 3000
+  mClipTexture: {fileID: 0}
+  mAlpha: 1
+  mClipping: 0
+  mClipRange: {x: 0, y: 0, z: 300, w: 200}
+  mClipSoftness: {x: 4, y: 4}
+  mDepth: 1
+  mSortingOrder: 0
+  mClipOffset: {x: 0, y: 0}
+--- !u!114 &6003453472346918249
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6655210489690858908}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1ff491def90b44724978eb9e0b2b558f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPNewFollowTask.lua
+  isNeedBackplate: 1
+  destroyWhenHide: 0
+  isNeedResetAtlase: 1
+  isNeedMask4Init: 0
+  isNeedMask4InitOnlyOnce: 1
+  isHideWithEffect: 1
+  isRefeshContentWhenEffectFinish: 0
+  EffectRoot: {fileID: 0}
+  effectType: 1
+  EffectList: []
+  frameName: Frame1
+  frameObj: {fileID: 0}
+  titleKeyName: "\u65B0\u5EFA\u8DDF\u8FDB\u4EFB\u52A1"
+--- !u!1 &7833718132027562127
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8271564019481054745}
+  - component: {fileID: 6605656819427986464}
+  m_Layer: 5
+  m_Name: Table
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8271564019481054745
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7833718132027562127}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 937, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 8405719512336295725}
+  m_Father: {fileID: 5646390679247249172}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6605656819427986464
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7833718132027562127}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66ca9c6e5cbd4544ab22016a27d817a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  columns: 1
+  direction: 0
+  sorting: 0
+  pivot: 1
+  cellAlignment: 1
+  hideInactive: 1
+  keepWithinPanel: 0
+  padding: {x: 0, y: 30}
+--- !u!1 &9049775882809917633
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5646390679247249172}
+  - component: {fileID: 4803176237007059409}
+  - component: {fileID: 6376198817563156533}
+  m_Layer: 5
+  m_Name: PanelContent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5646390679247249172
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9049775882809917633}
+  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:
+  - {fileID: 8271564019481054745}
+  m_Father: {fileID: 5592195152047375516}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4803176237007059409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9049775882809917633}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ae942c9068183dc40a9d01f648273726, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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
+  showInPanelTool: 1
+  generateNormals: 0
+  widgetsAreStatic: 0
+  cullWhileDragging: 1
+  alwaysOnScreen: 0
+  anchorOffset: 0
+  softBorderPadding: 1
+  renderQueue: 0
+  startingRenderQueue: 3001
+  mClipTexture: {fileID: 0}
+  mAlpha: 1
+  mClipping: 3
+  mClipRange: {x: 0, y: 0, z: 1126, w: 2000}
+  mClipSoftness: {x: 4, y: 10}
+  mDepth: 2
+  mSortingOrder: 0
+  mClipOffset: {x: 0, y: 0}
+--- !u!114 &6376198817563156533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9049775882809917633}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  movement: 1
+  dragEffect: 2
+  restrictWithinPanel: 1
+  disableDragIfFits: 1
+  smoothDragStart: 1
+  iOSDragEmulation: 1
+  scrollWheelFactor: 0.25
+  momentumAmount: 35
+  dampenStrength: 9
+  horizontalScrollBar: {fileID: 0}
+  verticalScrollBar: {fileID: 0}
+  showScrollBars: 1
+  customMovement: {x: 1, y: 0}
+  contentPivot: 1
+  scale: {x: 0, y: 0, z: 0}
+  relativePositionOnReset: {x: 0, y: 0}
+  centerOnChild: {fileID: 0}

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewFollowTask.prefab.meta

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

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab

@@ -151,7 +151,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 420220745163305833}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -48.154236, z: 0}
+  m_LocalPosition: {x: 0, y: -48.654293, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6406361052267521726}
@@ -1075,7 +1075,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1747138548909843324}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -177.40427, z: 0}
+  m_LocalPosition: {x: 0, y: -177.77928, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 5582618885866839856}
@@ -1296,6 +1296,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!114 &1374284702246386988
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1900,7 +1901,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2425227412765712263}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -188.9042, z: 0}
+  m_LocalPosition: {x: 0, y: -777.27924, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 5247068646262692398}
@@ -3737,6 +3738,158 @@ MonoBehaviour:
   isAppendEndingString: 0
   AppendString: '...'
   fontName: EmptyFont
+--- !u!1 &5487216764156978569
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2509541483205259216}
+  - component: {fileID: 3489239926919154696}
+  - component: {fileID: 1838843289826127282}
+  - component: {fileID: 4460822429136587271}
+  - component: {fileID: 9035455709320344593}
+  - component: {fileID: 2085530375892443290}
+  m_Layer: 5
+  m_Name: 00000
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2509541483205259216
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  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:
+  - {fileID: 6755470009267612121}
+  m_Father: {fileID: 4600755202396098814}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3489239926919154696
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 2085530375892443290}
+  offset: 50
+  sizeAdjust: 1
+--- !u!114 &1838843289826127282
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 575f113ee96624a30ab2ca1af1303112, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isPause: 0
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellImage.lua
+  isNeedResetAtlase: 1
+--- !u!114 &4460822429136587271
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 0}
+  draggablePanel: {fileID: 0}
+--- !u!65 &9035455709320344593
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1025, y: 500, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &2085530375892443290
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487216764156978569}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5c5ca47aa5c01740810b7c66662099f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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: 1025
+  mHeight: 500
+  mDepth: 0
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2.05
+  mType: 0
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  mRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  mTexture: {fileID: 0}
+  mMat: {fileID: 0}
+  mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
+  mBorder: {x: 0, y: 0, z: 0, w: 0}
+  mFixedAspect: 0
 --- !u!1 &5817392990340767882
 GameObject:
   m_ObjectHideFlags: 0
@@ -4369,12 +4522,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6840166634573325542}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -350.25, z: 0}
+  m_LocalPosition: {x: 0, y: -938.87494, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 7870608547099953618}
   - {fileID: 7657068295081712894}
-  - {fileID: 2296907656735151289}
   m_Father: {fileID: 9092197074366352143}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4443,6 +4595,7 @@ Transform:
   - {fileID: 675396154728095867}
   - {fileID: 695648132874815624}
   - {fileID: 4781790433082627634}
+  - {fileID: 2296907656735151289}
   m_Father: {fileID: 4808583122758801922}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4650,6 +4803,139 @@ MonoBehaviour:
   mSpriteName: work_work_color
   mFillCenter: 1
   isGrayMode: 0
+--- !u!1 &7864880252234492747
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6755470009267612121}
+  - component: {fileID: 3531358558082589502}
+  - component: {fileID: 5949980243057264043}
+  - component: {fileID: 433959213111062007}
+  m_Layer: 5
+  m_Name: ButtonDel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6755470009267612121
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864880252234492747}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 470, y: 208, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2509541483205259216}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &3531358558082589502
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864880252234492747}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 100, y: 100, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &5949980243057264043
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864880252234492747}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 7864880252234492747}
+  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: 1838843289826127282}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &433959213111062007
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864880252234492747}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 2509541483205259216}
+    relative: 1
+    absolute: -65
+  rightAnchor:
+    target: {fileID: 2509541483205259216}
+    relative: 1
+    absolute: -20
+  bottomAnchor:
+    target: {fileID: 2509541483205259216}
+    relative: 1
+    absolute: -65
+  topAnchor:
+    target: {fileID: 2509541483205259216}
+    relative: 1
+    absolute: -20
+  updateAnchors: 0
+  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mPivot: 4
+  mWidth: 45
+  mHeight: 45
+  mDepth: 5
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
+  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: login_log_no
+  mFillCenter: 1
+  isGrayMode: 0
 --- !u!1 &7898200024377142075
 GameObject:
   m_ObjectHideFlags: 0
@@ -4663,14 +4949,16 @@ GameObject:
   - component: {fileID: 7847741233886550698}
   - component: {fileID: 3989876927114666004}
   - component: {fileID: 6582611865144033048}
-  - component: {fileID: 5684835301358909987}
+  - component: {fileID: 4891233890758738143}
+  - component: {fileID: 8089659989952212147}
+  - component: {fileID: 3196188467329571094}
   m_Layer: 5
   m_Name: InputAttachment
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &2296907656735151289
 Transform:
   m_ObjectHideFlags: 0
@@ -4678,8 +4966,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7898200024377142075}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -863.0292, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -1338.6248, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4096705695685564279}
@@ -4687,8 +4975,9 @@ Transform:
   - {fileID: 22394276322990286}
   - {fileID: 5447743745483950510}
   - {fileID: 6561805268829721416}
-  m_Father: {fileID: 4781790433082627634}
-  m_RootOrder: 2
+  - {fileID: 4600755202396098814}
+  m_Father: {fileID: 9092197074366352143}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &6052790691369986581
 BoxCollider:
@@ -4785,7 +5074,7 @@ MonoBehaviour:
   widget: {fileID: 7847741233886550698}
   offset: 0
   sizeAdjust: 1
---- !u!114 &5684835301358909987
+--- !u!114 &4891233890758738143
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4794,31 +5083,91 @@ MonoBehaviour:
   m_GameObject: {fileID: 7898200024377142075}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  tweenTarget: {fileID: 8872996654376181753}
-  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:
+  atlasName: 
+  atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
+  fontName: 
+  bitmapFont: {fileID: 0}
+  trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3}
+  fontSize: 46
+  fontStyle: 0
+  backgroundSprite: help_chengfang
+  highlightSprite: help_chengfang
+  position: 0
+  alignment: 1
+  items:
+  - "\u62CD\u7167"
+  - "\u4ECE\u76F8\u518C\u9009\u62E9"
+  valueItems:
+  - 1
+  - 2
+  padding: {x: 4, y: 4}
+  textColor: {r: 1, g: 1, b: 1, a: 1}
+  backgroundColor: {r: 1, g: 1, b: 1, a: 1}
+  highlightColor: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  isAnimated: 1
+  isLocalized: 0
+  openOn: 0
+  onChange: []
+  mSelectedItem: "\u62CD\u7167"
+  mPanel: {fileID: 0}
+  mChild: {fileID: 0}
+  mBackground: {fileID: 0}
+  mHighlight: {fileID: 0}
+  mHighlightedLabel: {fileID: 0}
+  mLabelList: []
+  mBgBorder: 0
+  eventReceiver: {fileID: 0}
+  functionName: OnSelectionChange
+  textScale: 0
+  font: {fileID: 0}
+  textLabel: {fileID: 0}
+--- !u!114 &8089659989952212147
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898200024377142075}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onSelect:
   - mTarget: {fileID: 6896994100725352575}
     mMethodName: uiEventDelegate
     mParameters:
     - obj: {fileID: 0}
       field: 
-      name: go
+      name: 
     oneShot: 0
+--- !u!114 &3196188467329571094
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7898200024377142075}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: 
+  formatValue: 
+  labeName: {fileID: 0}
+  defaultName: 
+  canNull: 1
+  checkIDCard: 0
+  minLen: 0
+  maxLen: 0
+  spriteBg: {fileID: 0}
+  valueIsNumber: 0
+  isPhoneNum: 0
+  inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
 --- !u!1 &8174250477570590167
 GameObject:
   m_ObjectHideFlags: 0
@@ -4927,6 +5276,62 @@ MonoBehaviour:
   scale: {x: 0, y: 0, z: 0}
   relativePositionOnReset: {x: 0, y: 0}
   centerOnChild: {fileID: 0}
+--- !u!1 &8177775070125587863
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4600755202396098814}
+  - component: {fileID: 749625377866579281}
+  m_Layer: 5
+  m_Name: Grid
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4600755202396098814
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8177775070125587863}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -355, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2509541483205259216}
+  m_Father: {fileID: 2296907656735151289}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &749625377866579281
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8177775070125587863}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 07c4de3b4b6fe9045b059ee627c100df, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  arrangement: 1
+  sorting: 1
+  pivot: 1
+  maxPerLine: 0
+  cellWidth: 200
+  cellHeight: 520
+  animateSmoothly: 0
+  hideInactive: 1
+  keepWithinPanel: 0
+  sorted: 0
+  oldParentPos: {x: 0, y: 0, z: 0}
+  oldParentClipOffset: {x: 0, y: 0}
 --- !u!1 &8432021983544835164
 GameObject:
   m_ObjectHideFlags: 0
@@ -5040,7 +5445,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8872996654376181753}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -685.9043, z: 0}
+  m_LocalPosition: {x: 0, y: -269.90417, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3343166803441427381}

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderList.prefab.meta

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

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPopCheckBoxs.prefab

@@ -1102,6 +1102,9 @@ MonoBehaviour:
   itemList: []
   grid: {fileID: 0}
   panel: {fileID: 0}
+  OnShowHeadListCallbacks: []
+  OnHideHeadListCallbacks: []
+  OnEndListCallbacks: []
 --- !u!1 &4260279069647208014
 GameObject:
   m_ObjectHideFlags: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelTasks.prefab

@@ -555,7 +555,7 @@ MonoBehaviour:
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u9500\u552E\u76EE\u6807"
   mFontSize: 42
-  mFontStyle: 0
+  mFontStyle: 1
   mAlignment: 0
   mEncoding: 1
   mMaxLineCount: 0
@@ -3402,7 +3402,7 @@ MonoBehaviour:
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u5BA2\u6237\u7C7B\u578B"
   mFontSize: 42
-  mFontStyle: 0
+  mFontStyle: 1
   mAlignment: 0
   mEncoding: 1
   mMaxLineCount: 0
@@ -4601,13 +4601,13 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 2
+  aspectRatio: 4
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u8BA2\u5355\u6210\u4EA4"
   mFontSize: 42
-  mFontStyle: 0
+  mFontStyle: 1
   mAlignment: 0
   mEncoding: 1
   mMaxLineCount: 0

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/ToastRoot.prefab

@@ -151,7 +151,7 @@ MonoBehaviour:
   mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
   mPivot: 4
   mWidth: 800
-  mHeight: 146
+  mHeight: 152
   mDepth: 0
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
@@ -373,7 +373,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8524572109241191192}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 54, y: 0, z: 0}
+  m_LocalPosition: {x: 39, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 576939815961468376}
@@ -394,7 +394,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 6505418891330252177}
     relative: 1
-    absolute: 50
+    absolute: 20
   rightAnchor:
     target: {fileID: 576939815961468376}
     relative: 1
@@ -410,13 +410,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 1, g: 1, b: 1, a: 1}
   mPivot: 4
-  mWidth: 592
-  mHeight: 46
+  mWidth: 622
+  mHeight: 52
   mDepth: 1
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 12.869565
+  aspectRatio: 12.307693
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}