Merge remote-tracking branch 'origin/master'

8f75afed · Menethil · 854bacf6 · ce225563 · 8f75afed · 8f75afed
Commit 8f75afed authored Aug 28, 2018 by Menethil
--- a/litemall-wx/static/images/icon_collect.png
+++ b/litemall-wx/static/images/icon_collect.png
--- a/litemall-wx/static/images/icon_collect_checked.png
+++ b/litemall-wx/static/images/icon_collect_checked.png
--- a/litemall-wx/static/images/mobile.png
+++ b/litemall-wx/static/images/mobile.png
--- a/litemall-wx/static/images/my.png
+++ b/litemall-wx/static/images/my.png
--- a/litemall-wx/static/images/my@selected.png
+++ b/litemall-wx/static/images/my@selected.png
--- a/litemall-wx/static/images/pendpay.png
+++ b/litemall-wx/static/images/pendpay.png
--- a/litemall-wx/static/images/receive.png
+++ b/litemall-wx/static/images/receive.png
--- a/litemall-wx/static/images/send.png
+++ b/litemall-wx/static/images/send.png
--- a/litemall-wx/static/images/share.png
+++ b/litemall-wx/static/images/share.png
--- a/litemall-wx/static/images/wechat.png
+++ b/litemall-wx/static/images/wechat.png