Merge remote-tracking branch 'origin/master' into bobo/feat/statistics

pages/signIn/activity/activity.wxml

@@ -114,7 +114,7 @@
                     </view>
                 </jumpmallapp>
            </view>
-           <view class="award_des" style="color:{{secColor}};">恭喜您签到成功 获得9折扣折扣券</view>
+           <view class="award_des" style="color:{{secColor}};">恭喜您签到成功</view>
 
            <view class="_btn" style="{{backGroundStyle}}">
             <jumpmallapp>去使用</jumpmallapp>