修改搜索页bug
修改主页和搜索bug
修改主页和搜索bug
Merge branch 'promote_branch'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
提交错误
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/drawable-xhdpi/vip_1_member.png
	app/src/main/res/drawable-xhdpi/vip_2_member.png
	app/src/main/res/drawable-xhdpi/vip_3_member.png
	app/src/main/res/drawable-xhdpi/vip_4_member.png
	app/src/main/res/layout/activity_buy_info.xml
	app/src/main/res/values/strings.xml