merge from master

 <script>
-(function(w, d, s, j, f) {
+{{!--(function(w, d, s, j, f) {
     var a = d.createElement(s);
     var m = d.getElementsByTagName(s)[0];
 
@@ -54,5 +54,12 @@
     if (window._yas) {
         window._yas(1 * new Date(), '2.1.2', 'yohoblk_m', uid, '', '');
     }
-}());
+}());--}}
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?f7f9b12ad29dd4bc58f293770ea94dc8";
+  var s = document.getElementsByTagName("script")[0];
+  s.parentNode.insertBefore(hm, s);
+})();
 </script>

 {
   "name": "yohoblk-wap",
-  "version": "0.2.0",
+  "version": "2.0.0",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -102,6 +102,9 @@
                         this.shopInfo = result;
                         this.shopInfo.showBrandInfo = true;
 
+                        // 处理富文本
+                        this.shopInfo.shopIntro && (this.shopInfo.shopIntro = this.shopInfo.shopIntro.replace(/<\/?[^>]*>/g, ''));
+
                         let shareUrl = locationQuery.id ?
                             location.origin + '/product/shop/favorite/share?id=' + locationQuery.id :
                             location.origin + '/product/shop/' + $shop.data('domain') + '/share';