Authored by 黄敬囿

Merge branch 'de-jump' into 'master'

fix merge



See merge request !5
@@ -38,6 +38,7 @@ Page({ @@ -38,6 +38,7 @@ Page({
38 stepData: {}, 38 stepData: {},
39 couponData: {}, 39 couponData: {},
40 notLogin: false, // 默认未登录 40 notLogin: false, // 默认未登录
  41 +
41 }, 42 },
42 onLoad: function(options) { 43 onLoad: function(options) {
43 // 禁止分享 44 // 禁止分享