chengjie 6 lat temu
rodzic
commit
664422e0c3

+ 1 - 1
app.js

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

+ 20 - 3
package4/main/activate.js

@@ -92,9 +92,26 @@ Page({
92
           for (var i = 0; i < productList.length; i++) {
92
           for (var i = 0; i < productList.length; i++) {
93
             productList[i].IsActivate = 1;
93
             productList[i].IsActivate = 1;
94
           }
94
           }
95
-          that.setData({
96
-            List: productList,
97
-          });
95
+
96
+          if (productList.length>0){
97
+            that.setData({
98
+              List: productList,
99
+            });
100
+          }
101
+          else{
102
+            wx.removeStorageSync("HasActivate");
103
+            wx.showModal({
104
+              title: '提醒',
105
+              content: '产品已激活。',
106
+              showCancel: false,
107
+              confirmText: "去首页",
108
+              success:function(){
109
+                wx.reLaunch({
110
+                  url: '../../pages/index/index',
111
+                })
112
+              }
113
+            });
114
+          }
98
         }
115
         }
99
       }
116
       }
100
       wx.hideLoading();
117
       wx.hideLoading();

+ 1 - 0
package4/main/giftcard.js

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

+ 4 - 4
package4/main/giftcard.wxml

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

+ 3 - 1
pages/main/default.json

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

+ 5 - 4
pages/main/default.wxml

@@ -21,14 +21,15 @@
21
         </view>
21
         </view>
22
         <view class="panel001 FlexRow">
22
         <view class="panel001 FlexRow">
23
           <view class="panel0010 FlexRow">
23
           <view class="panel0010 FlexRow">
24
-            <view class='panel00100'></view>
25
             <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" />
24
             <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" />
26
-            <view class='panel00101'></view>
27
           </view>
25
           </view>
28
         </view>
26
         </view>
27
+        <view class="panel0011">
28
+        </view>
29
         <image class="universalpic_line_zigzag_brown_down" src="../images/universalpic_line_zigzag_brown_down.png" />
29
         <image class="universalpic_line_zigzag_brown_down" src="../images/universalpic_line_zigzag_brown_down.png" />
30
         <image class="universalpic_line_zigzag_brown_up" src="../images/universalpic_line_zigzag_brown_up.png" />
30
         <image class="universalpic_line_zigzag_brown_up" src="../images/universalpic_line_zigzag_brown_up.png" />
31
-        <view class='panel00102'></view>
31
+        <view class="panel0011">
32
+        </view>
32
         <view class="panel002 FlexRow">
33
         <view class="panel002 FlexRow">
33
           <view class="panel0020 FlexRow">
34
           <view class="panel0020 FlexRow">
34
             <view class="panel00200 FlexColumn">
35
             <view class="panel00200 FlexColumn">
@@ -113,7 +114,7 @@
113
                 <image class="universalpic_indicator_maroon" src="../images/universalpic_indicator_pink.png" />
114
                 <image class="universalpic_indicator_maroon" src="../images/universalpic_indicator_pink.png" />
114
               </view>
115
               </view>
115
               <view class="line"></view>
116
               <view class="line"></view>
116
-              
117
+
117
             </block>
118
             </block>
118
           </view>
119
           </view>
119
         </view>
120
         </view>

+ 15 - 5
pages/main/default.wxss

@@ -31,7 +31,7 @@
31
 .panel {
31
 .panel {
32
   width: 100%;
32
   width: 100%;
33
   background-color: #583027;
33
   background-color: #583027;
34
-  height: 2634rpx;
34
+  height: 2654rpx;
35
   justify-content: flex-start;
35
   justify-content: flex-start;
36
 }
36
 }
37
 
37
 
@@ -89,12 +89,21 @@
89
 
89
 
90
 .panel001 {
90
 .panel001 {
91
   width: 100%;
91
   width: 100%;
92
-  height: 368rpx;
92
+  height: 398rpx;
93
   background-color: #723c30;
93
   background-color: #723c30;
94
+  align-items: flex-start;
94
 }
95
 }
95
 
96
 
96
 .panel0010 {
97
 .panel0010 {
97
   flex-wrap: wrap;
98
   flex-wrap: wrap;
99
+  margin: 50rpx 0 0 0;
100
+  background-color: #723c30;
101
+}
102
+
103
+.panel0011{
104
+  width:100%;
105
+  height:24rpx;
106
+  background-color: #723c30;
98
 }
107
 }
99
 
108
 
100
 .homepage_question_illus_grade01 {
109
 .homepage_question_illus_grade01 {
@@ -126,9 +135,10 @@
126
 }
135
 }
127
 .panel002 {
136
 .panel002 {
128
   width: 100%;
137
   width: 100%;
129
-  height: 638rpx;
138
+  height:698rpx;
130
   background-color: #723c30;
139
   background-color: #723c30;
131
   position: relative;
140
   position: relative;
141
+  align-items: flex-start;
132
 }
142
 }
133
 
143
 
134
 .panel0020 {
144
 .panel0020 {
@@ -144,7 +154,7 @@
144
   height: 116rpx;
154
   height: 116rpx;
145
   position: absolute;
155
   position: absolute;
146
   left: 230rpx;
156
   left: 230rpx;
147
-  top: -17rpx;
157
+  top: -34rpx;
148
 }
158
 }
149
 
159
 
150
 .homepage_clipboard_illus_ruler {
160
 .homepage_clipboard_illus_ruler {
@@ -152,7 +162,7 @@
152
   height: 57rpx;
162
   height: 57rpx;
153
   position: absolute;
163
   position: absolute;
154
   right: 77rpx;
164
   right: 77rpx;
155
-  bottom: -5rpx;
165
+  top: 537rpx;
156
 }
166
 }
157
 
167
 
158
 .panel00200 {
168
 .panel00200 {

+ 4 - 1
pages/main/detail.json

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

+ 3 - 1
pages/main/list.json

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