Merge branch '黄色分支' into 测试

packageA/publicClue/modules/follow/follow.wxml

@@ -29,7 +29,7 @@
             {{item.content||' --'}}
         </view>
         <view class="type" wx:if="{{isshowsalesfeesamount}}">
-            营销费用：<text>{{item.showsalesfeesamount}}</text>
+            营销费用：<text  style="color: #FF3B30;">{{item.showsalesfeesamount}}</text>
         </view>
     </view>
     <Yl_Files id="{{'Yl_Files'+item.rowindex}}" delete="{{disabled}}" strict />

pages/trace/index.wxml

@@ -45,7 +45,7 @@
             下次跟进计划：{{item.nextplan||' --'}}
         </view>
         <view class="text">
-            营销费用：{{item.showsalesfeesamount||' --'}}
+            营销费用：<text style="color: #FF3B30;">{{item.showsalesfeesamount||' --'}}</text>
         </view>
     </navigator>
     <view class="bottom">