zhengjinyi 7 месяцев назад
Родитель
Сommit
ffcd4bcfb1

+ 3 - 1
src/main/resources/static/css/flea-market/list.css

@@ -21,7 +21,8 @@
     .Listitem:nth-of-type(4n) {margin-right: 0;}
     .mainTab li {height: 40px;line-height: 40px;text-align: center;color: #627386;cursor: pointer;width: 128px;float: left;}
     .mainTab li.addstyle {color: #FF5B00;}
-    .shopList {width: 1184px;margin: 20px auto;float:left;font-size: 0;}
+    .shopList {width: 1184px;margin: 0px auto;float:left;font-size: 0;}
+    .shopList-tips{ width: 100%;height: 40px;line-height: 40px;font-size: 14px;color: #999999;}
     .Listitem {width: 284px;display: inline-block;margin: 0 16px 20px 0;border-radius: 8px;overflow: hidden;}
     .itemImg {display: block;position: relative;width: 100%;height: 284px;margin-right: 20px;background-color: #fff;cursor: pointer;}
     .itemImg .bigImg {width: 100%;height: 100%;}
@@ -57,6 +58,7 @@
 #fleaMarketList{width: 100%;overflow: hidden}
     #fleaMarketList{ padding-top: 27vw; }
     .shopList{background: #fff}
+    .shopList-tips{ width: 100%;height: 6vw;line-height: 6vw;font-size: 3.4vw;color: #999999;box-sizing: border-box;padding: 0 3vw;}
     .Listitem{height:33vw;padding: 2.7vw;border-bottom: .24vw solid #F0F2F4}
     .ListImg{width: 100%;height: 35.3vw}
     .ListImg img {width: 100%;height: 100%;}

+ 0 - 2
src/main/resources/static/css/flea-market/secondDetail.css

@@ -39,7 +39,6 @@
 
     .preview-info .preview-info-title .info-p.label .label-s {font-size: 12px;background: #A69DFE;color: #fff;padding: 5px 10px;border-radius: 2px;margin: 0 10px 5px 0;display: inline-block;}
     .preview-info .preview-info-main {height: 348px; padding: 16px 20px;background-color: #f3f7fe;border-radius: 12px;float: left;margin-top: 10px;}
-    .preview-info .preview-info-main .info.price{ display: none; }
     .preview-info .preview-info-main .info {width: 50%;height: 30px;float: left;margin-bottom: 5px;line-height: 30px;}
     .preview-info .preview-info-main .info .label {width: 70px;height: 30px;float: left;display: block;font-size: 14px;line-height: 30px;text-align: right;color: #999;}
     .preview-info .preview-info-main .info p {float: left;height: 100%;padding-left: 20px;color: #4a4f58;}
@@ -96,7 +95,6 @@
     .preview-info{box-sizing: border-box;padding: 0 3.3vw;overflow: hidden;background: #fff}
     .preview-info-main{box-sizing: border-box;padding: 2.8vw;font-size: 3.4vw;line-height: 7.5vw;color: #93979F;background: #f3f7fe;border-radius: 2vw;position: relative;margin: 3.5vw 0;overflow: hidden}
     .preview-info .preview-info-main .info {width: 100%;height: 8vw;float: left;margin-bottom: 1.3vw;line-height: 8vw;}
-    .preview-info .preview-info-main .info.price{ display: none; }
     .preview-info .preview-info-main .info .label {width: 18.7vw;height: 8vw;float: left;display: block;font-size: 3.4vw;line-height: 8vw;text-align: right;color: #9aa5b5;}
     .preview-info .preview-info-main .info p {float: left;height: 100%;padding-left: 5.3vw;color: #22272e;}
     .preview-info-title{font-size: 3.6vw;color: #22272e;padding: 2vw 0;position: relative;line-height: 7vw;}

+ 18 - 19
src/main/resources/templates/flea-market/detail.html

@@ -61,25 +61,24 @@
                 </div>
                 <div class="preview-info-main clearfix">
                     <div class="info price" style="width: 100%" v-if="detail.sold == 0">
-<!--                        <span class="label">交&nbsp;&nbsp;易&nbsp;&nbsp;价:</span>-->
-<!--                        <p>-->
-<!--                            <span v-if="detail.detailTalkFlag==2&&userID == 0" class="fave-text">-->
-<!--                                <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'])">-->
-<!--                                    <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>-->
-<!--                            </span>-->
-<!--                            <span v-else class="fave-text">¥<span class="big">{{detail.price}}</span></span>-->
-<!--                        </p>-->
-
+                        <span class="label">交&nbsp;&nbsp;易&nbsp;&nbsp;价:</span>
+                        <p>
+                            <span v-if="detail.detailTalkFlag==2&&userID == 0" class="fave-text">
+                                <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'])">
+                                    <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>
+                            </span>
+                            <span v-else class="fave-text">¥<span class="big">{{detail.price}}</span></span>
+                        </p>
                     </div>
                      <div class="info " v-if="HandType && userID > 0">
                         <span class="label">市&nbsp;&nbsp;场&nbsp;&nbsp;价:</span>

+ 22 - 18
src/main/resources/templates/flea-market/list.html

@@ -57,7 +57,11 @@
             <ul class="mainTab" v-if="mainflag">
                 <li v-for="(item,index) in tabList" @click='handleChild(item)' :class="currentID2 ==index?'addstyle':' '">{{item.name}}</li>
             </ul>
+
             <div class="shopList">
+                <div class="shopList-tips">
+                    <p>说明:仅限采美会员可查看价格及联系方式</p>
+                </div>
                 <div class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList">
                     <a class="itemImg onhref" :href="'/flea-market-'+item.productId+'.html'" target="_blank">
                         <img :src="item.imageList[0]" :class="item.sold==1?'activeImg':''" class="bigImg">
@@ -72,24 +76,24 @@
                         <a class="productname" :href="'/flea-market-'+item.productId+'.html'" target="_blank">
                             {{item.name}}
                         </a>
-<!--                        <div class="targetprice">-->
-<!--                            <span v-if="item.detailTalkFlag ==2 && userId == 0">-->
-<!--                                <span v-if="item.sold == 1">&nbsp;&nbsp;&nbsp;</span>-->
-<!--                                <span v-else>¥价格详聊</span>-->
-<!--                            </span>-->
-<!--                            <span v-else-if="userId == 0" class="priceparam " @click="toLogin" onclick="_czc.push(['_trackEvent','二手市场列表','登录查看价格','点击','','Um_Event_SecondListLoginSubmit'])">-->
-<!--                                <span v-if="item.sold == 1">&nbsp;&nbsp;&nbsp;</span>-->
-<!--                                <span v-else>登录查看价格></span>-->
-<!--                            </span>-->
-<!--                            <span v-else-if="userId>0 && item.detailTalkFlag==2">-->
-<!--                                <span v-if="item.sold == 1">&nbsp;&nbsp;&nbsp;</span>-->
-<!--                                <span v-else>¥价格详聊</span>-->
-<!--                            </span>-->
-<!--                            <span v-else>-->
-<!--                                <span v-if="item.sold == 1">&nbsp;&nbsp;&nbsp;</span>-->
-<!--                                <span v-else>¥{{ item.price }}</span>-->
-<!--                            </span>-->
-<!--                        </div>-->
+                        <div class="targetprice">
+                            <span v-if="item.detailTalkFlag ==2 && userId == 0">
+                                <span v-if="item.sold == 1">&nbsp;&nbsp;&nbsp;</span>
+                                <span v-else>¥价格详聊</span>
+                            </span>
+                            <span v-else-if="userId == 0" class="priceparam " @click="toLogin" onclick="_czc.push(['_trackEvent','二手市场列表','登录查看价格','点击','','Um_Event_SecondListLoginSubmit'])">
+                                <span v-if="item.sold == 1">&nbsp;&nbsp;&nbsp;</span>
+                                <span v-else>登录查看价格></span>
+                            </span>
+                            <span v-else-if="userId>0 && item.detailTalkFlag==2">
+                                <span v-if="item.sold == 1">&nbsp;&nbsp;&nbsp;</span>
+                                <span v-else>¥价格详聊</span>
+                            </span>
+                            <span v-else>
+                                <span v-if="item.sold == 1">&nbsp;&nbsp;&nbsp;</span>
+                                <span v-else>¥{{ item.price }}</span>
+                            </span>
+                        </div>
                         <div class="shijian">
                             <div>
                                 <i class="icon mIcon  liulanliang"></i> {{item.viewingNum}}