1.2.0

app.js

@@ -11,13 +11,13 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.1.16",
+    Version: "1.2.0",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
     ProgramName: "语文识字",
     ShareTitle:"赢在阅读起跑线",
-    ShareImage: "../images/07001.png",
+    ShareImage: "../../pages/images/07001.png",
     userInfo: null,
     fileUrl: "https://www.kylx365.com/",
     serverUrl: "https://www.kylx365.com/apiData/",

app.json

@@ -45,6 +45,7 @@
         "main/giftinfo",
         "main/coupon",
         "main/limited",
+        "main/invite",
         "main/list"
       ]
     }

app.wxss

@@ -1,4 +1,3 @@
-/**app.wxss**/
 ::-webkit-scrollbar {
   width: 0;
   height: 0;
@@ -30,39 +29,33 @@
 
 .lineFooter{
   width: 100%;
-  height: 2rpx;
-  background-color: #E3E3E3; 
+  height: 1rpx;
+  background-color: #d2d2d2; 
 }
-
-
 .lineWidthAll{
   width: 100%;
   justify-content: flex-end;
   background-color: #fff;
-  height: 2rpx;
+  height: 1rpx;
 }
-
 .lineWidth750{
   width: 100%;
-  height: 2rpx;
+  height: 1rpx;
   background-color: #E3E3E3; 
 }
-
 .lineWidth720{
   width: 720rpx;
-  height: 2rpx;
+  height: 1rpx;
   background-color: #E3E3E3; 
 }
-
 .lineWidth650{
   width: 650rpx;
-  height: 2rpx;
+  height: 1rpx;
   background-color: #E3E3E3; 
 }
-
 .lineWidth620{
   width: 620rpx;
-  height: 2rpx;
+  height: 1rpx;
   background-color: #E3E3E3; 
 }
 

package4/main/activate.wxss

@@ -24,6 +24,16 @@
   margin-top: 1rpx;
 }
 
+.Left {
+  margin-left: 30rpx;
+  justify-content: flex-start;
+}
+
+.Right {
+  margin-right: 30rpx;
+  justify-content: flex-end;
+}
+
 .img{
   width:50rpx;
   height:50rpx;

package4/main/activateFinish.wxss

@@ -33,6 +33,16 @@
   margin-top: 1rpx;
 }
 
+.Left {
+  margin-left: 30rpx;
+  justify-content: flex-start;
+}
+
+.Right {
+  margin-right: 30rpx;
+  justify-content: flex-end;
+}
+
 .img{
   width:50rpx;
   height:50rpx;

package4/main/buyad.js

@@ -18,7 +18,7 @@ Page({
     for (var i = 0; i < arrProduct.length; i++) {
       if (arrProduct[i].ProductNum == app.globalData.ProgramID) {
         that.setData({
-          Price: Math.floor(arrProduct[i].Period[0].Price),
+          Price: Math.floor(100 * arrProduct[i].Period[0].Price) / 100,
         });
       }
     }
@@ -39,7 +39,6 @@ Page({
     });
   },
   closePage:function(){
-    wx.setStorageSync("NoRefreshList", true);
     wx.navigateBack({
       delta: 1
     });

package4/main/buyad.wxml

@@ -5,6 +5,7 @@
       <view class='panel111' bindtap='gotoOrder'>
         直接购买
       </view>
+      <view class='line1'></view>
       <view class='panel112 panel111' bindtap='gotoPackList'>
         优惠套装
       </view>

package4/main/buyad.wxss

@@ -1,5 +1,6 @@
 .container {
   background-color: #342535;
+  color:#1e1e1e;
 }
 
 .panel1 {
@@ -20,20 +21,26 @@
 
 .panel11{
   width: 610rpx;
-  background-color: #E4B06C;
+  background-color: #FEC579;
   justify-content: space-between;
   border-bottom-left-radius: 10rpx;
   border-bottom-right-radius: 10rpx;
 }
 
 .panel111{
-  width: 305rpx;
+  width: 304rpx;
   height:120rpx;
   line-height: 120rpx;
   text-align: center;
   background-color: #FEC579;
   border-bottom-left-radius: 10rpx;
 }
+
+.line1{
+  width:2rpx;
+  height:60rpx;
+  background-color: #E4B06C;
+}
 .panel112{
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 10rpx;

package4/main/coupon.js

@@ -22,7 +22,7 @@ Page({
     wx.showLoading({
       title: '请稍后',
     });
-    server.getData('GetUserCouponListByUserID?IsShowAll=1&UserID=' + app.globalData.userInfo.UserID, function (data) {
+    server.getData('GetUserCouponListByUserID?ProductID='+app.globalData.ProgramID+'&IsShowAll=1&UserID=' + app.globalData.userInfo.UserID, function (data) {
       if (data) {
         that.setData({
           CouponList: data,

package4/main/invite.js

@@ -0,0 +1,38 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List:[],
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+    });
+
+    this.init();
+  },
+  init: function () {
+    var that = this;
+    wx.showLoading({
+      title: '请稍后',
+    });
+    server.getData('GetInviteUser500?ProductID=' + app.globalData.ProgramID + '&UserID=' + app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          List: data,
+        });
+      }
+      wx.hideLoading();
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/invite.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "我的邀请",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/invite.wxml

@@ -0,0 +1,22 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{List.length>0}}">
+    <view class="panelTitle FlexRow">
+      <view class="panelTitle1">已邀请到 {{List.length}} 位新用户</view>
+    </view>
+    <block wx:for="{{List}}" wx:key="index">
+      <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+        <view class="lineWidth750"></view>
+      </view>
+      <view class="panelItem FlexRow">
+        <image src='{{item.AvatarUrl}}' class="AvatarUrl" wx:if="{{item.AvatarUrl}}" />
+        <view class="AvatarUrl" wx:if="{{!item.AvatarUrl}}"></view>
+        <view class="panelItem1">{{item.NickName}}</view>
+      </view>
+    </block>
+    <view class='lineFooter'></view>
+    <view style='height:100rpx;'></view>
+  </block>
+  <block wx:if="{{List.length==0}}">
+  <text class='text1'>暂无由您邀请\n的新用户</text>
+  </block>
+</view>

package4/main/invite.wxss

@@ -0,0 +1,44 @@
+.container {
+  background-color: #f0f0f0;
+  color:#1e1e1e;
+  font-weight: 500;
+}
+
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: flex-start;
+}
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: flex-start;
+  font-size:28rpx;
+  height:120rpx;
+  background-color: #fff;
+}
+
+.AvatarUrl{
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  margin-left: 30rpx;
+  background-color: #D2D2D2;
+}
+
+.panelItem .panelItem1{
+  margin-left: 20rpx;
+  font-weight: 400;
+  color:#1e1e1e;
+}
+
+.text1{
+  font-size:48rpx;
+  text-align: center;
+  margin-top: 462rpx;
+}

package4/main/list.js

@@ -12,6 +12,7 @@ Page({
     this.setData({
       Containnerheight: common.getSystemHeight(),
       ProgramList: server.getProgramList(),
+      ProgramID:app.globalData.ProgramID,
       MathShow: false,
       ChineseShow: false,
       AllShow: false,

package4/main/list.wxml

@@ -21,7 +21,7 @@
                 <view class="text5">{{item.Name2}}</view>
               </view>
             </view>
-            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' wx:if="{{ProgramID!=item.ID}}">去体验</view>
           </view>
         </block>
         <block wx:if="{{!ChineseShow}}">
@@ -58,14 +58,14 @@
                 <view class="text5">{{item.Name2}}</view>
               </view>
             </view>
-            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' wx:if="{{ProgramID!=item.ID}}">去体验</view>
           </view>
           <view class="line1"></view>
         </block>
         <block wx:if="{{!MathShow}}">
           <view class="panel121 panel12 FlexRow" bindtap="showList" data-id="MathShow">
             <view class="text4">套装详情</view>
-            <image src='../../pages/images/universalpic_indicator_down_gray.png' class="universalpic_indicator_down_gray" />
+            <image src='../images/universalpic_indicator_down_gray.png' class="universalpic_indicator_down_gray" />
           </view>
         </block>
 
@@ -96,7 +96,7 @@
                 <view class="text5">{{item.Name2}}</view>
               </view>
             </view>
-            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' wx:if="{{ProgramID!=item.ID}}">去体验</view>
           </view>
           <view class="line1"></view>
         </block>
@@ -104,7 +104,7 @@
         <block wx:if="{{!AllShow}}">
           <view class="panel121 panel12 FlexRow" bindtap="showList" data-id="AllShow">
             <view class="text4">套装详情</view>
-            <image src='../../pages/images/universalpic_indicator_down_gray.png' class="universalpic_indicator_down_gray" />
+            <image src='../images/universalpic_indicator_down_gray.png' class="universalpic_indicator_down_gray" />
           </view>
         </block>
       </view>
@@ -137,14 +137,14 @@
                 <view class="text5">{{item.Name2}}</view>
               </view>
             </view>
-            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' wx:if="{{ProgramID!=item.ID}}">去体验</view>
           </view>
           <view class="line1"></view>
         </block>
         <block wx:if="{{!MathGiftShow}}">
           <view class="panel121 panel12 FlexRow" bindtap="showList" data-id="MathGiftShow">
             <view class="text4">礼品卡详情</view>
-            <image src='../../pages/images/universalpic_indicator_down_gray.png' class="universalpic_indicator_down_gray" />
+            <image src='../images/universalpic_indicator_down_gray.png' class="universalpic_indicator_down_gray" />
           </view>
         </block>
 
@@ -175,13 +175,13 @@
                 <view class="text5">{{item.Name2}}</view>
               </view>
             </view>
-            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' wx:if="{{ProgramID!=item.ID}}">去体验</view>
           </view>
         </block>
         <block wx:if="{{!AllGiftShow}}">
           <view class="panel121 panel12 FlexRow" bindtap="showList" data-id="AllGiftShow">
             <view class="text4">礼品卡详情</view>
-            <image src='../../pages/images/universalpic_indicator_down_gray.png' class="universalpic_indicator_down_gray" />
+            <image src='../images/universalpic_indicator_down_gray.png' class="universalpic_indicator_down_gray" />
           </view>
         </block>
       </view>

package4/main/order.js

@@ -86,7 +86,7 @@ Page({
     wx.showLoading({
       title: '请稍后',
     });
-    server.getData('GetUserCouponListByUserID?UserID=' + app.globalData.userInfo.UserID, function (data) {
+    server.getData('GetUserCouponListByUserID?ProductID='+app.globalData.ProgramID+'&UserID=' + app.globalData.userInfo.UserID, function (data) {
         if (data) {
           that.setData({
             CouponList:data,

pages/main/index.js

@@ -246,17 +246,9 @@ Page({
   },
   gotoReview: function () {
     if (this.data.IsShow == 1 && this.data.IsMember == 0) {
-      var query = wx.createSelectorQuery();
-      query.select('.payInfo').boundingClientRect();
-      query.selectViewport().scrollOffset();
-      query.exec(function (res) {
-        var top = res[0].top + res[1].scrollTop
-
-        wx.pageScrollTo({
-          scrollTop: top,
-          duration: 500
-        });
-      });
+      wx.navigateTo({
+        url: '../../package4/main/buyad',
+      })
     }
     else {
       wx.navigateTo({

pages/main/list.js

@@ -15,7 +15,6 @@ Page({
       NavClass2: "nav2",
       IsShowNav1: true,
       BookID: bookID,
-      IsShowPayInfo: false,
       IsShow: app.globalData.IsShow,
     });
 
@@ -115,9 +114,9 @@ Page({
   goto: function (e) {
     var islocked = e.currentTarget.dataset.islocked;
     if (islocked == 1 && app.globalData.IsShow == 1) {
-      this.setData({
-        IsShowPayInfo: true,
-      });
+      wx.navigateTo({
+        url: '../../package4/main/buyad',
+      })
     }
     else {
       var word = e.currentTarget.dataset.word;
@@ -171,11 +170,6 @@ Page({
       }
     });
   },
-  close: function () {
-    this.setData({
-      IsShowPayInfo: false,
-    });
-  },
   gotoIndex: function () {
     wx.setStorageSync("indexNav", 2);
     wx.navigateBack({

pages/main/list.wxml

@@ -64,25 +64,3 @@
   <image src='../images/02004.gif' class="hand" wx:if="{{IsRemind}}" />
 
 </view>
-  
-<view class="PayInfo container FlexColumn" style='height:{{Height}}rpx;' wx:if="{{IsShowPayInfo}}">
-  <view class="btn">
-    <view class="btn1 FlexColumn" catchtap="getPay">
-      <view class="panel1 FlexColumn">
-        <image src='../images/04010.png' class="img" />
-      </view>
-      <view class="panel2 FlexColumn">
-        购买
-      </view>
-    </view>
-  </view>
-  <view class="text1">一款原价，成套购买更划算</view>
-  <view class="text2 FlexRow" catchtap='gotoIndex'>
-    <image src='../images/06010.png' class="Triangle" />
-    <view class="text3">产品详情</view>
-  </view>
-
-  <view class="close FlexColumn" catchtap='close'>
-    <image src='../images/02024.png' class="closeImage" />
-  </view>
-</view>

pages/main/list.wxss

@@ -186,78 +186,6 @@
   height:106rpx;
 }
 
-
-.PayInfo{
-  z-index: 100;
-  position: fixed;
-  width: 100%;
-  left:0;
-  top:0;
-  background-color: rgba(240,240,240,0.95);
-}
-
-.PayInfo .btn {
-  width: 600rpx;
-  height: 420rpx;
-  background-color: #F19805;
-  border-radius: 40rpx;
-  margin-top: 282rpx;
-  box-shadow: 0 0 30rpx rgba(0, 0, 0, 0.5);
-}
-.PayInfo .btn1 {
-  width: 100%;
-  height: 400rpx;
-  background-color: #FFDD0C;
-  border-radius: 40rpx;
-  position:relative;
-  top:0;
-  justify-content: flex-start;
-}
-.PayInfo .panel1 {
-  width: 100%;
-  height: 280rpx;
-  background-color: #F9676C;
-  border-top-left-radius: 40rpx;
-  border-top-right-radius: 40rpx;
-}
-.PayInfo .img {
-  width: 518rpx;
-  height: 175rpx;
-}
-.PayInfo .panel2 {
-  width: 100%;
-  height: 120rpx;
-  font-size:48rpx;
-}
-
-.PayInfo .text1{
-  margin-top: 126rpx;
-  font-size:32rpx;
-}
-.PayInfo .text2{
-  margin-top: 20rpx;
-  font-size:36rpx;
-  color:#A20602;
-}
-.PayInfo .Triangle{
-  width: 16rpx;
-  height:22rpx;
-  margin-right: 22rpx;
-}
-.PayInfo .close {
-  width: 100%;
-  height: 155rpx;
-  position: fixed;
-  bottom: 0;
-  justify-content: flex-start;
-}
-
-.PayInfo .closeImage {
-  width: 33rpx;
-  height: 33rpx;
-  margin-top: 30rpx;
-}
-
 .hand{
   width:60rpx;
   height:90rpx;

pages/main/userinfo.wxml

@@ -8,6 +8,15 @@
       <image src='../images/Arrow.png' class="Arrow" />
     </view>
   </view>
+  <view class="lineWidthAll FlexRow">
+    <view class="lineWidth720"></view>
+  </view>
+  <view class="panelItem FlexRow" bindtap='goto' data-url='../../package4/main/invite'>
+    <view class="panelItem1">我的邀请</view>
+    <view class="panelItem2 FlexRow">
+      <image src='../images/Arrow.png' class="Arrow" />
+    </view>
+  </view>
   <view class='lineFooter'></view>
 
   <view class="panelTitle FlexRow">
@@ -103,7 +112,7 @@
   <view class="panelTitle FlexRow">
     <view class="panelTitle1">支持</view>
   </view>
-  <view class="panelItem FlexRow" bindtap='goto' data-url='./help'>
+  <view class="panelItem FlexRow" bindtap='goto' data-url='./help' wx:if="{{ProgramID!=106}}">
     <view class="panelItem1">帮助</view>
     <view class="panelItem2 FlexRow">
       <image src='../images/Arrow.png' class="Arrow" />

pages/main/userinfo.wxss

@@ -1,5 +1,6 @@
 .container {
   background-color: #f0f0f0;
+  color:#1e1e1e;
 }
 
 .panelTitle{

utils/main.js

@@ -65,7 +65,7 @@ function getLocalHost(callback) {
   }
 }
 
-function payMoney(payType, money, detail, callback) {
+function payMoney(payType, buyType, money, detail, callback) {
   console.log(money);
   if (app.globalData.userInfo.UserID == 1)
     money = 0.01;
@@ -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 + '&productID=' + app.globalData.ProgramID, function (data) {
+        getData('ProductPayLogin500?code=' + res.code + '&payType=' + payType + '&buyType=' + buyType + '&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID, function (data) {
           if (data && data.timeStamp) {
             //微信支付
             wx.requestPayment({
@@ -118,6 +118,7 @@ function payMoney(payType, money, detail, callback) {
   });
 }
 
+
 function getProgramList() {
   return [
     {
@@ -149,7 +150,7 @@ function getProgramList() {
       ImageUrl: "product_icon_sz_70x70.png",
       appId: 'wx313a8f2c0741efe1',
       path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
-      IsShow: true,
+      IsShow: false,
       IsShow2: true,
       Category: "语文系列",
     },
@@ -160,7 +161,7 @@ function getProgramList() {
       ImageUrl: "product_icon_py_70x70.png",
       appId: 'wx331e8dd070f01d0e',
       path: 'pages/index/index?SourceID=' + app.globalData.ProgramID,
-      IsShow: false,
+      IsShow: true,
       IsShow2: true,
       Category: "语文系列",
     },