1.1.1

app.js

@@ -14,12 +14,13 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    version: "1.1.0",
+    version: "1.1.1",
     IsProduction: true,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",
     ProgramName: "数学计算题",
     ShareTitle: "认真练习，告别粗心",
+    SharePath: "pages/index/index",
     ShareImageUrl: '../../pages/images/programsystem_screenshot_pic01.png',
 
     fileUrl: "https://math-1253256735.file.myqcloud.com/",
@@ -38,5 +39,6 @@ App({
     IsShow: 0,
     NewUserNumberMax: 6,//邀请新用户最大值
     IsSaveCustom: false,//是否保存了定制
+    IsRefresh: false,
   }
 })

app.wxss

@@ -33,6 +33,29 @@
   width:100%;
 }
 
+
+
+.button0 {
+  width:132rpx;
+  height:122rpx;
+  background-color: rgba(73,188,255,0.3);
+  /* border: 6rpx solid rgba(73,188,255,0.7); */
+  border-radius: 10rpx;
+  box-shadow: 0 14rpx 5rpx #213454,
+  0 24rpx 1rpx rgba(0,0,0,0.14);
+}
+
+
+.button1 {
+  width:120rpx;
+  height:100rpx;
+  color:#fff;
+  background-color: #B3443B;
+  border-radius: 10rpx;
+  box-shadow: 0 10rpx 1rpx #7D2B25;
+}
+
+
 /* 灰度去色 */
 .desaturate {
     filter: grayscale(100%);

package4/main/activate.js

@@ -2,7 +2,7 @@ import common from '../../utils/util';
 import server from '../../utils/main';
 
 const app = getApp();
-var productList=[];
+var productList = [];
 
 Page({
   data: {
@@ -16,6 +16,9 @@ Page({
 
     this.init();
   },
+  onUnload:function(){
+    productList=[];
+  },
   init: function (e, isRemind) {
     var that = this;
     wx.showLoading({
@@ -31,21 +34,25 @@ Page({
               data[j].ImageUrl = programList[i].ImageUrl;
               data[j].appId = programList[i].appId;
               data[j].path = programList[i].path;
+              //不是当前小程序不解锁
+              if (app.globalData.ProgramID == data[j].ProductID)
+                app.globalData.userInfo.IsMember = 1;
             }
           }
         }
 
-        if (productList.length>0){
-          for(var i=0;i<productList.length;i++){
-            var b=false;
-            for(var j=0;j<data.length;j++){
-              if (productList[i].ProductID == data[j].ProductID){
-                b=true;
+        if (productList.length > 0) {
+          for (var i = 0; i < productList.length; i++) {
+            var b = false;
+            for (var j = 0; j < data.length; j++) {
+              if (productList[i].ProductID == data[j].ProductID) {
+                b = true;
+                
                 break;
               }
             }
-            if (!b){
-              productList[i].IsActivate=1;
+            if (!b) {
+              productList[i].IsActivate = 1;
               data.push(productList[i]);
             }
           }
@@ -55,9 +62,7 @@ Page({
           List: data,
         });
 
-        productList=data;
-
-        wx.hideLoading();
+        productList = data;
 
         if (isRemind) {
           wx.showModal({
@@ -69,13 +74,31 @@ Page({
         }
 
         wx.setStorageSync("HasActivate", 1);
+        wx.hideLoading();
       }
       else {
-        wx.redirectTo({
-          url: "./activateFinish",
-        });
-        wx.removeStorageSync("HasActivate");
+        if (isRemind) {
+          var arr = [];
+          for (var i = 0; i < productList.length; i++) {
+            arr.push(productList[i].ProductID);
+          }
+          wx.redirectTo({
+            url: "./activateFinish?idarr="+arr.join(","),
+          });
+          productList = [];
+          wx.removeStorageSync("HasActivate");
+        }
+        else{
+          for (var i = 0; i < productList.length; i++) {
+            productList[i].IsActivate = 1;
+          }
+          that.setData({
+            List: productList,
+          });
+        }
       }
+      wx.hideLoading();
+
     });
   },
   gotoFeedback: function () {

package4/main/activateFinish.js

@@ -7,10 +7,20 @@ Page({
   data: {
   },
   onLoad: function (options) {
+    var idarr=options.idarr.split(",");
+    var list = server.getProgramList();
+    var arr=[];
+    for(var i=0;i<list.length;i++){
+      for(var j=0;j<idarr.length;j++){
+        if (idarr[j]==list[i].ID){
+          arr.push(list[i]);
+        }
+      }
+    }
 
     this.setData({
       Containnerheight: common.getSystemHeight(),
-      ProgramList: server.getProgramList(),
+      ProgramList: arr,
       ProgramID:app.globalData.ProgramID,
     });
   },
@@ -25,6 +35,11 @@ Page({
       }
     });
   },
+  gotoFinish: function () {
+    wx.reLaunch({
+      url: '../../pages/index/index',
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

package4/main/activateFinish.wxml

@@ -23,6 +23,8 @@
       <view class='btnRefresh' wx:if="{{ProgramID!=item.ID}}">去使用</view>
     </view>
   </view>
-<view class='lineFooter'></view>
-
+  <view class='lineFooter'></view>
+  <view class='footer FlexRow' bindtap="gotoFinish">
+    前往首页
+  </view>
 </view>

package4/main/activateFinish.wxss

@@ -63,4 +63,16 @@
   font-size:24rpx;
   text-align: center;
   line-height: 50rpx;
-}
+}
+
+.footer{
+  width: 100%;
+  height: 140rpx;
+  position: fixed;
+  bottom: 0;
+  line-height: 140rpx;
+  font-size:48rpx;
+  color:#fff;
+  text-align: center;
+  background-color: #03AF69;
+}

package4/main/activateOK.js

@@ -5,6 +5,7 @@ const app = getApp();
 
 Page({
   data: {
+    ShowNumber:0,
   },
   onLoad: function (options) {
 
@@ -13,6 +14,11 @@ Page({
     });
     this.updateData(options);
   },
+  onShow: function(){
+    this.setData({
+      ShowNumber:this.data.ShowNumber,
+    })
+  },
   updateData: function (param) {
     var that = this;
     server.getData('UpdateWXUsersAll500?ProductID=' + param.ProductID

package4/main/buyad.js

@@ -24,17 +24,17 @@ Page({
     }
   },
   gotoOrder: function () {
-    wx.navigateTo({
-      url: "./order?id="+app.globalData.ProgramID+"&paytype=3",
+    wx.redirectTo({
+      url: "./order?id=" + app.globalData.ProgramID + "&paytype=3",
     });
   },
   gotoPackList: function () {
-    wx.navigateTo({
+    wx.redirectTo({
       url: "./list?IsGift=0",
     });
   },
   gotoGiftList: function () {
-    wx.navigateTo({
+    wx.redirectTo({
       url: "./list?IsGift=1",
     });
   },

package4/main/giftinfo.js

@@ -36,7 +36,7 @@ Page({
       success(res) {
         if (!res.authSetting['scope.userInfo']) {
           wx.navigateTo({
-            url: '../../pages/index/userlogin?url=giftinfo'
+            url: '../../pages/main/accredit?url=giftinfo'
           });
         }
         else {

package4/main/limited.js

@@ -6,14 +6,21 @@ const app = getApp();
 Page({
   data: {
     FileUrl: app.globalData.imageUrl,
+    IsShowButton:0,
   },
   onLoad: function (options) {
-
+    var IsShowButton = 0;
+    if (options.IsShowButton)
+      IsShowButton=options.IsShowButton;
     this.setData({
       Containnerheight: common.getSystemHeight(),
+      IsShowButton: IsShowButton
     });
     this.init();
   },
+  onUnload: function () {
+    app.globalData.IsRefresh=true;
+  },
   init: function () {
     var that = this;
     server.getData('GetWXUsersAllTime?ProductID=' + app.globalData.ProgramID + '&UserID=' + app.globalData.userInfo.UserID, function (data) {
@@ -34,6 +41,11 @@ Page({
   gotoFeedback: function () {
     server.gotoFeedback();
   },
+  gotoFinish:function(){
+    wx.reLaunch({
+      url: '../../pages/index/index',
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

package4/main/limited.wxml

@@ -15,7 +15,9 @@
     </view>
   </view>
   <view class='lineFooter'></view>
-
+  <view class='footer FlexRow' bindtap="gotoFinish" wx:if="{{IsShowButton==1}}">
+    前往首页
+  </view>
 
   <view class='panelFooter FlexRow' bindtap='gotoFeedback'>
     <view>如遇问题，请切换到“唱意教育家长助手”中</view>

package4/main/limited.wxss

@@ -72,4 +72,17 @@
   color:#B3443B;
   text-decoration: underline;
   font-weight: 500;
-}
+}
+
+
+.footer{
+  width: 100%;
+  height: 140rpx;
+  position: fixed;
+  bottom: 0;
+  line-height: 140rpx;
+  font-size:48rpx;
+  color:#fff;
+  text-align: center;
+  background-color: #03AF69;
+}

package4/main/order.js

@@ -50,9 +50,9 @@ Page({
         if (this.data.Coupon){
           price=price-Number(this.data.Coupon.Price);
         }
-        if (price.toString().indexOf(".") < 0) {
-          price = price + ".00";
-        }
+        
+        price = common.FormatMoney(price*100);
+
         detail = list[i].Detail;
         if (i==0)
           buytype=110;
@@ -104,9 +104,8 @@ Page({
         if (this.data.Coupon)
           price+=Number(this.data.Coupon.Price);
 
-        if (price.toString().indexOf(".")<0){
-          price=price+".00";
-        }
+        price = common.FormatMoney(price * 100);
+
         this.setData({
           IsDiscount: false,
           Coupon: list[i],

package4/main/payfinish.js

@@ -22,14 +22,15 @@ Page({
 
     if (paytype == "4") {
       wx.setStorageSync("HasActivate", 1);
-      app.globalData.userInfo.IsMember = 1;
-      app.globalData.IsLocked = 0;
     }
     else if (paytype=="3"){
       app.globalData.userInfo.IsMember = 1;
-      app.globalData.IsLocked = 0;
     }
   }, 
+  onUnload: function () {
+    if (this.data.Paytype == "4") 
+      app.globalData.IsRefresh = true;
+  },
   gotoDefault: function() {
     wx.redirectTo({
       url: "../../pages/main/default",
@@ -38,7 +39,7 @@ Page({
   goto: function () {
     if (this.data.Paytype == "3") {
       wx.redirectTo({
-        url: "./limited",
+        url: "./limited?IsShowButton=1",
       });
     }
     if (this.data.Paytype == "4") {

pages/index/index.js

@@ -35,6 +35,11 @@ Page({
           ProductUserID: options.ProductUserID,
         });
       }
+      if (options.GiftID) {
+        this.setData({
+          GiftID: options.GiftID,
+        });
+      }
     }
     this.setData({
       Containnerheight: server.getWindowHeight(),
@@ -154,7 +159,13 @@ Page({
           //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
           that.getQuestionType(function () {
 
-            if (that.data.ProductID) {
+            if (that.data.GiftID) {
+              var url = "../../package4/main/giftcard?GiftID=" + that.data.GiftID + "&UserID=" + app.globalData.introducer
+              wx.redirectTo({
+                url: url
+              });
+            }
+            else if (that.data.ProductID) {
               var url = "../../package4/main/activateOK?ProductID=" + that.data.ProductID
                 + "&ProductUserID=" + that.data.ProductUserID
                 + "&CurrentUserID=" + app.globalData.userInfo.UserID

pages/main/accredit.js

@@ -35,16 +35,6 @@ Page({
     }
 
   },
-  onUnload: function () {
-    wx.reLaunch({
-      url: '../main/default'
-    });
-  },
-  deblocking: function () {
-    wx.reLaunch({
-      url: '../index/index'
-    });
-  },
   goto: function (e) {
     var that = this;
     wx.getSetting({
@@ -80,40 +70,26 @@ 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;
-
-            // 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);
+
+            app.globalData.userInfo.NickName = res.userInfo.nickName;
+            app.globalData.userInfo.AvatarUrl = res.userInfo.avatarUrl;
+
+            that.login(app.globalData.userInfo, res.userInfo);
           },
           fail: function (res) {
-            wx.reLaunch({
-              url: '../index/index'
-            });
+
           }
         });
       },
       fail: function () {
-        wx.reLaunch({
-          url: '../index/index'
-        });
+
       }
     });
   },
-  login: function (param) {
+  login: function (param, param2) {
     var that = this;
     var url = "Login";
     switch (app.globalData.ProgramID) {
@@ -135,13 +111,13 @@ Page({
     }
     server.postData(url, {
       Code: param.Code,
-      NickName: param.nickName,
-      Language: param.language,
-      Gender: param.gender,
-      City: param.city,
-      Province: param.province,
-      Country: param.country,
-      AvatarUrl: param.avatarUrl,
+      NickName: param2.nickName,
+      AvatarUrl: param2.avatarUrl,
+      Language: param2.language,
+      Gender: param2.gender,
+      City: param2.city,
+      Province: param2.province,
+      Country: param2.country,
       ProgramVersion: app.globalData.Version,
       Introducer: app.globalData.introducer,
       UserSource: app.globalData.userSource,
@@ -150,8 +126,8 @@ Page({
       iv: param.iv,
       encryptedData: param.encryptedData,
     }, function (data) {
-      wx.reLaunch({
-        url: '../main/default'
+      wx.navigateBack({
+        delta: 1
       });
     });
   },

pages/main/default.js

@@ -12,7 +12,7 @@ Page({
     version: app.globalData.version,
     FileUrl: app.globalData.fileUrl,
     NickName: "陌生用户",
-    IsMember: 0,
+    IsMember: 1,
     AvatarUrl: "",
     IsAccredit: false,
   },

pages/main/list.js

@@ -30,8 +30,20 @@ Page({
       CategoryID: categoryID,
       Containnerheight: server.getWindowHeight(),
     });
+    
+  },
+  onShow: function(){
+    if (app.globalData.IsRefresh) {
+      wx.showLoading({
+        title: '请稍候',
+        mask: true,
+      });
+      setTimeout(function () {
+        wx.hideLoading();
+      }, 3000);
+      app.globalData.IsRefresh = false;
+    }
     this.getList();
-
   },
   onUnload: function () {
     this.closeHelp();
@@ -116,7 +128,6 @@ Page({
     this.setData({
       QuestionTypeList: list,
     });
-
   },
   openMenu: function (e) {
     this.data.filter = e.currentTarget.dataset.filter;

utils/main.js

@@ -121,8 +121,6 @@ function payMoney(payType, buyType, money, detail, callback) {
               'signType': 'MD5',
               'paySign': data.paySign,
               'success': function (res3) {
-                app.globalData.userInfo.IsMember = 1;
-                app.globalData.userInfo.IsPay = 1;
                 console.log("success:" + res3);
                 callback(data);
               },

utils/util.js

@@ -284,6 +284,25 @@ function getStorageValue(obj, name, defaultStatus, callback) {
   });
 }
 
+function FormatMoney(money) {
+  var result;
+  if (money == 0)
+    result = "0.00";
+  else {
+    result = (Math.round(money) / 100).toString();
+    //console.log("1:"+result);
+    if (result.indexOf(".") >= 0) {
+      if (result.substr(result.indexOf(".")).length < 3)
+        result += "0";
+    }
+    else {
+      result += ".00";
+    }
+  }
+
+  return result;
+}
+
 module.exports = {
   formatTime: formatTime,
   formatDateCHS: formatDateCHS,
@@ -303,4 +322,5 @@ module.exports = {
   isExistStr: isExistStr,
   getStorageValue: getStorageValue,
   getSystemHeight: getSystemHeight,
+  FormatMoney: FormatMoney,
 }