Merge remote-tracking branch 'origin/release/5.1' into release/5.1

@@ -276,7 +276,12 @@ function getMarketPrice() {
                 productSkn: productSkn
                 productSkn: productSkn
             },
             },
             success: function(data) {
             success: function(data) {
+                if (data.goodsPrice.previousPrice) {
                     $('.previous-price').text(data.goodsPrice.previousPrice);
                     $('.previous-price').text(data.goodsPrice.previousPrice);
+                } else {
+                    $('.previous-price').text(data.goodsPrice.currentPrice);
+                }
+
             }
             }
         });
         });
     }
     }