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

src/main/resources/static/css/article/article.css

@@ -98,7 +98,7 @@ dl,dd,dt{zoom:1}
 	.bar a{color:#777;font-size:14px}
 	.classify.biaoqian{border-bottom:solid 1px #ededed}
 	.content{width:1185px;margin:0 auto;position:relative;}
-	.content .mainData{float:left;width: 884px;background:#ffffff;}
+	.content .mainData{float:left;width: 884px;background:#f5f5f5;min-height: 900px; }
 	.content .new-list{width:100%;background:#ffffff;}
 	.content .row:nth-last-child(1){border-bottom:0}
 	.new-list .row{position:relative;display:table;width:800px;height:150px;margin:0 30px;padding:24px 0;border-bottom:solid 1px #ededed}

src/main/resources/static/css/user-center/member/member-page.css

@@ -119,7 +119,20 @@
 .vip-bar .right-box a.btn{width:19.2vw;height:7.2vw;background:-webkit-gradient(linear,right top,left top,from(#585658),to(#323031));background:-o-linear-gradient(right,#585658 0%,#323031 100%);background:linear-gradient(270deg,#585658 0%,#323031 100%);border-radius:2px;line-height:7.2vw;text-align:center;font-size:3.2vw;color:#F0CB72;margin-top:2.4vw}
 /*套餐价格*/
 .combo-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}
-.combo-list > div:first-child{width:93.2vw;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+.combo-list > div:first-child{
+    width:93.2vw;
+    display:-webkit-box;
+    display:-ms-flexbox;
+    display:flex;
+    -webkit-box-pack:justify;
+    -ms-flex-pack:justify;
+    /*justify-content:space-between;*/
+    -webkit-box-align:center;
+    -ms-flex-align:center;
+    align-items:center;
+    column-gap:16px;
+}
+.copy-p{padding-top: 8vw;}
 .combo-list .combo{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:29vw;height:31.4vw;background:#FFFFFF;border:1px solid #F0F0F0;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}
 .combo-list .combo.recommend::after{content:"推荐";position:absolute;top:-1.4vw;left:-1px;z-index:9;width:10vw;height:4.8vw;text-align:center;line-height:4.8vw;background:#FF2A2A;color:#fff;font-size:2.8vw}
 .combo-list .combo.active{background:#FDF8EE;border:1px solid #F0CC8C}

src/main/resources/static/js/mixins/cmSysMixins.js

@@ -72,7 +72,7 @@ var cmSysVitaMixins = function () {
                 this.cmSysParams.pagePath = pagePath;
                 setTimeout(()=>{
                     this.handleSetNetworks(this.cmSysParams);
-                },1000)
+                },2000)
             },
             handleSetNetworks(params){// 进入页面执行统计
                 console.log(`页面路径:${params.pagePath}`,`标签:${params.pageLabel}`)

src/main/resources/static/js/user-center/member/memberPage.js

@@ -54,7 +54,10 @@ var memberPage = new Vue({
     mixins: [cmSysVitaMixins],
     data: {
         serviceList: serviceList, // 服务列表
-        comboInfo: [], // svip套餐信息
+        comboInfo: [
+            {duration:12,price:1800},
+            {duration:3,price:600}
+        ], // svip套餐信息
         showMask: false, // 遮罩层
         showRenewPopup: false, // 续费弹窗
         showConfirmPopup: false, // 支付确认弹窗
@@ -88,7 +91,7 @@ var memberPage = new Vue({
         },
     },
     mounted: function () {
-        this.fetchSuperPackage();
+        // this.fetchSuperPackage();
         this.initCenter();
         this.getSvipProductList();
         this.setBottomBtnsVisiable();

src/main/resources/templates/product/detail.html

@@ -262,6 +262,7 @@
                 <div v-else class="none-details" :class="isNoneDisabled ? 'show':''">
                     <img class="none-image" src="/img/base/icon-none.svg" alt="">
                     <p class="none-text">此商品已{{disabledText}},请浏览以下推荐商品~</p>
+                    <p class="none-text">咨询类似商品，请联系客服!</p>
                 </div>
                 <div v-if="!isPC" class="wechatH5 btnBox"><img src="/img/base/wechat.h5.png" style="padding: 2.7vw 0">
                 </div>

src/main/resources/templates/user-center/member/member.html

@@ -50,17 +50,25 @@
                                 </template>
                             </div>
                             <div>
-                                <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付1','','Um_Event_RegisterSuperPayOne'])">
-                                    <a href="javascript:void(0);" @click="payAction(1, 1)">
-                                        立即支付{{ comboInfo[currentIndex].price }}元开通
-                                    </a>
-                                </div>
-                                <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣1','','Um_Event_RegisterSuperByBeansOne'])">
-                                    <a href="javascript:void(0);" @click="payAction(2, 1)">
-                                        或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
-                                    </a>
+                                <p class="copy-p">使用微信扫描二维码，联系采美客服进行购买</p>
+                            </div>
+                            <div>
+                                <div class="wechat-image">
+                                    <img src="/img/base/Wecha.png" alt="">
                                 </div>
                             </div>
+<!--                            <div>-->
+<!--                                <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付1','','Um_Event_RegisterSuperPayOne'])">-->
+<!--                                    <a href="javascript:void(0);" @click="payAction(1, 1)">-->
+<!--                                        立即支付{{ comboInfo[currentIndex].price }}元开通-->
+<!--                                    </a>-->
+<!--                                </div>-->
+<!--                                <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣1','','Um_Event_RegisterSuperByBeansOne'])">-->
+<!--                                    <a href="javascript:void(0);" @click="payAction(2, 1)">-->
+<!--                                        或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通-->
+<!--                                    </a>-->
+<!--                                </div>-->
+<!--                            </div>-->
                         </template>
                         <span v-else>暂无可选套餐~</span>
                     </div>