Merge branch 'hotfix/baiduJsonLd' into 'gray'

jsonld See merge request !1207

Merge branch 'hotfix/baiduJsonLd' into 'gray'
jsonld See merge request !1207
毕凯
Commit 29561ed7c6559f01abcf3050c4802258988eb776 2 parents c59cc776 7b828ddc
Showing 5 changed files with 26 additions and 28 deletions
apps/guang/controllers/detail.js
apps/mip/controllers/guang.js
apps/product/controllers/new-detail.js
doraemon/views/layout.hbs
doraemon/views/partial/ld-json.hbs
--- a/apps/guang/controllers/detail.js
View file @29561ed
+++ b/apps/guang/controllers/detail.js
View file @29561ed
@@ -307,12 +307,12 @@ const index = (req, res, next) => {
             isShare: isShare,
             id: id,
             showAnaJson: {
-                mipsite: true,
-                miptitle: data.title,
-                mipPublishTime: guang.detail.publishTime,
-                mipPic: mipPic,
-                mipDes: guang.shareDesc,
-                mipUrl: `${req.protocol}://m.yohobuy.com/guang/${id}.html`
+                addBaiduSite: true,
+                title: data.title,
+                publishTime: guang.detail.publishTime,
+                pic: mipPic,
+                des: guang.shareDesc,
+                url: `${req.protocol}://m.yohobuy.com/guang/${id}.html`
             }
         }, data, parameter));
     })().catch(next);
--- a/apps/mip/controllers/guang.js
View file @29561ed
+++ b/apps/mip/controllers/guang.js
View file @29561ed
@@ -216,14 +216,12 @@ const detailIndex = (req, res, next) => {
                 currentHref: `https://m.yohobuy.com/guang/${id}.html`
             },
             showAnaJson: {
-                mipsite: false,
-                miptitle: `${detail.getArticle.article_title} | Yoho!Buy有货 | 潮流购物逛不停`,
-                mipId: id,
-                mipPublishTime: mipPublishTime,
-                mipPic: mipPic,
-                mipDes: detail.getArticle.article_summary,
-                mipUrl: `${req.protocol}://m.yohobuy.com${req.originalUrl}`,
-                miphtml: `${req.protocol}://m.yohobuy.com/mip/guang/${id}.html`
+                addBaiduSite: false,
+                title: `${detail.getArticle.article_title} | Yoho!Buy有货 | 潮流购物逛不停`,
+                publishTime: mipPublishTime,
+                pic: mipPic,
+                des: detail.getArticle.article_summary,
+                url: `${req.protocol}://m.yohobuy.com${req.originalUrl}`,
             }
         }, data));
     })().catch(next);
--- a/apps/product/controllers/new-detail.js
View file @29561ed
+++ b/apps/product/controllers/new-detail.js
View file @29561ed
@@ -85,12 +85,12 @@ const newDetail = {
                 appPath: appPath,
                 isMarsApp: req.yoho.isMarsApp, // 判断mars
                 showAnaJson: {
-                    mipsite: true,
-                    miptitle: title,
-                    mipPublishTime: moment.unix(result.shelveTime).format('YYYY-MM-DDTHH:mm:ss'), // mip日期必填
-                    mipPic: mipPic,
-                    mipDes: description,
-                    mipUrl: `${req.protocol}://m.yohobuy.com/product/${result.productSkn}.html`
+                    addBaiduSite: true,
+                    title: title,
+                    publishTime: moment.unix(result.shelveTime).format('YYYY-MM-DDTHH:mm:ss'), // mip日期必填
+                    pic: mipPic,
+                    des: description,
+                    url: `${req.protocol}://m.yohobuy.com/product/${result.productSkn}.html`
                 },
                 miniPath: helpers.urlFormat('/api/wechat/miniapp.jpg', {
                     miniapp_type: 0,
--- a/doraemon/views/layout.hbs
View file @29561ed
+++ b/doraemon/views/layout.hbs
View file @29561ed
@@ -22,8 +22,6 @@
             <link rel="dns-prefetch" href="{{this}}">
         {{/dnsPrefetch.hosts}}
-        {{> ld-json}}
-
         <script>
             {{#ifand isProduction wap.open.bughd}}
             window._timeStart = new Date().getTime();
@@ -87,6 +85,8 @@
         <link rel="apple-touch-startup-image" href="https://cdn.yoho.cn/h5/forios/startup/startup-orange-x.png" media="screen and (min-device-width: 751px) and (max-device-width: 1125px)">
         <link rel="apple-touch-startup-image" href="https://cdn.yoho.cn/h5/forios/startup/startup-orange-6.png" media="screen and (min-device-width: 641px) and (max-device-width: 750px)">
         <link rel="apple-touch-startup-image" href="https://cdn.yoho.cn/h5/forios/startup/startup-orange-5.png" media="screen and (max-device-width: 640px)">
+
+        {{> ld-json}}
     </head>
     <body class="{{pageStyle}}{{#if isWechat}} wechat-body{{/if}}{{#if width750}} width750{{/if}}{{#if isPassportPage}} passport-body{{/if}}{{#if isStarIndexPage}} star-index-bg{{/if}}{{#if isStarDetailPage}} star-class-body{{/if}}{{#if isInstallmentPage}} installment-body{{/if}}{{#if @root.isMarsApp}} is-mars-app{{/if}}{{#if @root.isNowApp}} is-now-app{{/if}}">
     <div class="main-wrap" id="main-wrap" {{#if appPath}}data-apppath='{{{appPath}}}'{{/if}} {{#if miniPath}}data-miniPath='{{{miniPath}}}'{{/if}}>
--- a/doraemon/views/partial/ld-json.hbs
View file @29561ed
+++ b/doraemon/views/partial/ld-json.hbs
View file @29561ed
 {{# showAnaJson}}
-{{#if mipsite}}<script src="//msite.baidu.com/sdk/c.js?appid=1583402501013173"></script>{{/if}}
 <script type="application/ld+json">
 {
     "@context": "https://ziyuan.baidu.com/contexts/cambrian.jsonld",
-    "@id": "{{mipUrl}}",
+    "@id": "{{url}}",
     "appid": "1583402501013173",
-    "title": "{{miptitle}}",
+    "title": "{{title}}",
     "images": [
-        {{#if mipPic}}"http:{{image mipPic 750 500 1}}"{{/if}}
+        {{#if pic}}"http:{{image pic 750 500 1}}"{{/if}}
     ],
-    "description": "{{mipDes}}",
-    "pubDate": "{{mipPublishTime}}"
+    "description": "{{des}}",
+    "pubDate": "{{publishTime}}"
 }
 </script>
+{{#if addBaiduSite}}<script src="//msite.baidu.com/sdk/c.js?appid=1583402501013173"></script>{{/if}}
 {{/showAnaJson}}