Merge branch 'develop' of http://git.yoho.cn/fe/yoho-limited-sell-miniapp into develop

@@ -168,7 +168,7 @@ Page(Object.assign({
         });
         });
       } else {
       } else {
         this.init().then(() => {
         this.init().then(() => {
-            this._showRepeat();
+          this._showRepeat();
         });
         });
       }
       }
     }, app ? 0 : 1000);
     }, app ? 0 : 1000);

@@ -84,7 +84,7 @@ Page(Object.assign({
     h5PageUrl: [
     h5PageUrl: [
       {
       {
         title: '排队活动说明',
         title: '排队活动说明',
-        url: 'https://activity.yoho.cn/feature/249.html?nodownload=1'
+        url: 'https://activity.yoho.cn/feature/2593.html'
       }
       }
     ],
     ],
     bgStyle: [ // 排队图片
     bgStyle: [ // 排队图片
@@ -317,7 +317,7 @@ Page(Object.assign({
      * 跳转到我的排队列表
      * 跳转到我的排队列表
      */
      */
   navigateToMyList: function(e) {
   navigateToMyList: function(e) {
-    router.go('myList', Object.assign({actId: this.data.activityInfo.activityId}, this.data.shareInfo));
+    router.go('myList', Object.assign({actId: this.data.activityInfo.activityId, isEnd: this.data.activityInfo.isEnd}, this.data.shareInfo));
   },
   },
 
 
   /**
   /**
@@ -407,6 +407,11 @@ Page(Object.assign({
         let activityName = res.data.activityName;
         let activityName = res.data.activityName;
         let activityId = res.data.activityId;
         let activityId = res.data.activityId;
         let bgStyle = res.data.bgStyle && res.data.bgStyle.length > 0 ? res.data.bgStyle : this.data.bgStyle;
         let bgStyle = res.data.bgStyle && res.data.bgStyle.length > 0 ? res.data.bgStyle : this.data.bgStyle;
+        let activityDesc = res.data.activityDesc;
+
+        wx.setNavigationBarTitle({
+          title: activityName
+        });
 
 
         this.setData({
         this.setData({
           activityInfo: {
           activityInfo: {
@@ -416,7 +421,8 @@ Page(Object.assign({
             isEnd: isEnd, // 是否已结束 1-结束 0-未结束
             isEnd: isEnd, // 是否已结束 1-结束 0-未结束
             prizeType: prizeType, // 奖品类型1-有货币 2-优惠券 3-限购码
             prizeType: prizeType, // 奖品类型1-有货币 2-优惠券 3-限购码
             activityId: activityId,
             activityId: activityId,
-            activityName: activityName
+            activityName: activityName,
+            activityDesc: activityDesc
           },
           },
           bgStyle: bgStyle
           bgStyle: bgStyle
         });
         });
@@ -559,7 +565,9 @@ Page(Object.assign({
      * 跳转到活动说明的H5页面
      * 跳转到活动说明的H5页面
      */
      */
   navigateToDescPage: function() {
   navigateToDescPage: function() {
-    router.goUrl(this.data.h5PageUrl[0].url + '&title=' + this.data.h5PageUrl[0].title);
+    let descUrl = this.data.activityInfo.activityDesc || this.data.h5PageUrl[0].url;
+
+    router.goUrl(descUrl);
   },
   },
 
 
   /**
   /**

@@ -25,6 +25,7 @@ Page(Object.assign({
      */
      */
   data: {
   data: {
     actId: 0,
     actId: 0,
+    isEnd: 0,
     userInfo: {}, // 用户信息
     userInfo: {}, // 用户信息
     shareInfo: {
     shareInfo: {
       default_image: '',
       default_image: '',
@@ -78,12 +79,14 @@ Page(Object.assign({
   onLoad: function(options) {
   onLoad: function(options) {
     console.log(options);
     console.log(options);
     let actId = options.actId;
     let actId = options.actId;
+    let isEnd = options.isEnd || 0;
     let uid = app.getUid() || options.uid;
     let uid = app.getUid() || options.uid;
 
 
 
 
     if (actId) {
     if (actId) {
       this.setData({
       this.setData({
-        actId: actId
+        actId: actId,
+        isEnd: parseInt(isEnd)
       });
       });
       this.getQueueList(actId);
       this.getQueueList(actId);
       for (let i in options) {
       for (let i in options) {

@@ -49,7 +49,7 @@
         </view>
         </view>
     </block>
     </block>
     <form bindsubmit='submitFormId' report-submit='true'>
     <form bindsubmit='submitFormId' report-submit='true'>
-        <button class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'>
+        <button wx:if='{{!isEnd}}' class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'>
             邀请好友助力排队
             邀请好友助力排队
         </button>
         </button>
     </form>
     </form>