1.1.19

app.js

@@ -1,32 +1,7 @@
 //app.js
 App({
-  onLaunch: function (options) {
-    this.getSystemInfo();
-    if (options && options.scene) {
-      console.log("scene:" + options.scene);
-      this.globalData.userSource = options.scene;
-    }
-    if (options && options.shareTicket) {
-      this.globalData.shareTicket = options.shareTicket;
-    }
-  },
-  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 = true;
-      this.globalData.IsAndroid = false;
-    }
-
-    if (this.globalData.systemInfo.model.indexOf("iPad") >= 0) {
-      this.globalData.IsIPad = true;
-    }
-  },
   globalData: {
-    version: "1.1.15",
+    version: "1.1.19",
     IsProduction: true,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",
@@ -56,5 +31,30 @@ App({
     IsIOS: true,
     IsAndroid: false,
     IsIPad: false,
+  },
+  onLaunch: function (options) {
+    this.getSystemInfo();
+    if (options && options.scene) {
+      console.log("scene:" + options.scene);
+      this.globalData.userSource = options.scene;
+    }
+    if (options && options.shareTicket) {
+      this.globalData.shareTicket = options.shareTicket;
+    }
+  },
+  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 = true;
+      this.globalData.IsAndroid = false;
+    }
+
+    if (this.globalData.systemInfo.model.indexOf("iPad") >= 0) {
+      this.globalData.IsIPad = true;
+    }
   }
 })

package4/main/giftinfo.js

@@ -34,12 +34,7 @@ Page({
     var that=this;
     wx.getSetting({
       success(res) {
-        if (!res.authSetting['scope.userInfo']) {
-          wx.navigateTo({
-            url: '../../pages/main/accredit?url=giftinfo'
-          });
-        }
-        else {
+        
           wx.showModal({
             title: '慎重转发',
             content: '请勿转发到群。如误转，只能在聊天窗口中撤回（1分钟内）。',
@@ -49,7 +44,7 @@ Page({
           that.setData({
             canGive: true,
           });
-        }
+        
       }
     });
     

package4/main/miaoguoreadme.wxml

@@ -1,6 +1,6 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
   <view class="text1">活动规则</view>
-  <text class="text2">① 本活动只针对自2021年3月？？日起报名秒过的用户，在此之前报名的老用户不享受此活动优惠项目。\n
+  <text class="text2">① 本活动只针对自2021年3月1日起报名秒过的用户，在此之前报名的老用户不享受此活动优惠项目。\n
 ② 秒过新手培训只能报名一次，不能重复报名。\n
 ③ 符合本活动规则的有效报名是指：打开秒过小程序；支付报名费；关注秒过学习法公众号；添加班务员微信；收到班务员开班安排的通知。以上整个流程中的任何环节均不可或缺。请按系统引导信息一步步完成。\n
 ④ 有效报名可获得唱意公司旗下5款产品各20天免费有效期。产品包括：语文汉语拼音、语文识字、英语自然拼读、数学计算题、口算星球。\n

package4/main/payfinish.js

@@ -20,10 +20,7 @@ Page({
       wx.hideLoading();
     },5000);
 
-    if (paytype == "4") {
-      wx.setStorageSync("HasActivate", 1);
-    }
-    else if (paytype=="3"){
+    if (paytype=="3"){
       app.globalData.userInfo.IsMember = 1;
       app.globalData.IsLocked=0;
     }
@@ -43,11 +40,7 @@ Page({
         url: "./limited?IsShowButton=1",
       });
     }
-    if (this.data.Paytype == "4") {
-      wx.redirectTo({
-        url: "./activate",
-      });
-    }
+   
     if (this.data.Paytype == "5") {
       wx.redirectTo({
         url: "./giftlist",

package4/main/paylist.js

@@ -6,12 +6,20 @@ const app = getApp();
 Page({
   data: {
     PayList: null,
+    IsLogin:1,
   },
   onLoad: function (options) {
     this.setData({
       Containnerheight: common.getSystemHeight(),
     });
-    this.init();
+
+    if (app.globalData.userInfo)
+      this.init();
+    else{
+      this.setData({
+        IsLogin: -1,
+      });
+    }
   },
   init: function () {
     var that = this;
@@ -31,16 +39,63 @@ Page({
           }
         }
         that.setData({
+          IsLogin: 1,
           PayList: data,
         });
       }
       else {
         that.setData({
+          IsLogin: 1,
           PayList: [],
         });
       }
     });
   },
+  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;
+
+    server.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;
+            that.init();
+        }
+        else {
+          wx.showToast({
+            title: '用户名或密码不正确',
+          });
+        }
+      }
+      else {
+        wx.showToast({
+          title: '登录出错',
+        });
+      }
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

package4/main/paylist.wxml

@@ -1,4 +1,5 @@
 <view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  
   <view style='height:50rpx'></view>
   <view class="panel1 FlexColumn" wx:for="{{PayList}}" wx:key="index" wx:if="{{PayList.length>0}}">
     <view class="item0 item FlexRow">
@@ -54,4 +55,21 @@
   </view>
 
   <view class='panelNull' wx:if="{{PayList.length==0}}">没有帐单</view>
+
+  <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>

package4/main/paylist.wxss

@@ -104,4 +104,59 @@
 .panelNull{
   margin-top: 462rpx;
   font-size:48rpx;
+}
+
+.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/index/index.js

@@ -103,17 +103,20 @@ Page({
         } else {
           app.globalData.userInfo = data;
 
-          var isShow = data.IsShow;
-          if (isShow == -1) {
-            isShow = 0;
-          }
-          else {
-            var systemInfo = wx.getSystemInfoSync();
-            if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
-              isShow = 1;
-            }
-          }
-          app.globalData.userInfo.IsShow = isShow;
+          //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
+
+          // var isShow = data.IsShow;
+          // if (isShow == -1) {
+          //   isShow = 0;
+          // }
+          // else {
+          //   var systemInfo = wx.getSystemInfoSync();
+          //   if (isShow == 0 && systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
+          //     isShow = 1;
+          //   }
+          // }
+          // app.globalData.userInfo.IsShow = isShow;
+          app.globalData.userInfo.IsShow = data.IsShow;
 
           app.globalData.IsLocked = data.IsLocked;
 
@@ -171,11 +174,15 @@ Page({
       }
     });
 
-    server.getData('GetBaiduToken', function (data) {
-      if (data) {
-        app.globalData.BaiduToken = data;
-      }
-    });
+    //调用登录接口
+    wx.login({
+    success: function (res0) {
+      server.getData('GetBaiduToken20220922?ProgramID='+app.globalData.ProgramID+'&Code='+res0.code, function (data) {
+        if (data) {
+          app.globalData.BaiduToken = data;
+        }
+      });
+    }});
   },
   getPriceList: function () {
     var that = this;

pages/main/default.js

@@ -79,12 +79,6 @@ Page({
       });
     }
 
-    if (wx.getStorageSync("HasActivate") == 1) {
-      wx.navigateTo({
-        url: '../../package4/main/activate',
-      });
-    }
-    
     common.getStorageValue(this, "IsMiaoguoAD", true, function () { });
 
     var miaoguoADTime = wx.getStorageSync("miaoguoADTime");
@@ -176,13 +170,7 @@ Page({
     });
   },
   gotoMemberCenter: function () {
-    if (app.globalData.userInfo.NickName=="陌生用户" && app.globalData.userInfo.IsShow>0) {
-      //请去授权
-      wx.navigateTo({
-        url: './accredit?type=accredit',
-      });
-    }
-    else if (app.globalData.userInfo.IsShow>0) {
+    if (app.globalData.userInfo.IsShow>=0) {
       wx.navigateTo({
         url: './userinfo',
       });

pages/main/default.wxml

@@ -123,7 +123,7 @@
         -->
       </view>
     </view>
-    <view class="panel1 FlesColumn">
+    <view class="panel1 FlesColumn" wx:if="{{IsShow==1}}">
       <view class="panelOther FlexRow">
         <view class="panelOther1">其它产品</view>
         <image src='../images/home_triangle_up.png' class="home_triangle_up" />

pages/main/userinfo.js

@@ -16,6 +16,7 @@ Page({
       ProgramID:app.globalData.ProgramID,
       IsLocked: app.globalData.IsLocked,
       IsShow: app.globalData.userInfo.IsShow,
+      IsIOS:app.globalData.IsIOS,
     });
   },
   goto:function(e){

pages/main/userinfo.wxml

@@ -18,7 +18,7 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-  <block wx:if="{{IsShow==1 && IsLocked==1}}">
+  <block wx:if="{{(IsShow==1 && IsLocked==1) || (IsShow<=0 && !IsIOS)}}">
     <view class="panelTitle FlexRow">
       <view class="panelTitle1">我的卡包</view>
     </view>

project.private.config.json

@@ -0,0 +1,61 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "list",
+          "pathName": "pages/main/list",
+          "query": "id=3&name=三年级"
+        },
+        {
+          "name": "detail",
+          "pathName": "pages/main/detail",
+          "query": "id=187"
+        },
+        {
+          "name": "print",
+          "pathName": "pages/main/print",
+          "query": "id=183"
+        },
+        {
+          "name": "item",
+          "pathName": "pages/main/item",
+          "query": "id=46"
+        },
+        {
+          "name": "guide",
+          "pathName": "pages/main/guide",
+          "query": ""
+        },
+        {
+          "name": "login",
+          "pathName": "pages/about/payfinished",
+          "query": ""
+        },
+        {
+          "name": "answer",
+          "pathName": "pages/main/answer",
+          "query": ""
+        },
+        {
+          "name": "errorlist",
+          "pathName": "pages/main/errorlist",
+          "query": ""
+        },
+        {
+          "name": "share",
+          "pathName": "pages/about/share",
+          "query": ""
+        },
+        {
+          "name": "/package4/main/paylist",
+          "pathName": "/package4/main/paylist",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        }
+      ]
+    }
+  }
+}