2.6.0

app.js

@@ -1,7 +1,7 @@
 App({
   globalData: {
-    Version: "2.5.10",
-    //IsProduction: true,
+    Version: "2.6.0",
+    IsProduction: true,
     ShareTitle: "高效学习从秒过开始",
     SharePath: "pages/index/index",
     ShareImage: '../images/program_share-a01.png',
@@ -10,9 +10,9 @@ App({
     AppID: "wx84b3feac6069eec3",
     serverUrl: "https://www.kylx365.com/apiData/",
     serverUrlServer: "https://www.kylx365.com/apiData/",
-    serverUrlServer2: "https://scoreline.kylx365.com/apiData/",
-    serverUrlLocalhost: "http://localhost:3020/apiData/",
-    serverUrlLocalhost2: "http://localhost:3000/apiData/",
+    serverUrlServer2: "https://www.kylx365.com/apiData/",
+    serverUrlLocalhost: "http://localhost:3010/apiData/",
+    serverUrlLocalhost2: "http://localhost:3010/apiData/",
     audioUrlBaidu: "https://tsn.baidu.com/text2audio?lan=zh&ctp=1&cuid=abcdxxx&tok=[token]&tex=[word]&vol=9&per=0&spd=3&pit=5",
     audioUrlYoudao: "https://dict.youdao.com/dictvoice?rate=10&le=auto&audio=[word]",
     uploadImageUrl: "https://miaguo-1253256735.file.myqcloud.com/",
@@ -106,4 +106,4 @@ App({
     }
   }
 
-})
+})

app.json

@@ -18,13 +18,10 @@
     "pages/main/mainlist",
     "pages/main/addInfomation",
     "pages/main/addInfomationDetail",
-
     "pages/main/searchCard",
-    
     "pages/main/preview",
     "pages/index/accredit",
     "pages/other/openSetting",
-
     "pages/main/default",
     "pages/main/cardInfo",
     "pages/main/cardInfoDetail",
@@ -32,8 +29,6 @@
     "pages/main/detail",
     "pages/main/systemsetting",
     "pages/main/symbolsetting",
-
-    
     "pages/other/family",
     "pages/other/recover",
     "pages/other/grade",
@@ -57,7 +52,6 @@
     "pages/other/annualreport",
     "pages/other/systemrestore",
     "pages/other/pay"
-    
   ],
   "window": {
     "navigationBarBackgroundColor": "#ffffff",

pages/index/index.js

@@ -278,6 +278,13 @@ Page({
               isShow = 1;
             }
           }
+          
+          // if (app.globalData.userInfo.UserID<7 && isShow==1){
+          //   app.globalData.serverUrl=app.globalData.serverUrlServer2;
+          //   app.globalData.serverUrlServer=app.globalData.serverUrlServer2;
+          // }
+          
+
           app.globalData.userInfo.isShow = isShow;
 
           if (app.globalData.userInfo.IsMember == 1)
@@ -285,7 +292,7 @@ Page({
 
           wx.removeStorageSync("UserID");
           wx.removeStorageSync("UserName");
-
+          
           // //测试****************
           // var url = '../share/shareindex';
           // wx.redirectTo({

pages/main/addInfomation.js

@@ -77,13 +77,14 @@ Page({
     });
   },
   onSearchHistory: function (e) {
+    //debugger;
     var index = Number(e.currentTarget.dataset.index);
     var obj = {};
     if (e.currentTarget.dataset.type == "SearchWord3")
       obj = this.data.SearchWord3[index];
     else
       obj = this.data.SearchList[index];
-
+    
     main.updateSearchList(obj);
     app.globalData.TempSearchBackNumber = 2;
     app.globalData.CardList2=[];
@@ -93,6 +94,7 @@ Page({
   },
 
   searchResult: function (e) {
+    
     var that = this;
     var search = that.data.SearchInfo;
     app.globalData.TempStr=search;
@@ -115,7 +117,6 @@ Page({
     var author=e.currentTarget.dataset.author;
     var shiciurl=e.currentTarget.dataset.shiciurl;
     main.searchInfomation(search,searchtype,author,shiciurl,function(list,obj){
-      
       if (obj){
         main.updateSearchList(obj,function(){
           updateData(that,search);

pages/other/newuser.js

@@ -85,7 +85,7 @@ Page({
     //console.log(detail);
     //console.log(money);
     var remark = null;
-    main.payMoney(9, remark, money, detail, function () {
+    main.virtualPayMoney(9, remark, money, detail, function () {
       that.setData({
         PanelShow:1,
       });
@@ -130,4 +130,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages/other/pay.js

@@ -87,7 +87,7 @@ Page({
     var remark = null;
     if (that.data.Options && that.data.Options.Remark)
       remark = that.data.Options.Remark;
-    main.payMoney(7, remark, money, detail, function () {
+    main.virtualPayMoney(7, remark, money, detail, function () {
       that.setData({
         PayPanel: 1,
       });
@@ -105,4 +105,4 @@ Page({
       imageUrl: app.globalData.ShareImage,
     }
   },
-})
+})

pages/share/shareitem.js

@@ -274,7 +274,7 @@ Page({
     if (url3=="../images/universalpic_face_default_blue_120x120.png")
       url3="https://miaguo-1253256735.file.myqcloud.com/web/universalpic_face_default_blue_120x120.png";
 
-    debugger;
+    //debugger;
     var _uid = common.Encrypt(app.globalData.userInfo.UserID);
     if (_uid.indexOf("/") >= 0)
       _uid = common.ReplaceAllString(_uid, "/", "___");

pages_agent/main/index.js

@@ -87,6 +87,7 @@ Page({
             data.RealName="";
             
           app.globalData.userInfo = data;
+          
           that.setData({
             IsPromoter:app.globalData.userInfo.IsPromoter,
           });    

project.private.config.json

@@ -6,12 +6,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/markdown/index",
+          "pathName": "pages/markdown/index",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "语境",
           "pathName": "pages/index/index",
           "query": "SourceID=173&&type=buildcard&Words=Boy,girl,king,come",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "分享",

utils/main.js

@@ -196,6 +196,159 @@ function payMoney(payType, remark, money, detail, callback) {
   });
 }
 
+function compareVersion(v1, v2) {
+  v1 = String(v1 || '').split('.');
+  v2 = String(v2 || '').split('.');
+  var len = Math.max(v1.length, v2.length);
+  while (v1.length < len) v1.push('0');
+  while (v2.length < len) v2.push('0');
+  for (var i = 0; i < len; i++) {
+    var n1 = parseInt(v1[i], 10) || 0;
+    var n2 = parseInt(v2[i], 10) || 0;
+    if (n1 > n2) return 1;
+    if (n1 < n2) return -1;
+  }
+  return 0;
+}
+
+function getVirtualPayPlatform(systemInfo) {
+  var platform = String(systemInfo.platform || '').toLowerCase();
+  var system = String(systemInfo.system || '').toLowerCase();
+  if (platform == 'ios' || system.indexOf('ios') >= 0) return 'ios';
+  if (platform == 'ohos' || system.indexOf('harmony') >= 0) return 'harmony';
+  if (platform == 'windows' || system.indexOf('windows') >= 0) return 'windows';
+  if (platform == 'android' || system.indexOf('android') >= 0) return 'android';
+  return platform || 'unknown';
+}
+
+function checkVirtualPaySupport(systemInfo, platform) {
+  if (platform == 'ios') {
+    var iosVersion = String(systemInfo.system || '').replace(/[^0-9.]/g, '');
+    //debugger;
+    if (app.globalData.userInfo.UserID==1)
+      iosVersion="26.3.1";
+
+    if (iosVersion && compareVersion(iosVersion, '15.0') < 0)
+      return 'iOS 15 以下系统暂不支持虚拟支付';
+
+    var version=app.globalData.systemInfo.version;
+    if (app.globalData.userInfo.UserID==1)
+      version="8.0.68";
+    if (version && compareVersion(version, '8.0.68') < 0)
+      return '请将微信升级到 8.0.68 或更高版本';
+  }
+  var sdkSupported = compareVersion(systemInfo.SDKVersion, '2.19.2') >= 0;
+  var canUse = wx.canIUse && wx.canIUse('requestVirtualPayment');
+  if ((!sdkSupported && !canUse) || typeof wx.requestVirtualPayment != 'function')
+    return '当前微信版本不支持虚拟支付，请升级微信后再试';
+  return '';
+}
+
+function showVirtualPayError(message) {
+  wx.hideLoading();
+  wx.showModal({
+    title: '支付未完成',
+    content: message || '系统忙，请稍后再试',
+    showCancel: false,
+  });
+}
+
+function waitVirtualPayDelivered(tradeNo, callback, createData, attempt) {
+  attempt = attempt || 0;
+  getData('MiaoguoVirtualPayOrderStatus500?TradeNo=' + encodeURIComponent(tradeNo), function (status) {
+    if (status && status.Fulfilled) {
+      wx.hideLoading();
+      callback(createData);
+      return;
+    }
+    if (attempt >= 9) {
+      wx.hideLoading();
+      wx.showModal({
+        title: '支付已受理',
+        content: '权益正在后台开通，请稍后下拉刷新查看。',
+        showCancel: false,
+        success: function () {
+          callback(createData);
+        }
+      });
+      return;
+    }
+    setTimeout(function () {
+      waitVirtualPayDelivered(tradeNo, callback, createData, attempt + 1);
+    }, 1500);
+  });
+}
+
+function virtualPayMoney(payType, remark, money, detail, callback) {
+  var systemInfo = wx.getSystemInfoSync();
+  var platform = getVirtualPayPlatform(systemInfo);
+  var supportError = checkVirtualPaySupport(systemInfo, platform);
+  if (!supportError && platform == 'ios' && Number(money) < 1)
+    supportError = 'iOS 虚拟支付的最低金额为 1 元';
+
+  if (app.globalData.userInfo.UserID < 8 ||
+      app.globalData.userInfo.UserID == 3089)
+      money = 1;
+      
+  if (supportError) {
+    showVirtualPayError(supportError);
+    return;
+  }
+
+  wx.showLoading({ title: '正在准备支付', mask: true });
+  wx.login({
+    success: function (loginResult) {
+      if (!loginResult.code) {
+        showVirtualPayError('获取微信登录态失败，请稍后再试');
+        return;
+      }
+      var url = 'MiaoguoVirtualPayLogin500'
+        + '?code=' + encodeURIComponent(loginResult.code)
+        + '&payType=' + encodeURIComponent(payType)
+        + '&money=' + encodeURIComponent(money)
+        + '&detail=' + encodeURIComponent(detail)
+        + '&productID=' + encodeURIComponent(app.globalData.ProgramID)
+        + '&Remark=' + encodeURIComponent(remark || '')
+        + '&platform=' + encodeURIComponent(platform);
+      getData(url, function (data) {
+        if (!data || data.errorMessage) {
+          showVirtualPayError(data && data.errorMessage);
+          return;
+        }
+        wx.hideLoading();
+        wx.requestVirtualPayment({
+          signData: data.signData,
+          paySig: data.paySig,
+          signature: data.signature,
+          mode: data.mode,
+          success: function () {
+            wx.showLoading({ title: '正在开通权益', mask: true });
+            waitVirtualPayDelivered(data.TradeNo, callback, data, 0);
+          },
+          fail: function (error) {
+            var message = error && error.errMsg ? error.errMsg : '';
+            if (message.toLowerCase().indexOf('cancel') >= 0) return;
+            if (error && Number(error.errCode) == -15010) {
+              var envName = Number(data.env) == 1 ? '沙箱环境' : '正式环境';
+              message = '微信虚拟支付' + envName + '尚未发布商品 productId=' + (data.productId || app.globalData.ProgramID);
+            } else if (error && Number(error.errCode) == -15014) {
+              message = '微信新发布的道具 ' + (data.productId || '') + ' 正在生效，通常约需 10 分钟，请稍后重试';
+            } else if (error && Number(error.errCode) == -15013) {
+              message = '微信后台商品价格与本次支付金额不一致';
+            } else if (error && error.errCode) {
+              message = (message || '微信支付失败') + '（' + error.errCode + '）';
+            }
+            showVirtualPayError(message);
+          }
+        });
+      });
+    },
+    fail: function () {
+      showVirtualPayError('获取微信登录态失败，请稍后再试');
+    }
+  });
+}
+
 function getTimeFormat(duration) {
   //console.log("duration:" + duration);
   var arr = ['', '', '']
@@ -755,7 +908,7 @@ function updateSearchList(obj, callback) {
   var arr = wx.getStorageSync("SearchWord3");
   if (!arr)
     arr = [];
-
+  //debugger;
   if (obj && obj.Type && obj.Type == "shici") {
     if (obj.Value.CHN.ShiciTitle)
       obj.Key = obj.Value.CHN.ShiciTitle;
@@ -764,12 +917,12 @@ function updateSearchList(obj, callback) {
   }
   for (var i = 0; i < arr.length; i++) {
     if (obj.Key && arr[i].Key == obj.Key) {
-      if (obj.Type == "shici") {
-        if (arr[i].ShiciUrl == obj.ShiciUrl) {
+      if (arr[i].Type == "shici" && obj.Type=="shici") {
+        //if (arr[i].ShiciUrl == obj.ShiciUrl) {
           obj.Value = arr[i].Value;
           arr.splice(i, 1);
           break;
-        }
+        //}
       } else {
         var b = true;
         if (obj.Type && arr[i].Type && arr[i].Type != obj.Type)
@@ -1574,10 +1727,8 @@ function searchInfomation(search, searchtype, author, shiciurl, callback) {
   getData(url, function (data) {
     wx.hideLoading();
     clearTimeout(timeout);
-
+    console.log(data);
     if (data) {
-      //console.log(data);
-
       if (data.List) {
         var len = WORD_LENGTH;
         var list = data.List;
@@ -2072,6 +2223,7 @@ module.exports = {
   getData2: getData2,
   postData2: postData2,
   payMoney: payMoney,
+  virtualPayMoney: virtualPayMoney,
   getLocalHost: getLocalHost,
   getTimeFormat: getTimeFormat,
   getWindowHeight: getWindowHeight,