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

@@ -482,9 +482,7 @@ Page(Object.assign({
 
 
         if ((this.data.avatarList.length + 1) === this.data.assistLimit) {
         if ((this.data.avatarList.length + 1) === this.data.assistLimit) {
           detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode);
           detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode);
-        } else if (this.data.avatarList.length === this.data.assistLimit) {
-          detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode);
-        }
+        } 
       } else if (result.code === 401) {
       } else if (result.code === 401) {
         this.setData({
         this.setData({
           assistSuccess: ASSIST_SUCCESS.REPEAT
           assistSuccess: ASSIST_SUCCESS.REPEAT

@@ -100,11 +100,11 @@
         </block>
         </block>
     </block>
     </block>
 
 
-    <block wx:elif="{{showStatus === 2 || showStatus === 7}}">
+    <block wx:elif="{{showStatus === 2}}">
         <block wx:if="{{productSourceType === 1}}">
         <block wx:if="{{productSourceType === 1}}">
             <action-bar>
             <action-bar>
                 <view class="bottom1-action">
                 <view class="bottom1-action">
-                    <view class="as-bottom cancel">立即购买</view>
+                    <view class="as-bottom cancel">限购码已抢光</view>
                 </view>
                 </view>
             </action-bar>
             </action-bar>
         </block>
         </block>
@@ -149,7 +149,7 @@
     <block wx:elif="{{showStatus === 5}}">
     <block wx:elif="{{showStatus === 5}}">
         <action-bar>
         <action-bar>
             <view class="bottom1-action">
             <view class="bottom1-action">
-                <view class="as-bottom cancel">即将售罄</view>
+                <view class="as-bottom cancel">限购码已抢光</view>
             </view>
             </view>
         </action-bar>
         </action-bar>
     </block>
     </block>
@@ -162,6 +162,24 @@
         </action-bar>
         </action-bar>
     </block>
     </block>
 
 
+    <block wx:elif="{{showStatus === 7}}">
+        <block wx:if="{{productSourceType === 1}}">
+            <action-bar>
+                <view class="bottom1-action">
+                    <view class="as-bottom cancel">立即购买</view>
+                </view>
+            </action-bar>
+        </block>
+        <block wx:if="{{productSourceType === 2}}">
+            <action-bar>
+                <view class="top-assist-action">
+                    <view class="top-title" >当前活动已结束</view>
+                    <view class="as-bottom ok" bindtap="goList">查看其他活动</view>
+                </view>
+            </action-bar>
+        </block>
+    </block>
+
     <block wx:else>
     <block wx:else>
         <action-bar>
         <action-bar>
             <view class="top-assist-action">
             <view class="top-assist-action">
@@ -184,7 +202,7 @@
 
 
         <action-bar wx:elif="{{queueStatus === 2}}">
         <action-bar wx:elif="{{queueStatus === 2}}">
             <view class="bottom1-action">
             <view class="bottom1-action">
-                <view class="as-bottom ok" bindtap="goQueueList">参加排队</view>
+                <view class="as-bottom ok" bindtap="goQueueList">参加排队赢取限购码</view>
                 <view class="help" bindtap="goHelp">?</view>
                 <view class="help" bindtap="goHelp">?</view>
             </view>
             </view>
         </action-bar>
         </action-bar>

@@ -103,12 +103,12 @@
 
 
 .bottom1-action .help {
 .bottom1-action .help {
     position: absolute;
     position: absolute;
-    height: 36rpx;
-    width: 36rpx;
-    line-height: 36rpx;
-    border-radius: 18rpx;
+    height: 50rpx;
+    width: 50rpx;
+    line-height: 50rpx;
+    border-radius: 25rpx;
     color: #fff;
     color: #fff;
-    font-size: 28rpx;
+    font-size: 40rpx;
     background-color: #d0021b;
     background-color: #d0021b;
     right: 30rpx;
     right: 30rpx;
     top:50%;
     top:50%;