Merge branch 'develop' of http://gitlab.icaremgt.com/tanxinyu/h5_activity into develop

655dcdfe · 胡畅 · bfebc0c9 · 12bd1e11 · bfebc0c9 · bfebc0c9
Commit 655dcdfe authored Jul 09, 2019 by 胡畅
27 changed files
--- a/showPhotos/images/arrow.png
+++ b/showPhotos/images/arrow.png
--- a/showPhotos/images/confirm_btn.png
+++ b/showPhotos/images/confirm_btn.png
--- a/showPhotos/images/error.png
+++ b/showPhotos/images/error.png
--- a/showPhotos/images/failed.png
+++ b/showPhotos/images/failed.png
--- a/showPhotos/images/getvote.png
+++ b/showPhotos/images/getvote.png
--- a/showPhotos/images/goonvote.png
+++ b/showPhotos/images/goonvote.png
--- a/showPhotos/images/index_act.png
+++ b/showPhotos/images/index_act.png
--- a/showPhotos/images/index_banner.png
+++ b/showPhotos/images/index_banner.png
--- a/showPhotos/images/index_banner2.png
+++ b/showPhotos/images/index_banner2.png
--- a/showPhotos/images/index_btn.png
+++ b/showPhotos/images/index_btn.png
--- a/showPhotos/images/index_logo.png
+++ b/showPhotos/images/index_logo.png
--- a/showPhotos/images/index_rank.png
+++ b/showPhotos/images/index_rank.png
--- a/showPhotos/images/index_vote.png
+++ b/showPhotos/images/index_vote.png
--- a/showPhotos/images/next_btn.png
+++ b/showPhotos/images/next_btn.png
--- a/showPhotos/images/prev_btn.png
+++ b/showPhotos/images/prev_btn.png
--- a/showPhotos/images/rank.png
+++ b/showPhotos/images/rank.png
--- a/showPhotos/images/rank_no1.png
+++ b/showPhotos/images/rank_no1.png
--- a/showPhotos/images/rank_no2.png
+++ b/showPhotos/images/rank_no2.png
--- a/showPhotos/images/rank_no3.png
+++ b/showPhotos/images/rank_no3.png
--- a/showPhotos/images/return_back.png
+++ b/showPhotos/images/return_back.png
--- a/showPhotos/images/search_icon.png
+++ b/showPhotos/images/search_icon.png
--- a/showPhotos/images/share-pic.png
+++ b/showPhotos/images/share-pic.png
--- a/showPhotos/images/sign_photo.png
+++ b/showPhotos/images/sign_photo.png
--- a/showPhotos/images/success.png
+++ b/showPhotos/images/success.png
--- a/showPhotos/images/user_ticket01.png
+++ b/showPhotos/images/user_ticket01.png
--- a/showPhotos/images/user_ticket02.png
+++ b/showPhotos/images/user_ticket02.png
--- a/showPhotos/images/voter.png
+++ b/showPhotos/images/voter.png