1.1.0

pages/about/orderlist.js

@@ -10,7 +10,7 @@ Page({
       {
         ID: 89,
         Name: "数学口算练习",
-        Remark: "一款原价19.90元，有效期6个月",
+        Remark: "原价19.90元，有效期6个月",
         Price: 1990,
         Remark2: "",
         Image: "06009",
@@ -18,7 +18,7 @@ Page({
       }, {
         ID: 99,
         Name: "英语自然拼读",
-        Remark: "一款原价19.80元，有效期6个月",
+        Remark: "原价19.80元，有效期6个月",
         Price: 1980,
         Remark2: "成套购买赠永久有效期",
         Image: "06006",
@@ -26,7 +26,7 @@ Page({
       }, {
         ID: 98,
         Name: "语文汉语拼音",
-        Remark: "一款原价9.90元，有效期6个月",
+        Remark: "原价9.90元，有效期6个月",
         Price: 990,
         Remark2: "成套购买赠永久有效期",
         Image: "06007",
@@ -34,7 +34,7 @@ Page({
       }, {
         ID: 106,
         Name: "语文识字",
-        Remark: "一款原价9.80元，有效期6个月",
+        Remark: "原价9.80元，有效期6个月",
         Price: 980,
         Remark2: "成套购买赠永久有效期",
         Image: "06008",
@@ -108,7 +108,7 @@ Page({
       detail=detail.substr(1);
       server.payMoney(4,money,detail, function (data) {
         wx.navigateTo({
-          url: '../about/payfinished',
+          url: '../about/payfinished?type=all',
         });
       });
       setTimeout(function () {

pages/about/orderlist.wxml

@@ -14,14 +14,15 @@
         <view class="text3" wx:if="{{item.Remark2}}">{{item.Remark2}}</view>
       </view>
     </view>
-  </view>
-
-  <view class="bottom FlexColumn">
     <view class="text0 FlexRow" bindtap='gotoFeedback'>
       <view>如遇支付问题请</view>
       <view class="red">联系客服</view>
       <view>为您处理</view>
     </view>
+  </view>
+
+  <view class="bottom FlexColumn">
+    
     <view class="bottom1 FlexColumn">
       <view class="top FlexRow" wx:if="{{Total>0}}">
         <view class="left">

pages/about/orderlist.wxss

@@ -1,7 +1,7 @@
 .container {
   background-color: #F0F0F0;
   justify-content: flex-start;
-  color: #872439;
+  color: #1e1e1e;
   font-weight:500;
 }
 
@@ -71,6 +71,18 @@
   margin-bottom: 40rpx;
 }
 
+.panel2 .text0 {
+  font-size: 22rpx;
+  font-weight: 400;
+  height:80rpx;
+}
+
+.panel2 .text0 .red {
+  color: #a20602;
+  font-weight: 600;
+  text-decoration: underline;
+}
+
 .container .bottom{
   width:100%;
   position: fixed;
@@ -92,19 +104,6 @@
   border: 0px;
 }
 
-.bottom .text0 {
-  font-size: 22rpx;
-  font-weight: 400;
-  height:80rpx;
-}
-
-.bottom .text0 .red {
-  color: #a20602;
-  font-weight: 600;
-  text-decoration: underline;
-}
-
-
 .bottom .left{
   margin-left: 50rpx;
   align-items: flex-start;

pages/about/payfinished.js

@@ -28,7 +28,7 @@ Page({
   },
   gotoPayList: function () {
     wx.navigateTo({
-      url: '../about/paylist',
+      url: '../about/paylist?type=finished',
     });
   },
   gotoNewUserList: function () {

pages/about/paylist.js

@@ -5,38 +5,52 @@ const app = getApp();
 
 Page({
   data: {
-    PayList: [],
-    IsActive: false,
+    PayList: null,
+    IsShowActivty: false,
   },
   onLoad: function (options) {
     //测试*****************
-    if (!app.globalData.userInfo)
-      app.globalData.userInfo = { UserID: 4 };
+    // if (!app.globalData.userInfo)
+    //   app.globalData.userInfo = { UserID: 4 };
 
     this.setData({
       Height: common.getSystemHeight(),
+      UnloadType: options.type,
     });
     this.init();
   },
+  onUnload: function () {
+    if (this.data.UnloadType == "finished") {
+      wx.reLaunch({
+        url: '../main/index'
+      });
+    }
+  },
   init: function () {
     var that = this;
-    server.getLocalHost(function () {
-      server.getData('GetWXUsersAllPayInfo?UserID=' + app.globalData.userInfo.UserID, function (data) {
-        if (data) {
-          
-          for (var i = 0; i < data.length; i++) {
-            for (var j = 0; j < data[i].List.length; j++) {
-              data[i].List[j].isShowActivty = false;
-              if (data[i].List[j].Status == 0) {
-                data[i].List[j].isShowActivty = true;
-              }
+
+    server.getData('GetWXUsersAllPayInfo?UserID=' + app.globalData.userInfo.UserID + "&ProductID=" + app.globalData.ProgramID, function (data) {
+      if (data) {
+        var isShowActivty = false;
+        for (var i = 0; i < data.length; i++) {
+          for (var j = 0; j < data[i].List.length; j++) {
+            data[i].List[j].isShowActivty = false;
+            if (data[i].List[j].Status == 0) {
+              data[i].List[j].isShowActivty = true;
+              isShowActivty = true;
             }
           }
-          that.setData({
-            PayList: data,
-          });
         }
-      });
+        that.setData({
+          PayList: data,
+          IsShowActivty: isShowActivty,
+        });
+      }
+      else {
+        that.setData({
+          PayList: [],
+        });
+      }
     });
   },
   gotoActive: function (e) {
@@ -55,7 +69,7 @@ Page({
           appId: list[i].appId,
           path: path,
           success(res) {
-            
+
           }
         });
 
@@ -75,12 +89,15 @@ Page({
       }
     }
   },
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
   refresh: function () {
     var that = this;
     wx.showLoading({
       title: '加载中',
     });
-    
+
     setTimeout(function () {
       wx.hideLoading();
       that.init();

pages/about/paylist.wxml

@@ -3,8 +3,8 @@
     <view class="text0" wx:if="{{IsShowActivty}}">
       您购买的产品未激活，请尽快处理！
     </view>
-    <view class="text1">购买后如不能正常使用，请清理内存后重启微信并打开小程序，</view>
-    <view class="text2 FlexRow">
+    <view class="text1" bindtap='gotoFeedback'>购买后如不能正常使用，请清理内存后重启微信并打开小程序，</view>
+    <view class="text2 FlexRow" bindtap='gotoFeedback'>
       <view>一般问题即可解决。也可通过“</view>
       <view class="red">意见反馈</view>
       <view>”联系我们为您处理。</view>
@@ -50,7 +50,7 @@
       </view>
     </view>
   </block>
-  <block wx:if="{{PayList.length==0}}">
+  <block wx:if="{{PayList && PayList.length==0}}">
     <view class="titleNull">无记录</view>
   </block>
 

pages/index/index.js

@@ -157,16 +157,19 @@ Page({
           }
           else {
             //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
-            setTimeout(function () {
-              wx.redirectTo({
-                url: '../main/index'
-              })
-            }, 2000);
+            that.getHanzi(function(){
+              setTimeout(function () {
+                wx.redirectTo({
+                  url: '../main/index'
+                })
+              }, 2000);
+            });
           }
         }
       });
 
     });
+    
   },
   getHanzi: function (callback) {
     var that = this;

pages/main/index.js

@@ -26,6 +26,7 @@ Page({
   onReady: function (e) {
   },
   onLoad: function (options) {
+    //app.globalData.userInfo.UserID=5;
     this.setData({
       Height: common.getSystemHeight(),
       NickName: app.globalData.userInfo.NickName,
@@ -91,6 +92,9 @@ Page({
               }
             })
           }
+          else{
+            that.getUserInfo();
+          }
         }
       })
     }
@@ -171,6 +175,8 @@ Page({
   getData: function () {
     var that = this;
     server.getData('GetHanziRecordData?UserID=' + app.globalData.userInfo.UserID + "&Version=" + app.globalData.Version, function (data) {
+      
+
       if (data) {
 
         if (!data.DayNumber)
@@ -181,7 +187,7 @@ Page({
         var reviewCount = 0;
         if (data.ReviewList)
           reviewCount = data.ReviewList.length;
-
+        
         hanziNumber = 0;
         var arr = JSON.parse(wx.getStorageSync("HanziAll"));
         for (var k = 0; k < data.FinishedList.length; k++) {
@@ -209,7 +215,9 @@ Page({
               break;
           }
         }
-
+        if (!hanziNumber){
+          hanziNumber=0;
+        }
         that.setData({
           DayNumber: data.DayNumber,
           HanziNumber: hanziNumber,

pages/main/index.wxml

@@ -70,9 +70,9 @@
           <image src='../../images/02022.png' class="img" />
         </view>
       </image>
-      <view class="NickName">{{NickName}}</view>
-      <view class="Member2 Member" wx:if="{{IsMember==0}}">非会员</view>
-      <view class="Member" wx:if="{{IsMember==1}}">付费会员</view>
+      <view class="NickName" bindtap="gotoMemberCenter">{{NickName}}</view>
+      <view class="Member2 Member" wx:if="{{IsMember==0}}"  bindtap="gotoMemberCenter">非会员</view>
+      <view class="Member" wx:if="{{IsMember==1}}"  bindtap="gotoMemberCenter">付费会员</view>
       <view class="index3_0 FlexRow">
         <view class="index3_1 FlexColumn">
           <view class="index3_1_1 FlexRow">

utils/main.js

@@ -69,6 +69,8 @@ function payMoney(payType, money, detail, callback) {
   console.log(money);
   if (app.globalData.userInfo.UserID == 1)
     money = 0.01;
+  else if (app.globalData.userInfo.UserID == 5)
+    money = 0.01;
   //登录认证
   wx.login({
     success: function (res) {