Merge branch 'developer' of http://git.caimei365.com/zhengjinyi/caimei-applets-mcare into developer

pages/goods/components/cm-special.vue

@@ -5,7 +5,7 @@
         </view>
         <view class="special_title">
             <view class="title">
-                {{activeImage.topic | subText(25)}}
+                {{activeImage.topic}}
             </view>
             <view class="">
                 <button class="special_btn">查看详情</button>

pages/goods/components/procurement_good.vue

@@ -5,9 +5,9 @@
         </view>
         <view class="pro-content">
             <view class="pro-title">
-                {{storeInfo.name | sliceText(20)}}
+                {{storeInfo.name | sliceText(18)}}
             </view>
-            <view class="pro-price" v-if='hasLogin'>
+            <view class="pro-price" v-if='!hasLogin'>
                 ￥{{storeInfo.price}}
             </view>
             <view class="product-price-none" v-else>