I went out with a Bus Capt on my last layover in CAN and he had not found a 'market' like the one in PVG...... yet. We used taxis and went to various districts in the city to shop for stuff. There's a watch area and for 2 -3 blocks there's nothing but watch vendors and everything to do with watches -- bands, faces, watch repair tools, etc.... And we were also not harassed at all by "copy watch..." and then the litany of watch makers.
I've got a 50+ hr layover coming up in Sept and would like some more local shopping gouge too if anyone has more to offer or suggest.
BTW, the Thai restaurant near the CAN Holiday Inn has excellent Thai food; some of the best in the system IMO.