@bee-hole/server 1.83.5 → 1.83.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bee-hole/server",
-  "version": "1.83.5",
+  "version": "1.83.6",
   "description": "www.bee-hole.com",
   "main": "index.js",
   "directories": {

package/resource/public/html/h5pay.html

@@ -182,7 +182,7 @@
 
   <script>
     var debug = false;
-    const httpurl = 'http://192.168.3.50:8299';
+    const httpurl = 'http://beehole.tlyoupin.com';
     const translations = {
       'zh-CN': {
         paymentDetails: '支付详情',
@@ -193,6 +193,7 @@
         selectCurrency: '选择货币',
         paymentProcessing: '正在使用 {method} 进行 {currency} 支付',
         loadingFailed: '加载支付方式失败，请刷新页面重试。',
+        noPayMethod: '暂无可用支付方式',
         creditCard: '信用卡',
         debitCard: '借记卡',
         bankTransfer: '银行转账',
@@ -211,6 +212,7 @@
         selectCurrency: 'Select Currency',
         paymentProcessing: 'Processing payment with {method} in {currency}',
         loadingFailed: 'Failed to load payment methods. Please refresh the page and try again.',
+        noPayMethod: 'No payment methods available',
         creditCard: 'Credit Card',
         debitCard: 'Debit Card',
         bankTransfer: 'Bank Transfer',
@@ -314,23 +316,30 @@
             })
           }).then(response => response.json())
             .then(result => {
-              if (result && result.data && result.data.list) {
+              if (result && result.data) {
                 // this.paymentList = result.data.list
                 // this.initPaymenthods();
-                if(result.data.list){
-                  // 向第一个追加余额支付
-                  if(result.data.balance){
-                    result.data.list.unshift({
-                      "pay_way_id": 0,
-                      "description": translate('balance'),
-                      "logo": "",
-                      "balance": result.data.balance_currency + result.data.balance
-                    });
+
+                if(result.data && result.data.balance){
+                  if(!result.data.list){
+                    // 向第一个追加余额支付
+                    result.data.list = [];
                   }
+                  result.data.list.unshift({
+                    "pay_way_id": 0,
+                    "description": translate('balance'),
+                    "logo": "",
+                    "balance": result.data.balance_currency + result.data.balance
+                  });
+                }
+
+                if (!result.data.list || result.data.list.length == 0) {
+                  showNotification(translate('noPayMethod'), 'error');
+                  return;
                 }
                 resolve(result.data.list);
               } else {
-                if (result && result.message) {
+                if (result && result.code != 0) {
                   // this.ErrMsg = result.message;
                   // showErrText(result.message);
                   showNotification(result.message, 'error');
@@ -485,11 +494,11 @@
                 resolve({ url: qrCode, type: 'qrCode' });
                 // this.lunxunOrder();
               }
-              if (payWayId === '' && result.message === 'SUCCESS'){
-                resolve({ status: 'SUCCESS' });
+              if (payWayId === '' && result.code === 0){
+                resolve(result);
               }
             } else {
-              if (result && result.message) {
+              if (result && result.code != 0) {
                 // that.ErrMsg = result.message;
                 // console.log('result.message', result.message);
                 // showErrText(result.message);
@@ -533,7 +542,7 @@
             } else if (res.status === 'PAID') {
               window.close();
             }else{
-              if(res.message){
+              if(res && res.code != 0){
                 // showErrText(res.message);
                 showNotification(result.message, 'error');
               }
@@ -665,7 +674,7 @@
         if(payWayId+'' === '0'){
           // 余额支付
           const res = await Pay(selectedCurrency, '', '余额');
-          if (res.status === 'SUCCESS') {
+          if (res.code === 0) {
             showNotification(translate('paySuccess'), 'success');
             setTimeout(() => {
               window.close();

package/version

@@ -1 +1 @@
-v1.83.5
+v1.83.6