M2-branes on discs and multi-charged spindles