1.1.3

app.js

@@ -11,8 +11,8 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.1.1",
-    IsProduction: false,
+    Version: "1.1.3",
+    IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
     ShareTitle:"赢在阅读起跑线",

pages/about/membercenter.js

@@ -57,7 +57,9 @@ Page({
           });
         }
         else {
-          that.getAccredit();
+          wx.redirectTo({
+            url: '../about/payfinished?type=accredit',
+          });
         }
       }
     });

pages/about/newuserlist.wxml

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

pages/about/orderlist.js

@@ -20,7 +20,7 @@ Page({
         Name: "英语自然拼读",
         Remark: "原价19.80元，有效期6个月",
         Price: 1980,
-        Remark2: "成套购买加送6个月",
+        Remark2: "",
         Image: "06006",
         IsSelect: true,
       }, {
@@ -28,7 +28,7 @@ Page({
         Name: "语文汉语拼音",
         Remark: "原价9.90元，有效期6个月",
         Price: 990,
-        Remark2: "成套购买加送6个月",
+        Remark2: "",
         Image: "06007",
         IsSelect: true,
       }, {
@@ -36,7 +36,7 @@ Page({
         Name: "语文识字",
         Remark: "原价9.80元，有效期6个月",
         Price: 980,
-        Remark2: "成套购买加送6个月",
+        Remark2: "",
         Image: "06008",
         IsSelect: true,
       },
@@ -116,8 +116,21 @@ Page({
       }
       else {
         server.payMoney(4, money, detail, function (data) {
-          wx.navigateTo({
-            url: '../about/payfinished?type=all',
+          wx.setStorageSync("IsShowActivty", true);
+          var that = this;
+          wx.getSetting({
+            success(res) {
+              if (res.authSetting['scope.userInfo']) {
+                wx.navigateTo({
+                  url: '../about/payfinished?type=all',
+                });
+              }
+              else {
+                wx.navigateTo({
+                  url: '../about/payfinished?type=accredit',
+                });
+              }
+            }
           });
         });
       }

pages/about/orderlist.wxml

@@ -11,7 +11,7 @@
       <view class="text FlexColumn">
         <view class="text1">{{item.Name}}</view>
         <view class="text2">{{item.Remark}}</view>
-        <view class="text3" wx:if="{{item.Remark2}}">{{item.Remark2}}</view>
+        <!-- <view class="text3" wx:if="{{item.Remark2}}">{{item.Remark2}}</view> -->
       </view>
     </view>
     <view class="text0 FlexRow" bindtap='gotoFeedback'>
@@ -19,6 +19,8 @@
       <view class="red">联系客服</view>
       <view>为您处理</view>
     </view>
+     <view style='width:100%;height:500rpx;' >
+    </view> 
   </view>
 
   <view class="bottom FlexColumn">
@@ -31,7 +33,7 @@
         <view class="right FlexColumn">
           <view class="text3 text2 FlexRow">原价
             <view class="total">{{Total}}</view> 元</view>
-          <view class="text2">{{Remark}}</view>
+           <view class="text2">{{Remark}}</view> 
         </view>
       </view>
       <view class="top FlexRow" wx:if="{{Total==0}}">

pages/about/payfinished.js

@@ -26,7 +26,6 @@ Page({
         text1 = "激活后才能正常使用";
         text2 = "去激活";
         text3 = "注意：如遇网络问题未能解锁，请清理手机内存并重新打开微信小程序，一般即可恢复正常。如仍未解决，可通过首页底部“意见反馈”联系我们为您处理。";
-        wx.setStorageSync("IsShowActivty", true);
       }
     }
 

pages/main/index.js

@@ -140,6 +140,7 @@ Page({
             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) {
@@ -305,7 +306,9 @@ Page({
         IsRemind: false,
       })
       wx.setStorageSync('IsRemind', false);
-
+      wx.pageScrollTo({
+        scrollTop: 0
+      });
     }
   },
   goto: function (e) {

pages/main/index.wxml

@@ -189,7 +189,7 @@ wx:if="{{IsMemberForeverRemind==1}}">
       <view class="panel1 FlexColumn">
         <image src='../../images/02023.png' class="img" />
         <view class="text1">恭喜你</view>
-        <view class="text2">获得3个月有效期</view>
+        <view class="text2">获得1个月有效期</view>
       </view>
       <view class="panel2 FlexColumn">
         知道了

project.config.json

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

utils/main.js

@@ -77,7 +77,7 @@ function payMoney(payType, money, detail, callback) {
       if (res.code) {
         console.log('获取用户登录态成功！' + res.code);
         //预支付
-        getData('HanziPayLogin?code=' + res.code + '&payType=' + payType + '&money=' + money + '&detail=' + detail, function (data) {
+        getData('HanziPayLogin?code=' + res.code + '&payType=' + payType + '&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID, function (data) {
           if (data && data.timeStamp) {
             //微信支付
             wx.requestPayment({