up

Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/sort.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: f252adfc70a584406bca4d3b90347c25
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/xuanze.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: dceec601e403f4a5783e8a96b0ae0f07
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/xuanze_bg.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: acf4741c16a13467a90d407f4df2fc6d
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1823,6 +1823,48 @@ MonoBehaviour:
     paddingTop: 0
     paddingBottom: 0
     path: trCRM/upgradeRes4Dev/other/uiAtlas/logo/512.png
+  - name: order_sort
+    x: 0
+    y: 0
+    width: 60
+    height: 48
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/sort.png
+  - name: order_xuanze
+    x: 0
+    y: 0
+    width: 64
+    height: 64
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/xuanze.png
+  - name: order_xuanze_bg
+    x: 0
+    y: 0
+    width: 64
+    height: 64
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/xuanze_bg.png
   mPixelSize: 1
   mReplacement: {fileID: 0}
   mCoordinates: 0

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

@@ -76,7 +76,9 @@ end
 
 --==============================================================================
 DBOrder.onGetProducts = function(content)
-    db.products = content.productList
+    if content then
+        db.products = content.productList
+    end
 end
 
 DBOrder.getProducts = function()

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

@@ -14,7 +14,11 @@ function DBUser.onGetUsers(list)
     poplist.values = ArrayList()
     for i, v in ipairs(list) do
         db[v.loginNo] = v
-        poplist.options:Add(joinStr(v.loginNo, "_", v.loginName))
+        if v.loginName == "系统生成" then
+            poplist.options:Add(joinStr(v.loginNo, "_", v.loginName))
+        else
+            poplist.options:Add(joinStr(v.loginName))
+        end
         poplist.values:Add(v.loginNo)
     end
 end

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

@@ -242,6 +242,7 @@ NetProto.cmds = {
     selectProductInfo = "selectProductInfo", -- 商品列表
     createWfInfo = "createWfInfo", -- 创建订单
     create_followUp_task = "create_followUp_task", -- 创建跟进预约
+    list_followUp_records = "list_followUp_records" -- 跟进记录
 }
 ---------------------------------------------------------------------------------------
 ---------------------------------------------------------------------------------------
@@ -335,7 +336,7 @@ NetProto.OnReceiveStompMsg = function(frame)
                     end
                 end
             end
-            
+
             if isDebug then
                 printw(cmd, frame.Content)
             end
@@ -462,6 +463,7 @@ NetProto.send.bi_call = function(custId, phoneNo, loginNo, callback, timeOutSec)
     content.custId = custId
     content.phoneNo = phoneNo
     content.loginNo = loginNo or NetProto.loginNo
+    content.appIP = CLUIFormUtl.GetMyIP(CLUIFormUtl.ADDRESSFAM.IPv4) -- 本机的ip地址
     NetProto.sendSocket(content, callback, timeOutSec)
 end
 
@@ -530,7 +532,7 @@ end
 NetProto.send.create_followUp_record = function(followUpRecordJson, callback, timeOutSec)
     local content = {}
     content.action = NetProto.cmds.create_followUp_record
-    followUpRecordJson.loginNo= NetProto.loginNo
+    followUpRecordJson.loginNo = NetProto.loginNo
     followUpRecordJson.groupId = NetProto.groupId
     followUpRecordJson.recordingTime = DateEx.nowString()
     content.followUpRecordJson = followUpRecordJson
@@ -574,5 +576,14 @@ NetProto.send.create_followUp_task = function(followUpTaskJson, callback, timeOu
     content.followUpTaskJson.groupId = NetProto.groupId
     NetProto.sendSocket(content, callback, timeOutSec)
 end
+
+NetProto.send.list_followUp_records = function(filters, queryKey, page, callback, timeOutSec)
+    local content = {}
+    content.action = NetProto.cmds.list_followUp_records
+    content.filters = filters
+    content.keywords = queryKey
+    content.current_page = page
+    NetProto.sendSocket(content, callback, timeOutSec)
+end
 ------------------------------------------------------
 return NetProto

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

@@ -0,0 +1,63 @@
+-- xx单元
+local _cell = {}
+---@type Coolape.CLCellLua
+local csSelf = nil
+local transform = nil
+local mData = nil
+local uiobjs = {}
+
+-- 初始化，只调用一次
+function _cell.init(csObj)
+    csSelf = csObj
+    transform = csSelf.transform
+    ---@type CLUIFormRoot
+    uiobjs.formRoot = csSelf:GetComponent("CLUIFormRoot")
+
+    ---@type UIPopupList
+    uiobjs.LabelStatus = getCC(transform, "LabelStatus", "UIPopupList")
+    ---@type UIPopupList
+    uiobjs.LabelServerNo = getCC(transform, "LabelServerNo", "UIPopupList")
+    uiobjs.SpriteHeadIcon = getCC(transform, "SpriteHeadBg/SpriteHeadIcon", "UITexture")
+    uiobjs.SpriteStatus = getCC(transform, "SpriteStatus", "UISprite")
+    uiobjs.LabelDate = getCC(transform, "LabelDate", "UILabel")
+end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    local optionInfor = DBCust.getFilter4Popup(DBCust.FilterGroup.dealFlagList)
+    uiobjs.LabelStatus:refreshItems(optionInfor.options, optionInfor.values)
+    local optionInfor = DBUser.getPopList()
+    uiobjs.LabelServerNo:refreshItems(optionInfor.options, optionInfor.values)
+
+    if tostring(mData.dealFlag) == "0" then
+        SetActive(uiobjs.SpriteStatus.gameObject, true)
+    else
+        SetActive(uiobjs.SpriteStatus.gameObject, false)
+    end
+    uiobjs.LabelDate.text = string.sub(mData.createTime, 1, 10)
+
+    uiobjs.formRoot:setValue(mData)
+
+    ---@type _DBUser
+    local user = DBUser.getUserById(mData.loginNo)
+    if user then
+        DBUser.getIcon(
+            mData.loginNo,
+            function(texture)
+                if texture and texture.name == user.imageUrl then
+                    uiobjs.SpriteHeadIcon.mainTexture = texture
+                end
+            end
+        )
+    end
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+--------------------------------------------
+return _cell

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

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

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

@@ -21,7 +21,9 @@ end
 function _cell.show(go, data)
     mData = data
     uiobjs.formRoot:setValue(mData.data, true)
-    _cell.selected(mData.isSelected)
+    if uiobjs.Toggle then
+        _cell.selected(mData.isSelected)
+    end
 end
 
 -- 取得数据

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/CSPTasks.lua

@@ -161,6 +161,9 @@ function CSPTasks.setEventDelegate()
         ButtonOrder = function()
             getPanelAsy("PanelOrderList", onLoadedPanelTT)
         end,
+        ButtonGoods = function()
+            getPanelAsy("PanelProductList", onLoadedPanelTT)
+        end,
 
     }
 end

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

@@ -25,6 +25,7 @@ function TRPCustDetail:init(csObj)
     ---@type UIPopupList
     uiobjs.LabelStatus = getCC(uiobjs.Head.transform, "LabelStatus", "UIPopupList")
     uiobjs.LabelType = getCC(uiobjs.Head.transform, "LabelType", "UIPopupList")
+    uiobjs.LabelLoginNo = getCC(uiobjs.Head.transform, "LabelLoginNo", "UIPopupList")
     uiobjs.starGrid = getCC(uiobjs.Head.transform, "LabelStars/Grid", "UIGrid")
     uiobjs.starGridPrefab = getChild(uiobjs.starGrid.transform, "00000").gameObject
 
@@ -135,6 +136,7 @@ function TRPCustDetail:show()
     uiobjs.InputTask:refreshItems(optionInfor.options, optionInfor.values)
     local poplist = DBUser.getPopList()
     uiobjs.InputLogin:refreshItems(poplist.options, poplist.values)
+    uiobjs.LabelLoginNo:refreshItems(poplist.options, poplist.values)
     -- 设置星级
     local stars = {}
     for i = 1, 5 do

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

@@ -38,7 +38,7 @@ function TRPFollowList:show()
     self:refreshFilterBtnStatus()
     self:showList({})
     showHotWheel()
-    NetProto.send.list_customers(self.filterValue, "", 1)
+    NetProto.send.list_followUp_records(self.filterValue, "", 1)
 end
 
 function TRPFollowList:showList(list)
@@ -70,7 +70,7 @@ end
 function TRPFollowList:refreshList()
     local queryKey = uiobjs.InputSeachKey.value
     showHotWheel()
-    NetProto.send.list_customers(self.filterValue, queryKey, 1)
+    NetProto.send.list_followUp_records(self.filterValue, queryKey, 1)
 end
 
 function TRPFollowList:onHeadList(head)
@@ -85,7 +85,7 @@ function TRPFollowList:onEndList(tail)
         local queryKey = uiobjs.InputSeachKey.value
         showHotWheel()
         -- 取得下一页
-        NetProto.send.list_customers(self.filterValue, queryKey, self.pageInfo.current_page + 1)
+        NetProto.send.list_followUp_records(self.filterValue, queryKey, self.pageInfo.current_page + 1)
     else
         uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -335
         SetActive(uiobjs.ButtonEndList.gameObject, true)
@@ -134,7 +134,7 @@ end
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function TRPFollowList:procNetwork(cmd, succ, msg, paras)
     if (succ == NetSuccess) then
-        if cmd == NetProto.cmds.list_customers then
+        if cmd == NetProto.cmds.list_followUp_records then
             local result = paras.result or {}
             self.pageInfo = result.meta
             if self.pageInfo and self.pageInfo.current_page > 1 then
@@ -143,19 +143,12 @@ function TRPFollowList:procNetwork(cmd, succ, msg, paras)
                 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",
@@ -169,7 +162,7 @@ function TRPFollowList:setEventDelegate()
         end,
         InputSeachKey = function()
             local queryKey = uiobjs.InputSeachKey.value
-            NetProto.send.list_customers(self.filterValue, queryKey, 1)
+            NetProto.send.list_followUp_records(self.filterValue, queryKey, 1)
         end
     }
 end
@@ -201,7 +194,7 @@ function TRPFollowList:onSetFilter(filters, queryKey)
     showHotWheel()
     self.filterValue = self:getFilterStr()
     if oldqueryKey == queryKey then
-        NetProto.send.list_customers(self.filterValue, queryKey, 1)
+        NetProto.send.list_followUp_records(self.filterValue, queryKey, 1)
     else
         -- 会触发input的onChange事件
     end

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

@@ -0,0 +1,158 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPProductDetail:TRBasePanel
+local TRPProductDetail = class("TRPProductDetail", TRBasePanel)
+
+local uiobjs = {}
+-- 初始化，只会调用一次
+function TRPProductDetail:init(csObj)
+    TRPProductDetail.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.TableForm = uiobjs.Table:GetComponent("CLUIFormRoot")
+    ---@type Coolape.CLCellLua
+    uiobjs.TableLua = uiobjs.Table:GetComponent("CLCellLua")
+end
+
+function TRPProductDetail:initFiledsAttr()
+    ---@type _ParamFieldAttr
+    local attr
+    self.baseFiledsAttr = {}
+    attr = {}
+    attr.attrName = "产品名称"
+    attr.id = "name"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "产品单价"
+    attr.id = "price"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "产品库存"
+    attr.id = "num"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "产品类型"
+    attr.id = "prodTypeName"
+    attr.attrType = DBCust.FieldType.text
+    attr.ifMust = 0
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+
+    attr = {}
+    attr.attrName = "产品描述"
+    attr.id = "productDesc"
+    attr.attrType = DBCust.FieldType.multext
+    attr.ifMust = 0
+    attr.donotJoinKey = true
+    table.insert(self.baseFiledsAttr, attr)
+end
+
+-- 设置数据
+---@param paras _ParamTRPProductDetail
+function TRPProductDetail:setData(paras)
+    self.mdata = paras
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPProductDetail: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.showOnly
+        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 TRPProductDetail:onClickField(el)
+end
+
+function TRPProductDetail:onFinishSetField(key, val)
+    if tostring(val) ~= tostring(self.mdata[key]) then
+    -- self:sendModifymsg(key, val, true)
+    --//TODO:
+    end
+end
+
+function TRPProductDetail:onSelectField(go)
+end
+
+function TRPProductDetail:reposition()
+    uiobjs.Table:Reposition()
+    uiobjs.Table.repositionNow = true
+    uiobjs.scrollView:ResetPosition()
+end
+
+-- 刷新
+function TRPProductDetail:refresh()
+end
+
+-- 关闭页面
+function TRPProductDetail:hide()
+    uiobjs.TableLua.luaTable.release()
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPProductDetail:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+    --[[
+        if cmd == xx then
+        end
+        ]]
+    end
+end
+
+function TRPProductDetail:setEventDelegate()
+    self.EventDelegate = {}
+end
+
+function TRPProductDetail:onGetImage(path)
+    if isNilOrEmpty(path) then
+        return
+    end
+    --//TODO:
+end
+
+-- 处理ui上的事件，例如点击等
+function TRPProductDetail:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func(go)
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPProductDetail:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPProductDetail

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

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

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

@@ -0,0 +1,120 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPProductList:TRBasePanel
+local TRPProductList = class("TRPProductList", TRBasePanel)
+
+local uiobjs = {}
+local selectedMap = {}
+-- 初始化，只会调用一次
+function TRPProductList:init(csObj)
+    TRPProductList.super.init(self, csObj)
+
+    self:setEventDelegate()
+
+    MyUtl.setContentView(getChild(self.transform, "PanelContent"), 298, 0)
+    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
+    ---@type UIScrollView
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
+    ---@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")
+end
+
+-- 设置数据
+---@param paras _ParamTRPProductList
+function TRPProductList:setData(paras)
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPProductList:show()
+    uiobjs.InputSeachKey.value = ""
+    showHotWheel()
+    NetProto.send.selectProductInfo(uiobjs.InputSeachKey.value, 1)
+    self:showList({})
+end
+
+function TRPProductList:showList(products)
+    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    local list = {}
+    for i, v in ipairs(products or {}) do
+        table.insert(list, {data = v, isSelected = false})
+    end
+    uiobjs.Grid:setList(list, self:wrapFunc(self.initCell), nil, self:wrapFunc(self.onEndList))
+    uiobjs.scrollView:ResetPosition()
+end
+function TRPProductList:appList(list)
+    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    uiobjs.Grid:appendList(list)
+end
+
+function TRPProductList:initCell(cell, data)
+    cell:init(data, self:wrapFunc(self.onClickCell))
+end
+
+function TRPProductList:onClickCell(cell, data)
+    getPanelAsy("PanelProductDetail", onLoadedPanelTT, data.data)
+end
+
+function TRPProductList: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.selectProductInfo(queryKey, self.pageInfo.current_page + 1)
+    else
+        uiobjs.ButtonEndList.localPosition = tail.transform.localPosition + Vector3.up * -210
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
+end
+
+-- 刷新
+function TRPProductList:refresh()
+end
+
+-- 关闭页面
+function TRPProductList:hide()
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPProductList:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.selectProductInfo 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()
+        end
+    end
+end
+
+function TRPProductList:setEventDelegate()
+    self.EventDelegate = {
+        InputSeachKey = function()
+            local queryKey = uiobjs.InputSeachKey.value
+            NetProto.send.selectProductInfo(queryKey, 1)
+        end,
+        ButtonProductGroup = function()
+        end
+    }
+end
+-- 处理ui上的事件，例如点击等
+function TRPProductList:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func()
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPProductList:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPProductList

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

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

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

@@ -112,6 +112,10 @@ end
 
 function TRPSelectProduct:setEventDelegate()
     self.EventDelegate = {
+        InputSeachKey = function()
+            local queryKey = uiobjs.InputSeachKey.value
+            NetProto.send.selectProductInfo(queryKey, 1)
+        end,
         ButtonCancel = function()
             hideTopPanel(self.csSelf)
         end,

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

@@ -461,6 +461,8 @@ GameObject:
   - component: {fileID: 155902628055415791}
   - component: {fileID: 6831394005452773185}
   - component: {fileID: 5229311105184497291}
+  - component: {fileID: 3469882672876569290}
+  - component: {fileID: 5628632555725026876}
   m_Layer: 5
   m_Name: LabelLoginNo
   m_TagString: Untagged
@@ -576,6 +578,72 @@ MonoBehaviour:
   valueIsNumber: 0
   isPhoneNum: 0
   inValidColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+--- !u!114 &3469882672876569290
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 57496988696797941}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  atlasName: 
+  atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
+  fontName: 
+  bitmapFont: {fileID: 0}
+  trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3}
+  fontSize: 46
+  fontStyle: 0
+  backgroundSprite: order_sort
+  highlightSprite: order_sort
+  position: 0
+  alignment: 1
+  items: []
+  valueItems: []
+  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:
+  - mTarget: {fileID: 6831394005452773185}
+    mMethodName: SetCurrentSelection
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+  mSelectedItem: 
+  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 &5628632555725026876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 57496988696797941}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!1 &300560038681990072
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -113,7 +113,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: lastFollowUpTime
+  jsonKey: createTime
   formatValue: 
   labeName: {fileID: 0}
   defaultName: 
@@ -454,7 +454,6 @@ GameObject:
   m_Component:
   - component: {fileID: 3463038481719258851}
   - component: {fileID: 3376297966861825577}
-  - component: {fileID: 257626866429932962}
   m_Layer: 5
   m_Name: LabelDate
   m_TagString: Untagged
@@ -545,30 +544,6 @@ MonoBehaviour:
   isAppendEndingString: 0
   AppendString: '...'
   fontName: EmptyFont
---- !u!114 &257626866429932962
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 874262287710027083}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  jsonKey: lastFollowUpTime
-  formatValue: 
-  labeName: {fileID: 0}
-  defaultName: 
-  canNull: 0
-  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 &960726833247064348
 GameObject:
   m_ObjectHideFlags: 0
@@ -767,139 +742,6 @@ MonoBehaviour:
   mShader: {fileID: 4800000, guid: e75727d9555d9d14ca51d91908c681bc, type: 3}
   mBorder: {x: 0, y: 0, z: 0, w: 0}
   mFixedAspect: 0
---- !u!1 &1176488640897575637
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1202781764663362730}
-  - component: {fileID: 6592977029420657972}
-  - component: {fileID: 7258243521143170126}
-  - component: {fileID: 6348333670869065997}
-  m_Layer: 5
-  m_Name: ButtonAddCust
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1202781764663362730
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1176488640897575637}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 486, y: -66, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 3955721642617299595}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &6592977029420657972
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1176488640897575637}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 150, y: 100, z: 0}
-  m_Center: {x: 0, y: -0.22070312, z: 0}
---- !u!114 &7258243521143170126
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1176488640897575637}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  tweenTarget: {fileID: 1176488640897575637}
-  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: 960726833247064349}
-    mMethodName: uiEventDelegate
-    mParameters:
-    - obj: {fileID: 0}
-      field: 
-      name: go
-    oneShot: 0
---- !u!114 &6348333670869065997
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1176488640897575637}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  leftAnchor:
-    target: {fileID: 4845106627748195530}
-    relative: 1
-    absolute: -100
-  rightAnchor:
-    target: {fileID: 4845106627748195530}
-    relative: 1
-    absolute: -50
-  bottomAnchor:
-    target: {fileID: 0}
-    relative: 0
-    absolute: 0
-  topAnchor:
-    target: {fileID: 0}
-    relative: 1
-    absolute: 0
-  updateAnchors: 1
-  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
-  mPivot: 4
-  mWidth: 50
-  mHeight: 50
-  mDepth: 10
-  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: cust_add
-  mFillCenter: 1
-  isGrayMode: 0
 --- !u!1 &1462227533783567335
 GameObject:
   m_ObjectHideFlags: 0
@@ -1586,7 +1428,6 @@ Transform:
   - {fileID: 3955721643049180485}
   - {fileID: 3955721642142727607}
   - {fileID: 1386553543158924622}
-  - {fileID: 1202781764663362730}
   m_Father: {fileID: 4845106627748195530}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1963,7 +1804,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isPause: 0
-  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellCustList.lua
+  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellFollowList.lua
   isNeedResetAtlase: 1
 --- !u!114 &198281615027052633
 MonoBehaviour:
@@ -2165,6 +2006,9 @@ GameObject:
   m_Component:
   - component: {fileID: 2218852819735783465}
   - component: {fileID: 1949412162795032995}
+  - component: {fileID: 3091544677786550540}
+  - component: {fileID: 3722385388059547129}
+  - component: {fileID: 4931304854411462083}
   m_Layer: 5
   m_Name: LabelServerNo
   m_TagString: Untagged
@@ -2255,6 +2099,96 @@ MonoBehaviour:
   isAppendEndingString: 0
   AppendString: '...'
   fontName: EmptyFont
+--- !u!114 &3091544677786550540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487704797287005821}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: loginNo
+  formatValue: 
+  labeName: {fileID: 0}
+  defaultName: 
+  canNull: 0
+  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!114 &3722385388059547129
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487704797287005821}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 57e428c9b6087304da439ec665b56a2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  atlasName: 
+  atlas: {fileID: 8379920634462272047, guid: 9aea3d2b5a77f4e84bd921688ff9ca99, type: 3}
+  fontName: 
+  bitmapFont: {fileID: 0}
+  trueTypeFont: {fileID: 12800000, guid: e49e0253465a54d1a83f684649c927ae, type: 3}
+  fontSize: 46
+  fontStyle: 0
+  backgroundSprite: order_sort
+  highlightSprite: order_sort
+  position: 0
+  alignment: 1
+  items: []
+  valueItems: []
+  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:
+  - mTarget: {fileID: 1949412162795032995}
+    mMethodName: SetCurrentSelection
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+  mSelectedItem: 
+  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 &4931304854411462083
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5487704797287005821}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 864ebfdb17c38481296fc3f903fd594c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onSelect: []
 --- !u!1 &5642077603588667844
 GameObject:
   m_ObjectHideFlags: 0
@@ -2695,9 +2629,9 @@ MonoBehaviour:
     relative: 1
     absolute: 0
   updateAnchors: 0
-  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 3
-  mWidth: 572
+  mWidth: 264
   mHeight: 42
   mDepth: 1
   autoResizeBoxCollider: 0
@@ -2707,7 +2641,7 @@ MonoBehaviour:
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u6700\u540E\u8DDF\u8FDB:220-05-12 12:12:12"
+  mText: "[999999]\u6765\u81EA\u5BA2\u6237\uFF1A[-][4c4c4c]{0}[-]"
   mFontSize: 42
   mFontStyle: 0
   mAlignment: 0
@@ -2747,7 +2681,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: custName
+  jsonKey: companyName
   formatValue: "[999999]\u6765\u81EA\u5BA2\u6237\uFF1A[-][4c4c4c]{0}[-]"
   labeName: {fileID: 0}
   defaultName: 
@@ -3065,7 +2999,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: _phoneNo
+  jsonKey: FollowUpContent
   formatValue: 
   labeName: {fileID: 0}
   defaultName: 

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

@@ -0,0 +1,482 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1110160996730555693
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7046416373065478791}
+  - component: {fileID: 5479929505863541246}
+  - component: {fileID: 5847089013654025588}
+  m_Layer: 5
+  m_Name: Empty
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7046416373065478791
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1110160996730555693}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -19.904232, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3568958085864287330}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5479929505863541246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1110160996730555693}
+  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 &5847089013654025588
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1110160996730555693}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbe6448146c445e5ae7040ea035c0fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  widget: {fileID: 5479929505863541246}
+  offset: 0
+  sizeAdjust: 1
+--- !u!1 &3568958084639273332
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3568958084639273333}
+  - component: {fileID: 3568958084639273331}
+  - component: {fileID: 3568958084639273330}
+  m_Layer: 5
+  m_Name: PanelContent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3568958084639273333
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958084639273332}
+  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: 3568958085864287330}
+  m_Father: {fileID: 3568958084693198938}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3568958084639273331
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958084639273332}
+  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: 3
+  mClipRange: {x: 0, y: 0, z: 1125, w: 1920}
+  mClipSoftness: {x: 4, y: 8}
+  mDepth: 2
+  mSortingOrder: 0
+  mClipOffset: {x: 0, y: 0}
+--- !u!114 &3568958084639273330
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958084639273332}
+  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}
+--- !u!1 &3568958084693198941
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3568958084693198938}
+  - component: {fileID: 3568958084693198936}
+  - component: {fileID: 4209767270070157778}
+  m_Layer: 5
+  m_Name: PanelProductDetail
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &3568958084693198938
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958084693198941}
+  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: 3568958084639273333}
+  - {fileID: 7314174825043317050}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3568958084693198936
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958084693198941}
+  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 &4209767270070157778
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958084693198941}
+  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/TRPProductDetail.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: "\u4EA7\u54C1\u8BE6\u60C5"
+--- !u!1 &3568958085864287333
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3568958085864287330}
+  - component: {fileID: 3568958085864287331}
+  - component: {fileID: 629545094351601269}
+  - component: {fileID: 2393882548473904717}
+  m_Layer: 5
+  m_Name: Table
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3568958085864287330
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958085864287333}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 613, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 7046416373065478791}
+  m_Father: {fileID: 3568958084639273333}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3568958085864287331
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958085864287333}
+  m_Enabled: 1
+  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: 0}
+--- !u!114 &629545094351601269
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958085864287333}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16bd2beefa5ca4a3ba0753143d28e2d9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  jsonKey: 
+--- !u!114 &2393882548473904717
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3568958085864287333}
+  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 &7273696020017155535
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7314174825043317050}
+  - component: {fileID: 2817208437067424587}
+  - component: {fileID: 7301133520900920971}
+  - component: {fileID: 1104809914868826075}
+  m_Layer: 5
+  m_Name: DragContent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7314174825043317050
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7273696020017155535}
+  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: 3568958084693198938}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &2817208437067424587
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7273696020017155535}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1127, y: 2172, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &7301133520900920971
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7273696020017155535}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f02842fa4878db54f9587ff4de7d9f2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scrollView: {fileID: 3568958084639273330}
+  draggablePanel: {fileID: 0}
+--- !u!114 &1104809914868826075
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7273696020017155535}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 3568958084693198938}
+    relative: 0
+    absolute: -1
+  rightAnchor:
+    target: {fileID: 3568958084693198938}
+    relative: 1
+    absolute: 1
+  bottomAnchor:
+    target: {fileID: 3568958084693198938}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 3568958084693198938}
+    relative: 1
+    absolute: -132
+  updateAnchors: 0
+  mColor: {r: 1, g: 1, b: 1, a: 1}
+  mPivot: 4
+  mWidth: 1127
+  mHeight: 2172
+  mDepth: -1
+  autoResizeBoxCollider: 1
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.55736893

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

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

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

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

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

@@ -456,7 +456,7 @@ MonoBehaviour:
   pivot: 1
   maxPerLine: 0
   cellWidth: 0
-  cellHeight: 220
+  cellHeight: 240
   animateSmoothly: 0
   hideInactive: 1
   keepWithinPanel: 0
@@ -1974,7 +1974,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6575156775745750833}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -592.75, z: 0}
+  m_LocalPosition: {x: 0, y: -960, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3318967223522064214}

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/sort.unity3d.meta

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

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze.unity3d.meta

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

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze_bg.unity3d.meta

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

Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellFollowList.lua.meta

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

Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductDetail.lua.meta

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

Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPProductList.lua.meta

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

Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductDetail.unity3d.meta

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

Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelProductList.unity3d.meta

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

Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver

@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,fc95ef03321bc60d7ddb47a8158553a18	%trCRM/resVer/Android/VerCtl/other.ver8,f015b5161f131b75152dbc02ba015a33
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,f8fe6a54b41b24c21a17c44adcf3c7368	%trCRM/resVer/Android/VerCtl/other.ver8,822497381e060296014eff513bee3aeb