1.1.3

app.js

@@ -14,7 +14,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    version: "1.1.2",
+    version: "1.1.3",
     IsProduction: true,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",

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>

pages/main/default.json

@@ -1,5 +1,7 @@
 {
   "navigationBarBackgroundColor": "#B9DC5D",
   "navigationBarTextStyle": "black",
-  "backgroundColor": "#583027"
+  "backgroundColor": "#583027",
+  "backgroundColorTop": "#B9DC5D",
+  "backgroundColorBottom": "#583027"
 }

pages/main/default.wxml

@@ -21,14 +21,15 @@
         </view>
         <view class="panel001 FlexRow">
           <view class="panel0010 FlexRow">
-            <view class='panel00100'></view>
             <image wx:for="{{[1,2,3,4]}}" wx:key="index" bindtap='gotoList' data-id="{{item}}" class="homepage_question_illus_grade01" src="../images/homepage_question_illus_grade0{{item}}.png" />
-            <view class='panel00101'></view>
           </view>
         </view>
+        <view class="panel0011">
+        </view>
         <image class="universalpic_line_zigzag_brown_down" src="../images/universalpic_line_zigzag_brown_down.png" />
         <image class="universalpic_line_zigzag_brown_up" src="../images/universalpic_line_zigzag_brown_up.png" />
-        <view class='panel00102'></view>
+        <view class="panel0011">
+        </view>
         <view class="panel002 FlexRow">
           <view class="panel0020 FlexRow">
             <view class="panel00200 FlexColumn">
@@ -113,7 +114,7 @@
                 <image class="universalpic_indicator_maroon" src="../images/universalpic_indicator_pink.png" />
               </view>
               <view class="line"></view>
-              
+
             </block>
           </view>
         </view>

pages/main/default.wxss

@@ -31,7 +31,7 @@
 .panel {
   width: 100%;
   background-color: #583027;
-  height: 2634rpx;
+  height: 2654rpx;
   justify-content: flex-start;
 }
 
@@ -89,12 +89,21 @@
 
 .panel001 {
   width: 100%;
-  height: 368rpx;
+  height: 398rpx;
   background-color: #723c30;
+  align-items: flex-start;
 }
 
 .panel0010 {
   flex-wrap: wrap;
+  margin: 50rpx 0 0 0;
+  background-color: #723c30;
+}
+
+.panel0011{
+  width:100%;
+  height:24rpx;
+  background-color: #723c30;
 }
 
 .homepage_question_illus_grade01 {
@@ -126,9 +135,10 @@
 }
 .panel002 {
   width: 100%;
-  height: 638rpx;
+  height:698rpx;
   background-color: #723c30;
   position: relative;
+  align-items: flex-start;
 }
 
 .panel0020 {
@@ -144,7 +154,7 @@
   height: 116rpx;
   position: absolute;
   left: 230rpx;
-  top: -17rpx;
+  top: -34rpx;
 }
 
 .homepage_clipboard_illus_ruler {
@@ -152,7 +162,7 @@
   height: 57rpx;
   position: absolute;
   right: 77rpx;
-  bottom: -5rpx;
+  top: 537rpx;
 }
 
 .panel00200 {

pages/main/detail.json

@@ -2,5 +2,8 @@
   "navigationBarBackgroundColor": "#E5A744",
   "navigationBarTextStyle": "black",
   "navigationBarTitleText": "制作车间",
-  "backgroundColor": "#4F4745"
+  "backgroundColor": "#4F4745",
+  "backgroundColorTop": "#E5A744",
+  "backgroundColorBottom": "#4F4745"
+  
 }

pages/main/list.json

@@ -2,5 +2,7 @@
   "navigationBarBackgroundColor": "#9C5043",
   "navigationBarTextStyle": "white",
   "navigationBarTitleText": "题目仓库",
-  "backgroundColor": "#514a47"
+  "backgroundColor": "#514a47",
+  "backgroundColorTop": "#9C5043",
+  "backgroundColorBottom": "#514a47"
 }