In the PVG airport, airside, there is a machine that sells bottled water at a much more reasonable price than typical for airports. It can't take cash or credit cards, though, paying with your phone is the only option.