Merge branch 'release/6.9.2' into feature/group-home-correct

@@ -403,7 +403,7 @@ class YoLuckService extends global.yoho.BaseModel {
     async getDetailBanner() {
         try {
             const result = await this.getResourceCode({
-                contentCode: 'ccc32dbedf164a52b4efa34383878860'
+                contentCode: '60a3d9bf6e3724c91f39ef5ff9f55d55'
             });
 
             if (!result.width) {
@@ -422,7 +422,7 @@ class YoLuckService extends global.yoho.BaseModel {
     async getBottomBanner() {
         try {
             const result = await this.getResourceCode({
-                contentCode: '5a2203f5656fbc9788bd8af70f2823d3'
+                contentCode: '7699904c4a2377bb970e2941e0de14d9'
             });
 
             if (!result.width) {

@@ -29,6 +29,12 @@
                                 </div>
                             {{/isEqualOr}}
 
+                            {{#isEqualOr ../showPrdName '1'}}
+                                <div class="product-name">
+                                    <span {{#if ../fontColor}} style="color:{{../fontColor}};" {{/if}}>{{productname}}</span>
+                                </div>
+                            {{/isEqualOr}}
+
                             {{#if ../brandImg}}
                                 <img class="brand-img" src="{{image2 ../brandImg q=85}}">
                             {{/if}}

 {
   "name": "yohobuywap-node",
-  "version": "6.9.2-9",
+  "version": "6.9.2-10",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -334,11 +334,11 @@ $('body').on('touchstart', '.similar-btn', function() {
 
 // 更新union_type
 +(() => {
-    $('a[href*=activity]').each(function() {
+    $('a[href*="activity.yoho.cn"]').each(function() {
         const $el = $(this);
         const href = $el.attr('href');
 
-        if (href.indexOf('union_type') < 0) {
+        if (href.indexOf('union_type') < 0 && cookie('unionTypeYas')) {
             const sps = href.split('?');
 
             $el.attr('href', `${sps[0]}?union_type=${cookie('unionTypeYas')}&${sps[1]}`);