Merge branch 'develop' of zhengxifeng/zc100 into master

template/pc/components/detail/content.htm

                         <i class="more2_info_self">推荐</i>
                         {/eyou:if}
 
+
+
+
                         <a class="" href="{$ar_url}" title="{$field.title}" >
-                            {$field.title|msubstr=###,0,30,true}
+                            {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
                         </a>
                     </h3>
                     <div class="mod_price">
                         <i>¥</i>
                         <span class="more2_info_price_txt">{$field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
+
                                  </span>
                     </div>
                 </div>

template/pc/components/detail/new.htm

                         {/eyou:if}
 
                         <a class="" href="{$ar_url}" title="{$field.title}" >
-                            {$field.title|msubstr=###,0,30,true}
+                            {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
                         </a>
                     </h3>
                     <div class="mod_price">

template/pc/components/index/content.htm

                                     {/eyou:if}
 
                                     <a class="" href="{$ar_url}" title="{$field.title}" >
-                                        {$field.title|msubstr=###,0,30,true}
+                                        {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
                                     </a>
                                 </h3>
                                 <div class="mod_price">

template/pc/components/list/style12/page/mod_4.htm

             {/eyou:if}
 
             <a class="" href="{$ar_url}" title="{$field.title}" >
-                {$field.title|msubstr=###,0,30,true}
+                {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
             </a>
         </h3>
         <div class="mod_price">

template/pc/components/list/style12/page/mod_5.htm

 
 
             <a class="" href="{$ar_url}" title="{$field.title}" >
-                {$field.title}
+                {$field.title}{eyou:if condition='($field.typeid === 1233)'}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>{/eyou:if}
             </a>
 
         </h3>
         <div class="mod_price" style="">
             <i>¥</i>
             <span class="more2_info_price_txt">{$field.users_price}.<span class="more2_info_price_txt-decimal">00</span>
+
                                  </span>
         </div>
         {eyou:else /}

template/pc/components/search/content.htm

             {/eyou:if}
 
             <a class="" href="{$ar_url}" title="{$field.title}" >
-                {$field.title|msubstr=###,0,30,true}
+                {$field.title|msubstr=###,0,30,true}<span style="color:red;">👍<font style="font-weight: bold;font-size: 12px;">限时免费赠送</font></span>
             </a>
         </h3>
         <div class="mod_price">