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

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

@@ -56,14 +56,20 @@
                     <div class="info price" style="width: 100%" >
                         <span class="label">交&nbsp;&nbsp;易&nbsp;&nbsp;价：</span>
                         <p>
-                            <span v-if="detail.detailTalkFlag==2&&userID>0" class="fave-text">价格详聊</span></span>
+                            <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'])">登录查看价格></a></span>
-                            <span v-else-if="userID > 0 && detail.detailTalkFlag==2" class="fave-text">价格详聊</span></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 class="tag">
                            <span class="infotag news" v-if="detail.sold==0&&detail.newAdded==1">最新</span>
-                           <span class="infotag sold" v-if="detail.sold==1&&detail.newAdded==1||detail.sold==1&&detail.newAdded==0">已售</span>
+                           <span class="infotag sold" v-if="detail.sold==1">已售</span>
                            <span class="infotag other" v-if="detail.brandID==161&&detail.brandName!=''&&detail.brandName!=null">{{detail.brandName}}</span>
                          </div>
                     </div>

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

@@ -37,7 +37,6 @@
                             <a href="/flea-market/form.html" onclick="_czc.push(['_trackEvent','二手市场列表','我要发布','点击','','Um_Event_SecondReleaseSubmit'])">我要发布</a>
                         <li/>
                     </div>
-
                 </ul>
                 <ul class="secondTitle" v-else>
                     <li class="ClassA mIcon off" @click="handle('1')" :class="currentId == '1' ? 'active':''">
@@ -62,17 +61,26 @@
                         <div class="tag">
                             <span class="infotag news" v-if="item.sold==0&&item.newAdded==1">最新</span>
                             <span class="infotag brand" v-if="item.brandName!=null&&item.brandName!=''&&item.brandID!=161">{{item.brandName}}</span>
-                            <span class="infotag sold " v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
+                            <span class="infotag sold " v-if="item.sold==1">已售</span>
                             <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
                         </div>
                         <a class="productname" :href="'/flea-market-'+item.productId+'.html'">
                             {{item.name}}
                         </a>
                         <div class="targetprice">
-                            <span v-if="item.detailTalkFlag ==2 && userId>0">价格详聊</span>
-                            <span v-else-if="userId == 0" class="priceparam " @click="toLogin" onclick="_czc.push(['_trackEvent','二手市场列表','登录查看价格','点击','','Um_Event_SecondListLoginSubmit'])">登录查看价格></span>
-                            <span v-else-if="userId>0 && item.detailTalkFlag==2">价格详聊</span>
-                            <span v-else>￥{{item.price}}</span>
+                            <span v-if="item.detailTalkFlag ==2 && userId == 0">
+                                <span v-if="item.sold == 1">已售二手商品不公开价格</span>
+                                <span v-else>￥价格详聊</span>
+                            </span>
+                            <span v-else-if="userId == 0" class="priceparam " @click="toLogin" onclick="_czc.push(['_trackEvent','二手市场列表','登录查看价格','点击','','Um_Event_SecondListLoginSubmit'])">{{ item.sold == 1 ? '已售二手商品不公开价格' : '登录查看价格' }}</span>
+                            <span v-else-if="userId>0 && item.detailTalkFlag==2">
+                                <span v-if="item.sold == 1">已售二手商品不公开价格</span>
+                                <span v-else>￥价格详聊</span>
+                            </span>
+                            <span v-else>
+                                <span v-if="item.sold == 1">已售二手商品不公开价格</span>
+                                <span v-else>￥{{ item.price }}</span>
+                            </span>
                         </div>
                         <div class="shijian">
                             <div>