1.1.1

app.js

@@ -12,7 +12,7 @@ App({
   },
   globalData: {
     Version: "1.1.0",
-    IsProduction: false,
+    IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
     ShareTitle:"赢在阅读起跑线",

pages/about/about.wxml

@@ -1,5 +1,6 @@
 <view class="container FlexColumn">
   <image src="../../images/06001.png" class="bg" />
+  <view style='height:100rpx;'></view>
 
   <view class="btn" wx:for="{{ListProgram}}" wx:key="index" style='left:{{item.left}}rpx;top:{{item.top}}rpx;' bindtap='switchProgram' data-appid="{{item.appId}}" data-path="{{item.path}}"></view>
   <view class="getAppID" bindtap='getAppID' ></view>

pages/about/about.wxss

@@ -5,8 +5,8 @@
 }
 
 .bg{
-  width:100%;
-  height:3081rpx;
+  width:630rpx;
+  height:2683rpx;
   margin-top: 40rpx;
 }
 

pages/about/membercenter.js

@@ -15,10 +15,8 @@ Page({
 
     this.setData({
       Height: common.getSystemHeight(),
-      Member:member,
+      Member: member,
     });
-    
-    
 
     this.init();
   },
@@ -26,6 +24,13 @@ Page({
     var that = this;
     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);
+              }
+            }
+        }
         that.setData({
           ProductList: data,
         });
@@ -43,9 +48,20 @@ Page({
     });
   },
   gotoPaylist:function(){
-    wx.navigateTo({
-      url: '../about/paylist',
+    var that=this;
+    wx.getSetting({
+      success(res) {
+        if (res.authSetting['scope.userInfo']) {
+          wx.navigateTo({
+            url: '../about/paylist',
+          });
+        }
+        else{
+          that.getAccredit();
+        }
+      }
     });
+    
   },
   getAccredit: function () {
     if (!this.data.IsAccredit) {
@@ -80,7 +96,9 @@ Page({
         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;

pages/about/orderlist.js

@@ -50,8 +50,8 @@ Page({
     if (e) {
       id = e.currentTarget.dataset.id;
     }
-    var total = 0, totalFinal = 0, 
-    selectCount = 0, discounts = 0;
+    var total = 0, totalFinal = 0,
+      selectCount = 0, discounts = 0;
     for (var i = 0; i < this.data.ListProgram.length; i++) {
       if (this.data.ListProgram[i].ID == id) {
         this.data.ListProgram[i].IsSelect = !this.data.ListProgram[i].IsSelect;
@@ -78,15 +78,15 @@ Page({
     totalFinal = Math.round(totalFinal) / 100;
     discounts = Math.round(discounts) / 100;
 
-    var remark="一款原价，成套购买更划算";
-    if (discount<1)
-      remark = "套装购买现享 " + (discount * 10) + " 折，已优惠 " + discounts+" 元"
+    var remark = "一款原价，成套购买更划算";
+    if (discount < 1)
+      remark = "套装购买现享 " + (discount * 10) + " 折，已优惠 " + discounts + " 元"
 
     this.setData({
       ListProgram: this.data.ListProgram,
       TotalFinal: totalFinal,
       Remark: remark,
-      Total:total,
+      Total: total,
       Discount: discount,
     });
 
@@ -99,18 +99,28 @@ Page({
       isPaying = true;
       var that = this;
       var money = this.data.TotalFinal;
-      var detail="";
-      for (var i = 0; i < this.data.ListProgram.length;i++){
-        if (this.data.ListProgram[i].IsSelect){
-          detail += ","+this.data.ListProgram[i].ID + ":" + this.data.ListProgram[i].Price * this.data.Discount;
+      var detail = "";
+      for (var i = 0; i < this.data.ListProgram.length; i++) {
+        if (this.data.ListProgram[i].IsSelect) {
+          detail += "," + this.data.ListProgram[i].ID + ":" + this.data.ListProgram[i].Price * this.data.Discount;
         }
       }
-      detail=detail.substr(1);
-      server.payMoney(4,money,detail, function (data) {
-        wx.navigateTo({
-          url: '../about/payfinished?type=all',
+      detail = detail.substr(1);
+      var currentProductMoney = app.globalData.ProgramID + ":" + Math.round(100 * app.globalData.PayMoney).toString();
+      if (detail == currentProductMoney) {
+        server.payMoney(3, money, null, function () {
+          wx.navigateTo({
+            url: '../about/payfinished',
+          });
         });
-      });
+      }
+      else {
+        server.payMoney(4, money, detail, function (data) {
+          wx.navigateTo({
+            url: '../about/payfinished?type=all',
+          });
+        });
+      }
       setTimeout(function () {
         isPaying = false;
       }, 10000);

pages/about/payfinished.js

@@ -12,6 +12,7 @@ Page({
     if (options && options.type=="all"){
       text1 = "套装产品必须逐个激活";
       text2 = "赶紧去激活";
+      wx.setStorageSync("IsShowActivty", true);
     }
 
     this.setData({
@@ -21,6 +22,11 @@ Page({
       OrderType: options.type,
     });
   },
+  onUnload: function () {
+    wx.reLaunch({
+      url: '../main/index'
+    });
+  },
   deblocking: function () {
     wx.reLaunch({
       url: '../index/index'

pages/about/paylist.js

@@ -45,6 +45,11 @@ Page({
           PayList: data,
           IsShowActivty: isShowActivty,
         });
+
+        if (isShowActivty)
+          wx.setStorageSync("IsShowActivty", isShowActivty);
+        else
+          wx.removeStorageSync("IsShowActivty");
       }
       else {
         that.setData({

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/index/activate.wxss

@@ -2,6 +2,7 @@
   background-color: #F5E2BE;
   justify-content: flex-start;
   color: #1e1e1e;
+  font-weight: 500;
 }
 
 .bg{

pages/main/detail.js

@@ -120,8 +120,13 @@ Page({
       wx.setStorageSync('IsHelpPosition1', 2);
     }
 
-    if (app.globalData.userInfo.NickName == "陌生用户")
-      wx.setStorageSync('IsRemindAccredit', 1);
+    wx.getSetting({
+      success(res) {
+        if (!res.authSetting['scope.userInfo']) {
+          wx.setStorageSync('IsRemindAccredit', 1);
+        }
+      }
+    })
 
   },
   submitData: function (content) {

pages/main/index.js

@@ -21,7 +21,7 @@ Page({
     NavClass1: "",
     NavClass2: "nav2",
     IsRemind: false,
-    IsMemberForeverRemind: false,
+    IsMemberForeverRemind: 0,
   },
   onReady: function (e) {
   },
@@ -71,6 +71,13 @@ Page({
       this.selectNav(obj);
       wx.removeStorageSync("indexNav");
     }
+
+    //如果未激活，请先去激活
+    if (wx.getStorageSync("IsShowActivty")) {
+      wx.navigateTo({
+        url: '../about/paylist',
+      });
+    }
   },
   getAccredit: function () {
     if (!this.data.IsAccredit) {
@@ -108,8 +115,9 @@ Page({
         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;
             
@@ -234,7 +242,9 @@ Page({
         wx.setStorageSync("ReviewList", data.ReviewList);
 
         common.getStorageValue(that, "IsMemberForeverRemind", 0, function () {
-          if (that.data.IsMemberForeverRemind == 0 && that.data.NewUserNumber >= app.globalData.NewUserNumberMax) {
+          if (that.data.IsMemberForeverRemind == 0 
+            && that.data.NewUserNumber >= app.globalData.NewUserNumberMax 
+            && that.data.NewUserNumber<999999) {
             that.setData({
               IsMemberForeverRemind: 1,
             });
@@ -319,7 +329,6 @@ Page({
     });
   },
   gotoPayList: function () {
-
     if (this.data.IsMember == 0 && !this.data.IsFirstDay && this.data.NewUserNumber >= this.data.NewUserNumberMax){
       this.setData({
         IsMemberForeverRemind: 0,

pages/main/index.wxml

@@ -137,9 +137,9 @@
       <image src='../../images/02028.png' class="img02028 img02025" wx:if="{{IsMember==1 && !IsFirstDay && NewUserNumber<NewUserNumberMax}}">
         <view class="getNewUser2 getNewUser" bindtap='gotoNewUser'></view>
       </image>
-      <view class="line"></view>
-      <view class="text">其它优惠</view>
-      <image src='../../images/02029.png' class="img02029" bindtap='selectNav' data-id="2"></image>
+      <view class="line" wx:if="{{IsMember==0}}"></view>
+      <view class="text" wx:if="{{IsMember==0}}">其它优惠</view>
+      <image  wx:if="{{IsMember==0}}" src='../../images/02029.png' class="img02029" bindtap='selectNav' data-id="2"></image>
 
       <view class="index10 index9 FlexRow">
         <image src='../../images/02016.png' class="imgWave" />
@@ -155,7 +155,7 @@
     <view class="index6 FlexColumn">
       <image src='../../images/{{item.ImageUrl}}' class="btn2" wx:for="{{ListProgram}}" wx:key="index" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' />
     </view>
-    <view class="bottom FlexColumn" bindtap='gotoAllPay' wx:if="{{IsShow==1 && IsMember==0}}">
+    <view class="bottom FlexColumn" bindtap='gotoAllPay' wx:if="{{IsShow==1}}">
       <view class="bottom1 FlexRow">
         <view class="left FlexColumn">
           <view class="text">成套购买更划算</view>
@@ -186,13 +186,16 @@
 
 </view>
 
-<view class="IsMemberForever container FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsMemberForeverRemind==1}}">
+<view class="IsMemberForever container FlexColumn" style='height:{{Height}}rpx;' 
+wx:if="{{IsMemberForeverRemind==1}}">
   <view class="btn">
     <view class="btn1 FlexColumn" catchtap="gotoPayList">
       <view class="panel1 FlexColumn">
         <image src='../../images/02023.png' class="img" />
         <view class="text1">恭喜你</view>
-        <view class="text2">已获得永久有效期</view>
+        <view class="text2">获得永久有效期奖励</view>
+        <view class="line"></view>
+        <view class="text3">*购买本产品后自动生效</view>
       </view>
       <view class="panel2 FlexColumn">
         知道了

pages/main/index.wxss

@@ -481,7 +481,7 @@
 
 .IsMemberForever .btn {
   width: 600rpx;
-  height: 640rpx;
+  height: 729rpx;
   background-color: #D2D2D2;
   border-radius: 40rpx;
   margin-top: 230rpx;
@@ -489,7 +489,7 @@
 }
 .IsMemberForever .btn1 {
   width: 100%;
-  height: 620rpx;
+  height: 709rpx;
   background-color: #F0F0F0;
   border-radius: 40rpx;
   position:relative;
@@ -498,7 +498,7 @@
 }
 .IsMemberForever .panel1 {
   width: 100%;
-  height: 500rpx;
+  height: 600rpx;
   background-color: #B3443B;
   border-top-left-radius: 40rpx;
   border-top-right-radius: 40rpx;
@@ -516,6 +516,18 @@
   font-size:36rpx;
   color:#fff;
 }
+.IsMemberForever .line {
+  width: 510rpx;
+  height: 2rpx;
+  background-color: #FC8D90;
+  margin-top: 20rpx;
+}
+.IsMemberForever .text3 {
+  font-size:24rpx;
+  color:#fff;
+  margin-top: 30rpx;
+  font-weight: 400;
+}
 .IsMemberForever .panel2 {
   width: 100%;
   height: 120rpx;

project.config.json

@@ -1,7 +1,7 @@
 {
 	"description": "项目配置文件。",
 	"setting": {
-		"urlCheck": false,
+		"urlCheck": true,
 		"es6": true,
 		"postcss": true,
 		"minified": true,