Singaporean in Vietnam and entering China.

Hi, i am a Singaporean holding an ordinary passport. I am currently in Hanoi, Vietnam. I am going to Nanning for a friend's wedding. I would spend a maximum of 7 days. Do I need a Visa or do I get a 15 day one on arrival? Thank you very much for answers rendered.