0

pages/main/default.wxml

@@ -91,7 +91,7 @@
         <text class="text10">诚恳声明：</text>本产品所有图文内容来自网络，仅供家长对上海地区招生计划有大致了解。由于有可能存在错谬，故不能作为填报志愿的决策依据，请务必以当时当地教育局和学校提供的信息为准。我们将认真对待用户提供的纠错和建议，尽可能刊载正确信息。
       </text>
     </view>
-    <text class="text11" bindtap="goto" data-url="webview?url=https://mp.weixin.qq.com/s/nBQA9X-PwkdlxKaIjLOf5w">©2023 秒过分数线 版本 {{Version}}</text>
+    <text class="text11" bindtap="goto" data-url="webview?url=https://mp.weixin.qq.com/s/nBQA9X-PwkdlxKaIjLOf5w">©2024 秒过分数线 版本 {{Version}}</text>
     <view style="height:100rpx;"></view>
   </view>
 </view>

pages/main/school.wxml

@@ -75,8 +75,8 @@
 
     <view class="panelSchoolLine02"></view>
     <view class="panelSchoolText13 panelSchoolText1311 FlexColumn">
-      <view class="panel114221" wx:if="{{!HasWish}}">来祝福孩子、自己、同学考上本校吧</view>
-      <block wx:if="{{HasWish}}">
+      <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>
           展开

pages/main/school.wxss

@@ -543,7 +543,6 @@
 
 .panel11423{
   width:580rpx;
-  height:160rpx;
   margin: 10rpx 0 0 50rpx;
   font-size:28rpx;
   font-weight: 400;

pages/main/wishinfo.js

@@ -58,17 +58,18 @@ Page({
   onUnload:function(){
     this.saveLikeNum();
   },
-  returnDefault:function(){
+  returnDefault:function(e){
+    var url='../index/index';
+    var url1=e.currentTarget.dataset.url;
+    if (url1)
+      url+=url1;
+
+
     wx.reLaunch({
-      url: '../index/index'
+      url: url,
     });
   },
   goto: function (e) {
-    if (e.currentTarget.dataset.target=="school"){
-      wx.navigateBack({
-        delta: 3,
-      });
-    }
     main.goto(e);
   },
   gotoRedirectTo:function(e){
@@ -135,7 +136,7 @@ Page({
     var url=app.globalData.uploadImageUrl+"web/fs_a02.png";
     //debugger;
     return {
-      title: that.data.MyWish.WishWhom2+that.data.MyWish.SchoolShortName,
+      title: "中考祝福",
       path: app.globalData.SharePath + '?type=wish&ID='+that.data.MyWish.ID+'&UserID=' + app.globalData.userInfo.UserID,
       imageUrl: url,
     }

pages/main/wishinfo.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "",
   "navigationBarBackgroundColor":"#DB1824",
+  "navigationBarTextStyle": "white",
   "backgroundColorTop":"#DB1824",
   "backgroundColorBottom":"#DB1824",
   "enablePullDownRefresh": true

pages/main/wishinfo.wxml

@@ -24,6 +24,6 @@
   <view class="panelFooter FlexRow" wx:if="{{IsShare}}">
     <view class="panelFooterBtn FlexRow" bindtap="returnDefault">返回首页</view>
     <view class="line2"></view>
-    <view class="panelFooterBtn FlexRow" bindtap="goto" data-target="school" data-url="./school?type=school&ID={{MyWish.SchoolID}}">查询{{MyWish.SchoolShortName}}分数线</view>
+    <view class="panelFooterBtn FlexRow" bindtap="returnDefault" data-url="?type=school&ID={{MyWish.SchoolID}}">查询{{MyWish.SchoolShortName}}分数线</view>
   </view>
 </view>