Merge remote-tracking branch 'origin/developerA' into developerA

# Conflicts:
#	src/main/resources/templates/activity/attestation.html

src/main/java/com/caimei/www/controller/unlimited/ProductController.java

@@ -360,4 +360,13 @@ public class ProductController extends BaseController {
     public String getProductSupporting() {
         return PRODUCT_SUPPORTING_PATH;
     }
+
+    /**
+     * H5配套商品页
+     */
+    @GetMapping("/attestation.html")
+    public String getActivityAttestaion() {
+        return ACTIVITY_ATTESTAION;
+    }
+
 }

src/main/resources/templates/activity/attestation.html

@@ -242,7 +242,7 @@
             <div class="code"></div>
             <div class="box-code">
                 <p>扫码咨询</p>
-                <img src="/img/common/qr_code_caimei.png" alt="">
+                <img src="/img/common/qr_code_kefu.png" alt="">
             </div>
         </div>
         <div class="box tel">

src/main/resources/templates/product/alliance-page.html

@@ -142,7 +142,7 @@
 				</transition>
 
 				<!-- 侧边二维码 -->
-				<transition enter-active-class="animate__fadeInRight" leave-active-class="animate__fadeOutRight">
+				<transition enter-active-class="animate__fadeInRight" leave-active-class="animate__fadeOutRight" v-if="productAuthInfo.qrCodeImage">
 					<div class="zp-wechat-ewm animate__animated" v-show="wechatVisible">
 						<img :src="productAuthInfo.qrCodeImage" alt="关注公众号了解更多"/>
 						<div class="zp-tip">