1.0.15

app.js

@@ -1,7 +1,7 @@
 // app.js
 App({
   globalData: {
-    Version: "1.0.13",
+    Version: "1.0.15",
     IsProduction: true,
     ShareTitle: "上海中考招生信息查询工具",
     SharePath: "pages/index/index",

app.json

@@ -3,9 +3,9 @@
     "pages/index/index",
     "pages/main/userinfo",
     "pages/main/wishAll",
-    "pages/main/wish",
     "pages/main/wishinfo",
     "pages/main/webview",
+    "pages/main/wishAdd",
     "pages/main/docs",
     "pages/main/search",
     "pages/main/collect",

pages/index/index.js

@@ -176,10 +176,8 @@ Page({
               isShow = 1;
             }
           }
-
+          //debugger;
           app.globalData.userInfo.IsShow = isShow;
-          if (app.globalData.userInfo.IsMember == 1)
-            app.globalData.IsLocked = 0;
 
           wx.removeStorageSync("UserID");
           wx.removeStorageSync("UserName");

pages/main/default.js

@@ -9,12 +9,13 @@ Page({
     ImagePath: app.globalData.uploadImageUrl,
     ArticleList:constant.arrArticleList,
     District:constant.arrDistrict,  
-    Version:app.globalData.Version,  
+    Version:app.globalData.Version,
   },
   onLoad: function (options) {
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      IsShow:app.globalData.userInfo.IsShow,
     });
 
     if (app.globalData.GotoUrl) {

pages/main/default.wxml

@@ -34,7 +34,7 @@
       
     </view>
 
-    <view class="panel114 FlexColumn">
+    <view class="panel114 FlexColumn" wx:if="{{IsShow}}">
       <view class="panel1141 FlexColumn">
         <view class="text12">中考祝福</view>
         <view class="line06"></view>

pages/main/default.wxss

@@ -200,10 +200,10 @@
 }
 .panel11421_1{
   width:540rpx;
+  line-height: 33rpx;
 }
 
 .avatar{
-  margin-top: 5rpx;
   border-radius: 50%;
   width:40rpx;
   height:40rpx;

pages/main/school.js

@@ -19,6 +19,7 @@ Page({
     var that = this;
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      IsShow:app.globalData.userInfo.IsShow,
       SchoolID:options.ID,
       IsCollect:false,
       HasWish:false,

pages/main/school.wxml

@@ -55,9 +55,9 @@
     <view style="height: 20rpx;"></view>
   </view>
 
-  <view class="panel114 panelBasicCss panelMain FlexColumn">
+  <view class="panel114 panelBasicCss panelMain FlexColumn" wx:if="{{Info.SchoolType1=='高中' && IsShow}}">
     <view class="panelSchoolText08">中考祝福</view>
-    <view wx:if="{{!HasWish}}" class="btnMyWish FlexRow" bindtap="goto" data-url="./wish?SchoolID={{Info.ID}}">我要祝福</view>
+    <view wx:if="{{!HasWish}}" class="btnMyWish FlexRow" bindtap="goto" data-url="./wishAdd?SchoolID={{Info.ID}}">我要祝福</view>
     <view wx:if="{{HasWish}}" class="btnMyWish btnMyWish2 FlexRow" bindtap="goto" data-url="./wishinfo">
       <image class="icon_share_03" src="../images/icon_share_03.png"></image>
       我的福帖

pages/main/school.wxss

@@ -501,10 +501,10 @@
 }
 .panel11421_1{
   width:580rpx;
+  line-height:33rpx;
 }
 
 .avatar{
-  margin-top: 5rpx;
   border-radius: 50%;
   width:40rpx;
   height:40rpx;

pages/main/wish.json

@@ -1,3 +0,0 @@
-{
-  "navigationBarTitleText": "中考祝福"
-}

pages/main/wish.js

@@ -11,11 +11,14 @@ Page({
     InputValue: "",
     ToWhomIndex: 0,
     IsOpen: true,
+    IsShow:0,
   },
   onLoad: function (options) {
     var that = this;
+    
     that.setData({
       Containnerheight: main.getWindowHeight(),
+      IsShow:app.globalData.userInfo.IsShow,
       SchoolID: options.SchoolID,
       ID: 0,
       ArrToWhom: [{
@@ -27,6 +30,8 @@ Page({
       }],
     });
 
+    
+
     if (options.type == "edit") {
       var mywish = app.globalData.MyWish;
 
@@ -49,6 +54,12 @@ Page({
         ID: mywish.ID,
       });
     }
+
+    if (app.globalData.userInfo.IsShow){
+      wx.setNavigationBarTitle({
+        title: "中考祝福",
+      });
+    }
   },
   onShow:function(){
     if (app.globalData.TempParam=="return"){

pages/main/wishAdd.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": ""
+}

pages/main/wish.wxml

@@ -1,4 +1,4 @@
-<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' wx:if="{{IsShow}}">
   <view class="panelBasicCss panelMain FlexColumn">
     <view class="panelSchoolText08">祝福送给谁</view>
     <view class="panel11 FlexRow">

pages/main/wishAll.wxss

@@ -19,7 +19,7 @@
 }
 .panel11421_1{
   width:620rpx;
-  line-height: 35rpx;
+  line-height: 33rpx;
   margin-top: 3rpx;
 }
 

pages/main/wishinfo.wxml

@@ -12,7 +12,7 @@
   </view>
 
   <block wx:if="{{MyWish.UserID==UserID && !IsShare}}">
-    <view class="text05" bindtap="gotoRedirectTo" data-url="./wish?type=edit">修改祝福</view>
+    <view class="text05" bindtap="gotoRedirectTo" data-url="./wishAdd?type=edit">修改祝福</view>
     <view class="line"></view>
   </block>