1.2.3

package4/main/activate.js

@@ -92,9 +92,26 @@ Page({
           for (var i = 0; i < productList.length; i++) {
             productList[i].IsActivate = 1;
           }
-          that.setData({
-            List: productList,
-          });
+
+          if (productList.length>0){
+            that.setData({
+              List: productList,
+            });
+          }
+          else{
+            wx.removeStorageSync("HasActivate");
+            wx.showModal({
+              title: '提醒',
+              content: '产品已激活。',
+              showCancel: false,
+              confirmText: "去首页",
+              success:function(){
+                wx.reLaunch({
+                  url: '../../pages/index/index',
+                })
+              }
+            });
+          }
         }
       }
       wx.hideLoading();

package4/main/giftcard.js

@@ -13,6 +13,7 @@ Page({
     this.setData({
       Containnerheight: common.getSystemHeight(),
       ProgramList: server.getProgramList(),
+      CurrentUserID:app.globalData.userInfo.UserID,
     });
 
     this.init(giftID,userID);

package4/main/giftcard.wxml

@@ -26,15 +26,15 @@
     <view class='text9'>{{GiftInfo.UseTime}}</view>
   </view>
 
-  <button class='btn1 FlexRow' open-type="getUserInfo" bindgetuserinfo="goto"  wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID==0}}">
+  <button class='btn1 FlexRow' open-type="getUserInfo" bindgetuserinfo="goto"  wx:if="{{GiftInfo.PayType==5 && (GiftInfo.ExchangeUserID==0 || GiftInfo.ExchangeUserID==CurrentUserID)}}">
     <view>立即领取</view>
   </button>
-  <view class='btn2 btn1 FlexRow' wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID>0}}">
+  <view class='btn2 btn1 FlexRow' wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID>0 && GiftInfo.ExchangeUserID!=CurrentUserID}}">
     <view>已被领取</view>
   </view>
 
-  <view class='text10' wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID==0}}">“允许微信授权”才能完成领取</view>
-  <view class='text14 text10' bindtap='gotoDefault' wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID>0}}">返回首页</view>
+  <view class='text10' wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID==0}}">该功能需要微信授权</view>
+  <view class='text14 text10' bindtap='gotoDefault' wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID>0}}">前往产品首页</view>
   
   <view class='text11 FlexRow'>如遇问题，请切换到“唱意教育家长助手”中
     <view class='text12' bindtap='gotoFeedback'>咨询客服</view>。</view>