1.1.1

app.js

@@ -11,7 +11,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.1.0",
+    Version: "1.1.1",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",

pages/about/membercenter.js

@@ -5,12 +5,12 @@ const app = getApp();
 
 Page({
   data: {
-    IsAccredit:false,
+    IsAccredit: false,
   },
   onLoad: function (options) {
 
-    var member="非会员";
-    if (app.globalData.userInfo.IsMember==1)
+    var member = "非会员";
+    if (app.globalData.userInfo.IsMember == 1)
       member = "付费会员";
 
     this.setData({
@@ -20,16 +20,16 @@ Page({
 
     this.init();
   },
-  init:function(){
+  init: function () {
     var that = this;
-    server.getData('GetWXUsersAllTime?ProductID=' + app.globalData.ProgramID+'&UserID=' + app.globalData.userInfo.UserID, function (data) {
+    server.getData('GetWXUsersAllTime?ProductID=' + app.globalData.ProgramID + '&UserID=' + app.globalData.userInfo.UserID, function (data) {
       if (data) {
-        for(var i=0;i<data.length;i++){
-            if (data[i].ID==app.globalData.ProgramID){
-              if (that.data.Member=="非会员"){
-                data[i].Time = common.formatDateCHS(app.globalData.userInfo.CreateTime);
-              }
+        for (var i = 0; i < data.length; i++) {
+          if (data[i].ID == app.globalData.ProgramID) {
+            if (that.data.Member == "非会员") {
+              data[i].Time = common.formatDateCHS(app.globalData.userInfo.CreateTime);
             }
+          }
         }
         that.setData({
           ProductList: data,
@@ -47,8 +47,8 @@ Page({
       }
     });
   },
-  gotoPaylist:function(){
-    var that=this;
+  gotoPaylist: function () {
+    var that = this;
     wx.getSetting({
       success(res) {
         if (res.authSetting['scope.userInfo']) {
@@ -56,95 +56,16 @@ Page({
             url: '../about/paylist',
           });
         }
-        else{
+        else {
           that.getAccredit();
         }
       }
     });
-    
-  },
-  getAccredit: function () {
-    if (!this.data.IsAccredit) {
-      var that = this;
-      wx.getSetting({
-        success(res) {
-          if (!res.authSetting['scope.userInfo']) {
-            wx.authorize({
-              scope: 'scope.userInfo',
-              success() {
-                that.getUserInfo();
-              },
-              fail() {
-                wx.openSetting({
-                  success(res) {
-                    that.getUserInfo();
-                  }
-                });
-              }
-            })
-          }
-        }
-      })
-    }
-  },
-  //得到用户信息
-  getUserInfo: function () {
-    var that = this
-    //调用登录接口
-    wx.login({
-      success: function (res0) {
-        wx.getUserInfo({
-          withCredentials: true,
-          success: function (res) {
-            var userID = app.globalData.userInfo.UserID;
-            app.globalData.userInfo = res.userInfo;
-            app.globalData.userInfo.UserID = userID;
-
-            app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
-            app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
 
-            // that.hasGetShareInfo(app.globalData.userInfo);
-            that.setData({
-              IsAccredit: true,
-              NickName: app.globalData.userInfo.NickName,
-              AvatarUrl: app.globalData.userInfo.AvatarUrl
-            });
-
-            app.globalData.userInfo.Code = res0.code;
-            app.globalData.userInfo.iv = res.iv;
-            app.globalData.userInfo.encryptedData = res.encryptedData;
-            that.login(app.globalData.userInfo);
-          },
-          fail: function (res) {
-            
-          }
-        });
-      },
-      fail: function () {
-      }
-    });
   },
-  login: function (param) {
-    var that = this;
-    server.postData('HanziLogin', {
-      Code: param.Code,
-      NickName: param.nickName,
-      Language: param.language,
-      Gender: param.gender,
-      City: param.city,
-      Province: param.province,
-      Country: param.country,
-      AvatarUrl: param.avatarUrl,
-      ProgramVersion: app.globalData.Version,
-      Introducer: app.globalData.introducer,
-      UserSource: app.globalData.userSource,
-      SourceID: app.globalData.SourceID,
-      LastUserSource: app.globalData.userSource,
-      iv: param.iv,
-      encryptedData: param.encryptedData,
-    }, function (data) {
-
+  gotoPayFinished: function () {
+    wx.navigateTo({
+      url: '../about/payfinished?type=accredit',
     });
-    
   },
 })

pages/about/membercenter.wxml

@@ -1,14 +1,14 @@
 <view class="container FlexColumn" style='height:{{Height}}rpx;'>
-  <view class="title0" bindtap="getAccredit" wx:if="{{!IsAccredit}}">
-    为保障您的消费权益，在购买后请尽快授权用户信息！
+  <view class="title0" bindtap="gotoPayFinished" wx:if="{{!IsAccredit}}">
+    去登录，开通统计、套装、礼品卡等功能
   </view>
   <view class="title1">
     <view class="title1_1">会员信息</view>
   </view>
-  <view class="title3 FlexRow" bindtap="getAccredit" wx:if="{{!IsAccredit}}">
+  <view class="title3 FlexRow" bindtap="gotoPayFinished" wx:if="{{!IsAccredit}}">
     <view class="title2_1 FlexColumn">
-      <view class="red">授权用户信息</view>
-      <view class="title3_2">授权后才能正常使用统计、套装、礼品卡等功能</view>
+      <view class="red">登录</view>
+      <view class="title3_2">无需注册，授权即可登录；未登录部分功能不可使用</view>
     </view>
     <view class="title2_2 FlexRow">
       <image src='../../images/Arrow.png' class="Arrow" />

pages/about/newuserlist.wxml

@@ -11,7 +11,7 @@
     </view>
   </view>
   <view class="text2">满6位新用户</view>
-  <view class="text3">升级到永久有效期</view>
+  <view class="text3">可延长有效期3个月</view>
   <view class="text4">技巧：转发到家长群，又快又有效率。</view>
   <button class="btnParent FlexRow" open-type="share">
     <view class="btn" bindtap="">
@@ -19,8 +19,7 @@
     </view>
   </button>
   <view class="text5">活动细则</view>
-  <text class="text6">* 购买产品并参加本活动，达到要求后有效期将升级为永久有效。</text>
-  <text class="text7 text6">* 购买前的邀请同样有效；购买前已达到，将在购买后自动生效。</text>
+  <text class="text6">* 本活动仅对会员（付费用户）开放，推荐结果自成为会员后开始计算。奖品自动生效，在达到要求后有效期延长3个月。</text>
   <text class="text7 text6">* “新用户”是指：从未打开过本小程序的微信帐号，经由您通过转发使对方打开小程序。</text>
 
 </view>

pages/about/newuserlist.wxss

@@ -97,7 +97,6 @@
   color:#fff;
 }
 
-
 .text5 {
   font-size: 20rpx;
   margin-top: 30rpx;
@@ -106,6 +105,7 @@
   font-size: 20rpx;
   margin-top: 20rpx;
   width:600rpx;
+  font-weight: 400;
 }
 .text7 {
   margin-top: 10rpx;

pages/about/orderlist.js

@@ -20,7 +20,7 @@ Page({
         Name: "英语自然拼读",
         Remark: "原价19.80元，有效期6个月",
         Price: 1980,
-        Remark2: "成套购买赠永久有效期",
+        Remark2: "成套购买加送6个月",
         Image: "06006",
         IsSelect: true,
       }, {
@@ -28,7 +28,7 @@ Page({
         Name: "语文汉语拼音",
         Remark: "原价9.90元，有效期6个月",
         Price: 990,
-        Remark2: "成套购买赠永久有效期",
+        Remark2: "成套购买加送6个月",
         Image: "06007",
         IsSelect: true,
       }, {
@@ -36,7 +36,7 @@ Page({
         Name: "语文识字",
         Remark: "原价9.80元，有效期6个月",
         Price: 980,
-        Remark2: "成套购买赠永久有效期",
+        Remark2: "成套购买加送6个月",
         Image: "06008",
         IsSelect: true,
       },
@@ -110,7 +110,7 @@ Page({
       if (detail == currentProductMoney) {
         server.payMoney(3, money, null, function () {
           wx.navigateTo({
-            url: '../about/payfinished',
+            url: '../about/payfinished?type=single',
           });
         });
       }

pages/about/payfinished.js

@@ -7,18 +7,35 @@ Page({
   data: {
   },
   onLoad: function (options) {
-    var text1= "请确认购买记录";
-    var text2 = "查看我的订单";
-    if (options && options.type=="all"){
-      text1 = "套装产品必须逐个激活";
-      text2 = "赶紧去激活";
-      wx.setStorageSync("IsShowActivty", true);
+    var text0 = "", text1 = "", text2 = "", text3 = "";
+    if (options) {
+      if (options.type == "accredit") {
+        text0 = "会员登录";
+        text1 = "无需注册，微信授权即可登录";
+        text2 = "去登录";
+        text3 = "注意：会员登录后可使用付费功能。授权微信用户信息即可一键登录。为保障消费权益，购买后请尽快授权用户信息。登录后才能正常使用统计、排行、我的订单、套装、礼品卡等功能。";
+      }
+      else if (options.type == "single") {
+        text0 = "你好，会员";
+        text1 = "请确认购买结果";
+        text2 = "去查看";
+        text3 = "注意：如遇网络问题未能解锁，请清理手机内存并重新打开微信小程序，一般即可恢复正常。如仍未解决，可通过首页底部“意见反馈”联系我们为您处理。";
+      }
+      else if (options.type == "all") {
+        text0 = "套装产品必须激活";
+        text1 = "激活后才能正常使用";
+        text2 = "去激活";
+        text3 = "注意：如遇网络问题未能解锁，请清理手机内存并重新打开微信小程序，一般即可恢复正常。如仍未解决，可通过首页底部“意见反馈”联系我们为您处理。";
+        wx.setStorageSync("IsShowActivty", true);
+      }
     }
 
     this.setData({
       Height: common.getSystemHeight(),
-      Text1:text1,
-      Text2:text2,
+      Text0: text0,
+      Text1: text1,
+      Text2: text2,
+      Text3: text3,
       OrderType: options.type,
     });
   },
@@ -32,14 +49,104 @@ Page({
       url: '../index/index'
     });
   },
-  gotoPayList: function () {
-    wx.navigateTo({
-      url: '../about/paylist?type=finished',
+  goto: function () {
+    var that=this;
+    if (this.data.OrderType == "accredit") {
+      var that = this;
+      wx.getSetting({
+        success(res) {
+          if (!res.authSetting['scope.userInfo']) {
+            wx.authorize({
+              scope: 'scope.userInfo',
+              success() {
+                that.getUserInfo();
+              },
+              fail() {
+                wx.openSetting({
+                  success(res) {
+                    that.getUserInfo();
+                  },
+                });
+              }
+            })
+          }
+          else {
+            that.getUserInfo();
+          }
+        }
+      })
+      
+    }
+    else if (this.data.OrderType == "single" || this.data.OrderType == "all") {
+      wx.navigateTo({
+        url: '../about/paylist?type=finished',
+      });
+    }
+  },
+  //得到用户信息
+  getUserInfo: function () {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function (res0) {
+        wx.getUserInfo({
+          withCredentials: true,
+          success: function (res) {
+            var userID = app.globalData.userInfo.UserID;
+            app.globalData.userInfo = res.userInfo;
+            app.globalData.userInfo.UserID = userID;
+
+            app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
+            app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
+
+            // that.hasGetShareInfo(app.globalData.userInfo);
+            that.setData({
+              IsAccredit: true,
+              NickName: app.globalData.userInfo.NickName,
+              AvatarUrl: app.globalData.userInfo.AvatarUrl
+            });
+
+            app.globalData.userInfo.Code = res0.code;
+            app.globalData.userInfo.iv = res.iv;
+            app.globalData.userInfo.encryptedData = res.encryptedData;
+            that.login(app.globalData.userInfo);
+          },
+          fail: function (res) {
+            wx.reLaunch({
+              url: '../main/index'
+            });
+          }
+        });
+      },
+      fail: function () {
+        wx.reLaunch({
+          url: '../main/index'
+        });
+      }
     });
   },
-  gotoNewUserList: function () {
-    wx.navigateTo({
-      url: '../about/newuserlist',
+  login: function (param) {
+    var that = this;
+    server.postData('HanziLogin', {
+      Code: param.Code,
+      NickName: param.nickName,
+      Language: param.language,
+      Gender: param.gender,
+      City: param.city,
+      Province: param.province,
+      Country: param.country,
+      AvatarUrl: param.avatarUrl,
+      ProgramVersion: app.globalData.Version,
+      Introducer: app.globalData.introducer,
+      UserSource: app.globalData.userSource,
+      SourceID: app.globalData.SourceID,
+      LastUserSource: app.globalData.userSource,
+      iv: param.iv,
+      encryptedData: param.encryptedData,
+    }, function (data) {
+      wx.reLaunch({
+        url: '../main/index'
+      });
     });
   },
   onShareAppMessage: function () {

pages/about/payfinished.json

@@ -1,6 +1,6 @@
 {
   "navigationBarBackgroundColor": "#F5E2BE",
-  "navigationBarTitleText": "订单",
+  "navigationBarTitleText": "感谢购买",
   "backgroundColor": "#F5E2BE",
   "enablePullDownRefresh": false
 }

pages/about/payfinished.wxml

@@ -1,21 +1,12 @@
 <view class="container FlexColumn" style='height:{{Height}}rpx;'>
   <image src="../../images/06003.png" class="bg" />
-  <text class="text1">感谢购买</text>
-  <text class="text1_1">{{Text1}}</text>
+  <text class="text0">{{Text0}}</text>
+  <text class="text1">{{Text1}}</text>
 
-  <view class="btn" bindtap="gotoPayList">
+  <view class="btn" bindtap="goto">
     <view class="btn1">{{Text2}}</view>
   </view>
-  <text class="text2">注意：如遇网络问题未能解锁，请清理手机内存并重新打开微信小程序，一般即可恢复正常。如仍未解决，可通过首页底部“意见反馈”联系我们为您处理。</text>
+  <view class="line2"></view>
+  <text class="text3">{{Text3}}</text>
 
-  <block wx:if="{{OrderType!='all'}}">
-    <view class="line2"></view>
-    <view class="text4">
-      想要获得永久有效期？
-    </view>
-    <view class="text5 text3 FlexRow" bindtap="gotoNewUserList">
-      <image src="../../images/Triangle.png" class="Triangle" />
-      <view>告诉我怎么做</view>
-    </view>
-  </block>
 </view>

pages/about/payfinished.wxss

@@ -13,13 +13,14 @@
   left:0;
 }
 
-.text1{
+.text0{
   font-size:36rpx;
   text-align: center;
-  margin-top: 132rpx;
+  margin-top: 280rpx;
+  z-index: 10;
 }
 
-.text1_1{
+.text1{
   font-size:44rpx;
   text-align: center;
   margin-top: 10rpx;
@@ -31,7 +32,8 @@
   height: 104rpx;
   background-color: #035834;
   border-radius: 14rpx;
-  margin-top: 88rpx;
+  margin-top: 90rpx;
+  z-index: 10;
 }
 
 .btn1 {
@@ -47,43 +49,20 @@
   color:#fff;
 }
 
-.text2{
-  font-size:22rpx;
-  width:560rpx; 
-  margin-top: 50rpx;
-  z-index: 10;
-}
-
 .line2{
   width: 600rpx;
   height:3rpx;
   background-color: #593613;
-  margin-top:360rpx;
+  margin-top:350rpx;
   z-index: 10;
 }
 
-
 .text3{
-  font-size:36rpx;
-  color:#A20602;
-  margin-top: 90rpx;
-  z-index: 10;
-}
-
-.Triangle{
-  width: 16rpx;
-  height:22rpx;
-  margin-right: 22rpx;
-}
-
-.text4{
-  font-size:28rpx;
-  margin-top: 60rpx;
+  font-size:22rpx;
+  width:560rpx; 
+  margin-top: 40rpx;
   z-index: 10;
+  font-weight: 400;
 }
 
-.text5{
-  margin-top: 20rpx;
-  z-index: 10;
-}
 

pages/about/paylist.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
   <block wx:if="{{PayList.length>0}}">
     <view class="text0" wx:if="{{IsShowActivty}}">
-      有产品未激活，请立即处理!
+      您有套装产品未激活，必须激活才能正常使用，请立即处理
     </view>
     <view class="text1" bindtap='gotoFeedback'>购买后如不能正常使用，请清理内存后重启微信并打开小程序，</view>
     <view class="text2 FlexRow" bindtap='gotoFeedback'>

pages/main/index.js

@@ -41,6 +41,14 @@ Page({
             IsAccredit: true,
           });
         }
+        else{
+          //付费用户请去授权
+          if (app.globalData.userInfo.IsMember == 1) {
+            wx.navigateTo({
+              url: '../about/payfinished?type=accredit',
+            });
+          }
+        }
       }
     })
 
@@ -52,6 +60,7 @@ Page({
   onShow: function () {
     this.getData();
 
+    //进入详情出来后，让用户授权
     if (!this.data.IsAccredit) {
       var IsRemindAccredit = wx.getStorageSync("IsRemindAccredit");
       if (IsRemindAccredit == 1) {
@@ -361,7 +370,7 @@ Page({
       var money = app.globalData.PayMoney;
       server.payMoney(3, money,null, function () {
         wx.navigateTo({
-          url: '../about/payfinished',
+          url: '../about/payfinished?type=single',
         });
       });
       setTimeout(function () {

pages/main/index.wxml

@@ -125,14 +125,10 @@
         <view class="payButton" bindtap='getPay'></view>
       </image>
       <!-- 次日 -->
-      <image src='../../images/02026.png' class="img02026 img02025" wx:if="{{IsMember==0 && !IsFirstDay && NewUserNumber<NewUserNumberMax}}">
+      <image src='../../images/02026.png' class="img02026 img02025" wx:if="{{IsMember==0 && !IsFirstDay}}">
         <view class="payButton2 payButton" bindtap='getPay'></view>
         <view class="getNewUser" bindtap='gotoNewUser'></view>
       </image>
-      <!-- 满员 -->
-      <image src='../../images/02027.png' class="img02027 img02025" wx:if="{{IsMember==0 && !IsFirstDay && NewUserNumber>=NewUserNumberMax}}">
-        <view class="payButton2 payButton" bindtap='getPay'></view>
-      </image>
       <!-- 已付 -->
       <image src='../../images/02028.png' class="img02028 img02025" wx:if="{{IsMember==1 && !IsFirstDay && NewUserNumber<NewUserNumberMax}}">
         <view class="getNewUser2 getNewUser" bindtap='gotoNewUser'></view>
@@ -193,9 +189,7 @@ wx:if="{{IsMemberForeverRemind==1}}">
       <view class="panel1 FlexColumn">
         <image src='../../images/02023.png' class="img" />
         <view class="text1">恭喜你</view>
-        <view class="text2">获得永久有效期奖励</view>
-        <view class="line"></view>
-        <view class="text3">*购买本产品后自动生效</view>
+        <view class="text2">获得3个月有效期</view>
       </view>
       <view class="panel2 FlexColumn">
         知道了

pages/main/index.wxss

@@ -418,23 +418,23 @@
 }
 .payInfo .img02025{
   width:100%;
-  height:953rpx;
+  height:1100rpx;
   position: relative;
 }
 .payInfo .img02026{
-  height:1024rpx;
+  height:810rpx;
 }
 .payInfo .img02027{
   height:696rpx;
 }
 .payInfo .img02028{
-  height:586rpx;
+  height:580rpx;
 }
 .payInfo .payButton{
   width:600rpx;
   height:104rpx;
   position: absolute;
-  top:690rpx;
+  top:800rpx;
   left:75rpx;
 }
 .payInfo .payButton2{
@@ -481,7 +481,7 @@
 
 .IsMemberForever .btn {
   width: 600rpx;
-  height: 729rpx;
+  height: 640rpx;
   background-color: #D2D2D2;
   border-radius: 40rpx;
   margin-top: 230rpx;
@@ -489,7 +489,7 @@
 }
 .IsMemberForever .btn1 {
   width: 100%;
-  height: 709rpx;
+  height: 620rpx;
   background-color: #F0F0F0;
   border-radius: 40rpx;
   position:relative;

pages/main/list.js

@@ -169,7 +169,7 @@ Page({
       var money = app.globalData.PayMoney;
       server.payMoney(3, money,null, function () {
         wx.navigateTo({
-          url: '../about/payfinished',
+          url: '../about/payfinished?type=single',
         });
       });
       setTimeout(function () {

project.config.json

@@ -85,6 +85,12 @@
 					"name": "\b激活",
 					"pathName": "pages/index/index",
 					"query": "SourceID=106&ProductBuyInfoID=3306&ProductID=106&ProductUserID=1&BuyType=109"
+				},
+				{
+					"id": -1,
+					"name": "新用户",
+					"pathName": "pages/about/newuserlist",
+					"query": ""
 				}
 			]
 		}