diff --git a/mallplusui-uniapp-app/common/api.js b/mallplusui-uniapp-app/common/api.js index fd6e2fa..d3055c2 100644 --- a/mallplusui-uniapp-app/common/api.js +++ b/mallplusui-uniapp-app/common/api.js @@ -1,7 +1,7 @@ import store from '../store/index'; export default { // qq 237524947 wx15d4269d3210863d - // BASEURI: 'http://2wsiyd.natappfree.cc/api/', + // BASEURI: 'http://5rygzr.natappfree.cc/api/', BASEURI: 'http://mall.yyundong.com/portalapi/api/', // BASEURI: 'http://192.168.31.52:8083/api/', ADMINURI: 'http://mall.yyundong.com/adminapi/', diff --git a/mallplusui-uniapp-app/components/payments/paymentsByApp.vue b/mallplusui-uniapp-app/components/payments/paymentsByApp.vue index eb36309..8504a89 100644 --- a/mallplusui-uniapp-app/components/payments/paymentsByApp.vue +++ b/mallplusui-uniapp-app/components/payments/paymentsByApp.vue @@ -120,17 +120,17 @@ provider: 'alipay', orderInfo: res, success: function(data) { - console.log("aliAppPay_data》》》", data); - let rawdataResult = JSON.parse(data.rawdata).result; - let r = rawdataResult.split(';')[0]; - let r1 = rawdataResult.split(';')[0].length - 1; - let r2 = rawdataResult.split(';')[0].length - 2; - let alipayTradeAppPayResponse = JSON.parse(r.substr(0, r1)) - .alipay_trade_app_pay_response; - let out_trade_no = alipayTradeAppPayResponse.out_trade_no; + console.log("aliAppPay_data》》》", data); + let rawdataResult1 = data.rawdata; + console.log("rawdataResult1》》》", rawdataResult1); + let rawdataResult2 = JSON.parse(rawdataResult1); + console.log("rawdataResult2》》》", rawdataResult2); + let rawdataResult3 = JSON.parse(rawdataResult2.result); + console.log("rawdataResult3》》》", rawdataResult3); + _this.$common.successToShow('支付成功', () => { //_this.redirectHandler(res.data.payment_id) - _this.redirectHandler(out_trade_no); + _this.redirectHandler(rawdataResult3.out_trade_no); }); } }); diff --git a/mallplusui-uniapp-app/manifest.json b/mallplusui-uniapp-app/manifest.json index 4f81052..a788f02 100644 --- a/mallplusui-uniapp-app/manifest.json +++ b/mallplusui-uniapp-app/manifest.json @@ -2,8 +2,8 @@ "name" : "汇融云链", "appid" : "__UNI__FB2C9C4", "description" : "", - "versionName" : "1.0.0.5", - "versionCode" : 1005, + "versionName" : "1.0.0.7", + "versionCode" : 1007, "transformPx" : false, "app-plus" : { "usingComponents" : true, diff --git a/mallplusui-uniapp-app/pages/index/user.vue b/mallplusui-uniapp-app/pages/index/user.vue index df93940..2b5801b 100644 --- a/mallplusui-uniapp-app/pages/index/user.vue +++ b/mallplusui-uniapp-app/pages/index/user.vue @@ -350,6 +350,27 @@ uni.navigateTo({ url: url }); + + /* let data = { + "channel": { + "id": "alipay", + "description": "支付宝", + "serviceReady": true + }, + "description": "处理成功", + "signature": "heRUjOSHc4w2J+m99Id5x42Q/K7ZD3NUMtDsYmO67ILJAEbDGAR5FMP6M7nRiZz5zpXytL1YRPP2J63YeecPVW/tA7ZB0mfjyA5BerR/W6LOV/BH0KotZvGfwgNWq3GuC9BpCSv7YoLwKNW+acaPh+Fg7wE4zFw5am7DAWlje+midCd60gU7+KrclQ3M7v519lMoVz56sDnzRd0wDhvlrTnJz19H8rn722EPbv60zQNdMc8QMjq8kwh8Yu8q1+tpy0hTy8AHx4qUuhwngRKW7TNmfgjogd4yNZe67QtNmos1u4gGx4zWJGqBnodxm9nsURmCXv6QV8NSHdBcrmxDUg==", + "tradeno": "2023030422001417821451126952", + "rawdata": "{\"resultStatus\":\"9000\",\"memo\":\"处理成功\",\"result\":\"{\\\"alipay_trade_app_pay_response\\\":{\\\"code\\\":\\\"10000\\\",\\\"msg\\\":\\\"Success\\\",\\\"app_id\\\":\\\"2018082761134635\\\",\\\"auth_app_id\\\":\\\"2018082761134635\\\",\\\"charset\\\":\\\"utf-8\\\",\\\"timestamp\\\":\\\"2023-03-04 15:26:17\\\",\\\"out_trade_no\\\":\\\"16779147527370101341\\\",\\\"total_amount\\\":\\\"0.01\\\",\\\"trade_no\\\":\\\"2023030422001417821451126952\\\",\\\"seller_id\\\":\\\"2088202217235266\\\"},\\\"sign\\\":\\\"heRUjOSHc4w2J+m99Id5x42Q\\/K7ZD3NUMtDsYmO67ILJAEbDGAR5FMP6M7nRiZz5zpXytL1YRPP2J63YeecPVW\\/tA7ZB0mfjyA5BerR\\/W6LOV\\/BH0KotZvGfwgNWq3GuC9BpCSv7YoLwKNW+acaPh+Fg7wE4zFw5am7DAWlje+midCd60gU7+KrclQ3M7v519lMoVz56sDnzRd0wDhvlrTnJz19H8rn722EPbv60zQNdMc8QMjq8kwh8Yu8q1+tpy0hTy8AHx4qUuhwngRKW7TNmfgjogd4yNZe67QtNmos1u4gGx4zWJGqBnodxm9nsURmCXv6QV8NSHdBcrmxDUg==\\\",\\\"sign_type\\\":\\\"RSA2\\\"}\"}", + "errMsg": "requestPayment:ok" + } + + console.log("aliAppPay_data》》》", data); + let rawdataResult1 = data.rawdata; + console.log("rawdataResult1》》》", rawdataResult1); + let rawdataResult2 = JSON.parse(rawdataResult1); + console.log("rawdataResult2》》》", rawdataResult2); + let rawdataResult3 = JSON.parse(rawdataResult2.result); + console.log("rawdataResult3》》》", rawdataResult3); */ }, /** diff --git a/mallplusui-uniapp-app/pages/order/payment/result.vue b/mallplusui-uniapp-app/pages/order/payment/result.vue index de47d65..55605d0 100644 --- a/mallplusui-uniapp-app/pages/order/payment/result.vue +++ b/mallplusui-uniapp-app/pages/order/payment/result.vue @@ -2,9 +2,9 @@ 支付成功 - - {{ paymentInfo.payAmount }} - + 查看订单 返回首页 @@ -25,11 +25,11 @@ import Api from '@/common/api'; } }, onLoad(options) { - if (options.order) { - let order = JSON.parse(options.order) - this.orderId = order.id - this.paymentInfo = order - } + // if (options.order) { + // let order = JSON.parse(options.order) + // this.orderId = order.id + // this.paymentInfo = order + // } }, methods: {}