Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
3f77b161
Commit
3f77b161
authored
Sep 29, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
09c4b4a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
Index.php
application/controllers/Index.php
+1
-0
MessageService.php
application/models/Business/Message/MessageService.php
+1
-1
No files found.
application/controllers/Index.php
View file @
3f77b161
...
@@ -52,6 +52,7 @@ class IndexController extends \Our\Controller_Abstract {
...
@@ -52,6 +52,7 @@ class IndexController extends \Our\Controller_Abstract {
}
}
public
function
indexAction
()
{
public
function
indexAction
()
{
phpinfo
();
exit
;
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
();
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
();
$res
=
$orderDao
->
getList
(
array
(
'buyer_id'
=>
1
),
'*'
,
0
,
10
);
$res
=
$orderDao
->
getList
(
array
(
'buyer_id'
=>
1
),
'*'
,
0
,
10
);
...
...
application/models/Business/Message/MessageService.php
View file @
3f77b161
...
@@ -194,7 +194,7 @@ class MessageServiceModel extends \Business\AbstractModel
...
@@ -194,7 +194,7 @@ class MessageServiceModel extends \Business\AbstractModel
foreach
(
$messageOneList
[
'list'
]
as
&
$val
)
{
foreach
(
$messageOneList
[
'list'
]
as
&
$val
)
{
$self
=
$this
->
getUserByMemberIdAndSelfType
(
$val
[
'fromId'
],
$val
[
'fromType'
]);
$self
=
$this
->
getUserByMemberIdAndSelfType
(
$val
[
'fromId'
],
$val
[
'fromType'
]);
$toMember
=
$this
->
getUserByMemberIdAndSelfType
(
$val
[
'toId'
],
$val
[
'toType'
]);
$toMember
=
$this
->
getUserByMemberIdAndSelfType
(
$val
[
'toId'
],
$val
[
'toType'
]);
$val
[
'toAvatar'
]
=
$toMember
[
'avatar'
]
;
$val
[
'toAvatar'
]
=
!
empty
(
$toMember
[
'avatar'
])
?
$toMember
[
'avatar'
]
:
''
;
$val
[
'message'
]
=
$messageHistoryDao
->
convertMessage
(
$val
[
'message'
]);
$val
[
'message'
]
=
$messageHistoryDao
->
convertMessage
(
$val
[
'message'
]);
$val
[
'fromAvatar'
]
=
$self
[
'avatar'
];
$val
[
'fromAvatar'
]
=
$self
[
'avatar'
];
// $val['toAvatar']=$this->getAvatar($val['toType'],$val['toId']);
// $val['toAvatar']=$this->getAvatar($val['toType'],$val['toId']);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment