1.0.13

app.js

@@ -3,7 +3,6 @@ App({
   globalData: {
     Version: "1.0.13",
     //IsProduction: true,
-    IsProduction: false,
     ShareTitle: "上海中考招生信息查询工具",
     SharePath: "pages/index/index",
     ShareImage: '../images/fs_a01.png',
@@ -23,16 +22,18 @@ App({
     userInfo: null,
     Key: "kylx365_chengjie",
     IV: "kylx365hongliren",
-    SourceID: 0,//来源ID
-    IsGoto:true,//可以跳转
-    WebViewUrl:"",//webview的链接
-    PageCount:100,//每一页翻页数
-    MyWish:{},//我的福帖
+    SourceID: 0, //来源ID
+    IsGoto: true, //可以跳转
+    WebViewUrl: "", //webview的链接
+    PageCount: 100, //每一页翻页数
+    TempParam: "", //临时参数
+    MyWish: {}, //我的福帖
+
   },
   onLaunch: function (options) {
     this.getSystemInfo();
   },
-  onShow: function(options) {
+  onShow: function (options) {
     if (options && options.scene) {
       this.globalData.userSource = options.scene;
       console.log("options.scene2:" + options.scene);
@@ -41,28 +42,27 @@ App({
   getSystemInfo: function () {
     this.globalData.systemInfo = wx.getSystemInfoSync();
     if (this.globalData.systemInfo.system.indexOf("Android") >= 0) {
-      this.globalData.IsIOS =false;
-      this.globalData.IsAndroid=true;
-    }
-    else if (this.globalData.systemInfo.system.indexOf("iOS") >= 0) {
+      this.globalData.IsIOS = false;
+      this.globalData.IsAndroid = true;
+    } else if (this.globalData.systemInfo.system.indexOf("iOS") >= 0) {
       this.globalData.IsIOS = true;
-      this.globalData.IsAndroid=false;
+      this.globalData.IsAndroid = false;
 
-      if (this.globalData.systemInfo.model.indexOf("X") >= 0
-        || this.globalData.systemInfo.model.indexOf("11") >= 0
-        || this.globalData.systemInfo.model.indexOf("12") >= 0
-        || this.globalData.systemInfo.model.indexOf("13") >= 0 
-        || this.globalData.systemInfo.model.indexOf("14") >= 0)
-        this.globalData.IsIPhoneX=true;
+      if (this.globalData.systemInfo.model.indexOf("X") >= 0 ||
+        this.globalData.systemInfo.model.indexOf("11") >= 0 ||
+        this.globalData.systemInfo.model.indexOf("12") >= 0 ||
+        this.globalData.systemInfo.model.indexOf("13") >= 0 ||
+        this.globalData.systemInfo.model.indexOf("14") >= 0)
+        this.globalData.IsIPhoneX = true;
     }
 
-    if (this.globalData.systemInfo.model.indexOf("iPad")>=0){
-      this.globalData.IsIPad=true;
+    if (this.globalData.systemInfo.model.indexOf("iPad") >= 0) {
+      this.globalData.IsIPad = true;
     }
 
-    if (this.globalData.systemInfo.brand.indexOf("OPPO")>=0){
-      this.globalData.IsOppo=true;
+    if (this.globalData.systemInfo.brand.indexOf("OPPO") >= 0) {
+      this.globalData.IsOppo = true;
     }
   }
 
-})
+})

pages/main/default.js

@@ -31,6 +31,9 @@ Page({
 
     that.getWish();
   },
+  onShow:function(){
+    this.getWish();
+  },
   getWish:function(){
     var that = this;
     main.getData("GetMPSWish?WishType=all", function (data) {

pages/main/default.wxml

@@ -76,7 +76,7 @@
       </view>
     </view>
     <view style="height:30rpx;"></view>
-    <view class="panel1133 FlexRow" bindtap="goto" data-url="userinfo">
+    <view class="panel1133 FlexRow" bindtap="goto" data-url="userinfo?ReturnCount=1">
       <view class="text03 text031">编辑用户信息</view>
       <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
     </view>

pages/main/default.wxss

@@ -151,7 +151,6 @@
   border-top-left-radius: 30rpx;
   border-top-right-radius: 30rpx;
   background-color: #fff;
-  min-height: 576rpx;
   margin-top: 40rpx;
   justify-content: flex-start;
   position: relative;
@@ -186,7 +185,7 @@
 
 .panel1142{
   justify-content: flex-start;
-  margin-top: 40rpx;
+  margin: 40rpx 0 30rpx 0;
 }
 
 .panel11420{
@@ -228,7 +227,7 @@
   position: absolute;
   bottom:0;
   width:750rpx;
-  height:20rpx;
+  height:26rpx;
   background-color:rgba(0,0,0,0.1);
   justify-content: flex-end;
 }
@@ -315,3 +314,9 @@
   font-weight: 400;
   color:#787878;
 }
+
+.arrowRight{
+  width:16rpx;
+  height:26rpx;
+  margin-right: 60rpx;
+}

pages/main/feedback.wxml

@@ -14,7 +14,7 @@
   <view class="panelBasicCss panel2 FlexColumn">
     <view class="text01">留言</view>
     <view class="panelLine3"></view>
-    <textarea class="text02" bindinput="bindKeyInput" value="{{InputValue}}" maxlength="800" placeholder="请填写至少5个汉字以上内容，以便我们准确理解您的意思。" placeholder-style="color:#787878;font-size:28rpx;font-weight:400;" />
+    <textarea class="text02" bindinput="bindKeyInput" value="{{InputValue}}" maxlength="800" placeholder="请填写至少5个汉字以上内容，以便我们准确理解您的意思。" placeholder-style="color:#9b9b9b;font-size:28rpx;font-weight:400;" />
   </view>
   <view class="panelBasicCss panel3 FlexColumn">
     <view class="panel31 FlexRow">
@@ -38,7 +38,7 @@
     <view class="text01">联系方式</view>
     <view class="text05">劳烦提供截图，并将错处做个记号。万分感谢。</view>
     <view class="panelLine3"></view>
-    <textarea class="text06" bindinput="bindKeyInput2" value="{{InputValue2}}" maxlength="100" placeholder="微信号（首选）、邮箱" placeholder-style="color:#787878;font-size:28rpx;font-weight:400;" />
+    <textarea class="text06" bindinput="bindKeyInput2" value="{{InputValue2}}" maxlength="100" placeholder="微信号（首选）、邮箱" placeholder-style="color:#9b9b9b;font-size:28rpx;font-weight:400;" />
   </view>
   
   <view class="btn" bindtap="saveFeedback">提交</view>

pages/main/school.wxml

@@ -68,14 +68,14 @@
           <view class="text02">{{item.WishWhom}}</view>
           <view class="text02">{{item.SchoolShortName}}</view>
         </view>
-        <view class="panel11423">{{item.WishContentItem}}</view>
+        <view class="panel11423" wx:if="{{item.WishContentItem}}">{{item.WishContentItem}}</view>
       </view>
       
     </view>
 
     <view class="panelSchoolLine02"></view>
     <view class="panelSchoolText13 panelSchoolText1311 FlexColumn">
-      <view class="panel114221" wx:if="{{!HasWish}}">来祝福自己、孩子、同学上本校吧</view>
+      <view class="panel114221" wx:if="{{!HasWish}}">来祝福孩子、自己、同学考上本校吧</view>
       <block wx:if="{{HasWish}}">
         <view class="panel11422 FlexRow" bindtap="unfoldWish" wx:if="{{!IsWishFold}}">
           <image class="icon_fold_05" src="../images/icon_fold_05.png"></image>

pages/main/userinfo.js

@@ -4,53 +4,64 @@ import main from '../../utils/main';
 const app = getApp();
 
 Page({
-  data: {
- },
+  data: {},
   onLoad: function (options) {
 
     var that = this;
-    var nickname=app.globalData.userInfo.NickName;
-    if (app.globalData.userInfo.NickName=="陌生用户")
-      nickname="";
+    var nickname = app.globalData.userInfo.NickName;
+    if (app.globalData.userInfo.NickName == "陌生用户")
+      nickname = "";
     this.setData({
       Containnerheight: main.getWindowHeight(),
+      ReturnCount:options.ReturnCount,
       NickName: nickname,
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
   },
-  onChooseAvatar:function(e){
+  onChooseAvatar: function (e) {
     var that = this;
     console.log(e);
     that.uploadFileToServer(e.detail.avatarUrl, function (data) {
       if (data) {
         //console.log(data.Target);
-        setTimeout(function(){
+        setTimeout(function () {
           that.setData({
-            AvatarUrl:app.globalData.uploadImageUrl + data.Target,
+            AvatarUrl: app.globalData.uploadImageUrl + data.Target,
           });
-        },1000);
+        }, 1000);
       }
     });
   },
   onKeyInput: function (e) {
-    var that=this;
-    var nickname = e.detail.value;    
+    var that = this;
+    var nickname = e.detail.value;
     that.setData({
       NickName: nickname,
     });
   },
-  save:function(){
-    var that=this;
-    app.globalData.userInfo.NickName=that.data.NickName;
-    app.globalData.userInfo.AvatarUrl=that.data.AvatarUrl;
-    
-    var param={};
-    param.NickName=app.globalData.userInfo.NickName;
-    param.AvatarUrl=app.globalData.userInfo.AvatarUrl;
-    //debugger;
-    main.postData('UpdateMPSUserNickNameAndAvatar?UserID=' + app.globalData.userInfo.UserID, param, function (data) {
-      that.gotoReturn();
-    });
+  save: function () {
+    var that = this;
+    if (!that.data.NickName || that.data.NickName==""){
+      wx.showToast({
+        title: "请写昵称",
+        duration: 2000,
+        image: "../images/universalpic_exclamation_white_120x120.png",
+      });
+    } else {
+      app.globalData.userInfo.NickName = that.data.NickName;
+      app.globalData.userInfo.AvatarUrl = that.data.AvatarUrl;
+
+      var param = {};
+      param.NickName = app.globalData.userInfo.NickName;
+      param.AvatarUrl = app.globalData.userInfo.AvatarUrl;
+      //debugger;
+      main.postData('UpdateMPSUserNickNameAndAvatar?UserID=' + app.globalData.userInfo.UserID, param, function (data) {
+        that.setData({
+          ReturnCount:1,
+        });
+        that.gotoReturn();
+      });
+    }
   },
   uploadFileToServer: function (file, callback) {
     var url = common.Encrypt("MiaoguoUploadFile2");
@@ -86,7 +97,9 @@ Page({
       }
     });
   },
-  gotoReturn:function(){
+  gotoReturn: function () {
+    if (this.data.ReturnCount==2)
+      app.globalData.TempParam="return";
     wx.navigateBack({
       delta: 1
     });

pages/main/userinfo.wxml

@@ -8,10 +8,10 @@
   <view class="line1"></view>
   <view class="panel2 panel1 FlexRow">
     <view class="text3">用户昵称</view>
-    <input type="nickname" class="weui-input" placeholder-class="placeholder" bindinput="onKeyInput" placeholder="没有名字" value="{{NickName}}" />
+    <input type="nickname" onBlur="" bindinput="onKeyInput" class="weui-input" placeholder-class="placeholder" placeholder="填写昵称" value="{{NickName}}" />
   </view>
   <view class="line2 line1"></view>
 
-  <view class="btn1" bindtap="save">登录</view>
+  <view class="btn1" bindtap="save">确定</view>
   <view class="btn2" bindtap="gotoReturn">放弃</view>
 </view>

pages/main/userinfo.wxss

@@ -20,7 +20,7 @@
 }
 
 .avatar-wrapper{
-  width: 100rpx;
+  width: 500rpx;
   margin: 0rpx;
   padding: 0rpx;
   background-color: #F8C324;
@@ -30,7 +30,7 @@
 button:not([size=mini]) {
   margin-left: 0;
   margin-right: 0;
-  width: 100rpx;
+  width: 500rpx;
 }
 
 .avatar{
@@ -49,8 +49,9 @@ button:not([size=mini]) {
 
 
 .weui-input{
-  width:400rpx;
+  width:500rpx;
   text-align: right;
+  color:#8E6011;
 }
 
 .placeholder{

pages/main/wish.js

@@ -11,16 +11,6 @@ Page({
     InputValue: "",
     ToWhomIndex: 0,
     IsOpen: true,
-    ArrToWhom: [{
-      Name: "给孩子",
-      CSS: "btn11"
-    }, {
-      Name: "给自己",
-      CSS: ""
-    }, {
-      Name: "给同学",
-      CSS: ""
-    }],
   },
   onLoad: function (options) {
     var that = this;
@@ -28,14 +18,25 @@ Page({
       Containnerheight: main.getWindowHeight(),
       SchoolID: options.SchoolID,
       ID: 0,
+      ArrToWhom: [{
+        Name: "给孩子",CSS: "btn11"
+      }, {
+        Name: "给自己",CSS: ""
+      }, {
+        Name: "给同学",CSS: ""
+      }],
     });
 
     if (options.type == "edit") {
       var mywish = app.globalData.MyWish;
 
       for (var i = 0; i < that.data.ArrToWhom.length; i++) {
-        if (mywish.ToWhom == that.data.ArrToWhom[i].Name)
+        if (mywish.ToWhom == that.data.ArrToWhom[i].Name){
           that.data.ArrToWhom[i].CSS = "btn11";
+          that.data.ToWhomIndex=i;
+        }
+        else
+          that.data.ArrToWhom[i].CSS = "";
       }
 
       that.setData({
@@ -44,10 +45,24 @@ Page({
         SchoolID: mywish.SchoolID,
         IsOpen: mywish.IsOpen ? true : false,
         ArrToWhom: that.data.ArrToWhom,
+        ToWhomIndex:that.data.ToWhomIndex,
         ID: mywish.ID,
       });
     }
   },
+  onShow:function(){
+    if (app.globalData.TempParam=="return"){
+      app.globalData.TempParam="";
+      wx.navigateBack({
+        delta: 1
+      });
+    }
+    else if (app.globalData.userInfo.NickName == "陌生用户") {
+      wx.navigateTo({
+        url: 'userinfo?ReturnCount=2',
+      });
+    }
+  },
   selectToWhom: function (event) {
     var index = event.currentTarget.dataset.index;
     this.data.ArrToWhom[0].CSS = "";
@@ -104,7 +119,7 @@ Page({
               wx.showToast({
                 title: data.errmsg,
                 duration: 2000,
-                image: "../images/universalpic_wrong_white_120x120.png",
+                image: "../images/universalpic_exclamation_white_120x120.png",
               });
               if (num == 1)
                 isViolate1 = true;
@@ -132,30 +147,24 @@ Page({
         confirmText: '返回',
       });
     } else {
+      var param = {};
+      param.ID = that.data.ID;
+      param.UserID = app.globalData.userInfo.UserID;
+      param.SchoolID = that.data.SchoolID;
+      param.ToWhom = that.data.ArrToWhom[that.data.ToWhomIndex].Name;
+      param.ToName = that.data.inputName;
+      param.WishContent = that.data.inputContent;
+      param.IsOpen = that.data.IsOpen ? 1 : 0;
 
-      if (app.globalData.userInfo.NickName == "陌生用户") {
-        wx.navigateTo({
-          url: 'userinfo',
-        });
-      } else {
-        var param = {};
-        param.ID = that.data.ID;
-        param.UserID = app.globalData.userInfo.UserID;
-        param.SchoolID = that.data.SchoolID;
-        param.ToWhom = that.data.ArrToWhom[that.data.ToWhomIndex].Name;
-        param.ToName = that.data.inputName;
-        param.WishContent = that.data.inputContent;
-        param.IsOpen = that.data.IsOpen ? 1 : 0;
-
-        console.log(param);
-        main.postData('MPSWish', param, function (data) {
-          app.globalData.MyWish = data;
-          //debugger;
-          wx.redirectTo({
-            url: './wishinfo',
-          })
-        });
-      }
+      console.log(param);
+      main.postData('MPSWish', param, function (data) {
+        app.globalData.MyWish = data;
+        //debugger;
+        wx.redirectTo({
+          url: './wishinfo',
+        })
+      });
+      
     }
   },
   onShareAppMessage: function () {

pages/main/wish.wxml

@@ -7,9 +7,9 @@
   </view>
 
   <view class="panelBasicCss panelMain FlexColumn">
-    <view class="panelSchoolText08">被祝福者的名字（选填）</view>
+    <view class="panelSchoolText08">Ta的名字（选填）</view>
     <view class="panelSchoolLine02"></view>
-    <textarea maxlength="100" value="{{inputName}}" bindinput="bindKeyInputName" class="Input" placeholder-style="color:#787878;font-weight:400;" placeholder="可填写孩子的名字、自己的名字、同学的名字、大家的名字、学校的名字、学生的名字、班级的名字等" name="textarea"/>
+    <textarea maxlength="100" value="{{inputName}}" bindinput="bindKeyInputName" class="Input" placeholder-style="color:#9b9b9b;font-weight:400;" placeholder="可填写被祝福者的名字，比如孩子的名字，或自己的、同学的、学校的、学生的、班级的名字" name="textarea"/>
     
   </view>
   
@@ -20,16 +20,16 @@
       随机祝福语
     </view>
     <view class="panelSchoolLine02"></view>
-    <textarea maxlength="1000" value="{{inputContent}}" bindinput="bindKeyInputContent" class="Input Input2" placeholder-style="color:#787878;font-weight:400;" placeholder="可填写更具体的祝福内容" name="textarea"/>
+    <textarea maxlength="1000" value="{{inputContent}}" bindinput="bindKeyInputContent" class="Input Input2" placeholder-style="color:#9b9b9b;font-weight:400;" placeholder="可填写更具体的祝福内容" name="textarea"/>
     
   </view>
 
   <view class="panelWish1 FlexRow" bindtap="clickCheckbox">
-    <view wx:if="{{!IsOpen}}" class="checkbox"></view>
-    <view wx:if="{{IsOpen}}" class="checkbox checkbox1 FlexRow">
+    <view wx:if="{{IsOpen}}" class="checkbox"></view>
+    <view wx:if="{{!IsOpen}}" class="checkbox checkbox1 FlexRow">
       <image class="icon_check_01" src="../images/icon_check_01.png"></image>
     </view>
-    <view class="panelWish11">名字和祝福语仅自己可见（转发除外）。</view>
+    <text class="panelWish11">在主页中隐藏名字和祝福语，仅显示在我的福帖中。\n福帖内容仅自己可见（自己主动转发福帖给他人时除外）。</text>
   </view>
 
   <view class="panelWish2 FlexRow" bindtap="onSubmit">

pages/main/wish.wxss

@@ -37,6 +37,7 @@
   height:120rpx;
   margin: 30rpx 0 50rpx 0;
   font-size:28rpx;
+  font-weight:400;
 }
 
 .placeholder{
@@ -73,6 +74,7 @@
   width:100%;
   margin: 30rpx 0 0 0;
   justify-content: flex-start;
+  align-items: flex-start;
 }
 
 .cbIsOpen{
@@ -83,6 +85,7 @@
 .panelWish11{
   font-size: 24rpx;
   font-weight: 400;
+  width:624rpx;
 }
 
 .panelWish2{

pages/main/wishinfo.js

@@ -16,6 +16,13 @@ Page({
       IsShare:options.Share
     });
   },
+  onPullDownRefresh: function () {
+    var that=this;
+    that.saveLikeNum(function(){
+      that.onShow();
+    });    
+    wx.stopPullDownRefresh();
+  },
   onShow:function(){
     var that = this;
     
@@ -62,7 +69,6 @@ Page({
         delta: 3,
       });
     }
-  
     main.goto(e);
   },
   gotoRedirectTo:function(e){
@@ -74,8 +80,11 @@ Page({
   clickLikeNum:function(){
     var that=this;
     this.animateSmallShow();
+    var count=++that.data.LikeNum;
+    if (count>9999)
+      count=9999;
     that.setData({
-      LikeNum:++that.data.LikeNum
+      LikeNum:count,
     });
     if (isUpdate){
       isUpdate=false;
@@ -85,12 +94,14 @@ Page({
       that.saveLikeNum();
     }
   },
-  saveLikeNum:function(){
+  saveLikeNum:function(callback){
     var that = this;
     var likeNumAdd=that.data.LikeNum-historyLikeNum;
     main.getData("UpdateMPSWishLikeNum?ID="+that.data.ID+"&LikeNumAdd="+likeNumAdd, function (data2) {
       console.log(that.data.LikeNum);
       historyLikeNum=that.data.LikeNum;
+      if (callback)
+        callback();
     });
   },
   //动画缩小淡出

pages/main/wishinfo.json

@@ -2,5 +2,6 @@
   "navigationBarTitleText": "",
   "navigationBarBackgroundColor":"#DB1824",
   "backgroundColorTop":"#DB1824",
-  "backgroundColorBottom":"#DB1824"
+  "backgroundColorBottom":"#DB1824",
+  "enablePullDownRefresh": true
 }

pages/main/wishinfo.wxss

@@ -1,3 +1,7 @@
+page{
+  background-color: #DB1824;
+}
+
 .container{
   background-color: #DB1824;
   color:#FBF0E1;
@@ -14,14 +18,18 @@
   width:580rpx;
   text-align: center;
   margin-top: 60rpx;
+  text-shadow: 0 5rpx 0 #BD0E19;
 }
 .text02{
   font-size: 96rpx;
   margin-top: 0rpx;
+  text-shadow: 0 7rpx 0 #BD0E19;
 }
 .text03{
   font-size: 32rpx;
   margin-top: 30rpx;
+  font-weight: 400;
+  text-shadow: 0 3rpx 0 #BD0E19;
 }
 
 .panel1{