+ ���������봦��
* �������ʾ����
Merge branch 'genertecMobile2' of https://github.com/finalljx/viewhome into genertecMobile2
+ ���ȱʧ����ҳ��
* ���������б���ʾloading״̬
Merge branch 'genertecMobile2' of https://github.com/finalljx/viewhome into genertecMobile2
* ����ҳ����ʽ
Merge branch 'genertecMobile2' of https://github.com/finalljx/viewhome into genertecMobile2

Conflicts:
	html/news/newsList.html
	html/zcfgz.html
* �滻����ͼ��
* ���������ʾ