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

src/main/resources/templates/activity/beautyTopic.html

@@ -92,8 +92,8 @@
                                                         {{pros.name}}
                                                     </div>
                                                     <div class="cm-tags cm-p-t-2 cm-p-b-2 h20">
-                                                         <span class="cm-tag color3" v-if="pros.product.couponsLogo">优惠券</span>
-                                                        <span class="cm-tag color2" v-if="pros.listType == 2">{{ pros.label }}</span>
+                                                        <span class="cm-tag color2" v-if="pros.product.couponsLogo">优惠券</span>
+                                                        <span class="cm-tag color3" v-if="pros.listType == 2">{{ pros.label }}</span>
                                                     </div>
                                                     <div class="cm-prodcut-price h24">
                                                         <div class="pro-price" v-if="pros.listType == 1">