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/comment.png
+++ b/litemall-wx/static/images/comment.png
--- a/litemall-wx/static/images/complete.png
+++ b/litemall-wx/static/images/complete.png
--- a/litemall-wx/static/images/coupon.png
+++ b/litemall-wx/static/images/coupon.png
--- a/litemall-wx/static/images/customer.png
+++ b/litemall-wx/static/images/customer.png
--- a/litemall-wx/static/images/detail_kefu.png
+++ b/litemall-wx/static/images/detail_kefu.png
--- a/litemall-wx/static/images/down.png
+++ b/litemall-wx/static/images/down.png
--- a/litemall-wx/static/images/feedback.png
+++ b/litemall-wx/static/images/feedback.png
--- a/litemall-wx/static/images/foot.png
+++ b/litemall-wx/static/images/foot.png
--- a/litemall-wx/static/images/footprint.png
+++ b/litemall-wx/static/images/footprint.png
--- a/litemall-wx/static/images/friend.png
+++ b/litemall-wx/static/images/friend.png
--- a/litemall-wx/static/images/goright.png
+++ b/litemall-wx/static/images/goright.png
--- a/litemall-wx/static/images/group.png
+++ b/litemall-wx/static/images/group.png
--- a/litemall-wx/static/images/home.png
+++ b/litemall-wx/static/images/home.png
--- a/litemall-wx/static/images/ic_menu_choice_nor.png
+++ b/litemall-wx/static/images/ic_menu_choice_nor.png
--- a/litemall-wx/static/images/ic_menu_choice_pressed.png
+++ b/litemall-wx/static/images/ic_menu_choice_pressed.png
--- a/litemall-wx/static/images/ic_menu_me_nor.png
+++ b/litemall-wx/static/images/ic_menu_me_nor.png
--- a/litemall-wx/static/images/ic_menu_me_pressed.png
+++ b/litemall-wx/static/images/ic_menu_me_pressed.png
--- a/litemall-wx/static/images/ic_menu_shoping_pressed.png
+++ b/litemall-wx/static/images/ic_menu_shoping_pressed.png
--- a/litemall-wx/static/images/ic_menu_sort_nor.png
+++ b/litemall-wx/static/images/ic_menu_sort_nor.png
--- a/litemall-wx/static/images/ic_menu_sort_pressed.png
+++ b/litemall-wx/static/images/ic_menu_sort_pressed.png