Merge branch 'master' into feature/invoice

@@ -35,7 +35,7 @@ const getPreferenceData = (data) => {
             default_images: value.default_images,
             is_soon_sold_out: value.is_soon_sold_out === 'Y',
             url: helpers.urlFormat(`/product/${value.product_skn}.html`), // 商品url改版
-            market_price: value.market_price,
+            market_price: value.market_price === value.sales_price ? false : value.market_price,
             sales_price: value.sales_price
         };
 

-User-agent: * 
-Disallow:  
\ No newline at end of file
+User-Agent: *
+Disallow: /*?*
+Disallow: /passport
+Disallow: /cart
+Disallow: /home/
+Disallow: /service/
+Disallow: /passport
+Disallow: /3party
+Disallow: /api
+Disallow: /hf
+Disallow: /rn