diff --git a/config/baseUrl.js b/config/baseUrl.js index 4ca3c09..3355af6 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -6,8 +6,8 @@ if (process.env.NODE_ENV === 'development') { // socketUrl = "ws://localhost:6001/"; // baseUrl = "https://twin-ui.com/demo/"; // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 - // baseUrl = "https://api.nuttyreading.com/"; // 线上正式 - baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑 + baseUrl = "https://api.nuttyreading.com/"; // 线上正式 + // baseUrl = "http://192.168.110.100:9200/pb/"; // 开发用电脑 // baseUrl = "http://59.110.212.44:9200/pb/"; // baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑 // baseUrl = "http://192.168.110.110:9200/pb/"; diff --git a/manifest.json b/manifest.json index 7c7b252..3cb6a12 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "src" : "图片路径" } ], - "versionName" : "1.2.49", - "versionCode" : 1249, + "versionName" : "1.2.50", + "versionCode" : 1250, "app-plus" : { "compatible" : { "ignoreVersion" : true diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue index 91f8b53..d95ef2a 100644 --- a/pages/bookShop/commodityDetail.vue +++ b/pages/bookShop/commodityDetail.vue @@ -116,7 +116,7 @@ diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue index 9e8898e..3f63498 100644 --- a/pages/bookShop/orderList.vue +++ b/pages/bookShop/orderList.vue @@ -382,15 +382,21 @@ import { data } from 'jquery'; }else if(payItem.paymentMethod == 3){ // 苹果充值 console.log('苹果二次支付') - if(this.isAndorid){ - uni.showModal({ - title:'提示', - showCancel:false, - content:'很抱歉,当前订单属于苹果系统内购订单,安卓系统无法完成支付操作,您可切换到苹果系统进行支付,也可以取消该订单,并重新下单' - }) - }else{ - this.iphonepay(payItem) - } + uni.showModal({ + content:'apple内购订单不支持继续支付,请重新发起支付申请并完成支付', + confirmText:'好的', + showCancel:false + }) + return + // if(this.isAndorid){ + // uni.showModal({ + // title:'提示', + // showCancel:false, + // content:'很抱歉,当前订单属于苹果系统内购订单,安卓系统无法完成支付操作,您可切换到苹果系统进行支付,也可以取消该订单,并重新下单' + // }) + // }else{ + // this.iphonepay(payItem) + // } } }, // 取消订单 diff --git a/pages/peanut/reCharge.vue b/pages/peanut/reCharge.vue index 9e36b7c..5b4f5f9 100644 --- a/pages/peanut/reCharge.vue +++ b/pages/peanut/reCharge.vue @@ -4,7 +4,7 @@ - 充值金额1 + 充值金额 @@ -17,7 +17,6 @@ 支付方式 - diff --git a/unpackage/debug/iOS_debug.ipa b/unpackage/debug/iOS_debug.ipa index ce8f07e..856d96c 100644 Binary files a/unpackage/debug/iOS_debug.ipa and b/unpackage/debug/iOS_debug.ipa differ