chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

up

Browse Source
This commit is contained in:
陈彬
2020-07-09 09:23:09 +08:00
parent c523462b82
commit c0095c1af9
48 changed files with 553 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab
View File

@@ -1347,6 +1347,62 @@ MonoBehaviour:
paddingTop: 0
paddingBottom: 0
path: trCRM/upgradeRes4Dev/other/uiAtlas/hotwheel/loading.png
- name: public_tips_2
x: 0
y: 0
width: 80
height: 80
borderLeft: 0
borderRight: 0
borderTop: 0
borderBottom: 0
paddingLeft: 0
paddingRight: 0
paddingTop: 0
paddingBottom: 0
path: trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_2.png
- name: public_tips_1
x: 0
y: 0
width: 80
height: 80
borderLeft: 0
borderRight: 0
borderTop: 0
borderBottom: 0
paddingLeft: 0
paddingRight: 0
paddingTop: 0
paddingBottom: 0
path: trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_1.png
- name: public_tips_3
x: 0
y: 0
width: 80
height: 80
borderLeft: 0
borderRight: 0
borderTop: 0
borderBottom: 0
paddingLeft: 0
paddingRight: 0
paddingTop: 0
paddingBottom: 0
path: trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_3.png
- name: public_tips_4
x: 0
y: 0
width: 80
height: 80
borderLeft: 0
borderRight: 0
borderTop: 0
borderBottom: 0
paddingLeft: 0
paddingRight: 0
paddingTop: 0
paddingBottom: 0
path: trCRM/upgradeRes4Dev/other/uiAtlas/public/tips_4.png
mPixelSize: 1
mReplacement: {fileID: 0}
mCoordinates: 0

6
Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
View File

@@ -109,7 +109,7 @@ end
NetProto.sendGet = function(cmd, map, callback, failedCallback, orgs, _baseUrl)
if isNilOrEmpty(NetProto.sign) and (cmd ~= NetProto.cmds.getTokenForAPI) then
CLAlert.add("与服务器失去联络，请重试！", Color.white, 1)
MyUtl.toastE("与服务器失去联络，请重试！")
NetProto.init()
return
end
@@ -152,12 +152,12 @@ function NetProto.init(callback)
onGetToken(data.result)
Utl.doCallback(callback, true)
else
CLAlert.add(data.msg, Color.white, 1)
MyUtl.toastW(data.msg)
Utl.doCallback(callback, false)
end
end,
function()
CLAlert.add("取得会话ID失败！", Color.white, 1)
MyUtl.toastE("取得会话ID失败！")
Utl.doCallback(callback, false)
end
)

2
Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
View File

@@ -80,7 +80,7 @@ MyUtl.doCall = function(custId, phoneNo)
function(content)
hideHotWheel()
if content.success then
CLAlert.add("拨号成功！", Color.white, 5)
MyUtl.toastS("拨号成功！")
end
end
)

10
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CLCellToast.lua
View File

@@ -24,20 +24,20 @@ function _cell.show(go, data)
local spriteName = ""
local colorIcon
if mData.type == CLToastRoot.Type.success then
spriteName = "cust_suc"
spriteName = "public_tips_2"
colorIcon = Color.green
elseif mData.type == CLToastRoot.Type.warning then
spriteName = "cust_suc"
spriteName = "public_tips_3"
colorIcon = Color.yellow
elseif mData.type == CLToastRoot.Type.error then
spriteName = "cust_suc"
spriteName = "public_tips_4"
colorIcon = Color.red
else
spriteName = "cust_suc"
spriteName = "public_tips_1"
colorIcon = Color.white
end
uiobjs.SpriteIcon.color = colorIcon
uiobjs.SpriteIcon.spriteName = spriteName
CLUIUtl.setSpriteFit(uiobjs.SpriteIcon, spriteName)
uiobjs.tweenAlpha.delay = mData.staySec or 1
uiobjs.tweenAlpha:ResetToBeginning()
uiobjs.tweenAlpha:Play(true)

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMine.lua
View File

@@ -105,7 +105,7 @@ function CSPMine.onGetLocation(locInfor)
)
getPanelAsy("PanelWebView", onLoadedPanelTT, {url = url})
else
CLAlert.add(location.msg, Color.white, 1)
MyUtl.toastW(location.msg)
if code == 8 or code == 9 or code == 5 then
-- 打开gps
MyLocation.self:guidSwitchGps()

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua
View File

@@ -113,7 +113,7 @@ function TRPLogin:setEventDelegate()
end
end,
function()
CLAlert.add("登录失败，请确保网络通畅！", Color.white, 1)
MyUtl.toastW("登录失败，请确保网络通畅！")
end
)
end,

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPModifyFiled.lua
View File

@@ -59,7 +59,7 @@ function TRPModifyFiled:setEventDelegate()
ButtonOkay = function()
local err = uiobjs.element:checkValid()
if not isNilOrEmpty(err) then
CLAlert.add(err, Color.white, 1)
MyUtl.toastW(err)
return
end
Utl.doCallback(self.mdata.callback, self.mdata.key, uiobjs.Input.value)

4
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewCust.lua
View File

@@ -312,7 +312,7 @@ function TRPNewCust:onPopupFieldValChg4Extend(go)
-- 有修改，发送数据
self:sendModifymsg(el.jsonKey, el.value, true)
else
MyUtl.toastE(err)
MyUtl.toastW(err)
end
end
end
@@ -352,7 +352,7 @@ function TRPNewCust:setEventDelegate()
local err = uiobjs.DetailRoot:checkValid()
err = joinStr(err, uiobjs.ExtendFormRoot:checkValid())
if not isNilOrEmpty(err) then
MyUtl.toastE(err)
MyUtl.toastW(err)
return
end

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPResetPasswordStep3.lua
View File

@@ -62,7 +62,7 @@ end
function TRPResetPasswordStep3:procNetwork(cmd, succ, msg, paras)
if (succ == NetSuccess) then
if cmd == NetProto.cmds.updateLoginNoPwd then
CLAlert.add("密码修改成功", Color.green, 0)
MyUtl.toastS("密码修改成功")
hideTopPanel()
hideTopPanel()
hideTopPanel()

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectCompany.lua
View File

@@ -92,7 +92,7 @@ function TRPSelectCompany:setEventDelegate()
self.EventDelegate = {
ButtonRight = function()
if selectedCompany == nil then
CLAlert.add("请选择要进入的公司", Color.white, 0)
MyUtl.toastW("请选择要进入的公司")
return
end
-- 缓存一下，下次进来后就不用再先公司了

210
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSplash.prefab
View File

@@ -430,7 +430,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1360523796241388}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.57044226, y: 22.4, z: 0}
m_LocalPosition: {x: -0.57044226, y: 112.399994, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4506292931704418}
@@ -537,7 +537,6 @@ Transform:
- {fileID: 4506292931704418}
- {fileID: 4098723856805998}
- {fileID: 4525616215859032}
- {fileID: 223460704660280301}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -638,7 +637,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617362407899682}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 57.9, z: 0}
m_LocalPosition: {x: 0, y: 147.9, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4080061421678368}
@@ -802,7 +801,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1681857750492670}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1, y: 13, z: 0}
m_LocalPosition: {x: -1, y: 103, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4506292931704418}
@@ -1117,207 +1116,6 @@ MonoBehaviour:
callWhenFinished:
from: 0.3
to: 1
--- !u!1 &791695792701113897
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4506719672661420977}
- component: {fileID: 5221257317028059316}
m_Layer: 5
m_Name: Label2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4506719672661420977
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 791695792701113897}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -81.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 223460704660280301}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5221257317028059316
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 791695792701113897}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, 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: 0.4339623, g: 0.4339623, b: 0.4339623, a: 1}
mPivot: 4
mWidth: 370
mHeight: 40
mDepth: 1
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 9.25
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: TIANTIANFU
mFontSize: 40
mFontStyle: 0
mAlignment: 0
mEncoding: 1
mMaxLineCount: 0
mEffectStyle: 0
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 1, y: 1}
mOverflow: 2
mMaterial: {fileID: 0}
mApplyGradient: 0
mGradientTop: {r: 1, g: 1, b: 1, a: 1}
mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
mSpacingX: 14
mSpacingY: 0
mUseFloatSpacing: 0
mFloatSpacingX: 0
mFloatSpacingY: 0
mShrinkToFit: 0
mMaxLineWidth: 0
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!1 &5670893069891110169
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 223460704660280301}
- component: {fileID: 7247584930376180958}
m_Layer: 5
m_Name: Label
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &223460704660280301
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5670893069891110169}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 250.87497, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4506719672661420977}
m_Father: {fileID: 4228491702010106}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7247584930376180958
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5670893069891110169}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, 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: 0, g: 0, b: 0, a: 1}
mPivot: 4
mWidth: 374
mHeight: 90
mDepth: 1
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.1555557
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u6DFB\u6DFB\u547C"
mFontSize: 90
mFontStyle: 1
mAlignment: 0
mEncoding: 1
mMaxLineCount: 0
mEffectStyle: 0
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 1, y: 1}
mOverflow: 2
mMaterial: {fileID: 0}
mApplyGradient: 0
mGradientTop: {r: 1, g: 1, b: 1, a: 1}
mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
mSpacingX: 52
mSpacingY: 0
mUseFloatSpacing: 0
mFloatSpacingX: 0
mFloatSpacingY: 0
mShrinkToFit: 0
mMaxLineWidth: 0
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
isAppendEndingString: 0
AppendString: '...'
fontName: EmptyFont
--- !u!1 &6328643013924818452
GameObject:
m_ObjectHideFlags: 0
@@ -1443,7 +1241,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7381716524038025871}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 95.5, z: 0}
m_LocalPosition: {x: 0, y: 185.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8342146830181434174}