1.0.13

app.js

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

app.json

@@ -2,6 +2,7 @@
   "pages": [
     "pages/index/index",
     "pages/main/userinfo",
+    "pages/main/wishAll",
     "pages/main/wish",
     "pages/main/wishinfo",
     "pages/main/webview",

pages/main/default.wxml

@@ -45,9 +45,11 @@
           <view class="avatar FlexRow">
             <image class="avatarIcon" src="{{item.AvatarUrl}}"></image>
           </view>
-          <view class="nickName">{{item.NickName}}</view>
-          <view class="text01">{{item.WishWhom}}</view>
-          <view class="text01 text13">{{item.SchoolShortName}}</view>
+          <text class="panel11421_1">
+            <text class="nickName">{{item.NickName2}}</text>
+            <text class="text01">{{item.WishWhom}}</text>
+            <text class="text01 text13">{{item.SchoolShortName}}</text>
+          </text>
         </view>
       </view>
     </view>

pages/main/default.wxss

@@ -194,11 +194,16 @@
 
 .panel11421{
   justify-content: flex-start;
+  align-items: flex-start;
   width:590rpx;
   margin-bottom: 30rpx;
 }
+.panel11421_1{
+  width:540rpx;
+}
 
 .avatar{
+  margin-top: 5rpx;
   border-radius: 50%;
   width:40rpx;
   height:40rpx;

pages/main/school.js

@@ -22,7 +22,6 @@ Page({
       SchoolID:options.ID,
       IsCollect:false,
       HasWish:false,
-      IsWishFold:false,
     });
     if (!options.ID){
       wx.navigateBack({
@@ -174,12 +173,6 @@ Page({
       }
     });   
   },
-  unfoldWish:function(){
-    this.setData({
-      WishHeight:"height:auto;min-height:221rpx;",
-      IsWishFold:true,
-    });
-  },
   onFold:function(e){
     var that=this;
     that.setData({
@@ -223,13 +216,11 @@ Page({
             app.globalData.MyWish=data2[0];
             that.setData({
               HasWish: true,
-              WishHeight:"height:auto;min-height:221rpx;",
             });
           }
           else{
             that.setData({
               HasWish: false,
-              WishHeight:"height:auto;",
             });
           }
         });

pages/main/school.wxml

@@ -2,9 +2,8 @@
 
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="panelSchool1 panelBasicCss FlexColumn">
-    
+
     <image wx:if="{{Info.ImageUrl && Info.SchoolType1=='高中'}}" class="panelSchoolImage" src="{{ImagePath}}web/_School/{{Info.ImageUrl}}"></image>
-    <image wx:if="{{Info.ImageLogo && Info.SchoolType1=='高中'}}" class="panelSchoolLogo" src="{{ImagePath}}web/_School/{{Info.ImageLogo}}"></image>
     
     <view wx:if="{{!Info.ImageUrl && Info.SchoolType1=='高中'}}" class="panelNullImage FlexColumn">
       <image class="icon_sys_13" src="../images/icon_sys_13.png"></image>
@@ -12,6 +11,8 @@
 
       <view class="btnHelp" bindtap="goto" data-url="feedback?type=1">帮忙补充</view>
     </view>
+    <image wx:if="{{Info.ImageLogo && Info.SchoolType1=='高中'}}" class="panelSchoolLogo" src="{{ImagePath}}web/_School/{{Info.ImageLogo}}"></image>
+
     <view class="panelSchoolText01">{{Info.SchoolFullName}}</view>
     <view class="panelSchool11 FlexRow">
       <view class="panelSchoolText02">{{Info.District}}</view>
@@ -24,12 +25,14 @@
         <view class="panelSchoolText02">{{Info.SchoolType1}}</view>
       </block>
     </view>
-    <view wx:if="{{Info.SchoolType2}}" class="panelSchoolText03">{{Info.SchoolType2}}<block wx:if="{{Info.SchoolType2Short!='一般高中'}}">（{{Info.SchoolType2Short}}）</block></view>
+    <view wx:if="{{Info.SchoolType2}}" class="panelSchoolText03">{{Info.SchoolType2}}<block wx:if="{{Info.SchoolType2Short!='一般高中'}}">（{{Info.SchoolType2Short}}）</block>
+    </view>
     <view wx:if="{{Info.SchoolType1=='高中'}}" class="panelSchool12 FlexRow">
       <view class="panelSchool121 FlexColumn">
         <view class="panelSchoolText04">学校简称</view>
         <text class="panelSchoolText05">{{Info.SchoolShortName}}
-        <block wx:if="{{0}}">\n{{Info.SchoolOtherName}}</block></text>
+          <block wx:if="{{0}}">\n{{Info.SchoolOtherName}}</block>
+        </text>
       </view>
       <view class="FlexColumn">
         <view class="panelSchoolText04">招生代码</view>
@@ -44,7 +47,9 @@
     <view wx:if="{{!Info.HasSameName}}" style="height: 30rpx;"></view>
     <view wx:if="{{Info.HasSameName}}" class="panelMarginTop panelLine"></view>
     <view wx:if="{{Info.HasSameName}}" class="panelSchool13 FlexRow" bindtap="goto" data-url="school?PageType={{PageType}}&ID={{Info.HasSameName}}">
-      <view class="panelSchool41">同校<block wx:if="{{Info.SchoolType1=='高中'}}">初中</block><block wx:if="{{Info.SchoolType1=='初中'}}">高中</block>部主页</view>
+      <view class="panelSchool41">同校<block wx:if="{{Info.SchoolType1=='高中'}}">初中</block>
+        <block wx:if="{{Info.SchoolType1=='初中'}}">高中</block>部主页
+      </view>
       <image class="arrowRight" src="../images/icon_nextpage_1.png"></image>
     </view>
     <view style="height: 20rpx;"></view>
@@ -58,37 +63,31 @@
       我的福帖
     </view>
 
-    <view class="panel1142 FlexColumn" style="{{WishHeight}}">
+    <view class="panel1142 FlexColumn">
       <view class="panel11420 FlexColumn" wx:for="{{WishList}}" wx:key="*this">
         <view class="panel11421 FlexRow">
           <view class="avatar FlexRow">
             <image class="avatarIcon" src="{{item.AvatarUrl}}"></image>
           </view>
-          <view class="nickName">{{item.NickName}}</view>
-          <view class="text02">{{item.WishWhom}}</view>
-          <view class="text02">{{item.SchoolShortName}}</view>
+          <text class="panel11421_1">
+            <text class="nickName">{{item.NickName2}}</text>
+            <text class="text02">{{item.WishWhom}}</text>
+            <text class="text02">{{item.SchoolShortName}}</text>
+          </text>
         </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="{{WishList.length==0}}">来祝福孩子、自己、同学考上本校吧</view>
-      <block wx:if="{{WishList.length>0}}">
-        <view class="panel11422 FlexRow" bindtap="unfoldWish" wx:if="{{!IsWishFold}}">
-          <image class="icon_fold_05" src="../images/icon_fold_05.png"></image>
-          展开
-        </view>
-        <view class="panel11422 FlexRow" bindtap="freshWish"  wx:if="{{IsWishFold && WishList.length>10}}">
-          <image class="icon_refresh_01" src="../images/icon_refresh_01.png"></image>
-          换一批
-        </view>
-        
-        <view class="panel114221">{{WishList.length}}条祝福</view>
-      </block>
+      <view class="panel114222 FlexRow" wx:if="{{WishList.length>0}}" bindtap="goto" data-url="./wishAll?SchoolID={{SchoolID}}">
+        <view>全部祝福 {{WishList[0].RowCount}} </view>
+        <image class="icon_nextpage_4" src="../images/icon_nextpage_4.png"></image>
+      </view>
     </view>
+    <view style="height:10rpx;"></view>
   </view>
 
   <view class="panelBasicCss panelMain FlexColumn" wx:if="{{Info.HasData}}">
@@ -118,7 +117,7 @@
       <view class="panelSchool31 FlexRow">
         <block wx:for="{{ScoreType}}" wx:key="index">
           <view class="panelSchoolText11 panelSchoolText111" wx:if="{{Info[item.Name][Info[item.Name].length-1].Total}}">
-          {{Info[item.Name][Info[item.Name].length-1].Total}}
+            {{Info[item.Name][Info[item.Name].length-1].Total}}
           </view>
           <view class="panelSchoolText11 panelSchoolText111 panelSchoolText1111" wx:if="{{!Info[item.Name][Info[item.Name].length-1].Total}}">
             无
@@ -128,8 +127,7 @@
       <image class="line_02" src="../images/line_02.png"></image>
 
       <view class="panelRadio radio2 FlexRow">
-        <view class="panelRadio1 radio21 panelRadio1{{item.CSS}}" wx:for="{{ScoreType}}" wx:key="index"
-        bindtap="onSelect" data-object="ScoreType" data-index="{{index}}" data-clicktype="radio">{{item.Name}}</view>
+        <view class="panelRadio1 radio21 panelRadio1{{item.CSS}}" wx:for="{{ScoreType}}" wx:key="index" bindtap="onSelect" data-object="ScoreType" data-index="{{index}}" data-clicktype="radio">{{item.Name}}</view>
       </view>
 
       <!-- 自主招生 -->
@@ -140,59 +138,64 @@
           <view class="panelSchoolText13 ">{{Info['自主招生'][Info['自主招生'].length-1].ScoreYear}}年</view>
         </view>
         <view class="panelLine"></view>
-        
+
         <!-- 学科 -->
         <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].List[0].PlanNum}}">
-        <view class="panelSchoolIndependent1 FlexRow">
-          <view class="panelSchoolIndependentText1 panelSchoolText13 panelSchoolText131 FlexColumn"><view>市实验示范性高中</view><view>（学科优秀学生）</view></view>
-          <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[0].PlanNum}}</view>
-          <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[0].PlanNum}}</view>
-        </view>
-        <view class="panelLine"></view>
+          <view class="panelSchoolIndependent1 FlexRow">
+            <view class="panelSchoolIndependentText1 panelSchoolText13 panelSchoolText131 FlexColumn">
+              <view>市实验示范性高中</view>
+              <view>（学科优秀学生）</view>
+            </view>
+            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[0].PlanNum}}</view>
+            <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[0].PlanNum}}</view>
+          </view>
+          <view class="panelLine"></view>
         </block>
-        
+
         <!-- 体育 -->
         <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].List[1].PlanNum}}">
-        <view class="panelSchoolIndependent1 FlexRow">
-          <view class="panelSchoolIndependentText1 panelSchoolText13">市级优秀体育学生</view>
-          <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[1].PlanNum}}</view>
-          <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[1].PlanNum}}</view>
-        </view>
-        <view class="panelSchoolIndependent2 FlexColumn">
-          <text class="panelSchoolText16">{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}年项目\n{{Info['自主招生'][Info['自主招生'].length-2].List[1].SchoolTargetRemark2}}</text>
-        </view>
-        <view class="panelLine"></view>
+          <view class="panelSchoolIndependent1 FlexRow">
+            <view class="panelSchoolIndependentText1 panelSchoolText13">市级优秀体育学生</view>
+            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[1].PlanNum}}</view>
+            <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[1].PlanNum}}</view>
+          </view>
+          <view class="panelSchoolIndependent2 FlexColumn">
+            <text class="panelSchoolText16">{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}年项目\n{{Info['自主招生'][Info['自主招生'].length-2].List[1].SchoolTargetRemark2}}</text>
+          </view>
+          <view class="panelLine"></view>
         </block>
-        
+
         <!-- 艺术 -->
         <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].List[2].PlanNum}}">
-        <view class="panelSchoolIndependent1 FlexRow">
-          <view class="panelSchoolIndependentText1 panelSchoolText13">市级艺术骨干学生</view>
-          <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[2].PlanNum}}</view>
-          <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[2].PlanNum}}</view>
-        </view>
-        <view class="panelSchoolIndependent2 FlexColumn">
-          <text class="panelSchoolText16">{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}年项目\n{{Info['自主招生'][Info['自主招生'].length-2].List[2].SchoolTargetRemark2}}</text>
-        </view>
-        <view class="panelLine"></view>
+          <view class="panelSchoolIndependent1 FlexRow">
+            <view class="panelSchoolIndependentText1 panelSchoolText13">市级艺术骨干学生</view>
+            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[2].PlanNum}}</view>
+            <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[2].PlanNum}}</view>
+          </view>
+          <view class="panelSchoolIndependent2 FlexColumn">
+            <text class="panelSchoolText16">{{Info['自主招生'][Info['自主招生'].length-2].ScoreYear}}年项目\n{{Info['自主招生'][Info['自主招生'].length-2].List[2].SchoolTargetRemark2}}</text>
+          </view>
+          <view class="panelLine"></view>
         </block>
-        
+
         <!-- 国际 -->
         <block wx:if="{{Info['自主招生'][Info['自主招生'].length-2].List[3].PlanNum || Info['自主招生'][Info['自主招生'].length-2].List[4].PlanNum}}">
-        <view class="panelSchoolText13 panelSchoolIndependent4">国际课程班和中外合作办学高中</view>
-        <view class="panelSchoolIndependent3 FlexRow">
-          <view class="panelSchoolIndependentText2 panelSchoolText13">本市生源</view>
-          <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[3].PlanNum}}</view>
-          <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[3].PlanNum}}</view>
-        </view>
-        <view class="panelSchoolIndependent3 FlexRow">
-          <view class="panelSchoolIndependentText2 panelSchoolText13">非本市生源</view>
-          <view class="panelSchoolText11 panelSchoolText112">
-          <block wx:if="{{!Info['自主招生'][Info['自主招生'].length-2].List[4].PlanNum}}">0</block>{{Info['自主招生'][Info['自主招生'].length-2].List[4].PlanNum}}</view>
-          <view class="panelSchoolText11 ">
-          <block wx:if="{{!Info['自主招生'][Info['自主招生'].length-1].List[4].PlanNum}}">0</block>{{Info['自主招生'][Info['自主招生'].length-1].List[4].PlanNum}}</view>
-        </view>
-        <view class="panelLine"></view>
+          <view class="panelSchoolText13 panelSchoolIndependent4">国际课程班和中外合作办学高中</view>
+          <view class="panelSchoolIndependent3 FlexRow">
+            <view class="panelSchoolIndependentText2 panelSchoolText13">本市生源</view>
+            <view class="panelSchoolText11 panelSchoolText112">{{Info['自主招生'][Info['自主招生'].length-2].List[3].PlanNum}}</view>
+            <view class="panelSchoolText11 ">{{Info['自主招生'][Info['自主招生'].length-1].List[3].PlanNum}}</view>
+          </view>
+          <view class="panelSchoolIndependent3 FlexRow">
+            <view class="panelSchoolIndependentText2 panelSchoolText13">非本市生源</view>
+            <view class="panelSchoolText11 panelSchoolText112">
+              <block wx:if="{{!Info['自主招生'][Info['自主招生'].length-2].List[4].PlanNum}}">0</block>{{Info['自主招生'][Info['自主招生'].length-2].List[4].PlanNum}}
+            </view>
+            <view class="panelSchoolText11 ">
+              <block wx:if="{{!Info['自主招生'][Info['自主招生'].length-1].List[4].PlanNum}}">0</block>{{Info['自主招生'][Info['自主招生'].length-1].List[4].PlanNum}}
+            </view>
+          </view>
+          <view class="panelLine"></view>
         </block>
       </view>
     </block>
@@ -201,17 +204,16 @@
       <view class="panelSchoolText17">统一招生</view>
       <view class="panelSchoolText18">1至15志愿（平行志愿）</view>
     </block>
-    
+
     <block wx:if="{{Info['名额到校'] && Info.SchoolType1=='初中'}}">
       <view class="panelSchoolText17">名额分配综合评价录取志愿</view>
       <view class="panelSchoolText18">名额分配到本校</view>
     </block>
 
     <!-- 名额到区、名额到校、1-15志愿 -->
-    <block wx:if="{{ScoreTypeID!=1 && Info[ScoreType[ScoreTypeID-1].Name]}}" >
+    <block wx:if="{{ScoreTypeID!=1 && Info[ScoreType[ScoreTypeID-1].Name]}}">
       <view class="panelTool1 panelTool1_1 FlexRow">
-        <view class="panelCheckbox panelCheckbox{{item.CSS}} checkMarginTop FlexRow" wx:for="{{TailScore}}" wx:key="index" 
-        bindtap="onSelect" data-object="TailScore" data-index="0" data-clicktype="checkbox">
+        <view class="panelCheckbox panelCheckbox{{item.CSS}} checkMarginTop FlexRow" wx:for="{{TailScore}}" wx:key="index" bindtap="onSelect" data-object="TailScore" data-index="0" data-clicktype="checkbox">
           <view class="panelCheckboxCircle panelCheckboxCircle{{item.CSS}} FlexRow">
             <image wx:if="{{item.CSS}}" class="panelCheckbox_icon_check_01" src="../images/icon_check_01.png"></image>
           </view>
@@ -219,20 +221,19 @@
         </view>
       </view>
       <view class="panelMarginTop panelLine"></view>
-    
+
       <view class="panelRadio2 panelMarginTop FlexRow">
-        <view class="panelRadio21 panelRadio21{{item.CSS}}" wx:for="{{Years}}" wx:key="index"
-        bindtap="onSelect" data-object="Years" data-index="{{index}}" data-clicktype="radio">{{item.Name}}</view>
+        <view class="panelRadio21 panelRadio21{{item.CSS}}" wx:for="{{Years}}" wx:key="index" bindtap="onSelect" data-object="Years" data-index="{{index}}" data-clicktype="radio">{{item.Name}}</view>
       </view>
 
       <view class="panelMarginTop panelLine"></view>
-      
+
       <template is="componentList" data="{{IsListAll:IsListAll,ScoreTypeID:ScoreTypeID,List:List,PageType:PageType,SchoolType1:Info.SchoolType1,IsSearch:IsSearch,SearchNull:SearchNull}}" />
-      
+
     </block>
 
     <!-- 名额到区、名额到校、1-15志愿 -->
-    <block wx:if="{{ScoreTypeID!=1 && !Info[ScoreType[ScoreTypeID-1].Name]}}" >
+    <block wx:if="{{ScoreTypeID!=1 && !Info[ScoreType[ScoreTypeID-1].Name]}}">
       <view class="panelSchoolText19">该校不属于“{{ScoreType[ScoreTypeID-1].Name}}”可填报的学校。</view>
       <view class="panelLine"></view>
       <view class="panelSchool22 panelSchool221 FlexRow" bindtap="goto" data-url="docs?ID=1">
@@ -240,23 +241,25 @@
         <image class="icon_nextpage_4" src="../images/icon_nextpage_4.png"></image>
       </view>
     </block>
-    
+
     <view style="height:50rpx;"></view>
   </view>
 
   <view class="panelBasicCss FlexColumn" wx:if="{{Info.ImageOther}}">
-    <view class="panelSchoolText08">校园风光</view>    
+    <view class="panelSchoolText08">校园风光</view>
     <view class="panelScrollView" bindtap="goto" data-url="imagelist?ID={{Info.ID}}&SchoolFullName={{Info.SchoolFullName}}&SchoolShortName={{Info.SchoolShortName}}&ImageOtherStr={{Info.ImageOtherStr}}">
       <image lazy-load="true" mode="aspectFill" class="scrollItem" src="{{ImagePath}}web/_School/{{item}}" wx:for="{{Info.ImageOther}}" wx:key="index" wx:if="{{index<9}}" />
-    </view>   
+    </view>
   </view>
-  
-  <view class="panelBasicCss panelSchool5 FlexRow" bindtap="goto" data-url="map?PageType=1&ID={{Info.ID}}&Name={{Info.SchoolShortName}}&Coordinates={{Info.Coordinates}}&SchoolType2Short={{Info.SchoolType2Short}}&SchoolShortName={{Info.SchoolShortName}}&Address={{Info.Address}}&DistrictID={{Info.District2}}" data-isgoto="{{Info.Coordinates}}"  wx:if="{{Info.Address || Info.Coordinates}}">
+
+  <view class="panelBasicCss panelSchool5 FlexRow" bindtap="goto" data-url="map?PageType=1&ID={{Info.ID}}&Name={{Info.SchoolShortName}}&Coordinates={{Info.Coordinates}}&SchoolType2Short={{Info.SchoolType2Short}}&SchoolShortName={{Info.SchoolShortName}}&Address={{Info.Address}}&DistrictID={{Info.District2}}" data-isgoto="{{Info.Coordinates}}" wx:if="{{Info.Address || Info.Coordinates}}">
     <view class="panelSchool51 FlexColumn">
       <view class="panelSchool411">校址</view>
       <view class="panelSchool512 FlexRow">
         <image class="icon_loc_01" src="../images/icon_loc_01.png"></image>
-        <text class="panelSchoolText09"><block wx:if="{{Info.Address}}">{{Info.Address}}</block></text>
+        <text class="panelSchoolText09">
+          <block wx:if="{{Info.Address}}">{{Info.Address}}</block>
+        </text>
       </view>
     </view>
     <view class="panelSchool52 FlexRow">
@@ -269,8 +272,8 @@
 
   <view class="panelBasicCss FlexColumn" wx:if="{{Info.SchoolType1=='高中'}}">
     <block wx:if="{{Info.SchoolType2Short=='区重点（特色）'}}">
-      <view class="panelSchoolText082">特色高中办校重点</view>    
-      <view class="panelSchoolText08 panelSchoolText083">美育特色</view>    
+      <view class="panelSchoolText082">特色高中办校重点</view>
+      <view class="panelSchoolText08 panelSchoolText083">美育特色</view>
       <text class="panelContent">{{Info.Introduction2}}</text>
       <view class="panelSchool22 FlexRow" bindtap="goto" data-url="docs?ID=2">
         <view>上海市19所特色高中情況汇总</view>
@@ -287,8 +290,9 @@
         </view>
       </view>
     </view>
-    
-    <text class="panelContent"  wx:if="{{IsFold}}"><block wx:if="{{Info.Introduction}}">{{Info.Introduction}}</block>
+
+    <text class="panelContent" wx:if="{{IsFold}}">
+      <block wx:if="{{Info.Introduction}}">{{Info.Introduction}}</block>
     </text>
   </view>
 
@@ -303,10 +307,9 @@
         <view class="panelSchool413 FlexRow" wx:if="{{Info.ImageQRCode}}">
           <image class="icon_web_01" src="../images/icon_web_02.png"></image>
           <text class="panelSchoolText13">长按二维码\n关注学校官方公众号</text>
-        </view>      
+        </view>
       </view>
-      <image wx:if="{{Info.ImageQRCode}}" show-menu-by-longpress="true" 
-      data-image="{{Info.ImageQRCode}}" class="panelSchoolQRCode" src="{{ImagePath}}web/_School/{{Info.ImageQRCode}}"></image>
+      <image wx:if="{{Info.ImageQRCode}}" show-menu-by-longpress="true" data-image="{{Info.ImageQRCode}}" class="panelSchoolQRCode" src="{{ImagePath}}web/_School/{{Info.ImageQRCode}}"></image>
     </view>
   </view>
 
@@ -338,7 +341,7 @@
 
   <view style="width: 100%;height:100rpx;z-index: 5; position: fixed;bottom:0;" bindtap="onUpdateTitle"></view>
 
-  <view class="panelFooter FlexRow" >
+  <view class="panelFooter FlexRow">
     <view class="panelFooter1 FlexRow" wx:if="{{!IsCollect}}" catchtap="collectSchool" data-index="1">
       <image class="panelFooter_icon_save_01 panelFooterBottom" src="../images/icon_fav_02.png"></image>
       <view class="panelFooterBottom">收藏</view>
@@ -347,7 +350,7 @@
       <image class="panelFooter_icon_save_01 panelFooterBottom" src="../images/icon_fav_03.png"></image>
       <view class="panelFooterBottom">已收藏</view>
     </view>
-    
+
     <view class="panelFooter0 FlexRow">
       <view class="panelFooterLine panelFooterBottom"></view>
       <button open-type='share' class="share FlexRow">
@@ -357,7 +360,7 @@
     </view>
     <view class="panelFooter2 FlexRow" catchtap="goto" data-url="feedback">
       <view class="panelFooterLine panelFooterBottom"></view>
-      <view  class="panelFooter21 panelFooterBottom">纠错</view>
+      <view class="panelFooter21 panelFooterBottom">纠错</view>
     </view>
     <view class="panelFooter3 FlexRow" catchtap="returnTop">
       <view class="panelFooterLine panelFooterBottom"></view>

pages/main/school.wxss

@@ -204,6 +204,7 @@
 .panelSchoolLine02{
   width:630rpx;
   height: 1rpx;
+  margin-top: 20rpx;
   background-color: #E3E3E3;
 }
 
@@ -484,10 +485,6 @@
   color:#fff;
 }
 
-.panelSchoolText1311{
-  margin: 30rpx 40rpx 30rpx 40rpx;
-  width: 100%;
-}
 
 .panel114{
   width:710rpx;
@@ -496,14 +493,18 @@
 .panel1142{
   justify-content: flex-start;
   width:630rpx;
-  overflow: hidden;
 }
 .panel11421{
   justify-content: flex-start;
   width:620rpx;
+  align-items: flex-start;
+}
+.panel11421_1{
+  width:580rpx;
 }
 
 .avatar{
+  margin-top: 5rpx;
   border-radius: 50%;
   width:40rpx;
   height:40rpx;
@@ -556,14 +557,33 @@
 .panel11420{
   margin-bottom: 30rpx;
 }
-.panel114221{
-  align-self: flex-end;
-  margin-right: 40rpx;
+
+.panelSchoolText1311{
+  margin: 0rpx 40rpx 0 40rpx;
+  width: 100%;
 }
 
+.panel114221{
+  align-self: flex-start;
+  margin-left: 40rpx;
+  line-height:113rpx;
+}
+.panel114222{
+  align-self: flex-start;
+  height:113rpx;
+  width:218rpx;
+  color:#EB5C28;
+  font-weight: 700;
+}
 
 .icon_refresh_01{
   width:30rpx;
   height:28rpx;
   margin-right: 10rpx;
+}
+
+.icon_nextpage_4{
+  width:12rpx;
+  height:18rpx;
+  margin-left: 10rpx;
 }

pages/main/wish.js

@@ -132,28 +132,28 @@ Page({
   },
   onSubmit: function () {
     var that = this;
-    if (isViolate1) {
+    if (isViolate1 || isViolate2) {
+      var str="名字或祝福语";
       wx.showModal({
         title: '生成失败',
-        content: '抱歉，您填写的名字未能通过微信敏感词检查故无法生成福帖。敏感词由微信官方功能判定，建议您调整内容多尝试几次。',
+        content: '抱歉，您填写的'+str+'未能通过微信敏感词检查故无法生成福帖。敏感词由微信官方功能判定，建议您调整内容多尝试几次。',
         showCancel: false,
         confirmText: '返回',
-      });
-    } else if (isViolate2) {
-      wx.showModal({
-        title: '生成失败',
-        content: '抱歉，您填写的祝福语未能通过微信敏感词检查故无法生成福帖。敏感词由微信官方功能判定，建议您调整内容多尝试几次。',
-        showCancel: false,
-        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.ToName = that.data.inputName; 
+      if (param.ToName)    
+        param.ToName=common.Trim(param.ToName);
+
       param.WishContent = that.data.inputContent;
+      if (param.WishContent)
+        param.WishContent=common.Trim(param.WishContent);
+      
       param.IsOpen = that.data.IsOpen ? 1 : 0;
 
       console.log(param);

pages/main/wish.wxml

@@ -7,9 +7,9 @@
   </view>
 
   <view class="panelBasicCss panelMain FlexColumn">
-    <view class="panelSchoolText08">Ta的名字（选填）</view>
+    <view class="panelSchoolText08">名字（选填）</view>
     <view class="panelSchoolLine02"></view>
-    <textarea maxlength="100" value="{{inputName}}" bindinput="bindKeyInputName" class="Input" placeholder-style="color:#9b9b9b;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>
   
@@ -29,7 +29,7 @@
     <view wx:if="{{!IsOpen}}" class="checkbox checkbox1 FlexRow">
       <image class="icon_check_01" src="../images/icon_check_01.png"></image>
     </view>
-    <text class="panelWish11">在主页中隐藏名字和祝福语，仅显示在我的福帖中。\n福帖内容仅自己可见（自己主动转发福帖给他人时除外）。</text>
+    <text class="panelWish11">在主页中隐藏我填写的名字和祝福语（主动转发福帖给他人时除外）。</text>
   </view>
 
   <view class="panelWish2 FlexRow" bindtap="onSubmit">

pages/main/wishAll.js

@@ -0,0 +1,38 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      ID:options.SchoolID,
+    });
+    this.getWish();
+  },
+  getWish:function(){
+    var that = this;
+    main.getData("GetMPSWish?WishType=schoolAll&SchoolID="+that.data.ID, function (data) {
+      if (data) {
+        that.setData({
+          WishList: data,
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    var that=this;
+    var name="中考招生信息：";
+    name+=that.data.Info.SchoolShortName;
+    
+    return {
+      title: name,
+      path: app.globalData.SharePath+'?UserID=' + app.globalData.userInfo.UserID+'&type=school&ID=' + that.data.Info.ID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/wishAll.json

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

pages/main/wishAll.wxml

@@ -0,0 +1,17 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panel1142 FlexColumn">
+    <view class="panel11420 FlexColumn" wx:for="{{WishList}}" wx:key="*this">
+      <view class="panel11421 FlexRow">
+        <view class="avatar FlexRow">
+          <image class="avatarIcon" src="{{item.AvatarUrl}}"></image>
+        </view>
+        <text class="panel11421_1">
+          <text class="nickName">{{item.NickName2}}</text>
+          <text class="text02">{{item.WishWhom}}</text>
+          <text class="text02">{{item.SchoolShortName}}</text>
+        </text>
+      </view>
+      <view class="panel11423" wx:if="{{item.WishContentItem}}">{{item.WishContent}}</view>
+    </view>
+  </view>
+</view>

pages/main/wishAll.wxss

@@ -0,0 +1,69 @@
+.container{
+  background-color: #fff;
+}
+
+.panel1142{
+  justify-content: flex-start;
+  width:670rpx;
+  margin: 60rpx 0 100rpx 0;
+}
+.panel11420{
+  width:100%;
+  margin-bottom: 30rpx;
+  align-items: flex-start;
+}
+.panel11421{
+  justify-content: flex-start;
+  align-items: flex-start;
+  width:100%;
+}
+.panel11421_1{
+  width:620rpx;
+  line-height: 35rpx;
+  margin-top: 3rpx;
+}
+
+.avatar{
+  border-radius: 50%;
+  width:40rpx;
+  height:40rpx;
+  background-color: #E3E3E3;
+  margin-right: 10rpx;
+}
+
+.avatarIcon{
+  width:40rpx;
+  height:40rpx;
+  border-radius: 50%;
+}
+
+.nickName{
+  font-size: 24rpx;
+  font-weight: 700;
+}
+
+.text02{
+  font-size: 24rpx;
+  margin-left: 10rpx;
+  font-weight: 400;
+}
+
+.icon_share_03{
+  width:30rpx;
+  height:30rpx;
+  margin-right: 10rpx;
+}
+
+.panel11422{
+  font-size: 28rpx;
+  color:#EB5C28;
+  position: absolute;
+  bottom:30rpx;
+}
+
+.panel11423{
+  width:580rpx;
+  margin: 10rpx 0 0 50rpx;
+  font-size:28rpx;
+  font-weight: 400;
+}

pages/main/wishinfo.wxml

@@ -2,7 +2,7 @@
   <image class="pic_06" src="../images/pic_06.png"></image>
   <view class="text01">{{MyWish.WishWhom2}}</view>
   <view class="text01 text02">{{MyWish.SchoolShortName}}</view>
-  <view class="text01 text03">{{MyWish.WishContent}}</view>
+  <view class="text01 text03" wx:if="{{MyWish.WishContent}}">{{MyWish.WishContent}}</view>
   <view class="panel1 FlexRow" bindtap="clickLikeNum">
     <view class="panel11 FlexRow">
       <image animation="{{animationDataShow}}" class="icon_add_02" src="../images/icon_add_02.png"></image>