Do I need a visa at Shanghai issue

We also fly into Shanghai from Dubai on 23/02/18 at 10:25am staying at hotel in Shanghai for 2 nights, departing Shanghai on Majestic Princess at 5pm on 25/02/18 - will the 144 hr Shanghai Waiver apply for my wife & myself/

When cruise finishes we are staying in Singapore for 2 nights then departing to Dubai then back to UK.
Im unsure whether I need a vise
Thank you Brian Mann