1.1.0

app.js

@@ -11,7 +11,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    Version: "1.0.1",
+    Version: "1.1.0",
     IsProduction: false,
     ProgramID: 106,
     AppID: "wx313a8f2c0741efe1",

app.json

@@ -1,6 +1,7 @@
 {
   "pages": [
     "pages/index/index",
+    "pages/index/activate",
     "pages/main/list",
     "pages/main/detail",
     "pages/main/search",
@@ -10,6 +11,8 @@
     "pages/about/payfinished",
     "pages/about/paylist",
     "pages/about/newuserlist",
+    "pages/about/orderlist",
+    "pages/about/membercenter",
     "pages/main/index"
   ],
   "window": {

pages/about/membercenter.js

@@ -0,0 +1,132 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+
+Page({
+  data: {
+    IsAccredit:false,
+  },
+  onLoad: function (options) {
+
+    var member="非会员";
+    if (app.globalData.userInfo.IsMember==1)
+      member = "付费会员";
+
+    this.setData({
+      Height: common.getSystemHeight(),
+      Member:member,
+    });
+    
+    
+
+    this.init();
+  },
+  init:function(){
+    var that = this;
+    server.getData('GetWXUsersAllTime?ProductID=' + app.globalData.ProgramID+'&UserID=' + app.globalData.userInfo.UserID, function (data) {
+      if (data) {
+        that.setData({
+          ProductList: data,
+        });
+      }
+    });
+
+    wx.getSetting({
+      success(res) {
+        if (res.authSetting['scope.userInfo']) {
+          that.setData({
+            IsAccredit: true,
+          });
+        }
+      }
+    });
+  },
+  gotoPaylist:function(){
+    wx.navigateTo({
+      url: '../about/paylist',
+    });
+  },
+  getAccredit: function () {
+    if (!this.data.IsAccredit) {
+      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();
+                  }
+                });
+              }
+            })
+          }
+        }
+      })
+    }
+  },
+  //得到用户信息
+  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.hasGetShareInfo(app.globalData.userInfo);
+            that.setData({
+              IsAccredit: true,
+              NickName: app.globalData.userInfo.NickName,
+              AvatarUrl: app.globalData.userInfo.AvatarUrl
+            });
+
+            app.globalData.userInfo.Code = res0.code;
+            app.globalData.userInfo.iv = res.iv;
+            app.globalData.userInfo.encryptedData = res.encryptedData;
+            that.login(app.globalData.userInfo);
+          },
+          fail: function (res) {
+            
+          }
+        });
+      },
+      fail: function () {
+      }
+    });
+  },
+  login: function (param) {
+    var that = this;
+    server.postData('HanziLogin', {
+      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) {
+
+    });
+    
+  },
+})

pages/about/membercenter.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "会员中心",
+  "backgroundColor": "#F0F0F0",
+  "enablePullDownRefresh": false
+}

pages/about/membercenter.wxml

@@ -0,0 +1,81 @@
+<view class="container FlexColumn" style='height:{{Height}}rpx;'>
+  <view class="title0" bindtap="getAccredit" wx:if="{{!IsAccredit}}">
+    为保障您的消费权益，在购买后请尽快授权用户信息！
+  </view>
+  <view class="title1">
+    <view class="title1_1">会员信息</view>
+  </view>
+  <view class="title3 FlexRow" bindtap="getAccredit" wx:if="{{!IsAccredit}}">
+    <view class="title2_1 FlexColumn">
+      <view class="red">授权用户信息</view>
+      <view class="title3_2">授权后才能正常使用统计、套装、礼品卡等功能</view>
+    </view>
+    <view class="title2_2 FlexRow">
+      <image src='../../images/Arrow.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="line FlexColumn">
+    <view class="line1"></view>
+  </view>
+  <view class="title2 FlexRow">
+    <view class="title2_1 FlexColumn">
+      <view>用户身份</view>
+    </view>
+    <view class="title2_2 FlexRow">
+      {{Member}}
+    </view>
+  </view>
+  <view class="line FlexColumn">
+    <view class="line1"></view>
+  </view>
+  <view class="title2_5 title2 FlexRow">
+    <view class="title2_4 title2_1 FlexColumn">产品有效期</view>
+  </view>
+  <view class="title2_3 title2 FlexRow" wx:for="{{ProductList}}" wx:key="index">
+    <view class="title2_1">
+      {{item.Name}}
+    </view>
+    <view class="title2_2">
+      {{item.Time}}
+    </view>
+  </view>
+  <view class="line2"></view>
+
+  <view class="title1">
+    <view class="title1_1">消费记录</view>
+  </view>
+
+  <view class="title2 FlexRow" bindtap='gotoPaylist'>
+    <view class="title2_1 FlexColumn">
+      <view>我的订单</view>
+    </view>
+    <view class="title2_2 FlexRow">
+      <image src='../../images/Arrow.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="line FlexColumn">
+    <view class="line1"></view>
+  </view>
+
+  <!-- <view class="title2 FlexRow">
+    <view class="title2_1 FlexColumn">
+      <view>优惠券</view>
+    </view>
+    <view class="title2_2 FlexRow">
+      <view class="number">1</view>
+      <image src='../../images/Arrow.png' class="Arrow" />
+    </view>
+  </view>
+  <view class="line FlexColumn">
+    <view class="line1"></view>
+  </view>
+  <view class="title2 FlexRow">
+    <view class="title2_1 FlexColumn">
+      <view>礼品卡</view>
+    </view>
+    <view class="title2_2 FlexRow">
+      <view class="number">34</view>
+      <image src='../../images/Arrow.png' class="Arrow" />
+    </view>
+  </view> -->
+</view>

pages/about/membercenter.wxss

@@ -0,0 +1,110 @@
+.container {
+  background-color: #F0F0F0;
+  justify-content: flex-start;
+  font-weight: 500;
+  color:#1e1e1e;
+  overflow-x:hidden;
+}
+
+.title0 {
+  width: 100%;
+  height: 73rpx;
+  background-color: #A63917;
+  color:#fff;
+  font-size:24rpx;
+  text-align: center;
+  line-height: 73rpx;
+}
+.title1 {
+  width: 100%;
+  height: 125rpx;
+  background-color: #F0F0F0;
+}
+
+.title1_1 {
+  margin: 50rpx 0 0 30rpx;
+  font-size: 32rpx;
+}
+
+.title2 {
+  width: 100%;
+  background-color: #FFFFFF;
+  font-size: 28rpx;
+  height: 100rpx;
+  justify-content: space-between;
+  font-weight: 400;
+}
+
+.title2_1 {
+  margin-left: 30rpx;
+  align-items: flex-start;
+}
+
+.title2_1 .red{
+  color:#A20602;
+  font-weight: 500;
+}
+
+.title2_2 {
+  margin-right: 30rpx;
+}
+
+.title2_3{
+  height:40rpx;
+  font-size:24rpx;
+}
+.title2_4{
+  margin-top: 30rpx;
+  font-size:28rpx;
+}
+.title2_5{
+  height:70rpx;
+}
+
+.Arrow {
+  width: 16rpx;
+  height: 26rpx;
+  margin: 0 0 0 30rpx;
+}
+
+.title3 {
+  width: 100%;
+  background-color: #FFFFFF;
+  font-size: 28rpx;
+  height: 139rpx;
+  justify-content: space-between;
+  font-weight: 400;
+}
+
+.title3_2 {
+  font-size: 24rpx;
+}
+
+.line {
+  width: 100%;
+  height: 2rpx;
+  background-color: #F8F8F8;
+  align-items: flex-end;
+}
+
+.line1 {
+  width: 720rpx;
+  height: 1rpx;
+  background-color: #E3E3E3;
+}
+.line2 {
+  width: 100%;
+  height: 30rpx;
+  background-color: #fff;
+}
+
+.number{
+  background-color: #A20602;
+  width:53rpx;
+  height:40rpx;
+  line-height: 40rpx;
+  border-radius: 8rpx;
+  text-align: center;
+  color:#ffffff;
+  font-size: 24rpx;
+}

pages/about/orderlist.js

@@ -0,0 +1,126 @@
+import common from '../../utils/util';
+import server from '../../utils/main';
+
+const app = getApp();
+var isPaying = false;
+
+Page({
+  data: {
+    ListProgram: [
+      {
+        ID: 89,
+        Name: "数学口算练习",
+        Remark: "一款原价19.90元，有效期6个月",
+        Price: 1990,
+        Remark2: "",
+        Image: "06009",
+        IsSelect: true,
+      }, {
+        ID: 99,
+        Name: "英语自然拼读",
+        Remark: "一款原价19.80元，有效期6个月",
+        Price: 1980,
+        Remark2: "成套购买赠永久有效期",
+        Image: "06006",
+        IsSelect: true,
+      }, {
+        ID: 98,
+        Name: "语文汉语拼音",
+        Remark: "一款原价9.90元，有效期6个月",
+        Price: 990,
+        Remark2: "成套购买赠永久有效期",
+        Image: "06007",
+        IsSelect: true,
+      }, {
+        ID: 106,
+        Name: "语文识字",
+        Remark: "一款原价9.80元，有效期6个月",
+        Price: 980,
+        Remark2: "成套购买赠永久有效期",
+        Image: "06008",
+        IsSelect: true,
+      },
+    ],
+  },
+  onLoad: function (options) {
+    this.selectProgram();
+  },
+  selectProgram: function (e) {
+    var id = 0;
+    if (e) {
+      id = e.currentTarget.dataset.id;
+    }
+    var total = 0, totalFinal = 0, 
+    selectCount = 0, discounts = 0;
+    for (var i = 0; i < this.data.ListProgram.length; i++) {
+      if (this.data.ListProgram[i].ID == id) {
+        this.data.ListProgram[i].IsSelect = !this.data.ListProgram[i].IsSelect;
+      }
+
+      if (this.data.ListProgram[i].IsSelect) {
+        total += this.data.ListProgram[i].Price;
+        selectCount++;
+      }
+    }
+
+    var discount = 1;
+    if (selectCount >= 3) {
+      discount = 0.6
+    }
+    else if (selectCount == 2) {
+      discount = 0.7
+    }
+
+    totalFinal = total * discount;
+    discounts = total - totalFinal;
+
+    total = Math.round(total) / 100;
+    totalFinal = Math.round(totalFinal) / 100;
+    discounts = Math.round(discounts) / 100;
+
+    var remark="一款原价，成套购买更划算";
+    if (discount<1)
+      remark = "套装购买现享 " + (discount * 10) + " 折，已优惠 " + discounts+" 元"
+
+    this.setData({
+      ListProgram: this.data.ListProgram,
+      TotalFinal: totalFinal,
+      Remark: remark,
+      Total:total,
+      Discount: discount,
+    });
+
+  },
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
+  getPay: function (e) {
+    if (!isPaying) {
+      isPaying = true;
+      var that = this;
+      var money = this.data.TotalFinal;
+      var detail="";
+      for (var i = 0; i < this.data.ListProgram.length;i++){
+        if (this.data.ListProgram[i].IsSelect){
+          detail += ","+this.data.ListProgram[i].ID + ":" + this.data.ListProgram[i].Price * this.data.Discount;
+        }
+      }
+      detail=detail.substr(1);
+      server.payMoney(4,money,detail, function (data) {
+        wx.navigateTo({
+          url: '../about/payfinished',
+        });
+      });
+      setTimeout(function () {
+        isPaying = false;
+      }, 10000);
+    }
+  },
+  onShareAppMessage: function () {
+    return {
+      title: app.globalData.ShareTitle,
+      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
+      imageUrl: '../../images/07001.png',
+    }
+  },
+})

pages/about/orderlist.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarBackgroundColor": "#F0F0F0",
+  "navigationBarTitleText": "订单",
+  "backgroundColor": "#F0F0F0",
+  "enablePullDownRefresh": false
+}

pages/about/orderlist.wxml

@@ -0,0 +1,53 @@
+<view class="container FlexColumn">
+  <view class="panel1 FlexColumn">
+    <image src="../../images/06005.png" class="img06005" />
+
+  </view>
+  <view class="panel2 FlexColumn">
+    <view class="panelItem FlexRow" wx:for="{{ListProgram}}" wx:key="index" bindtap='selectProgram' data-id="{{item.ID}}">
+      <image src="../../images/SelectYes.png" class="SelectImg" wx:if="{{item.IsSelect}}" />
+      <image src="../../images/SelectNo.png" class="SelectImg" wx:if="{{!item.IsSelect}}" />
+      <image src="../../images/{{item.Image}}.png" class="img06009" />
+      <view class="text FlexColumn">
+        <view class="text1">{{item.Name}}</view>
+        <view class="text2">{{item.Remark}}</view>
+        <view class="text3" wx:if="{{item.Remark2}}">{{item.Remark2}}</view>
+      </view>
+    </view>
+  </view>
+
+  <view class="bottom FlexColumn">
+    <view class="text0 FlexRow" bindtap='gotoFeedback'>
+      <view>如遇支付问题请</view>
+      <view class="red">联系客服</view>
+      <view>为您处理</view>
+    </view>
+    <view class="bottom1 FlexColumn">
+      <view class="top FlexRow" wx:if="{{Total>0}}">
+        <view class="left">
+          {{TotalFinal}}元
+        </view>
+        <view class="right FlexColumn">
+          <view class="text3 text2 FlexRow">原价
+            <view class="total">{{Total}}</view> 元</view>
+          <view class="text2">{{Remark}}</view>
+        </view>
+      </view>
+      <view class="top FlexRow" wx:if="{{Total==0}}">
+        <view class="left2 left">
+          0.00元
+        </view>
+        <view class="right FlexColumn">
+          <view class="text3 text2 FlexRow"></view>
+          <view class="text2">请选择商品</view>
+        </view>
+      </view>
+      <view class="btn" bindtap="getPay" wx:if="{{Total>0}}" >
+        <view class="btn1">立即购买</view>
+      </view>
+      <view class="btn5 btn" wx:if="{{Total==0}}">
+        <view class="btn4 btn1">立即购买</view>
+      </view>
+    </view>
+  </view>
+</view>

pages/about/orderlist.wxss

@@ -0,0 +1,188 @@
+.container {
+  background-color: #F0F0F0;
+  justify-content: flex-start;
+  color: #872439;
+  font-weight:500;
+}
+
+.panel1{
+  width: 100%;
+  justify-content: flex-start;
+  
+}
+.panel1 .img06005{
+  width:100%;
+  height:81rpx;
+}
+
+.panel2{
+  width: 100%;
+  background-color: #f0f0f0;
+  justify-content: flex-start;
+}
+.panel2 .panelItem{
+  width: 100%;
+  min-height:160rpx;
+  background-color: #fff;
+  margin-bottom: 1rpx;
+  justify-content: flex-start;
+  align-items: flex-start;
+}
+.panel2 .SelectImg{
+  width: 40rpx;
+  height:40rpx;
+  margin-left: 40rpx;
+  margin-top: 60rpx;
+}
+.panel2 .img06009{
+  width: 80rpx;
+  height:80rpx;
+  margin-left: 50rpx;
+  margin-top: 40rpx;
+}
+
+.panel2 .text{
+  margin-left: 30rpx;
+  align-items: flex-start;
+  margin-top: 40rpx;
+}
+
+.panel2 .text1{
+  font-size: 32rpx;
+  font-weight: 500;
+}
+.panel2 .text2{
+  font-size: 24rpx;
+  font-weight: 400;
+  color:#787878;
+}
+
+.panel2 .text3{
+  width:260rpx;
+  height:50rpx;
+  line-height: 50rpx;
+  text-align: center;
+  font-weight: 500;
+  color:#1E1E1E;
+  border-radius: 6rpx;
+  font-size:22rpx;
+  background-color: #FFEC89;
+  margin-top: 10rpx;
+  margin-bottom: 40rpx;
+}
+
+.container .bottom{
+  width:100%;
+  position: fixed;
+  bottom:0;
+  background-color: #F0F0F0;
+  justify-content: flex-end;
+  z-index: 100;
+}
+
+.bottom .contact {
+  padding-left: 0;
+  padding-right: 0;
+  background-color: #F0F0F0;
+  width:100%;
+  margin: 12rpx 0 12rpx 0;
+}
+
+.bottom .contact::after {
+  border: 0px;
+}
+
+.bottom .text0 {
+  font-size: 22rpx;
+  font-weight: 400;
+  height:80rpx;
+}
+
+.bottom .text0 .red {
+  color: #a20602;
+  font-weight: 600;
+  text-decoration: underline;
+}
+
+
+.bottom .left{
+  margin-left: 50rpx;
+  align-items: flex-start;
+}
+
+
+.bottom .bottom1{
+  width:100%;
+  height:230rpx;
+  background-color: #F77706;
+  text-align: center;
+  font-size: 48rpx;
+  color: #fff;
+  position: relative;
+}
+
+
+.bottom .top{
+  width:100%;
+  color: #fff;
+  justify-content: space-between;
+  font-size: 24rpx;
+}
+
+.bottom .left{
+  margin-left: 50rpx;
+  font-size: 64rpx;
+  font-weight: 400;
+  text-align: left;
+  height:90rpx;
+  line-height: 90rpx;
+}
+
+.bottom .left2{
+  font-size: 48rpx;
+}
+
+.bottom .right{
+  margin-right: 50rpx;
+  align-items: flex-end;
+  justify-content: flex-end;
+  min-height: 55rpx;
+}
+.bottom .text2{
+  font-size: 24rpx;
+  font-weight: 400;
+}
+.bottom .text3{
+  color:#7D2B25;
+}
+.bottom .total{
+  text-decoration:line-through; 
+}
+
+.bottom .btn {
+  width: 690rpx;
+  height: 100rpx;
+  background-color: #E1600A;
+  border-radius: 10rpx;
+  margin-top: 10rpx;
+}
+.bottom .btn1 {
+  width: 100%;
+  height: 90rpx;
+  line-height: 90rpx;
+  background-color: #FFDD0C;
+  border-radius: 10rpx;
+  position:relative;
+  top:0;
+  font-size: 36rpx;
+  color: #1E1E1E;
+}
+
+.bottom .btn4 {
+  background-color: #4D4D4D;
+  color:#787878;
+}
+
+.bottom .btn5 {
+  background-color: #262626;
+}

pages/about/payfinished.js

@@ -7,8 +7,18 @@ Page({
   data: {
   },
   onLoad: function (options) {
+    var text1= "请确认购买记录";
+    var text2 = "查看我的订单";
+    if (options && options.type=="all"){
+      text1 = "套装产品必须逐个激活";
+      text2 = "赶紧去激活";
+    }
+
     this.setData({
       Height: common.getSystemHeight(),
+      Text1:text1,
+      Text2:text2,
+      OrderType: options.type,
     });
   },
   deblocking: function () {

pages/about/payfinished.wxml

@@ -1,20 +1,21 @@
 <view class="container FlexColumn" style='height:{{Height}}rpx;'>
   <image src="../../images/06003.png" class="bg" />
-  <text class="text1">感谢购买\n直接解锁小程序或看看别的 ^_^</text>
-  <view class="btn" bindtap="deblocking">
-    <view class="btn1">直接解锁</view>
+  <text class="text1">感谢购买</text>
+  <text class="text1_1">{{Text1}}</text>
+
+  <view class="btn" bindtap="gotoPayList">
+    <view class="btn1">{{Text2}}</view>
   </view>
   <text class="text2">注意：如遇网络问题未能解锁，请清理手机内存并重新打开微信小程序，一般即可恢复正常。如仍未解决，可通过首页底部“意见反馈”联系我们为您处理。</text>
-  <view class="line2"></view>
-  <view class="text3 FlexRow" bindtap="gotoPayList">
-    <image src="../../images/Triangle.png" class="Triangle" />
-    <view>查看购买记录</view>
-  </view>
-  <view class="text4">
-    想要获得永久有效期？
-  </view>
-  <view class="text5 text3 FlexRow"  bindtap="gotoNewUserList">
-    <image src="../../images/Triangle.png" class="Triangle" />
-    <view>告诉我怎么做</view>
-  </view>
+
+  <block wx:if="{{OrderType!='all'}}">
+    <view class="line2"></view>
+    <view class="text4">
+      想要获得永久有效期？
+    </view>
+    <view class="text5 text3 FlexRow" bindtap="gotoNewUserList">
+      <image src="../../images/Triangle.png" class="Triangle" />
+      <view>告诉我怎么做</view>
+    </view>
+  </block>
 </view>

pages/about/payfinished.wxss

@@ -6,8 +6,8 @@
 }
 
 .bg{
-  width: 639rpx;
-  height:521rpx;
+  width: 100%;
+  height:769rpx;
   position: fixed;
   bottom: 0;
   left:0;
@@ -19,13 +19,19 @@
   margin-top: 132rpx;
 }
 
+.text1_1{
+  font-size:44rpx;
+  text-align: center;
+  margin-top: 10rpx;
+}
+
 
 .btn {
   width: 600rpx;
   height: 104rpx;
   background-color: #035834;
   border-radius: 14rpx;
-  margin-top: 110rpx;
+  margin-top: 88rpx;
 }
 
 .btn1 {
@@ -45,13 +51,15 @@
   font-size:22rpx;
   width:560rpx; 
   margin-top: 50rpx;
+  z-index: 10;
 }
 
 .line2{
   width: 600rpx;
   height:3rpx;
   background-color: #593613;
-  margin-top:80rpx;
+  margin-top:360rpx;
+  z-index: 10;
 }
 
 

pages/about/paylist.js

@@ -6,8 +6,13 @@ const app = getApp();
 Page({
   data: {
     PayList: [],
+    IsActive: false,
   },
   onLoad: function (options) {
+    //测试*****************
+    if (!app.globalData.userInfo)
+      app.globalData.userInfo = { UserID: 4 };
+
     this.setData({
       Height: common.getSystemHeight(),
     });
@@ -15,22 +20,71 @@ Page({
   },
   init: function () {
     var that = this;
-    server.getData('GetHanziUserPayInfoList?UserID=' + app.globalData.userInfo.UserID, function (data) {
-      if (data) {
-        var list = [];
-        for (var i = data.List.length - 1; i >= 0; i--) {
-          list.push(data.List[i]);
+    server.getLocalHost(function () {
+      server.getData('GetWXUsersAllPayInfo?UserID=' + app.globalData.userInfo.UserID, function (data) {
+        if (data) {
+          
+          for (var i = 0; i < data.length; i++) {
+            for (var j = 0; j < data[i].List.length; j++) {
+              data[i].List[j].isShowActivty = false;
+              if (data[i].List[j].Status == 0) {
+                data[i].List[j].isShowActivty = true;
+              }
+            }
+          }
+          that.setData({
+            PayList: data,
+          });
         }
-        var serviceTime = data.ProductServiceTime;
-        if (serviceTime == "2099年12月31日")
-          serviceTime = "永久有效";
+      });
+    });
+  },
+  gotoActive: function (e) {
+    var that = this;
+    var productid = e.currentTarget.dataset.productid;
+    var list = server.getProgramList();
+    for (var i = 0; i < list.length; i++) {
+      if (productid == list[i].ID) {
+        var path = list[i].path;
+        path += "&ProductBuyInfoID=" + e.currentTarget.dataset.id;
+        path += "&ProductID=" + app.globalData.ProgramID;
+        path += "&ProductUserID=" + app.globalData.userInfo.UserID;
+        path += "&BuyType=" + e.currentTarget.dataset.buytype;
+
+        wx.navigateToMiniProgram({
+          appId: list[i].appId,
+          path: path,
+          success(res) {
+            
+          }
+        });
 
+        var data = this.data.PayList;
+        for (var i = 0; i < data.length; i++) {
+          for (var j = 0; j < data[i].List.length; j++) {
+            if (data[i].List[j].ProductID == productid) {
+              data[i].List[j].isShowActivty = false;
+            }
+          }
+        }
         that.setData({
-          ProductServiceTime: serviceTime,
-          PayList: list,
+          PayList: data,
         });
+
+        break;
       }
+    }
+  },
+  refresh: function () {
+    var that = this;
+    wx.showLoading({
+      title: '加载中',
     });
+    
+    setTimeout(function () {
+      wx.hideLoading();
+      that.init();
+    }, 1000);
   },
   onShareAppMessage: function () {
     return {

pages/about/paylist.json

@@ -1,6 +1,6 @@
 {
   "navigationBarBackgroundColor": "#F5E2BE",
-  "navigationBarTitleText": "购买记录",
+  "navigationBarTitleText": "我的订单",
   "backgroundColor": "#F5E2BE",
   "enablePullDownRefresh": false
 }

pages/about/paylist.wxml

@@ -1,31 +1,57 @@
-<view class="container FlexColumn" style='height:{{Height}}rpx;'>
+<view class="container FlexColumn" style='min-height:{{Height}}rpx;'>
   <block wx:if="{{PayList.length>0}}">
-    <view class="text2 text1">购买后如不能正常使用，请清理内存后重启微信并打开小程序，</view>
-    <button class="contact" open-type="contact">
-      <view class="text1 FlexRow">
-        <view>一般问题即可解决。也可通过“</view>
-        <view class="red">意见反馈</view>
-        <view>”联系我们为您处理。</view>
-      </view>
-    </button>
-    <view class="text3">有效期</view>
-    <view class="text4">{{ProductServiceTime}}</view>
-    <view class="panel1">
-      <view class="item FlexRow" wx:for="{{PayList}}" wx:key="index">
+    <view class="text0" wx:if="{{IsShowActivty}}">
+      您购买的产品未激活，请尽快处理！
+    </view>
+    <view class="text1">购买后如不能正常使用，请清理内存后重启微信并打开小程序，</view>
+    <view class="text2 FlexRow">
+      <view>一般问题即可解决。也可通过“</view>
+      <view class="red">意见反馈</view>
+      <view>”联系我们为您处理。</view>
+    </view>
+    <view class="panel1 FlexColumn" wx:for="{{PayList}}" wx:key="index">
+      <view class="item0 item FlexRow">
         <view class="left FlowColumn">
-          <view class="title1">
-            {{item.Title}}
+          <view class="title0 FlexRow">
+            <view class="title0_1">支付时间</view>
+            <view>{{item.PayEndTime}}</view>
+          </view>
+          <view class="title0 FlexRow">
+            <view class="title0_1">交易单号</view>
+            <view>{{item.TradeNo}}</view>
           </view>
-          <view class="title2">
-            {{item.Time}}
+        </view>
+        <view class="right2 right">{{item.MoneyTotal}}</view>
+      </view>
+      <view class="panel2 FlexColumn" wx:for="{{item.List}}" wx:key="i" wx:for-item="itemChild" wx:for-index="i">
+        <view class="item FlexRow">
+          <view class="left FlexRow">
+            <image src='../../images/{{itemChild.ImageName}}.png' class="img" />
+            <view class="title1">
+              {{itemChild.ProductName}}
+            </view>
+            <view class="title2">
+              [{{itemChild.PayTypeName}}]
+            </view>
           </view>
+          <view class="right">
+            <view wx:if="{{itemChild.Status==1}}">{{itemChild.Money}}</view> 
+            <view class="btn" wx:if="{{itemChild.Status==0 && itemChild.isShowActivty}}" bindtap="gotoActive" data-id='{{itemChild.ID}}' data-productid='{{itemChild.ProductID}}' data-buytype='{{itemChild.BuyType}}' >
+              <view class="btn1">去激活</view>
+            </view>
+            <view class="btn2 btn" wx:if="{{itemChild.Status==0  && !itemChild.isShowActivty}}" bindtap="refresh">
+              <view class="btn3 btn1">刷新</view>
+            </view>
+          </view>
+        </view>
+        <view class="line FlexRow" wx:if="{{i<item.List.length-1}}">
+          <view class="line2"></view>
         </view>
-        <view class="right">{{item.PayMoney}}</view>
       </view>
     </view>
   </block>
   <block wx:if="{{PayList.length==0}}">
-    <view class="title0">无记录</view>
+    <view class="titleNull">无记录</view>
   </block>
-  
+
 </view>

pages/about/paylist.wxss

@@ -5,14 +5,14 @@
   font-weight: 500;
 }
 
-.contact {
-  padding-left: 0;
-  padding-right: 0;
-  background-color: #f0f0f0;
-}
-
-.contact::after {
-  border: 0px;
+.text0 {
+  width: 100%;
+  height: 73rpx;
+  background-color: #A63917;
+  color:#fff;
+  font-size:24rpx;
+  text-align: center;
+  line-height: 73rpx;
 }
 
 .text1 {
@@ -20,14 +20,18 @@
   font-weight: 400;
   width: 690rpx;
   text-align: left;
-  justify-content: flex-start;
+  margin-top: 40rpx;
 }
 
 .text2 {
-  margin-top: 50rpx;
+  font-size: 24rpx;
+  font-weight: 400;
+  width: 690rpx;
+  justify-content: flex-start;
+  margin-bottom: 40rpx;
 }
 
-.text1 .red {
+.text2 .red {
   color: #a20602;
   font-weight: 500;
   text-decoration: underline;
@@ -37,7 +41,7 @@
   font-size: 32rpx;
   width: 690rpx;
   text-align: left;
-  margin-top: 40rpx;
+  margin-top: 140rpx;
 }
 
 .text4 {
@@ -49,15 +53,14 @@
 
 .panel1 {
   width: 100%;
-  margin-top: 40rpx;
+  margin-bottom: 40rpx;
   background-color: #fff;
+  border-bottom: 1rpx solid #D2D2D2;
 }
 
-.item {
-  width: 100%;
-  justify-content: space-between;
-  height: 132rpx;
-  border-bottom: 1rpx solid #f0f0f0;
+.item0 {
+  height: 138rpx;
+  border-bottom: 1rpx solid #E3E3E3;
 }
 
 .left {
@@ -66,23 +69,88 @@
 
 .right {
   margin-right: 30rpx;
-  font-size: 32rpx;
+  font-size: 28rpx;
+  color:#9B9B9B;
+}
+.right2 {
+  font-size: 56rpx;
+  color:#1e1e1e;
+}
+
+.title0 {
+  font-size: 20rpx;
+  text-align: left;
+  justify-content: flex-start;
+}
+
+.title0_1{
+  color:#9B9B9B;
+  margin-right: 10rpx;
+}
+.panel2{
+  width: 100%;
+}
+.item {
+  width: 100%;
+  justify-content: space-between;
+  height: 111rpx;
+}
+
+.img {
+  width:50rpx;
+  height:50rpx;
+  margin-right: 20rpx;
 }
 
 .title1 {
   font-size: 28rpx;
   text-align: left;
+  margin-right: 10rpx;
 }
 
 .title2 {
-  font-size: 24rpx;
+  font-size: 22rpx;
   text-align: left;
-  color: #787878;
-  font-weight: 400;
+  color: #9B9B9B;
 }
 
-.title0 {
+.panel2 .line{
+  width: 100%;
+  justify-content: flex-end;
+}
+.panel2 .line2{
+  width: 720rpx;
+  height: 1rpx;
+  background-color: #E3E3E3; 
+}
+
+.titleNull {
   font-size: 36rpx;
   color: #787878;
   margin-top: 522rpx;
 }
+
+.btn {
+  width: 136rpx;
+  height: 70rpx;
+  background-color: #A63917;
+  border-radius: 8rpx;
+}
+.btn1 {
+  width: 100%;
+  height: 60rpx;
+  background-color: #EA413A;
+  border-radius: 8rpx;
+  color:#fff;
+  text-align: center;
+  line-height: 60rpx;
+  font-size:32rpx;
+  position:relative;
+  top:0;
+}
+.btn2 {
+  background-color: #146392;
+}
+.btn3 {
+  background-color: #169DED;
+}

pages/index/activate.js

@@ -0,0 +1,29 @@
+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(),
+    });
+  },
+  updateData: function (param) {
+    var that = this;
+    server.getData('UpdateWXUsersAll?ProductID=' + param.ProductID
+      + "&ProductUserID=" + param.ProductUserID
+      + "&CurrentProductID=" + param.CurrentProductID
+      + "&CurrentUserID=" + param.CurrentUserID
+      + "&ProductBuyInfoID=" + param.ProductBuyInfoID
+      + "&BuyType=" + param.BuyType, function (data) {
+        if (data) {
+
+        }
+      });
+  },
+})

pages/index/activate.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarBackgroundColor": "#F5E2BE",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "激活",
+  "backgroundColor": "#F5E2BE",
+  "backgroundTextStyle": "light",
+  "disableScroll": true,
+  "enablePullDownRefresh": false
+}

pages/index/activate.wxml

@@ -0,0 +1,9 @@
+<view class="container FlexColumn" style='height:{{Height}}rpx;'>
+  <image src="../../images/06003.png" class="bg" />
+  <image src="../../images/06011.gif" class="hand" />
+  <text class="text1">语文识字\n激活成功</text>
+  <text class="text2">最后一步\n点击右上角圆圈</text>
+  <text class="text3">关闭并返回购买记录查看结果</text>
+  <view class="line"></view>
+  <text class="text4">注意：激活后请关闭本小程序，尽快返回之前的购买记录，刷新检查激活结果。如还有其它产品待激活，请以相同步骤逐个进行操作。</text>
+</view>

pages/index/activate.wxss

@@ -0,0 +1,59 @@
+.container {
+  background-color: #F5E2BE;
+  justify-content: flex-start;
+  color: #1e1e1e;
+}
+
+.bg{
+  width:100%;
+  height:820rpx;
+  position: fixed;
+  bottom: 0;
+}
+.hand{
+  width:60rpx;
+  height:100rpx;
+  position: fixed;
+  right: 20rpx;
+  top:0rpx;
+}
+
+.text1{
+  margin-top: 125rpx;
+  font-size:36rpx;
+  width:217rpx;
+  text-align: center;
+  z-index: 10;
+}
+
+.text2{
+  margin-top: 100rpx;
+  font-size:44rpx;
+  width:308rpx;
+  text-align: center;
+
+  z-index: 10;
+}
+.text3{
+  font-size:36rpx;
+  text-align: center;
+  color:#7D2B25;
+
+  z-index: 10;
+}
+
+.line{
+  margin-top: 440rpx;
+  width:600rpx;
+  height:3rpx;
+  background-color: #593613;
+  z-index: 10;
+}
+
+.text4{
+  margin-top: 40rpx;
+  font-size:22rpx;
+  width:560rpx;
+  text-align: left;
+  z-index: 10;
+}

pages/index/index.js

@@ -32,6 +32,15 @@ Page({
         console.log("introducer:" + introducer);
         app.globalData.introducer = scene;
       }
+
+      if (options.ProductID) {
+        this.setData({
+          ProductID: options.ProductID,
+          ProductUserID: options.ProductUserID,
+          BuyType: options.BuyType,
+          ProductBuyInfoID: options.ProductBuyInfoID,
+        });
+      }
     }
     this.setData({
       Height: common.getSystemHeight(),
@@ -134,15 +143,26 @@ Page({
         }
         else {
           app.globalData.userInfo = data;
-          //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
           
-          that.getHanzi(function(){
+          if (that.data.ProductID) {
+            var url = "../index/activate?ProductID=" + that.data.ProductID
+              + "&ProductUserID=" + that.data.ProductUserID
+              + "&CurrentUserID=" + app.globalData.userInfo.UserID
+              + "&CurrentProductID=" + app.globalData.ProgramID
+              + "&ProductBuyInfoID=" + that.data.ProductBuyInfoID
+              + "&BuyType=" + that.data.BuyType;
+            wx.redirectTo({
+              url: url
+            });
+          }
+          else {
+            //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
             setTimeout(function () {
               wx.redirectTo({
                 url: '../main/index'
               })
             }, 2000);
-          });
+          }
         }
       });
 

pages/main/detail.js

@@ -119,6 +119,10 @@ Page({
       });
       wx.setStorageSync('IsHelpPosition1', 2);
     }
+
+    if (app.globalData.userInfo.NickName == "陌生用户")
+      wx.setStorageSync('IsRemindAccredit', 1);
+
   },
   submitData: function (content) {
     if (app.globalData.userInfo && app.globalData.userInfo.UserID) {

pages/main/detail.wxml

@@ -1,7 +1,7 @@
 <view class="container FlexColumn" style='height:{{Height}}rpx;'>
   <view class="main FlexColumn" bindtap='playAudio' data-click="true">
     <block wx:if="{{CurrentIndex<List.length-1}}">
-      <view class="pinyin" animation="{{animationDataWord}}">
+      <view class="pinyin">
         <block wx:if="{{ShowPinyin}}">
           {{List[CurrentIndex].Pinyin}}
         </block>
@@ -284,12 +284,12 @@
       </view>
       <view class="settingMenuBasic FlexColumn" bindtap='settingSort' data-id="false">
         <view class="word">课本一致</view>
-        <image class="SelectLogo" src="../../images/012.png" hidden="{{SelectedRandom}}" />
+        <image class="SelectLogo" src="../../images/SelectYes.png" hidden="{{SelectedRandom}}" />
       </view>
       <view style='height:2rpx'></view>
       <view class="settingMenuBasic FlexColumn" bindtap='settingSort' data-id="true">
         <view class="word">随机</view>
-        <image class="SelectLogo" src="../../images/012.png" hidden="{{!SelectedRandom}}" />
+        <image class="SelectLogo" src="../../images/SelectYes.png" hidden="{{!SelectedRandom}}" />
       </view>
     </block>
 
@@ -302,7 +302,7 @@
         <view style='height:2rpx'></view>
         <view class="settingMenuBasic FlexColumn" bindtap='settingSpeaker' data-id="{{index}}">
           <view class="word">{{item.name}}</view>
-          <image class="SelectLogo" src="../../images/012.png" hidden="{{!item.isShow}}" />
+          <image class="SelectLogo" src="../../images/SelectYes.png" hidden="{{!item.isShow}}" />
         </view>
       </block>
     </block>

pages/main/detail.wxss

@@ -73,7 +73,7 @@
   font-family: 'GB Pinyinok-C';
   font-weight: normal;
   font-style: normal;
-  height:88rpx;
+  height:110rpx;
 }
 
 .main .wordImage{

pages/main/index.js

@@ -32,15 +32,21 @@ Page({
       AvatarUrl: app.globalData.userInfo.AvatarUrl,
     });
 
-    if (app.globalData.userInfo && app.globalData.userInfo.NickName != "陌生用户") {
-      this.setData({
-        IsAccredit: true,
-      });
-    }
+    var that = this;
+    wx.getSetting({
+      success(res) {
+        if (res.authSetting['scope.userInfo']) {
+          that.setData({
+            IsAccredit: true,
+          });
+        }
+      }
+    })
 
     common.getStorageValue(this, "IsRemind", true, function () { });
 
     this.updateProgram();
+
   },
   onShow: function () {
     this.getData();
@@ -52,6 +58,18 @@ Page({
         wx.removeStorageSync('IsRemindAccredit');
       }
     }
+
+    if (wx.getStorageSync("indexNav")) {
+      var obj = {
+        currentTarget: {
+          dataset: {
+            id: 2,
+          }
+        }
+      }
+      this.selectNav(obj);
+      wx.removeStorageSync("indexNav");
+    }
   },
   getAccredit: function () {
     if (!this.data.IsAccredit) {
@@ -90,6 +108,7 @@ Page({
 
             app.globalData.userInfo.NickName = app.globalData.userInfo.nickName;
             app.globalData.userInfo.AvatarUrl = app.globalData.userInfo.avatarUrl;
+            
             // that.hasGetShareInfo(app.globalData.userInfo);
             that.setData({
               IsAccredit: true,
@@ -101,7 +120,6 @@ Page({
             app.globalData.userInfo.iv = res.iv;
             app.globalData.userInfo.encryptedData = res.encryptedData;
             that.login(app.globalData.userInfo);
-
           },
           fail: function (res) {
             //console.log("getUserInfo:fail");
@@ -143,8 +161,8 @@ Page({
         UserSource: app.globalData.userSource,
         SourceID: app.globalData.SourceID,
         LastUserSource: app.globalData.userSource,
+        iv:param.iv,
         encryptedData: param.encryptedData,
-        iv: param.iv,
       }, function (data) {
 
       });
@@ -293,10 +311,27 @@ Page({
     });
   },
   gotoPayList: function () {
+
+    if (this.data.IsMember == 0 && !this.data.IsFirstDay && this.data.NewUserNumber >= this.data.NewUserNumberMax){
+      this.setData({
+        IsMemberForeverRemind: 0,
+      });
+      wx.pageScrollTo({
+        scrollTop: 1380,
+      });
+    }
+    else{
+      this.gotoMemberCenter();
+    }
+  },
+  gotoMemberCenter: function () {
     wx.navigateTo({
-      url: '../about/paylist',
+      url: '../about/membercenter',
     });
   },
+  gotoFeedback: function () {
+    server.gotoFeedback();
+  },
   close: function () {
     this.setData({
       IsMemberForeverRemind: 2,
@@ -307,7 +342,7 @@ Page({
       isPaying = true;
       var that = this;
       var money = app.globalData.PayMoney;
-      server.payMoney(3, money, function () {
+      server.payMoney(3, money,null, function () {
         wx.navigateTo({
           url: '../about/payfinished',
         });
@@ -317,6 +352,11 @@ Page({
       }, 10000);
     }
   },
+  gotoAllPay: function (e) {
+    wx.navigateTo({
+      url: '../about/orderlist',
+    });
+  },
   switchProgram: function (e) {
     wx.navigateToMiniProgram({
       appId: e.currentTarget.dataset.appid,

pages/main/index.wxml

@@ -65,8 +65,10 @@
     </view>
 
     <view class="index3 FlexColumn">
-      <image src='{{AvatarUrl}}' class="Avatar" bindtap="gotoPayList">
-        <view class="gear FlexRow"><image src='../../images/02022.png' class="img" /></view>
+      <image src='{{AvatarUrl}}' class="Avatar" bindtap="gotoMemberCenter">
+        <view class="gear FlexRow">
+          <image src='../../images/02022.png' class="img" />
+        </view>
       </image>
       <view class="NickName">{{NickName}}</view>
       <view class="Member2 Member" wx:if="{{IsMember==0}}">非会员</view>
@@ -135,6 +137,9 @@
       <image src='../../images/02028.png' class="img02028 img02025" wx:if="{{IsMember==1 && !IsFirstDay && NewUserNumber<NewUserNumberMax}}">
         <view class="getNewUser2 getNewUser" bindtap='gotoNewUser'></view>
       </image>
+      <view class="line"></view>
+      <view class="text">其它优惠</view>
+      <image src='../../images/02029.png' class="img02029" bindtap='selectNav' data-id="2"></image>
 
       <view class="index10 index9 FlexRow">
         <image src='../../images/02016.png' class="imgWave" />
@@ -150,15 +155,22 @@
     <view class="index6 FlexColumn">
       <image src='../../images/{{item.ImageUrl}}' class="btn2" wx:for="{{ListProgram}}" wx:key="index" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' />
     </view>
+    <view class="bottom FlexColumn" bindtap='gotoAllPay'>
+      <view class="bottom1 FlexRow">
+        <view class="left FlexColumn">
+          <view class="text">成套购买更划算</view>
+            <image src='../../images/02030.png' class="img02030" />
+        </view>
+        <view class="right">下单</view>
+      </view>
+    </view>
   </block>
   <view class="index5 FlexColumn">
 
     <view class="FooterDescription_1">©2014-2018 语文识字 - 小学生素质练习系列产品</view>
     <view class="FooterDescription_2" bindtap='updateMember'>微信小程序 版本 {{Version}} </view>
     <view class="index5_1 FlexRow">
-      <button class="feedback" open-type="contact">
-        <view class="index5_1_1">意见反馈</view>
-      </button>
+      <view class="feedback" bindtap='gotoFeedback'>意见反馈</view>
       <view class="line"></view>
       <view class="feedback1 feedback" bindtap='gotoAbout' data-id='Cooperation'>关联您的公众号</view>
       <view class="line"></view>
@@ -168,9 +180,8 @@
     </view>
     <view class="index5_3 FlexRow">
       <image src='../../images/{{item.ImageUrl2}}' class="btn" wx:for="{{ListProgram}}" wx:key="index" bindtap='switchProgram' data-appid='{{item.appId}}' data-path='{{item.path}}' />
-
     </view>
-
+    <view style='height:360rpx;' wx:if="{{NavClass1=='nav2'}}"></view>
   </view>
 
 </view>
@@ -184,12 +195,11 @@
         <view class="text2">已获得永久有效期</view>
       </view>
       <view class="panel2 FlexColumn">
-        查看记录
+        知道了
       </view>
     </view>
   </view>
   <view class="close FlexColumn" catchtap='close'>
     <image src='../../images/02024.png' class="closeImage" />
   </view>
-
 </view>

pages/main/index.wxss

@@ -178,7 +178,7 @@
   right:0;
   border-bottom-left-radius: 10rpx;
   border-top-right-radius: 10rpx;
-  background-color: #593613;
+  background-color: #fff;
 }
 .index3 .Avatar .img{
   width:24rpx;
@@ -414,6 +414,7 @@
 
 .payInfo{
   width:100%;
+  background-color: #fff;
 }
 .payInfo .img02025{
   width:100%;
@@ -451,6 +452,24 @@
   top:370rpx;
 }
 
+.payInfo .line{
+  width:600rpx;
+  height:3rpx;
+  background-color: #F0F0F0;
+}
+
+.payInfo .text{
+  font-size:28rpx;
+  margin-top: 30rpx;
+  
+}
+
+.payInfo .img02029{
+  width:600rpx;
+  height:314rpx;
+  margin: 30rpx 0 80rpx;
+}
+
 .IsMemberForever{
   z-index: 100;
   position: fixed;
@@ -515,3 +534,38 @@
   height: 33rpx;
 }
 
+.container .bottom{
+  width:100%;
+  height:133rpx;
+  position: fixed;
+  bottom:0;
+  background-color: #7D2B25;
+  justify-content: flex-end;
+  z-index: 100;
+}
+.bottom .bottom1{
+  width:100%;
+  height:123rpx;
+  background-color: #B3443B;
+  text-align: center;
+  font-size: 48rpx;
+  color: #fff;
+  justify-content: space-between;
+}
+
+
+.bottom .left{
+  margin-left: 50rpx;
+  font-size: 22rpx;
+  color: #F5E2BE;
+  align-items: flex-start;
+}
+.bottom .img02030{
+  width:243rpx;
+  height:42rpx;
+  margin-top: 6rpx;
+}
+.bottom .right{
+  margin-right: 70rpx;
+}
+

pages/main/list.js

@@ -167,7 +167,7 @@ Page({
       isPaying = true;
       var that = this;
       var money = app.globalData.PayMoney;
-      server.payMoney(3, money, function () {
+      server.payMoney(3, money,null, function () {
         wx.navigateTo({
           url: '../about/payfinished',
         });
@@ -187,6 +187,12 @@ Page({
       IsShowPayInfo: false,
     });
   },
+  gotoIndex:function(){
+    wx.setStorageSync("indexNav", 2);
+    wx.navigateBack({
+      delta: 1
+    });
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/list.wxml

@@ -18,10 +18,7 @@
     <view class="line2 line">
     </view>
     <view class="list2 FlexColumn">
-      <view class="btn" bindtap="goto" 
-      data-bookid='{{BookID}}' data-islocked='{{item.IsLocked}}' data-word='true'
-      data-unitid='{{item.ID}}' data-isfinished='{{item.IsFinished}}' 
-      wx:for="{{List}}" wx:key="index">
+      <view class="btn" bindtap="goto" data-bookid='{{BookID}}' data-islocked='{{item.IsLocked}}' data-word='true' data-unitid='{{item.ID}}' data-isfinished='{{item.IsFinished}}' wx:for="{{List}}" wx:key="index">
         <view class="btn1 FlexRow">
           <view class="left FlexRow">
             <image wx:if="{{IsShow==1 && item.IsLocked==0 && !item.IsFinished}}" src='../../images/04007.png' class="img04007" />
@@ -56,11 +53,8 @@
         <view class="title1">{{item.Name}}</view>
       </view>
       <view class="table FlexRow">
-        <view class="{{itemChild.ReviewCss}} box" wx:for="{{item.Words}}" wx:key="i" wx:for-item="itemChild" wx:for-index="i" 
-        bindtap="goto" data-islocked='{{item.IsLocked}}' 
-        data-bookid='{{BookID}}' data-unitid='{{item.ID}}' 
-        data-wordid='{{i}}' data-word='{{itemChild.Name}}' data-isfinished='{{item.IsFinished}}'
-        >{{itemChild.Name}}</view>
+        <view class="{{itemChild.ReviewCss}} box" wx:for="{{item.Words}}" wx:key="i" wx:for-item="itemChild" wx:for-index="i" bindtap="goto" data-islocked='{{item.IsLocked}}' data-bookid='{{BookID}}' data-unitid='{{item.ID}}' data-wordid='{{i}}' data-word='{{itemChild.Name}}'
+          data-isfinished='{{item.IsFinished}}'>{{itemChild.Name}}</view>
       </view>
     </view>
 
@@ -81,6 +75,12 @@
       </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>

pages/main/list.wxss

@@ -201,7 +201,7 @@
   height: 420rpx;
   background-color: #F19805;
   border-radius: 40rpx;
-  margin-top: 352rpx;
+  margin-top: 282rpx;
   box-shadow: 0 0 30rpx rgba(0, 0, 0, 0.5);
 }
 .PayInfo .btn1 {
@@ -230,6 +230,15 @@
   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;
@@ -237,13 +246,15 @@
 }
 .PayInfo .close {
   width: 100%;
-  height: 235rpx;
+  height: 155rpx;
   position: fixed;
   bottom: 0;
+  justify-content: flex-start;
 }
 
 .PayInfo .closeImage {
   width: 33rpx;
   height: 33rpx;
+  margin-top: 30rpx;
 }
 

project.config.json

@@ -57,16 +57,34 @@
 					"query": ""
 				},
 				{
-					"id": -1,
-					"name": "\b关于",
-					"pathName": "pages/about/about",
+					"id": 4,
+					"name": "\b订单",
+					"pathName": "pages/about/orderlist",
 					"query": ""
 				},
 				{
 					"id": 5,
-					"name": "\b首选词语",
-					"pathName": "pages/main/setcombine",
-					"query": "id=1"
+					"name": "\b支付完成",
+					"pathName": "pages/about/payfinished",
+					"query": "type=all"
+				},
+				{
+					"id": -1,
+					"name": "会员中心",
+					"pathName": "pages/about/membercenter",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "购买列表",
+					"pathName": "pages/about/paylist",
+					"query": ""
+				},
+				{
+					"id": 8,
+					"name": "\b激活",
+					"pathName": "pages/index/index",
+					"query": "SourceID=106&ProductBuyInfoID=3306&ProductID=106&ProductUserID=1&BuyType=109"
 				}
 			]
 		}

utils/main.js

@@ -65,7 +65,7 @@ function getLocalHost(callback) {
   }
 }
 
-function payMoney(payType, money, callback) {
+function payMoney(payType, money, detail, callback) {
   console.log(money);
   if (app.globalData.userInfo.UserID == 1)
     money = 0.01;
@@ -75,7 +75,7 @@ function payMoney(payType, money, callback) {
       if (res.code) {
         console.log('获取用户登录态成功！' + res.code);
         //预支付
-        getData('HanziPayLogin?code=' + res.code + '&payType=' + payType + '&money=' + money, function (data) {
+        getData('HanziPayLogin?code=' + res.code + '&payType=' + payType + '&money=' + money + '&detail=' + detail, function (data) {
           if (data && data.timeStamp) {
             //微信支付
             wx.requestPayment({
@@ -88,7 +88,7 @@ function payMoney(payType, money, callback) {
                 app.globalData.userInfo.IsMember = 1;
                 app.globalData.userInfo.IsPay = 1;
                 console.log("success:" + res3);
-                callback();
+                callback(data);
               },
               'fail': function (err) {
                 if (err && err.errMsg && err.errMsg.indexOf("fail cancel")) {
@@ -119,6 +119,7 @@ function payMoney(payType, money, callback) {
 function getProgramList(){
   return [
     {
+      ID:89,
       ImageUrl: "03001.png",
       ImageUrl2: "02018.png",
       appId: 'wx46a7b4c420e6d38f',
@@ -127,6 +128,7 @@ function getProgramList(){
       top: 837,
     },
     {
+      ID: 99,
       ImageUrl: "03002.png",
       ImageUrl2: "02020.png",
       appId: 'wxb54a6d5aff836ee3',
@@ -135,6 +137,7 @@ function getProgramList(){
       top: 1181,
     },
     {
+      ID: 98,
       ImageUrl: "03003.png",
       ImageUrl2: "02019.png",
       appId: 'wx331e8dd070f01d0e',
@@ -143,6 +146,7 @@ function getProgramList(){
       top: 837,
     },
     {
+      ID: 90,
       ImageUrl: "03004.png",
       ImageUrl2: "02021.png",
       appId: 'wxa5e33c61fe37dd01',
@@ -153,10 +157,23 @@ function getProgramList(){
   ];
 }
 
+function gotoFeedback(){
+  wx.navigateToMiniProgram({
+    appId: "wx80059777521b897c",
+    path: "pages/index/feedback",
+    extraData: {
+    },
+    success(res) {
+      // 打开成功
+    }
+  });
+}
+
 module.exports = {
   getData: getData,
   postData: postData,
   payMoney: payMoney,
   getLocalHost: getLocalHost,
   getProgramList: getProgramList,
+  gotoFeedback: gotoFeedback,
 }