1.5.3

app.js

@@ -32,8 +32,8 @@ App({
     }
   },
   globalData: {
-    Version: "1.5.1",
-    IsProduction: true,
+    Version: "1.5.3",
+    IsProduction: false,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_screenshot_main.png',

app.json

@@ -48,6 +48,7 @@
     "pages/other/coupon",
     "pages/other/tips",
     "pages/other/help",
+    "pages/other/paycustom",
     "pages/other/pay"
     
   ],

pages/index/index.js

@@ -123,6 +123,12 @@ Page({
           gotoUrl: "../other/help?IsShare=1&id=" + options.ID+"&idchild="+options.IDChild,
         });
       }
+      else if (options.type == "paycustom") {
+        this.setData({
+          gotoType: "other",
+          gotoUrl: "../other/pay?PayType=6&PayUserID="+options.PayUserID+"&DayNumber="+options.DayNumber+"&Price="+options.Price+"&Remark="+options.Remark,
+        });
+      }
     }
     this.setData({
       IsRefresh: false,

pages/main/default.js

@@ -39,6 +39,9 @@ Page({
     }
     
   },
+  onHide:function(){
+    wx.hideLoading();
+  },
   onShow: function () {
     var that = this;
     if (app.globalData.userInfo.IsNewUser==1 && app.globalData.userInfo.IsShow == 1) {

pages/main/systemsetting.js

@@ -27,6 +27,13 @@ Page({
       url: '../main/symbolsetting',
     });
   },
+  gotoPayCustom:function(){
+    if (app.globalData.userInfo.UserID<=7){
+      wx.navigateTo({
+        url: '../other/paycustom',
+      });
+    }
+  },
   onShareAppMessage: function () {
     return {
       title: app.globalData.ShareTitle,

pages/main/systemsetting.wxml

@@ -16,7 +16,7 @@
   </view>
   <view class='lineFooter'></view>
   <view style='width:100%;height:50rpx;'></view>
-  <text class='text1'>©2019 秒过™学习\n唱意教育微信小程序 版本 {{Version}}</text>
+  <text class='text1' bindtap="gotoPayCustom">©2019 秒过™学习\n唱意教育微信小程序 版本 {{Version}}</text>
   <view style='width:100%;height:100rpx;'></view>
 
 </view>

pages/other/binding.js

@@ -113,8 +113,9 @@ Page({
       var path = '/pages/index/index?type=bebound&ParentUserID=' + app.globalData.userInfo.UserID;
       path += "&NickName=" + app.globalData.userInfo.NickName;
       path += "&AvatarUrl=" + app.globalData.userInfo.AvatarUrl;
+      var time = common.formatTime(new Date());
       return {
-        title: app.globalData.userInfo.NickName,
+        title: "帐号绑定 "+time,
         path: path,
         imageUrl: app.globalData.uploadImageUrl +"web/program_screenshot_bindaccount.png",
       }

pages/other/pay.js

@@ -6,26 +6,51 @@ var userid = 0;
 
 Page({
   data: {
-    PayPanel: 0,
+    PayPanel:0,
   },
   onPullDownRefresh: function () {
     this.gotoIndex();
     wx.stopPullDownRefresh();
   },
   onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+    });
+
     userid = options.UserID;
 
     var PayType = options.PayType;
-    var EndDate = options.EndDate;
-    this.init(PayType, EndDate);
+    if (PayType == "6") {//自定义开具
+      if (options.PayUserID != app.globalData.userInfo.UserID) {
+        that.setData({
+          PayPanel: 2,
+        });
+      }
+      else {
+        var EndDate = common.formatTime(new Date());
+        this.init(PayType, EndDate, options.Price, options.DayNumber);
+        that.setData({
+          Options: options,
+        });
+      }
+    }
+    else {
+      var EndDate = options.EndDate;
+      this.init(PayType, EndDate);
+    }
 
   },
-  init: function (PayType, EndDate) {
+  init: function (PayType, EndDate, Price, DayNumber) {
     var that = this;
 
     EndDate = common.formatDateENG(EndDate, "/");
-    
-    main.getData('GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType + '&UserID=' + app.globalData.userInfo.UserID, function (data) {
+    var url = 'GetMiaoguoPayInfo3?EndDate=' + EndDate + '&PayType=' + PayType + '&UserID=' + app.globalData.userInfo.UserID;
+    if (Price && DayNumber) {
+      url += "&Price=" + Price + "&DayNumber=" + DayNumber;
+    }
+
+    main.getData(url, function (data) {
       if (data) {
         that.setData({
           Info: data,
@@ -41,15 +66,18 @@ Page({
     detail.Introducer = app.globalData.userInfo.Introducer;
     for (var i = 0; i < that.data.Info.List1.length; i++) {
       if (that.data.Info.List1[i].Name == "有效期") {
-        detail.EndTime = common.formatDateENG(that.data.Info.List1[i].Content,"/");
+        detail.EndTime = common.formatDateENG(that.data.Info.List1[i].Content, "/");
       }
     }
 
     detail = JSON.stringify(detail);
 
-    console.log(detail);
-    console.log(money);
-    main.payMoney(7, null, money, detail, function () {
+    //console.log(detail);
+    //console.log(money);
+    var remark = null;
+    if (that.data.Options && that.data.Options.Remark)
+      remark = that.data.Options.Remark;
+    main.payMoney(7, remark, money, detail, function () {
       that.setData({
         PayPanel: 1,
       });

pages/other/pay.wxml

@@ -30,3 +30,13 @@
 
 </view>
 
+<view class="container FlexColumn" wx:if="{{PayPanel==2}}">
+  <view class='panel2 FlexColumn'>
+    <view class='text3'>无效页面</view>
+    <view class='text7'>如有疑问请联系班务员天乐</view>
+  </view>
+
+  <view class="btn" bindtap='gotoIndex'>关闭</view>
+
+</view>
+

pages/other/pay.wxss

@@ -105,4 +105,8 @@
 
 .btn2{
   margin-top: 50rpx;
+}
+
+.panel2{
+  margin-top: 150rpx;
 }

pages/other/paycustom.js

@@ -0,0 +1,71 @@
+import common from '../../utils/util';
+import main from '../../utils/main';
+
+var app = getApp();
+
+Page({
+  data: {
+    DayNumber: 365,
+    Price: 199,
+    SearchUserID: "",
+    Remark: ""
+  },
+  onLoad: function (options) {
+    var that = this;
+    that.setData({
+      Containnerheight: main.getWindowHeight(),
+      ShareDisabled:true,
+    });
+  },
+  onKeyInput: function (e) {
+    var value = e.detail.value;
+    var inputType = e.currentTarget.dataset.type;
+    var that = this;
+    that.data[inputType] = value;
+    if (!that.data.SearchUserID || !that.data.DayNumber || !that.data.Price || !that.data.Remark){
+      that.data["ShareDisabled"] = true;
+    }
+    else
+      that.data["ShareDisabled"] = false;
+    that.setData(that.data);
+  },
+  getUserInfo: function (e) {
+    var that = this;
+    if (!that.data.SearchUserID) {
+      that.showToast('输入用户ID');
+    }
+    else {
+      main.getData("GetMiaoguoWXUserInfo?FieldStr=UserID,NickName,AvatarUrl &UserID=" + that.data.SearchUserID, function (data) {
+        if (data) {
+          that.setData({
+            UserInfo: data,
+          })
+        }
+        else {
+          that.showToast('无效用户ID');
+        }
+      });
+    }
+  },
+  showToast: function (str) {
+    wx.showToast({
+      title: str,
+      image: "../images/universalpic_wrong_white_120x120.png",
+    });
+  },
+  onShareAppMessage: function () {
+    var that = this;
+    var path = '/pages/index/index?type=paycustom&PayUserID=' + that.data.SearchUserID;
+    path += "&DayNumber=" + that.data.DayNumber;
+    path += "&Price=" + that.data.Price;
+    path += "&Remark=" + that.data.Remark;
+    var time = common.formatTime(new Date());
+    //console.log(path);
+    return {
+      title: "点开续费 "+time,
+      path: path,
+      imageUrl: app.globalData.uploadImageUrl + "web/program_screenshot_custompayment.png",
+    };
+
+  },
+})

pages/other/paycustom.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "自定义开具"
+}

pages/other/paycustom.wxml

@@ -0,0 +1,41 @@
+<view class="container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">秒过学习小程序ID</view>
+    <view class="panelTitle2"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <input class='input' type="number" maxlength='10' auto-focus bindinput="onKeyInput" data-type="SearchUserID" value="{{SearchUserID}}" />
+  </view>
+  <view class="panelTitle3 FlexRow">
+    <image src="{{UserInfo.AvatarUrl}}" class="avatar" />
+    <view class="btn2 btn" bindtap="getUserInfo">头像查验</view>
+  </view>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">增加有效期（天）</view>
+    <view class="panelTitle2"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <input class='input' type="number" maxlength='10' auto-focus bindinput="onKeyInput" data-type="DayNumber" value="{{DayNumber}}" />
+  </view>
+  <view class='lineFooter'></view>
+  <view class="panelTitle FlexRow">
+    <view class="panelTitle1">应收金额（元）</view>
+    <view class="panelTitle2"></view>
+  </view>
+  <view class="panelItem FlexRow">
+    <input class='input' type="number" maxlength='10' auto-focus bindinput="onKeyInput" data-type="Price" value="{{Price}}" />
+  </view>
+  <view class='lineFooter'></view>
+    <view class="panelTitle FlexRow">
+    <view class="panelTitle1">情况说明（沟通时间、付款人微信名称、事由等）</view>
+    <view class="panelTitle2"></view>
+  </view>
+  <view class="panelItem2 panelItem FlexRow">
+    <textarea class='input2' maxlength='500' auto-focus bindinput="onKeyInput" data-type="Remark" value="{{Remark}}">
+    </textarea>
+  </view>
+  <view class='lineFooter'></view>
+  <button class='btn' disabled="{{ShareDisabled}}" bindtap='shareFinished' open-type='share'>开具支付</button>
+  
+  <view style="height:100rpx;"></view>
+</view>

pages/other/paycustom.wxss

@@ -0,0 +1,68 @@
+.panelTitle{
+  width:100%;
+  margin-top: 50rpx;
+  justify-content: space-between;
+}
+.panelTitle .panelTitle1{
+  font-size:24rpx;
+  margin-left: 30rpx;
+  margin-bottom: 30rpx;
+  font-weight: 400;
+}
+
+.panelItem{
+  width:100%;
+  height:100rpx;
+  justify-content: flex-start;
+  background-color: #fff;
+}
+.input{
+  width:690rpx;
+  height:80rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+.input2{
+  width:690rpx;
+  height:200rpx;
+  font-size:28rpx;
+  font-weight: 400;
+  margin-left: 30rpx;
+}
+.panelItem2{
+  height:260rpx;
+}
+
+.btn{
+  width:690rpx;
+  height:90rpx;
+  color:#fff;
+  border-radius: 10rpx;
+  background-color: #0071EF;
+  font-size:28rpx;
+  text-align: center;
+  line-height: 90rpx;
+  margin-top: 60rpx;
+}
+
+.panelTitle3{
+  width:100%;
+  margin-top: 30rpx;
+  justify-content: space-between;
+}
+
+
+.avatar{
+  width:90rpx;
+  height:90rpx;
+  margin-left: 30rpx;
+  border-radius: 5rpx;
+  background-color: #d2d2d2;
+}
+
+.btn2{
+  width:260rpx;
+  margin-top: 0rpx;
+  margin-right: 30rpx;
+}

project.config.json

@@ -86,9 +86,9 @@
 					"scene": 1001
 				},
 				{
-					"id": -1,
-					"name": "pages/other/coupon",
-					"pathName": "pages/other/coupon",
+					"id": 4,
+					"name": "pages/other/paycustom",
+					"pathName": "pages/other/paycustom",
 					"query": "",
 					"scene": null
 				},
@@ -103,7 +103,7 @@
 					"id": 6,
 					"name": "pages/index/index",
 					"pathName": "pages/index/index",
-					"query": "type=help&ID=1&IDChild=2&UserID=1",
+					"query": "type=paycustom&PayUserID=1&DayNumber=100&Price=258&Remark=123 456",
 					"scene": null
 				},
 				{

utils/main.js

@@ -77,7 +77,7 @@ function getBaiduToken() {
   });
 }
 
-function payMoney(payType, buyType, money, detail, callback) {
+function payMoney(payType, remark, money, detail, callback) {
   console.log(money);
   if (app.globalData.userInfo.UserID < 8)
     money = 0.01;
@@ -87,7 +87,7 @@ function payMoney(payType, buyType, money, detail, callback) {
       if (res.code) {
         console.log('获取用户登录态成功！' + res.code);
         //预支付
-        getData('ProductPayLogin500?code=' + res.code + '&payType=7&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID, function (data) {
+        getData('ProductPayLogin500?code=' + res.code + '&payType=7&money=' + money + '&detail=' + detail + '&productID=' + app.globalData.ProgramID+'&Remark='+remark, function (data) {
           if (data && data.timeStamp) {
             //微信支付
             wx.requestPayment({