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

src/main/resources/static/js/product/detail.js

@@ -207,21 +207,21 @@ var productDetail = new Vue({
                         _self.trainingMethodText = product.trainingMethod == 1 ? '线上培训' : '线下培训';
                         _self.trainingType = product.trainingType == 1 ? '￥'+product.trainingFee : '售价已包含';
                     }
-                    if(product.validFlag =='3' || product.validFlag =='9' || product.validFlag =='0' ||  product.validFlag =='10' || product.stock == 0 ){
+                    if(product.validFlag == 3 || product.validFlag == 9 || product.validFlag == 0 ||  product.validFlag == 10 || product.stock == 0 ){
                         _self.isNoneDisabled = true;
                     }else{
                         _self.isNoneDisabled = false;
                     }
-                    if(product.validFlag =='3'){
+                    if(product.validFlag ==3){
                         _self.disabledText = '下架'
                     }
-                    if(product.validFlag =='10'){
+                    if(product.validFlag ==10){
                         _self.disabledText = '停售'
                     }
-                    if(product.validFlag =='9' || product.validFlag =='0'){
+                    if(product.validFlag ==9 || product.validFlag ==0){
                         _self.disabledText = '失效'
                     }
-                    if(product.stock == 0 && product.validFlag !='3'){
+                    if(product.stock == 0 && product.validFlag !=3){
                         _self.disabledText = '售罄'
                     }
                     _self.getRecommends();

src/main/resources/templates/flea-market/detail.html

@@ -60,7 +60,12 @@
                                 <span v-if="detail.sold == 1">已售二手商品不公开价格</span>
                                 <span v-else>价格详聊</span>
                             </span>
-                            <span v-else-if="userID == 0"><a class="member-detail toLogin loginWithParam " onclick="_czc.push(['_trackEvent','二手商品详情','登录查看价格','点击','','Um_Event_SecondDetailsLoginButton'])">登录查看价格></a></span>
+                            <span v-else-if="userID == 0">
+                                <a class="member-detail toLogin loginWithParam " onclick="_czc.push(['_trackEvent','二手商品详情','登录查看价格','点击','','Um_Event_SecondDetailsLoginButton'])">
+                                    <span v-if="detail.sold == 1">已售二手商品不公开价格</span>
+                                    <span v-else>登录查看价格></span>
+                                </a>
+                            </span>
                             <span v-else-if="userID > 0 && detail.detailTalkFlag==2" class="fave-text">
                                 <span v-if="detail.sold == 1">已售二手商品不公开价格</span>
                                 <span v-else>价格详聊</span>
@@ -119,7 +124,7 @@
                         <p v-else>非医美</p>
                     </div>
                 </div>
-                <div class="ercode" v-if="ShowImage" ><img :class="ShowImage?'show':''" src="/img/flea-market/er.png"/></div>
+                <div class="ercode" v-if="ShowImage && detail.sold == 0" ><img :class="ShowImage?'show':''" src="/img/flea-market/er.png"/></div>
             </div>
         </div>
             <!--  相关推荐 -->

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

@@ -172,7 +172,7 @@
                     <p class="none-text">此商品已{{disabledText}},请浏览以下推荐商品~</p>
                 </div>
                 <div v-if="!isPC" class="wechatH5 btnBox"><img src="/img/base/wechat.h5.png" style="padding: 2.7vw 0"></div>
-                <template>
+                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                     <div  class="btnBox" v-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">
                         <a class="upgrade" href="/user/setting/upgrade.html" onclick="_czc.push(['_trackEvent','商品详情','点击','升级查看价格','','Um_Event_ProductUpgrade'])">升级会员查看价格</a>
                     </div>