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

@@ -65,12 +65,12 @@
     </block>
     <!--如果用户已排队，并且活动结束, 展示用户中奖或未中奖的头像-->
     <block wx:elif='{{userInfo.isDrawline && activityInfo.isEnd}}'>
-        <view class='user-container {{userInfo.isLucky ? "success" : "fail"}}' bindtap='navigateToUserCodePage'>
+        <view class='user-container {{userInfo.isLucky ? "success" : "fail"}}'  bindtap='navigateToMyList'>
             <view class='userrank' hidden='{{hidePopup}}'>
                 <view class='rank-text'>
                     <!-- {{userInfo.sort}} -->
                     <text wx:if="{{!userInfo.isLucky}}">再接再厉</text>
-                    <text wx:else>查看限购码</text>
+                    <text wx:else>查看我的排队号</text>
                 </view>
             </view>
             <view class='userhead'>

@@ -68,7 +68,7 @@
 					"id": -1,
 					"name": "限定商品排队",
 					"pathName": "pages/queue/index",
-					"query": "actId=384"
+					"query": "actId=402"
 				},
 				{
 					"id": 5,