chengjie 1 ano atrás
pai
commit
f01314d75b

+ 2 - 2
app.js

@@ -1,7 +1,7 @@
1 1
 App({
2 2
   globalData: {
3
-    Version: "1.0.34",
4
-    //IsProduction: true,
3
+    Version: "1.0.36",
4
+    IsProduction: true,
5 5
     ShareTitle: "上海中考招生信息查询工具",
6 6
     SharePath: "pages/index/index",
7 7
     ShareImage: '../images/fs_a01.png',

BIN
pages/images/ad_01.png


BIN
pages/images/ad_02.png


+ 2 - 8
pages/main/default.wxml

@@ -73,16 +73,10 @@
73 73
 
74 74
   <view class="panel2 FlexColumn">
75 75
 
76
-    <block wx:if="{{false}}">
76
+    <block wx:if="{{IsShow}}">
77 77
       <view class="panel20 FlexRow" bindtap="gotoMiniprogram">
78
-        <view class="panel201 FlexColumn">
79
-          <view class="panel2011">秒过其它产品介绍</view>
80
-          <view class="panel2012">秒过学习·艾宾浩斯背记小程序轻松记牢「高考考纲3500词」</view>
81
-          <view class="panel2013">报名新手班,手把手教会使用,助您中考后更进一步!</view>
82
-        </view>
83
-        <image src="../images/ad_02.png" class="ad_02"></image>
78
+        <image src="../images/ad_01.png" class="ad_01"></image>
84 79
       </view>
85
-      <image src="../images/line_03.png" class="line_03"></image>
86 80
     </block>
87 81
     
88 82
     <view class="panelBasicCss panel4 FlexColumn">

+ 4 - 22
pages/main/default.wxss

@@ -396,30 +396,12 @@
396 396
 
397 397
 .panel20{
398 398
   width:100%;
399
-  height: 344rpx;
400
-}
401
-.panel201{
402
-  width:398rpx;
403
-  align-items: flex-start;
404
-  margin-right: 30rpx;
405
-}
406
-.panel2011{
407
-  font-size:20rpx;
408
-  color:#787878;
409
-  margin-bottom: 20rpx;
410
-}
411
-.panel2012{
412
-  font-size:28rpx;
413
-  margin-bottom: 10rpx;
414
-}
415
-.panel2013{
416
-  font-size:24rpx;
417
-  font-weight: 400;
418 399
 }
419 400
 
420
-.ad_02{
421
-  width:241rpx;
422
-  height: 205rpx;
401
+.ad_01{
402
+  width: 690rpx;
403
+  height: 370rpx;
404
+  margin-top: 60rpx;
423 405
 }
424 406
 
425 407
 .line_03{

+ 1 - 1
pages/main/school.wxss

@@ -751,7 +751,7 @@
751 751
 
752 752
 .ad_01{
753 753
   width:710rpx;
754
-  height:400rpx;
754
+  height:370rpx;
755 755
   margin-top: 20rpx;
756 756
 }
757 757
 

+ 6 - 4
pages/main/scoreline.js

@@ -160,11 +160,13 @@ Page({
160 160
           }
161 161
   
162 162
           var pageCount=data.length;
163
-          if (that.data.ScoreTypeID==3)
164
-            pageCount=app.globalData.PageCount;
165
-          
163
+          if (that.data.ScoreTypeID==3){
164
+            if (that.data.DistrictID==11)//浦东太特殊,减少加载数量
165
+              pageCount=50;
166
+            else
167
+              pageCount=app.globalData.PageCount;
168
+          }
166 169
           //debugger;
167
-
168 170
           var isContrastNull=false;
169 171
           if (data.length==0 && that.data.SchoolCount>0)
170 172
             isContrastNull=true;