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

src/main/resources/templates/single-page/topic.html

@@ -22,7 +22,7 @@
         <div class="pageFloor" v-for="floor in floorDatas">
             <div class="title">
                 <span v-text="floor.title"></span>
-                <a class="talk_link" v-if="buttonName!=null" :href="buttonLink" target="_blank">{{ buttonName }}</a>
+                <a class="talk_link" v-if="buttonName!=null && buttonName!=''" :href="buttonLink" target="_blank">{{ buttonName }}</a>
             </div>
             <ul class="content clear">
                 <li v-for="item in floor.floorData">

src/main/resources/templates/supplier-center/shop/release.html

@@ -198,7 +198,7 @@
                             </div>
                             <div class="release-from clear">
                                 <div class="release-label rightTxt">商品编码:</div>
-                                <div class="release-input"><input class="input" v-model="releaseParams.productCode" type="text" placeholder="建议输入品牌关键词"></div>
+                                <div class="release-input"><input class="input" v-model="releaseParams.productCode" type="text" placeholder="建议输入商品编码"></div>
                             </div>
                             <div class="release-from none clear">
                                 <div class="release-label rightTxt">搜索关键词:</div>