chengjie 6 years ago
parent
commit
29308ff944

+ 1 - 1
app.js

@@ -23,7 +23,7 @@ App({
23 23
     }
24 24
   },
25 25
   globalData: {
26
-    Version: "1.2.7",
26
+    Version: "1.2.8",
27 27
     IsProduction: true,
28 28
     ProgramID: 106,
29 29
     AppID: "wx313a8f2c0741efe1",

+ 2 - 1
app.json

@@ -27,7 +27,8 @@
27 27
     "wxb54a6d5aff836ee3",
28 28
     "wxa5e33c61fe37dd01",
29 29
     "wxaa1a8b48d9853872",
30
-    "wx80059777521b897c"
30
+    "wx80059777521b897c",
31
+    "wx84b3feac6069eec3"
31 32
   ],
32 33
   "subPackages": [
33 34
     {

+ 1 - 0
package4/main/payfinish.js

@@ -25,6 +25,7 @@ Page({
25 25
     }
26 26
     else if (paytype=="3"){
27 27
       app.globalData.userInfo.IsMember = 1;
28
+      app.globalData.IsLocked=0;
28 29
     }
29 30
   }, 
30 31
   onUnload: function () {

BIN
pages/images/10001.png


BIN
pages/images/home_banner.png


+ 1 - 1
pages/index/index.js

@@ -171,7 +171,7 @@ Page({
171 171
               isShow = 1;
172 172
             }
173 173
           }
174
-          app.globalData.IsShow = isShow;
174
+          app.globalData.userInfo.IsShow = isShow;
175 175
 
176 176
           app.globalData.IsLocked = data.IsLocked;
177 177
           

+ 1 - 1
pages/main/detail.js

@@ -111,7 +111,7 @@ Page({
111 111
     common.getStorageValue(this, "IsShare", 0, function () {
112 112
       if (that.data.IsShare == 0
113 113
         && app.globalData.userInfo.IsMember == 0
114
-        && app.globalData.IsShow == 1
114
+        && app.globalData.userInfo.IsShow == 1
115 115
         && app.globalData.IsLocked == 1
116 116
       ) {
117 117
         wx.navigateTo({

+ 2 - 2
pages/main/index.js

@@ -35,7 +35,7 @@ Page({
35 35
     var that = this;
36 36
     wx.getSetting({
37 37
       success(res) {
38
-        if (res.authSetting['scope.userInfo']) {
38
+        if (res.authSetting['scope.userInfo'] || app.globalData.userInfo.IsShow<=0) {
39 39
           that.setData({
40 40
             IsAccredit: true,
41 41
           });
@@ -61,7 +61,7 @@ Page({
61 61
   onShow: function () {
62 62
     this.setData({
63 63
       IsLocked: app.globalData.IsLocked,
64
-      IsShow: app.globalData.IsShow,
64
+      IsShow: app.globalData.userInfo.IsShow,
65 65
       IsMember: app.globalData.userInfo.IsMember
66 66
     });
67 67
 

+ 2 - 1
pages/main/index.wxml

@@ -143,9 +143,10 @@
143 143
     <view class="index6 FlexColumn">
144 144
       <image wx:if="{{item.ImageUrl}}" src='../images/{{item.ImageUrl}}' class="btn2" wx:for="{{ListProgram}}" wx:key="index" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' />
145 145
     </view>
146
+    <view style="height:100rpx;"></view>
146 147
   </block>
147 148
   <view class="index5 FlexColumn" wx:if="{{NavClass1!='nav2'}}">
148
-    <image src='../images/home_banner.png' class="home_banner" bindtap='switchProgram' data-appid='{{ListProgram[0].appId}}' data-path='{{ListProgram[0].path}}' />
149
+    <image mode="widthFix" src='../images/home_banner.png' class="home_banner" bindtap='switchProgram' data-appid='{{ListProgram[0].appId}}' data-path='{{ListProgram[0].path}}' />
149 150
   </view>
150 151
   
151 152
 </view>

+ 1 - 2
pages/main/index.wxss

@@ -26,7 +26,7 @@
26 26
 }
27 27
 
28 28
 .index1 .nav3{
29
-  border-bottom: 10rpx solid #0C5F73;
29
+  border-bottom: 10rpx solid #3D76C7;
30 30
 }
31 31
 
32 32
 .index1 .img{
@@ -354,7 +354,6 @@
354 354
 
355 355
 .home_banner{
356 356
    width:100%;
357
-   height:270rpx;
358 357
 }
359 358
 
360 359
 

+ 2 - 2
pages/main/list.js

@@ -15,7 +15,7 @@ Page({
15 15
       NavClass2: "nav2",
16 16
       IsShowNav1: true,
17 17
       BookID: bookID,
18
-      IsShow: app.globalData.IsShow,
18
+      IsShow: app.globalData.userInfo.IsShow,
19 19
     });
20 20
     common.getStorageValue(this, "IsRemind", true, function () { });
21 21
   },
@@ -119,7 +119,7 @@ Page({
119 119
   },
120 120
   goto: function (e) {
121 121
     var islocked = e.currentTarget.dataset.islocked;
122
-    if (islocked == 1 && app.globalData.IsShow == 1) {
122
+    if (islocked == 1 && app.globalData.userInfo.IsShow == 1) {
123 123
       wx.navigateTo({
124 124
         url: '../../package4/main/buyad',
125 125
       })

+ 1 - 1
pages/main/userinfo.js

@@ -14,7 +14,7 @@ Page({
14 14
       Containnerheight: common.getSystemHeight(),
15 15
       ProgramList: server.getProgramList(),
16 16
       ProgramID:app.globalData.ProgramID,
17
-      IsShow: app.globalData.IsShow,
17
+      IsShow: app.globalData.userInfo.IsShow,
18 18
       IsLocked: app.globalData.IsLocked,
19 19
     });
20 20
   },

+ 6 - 0
utils/main.js

@@ -192,6 +192,12 @@ function getProgramList() {
192 192
 
193 193
 function getProgramListOld() {
194 194
   var list = [
195
+    {
196
+      ID: 166,
197
+      ImageUrl: "10001.png",
198
+      appId: 'wx84b3feac6069eec3',
199
+      path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
200
+    },
195 201
     {
196 202
       ID: 164,
197 203
       ImageUrl: "03001.png",