2.3.51

app.js

@@ -1,6 +1,6 @@
 App({
   globalData: {
-    Version: "2.3.48",
+    Version: "2.3.51",
     IsProduction: true,
     //IsProduction: false,
     ShareTitle: "高效学习从秒过开始",

app.json

@@ -11,6 +11,7 @@
     "pages/main/health",
     "pages/main/folderEdit",
     "pages/main/folderIcon",
+    "pages/main/orderform",
 
     "pages/main/cardmain",
     "pages/main/mainlist",

pages/main/cardmain.js

@@ -14,18 +14,23 @@ Page({
   },
   onLoad: function () {
     var that = this;
+
+    var isshow=app.globalData.userInfo.isShow;
+    if (app.globalData.IsIOS && isshow==0)
+      isshow=-1;
+
     that.setData({
       Containnerheight: main.getWindowHeight(),
-      IsShow: app.globalData.userInfo.isShow,
+      IsShow: isshow,
     });
 
     var year = new Date(app.globalData.userInfo.CreateTime).getFullYear();
     //console.log(year);
-    // if (new Date().getFullYear()>=2021 && year<2020){
-    //   that.setData({
-    //     IsYearReport: true,
-    //   });
-    // }
+    if (new Date().getFullYear()>=2023 && year<2023){
+      that.setData({
+        IsYearReport: true,
+      });
+    }
 
     canPress=true;
 
@@ -219,7 +224,11 @@ Page({
       IsShowOrder: false,
     });
   },
-
+  gotoAbout: function (e) {
+    wx.navigateTo({
+      url: '../other/newuser',
+    });
+  },
   gotoReLaunch: function (e) {
     var url = e.currentTarget.dataset.url;
     wx.reLaunch({

pages/main/cardmain.wxml

@@ -24,6 +24,16 @@
       <view>回收</view>
     </view>
   </view>
+  <view class="panelTemp FlexColumn" wx:if="{{IsShow==0}}">
+    <view class="FlexColumn" bindtap='gotoAbout'>
+      <view class="panelTemp1">秒过新手班</view>
+      <image class="xsb" src='{{ImagePath}}web/xsb.png' />
+    </view>
+    <view class="panelTemp2 FlexRow"  bindtap='goto' data-url="./orderform">
+      <view class="panelTemp21">我的订单</view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
+  </view>
   <view class="panelItem3 FlexRow">
     <view class="panelItem31 FlexRow" bindtap="getList" data-id="0" data-cardtype="0">
       <view class="panelItem311 FlexColumn">
@@ -40,6 +50,10 @@
       <image class="richang_80x90" src='../images/jinji_80x90.png' />
     </view>
   </view>
+  <!-- 年度报告 -->
+  <block wx:if="{{IsYearReport}}">
+    <image class="report_2021-banner" src='{{ImagePath}}web/report_2022-banner.png' bindtap="goto" data-url="../other/annualreport" />
+  </block>
 
   <view class="panelItem3 FlexRow">
     <view class="panelItem41 FlexRow" bindtap="goto" data-url="../main/health">
@@ -57,10 +71,7 @@
       <image class="zhishijianyan_70x75" src='../images/wangzhan_70x75.png' />
     </view>
   </view>
-  <!-- 年度报告 -->
-  <block wx:if="{{IsYearReport}}">
-    <image class="report_2021-banner" src='{{ImagePath}}web/report_2021-banner.png' bindtap="goto" data-url="../other/annualreport" />
-  </block>
+  
   <!-- 没有勤勉接力 -->
   <view class="panelShare FlexRow" wx:if="{{!Hardworking}}">
     <view class="panelShare1 FlexColumn">

pages/main/cardmain.wxss

@@ -28,31 +28,41 @@
 /* 临时用****************** */
 .panelTemp {
   width: 100%;
-  justify-content: space-between;
   font-size: 28rpx;
-  height: 100rpx;
   background-color: #fff;
-  margin: 30rpx 0;
+  border-top:1rpx solid #F2F2F2;
 }
 
 .panelTemp1 {
-  margin-left: 30rpx;
-  justify-content: flex-start;
+  width:690rpx;
   font-weight: 400;
-  font-size: 28rpx;
-  height: 140rpx;
+  margin-top: 30rpx;
+  text-align: left;
 }
 
-.avatar {
-  width: 80rpx;
-  height: 80rpx;
-  background-color: #D8D8D8;
-  border-radius: 10rpx;
+.xsb{
+  width:710rpx;
+  height:180rpx;
+  margin:30rpx 0 0 0;
 }
 
-.text6 {
-  font-size: 28rpx;
-  margin-left: 20rpx;
+.panelTemp2 {
+  width:100%;
+  font-weight: 400;
+  margin-top: 30rpx;
+  border-top:1rpx solid #F2F2F2;
+  height:100rpx;
+  justify-content: space-between;
+}
+
+.panelTemp21{
+  margin-left: 30rpx;
+}
+
+.Arrow{
+  width:16rpx;
+  height:26rpx;
+  margin:0 30rpx;
 }
 
 /* 中部样式************************* */

pages/main/orderform.js

@@ -0,0 +1,103 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    PayList:[],
+    IsLogin:1,
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
+    if (app.globalData.userInfo){
+      that.init();
+    }
+    else{
+      this.setData({
+        IsLogin: -1,
+      });
+    }    
+  },
+  init:function(){
+    var that = this;
+    var url = "GetUserPayList?UserID=" + app.globalData.userInfo.UserID;
+    main.getData(url, function (data) {
+      if (data) {
+        that.setData({
+          PayList: data,
+          IsLogin: 1,
+        });
+      }
+    });
+  },
+  showLogin:function(){
+    this.setData({
+      IsLogin: -2,
+    });
+  },
+  hideLogin:function(){
+    this.setData({
+      IsLogin: -1,
+    });
+  },
+  onKeyInput: function (e) {
+    var that=this; 
+    that.setData({
+      UserName: e.detail.value
+    });
+  },
+  onKeyInput2: function (e) {
+    var that=this; 
+    that.setData({
+      UserPwd: e.detail.value
+    });
+  },
+  login: function () {
+    var that = this;
+
+    main.getData('Login20221228?UserName=' + that.data.UserName + "&UserPwd="+that.data.UserPwd+"&ProductID=" + app.globalData.ProgramID, function (data) {
+      if (data) {
+        if (data>0){
+            app.globalData.userInfo={};
+            app.globalData.userInfo.UserID=data;
+            main.getData('GetWXUsersAllPayInfo500?UserID=' + app.globalData.userInfo.UserID + "&ProductID=" + app.globalData.ProgramID, function (data2) {
+              if (data2) {
+                that.setData({
+                  IsLogin: 1,
+                  PayList: data2,
+                });
+              }
+              else {
+                that.setData({
+                  IsLogin: 1,
+                  PayList: [],
+                });
+              }
+            });
+        }
+        else {
+          wx.showToast({
+            title: '用户名或密码不正确',
+          });
+        }
+      }
+      else {
+        wx.showToast({
+          title: '登录出错',
+        });
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

pages/main/orderform.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "我的订单"
+}

pages/main/orderform.wxml

@@ -0,0 +1,33 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
+  <block wx:if="{{IsLogin==1}}">
+    <view class="panelNull"></view>
+    <view class="panelItem FlexColumn" wx:if="{{PayList.length>0}}" wx:for="{{PayList}}" wx:key="*this">
+      <view class="panelItem1 FlexRow">
+        <view class="panelItem11">订单</view>
+        <view class="panelItem12">{{item.Money}}元</view>
+      </view>
+      <text class="panelItem2">交易编号：{{item.TradeNo}}\n支付日期：{{item.PayEndTime}}</text>
+    </view>  
+    
+    <view style="margin-top: 60rpx;" class="FlexRow" wx:if="{{PayList.length==0}}">
+      无订单数据
+    </view>
+  </block>
+  <view class="panelIsLogin" wx:if="{{IsLogin==-1}}" bindtap="showLogin">
+    登录查看订单
+  </view>
+
+  <view  wx:if="{{IsLogin==-2}}" class="panelLogin FlexColumn" style='height:{{Containnerheight}}rpx;'>
+    <view class="panelLogin1 FlexColumn">
+      <view class="text1">用户名</view>
+      <input class="input" bindinput="onKeyInput" value="{{UserName}}"/>
+      <view class="text1">密码</view>
+      <input class="input" password="true" bindinput="onKeyInput2" value="{{UserPwd}}"/>
+      <view class="panelLogin2 FlexRow">
+        <view class="panelLogin21" bindtap="hideLogin">取消</view>
+        <view class="panelLogin21" bindtap="login">登录</view>
+      </view>
+    </view>
+  </view>
+</view>

pages/main/orderform.wxss

@@ -0,0 +1,92 @@
+.panelNull{
+  width:100%;
+  height:30rpx;
+}
+
+.panelItem{
+  width:100%;
+  background-color: #fff;
+  height:169rpx;
+  margin-bottom: 1rpx;
+}
+
+.panelItem1{
+  width:100%;
+  justify-content: space-between;
+  margin-top: 30rpx;
+
+  font-size: 28rpx;
+  font-weight: 400;
+  color:#1e1e1e;
+}
+.panelItem11{
+  margin-left: 30rpx;
+}
+.panelItem12{
+  margin-right: 30rpx;
+}
+
+.panelItem2{
+  width:690rpx;
+  font-size:20rpx;
+  color:#787878;
+  text-align: left;
+  margin-top: 10rpx;
+  margin-bottom: 32rpx;
+}
+
+
+.panelIsLogin{
+  background: #FFFFFF;
+  border: 4rpx solid #E65A20;
+  border-radius: 20rpx;
+  font-size: 36rpx;
+  color: #E65A20;
+  text-align: center;
+  width:500rpx;
+  height:100rpx;
+  line-height: 100rpx;
+  margin-top: 400rpx;
+}
+
+.panelLogin{
+  width:100%;
+  background-color: rgba(0,0,0,0.5);
+  position: fixed;
+  top:0;
+}
+.panelLogin1{
+  width:560rpx;
+  height:577rpx;
+  position: fixed;
+  top:313rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+  justify-content: flex-start;
+}
+.text1{
+  width:480rpx;
+  margin-top: 60rpx;
+  font-size: 28rpx;
+}
+.input{
+  width:480rpx;
+  height:90rpx;
+  background:#FFFFFF;
+  border: 1rpx solid #979797;
+  margin-top:20rpx;
+  color:#1e1e1e;
+  padding-left: 10rpx;
+}
+
+.panelLogin2{
+  width:100%;
+  margin-top: 74rpx;
+}
+
+.panelLogin21{
+  width:280rpx;
+  text-align: center;
+  font-size:36rpx;
+  font-weight: 400;
+}

pages/main/systemsetting.wxml

@@ -21,6 +21,12 @@
     <view class="panelItem2 FlexRow">
       <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
     </view>
+  </view>  
+  <view class="panelItem FlexRow" bindtap='goto' data-url="./orderform">
+    <view class="panelItem1">我的订单</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/universalpic_indicator_right_gray.png' class="Arrow" />
+    </view>
   </view>
   <view class="panelItem FlexRow" bindtap='gotoAbout'>
     <view class="panelItem1">关于秒过</view>

pages/other/annualreport.wxml

@@ -1,5 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
-	<image src="{{ImagePath}}web/report_2021-header.png" class="panelTop" />
+	<image src="{{ImagePath}}web/report_2022-header.png" class="panelTop" />
 	<view class="panelMain FlexColumn">
 		<view class="text1">自{{Data.StartDate}}以来</view>
 		<view class="text2">年度报告的数据统计截止于{{Data.EndDate}}</view>

pages/other/pay.js

@@ -45,6 +45,10 @@ Page({
   },
   init: function (PayType, EndDate, Price, DayNumber) {
     var that = this;
+
+    if (EndDate)
+      EndDate=common.formatTime(EndDate,"-");
+
     var url = 'GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType + '&UserID=' + app.globalData.userInfo.UserID;
     if (Price && DayNumber) {
       url += "&Price=" + Price + "&DayNumber=" + DayNumber;

pages/other/paycustom.js

@@ -55,6 +55,7 @@ Page({
   },
   onShareAppMessage: function () {
     var that = this;
+
     var path = '/pages/index/index?type=paycustom&PayUserID=' + that.data.SearchUserID;
     path += "&DayNumber=" + that.data.DayNumber;
     path += "&Price=" + that.data.Price;
@@ -66,6 +67,6 @@ Page({
       path: path,
       imageUrl: app.globalData.uploadImageUrl + "web/program_screenshot_custompayment.png",
     };
-
+    
   },
 })

pages/share/shareindex.js

@@ -5,12 +5,14 @@ const app = getApp();
 
 Page({
   data: {
+    ImagePath: app.globalData.uploadImageUrl,
     Weeks:["周一","周二","周三","周四","周五","周六","周日"],
     List:[],
     ShowActivity:1,
     Info:{
       DayNumber:-1,
     },
+    IsYearReport: false,
   },
   onLoad: function (options) {
     var that = this;
@@ -27,6 +29,12 @@ Page({
     });
 
     that.init();
+
+    if (new Date().getFullYear()>=2023){
+      that.setData({
+        IsYearReport: true,
+      });
+    }
   }, 
   init:function(){
     var that = this;

pages/share/shareindex.wxml

@@ -36,7 +36,7 @@
       <view class="panel21 FlexRow">
         <view class="text2">秒过学习小组活动</view>
       </view>
-      <view class="panel2200 panel22 FlexColumn">
+      <view class="panel2200 panel22 FlexColumn" wx:if="{{!IsYearReport}}">
         <image src="../images/qmjl_main_pic_2.png" class="qmjl_main_pic_2"></image>
         <image src="../images/qmjl_main_pic_3.png" class="qmjl_main_pic_3"></image>
         <image src="../images/qmjl_main_pic_4.png" class="qmjl_main_pic_4"></image>
@@ -49,7 +49,7 @@
           <view wx:if="{{Info.ShareNumberYearRate>=50 && Info.ShareNumberYearRate<100}}" class="panel220013 panel220014 FlexRow"></view>
         
           <view wx:if="{{Info.ShareNumberYearRate<100}}" class="panel220012 FlexRow"></view>
-          <view wx:if="{{Info.ShareNumberYearRate==100}}" class="panel220014 FlexRow"></view>
+          <view wx:if="{{Info.ShareNumberYearRate>=100}}" class="panel220014 FlexRow"></view>
         </view>
         <view class="panel22002 FlexRow">
           <view class="text15">今年已接力</view>
@@ -58,6 +58,24 @@
         <view class="panel22003" bindtap="goto" data-url="../other/webview?PageID=10">规则详情</view>
         <text class="text18" bindtap="goto" data-url="../other/userbook">活动截止：2022年12月31日，发奖：2023年1月8日，\n有效期大于发奖日才能领奖。<text class="text19">查看有效期</text></text>
       </view>
+
+      <view class="panel2201 panel22 FlexColumn" wx:if="{{IsYearReport}}">
+        <image lazy-load="true" class="qmjl_main_pic_5" src="{{ImagePath}}web/qmjl_main_pic_5.png"></image>
+        <view class="panel2201text1">2022年度勤勉接力统计于2022年12月30日结束。去年，您一共接力——{{Info.ShareNumberYear}}次。（有疑问请微信私聊天乐）</view>  
+        
+        <block wx:if="{{Info.Award>0}}">
+        <text class="panel2201text2">恭喜您\n获得{{Info.Award}}天有效期奖励</text>  
+        <text class="panel2201text3">领奖注意事项</text>  
+        <text class="panel2201text4">奖励将在2023年1月8日后陆续发放。您必须满足2个条件才能顺利获得奖励。\n① 保持关注秒过公众号，即时接收领奖通知，以免错过兑换时间。\n② 确保有效期超过2023年1月8日，过期的帐号无法领奖，视作自动放弃本奖励。</text>  
+        </block>
+
+        <view class="panel2201line"></view>
+        <text class="panel2201text5">2023年的「有奖勤勉接力」活动规则将在兔年春节过后公布。届时请留意您所在的小组群「群公告」或通过微信「私聊天乐」了解情况。</text>  
+        <text class="panel2201text6">一年来辛苦您了。希望勤勉接力活动能为帮助孩子建立练习习惯起到积极作用，也希望孩子和您都能喜欢接力图卡的内容。</text>  
+        <view class="panel2201line"></view>
+        <text class="panel2201text7">新年快乐，一年来您辛苦了</text>  
+       
+      </view>
     </view>
 
     <view class="panel2 FlexColumn">

pages/share/shareindex.wxss

@@ -542,4 +542,70 @@
 
 .text19 {
   color: #5282FA;
+}
+
+.panel2201 {
+  width:710rpx;
+  background-color: #A0272B;
+  justify-content: flex-start;
+}
+
+.qmjl_main_pic_5{
+  width:710rpx;
+  height:350rpx;
+  border-top-left-radius: 20rpx;
+  border-top-right-radius: 20rpx;
+}
+
+.panel2201text1{
+  font-size: 24rpx;
+  color: #FFF6E9;
+  width:550rpx;
+  margin-top: 20rpx;
+}
+
+.panel2201text2{
+  font-size: 28rpx;
+  color: #F3B150;
+  text-align: center;
+  margin-top: 30rpx;
+}
+
+.panel2201text3{
+  font-size: 24rpx;
+  color: #FFF6E9;
+  text-align: center;
+  margin-top: 30rpx;
+}
+.panel2201text4{
+  width:550rpx;
+  font-size: 24rpx;
+  color: #FFF6E9;
+  margin-top: 30rpx;
+}
+.panel2201line{
+  width:550rpx;
+  height:2rpx;
+  background: #FFFFFF;
+  margin-top: 40rpx;
+}
+
+.panel2201text5{
+  width:550rpx;
+  font-size: 24rpx;
+  margin-top: 30rpx;
+  color: #F3B150;
+}
+.panel2201text6{
+  width:550rpx;
+  font-size: 24rpx;
+  margin-top: 30rpx;
+  color: #FFF6E9;
+}
+.panel2201text7{
+  font-size: 28rpx;
+  margin-top: 40rpx;
+  color: #F3B150;
+  text-align: center;
+  margin-bottom: 60rpx;
 }

project.private.config.json

@@ -12,7 +12,7 @@
         {
           "name": "pages/index/index",
           "pathName": "pages/index/index",
-          "query": "type=family&PanelType=1&Time=2022-07-29 14:06:44&MainUserID=2&NickName=万戍仁&AvatarUrl=https://thirdwx.qlogo.cn/mmopen/vi_32/o7M9drMKflfW78mJrM9NX7hqPfyBaC4kic0IZ7Nw473oTlgERksibvlViauEiaiayIicT3cs7a5r9UcbKVSLnYhbCoNg/132",
+          "query": "type=paycustom&PayUserID=1&DayNumber=365&Price=199&Remark=test",
           "launchMode": "default",
           "scene": 1007
         },
@@ -35,6 +35,13 @@
           "query": "AgentCategory=promotion&ListType=%E5%8F%AF%E6%8F%90%E7%8E%B0%E6%94%B6%E7%9B%8A",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "pages/main/orderform",
+          "pathName": "pages/main/orderform",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }