mm

Assets/trCRM/upgradeRes4Dev/other/uiAtlas/cust/icon-right2.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 7e76ae92125634dedba3d63e4f3b374a
+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

@@ -1991,6 +1991,20 @@ MonoBehaviour:
     paddingTop: 0
     paddingBottom: 0
     path: trCRM/upgradeRes4Dev/other/uiAtlas/work/yuyue.png
+  - name: cust_icon-right2
+    x: 0
+    y: 0
+    width: 20
+    height: 35
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/cust/icon-right2.png
   mPixelSize: 1
   mReplacement: {fileID: 0}
   mCoordinates: 0

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

@@ -78,10 +78,15 @@ DBMessage.clean = function()
     db.lastGetTime = {}
 end
 
-DBMessage.onGetMessage = function(type, list)
+DBMessage.onGetMessage = function(type, list, meta)
     if not list then
         return
     end
+    if meta and meta.current_page == 1 then
+        db.list = {}
+        db.list[type] = {}
+        db.lastGetTime = {}
+    end
     db.list = db.list or {}
     db.list[type] = db.list[type] or {}
     db.lastGetTime = db.lastGetTime or {}

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

@@ -25,7 +25,7 @@ end
 
 DBRoot.funcs = {
     [NetProto.cmds.announcement_query] = function(data) -- 公告
-        DBMessage.onGetMessage(DBMessage.MsgType.Sys, data.result.data)
+        DBMessage.onGetMessage(DBMessage.MsgType.Sys, data.result.data, data.result.meta)
     end,
     [NetProto.cmds.booking_query] = function(data) -- 待跟进客户
         DBMessage.onGetMessage(DBMessage.MsgType.Task4Cust, data.result.data)

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

@@ -291,7 +291,7 @@ NetProto.cmds = {
     workFlowQuery = "workFlowQuery", -- 工单列表
     backToGH = "backToGH", -- 返回公海
     delCustomerInfo = "delCustomerInfo", -- 删除客户
-    loadProductType = "loadProductType", -- 产品类型
+    loadProductType = "loadProductType", -- 商品类型
     pageGHQueryList = "pageGHQueryList", -- 公海列表
     getFromGH = "getFromGH", -- 获取客户
     list_followUp_tasks = "list_followUp_tasks", --预约记录

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

@@ -32,7 +32,12 @@ function _cell.show(go, data)
     uiobjs.boxCollider.size = Vector3(mData.width, 150, 0)
     uiobjs.Background.spriteName = mData.Background
     uiobjs.Checkmark.spriteName = mData.Checkmark
-    _cell.setReddotNum(0)
+    if mData.id == 1 then
+        local unreadNum = DBMessage.getUnreadNum(DBMessage.MsgType.Sys)
+        _cell.setReddotNum(unreadNum)
+    else
+        _cell.setReddotNum(0)
+    end
 end
 
 function _cell.setReddotNum(num)

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

@@ -106,13 +106,11 @@ end
 
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function CSPMsg.procNetwork(cmd, succ, msg, paras)
-    --[[
-        if(succ == 1) then
-          if(cmd == "xxx") then
-            -- TODO:
-          end
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.readNotice then
+            CSPMsg.setList()
         end
-        --]]
+    end
 end
 
 -- 处理ui上的事件，例如点击等

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

@@ -46,17 +46,7 @@ function TRPFollowList:initFilters()
     d = {}
     d.title = "跟进类型"
     d.key = DBCust.FilterGroup.followUpTypeList
-    d.key2 = "followTypeUp"
-    d.list = DBCust.getFilter(DBCust.FilterGroup.followUpTypeList)
-    if d.list and #(d.list) > 0 then
-        -- table.insert(d.list, 1, {name = "全部", value = -1})
-        table.insert(self.filters, d)
-    end
-
-    d = {}
-    d.title = "跟进类型"
-    d.key = DBCust.FilterGroup.followUpTypeList
-    d.key2 = "followTypeUp"
+    d.key2 = "followUpType"
     d.list = DBCust.getFilter(DBCust.FilterGroup.followUpTypeList)
     if d.list and #(d.list) > 0 then
         -- table.insert(d.list, 1, {name = "全部", value = -1})

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

@@ -155,10 +155,14 @@ function TRPNewFollow:showBaseFields()
         -- 工单模板
         filedInfor = {}
         filedInfor.attr = v
-        if self.isNewFollow then
-            filedInfor.showMode = _FieldMode.inputOnly
-        else
+        if v.id == "custName" then
             filedInfor.showMode = _FieldMode.showOnly
+        else
+            if self.isNewFollow then
+                filedInfor.showMode = _FieldMode.inputOnly
+            else
+                filedInfor.showMode = _FieldMode.showOnly
+            end
         end
         if filedInfor.attr.attrType == DBCust.FieldType.multext then
             filedInfor.onMultTextInputChg = self:wrapFunc(self.reposition)

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

@@ -563,7 +563,7 @@ function TRPNewOrder:setEventDelegate()
             order.ifProduct = templateInfor.ifProduct
             if uiobjs.gridProjects.gameObject.activeInHierarchy then
                 if self.selectedProducts == nil or #(self.selectedProducts) <= 0 then
-                    MyUtl.toastW("请添加产品")
+                    MyUtl.toastW("请添加商品")
                     return
                 end
                 order.prodJson = self.selectedProducts

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

@@ -157,9 +157,11 @@ function TRPOceanList:initCell(cell, data)
 end
 
 function TRPOceanList:onClickCell(cell, data)
+    showHotWheel()
     NetProto.send.get_customerById(
         data.id,
         function(content)
+            hideHotWheel()
             if content.success then
                 local cust = content.result
                 if cust then

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

@@ -27,7 +27,7 @@ function TRPProductDetail:initFiledsAttr()
     local attr
     self.baseFiledsAttr = {}
     attr = {}
-    attr.attrName = "产品名称"
+    attr.attrName = "商品名称"
     attr.id = "name"
     attr.attrType = DBCust.FieldType.text
     attr.ifMust = 0
@@ -35,7 +35,7 @@ function TRPProductDetail:initFiledsAttr()
     table.insert(self.baseFiledsAttr, attr)
 
     attr = {}
-    attr.attrName = "产品单价"
+    attr.attrName = "商品单价"
     attr.id = "price"
     attr.attrType = DBCust.FieldType.text
     attr.ifMust = 0
@@ -43,7 +43,7 @@ function TRPProductDetail:initFiledsAttr()
     table.insert(self.baseFiledsAttr, attr)
 
     attr = {}
-    attr.attrName = "产品库存"
+    attr.attrName = "商品库存"
     attr.id = "num"
     attr.attrType = DBCust.FieldType.text
     attr.ifMust = 0
@@ -51,7 +51,7 @@ function TRPProductDetail:initFiledsAttr()
     table.insert(self.baseFiledsAttr, attr)
 
     attr = {}
-    attr.attrName = "产品类型"
+    attr.attrName = "商品类型"
     attr.id = "prodTypeName"
     attr.attrType = DBCust.FieldType.text
     attr.ifMust = 0
@@ -59,7 +59,7 @@ function TRPProductDetail:initFiledsAttr()
     table.insert(self.baseFiledsAttr, attr)
 
     attr = {}
-    attr.attrName = "产品描述"
+    attr.attrName = "商品描述"
     attr.id = "productDesc"
     attr.attrType = DBCust.FieldType.multext
     attr.ifMust = 0

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

@@ -61,7 +61,11 @@ function TRPSelectProduct:appList(list)
 end
 
 function TRPSelectProduct:initCell(cell, data)
-    cell:init(data, nil)
+    cell:init(data, self:wrapFunc(self.onClickCell))
+end
+
+function TRPSelectProduct:onClickCell(cell, data)
+    getPanelAsy("PanelProductDetail", onLoadedPanelTT, data.data)
 end
 
 function TRPSelectProduct:onEndList(tail)

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

@@ -386,11 +386,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 6380095735962770375}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 6380095735962770375}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -402,13 +402,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -421,7 +421,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &5740860109752881501

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

@@ -584,11 +584,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 5685129533249898953}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 5685129533249898953}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -600,13 +600,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -619,7 +619,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &8982677340866729075

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

@@ -636,11 +636,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 8702209548977510478}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 8702209548977510478}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -652,13 +652,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -671,7 +671,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &8534362044663175109

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

@@ -230,11 +230,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 2423944239439220864}
     relative: 1
-    absolute: -49
+    absolute: -45
   rightAnchor:
     target: {fileID: 2423944239439220864}
     relative: 1
-    absolute: -21
+    absolute: -25
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -246,13 +246,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -265,7 +265,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &4625788788876681624

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

@@ -669,11 +669,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 7956408309511629590}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 7956408309511629590}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -685,13 +685,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -704,6 +704,6 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0

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

@@ -795,11 +795,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 2063762107333207662}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 2063762107333207662}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -811,13 +811,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -830,7 +830,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &2088325436638624531

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

@@ -5347,7 +5347,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3335925071625191991}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 110, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7066844989434100784}

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

@@ -1673,7 +1673,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4266364974858932546}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 448, y: -78, z: 0}
+  m_LocalPosition: {x: 452, y: -78, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 3874950999241017755}
@@ -1694,7 +1694,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 3874950999241017755}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 3874950999241017755}
     relative: 1
@@ -1710,13 +1710,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 9
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.055555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -1729,7 +1729,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &4458887936443482893
@@ -2172,7 +2172,7 @@ MonoBehaviour:
   mLabelList: []
   mBgBorder: 0
   eventReceiver: {fileID: 0}
-  functionName: OnSelectionChange
+  functionName: 
   textScale: 0
   font: {fileID: 0}
   textLabel: {fileID: 0}
@@ -2444,7 +2444,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3008
+  startingRenderQueue: 3007
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3

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

@@ -200,7 +200,7 @@ MonoBehaviour:
   isNeedResetAtlase: 1
   isNeedMask4Init: 0
   isNeedMask4InitOnlyOnce: 1
-  isHideWithEffect: 1
+  isHideWithEffect: 0
   isRefeshContentWhenEffectFinish: 0
   EffectRoot: {fileID: 0}
   effectType: 0

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

@@ -711,7 +711,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 282266727664534412}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4684322523491284131}
@@ -732,7 +732,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 4684322523491284131}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 4684322523491284131}
     relative: 1
@@ -748,13 +748,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 1.8055556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -767,7 +767,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &299028792668413576
@@ -795,7 +795,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 299028792668413576}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8870281937905939455}
@@ -816,7 +816,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 8870281937905939455}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 8870281937905939455}
     relative: 1
@@ -832,13 +832,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 1.8055556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -851,7 +851,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &687710847390494655
@@ -1569,7 +1569,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2289809327738988593}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2472245831635882817}
@@ -1590,7 +1590,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 2472245831635882817}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 2472245831635882817}
     relative: 1
@@ -1606,13 +1606,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.055555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -1625,7 +1625,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &2515380845072610070
@@ -2290,7 +2290,7 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
   mPivot: 3
-  mWidth: 607
+  mWidth: 874
   mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
@@ -3104,7 +3104,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5409744234891560217}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4223530067768363855}
@@ -3125,7 +3125,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 4223530067768363855}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 4223530067768363855}
     relative: 1
@@ -3141,13 +3141,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.055555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -3160,7 +3160,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &5989378012256316181
@@ -3863,7 +3863,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7387586105971708824}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 8231042360533177612}
@@ -3884,7 +3884,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 8231042360533177612}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 8231042360533177612}
     relative: 1
@@ -3900,13 +3900,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.055555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -3919,7 +3919,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &7391015374733288727
@@ -3947,7 +3947,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7391015374733288727}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 9058263097930270872}
@@ -3968,7 +3968,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 9058263097930270872}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 9058263097930270872}
     relative: 1
@@ -3984,13 +3984,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 1.8055556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -4003,7 +4003,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &7611281673796965638
@@ -4160,7 +4160,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3006
+  startingRenderQueue: 3005
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -4659,7 +4659,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8494861609812830420}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 500, y: -340, z: 0}
+  m_LocalPosition: {x: 504, y: -340, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 261127664379096680}
@@ -4680,7 +4680,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 745552340}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 745552340}
     relative: 1
@@ -4696,13 +4696,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 6
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.055555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -4715,7 +4715,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &8585489449437462966
@@ -4743,7 +4743,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8585489449437462966}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 5491138480075079044}
@@ -4764,7 +4764,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 5491138480075079044}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 5491138480075079044}
     relative: 1
@@ -4780,13 +4780,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 1.8055556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -4799,7 +4799,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &8935792281559821714

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

@@ -344,11 +344,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 7275054153035427806}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 7275054153035427806}
     relative: 1
-    absolute: -21
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -360,13 +360,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 27
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 6
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -379,7 +379,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &1798168293896682392

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

@@ -1597,11 +1597,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 8621140261478235053}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 8621140261478235053}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -1613,13 +1613,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -1632,7 +1632,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &1321666168539132857
@@ -3957,11 +3957,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 6704876848758547630}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 6704876848758547630}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -3973,13 +3973,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -3992,7 +3992,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &3870624836954653492
@@ -7557,11 +7557,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 3531660715606027067}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 3531660715606027067}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -7573,13 +7573,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -7592,7 +7592,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &7604203578005475590
@@ -8423,11 +8423,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 5668497133297932595}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 5668497133297932595}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -8439,13 +8439,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -8458,7 +8458,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &8567129550716763821
@@ -9339,11 +9339,11 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 691154718777512327}
     relative: 1
-    absolute: -48
+    absolute: -44
   rightAnchor:
     target: {fileID: 691154718777512327}
     relative: 1
-    absolute: -20
+    absolute: -24
   bottomAnchor:
     target: {fileID: 0}
     relative: 0
@@ -9355,13 +9355,13 @@ MonoBehaviour:
   updateAnchors: 1
   mColor: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 2
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.5555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -9374,7 +9374,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &8961745196453642119

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

@@ -284,7 +284,7 @@ MonoBehaviour:
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u4EA7\u54C1\u5217\u8868"
+  mText: "\u5546\u54C1\u5217\u8868"
   mFontSize: 46
   mFontStyle: 0
   mAlignment: 0

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

@@ -299,7 +299,7 @@ MonoBehaviour:
   EffectList: []
   frameName: Frame1
   frameObj: {fileID: 0}
-  titleKeyName: "\u4EA7\u54C1\u8BE6\u60C5"
+  titleKeyName: "\u5546\u54C1\u8BE6\u60C5"
 --- !u!1 &3568958085864287333
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -1058,7 +1058,7 @@ MonoBehaviour:
   EffectList: []
   frameName: Frame1
   frameObj: {fileID: 0}
-  titleKeyName: "\u4EA7\u54C1\u5217\u8868"
+  titleKeyName: "\u5546\u54C1\u5217\u8868"
 --- !u!1 &3432446409778139678
 GameObject:
   m_ObjectHideFlags: 0
@@ -1168,7 +1168,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5229774026949365508}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 498, y: -37, z: 0}
+  m_LocalPosition: {x: 502, y: -37, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7400949262391066687}
@@ -1189,7 +1189,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 7400949262391066687}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 7400949262391066687}
     relative: 1
@@ -1205,13 +1205,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 9
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.05
+  aspectRatio: 0.055555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -1224,7 +1224,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &6430060577259612141

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

@@ -281,6 +281,7 @@ GameObject:
   - component: {fileID: 5129961851071160420}
   - component: {fileID: 2953575355203642134}
   - component: {fileID: 5748525195033831039}
+  - component: {fileID: 574870604841014744}
   m_Layer: 5
   m_Name: 00000
   m_TagString: Untagged
@@ -358,7 +359,7 @@ MonoBehaviour:
   mWidth: 1125
   mHeight: 240
   mDepth: 0
-  autoResizeBoxCollider: 0
+  autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
   aspectRatio: 4.6875
@@ -405,6 +406,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   jsonKey: 
+--- !u!65 &574870604841014744
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1339031885216242466}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1125, y: 240, z: 0}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &1476048743331547168
 GameObject:
   m_ObjectHideFlags: 0
@@ -1166,7 +1180,7 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 120, y: 120, z: 0}
+  m_Size: {x: 120, y: 240, z: 0}
   m_Center: {x: 0, y: -0.095760345, z: 0}
 --- !u!114 &5145410309966916066
 MonoBehaviour:
@@ -2420,7 +2434,7 @@ MonoBehaviour:
   EffectList: []
   frameName: Frame1
   frameObj: {fileID: 0}
-  titleKeyName: "\u9009\u62E9\u4EA7\u54C1"
+  titleKeyName: "\u9009\u62E9\u5546\u54C1"
 --- !u!1 &7208969650247642833
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -814,7 +814,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1987654442456433815}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1309268115925574498}
@@ -835,7 +835,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 1309268115925574498}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 1309268115925574498}
     relative: 1
@@ -851,13 +851,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 1.8055556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -870,7 +870,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &2085915762645019667
@@ -2078,7 +2078,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3859172374880658481}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 578342960997457729}
@@ -2099,7 +2099,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 578342960997457729}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 578342960997457729}
     relative: 1
@@ -2115,13 +2115,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 1.8055556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -2134,7 +2134,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &3861668615236389720
@@ -3129,7 +3129,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5538205938762950935}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 6340201778145445016}
@@ -3150,7 +3150,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 6340201778145445016}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 6340201778145445016}
     relative: 1
@@ -3166,13 +3166,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.055555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -3185,7 +3185,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &6533080316026118374
@@ -3313,7 +3313,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7015135009873643801}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 498, y: 0, z: 0}
+  m_LocalPosition: {x: 502, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1213015998593156943}
@@ -3334,7 +3334,7 @@ MonoBehaviour:
   leftAnchor:
     target: {fileID: 1213015998593156943}
     relative: 1
-    absolute: -78
+    absolute: -70
   rightAnchor:
     target: {fileID: 1213015998593156943}
     relative: 1
@@ -3350,13 +3350,13 @@ MonoBehaviour:
   updateAnchors: 0
   mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 4
-  mWidth: 28
-  mHeight: 40
+  mWidth: 20
+  mHeight: 36
   mDepth: 5
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.7
+  aspectRatio: 0.055555556
   mType: 0
   mFillDirection: 4
   mFillAmount: 1
@@ -3369,7 +3369,7 @@ MonoBehaviour:
   topType: 1
   atlasName: atlasAllReal
   mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
-  mSpriteName: cust_right
+  mSpriteName: cust_icon-right2
   mFillCenter: 1
   isGrayMode: 0
 --- !u!1 &7131839572080522511

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

@@ -236,12 +236,12 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 12.275862
+  aspectRatio: 11.827586
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
   mText: "\u8FD9\u662F\u516C\u544A\u7684\u6807\u9898\u7B49\u4E3B\u8981\u4FE1\u606F\u4FE1\u606F"
-  mFontSize: 56
+  mFontSize: 48
   mFontStyle: 0
   mAlignment: 0
   mEncoding: 1
@@ -268,6 +268,90 @@ MonoBehaviour:
   isAppendEndingString: 1
   AppendString: '...'
   fontName: EmptyFont
+--- !u!1 &634670535587632620
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1887805165466173844}
+  - component: {fileID: 4186616284110032654}
+  m_Layer: 5
+  m_Name: Sprite
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1887805165466173844
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 634670535587632620}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 336, y: -433, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2915380300450238212}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4186616284110032654
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 634670535587632620}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 7254502543690814442}
+    relative: 1
+    absolute: -54
+  rightAnchor:
+    target: {fileID: 7254502543690814442}
+    relative: 1
+    absolute: -34
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 0
+  mColor: {r: 0.8666667, g: 0.8666667, b: 0.8666667, a: 1}
+  mPivot: 4
+  mWidth: 20
+  mHeight: 36
+  mDepth: 6
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 0.5555556
+  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_icon-right2
+  mFillCenter: 1
+  isGrayMode: 0
 --- !u!1 &763079475718288175
 GameObject:
   m_ObjectHideFlags: 0
@@ -309,6 +393,7 @@ Transform:
   - {fileID: 1275924786017086346}
   - {fileID: 3976076584632784440}
   - {fileID: 1256567409904505604}
+  - {fileID: 1887805165466173844}
   m_Father: {fileID: 4829788144524211910}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -536,7 +621,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 1.6875
+  aspectRatio: 1.6897322
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -622,7 +707,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.5181776
+  aspectRatio: 1
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -733,7 +818,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 7.824176
+  aspectRatio: 7.4673915
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -835,7 +920,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3003
+  startingRenderQueue: 3001
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3
@@ -942,7 +1027,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.018416205
+  aspectRatio: 20
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1031,15 +1116,15 @@ MonoBehaviour:
     relative: 0
     absolute: -42
   updateAnchors: 0
-  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mColor: {r: 0.8, g: 0.8, b: 0.8, a: 1}
   mPivot: 3
   mWidth: 676
   mHeight: 2
-  mDepth: 5
+  mDepth: 6
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 355.5
+  aspectRatio: 338.5
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1299,7 +1384,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 1
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 0.009208103
+  aspectRatio: 10
   mType: 1
   mFillDirection: 4
   mFillAmount: 1
@@ -1396,7 +1481,7 @@ MonoBehaviour:
   autoResizeBoxCollider: 0
   hideIfOffScreen: 0
   keepAspectRatio: 0
-  aspectRatio: 13.5
+  aspectRatio: 14.625
   keepCrispWhenShrunk: 1
   mTrueTypeFont: {fileID: 0}
   mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}