Merge branch 'develop-medou' of ssh://gogs.1hhd.com:10022/1hjz-3N/1hjz-mini into develop-medou

# Conflicts:
#	pages/pay_result/pay_result.js

pages/activity_detail/activity_detail.wxml

@@ -72,7 +72,7 @@
       </view>
       <view class='row2'>176****6411发起的拼团已结束</view>
     </view>
-    <image src="{{ruleImage}}" bindload="ruleImageLoad" style="width:100%;margin: 5rpx auto;height:{{rule_image_height}}px"></image>
+    <image src="{{activityDetail.ruleUrl}}" bindload="ruleImageLoad" style="width:100%;margin: 5rpx auto;height:{{rule_image_height}}px"></image>
     <view class="global_focus intro-box" style='margin: 5rpx auto;'>
       <template is="wxParse" data="{{wxParseData:activityContent.nodes}}" />
     </view>

pages/pay_result/pay_result.js

@@ -105,7 +105,9 @@ Page({
   },
 
   goActivityInfo: function () {
-    wx.navigateBack()
+    wx.navigateBack({
+      delta: 1
+    });
   },
 
   togglePopup: function () {