The United States and China have struck a partial trade deal that could end the 15-month-long trade war between the world's two largest economies.