1.2.0

app.js

@@ -11,11 +11,13 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.1.15",
+    Version: "1.1.16",
     IsProduction: true,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",
+    ProgramName: "语文识字",
     ShareTitle:"赢在阅读起跑线",
+    ShareImage: "../images/07001.png",
     userInfo: null,
     fileUrl: "https://www.kylx365.com/",
     serverUrl: "https://www.kylx365.com/apiData/",
@@ -33,6 +35,7 @@ App({
     PayMoney: 19.8,//产品销售价
     BaiduToken:"",//百度开发平台token
     IsShow: 0,
+    IsLocked: 0,
     NewUserNumberMax:6,//邀请新用户最大值
     IsSaveCustom:false,//是否保存了定制
     goto:"",//用于服务直达的跳转

app.json

@@ -1,18 +1,14 @@
 {
   "pages": [
     "pages/index/index",
-    "pages/index/activate",
     "pages/main/list",
     "pages/main/detail",
     "pages/main/search",
     "pages/main/setcombine",
     "pages/main/review",
     "pages/main/test",
-    "pages/about/payfinished",
-    "pages/about/paylist",
-    "pages/about/newuserlist",
-    "pages/about/orderlist",
-    "pages/about/membercenter",
+    "pages/main/userinfo",
+    "pages/main/accredit",
     "pages/main/index"
   ],
   "window": {
@@ -23,6 +19,7 @@
     "backgroundColor": "#F5E2BE"   
   },
   "navigateToMiniProgramAppIdList": [
+    "wxa5441bbf344692ba",
     "wx46a7b4c420e6d38f",
     "wx1fef080f74481cbd",
     "wx331e8dd070f01d0e",
@@ -31,5 +28,33 @@
     "wxa5e33c61fe37dd01",
     "wxaa1a8b48d9853872",
     "wx80059777521b897c"
-  ]
+  ],
+  "subPackages": [
+    {
+      "root": "package4",
+      "pages": [
+        "main/buyad",
+        "main/order",
+        "main/paylist",
+        "main/payfinish",
+        "main/activate",
+        "main/activateOK",
+        "main/activateFinish",
+        "main/giftcard",
+        "main/giftlist",
+        "main/giftinfo",
+        "main/coupon",
+        "main/limited",
+        "main/list"
+      ]
+    }
+  ],
+  "preloadRule": {
+    "package4/main/buyad": {
+      "network": "all",
+      "packages": [
+        "package4"
+      ]
+    }
+  }
 }

app.wxss

@@ -1,9 +1,4 @@
 /**app.wxss**/
-.container {
-  width:100%;
-  justify-content: flex-start;
-} 
-
 ::-webkit-scrollbar {
   width: 0;
   height: 0;
@@ -25,6 +20,53 @@
   justify-content: center;
 }
 
+.container {
+  width:100%;
+  justify-content: flex-start;
+  background-color: #F5E2BE;
+  color:#1e1e1e;
+  font-weight: 500;
+} 
+
+.lineFooter{
+  width: 100%;
+  height: 2rpx;
+  background-color: #E3E3E3; 
+}
+
+
+.lineWidthAll{
+  width: 100%;
+  justify-content: flex-end;
+  background-color: #fff;
+  height: 2rpx;
+}
+
+.lineWidth750{
+  width: 100%;
+  height: 2rpx;
+  background-color: #E3E3E3; 
+}
+
+.lineWidth720{
+  width: 720rpx;
+  height: 2rpx;
+  background-color: #E3E3E3; 
+}
+
+.lineWidth650{
+  width: 650rpx;
+  height: 2rpx;
+  background-color: #E3E3E3; 
+}
+
+.lineWidth620{
+  width: 620rpx;
+  height: 2rpx;
+  background-color: #E3E3E3; 
+}
+
+
 @font-face {
     font-family: 'GB Pinyinok-C';
     //src: url('GBPinyinok-C.eot');

package4/main/activate.js

@@ -0,0 +1,133 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+var productList=[];
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+      ProgramList: server.getProgramList(),
+    });
+
+    this.init();
+  },
+  init: function (e, isRemind) {
+    var that = this;
+    wx.showLoading({
+      title: '装载中',
+    });
+    server.getData('GetUserActivateListByUserID500?UserID=' + app.globalData.userInfo.UserID + "&ProductID=" + app.globalData.ProgramID, function (data) {
+      if (data && data.length > 0) {
+        var programList = server.getProgramList();
+        for (var i = 0; i < programList.length; i++) {
+          for (var j = 0; j < data.length; j++) {
+            if (programList[i].ID == data[j].ProductID) {
+              data[j].Name = programList[i].Name;
+              data[j].ImageUrl = programList[i].ImageUrl;
+              data[j].appId = programList[i].appId;
+              data[j].path = programList[i].path;
+            }
+          }
+        }
+
+        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;
+              data.push(productList[i]);
+            }
+          }
+        }
+
+        that.setData({
+          List: data,
+        });
+
+        productList=data;
+
+        wx.hideLoading();
+
+        if (isRemind) {
+          wx.showModal({
+            title: '产品未激活',
+            content: '您有产品未激活，请立即点击红色“去激活”按钮。',
+            showCancel: false,
+            confirmText: "知道了",
+          });
+        }
+
+        wx.setStorageSync("HasActivate", 1);
+      }
+      else {
+        wx.redirectTo({
+          url: "./activateFinish",
+        });
+        wx.removeStorageSync("HasActivate");
+      }
+    });
+  },
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
+  gotoActive: function (e) {
+    var that = this;
+    var productid = e.currentTarget.dataset.id;
+
+    if (productid == app.globalData.ProgramID) {
+      server.getData('UpdateWXUsersAll500?ProductID=' + productid
+        + "&ProductUserID=" + app.globalData.userInfo.UserID
+        + "&CurrentProductID=" + productid
+        + "&CurrentUserID=" + app.globalData.userInfo.UserID, function (data) {
+          if (data) {
+
+          }
+        });
+    }
+    else {
+      var appId = e.currentTarget.dataset.appid;
+      var path = e.currentTarget.dataset.path;
+
+      path += "&ProductID=" + app.globalData.ProgramID;
+      path += "&ProductUserID=" + app.globalData.userInfo.UserID;
+
+      wx.navigateToMiniProgram({
+        appId: appId,
+        path: path,
+        success(res) {
+
+        }
+      });
+    }
+    var data = this.data.List;
+    for (var i = 0; i < data.length; i++) {
+      if (data[i].ProductID == productid) {
+        data[i].IsActivate = 0;
+      }
+    }
+    that.setData({
+      List: data,
+    });
+  },
+  gotoFinish: function () {
+    this.init(null, true);
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/activate.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "激活产品",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/activate.wxml

@@ -0,0 +1,34 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class='text1 FlexColumn' bindtap='gotoFeedback'>
+    <view>您有产品未激活，必须激活才能继续其它操作，请立即处理。如</view>
+    <view class='FlexRow'>
+      <view>遇到问题请切换到“唱意教育家长助手”通过</view>
+      <view class='text11'>意见反馈</view>
+      <view>联系我们为</view>
+    </view>
+    <view>您处理。</view>
+  </view>
+
+  <view class="panelItem FlexRow" wx:for="{{List}}" wx:key="index">
+    <view class="Left FlexRow">
+      <image src='../images/{{item.ImageUrl}}' class="img" />
+      <view class="title1">
+        {{item.Name}}
+      </view>
+    </view>
+    <view class="Right">
+      <view class='btnActivate' wx:if="{{item.IsActivate==-1}}" bindtap="gotoActive" data-id="{{item.ProductID}}" data-appid="{{item.appId}}" data-path="{{item.path}}">去激活</view>
+      <view class='btnRefresh btnActivate' wx:if="{{item.IsActivate==0}}" bindtap="init">刷新</view>
+      <view class='text2' wx:if="{{item.IsActivate==1}}">已激活</view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <image src='../images/file_0401.png' class="file_0401" />
+  <view class='lineFooter'></view>
+  <view style='height:240rpx'></view>
+
+  <view class='footer FlexRow' bindtap="gotoFinish">
+    完成
+  </view>
+</view>

package4/main/activate.wxss

@@ -0,0 +1,73 @@
+.container {
+  background-color: #f0f0f0;
+  color:#1e1e1e;
+  font-weight: 500;
+}
+
+.text1{
+  width:690rpx;
+  font-size:24rpx;
+  align-items: flex-start;
+  margin: 50rpx 0;
+}
+
+.text11{
+  color:#B3443B;
+  text-decoration: underline;
+}
+
+.panelItem{
+  width:100%;
+  height:111rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  margin-top: 1rpx;
+}
+
+.img{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 10rpx;
+}
+
+.title1{
+  margin-left: 20rpx;
+  font-size:28rpx;
+}
+
+.btnActivate{
+  width:108rpx;
+  height:50rpx;
+  border-radius: 10rpx;
+  background-color: #E5321C;
+  color:#fff;
+  font-size:24rpx;
+  text-align: center;
+  line-height: 50rpx;
+}
+.btnRefresh{
+  background-color: #0792E4;
+}
+.text2{
+  color:#329468;
+  font-size:28rpx;
+}
+
+.file_0401{
+  width:100%;
+  height:1879rpx;
+  margin-top: 50rpx;
+}
+
+
+.footer{
+  width: 100%;
+  height: 140rpx;
+  position: fixed;
+  bottom: 0;
+  line-height: 140rpx;
+  font-size:48rpx;
+  color:#fff;
+  text-align: center;
+  background-color: #0792E4;
+}

package4/main/activateFinish.js

@@ -0,0 +1,35 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+      ProgramList: server.getProgramList(),
+      ProgramID:app.globalData.ProgramID,
+    });
+  },
+  switchProgram: function (e) {
+    wx.navigateToMiniProgram({
+      appId: e.currentTarget.dataset.appid,
+      path: e.currentTarget.dataset.path,
+      extraData: {
+      },
+      success(res) {
+        // 打开成功
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/activateFinish.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "激活完成",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/activateFinish.wxml

@@ -0,0 +1,28 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+
+  <image src='../images/universalpic_select_on_green_100x100.png' class="universalpic_select_on_green_100x100" />
+
+  <view class='text1'>
+    可以正常使用了
+  </view>
+  <view class='text2'>
+    感谢您的配合
+  </view>
+  <view class='text3'>
+    请记住它们的图标和名称
+  </view>
+
+  <view class="panelItem FlexRow" wx:for="{{ProgramList}}" wx:key="index" wx:if="{{item.IsShow2}}" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>
+    <view class="Left FlexRow">
+      <image src='../images/{{item.ImageUrl}}' class="img" />
+      <view class="title1">
+        {{item.Name}}
+      </view>
+    </view>
+    <view class="Right">
+      <view class='btnRefresh' wx:if="{{ProgramID!=item.ID}}">去使用</view>
+    </view>
+  </view>
+<view class='lineFooter'></view>
+
+</view>

package4/main/activateFinish.wxss

@@ -0,0 +1,56 @@
+.container {
+  background-color: #f0f0f0;
+  color: #1e1e1e;
+  font-weight: 500;
+}
+
+.universalpic_select_on_green_100x100 {
+  width: 100rpx;
+  height: 100rpx;
+  margin-top: 120rpx;
+}
+
+.text1{
+  font-size: 48rpx;
+  margin-top: 30rpx;
+}
+.text2{
+  font-size: 36rpx;
+  margin-top: 50rpx;
+  font-weight: 400;
+}
+.text3{
+  font-size: 24rpx;
+  font-weight: 400;
+  margin-bottom: 40rpx;
+}
+
+.panelItem{
+  width:100%;
+  height:111rpx;
+  background-color: #fff;
+  justify-content: space-between;
+  margin-top: 1rpx;
+}
+
+.img{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 10rpx;
+}
+
+.title1{
+  margin-left: 20rpx;
+  font-size:28rpx;
+}
+
+.btnRefresh{
+  width:108rpx;
+  height:50rpx;
+  border-radius: 10rpx;
+  background-color: #0792E4;
+  color:#fff;
+  font-size:24rpx;
+  text-align: center;
+  line-height: 50rpx;
+}

pages/index/activate.js

@@ -1,29 +1,34 @@
 import common from '../../utils/util';
 import server from '../../utils/main';
+
 const app = getApp();
 
 Page({
   data: {
   },
   onLoad: function (options) {
-    console.log(options);
-    this.updateData(options);
 
     this.setData({
-      Height: common.getSystemHeight(),
+      Containnerheight: common.getSystemHeight(),
     });
+    this.updateData(options);
   },
   updateData: function (param) {
     var that = this;
-    server.getData('UpdateWXUsersAll?ProductID=' + param.ProductID
+    server.getData('UpdateWXUsersAll500?ProductID=' + param.ProductID
       + "&ProductUserID=" + param.ProductUserID
       + "&CurrentProductID=" + param.CurrentProductID
-      + "&CurrentUserID=" + param.CurrentUserID
-      + "&ProductBuyInfoID=" + param.ProductBuyInfoID
-      + "&BuyType=" + param.BuyType, function (data) {
+      + "&CurrentUserID=" + param.CurrentUserID, function (data) {
         if (data) {
 
         }
       });
   },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
 })

package4/main/activateOK.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/activateOK.wxml

@@ -0,0 +1,14 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src='../images/program_activated_clickclose.png' class="program_activated_clickclose" />
+
+  <image src='../images/universalpic_select_on_green_100x100.png' class="universalpic_select_on_green_100x100" />
+
+  <view class='text1'>
+    激活成功
+  </view>
+
+  <view class='panel1 FlexRow'>
+    <image src='../images/universalpic_attention_gray_50x50.png' class="universalpic_attention_gray_50x50" />
+    <view>关闭小程序，然后刷新状态</view>
+  </view>
+</view>

package4/main/activateOK.wxss

@@ -0,0 +1,39 @@
+.container {
+  background-color: #f0f0f0;
+  color: #1e1e1e;
+  font-weight: 500;
+}
+
+.program_activated_clickclose{
+  width:281rpx;
+  height:133rpx;
+  position: fixed;
+  top:10rpx;
+  right:40rpx;
+}
+
+.universalpic_select_on_green_100x100 {
+  width: 100rpx;
+  height: 100rpx;
+  top: 190rpx;
+  position: fixed;
+}
+
+.text1{
+  font-size: 64rpx;
+  top:320rpx;
+  position: fixed;
+}
+
+.panel1{
+  position: fixed;
+  bottom:275rpx;
+  font-size:36rpx;
+  font-weight: 400;
+}
+
+.universalpic_attention_gray_50x50{
+  width: 50rpx;
+  height: 50rpx;
+  margin-right: 20rpx;
+}

package4/main/buyad.js

@@ -0,0 +1,54 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+    });
+    this.init();
+  },
+  init:function(){
+    var that=this;
+    var arrProduct = wx.getStorageSync("ProductPrice");
+    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),
+        });
+      }
+    }
+  },
+  gotoOrder: function () {
+    wx.navigateTo({
+      url: "./order?id="+app.globalData.ProgramID+"&paytype=3",
+    });
+  },
+  gotoPackList: function () {
+    wx.navigateTo({
+      url: "./list?IsGift=0",
+    });
+  },
+  gotoGiftList: function () {
+    wx.navigateTo({
+      url: "./list?IsGift=1",
+    });
+  },
+  closePage:function(){
+    wx.setStorageSync("NoRefreshList", true);
+    wx.navigateBack({
+      delta: 1
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/buyad.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "购买",
+  "navigationBarBackgroundColor": "#342535",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#342535"
+}

package4/main/buyad.wxml

@@ -0,0 +1,20 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class='panel1 FlexColumn'>
+    <image src='../images/pay_shoppingguide_illus_01.png' class="pay_shoppingguide_illus_01" />
+    <view class='panel11 FlexRow'>
+      <view class='panel111' bindtap='gotoOrder'>
+        直接购买
+      </view>
+      <view class='panel112 panel111' bindtap='gotoPackList'>
+        优惠套装
+      </view>
+    </view>
+    <view class='number'>{{Price}}元</view>
+  </view>
+
+  <image src='../images/pay_shoppingguide_illus_02.png' class="pay_shoppingguide_illus_02" bindtap='gotoGiftList' />
+  
+  <button class='text1' open-type="share">推荐给家长</button>
+  <image src='../images/pay_shoppingguide_footer.png' class="pay_shoppingguide_footer" />
+  <view class='text2' bindtap='closePage'>返回</view>
+</view>

package4/main/buyad.wxss

@@ -0,0 +1,85 @@
+.container {
+  background-color: #342535;
+}
+
+.panel1 {
+  width: 610rpx;
+  margin-top: 100rpx;
+  justify-content: flex-start;
+  background-color: #AE5138;
+  border-radius: 10rpx;
+  box-shadow: 0 20rpx 1rpx #AE5138,
+  0 50rpx 1rpx #2E1E2F;
+  position: relative;
+}
+
+.pay_shoppingguide_illus_01 {
+  width: 610rpx;
+  height: 180rpx;
+}
+
+.panel11{
+  width: 610rpx;
+  background-color: #E4B06C;
+  justify-content: space-between;
+  border-bottom-left-radius: 10rpx;
+  border-bottom-right-radius: 10rpx;
+}
+
+.panel111{
+  width: 305rpx;
+  height:120rpx;
+  line-height: 120rpx;
+  text-align: center;
+  background-color: #FEC579;
+  border-bottom-left-radius: 10rpx;
+}
+.panel112{
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 10rpx;
+}
+
+.number{
+  position: absolute;
+  left:103rpx;
+  top:160rpx;
+  width:100rpx;
+  height:40rpx;
+  line-height: 40rpx;
+  font-size:24rpx;
+  text-align: center;
+  border-radius: 20rpx;
+  background-color: #E4B06C;
+}
+
+.pay_shoppingguide_illus_02{
+  width:610rpx;
+  height:192rpx;
+  margin-top: 74rpx;
+}
+
+.text1{
+  margin-top: 15rpx;
+  font-size:28rpx;
+  color:#FE6659;
+  text-decoration: underline;
+  z-index: 10;
+  background-color: #342535;
+  border: 0rpx solid;
+}
+
+.pay_shoppingguide_footer{
+  width:100%;
+  height:350rpx;
+  margin-top: -23rpx;
+}
+
+.text2{
+  width:100%;
+  height:130rpx;
+  color:#fff;
+  line-height: 130rpx;
+  font-size:48rpx;
+  text-align: center;
+  background-color: #6B4D4E;
+}

package4/main/coupon.js

@@ -0,0 +1,41 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+      ProgramList: server.getProgramList(),
+    });
+    this.init();
+  },
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
+  init: function () {
+    var that = this;
+    wx.showLoading({
+      title: '请稍后',
+    });
+    server.getData('GetUserCouponListByUserID?IsShowAll=1&UserID=' + app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          CouponList: 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/coupon.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "优惠券",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/coupon.wxml

@@ -0,0 +1,44 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+
+  <block wx:if="{{CouponList.length>0}}">
+    <view class='panel2 FlexRow' wx:for="{{CouponList}}" wx:key="index">
+      <view class='panel21 FlewRow'>
+        <view>{{item.PriceStr}}</view>
+      </view>
+      <view class='panel22 FlewColumn'>
+        <view class='panel221 FlexRow'>
+          <view>{{item.CouponName}}适用产品</view>
+          <view class='panel23' wx:if="{{item.IsPast==1}}">已过期</view>
+        </view>
+        <view class='panel220 FlexRow'>
+          <image src='../images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" wx:for="{{ProgramList}}" wx:key="index" wx:if="{{item.IsShow2}}" />
+        </view>
+        <view class='panel222'>有效期 {{item.LimitTime}}</view>
+        <view class='panel222'>{{item.CouponName2}}</view>
+      </view>
+    </view>
+
+    <!-- <view class='panel2 FlexRow'>
+      <view class='panel21 FlewRow'>
+        <view>免费</view>
+      </view>
+      <view class='panel22 FlewColumn'>
+        <view class='panel221 FlexRow'>
+          <view>免费邀请券适用产品</view>
+          <view class='panel23'>已过期</view>
+        </view>
+        <view class='panel220 FlexRow'>
+          <image src='../images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" wx:for="{{ProgramList}}" wx:key="index" wx:if="{{item.IsShow2}}" />
+        </view>
+        <view class='panel222'>有效期 2017年12月23日</view>
+        <view class='panel222'>邀请10位付费用户免费开通会员功能。</view>
+      </view>
+    </view> -->
+    <image src='../images/file_0201.png' class="file_0201" />
+    <view style='height:100rpx'></view>
+
+  </block>
+  <block wx:if="{{CouponList.length==0}}">
+    <view class="panelNull">没有优惠券</view>
+  </block>
+</view>

package4/main/coupon.wxss

@@ -0,0 +1,71 @@
+.container {
+  background-color: #f0f0f0;
+  color: #1e1e1e;
+  font-weight: 500;
+}
+
+.panel2{
+  width:690rpx;
+  height:239rpx;
+  border-radius: 14rpx;
+  background-color: #fff;
+  border:1rpx solid #D2D2D2;
+  margin-top: 40rpx;
+  justify-content: flex-start;
+}
+
+.panel21{
+  width:150rpx;
+  height:239rpx;
+  line-height:239rpx;
+  border-top-left-radius: 14rpx;
+  border-bottom-left-radius: 14rpx;
+  background-color: #FFDD0C;
+  font-size:48rpx;
+  text-align: center;
+}
+
+.panel22{
+  align-items: flex-start;
+  font-size:24rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+
+.panel221{
+  font-weight: 400;
+  margin-bottom: 10rpx;
+}
+.panel222{
+  color:#787878;
+}
+
+.panel220{
+  margin-bottom: 10rpx;
+  justify-content: flex-start;
+}
+
+.product_icon_ksxq_70x70{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 10rpx;
+  margin-right: 10rpx;
+}
+
+.panel23{
+  color:#F44336;
+  font-size:26rpx;
+  font-weight: 400;
+  margin-left: 176rpx;
+}
+
+.file_0201{
+  width:100%;
+  height:381rpx;
+  margin-top: 50rpx;
+}
+
+.panelNull{
+  font-size:48rpx;
+  margin-top: 462rpx;
+}

package4/main/giftcard.js

@@ -0,0 +1,201 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+var giftID=0;
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    giftID = options.GiftID;
+    var userID = options.UserID;
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+      ProgramList: server.getProgramList(),
+    });
+
+    this.init(giftID,userID);
+
+  },
+  init: function (id,userID) {
+    var that = this;
+    server.getData('GetGiftInfoByUserID500?ID=' + id + "&ProductID=" + app.globalData.ProgramID+"&UserID="+userID, function (data) {
+      if (data) {
+        
+        var price = data.PriceTotal;
+        var numberWidth = 240;
+        var fontsize = 100;
+        if (price.toString().length == 2) {
+          numberWidth = 180;
+        }
+        else if (price.toString().length == 3) {
+          numberWidth = 220;
+        }
+        else if (price.toString().length == 4) {
+          numberWidth = 220;
+        }
+        else if (price.toString().length == 5) {
+          numberWidth = 240;
+          fontsize = 85;
+        }
+
+        that.setData({
+          NumberWidth: numberWidth,
+          GiftInfo: data,
+          FontSize:fontsize,
+        });
+      }
+    });
+  },
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
+  goto: function (e) {
+    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();
+        }
+      }
+    });
+  },
+  //得到用户信息
+  getUserInfo: function () {
+    var that = this
+    //调用登录接口
+    wx.login({
+      success: function (res0) {
+        wx.getUserInfo({
+          withCredentials: true,
+          success: function (res) {
+            app.globalData.userInfo = res.userInfo;
+            app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
+            app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
+
+            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: '../index/index'
+            });
+          }
+        });
+      },
+      fail: function () {
+        wx.reLaunch({
+          url: '../index/index'
+        });
+      }
+    });
+  },
+  login: function (param) {
+    var that = this;
+    var url="Login";
+    switch(app.globalData.ProgramID){
+      case 164:
+        url = "MathStar" + url;
+        break;
+      case 105:
+        url = "Math" + url;
+        break;
+      case 106:
+        url = "Hanzi" + url;
+        break;
+      case 98:
+        url = "Pinyin" + url;
+        break;
+      case 99:
+        url = "Phonics" + url;
+        break;
+    }
+    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,
+      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) {
+      app.globalData.userInfo.UserID = data.UserID;
+      wx.showLoading({
+        title: '兑换中...',
+      });
+      server.getData('SetUserGiftExchange500?UserID=' + app.globalData.userInfo.UserID + "&ProductPayInfoID=" + giftID, function (data2) {
+        wx.hideLoading();
+        if (data2) {
+          app.globalData.userInfo.IsMember = 1;
+          app.globalData.IsMemberForeverRemind = 1;
+          if (that.data.GiftInfo.GiftNumber>1)
+            wx.setStorageSync("HasActivate", 1);
+          
+          wx.reLaunch({
+            url: '../../pages/index/index'
+          });
+        }
+        else {
+          var title = "无效";
+          var content = "兑换卡已被领取，请联系赠送者了解原因！";
+          wx.showModal({
+            showCancel: false,
+            title: title,
+            content: content,
+            confirmText: "返回首页",
+            success: function () {
+              wx.reLaunch({
+                url: '../../pages/index/index'
+              });
+            }
+          });
+
+        }
+      });
+    });
+  },
+  gotoDefault:function(){
+    wx.reLaunch({
+      url: '../../pages/index/index'
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/giftcard.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "唱意教育",
+  "navigationBarBackgroundColor": "#7D4434",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#7D4434"
+}

package4/main/giftcard.wxss

@@ -0,0 +1,208 @@
+.container {
+  background-color: #7d4434;
+  color: #fff;
+  font-weight: 500;
+}
+
+.text1 {
+  color: #fff;
+  font-size: 98rpx;
+  font-weight: 600;
+  text-shadow: 0 7rpx 1rpx #622112;
+}
+
+.text2 {
+  color: #feca90;
+  font-size: 28rpx;
+  margin-top: 40rpx;
+}
+
+.text3 {
+  color: #feca90;
+  font-size: 48rpx;
+  margin-top: 0rpx;
+}
+
+.text4 {
+  color: #feca90;
+  font-size: 28rpx;
+}
+
+.panel1 {
+  margin-top: 40rpx;
+  width: 100%;
+  position: relative;
+}
+
+.program_giftcard_illus_01 {
+  width: 100%;
+  height: 1108rpx;
+  position: absolute;
+  top: 0;
+  z-index: 1;
+}
+.program_giftcard_illus_02 {
+  height: 708rpx;
+}
+
+.text5 {
+  color: #feca90;
+  font-size: 24rpx;
+  text-shadow: 0 3rpx 1rpx #962017;
+  margin-top: 219rpx;
+  z-index: 10;
+}
+
+.text6 {
+  color: #feca90;
+  font-size: 36rpx;
+  text-shadow: 0 3rpx 1rpx #962017;
+  margin: 10rpx 0 30rpx 0;
+  z-index: 10;
+}
+
+.programItem {
+  width: 598rpx;
+  height: 80rpx;
+  margin-bottom: 25rpx;
+  border-radius: 6rpx;
+  background-color: rgba(0, 0, 0, 0.3);
+  z-index: 10;
+  justify-content: space-between;
+  color: #f8f8f8;
+}
+
+.programItem1 {
+  justify-content: flex-start;
+}
+
+.universalpic_product_jisuanti_icon_size01 {
+  width: 50rpx;
+  height: 50rpx;
+  margin-left: 20rpx;
+  border-radius: 10rpx;
+}
+
+.name1 {
+  margin-left: 20rpx;
+  font-size: 28rpx;
+}
+
+.name2 {
+  margin-right: 20rpx;
+  font-size: 24rpx;
+}
+
+.panel11 {
+  margin-top: 25rpx;
+  z-index: 10;
+  width:418rpx;
+  color: #feca90;
+  align-items: flex-end;
+}
+
+.text7 {
+  z-index: 10;
+  font-size: 24rpx;
+  font-weight: 600;
+  margin-bottom: 25rpx;
+  margin-right:250rpx;
+}
+
+.textTitle {
+  font-size: 100rpx;
+  height: 117rpx;
+  position: relative;
+  right:240rpx;
+}
+
+.textTitle1 {
+  -webkit-text-stroke: 20rpx #883029;
+  position: absolute;
+  text-align: center;
+  line-height: 117rpx;
+}
+
+.textTitle2 {
+  color: #91c167;
+  position: absolute;
+  text-align: center;
+  line-height: 117rpx;
+}
+
+.text8 {
+  z-index: 10;
+  font-size: 26rpx;
+  font-weight: 600;
+  margin: 0 0 22rpx 0;
+}
+
+.text9 {
+  z-index: 10;
+  font-size: 24rpx;
+  color: #feca90;
+  margin: 4rpx 0 60rpx 0;
+}
+
+.btn1 {
+  margin-top: 80rpx;
+  width: 460rpx;
+  height: 100rpx;
+  background-color: #03af69;
+  border-radius: 10rpx;
+  box-shadow: 0 10rpx 5rpx #035834, 0 20rpx 1rpx rgba(0, 0, 0, 0.3);
+  font-size: 48rpx;
+  color:#fff;
+}
+
+.btn2 {
+  background-color: #2E2E2E;
+  box-shadow: 0 10rpx 5rpx #1E1E1E, 0 20rpx 1rpx rgba(0, 0, 0, 0.3);
+  color:#4D4D4D;
+}
+
+.text10 {
+  z-index: 10;
+  font-size: 24rpx;
+  font-weight: 400;
+  color: #dc9d7e;
+  margin: 40rpx 0 0 0;
+}
+
+.text11 {
+  z-index: 10;
+  font-size: 24rpx;
+  color: #dc9d7e;
+  font-weight: 400;
+  margin: 50rpx 0 0 0;
+}
+
+.text12 {
+  color: #03af69;
+  text-decoration: underline;
+  font-weight: 500;
+}
+
+.line1 {
+  margin-top: 30rpx;
+  width: 650rpx;
+  height: 1rpx;
+  background-color: #dc9d7e;
+}
+
+.text13 {
+  margin-top: 60rpx;
+  width: 650rpx;
+  color: #dc9d7e;
+  font-size: 20rpx;
+}
+
+.text14{
+  text-decoration: underline;
+}
+
+.program_giftcard_footer {
+  margin-top: 0rpx;
+  width: 100%;
+  height: 304rpx;
+}

package4/main/giftinfo.js

@@ -0,0 +1,73 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    List: [],
+  },
+  onLoad: function (options) {
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+      ProgramList: server.getProgramList(),
+      ProgramID:app.globalData.ProgramID,
+      canGive:false,
+    });
+    this.init(options.id);
+  },
+  init: function (id) {
+    var that = this;
+    var url = "GetGiftInfoByUserID500?ID=" + id + "&ProductID=" + app.globalData.ProgramID;
+    server.getData(url, function (data) {
+      if (data) {
+        that.setData({
+          GiftInfo: data,
+        });
+      }
+    });
+  },
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
+  getRemind:function(){
+    var that=this;
+    wx.getSetting({
+      success(res) {
+        if (!res.authSetting['scope.userInfo']) {
+          wx.navigateTo({
+            url: '../../pages/index/userlogin?url=giftinfo'
+          });
+        }
+        else {
+          wx.showModal({
+            title: '慎重转发',
+            content: '请勿转发到群。如误转，只能在聊天窗口中撤回（1分钟内）。',
+            confirmText: '知道了',
+            showCancel: false,
+          });
+          that.setData({
+            canGive: true,
+          });
+        }
+      }
+    });
+    
+  },
+  onShareAppMessage: function () {
+    if (this.data.GiftInfo.PayType == 5 && this.data.GiftInfo.ExchangeUserID>0){
+      return {
+        title: app.globalData.ShareTitle,
+        path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+        imageUrl: app.globalData.ShareImage,
+      }
+    }
+    else{
+      return {
+        title: "有价商品尽快领取",
+        path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID + '&GiftID=' + this.data.GiftInfo.ID,
+        imageUrl: '../images/program_screenshot_giftcard.png',
+      }
+    }
+  },
+})

package4/main/giftinfo.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "礼品卡详情",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/giftinfo.wxml

@@ -0,0 +1,62 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">{{GiftInfo.Body}}</view>
+  </view>
+  <view class="panelItem FlexRow">
+    <view class="panelItem1">内容</view>
+    <view class="panelItem2 FlexRow">
+      <block wx:if="{{GiftInfo.Body=='唱意教育礼品卡'}}">
+        <image src='../images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" wx:for="{{ProgramList}}" wx:key="index" wx:if="{{item.IsShow2}}" />
+      </block>
+      <block wx:if="{{GiftInfo.Body!='唱意教育礼品卡'}}">
+        <image src='../images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" wx:for="{{ProgramList}}" wx:key="index" wx:if="{{item.IsShow2 && item.ID==ProgramID}}" />
+      </block>
+    </view>
+  </view>
+  <view class="lineWidth750"></view>
+  <view class="panelItem0 panelItem FlexRow">
+    <view class="panelItem1 FlexRow">
+      <view class="title1">截止日期</view>
+      <view class="title2">{{GiftInfo.LimitTime}}</view>
+    </view>
+    <view class="panelItem2 FlexRow">
+      <view class="title3" wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID>0}}">已领取</view>
+      <view class="title4 title3" wx:if="{{false}}">已过期</view>
+    </view>
+  </view>
+  <view class="lineWidth750"></view>
+  <view class="panelItem00 panelItem FlexRow" wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID>0}}">
+    <view class="panelItem1 FlexColumn">
+      <view class="panelItem11 FlexRow">
+        <view class="title1">领取人</view>
+        <view class="title2">{{GiftInfo.NickName}}</view>
+      </view>
+      <view class="panelItem11 FlexRow">
+        <view class="title1">领取时间</view>
+        <view class="title2">{{GiftInfo.ExchangeTime}}</view>
+      </view>
+    </view>
+    <view class="panelItem2 FlexRow">
+      <image src='{{GiftInfo.AvatarUrl}}' class="universalpic_face_default_blue_120x120" />
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+
+  <block wx:if="{{GiftInfo.PayType==5 && GiftInfo.ExchangeUserID==0}}">
+    <view class="btn0 button1 FlexRow" bindtap="getRemind" wx:if="{{!canGive}}">
+      赠送
+    </view>
+    <button class="btn0 button1 FlexRow" open-type='share' wx:if="{{canGive}}">
+      赠送
+    </button>
+    <view class='title5'>转发后，请联系对方尽快领取</view>
+  </block>
+  <view style='height:50rpx;'></view>
+  <image src='../images/file_030{{item}}.png' class="file_030{{item}}" wx:for="{{[1,2,3]}}" wx:key="index" />
+  <view class='panelFooter FlexRow' bindtap='gotoFeedback'>
+    <view>如遇赠送问题，请切换到“唱意教育家长助手”中</view>
+    <view class='title6'>咨询客服</view>
+    <view>。</view>
+  </view>
+
+</view>

package4/main/giftinfo.wxss

@@ -0,0 +1,119 @@
+.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: space-between;
+  font-size:28rpx;
+  height:110rpx;
+  background-color: #fff;
+}
+
+.panelItem0{
+  height:88rpx;
+}
+
+.panelItem00{
+  height:123rpx;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+  align-items: flex-start;
+}
+.panelItem .panelItem11{
+  margin-bottom: 5rpx;
+}
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+}
+
+.product_icon_ksxq_70x70{
+  width:50rpx;
+  height:50rpx;
+  border-radius: 10rpx;
+  margin-left: 10rpx;
+}
+
+.panelItem .title1{
+  color:#9B9B9B;
+  font-size:20rpx;
+  font-weight: 400;
+  margin-right: 10rpx;
+  width:80rpx;
+}
+
+.panelItem .title2{
+  font-size:20rpx;
+  font-weight: 400;
+}
+
+.panelItem .title3{
+  color:#787878;
+  font-size:28rpx;
+}
+
+.panelItem .title4{
+  color:#F44336;
+}
+
+.universalpic_face_default_blue_120x120{
+  width:60rpx;
+  height:60rpx;
+  border-radius: 10rpx;
+}
+
+.btn0{
+  width:400rpx;
+  height:100rpx;
+  font-size:48rpx;
+  margin-top: 50rpx;
+}
+
+.title5{
+  font-weight: 400;
+  font-size:24rpx;
+  margin: 30rpx 0 0 0;
+}
+
+.file_0301{
+  width:100%;
+  height:1204rpx;
+  margin-bottom: 50rpx;
+}
+.file_0302{
+  width:100%;
+  height:746rpx;
+  margin-bottom: 50rpx;
+}
+.file_0303{
+  width:100%;
+  height:752rpx;
+  margin-bottom: 50rpx;
+}
+
+.panelFooter{
+  font-weight: 400;
+  font-size: 24rpx;
+  margin-bottom: 100rpx;
+}
+.panelFooter .title6{
+  color:#B3443B;
+  text-decoration: underline;
+  font-weight: 500;
+}

package4/main/giftlist.js

@@ -0,0 +1,45 @@
+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;
+
+    server.getData('GetGiftListByUserID500?UserID=' + app.globalData.userInfo.UserID + "&ProductID=" + app.globalData.ProgramID, function (data) {
+      if (data) {
+        that.setData({
+          List: data,
+        });
+      }
+    });
+  },
+  goto: function (e) {
+    var id=e.currentTarget.dataset.id;
+    wx.navigateTo({
+      url: "./giftinfo?id="+id,
+    });
+  },
+  gotoGiftList: function () {
+    wx.navigateTo({
+      url: "./list?IsGift=1",
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/giftlist.json

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

package4/main/giftlist.wxml

@@ -0,0 +1,23 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <block wx:if="{{List.length>0}}" wx:for="{{List}}" wx:key="index">
+    <view class='panel FlexRow' bindtap="goto" data-id="{{item.ID}}">
+      <view class='panel1 FlexColumn'>
+        <view class='Title1'>{{item.Body}}</view>
+        <view class='Title2'>{{item.TradeNo}}</view>
+        <view class='Title3'>{{item.PayEndTime}}</view>
+      </view>
+      <view class='panel2 FlexRow'>
+        <view class='Title4' wx:if="{{item.PayType==5 && item.ExchangeUserID>0}}">已领取</view>
+        <image src='../images/universalpic_indicator_right_gray.png' class="universalpic_indicator_right_gray" />
+      </view>
+    </view>
+    <view class='lineFooter'></view>
+  </block>
+
+  <view class='panelNull FlexColumn' wx:if="{{List.length==0}}" bindtap='gotoGiftList'>
+    <view class='Title5'>没有礼品卡</view>
+    <view class='Title6'>乘此机会挑选一张吧</view>
+    <view class='Title7'>去选购</view>
+  </view>
+  <view style='height:100rpx;'></view>
+</view>

package4/main/giftlist.wxss

@@ -0,0 +1,72 @@
+.container {
+  background-color: #f0f0f0;
+  color: #1e1e1e;
+  font-weight: 400;
+}
+
+.panel{
+  margin-top: 50rpx;
+  width:100%;
+  background-color: #fff;
+  justify-content: space-between;
+}
+
+.panel .panel1{
+  align-items: flex-start;
+  margin-left: 30rpx;
+}
+
+.panel .Title1{
+  margin-top: 30rpx;
+  font-size:28rpx;
+}
+
+.panel .Title2{
+  font-size:20rpx;
+  color:#787878;
+}
+
+.panel .Title3{
+  font-size:20rpx;
+  color:#787878;
+  margin-bottom: 30rpx;
+}
+
+.panel .panel2{
+  justify-content: flex-end;
+  margin-right: 30rpx;
+}
+
+.panel .Title4{
+  font-size:28rpx;
+  color:#787878;
+  margin-right: 30rpx;
+}
+
+.universalpic_indicator_right_gray{
+  width:16rpx;
+  height:26rpx;
+}
+
+
+.panelNull{
+  margin-top: 412rpx;
+}
+
+.panelNull .Title5{
+  font-size:48rpx;
+  font-weight: 500;
+}
+
+.panelNull .Title6{
+  font-size:24rpx;
+  margin-top: 40rpx;
+}
+
+.panelNull .Title7{
+  font-size:36rpx;
+  text-decoration: underline;
+  color:#B3443B;
+  font-weight: 500;
+  margin-top: 20rpx;
+}

package4/main/limited.js

@@ -0,0 +1,44 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    FileUrl: app.globalData.imageUrl,
+  },
+  onLoad: function (options) {
+
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+    });
+    this.init();
+  },
+  init: function () {
+    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++) {
+          var date = common.formatDateCHS(common.formatTime(new Date()));
+          if (data[i].Time >= date) 
+            data[i].Member = "会员";
+          else
+            data[i].Member = "非会员";
+        }
+        that.setData({
+          ProductList: data,
+        });
+      }
+    });
+  },
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+});

package4/main/limited.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "使用有效期",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/limited.wxml

@@ -0,0 +1,25 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">产品</view>
+    <view class="panelTitle2 FlexRow">
+      <view class="panelTitle21">截止日期</view>
+      <view class="line1"></view>
+      <view class="panelTitle21">用户身份</view>
+    </view>
+  </view>
+  <view class="panelItem FlexRow" wx:for="{{ProductList}}" wx:key="index">
+    <view class="panelItem1">{{item.Name}}</view>
+    <view class="panelItem2 FlexRow">
+      <view class="panelItem21">{{item.Time}}</view>
+      <view class="panelItem22">{{item.Member}}</view>
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+
+
+  <view class='panelFooter FlexRow' bindtap='gotoFeedback'>
+    <view>如遇问题，请切换到“唱意教育家长助手”中</view>
+    <view class='title6'>咨询客服</view>
+    <view>。</view>
+  </view>
+</view>

package4/main/limited.wxss

@@ -0,0 +1,75 @@
+.container {
+  background-color: #f0f0f0;
+  color:#1e1e1e;
+  font-weight: 500;
+}
+
+
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+  align-items: flex-end;
+}
+
+.panelTitle .panelTitle1{
+  font-size:32rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+}
+
+
+.panelTitle .panelTitle2{
+  font-size: 20rpx;
+  color:#787878;
+  margin-bottom: 30rpx;
+  margin-right: 30rpx;
+  font-weight: 500;
+}
+
+.panelTitle .line1{
+  width:3rpx;
+  height:20rpx;
+  background-color: #D2D2D2;
+  margin: 0 10rpx;
+}
+
+.panelItem{
+  width:100%;
+  justify-content: space-between;
+  font-size:28rpx;
+  height:100rpx;
+  margin-bottom: 2rpx;
+  background-color: #fff;
+}
+
+.panelItem0{
+  height:133rpx;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+  color:#787878;
+  font-weight: 400;
+}
+
+.panelItem .panelItem22{
+  margin-left: 30rpx;
+  width: 90rpx;
+}
+
+.panelFooter{
+  font-weight: 400;
+  font-size: 24rpx;
+  margin-top: 50rpx;
+}
+.panelFooter .title6{
+  color:#B3443B;
+  text-decoration: underline;
+  font-weight: 500;
+}

package4/main/list.js

@@ -0,0 +1,81 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    IsGift:true,
+  },
+  onLoad: function (options) {
+    var isgift = Number(options.IsGift);
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+      ProgramList: server.getProgramList(),
+      MathShow: false,
+      ChineseShow: false,
+      AllShow: false,
+      MathGiftShow: false,
+      AllGiftShow: false,
+      IsGift: isgift,
+    });
+
+    if (isgift==1){
+      wx.setNavigationBarTitle({
+        title: '购买礼品卡',
+      })
+    }
+
+    this.init();
+  },
+  init:function(){
+    var arrProduct = wx.getStorageSync("ProductPrice");
+    var arr=[];
+    for(var i=0;i<arrProduct.length;i++){
+      if (arrProduct[i].ProductNum.indexOf(",")>0){
+        arr.push(arrProduct[i]);
+      }
+    }
+
+    var CurrentProduct;
+    for (var i = 0; i < arrProduct.length; i++) {
+      if (arrProduct[i].ProductNum == app.globalData.ProgramID) {
+        CurrentProduct=arrProduct[i];
+      }
+    }
+    this.setData({
+      ProductList:arr,
+      CurrentProduct: CurrentProduct,
+    });
+  },
+  showList: function (e) {
+    var id = e.currentTarget.dataset.id;
+    this.data[id] = true;
+    this.setData(this.data);
+  }, 
+  gotoOrder: function (e) {
+    var id = e.currentTarget.dataset.id;
+    var paytype = e.currentTarget.dataset.paytype;
+    wx.navigateTo({
+      url: "./order?id=" + id + "&paytype=" + paytype,
+    });
+  },
+  switchProgram: function (e) {
+    wx.navigateToMiniProgram({
+      appId: e.currentTarget.dataset.appid,
+      path: e.currentTarget.dataset.path,
+      extraData: {
+      },
+      success(res) {
+        // 打开成功
+      }
+    });
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/list.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "套装选购",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/list.wxml

@@ -0,0 +1,197 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <!-- 套装购买 -->
+  <block wx:if="{{!IsGift}}">
+    <view class='panel1 FlexRow'>
+      <image src='../images/product_icon_group_50x50.png' class="product_icon_group_50x50" />
+      <view class="panel11 FlexColumn">
+        <view class="panel111 FlexRow">
+          <view class="text1">{{ProductList[0].Name}}</view>
+          <view class="text0">{{ProductList[0].Period[0].Price}}</view>
+        </view>
+        <view class="text3">{{ProductList[0].ProductList.length}}款产品，有效期6个月</view>
+        <view class="text2">{{ProductList[0].Period[0].Title2}}</view>
+        <view class="line1"></view>
+        <block wx:for="{{ProductList[0].ProductList}}" wx:key="index" wx:if="{{ChineseShow}}">
+
+          <view class="panel12 FlexRow">
+            <view class="FlexRow">
+              <image src='../images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" />
+              <view class="panel13 FlexColumn">
+                <view class="text4">{{item.Name}}</view>
+                <view class="text5">{{item.Name2}}</view>
+              </view>
+            </view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</view>
+          </view>
+        </block>
+        <block wx:if="{{!ChineseShow}}">
+          <view class="panel121 panel12 FlexRow" bindtap="showList" data-id="ChineseShow">
+            <view class="text4">套装详情</view>
+            <image src='../images/universalpic_indicator_down_gray.png' class="universalpic_indicator_down_gray" />
+          </view>
+        </block>
+
+      </view>
+    </view>
+    <view class="panel2 FlexRow" bindtap='gotoOrder' data-paytype="4" data-id='{{ProductList[0].ProductNum}}'>
+      <view class="text6">去结算</view>
+      <image src='../images/universalpic_indicator_right_white.png' class="universalpic_indicator_right_white" />
+    </view>
+
+    <view class='panel1 FlexRow'>
+      <image src='../images/product_icon_group_50x50.png' class="product_icon_group_50x50" />
+      <view class="panel11 FlexColumn">
+        <view class="panel111 FlexRow">
+          <view class="text1">{{ProductList[1].Name}}</view>
+          <view class="text0">{{ProductList[1].Period[0].Price}}</view>
+        </view>
+        <view class="text3">{{ProductList[1].ProductList.length}}款产品，有效期6个月</view>
+        <view class="text2">{{ProductList[1].Period[0].Title2}}</view>
+        <view class="line1"></view>
+        <block wx:for="{{ProductList[1].ProductList}}" wx:key="index" wx:if="{{MathShow}}">
+
+          <view class="panel12 FlexRow">
+            <view class="FlexRow">
+              <image src='../../pages/images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" />
+              <view class="panel13 FlexColumn">
+                <view class="text4">{{item.Name}}</view>
+                <view class="text5">{{item.Name2}}</view>
+              </view>
+            </view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</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" />
+          </view>
+        </block>
+
+      </view>
+    </view>
+    <view class="panel2 FlexRow" bindtap='gotoOrder' data-paytype="4" data-id='{{ProductList[1].ProductNum}}'>
+      <view class="text6">去结算</view>
+      <image src='../images/universalpic_indicator_right_white.png' class="universalpic_indicator_right_white" />
+    </view>
+
+
+    <view class='panel1 FlexRow'>
+      <image src='../images/product_icon_group_50x50.png' class="product_icon_group_50x50" />
+      <view class="panel11 FlexColumn">
+        <view class="panel111 FlexRow">
+          <view class="text1">{{ProductList[2].Name}}</view>
+          <view class="text0">{{ProductList[2].Period[0].Price}}</view>
+        </view>
+        <view class="text3">{{ProductList[2].ProductList.length}}款产品，有效期6个月</view>
+        <view class="text2">{{ProductList[2].Period[0].Title2}}</view>
+        <view class="line1"></view>
+        <block wx:for="{{ProductList[2].ProductList}}" wx:key="index" wx:if="{{AllShow}}">
+          <view class="panel12 FlexRow">
+            <view class="FlexRow">
+              <image src='../../pages/images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" />
+              <view class="panel13 FlexColumn">
+                <view class="text4">{{item.Name}}</view>
+                <view class="text5">{{item.Name2}}</view>
+              </view>
+            </view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</view>
+          </view>
+          <view class="line1"></view>
+        </block>
+
+        <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" />
+          </view>
+        </block>
+      </view>
+    </view>
+    <view class="panel2 FlexRow" bindtap='gotoOrder' data-paytype="4" data-id='{{ProductList[2].ProductNum}}'>
+      <view class="text6">去结算</view>
+      <image src='../images/universalpic_indicator_right_white.png' class="universalpic_indicator_right_white" />
+    </view>
+  </block>
+
+  <!-- 礼品卡 -->
+  <block wx:if="{{IsGift}}">
+    <image src='../images/pay_shelf_banner_750x200.png' class="pay_shelf_banner_750x200" />
+    <view class='panel1 FlexRow'>
+      <image src='../images/product_icon_group_50x50.png' class="product_icon_group_50x50" />
+      <view class="panel11 FlexColumn">
+        <view class="panel111 FlexRow">
+          <view class="text1">{{CurrentProduct.ProductList[0].Name}}礼品卡</view>
+          <view class="text0">{{CurrentProduct.Period[0].Price}}</view>
+        </view>
+        <view class="text23">1款产品，可使用6个月</view>
+        <view class="line1"></view>
+        <block wx:for="{{CurrentProduct.ProductList}}" wx:key="index" wx:if="{{MathGiftShow}}">
+
+          <view class="panel12 FlexRow">
+            <view class="FlexRow">
+              <image src='../../pages/images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" />
+              <view class="panel13 FlexColumn">
+                <view class="text4">{{item.Name}}</view>
+                <view class="text5">{{item.Name2}}</view>
+              </view>
+            </view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</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" />
+          </view>
+        </block>
+
+      </view>
+    </view>
+    <view class="panel2 FlexRow" bindtap='gotoOrder' data-paytype="5" data-id='{{CurrentProduct.ProductNum}}'>
+      <view class="text6">去结算</view>
+      <image src='../images/universalpic_indicator_right_white.png' class="universalpic_indicator_right_white" />
+    </view>
+
+
+    <view class='panel1 FlexRow'>
+      <image src='../images/product_icon_group_50x50.png' class="product_icon_group_50x50" />
+      <view class="panel11 FlexColumn">
+        <view class="panel111 FlexRow">
+          <view class="text1">{{ProductList[2].Name}}礼品卡</view>
+          <view class="text0">{{ProductList[2].Period[0].Price}}</view>
+        </view>
+        <view class="text3">{{ProductList[2].ProductList.length}}款产品，有效期6个月</view>
+        <view class="text2">{{ProductList[2].Period[0].Title2}}</view>
+        <view class="line1"></view>
+        <block wx:for="{{ProductList[2].ProductList}}" wx:key="index" wx:if="{{AllGiftShow}}">
+          <view class="panel12 FlexRow">
+            <view class="FlexRow">
+              <image src='../../pages/images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" />
+              <view class="panel13 FlexColumn">
+                <view class="text4">{{item.Name}}</view>
+                <view class="text5">{{item.Name2}}</view>
+              </view>
+            </view>
+            <view class="panel14" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}'>去体验</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" />
+          </view>
+        </block>
+      </view>
+    </view>
+    <view class="panel2 FlexRow" bindtap='gotoOrder' data-paytype="5" data-id='{{ProductList[2].ProductNum}}'>
+      <view class="text6">去结算</view>
+      <image src='../images/universalpic_indicator_right_white.png' class="universalpic_indicator_right_white" />
+    </view>
+
+    <image src='../images/file_0303.png' class="file_0303" />
+  </block>
+  <view style='height:100rpx'></view>
+</view>

package4/main/list.wxss

@@ -0,0 +1,142 @@
+.container {
+  background-color: #f0f0f0;
+  color: #1e1e1e;
+  font-weight: 500;
+}
+
+.pay_shelf_banner_750x200 {
+  width: 100%;
+  height: 200rpx;
+}
+
+.panel1 {
+  width: 100%;
+  margin-top: 50rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+  background-color: #fff;
+}
+
+.product_icon_group_50x50 {
+  width: 50rpx;
+  height: 50rpx;
+  border-radius: 10rpx;
+  margin: 30rpx 30rpx 0 30rpx;
+}
+
+.panel11 {
+  margin-top: 30rpx;
+  align-items: flex-start;
+}
+
+.panel111 {
+  width: 100%;
+  justify-content: space-between;
+}
+
+.text1 {
+  font-size: 36rpx;
+}
+
+.text0 {
+  font-size: 36rpx;
+  margin-right: 30rpx;
+}
+
+.text3 {
+  margin-top: 10rpx;
+  font-size: 24rpx;
+  color: #787878;
+}
+
+.text2 {
+  font-size: 24rpx;
+  color: #fe6659;
+  margin-bottom: 30rpx;
+}
+
+.text23 {
+  margin-top: 10rpx;
+  font-size: 24rpx;
+  color: #787878;
+  margin-bottom: 30rpx;
+}
+
+.line1 {
+  width: 640rpx;
+  height: 1rpx;
+  background-color: #e3e3e3;
+}
+
+.panel12 {
+  width: 100%;
+  height: 131rpx;
+  justify-content: space-between;
+}
+
+.panel121 {
+  height: 100rpx;
+}
+
+.product_icon_ksxq_70x70 {
+  width: 70rpx;
+  height: 70rpx;
+  border-radius: 10rpx;
+}
+
+.panel13 {
+  margin-left: 20rpx;
+  align-items: flex-start;
+}
+
+.text4 {
+  font-size: 28rpx;
+}
+
+.text5 {
+  font-size: 24rpx;
+  font-weight: 400;
+  color: #787878;
+}
+
+.panel14 {
+  margin-right: 30rpx;
+  width: 108rpx;
+  height: 50rpx;
+  text-align: center;
+  color: #fff;
+  line-height: 50rpx;
+  border-radius: 6rpx;
+  font-size: 24rpx;
+  background-color: #0792e4;
+}
+
+.panel2 {
+  width: 100%;
+  justify-content: space-between;
+  background-color: #ffdd0c;
+  height: 110rpx;
+}
+
+.text6 {
+  margin-left: 110rpx;
+  font-size: 36rpx;
+}
+
+.universalpic_indicator_right_white {
+  margin-right: 30rpx;
+  width: 16rpx;
+  height: 26rpx;
+}
+
+.universalpic_indicator_down_gray {
+  margin-right: 30rpx;
+  width: 26rpx;
+  height: 16rpx;
+}
+
+.file_0303 {
+  margin-top: 50rpx;
+  width: 100%;
+  height: 752rpx;
+}

package4/main/order.js

@@ -0,0 +1,149 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+var isPaying = false;
+var paytype=3;//3是单买 4是套餐 5是礼品卡
+var buytype = 110;//110是6个月 112是12个月，111是永久
+var detail="";
+var selectedCouponID=0;
+
+Page({
+  data: {
+    CouponList: [],
+  },
+  onLoad: function (options) {
+    var id = options.id;
+    paytype = options.paytype;
+    var result, price = 0;
+    var programList = server.getProgramList();
+    var arrProduct=wx.getStorageSync("ProductPrice");
+    for (var j = 0; j < arrProduct.length; j++) {
+      if (id==arrProduct[j].ProductNum){
+        for (var k = 0; k < arrProduct[j].Period.length; k++) {
+          if (arrProduct[j].Period[k].Select) {
+            price = arrProduct[j].Period[k].Price;
+            detail = arrProduct[j].Period[k].Detail;
+          }
+        }
+        result = arrProduct[j];
+      }
+    }
+
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+      Product: result,
+      Price: price,
+      IsDiscount: false,
+      CouponName:"未选择",
+
+    });
+  },
+  selectPeriod: function (e) {
+    var id = e.currentTarget.dataset.id;
+    var list = this.data.Product.Period;
+    var price = 0;
+    for (var i = 0; i < list.length; i++) {
+      if (i == id) {
+        list[i].Select = true;
+        price = list[i].Price;
+        if (this.data.Coupon){
+          price=price-Number(this.data.Coupon.Price);
+        }
+        if (price.toString().indexOf(".") < 0) {
+          price = price + ".00";
+        }
+        detail = list[i].Detail;
+        if (i==0)
+          buytype=110;
+        else if (i == 1)
+          buytype = 112;
+        else if (i == 2)
+          buytype = 111;
+      }
+      else
+        list[i].Select = false;
+    }
+    this.data.Product.Period = list;
+    this.setData({
+      Product: this.data.Product,
+      Price: price,
+    });
+  },
+  showDiscount: function () {
+    this.GetUserCouponListByUserID();
+  },
+  closeDiscount: function () {
+    this.setData({
+      IsDiscount: false,
+    });
+  },
+  GetUserCouponListByUserID: function (callback) {
+    var that = this;
+    that.setData({
+      IsDiscount: true,
+    });
+    wx.showLoading({
+      title: '请稍后',
+    });
+    server.getData('GetUserCouponListByUserID?UserID=' + app.globalData.userInfo.UserID, function (data) {
+        if (data) {
+          that.setData({
+            CouponList:data,
+          });
+        }
+        wx.hideLoading();
+    });
+  },
+  selectCoupon:function(e){
+    selectedCouponID=e.currentTarget.dataset.id;
+    var list = this.data.CouponList;
+    for(var i=0;i<list.length;i++){
+      if (selectedCouponID==list[i].ID){
+        var price = Number(this.data.Price) - Number(list[i].Price);
+        if (this.data.Coupon)
+          price+=Number(this.data.Coupon.Price);
+
+        if (price.toString().indexOf(".")<0){
+          price=price+".00";
+        }
+        this.setData({
+          IsDiscount: false,
+          Coupon: list[i],
+          Price: price,
+        });
+        wx.pageScrollTo({
+          scrollTop: 2000,
+        });
+        break;
+      }
+    }
+  },
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
+  getPay: function (e) {
+    if (!isPaying) {
+      isPaying = true;
+      var that = this;
+      var money = that.data.Price;
+      if (that.data.Coupon)
+        detail += "_" + that.data.Coupon.ID+":"+Number(that.data.Coupon.Price)*100;
+      server.payMoney(paytype, buytype, money, detail, function () {
+        wx.redirectTo({
+          url: './payfinish?paytype=' + paytype,
+        });
+      });
+      setTimeout(function () {
+        isPaying = false;
+      }, 3000);
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/order.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "订单",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/order.wxml

@@ -0,0 +1,102 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;' wx:if="{{!IsDiscount}}">
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">订单内容</view>
+  </view>
+
+  <block wx:for="{{Product.ProductList}}" wx:key="index" wx:if="{{item.IsShow2}}">
+    <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+      <view class="lineWidth650"></view>
+    </view>
+    <view class="panelItem FlexRow">
+      <view class="panelItem1 FlexRow">
+        <image src='../images/{{item.ImageUrl}}' class="product_icon_ksxq_70x70" />
+        <view class="text1">{{item.Name}}</view>
+      </view>
+      <view>
+      </view>
+    </view>
+
+  </block>
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">有效期</view>
+  </view>
+
+  <view class="{{item.Css}} panelItem3 FlexColumn" wx:for="{{Product.Period}}" wx:key="index" bindtap="selectPeriod" data-id="{{index}}">
+    <view class="lineWidthAll FlexRow" wx:if="{{index>0}}">
+      <view class="lineWidth720"></view>
+    </view>
+    <view class="panelItem31 FlexRow">
+      <view class="panelItem1 FlexRow">
+        <view class="selected FlexRow" wx:if="{{item.Select}}">
+          <view class='selected1'></view>
+        </view>
+        <view class="selected2 selected FlexRow" wx:if="{{!item.Select}}">
+        </view>
+        <view class="panelItem311">{{item.Title1}}</view>
+      </view>
+      <view class="panelItem2 FlexRow">
+        {{item.Price}}
+      </view>
+    </view>
+    <view class="panelItem32">
+      {{item.Title2}}
+    </view>
+  </view>
+  
+  <view class='lineFooter'></view>
+
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">优惠券</view>
+  </view>
+
+  <view class="panelItem FlexRow" bindtap='showDiscount'>
+    <view class="panelItem1" wx:if="{{!Coupon}}">未选择</view>
+    <view class="panelItem1" wx:if="{{Coupon}}">{{Coupon.CouponName}}</view>
+    <view class="panelItem2 FlexRow">
+      <view wx:if="{{Coupon}}">已减 {{Coupon.Price}}</view>
+      <image src='../images/universalpic_indicator_right_gray.png' class="universalpic_indicator_right_gray" />
+    </view>
+  </view>
+  <view class='lineFooter'></view>
+  
+  <view class='text3 FlexRow' bindtap='gotoFeedback'>
+    <view class='text31'>如遇购买问题，请切换到“唱意教育家长助手”中</view>
+    <view class='text32'>咨询客服</view>
+  </view>
+
+  <view class="panelFooter FlexRow">
+    <view class='panelFooter1 FlexColumn'>
+      <view class='text2'>结算价格</view>
+      <view class='number1'>{{Price}}</view>
+    </view>
+    <view class="btnPay" bindtap="getPay">支付</view>
+  </view>
+</view>
+
+<view class="discount container FlexColumn" style='min-height:{{Containnerheight}}rpx;' wx:if="{{IsDiscount}}">
+  <view class="panel1">可供使用的优惠券</view>
+
+  <view class='panelNull FlexColumn' wx:if="{{CouponList.length==0}}">
+    <text class='panelNull1'>没有符合条件的\n优惠券</text>
+    <text class='panelNull2'>本次购买获赠的优惠券\n将在支付完成后发到您的账户，\n可在下次购买时使用。</text>
+  </view>
+  <view class='panel2 FlexRow' wx:if="{{CouponList.length>0}}" wx:for="{{CouponList}}" wx:key="index" bindtap="selectCoupon" data-id="{{item.ID}}">
+    <view class='panel21 FlewRow'>
+      <view>{{item.PriceStr}}</view>
+    </view>
+    <view class='panel22 FlewColumn'>
+      <view class='panel221'>{{item.CouponName}}</view>
+      <view class='panel222'>有效期 {{item.LimitTime}}</view>
+      <view class='panel222'>{{item.CouponName2}}</view>
+    </view>
+  </view>
+  <view style='height:160rpx'></view>
+
+  <view class="panel3 FlexColumn" bindtap='closeDiscount'>
+    <view class='line1'></view>
+    <view class="panel31">取消</view>
+  </view>
+
+</view>

package4/main/order.wxss

@@ -0,0 +1,239 @@
+.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: space-between;
+  font-size:28rpx;
+  height:100rpx;
+  background-color: #fff;
+}
+
+.panelItem0{
+  height:133rpx;
+}
+
+.panelItem .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+.panelItem .panelItem2{
+  margin-right: 30rpx;
+  color:#787878;
+  font-weight: 500;
+}
+
+.universalpic_indicator_right_gray{
+  width:16rpx;
+  height:26rpx;
+  margin-left: 30rpx;
+}
+
+.product_icon_ksxq_70x70 {
+  width: 50rpx;
+  height: 50rpx;
+  border-radius: 10rpx;
+}
+
+.text1{
+  font-size: 28rpx;
+  margin-left: 20rpx;
+  font-weight: 400;
+}
+
+
+.panelItem3{
+  width:100%;
+  font-size:28rpx;
+  height:144rpx;
+  background-color: #fff;
+  align-items: flex-start;
+}
+
+.panelItem30{
+  height:100rpx;
+}
+
+.panelItem3 .panelItem31{
+  width:100%;
+  justify-content: space-between;
+  margin-top: 30rpx;
+}
+.panelItem3 .panelItem32{
+  font-size:24rpx;
+  color:#F44336;
+  margin: 10rpx 0 0 100rpx;
+  min-height: 25rpx;
+}
+
+.panelItem3 .selected{
+  width:18rpx;
+  height:18rpx;
+  background-color: #fff;
+  border: 6rpx solid #1e1e1e;
+  border-radius: 50%;
+  margin: 0 30rpx 0 10rpx;
+}
+.panelItem3 .selected2{
+  background-color: #F8F8F8;
+  border: 6rpx solid #D2D2D2;
+}
+
+.panelItem3 .selected1{
+  width:10rpx;
+  height:10rpx;
+  background-color: #1e1e1e;
+  border-radius: 50%;
+}
+
+.panelItem3 .panelItem1{
+  margin-left: 30rpx;
+  font-weight: 400;
+}
+
+.panelItem3 .panelItem2{
+  margin-right: 30rpx;
+}
+
+.text3{
+  width:100%;
+  margin: 50rpx 0 240rpx 0;
+  justify-content: flex-start;
+  font-size:24rpx;
+
+}
+.text31{
+  margin-left: 30rpx;
+}
+.text32{
+  color:#B3443B;
+  text-decoration: underline;
+}
+
+.panelFooter{
+  width:100%;
+  height:140rpx;
+  background-color: #F77706;
+  justify-content: space-between;
+  color:#fff;
+
+  position: fixed;
+  z-index: 100;
+  bottom: 0;
+}
+
+.panelFooter .panelFooter1{
+  align-items: flex-start;
+  margin-left: 30rpx;
+  font-size:24rpx;
+}
+.panelFooter .number1{
+  font-size:48rpx;
+}
+.panelFooter .btnPay{
+  font-size:48rpx;
+  color:#1e1e1e;
+  width:380rpx;
+  height:100rpx;
+  background-color: #ffdd0c;
+  box-shadow: 0 10rpx 1rpx #E1600A;
+  border-radius: 10rpx;
+  text-align: center;
+  line-height: 100rpx;
+  margin-right: 30rpx;
+}
+
+.discount{
+  position: absolute;
+  background-color: #fff;
+  top:0;
+  z-index: 200;
+}
+.discount .panel1{
+  width:100%;
+  height:93rpx;
+  line-height: 93rpx;
+  text-align: center;
+  font-size:24rpx;
+  background-color: #D2D2D2;
+}
+
+.discount .panel2{
+  width:690rpx;
+  border-radius: 14rpx;
+  background-color: #fff;
+  border:1rpx solid #D2D2D2;
+  margin-top: 40rpx;
+  justify-content: flex-start;
+}
+
+.discount .panel21{
+  width:150rpx;
+  height:179rpx;
+  line-height:179rpx;
+  border-top-left-radius: 14rpx;
+  border-bottom-left-radius: 14rpx;
+  background-color: #FFDD0C;
+  font-size:48rpx;
+  text-align: center;
+}
+
+.discount .panel22{
+  align-items: flex-start;
+  font-size:24rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+
+.discount .panel221{
+  font-weight: 500;
+  margin-bottom: 20rpx;
+}
+.discount .panel222{
+  color:#787878;
+}
+
+.discount .panel3{
+  width:100%;
+  position: fixed;
+  bottom: 0;
+}
+.discount .line1{
+  width:100%;
+  height:20rpx;
+  background-color: #D2D2D2;
+}
+.discount .panel31{
+  width:100%;
+  height:110rpx;
+  background-color: #FFFFFF;
+  line-height: 110rpx;
+  font-size:36rpx;
+  font-weight: 400;
+  text-align: center;
+}
+
+.panelNull{
+  margin-top: 360rpx;
+  font-size:48rpx;
+  text-align: center;
+}
+.panelNull2{
+  margin-top: 30rpx;
+  font-size:24rpx;
+  font-weight: 400;
+}

package4/main/payfinish.js

@@ -0,0 +1,62 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+  },
+  onLoad: function (options) {
+    var paytype = options.paytype;
+    this.setData({
+      Containnerheight: common.getSystemHeight(),
+      Paytype: paytype
+    });
+    wx.showLoading({
+      title: '请勿退出',
+      mask:true,
+    }); 
+    setTimeout(function(){
+      wx.hideLoading();
+    },5000);
+
+    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;
+    }
+  }, 
+  gotoDefault: function() {
+    wx.redirectTo({
+      url: "../../pages/main/default",
+    });
+  },
+  goto: function () {
+    if (this.data.Paytype == "3") {
+      wx.redirectTo({
+        url: "./limited",
+      });
+    }
+    if (this.data.Paytype == "4") {
+      wx.redirectTo({
+        url: "./activate",
+      });
+    }
+    if (this.data.Paytype == "5") {
+      wx.redirectTo({
+        url: "./giftlist",
+      });
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: app.globalData.SharePath + '?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: app.globalData.ShareImage,
+    }
+  },
+})

package4/main/payfinish.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "微信支付",
+  "navigationBarBackgroundColor": "#ffffff",
+  "navigationBarTextStyle": "black",
+  "backgroundColor": "#F0F0F0"
+}

package4/main/payfinish.wxml

@@ -0,0 +1,22 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <image src='../images/universalpic_select_on_green_100x100.png' class="universalpic_select_on_green_100x100" />
+
+  <view class='text1'>
+    付款完成
+  </view>
+
+  <view class='text2' wx:if="{{Paytype=='3' || Paytype=='5'}}" bindtap='gotoDefault'>
+    前往首页
+  </view>
+
+  <view class='panel1 FlexRow' wx:if="{{Paytype=='4'}}">
+    <image src='../images/universalpic_attention_gray_50x50.png' class="universalpic_attention_gray_50x50" />
+    <view>套装产品必须激活才能使用</view>
+  </view>
+
+  <view class='footer FlexRow' bindtap='goto'>
+    <block wx:if="{{Paytype=='3'}}">查看使用有效期</block>
+    <block wx:if="{{Paytype=='4'}}">去激活</block>
+    <block wx:if="{{Paytype=='5'}}">查看我的礼品卡</block>
+  </view>
+</view>

package4/main/payfinish.wxss

@@ -0,0 +1,51 @@
+.container {
+  background-color: #f0f0f0;
+  color: #1e1e1e;
+  font-weight: 500;
+}
+
+.universalpic_select_on_green_100x100 {
+  width: 100rpx;
+  height: 100rpx;
+  top: 190rpx;
+  position: fixed;
+}
+
+.text1{
+  font-size: 64rpx;
+  top:320rpx;
+  position: fixed;
+}
+
+.text2{
+  position: fixed;
+  bottom:284rpx;
+  font-size:28rpx;
+  color:#B3443B;
+  text-decoration: underline;
+}
+
+.panel1{
+  position: fixed;
+  bottom:275rpx;
+  font-size:36rpx;
+  font-weight: 400;
+}
+
+.universalpic_attention_gray_50x50{
+  width: 50rpx;
+  height: 50rpx;
+  margin-right: 20rpx;
+}
+
+.footer{
+  width: 100%;
+  height: 140rpx;
+  position: fixed;
+  bottom: 0;
+  line-height: 140rpx;
+  font-size:48rpx;
+  color:#fff;
+  text-align: center;
+  background-color: #03AF69;
+}