Merge remote-tracking branch 'origin/sj-dev-v2' into wxl-develop

components/activitybar/index.wxml

@@ -6,6 +6,6 @@
 <view class="dailog-box" hover-class="none" hover-stop-propagation="false" wx:if="{{dailogShow}}">
     <view class="content animation" hover-class="none" hover-stop-propagation="false">
         <image class="close-icon" src="{{imageRoot}}activityindex/close-icon.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" bindtap="close"></image>
-        <image class="adimg" src="{{imageRoot}}activityindex/ac-btn.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" bindtap="gothemeor"></image>
+        <image class="adimg" src="{{imageRoot}}activityindex/dialog.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" bindtap="gothemeor"></image>
     </view>
 </view>
\ No newline at end of file