From e29902579b88d5207d64e63dbdc111905170e1a6 Mon Sep 17 00:00:00 2001 From: wangdong <1551135706@qq.com> Date: Thu, 16 May 2024 14:37:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/PayDialog/index.vue | 2 ++ manifest.json | 13 +++++++++---- pages/activity/event.vue | 4 ++-- pages/my/recharge.vue | 4 ++-- pages/my/studyAbroad.vue | 4 ++-- pages/special/confirm_order.vue | 4 ++-- pages/special/data_details.vue | 4 ++-- pages/special/details.vue | 4 ++-- pages/special/member_recharge.vue | 4 ++-- pages/special/offline_apply.vue | 4 ++-- pages/special/order.vue | 5 +++-- pages/special/order_store_list.vue | 4 ++-- pages/special/pink.vue | 4 ++-- pages/special/question_index.vue | 4 ++-- pages/special/recharge_index.vue | 4 ++-- pages/special/single_con_detail.vue | 4 ++-- pages/special/single_details.vue | 4 ++-- pages/special/task_text_info.vue | 4 ++-- pages/topic/subjectAnalysisDialog.vue | 4 ++-- 19 files changed, 46 insertions(+), 38 deletions(-) diff --git a/components/PayDialog/index.vue b/components/PayDialog/index.vue index 7a54155..02225b3 100644 --- a/components/PayDialog/index.vue +++ b/components/PayDialog/index.vue @@ -263,6 +263,7 @@ export default { try { console.log(backUrlCRshlcICwGdGY); const data = await createOrder(backUrlCRshlcICwGdGY); + console.log(JSON.stringify(data)); uni.hideLoading(); if (data.code === 200) { this.$emit("change", { @@ -274,6 +275,7 @@ export default { this.$emit("update:open", false); } } catch (err) { + console.log(JSON.stringify(err)); uni.hideLoading(); this.$util.showMsg(err.msg); } diff --git a/manifest.json b/manifest.json index bbe302b..b47cb59 100644 --- a/manifest.json +++ b/manifest.json @@ -1,9 +1,9 @@ { "name" : "梦航学习宝", "appid" : "__UNI__640EC10", - "description" : "1.1.6", - "versionName" : "1.0.16", - "versionCode" : 116, + "description" : "1.1.7", + "versionName" : "1.0.17", + "versionCode" : 117, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -74,11 +74,16 @@ "payment" : { "alipay" : { "__platform__" : [ "ios", "android" ] + }, + "weixin" : { + "__platform__" : [ "ios", "android" ], + "appid" : "wxcd2c36c7cbe79194", + "UniversalLinks" : "https://kn.tczxkj.com/" } }, "oauth" : { "weixin" : { - "appid" : "wx860a75a277e1265b", + "appid" : "wxcd2c36c7cbe79194", "appsecret" : "772ab067193d2bdc0b8dcaf28f6e18c5", "UniversalLinks" : "https://kn.tczxkj.com/" } diff --git a/pages/activity/event.vue b/pages/activity/event.vue index 557a09e..7dc3f3e 100644 --- a/pages/activity/event.vue +++ b/pages/activity/event.vue @@ -293,8 +293,8 @@ export default { this.extendOrder(data.msg); break; case 'WECHAT_PAY': - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case 'WECHAT_H5_PAY': this.payDialogOpen = false; diff --git a/pages/my/recharge.vue b/pages/my/recharge.vue index 10a94df..3ee188c 100644 --- a/pages/my/recharge.vue +++ b/pages/my/recharge.vue @@ -230,8 +230,8 @@ import { getUserInfo } from "@/api/auth"; this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/my/studyAbroad.vue b/pages/my/studyAbroad.vue index 1ef665d..9927c24 100644 --- a/pages/my/studyAbroad.vue +++ b/pages/my/studyAbroad.vue @@ -148,8 +148,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/special/confirm_order.vue b/pages/special/confirm_order.vue index a7a8d0c..6fd0650 100644 --- a/pages/special/confirm_order.vue +++ b/pages/special/confirm_order.vue @@ -390,9 +390,9 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); + this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_ROUTINE_PAY": this.$util.wechatRoutinePay(data.data.result.jsConfig, this); diff --git a/pages/special/data_details.vue b/pages/special/data_details.vue index 2dd9fc7..a2043ae 100644 --- a/pages/special/data_details.vue +++ b/pages/special/data_details.vue @@ -333,8 +333,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/special/details.vue b/pages/special/details.vue index 99e8f2c..4c0afa9 100644 --- a/pages/special/details.vue +++ b/pages/special/details.vue @@ -1709,8 +1709,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/special/member_recharge.vue b/pages/special/member_recharge.vue index eb121f8..b999641 100644 --- a/pages/special/member_recharge.vue +++ b/pages/special/member_recharge.vue @@ -248,8 +248,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/special/offline_apply.vue b/pages/special/offline_apply.vue index 8d1644a..0a014b5 100644 --- a/pages/special/offline_apply.vue +++ b/pages/special/offline_apply.vue @@ -171,8 +171,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/special/order.vue b/pages/special/order.vue index 90026c4..2029ef5 100644 --- a/pages/special/order.vue +++ b/pages/special/order.vue @@ -343,6 +343,7 @@ }, pay_order(data) { this.orderId = data.data.result.orderId || ""; + console.log(JSON.stringify(data)); switch (data.data.status) { case "PAY_ERROR": case "ORDER_EXIST": @@ -350,8 +351,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_ROUTINE_PAY": this.$util.wechatRoutinePay(data.data.result.jsConfig, this); diff --git a/pages/special/order_store_list.vue b/pages/special/order_store_list.vue index a97cc04..acb91c4 100644 --- a/pages/special/order_store_list.vue +++ b/pages/special/order_store_list.vue @@ -272,8 +272,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_ROUTINE_PAY": this.$util.wechatRoutinePay(data.data.result.jsConfig, this); diff --git a/pages/special/pink.vue b/pages/special/pink.vue index 96d5030..d2e9f16 100644 --- a/pages/special/pink.vue +++ b/pages/special/pink.vue @@ -347,8 +347,8 @@ export default { this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_ROUTINE_PAY": this.$util.wechatRoutinePay(data.data.result.jsConfig, this); diff --git a/pages/special/question_index.vue b/pages/special/question_index.vue index 12d5dc2..7a4074f 100644 --- a/pages/special/question_index.vue +++ b/pages/special/question_index.vue @@ -170,8 +170,8 @@ this.orderId = data.data.result.orderId || ""; switch (data.data.status) { case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_ROUTINE_PAY": this.$util.wechatRoutinePay(data.data.result.jsConfig, this); diff --git a/pages/special/recharge_index.vue b/pages/special/recharge_index.vue index 95edf01..339853a 100644 --- a/pages/special/recharge_index.vue +++ b/pages/special/recharge_index.vue @@ -246,8 +246,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/special/single_con_detail.vue b/pages/special/single_con_detail.vue index 9e0c42c..038f0bc 100644 --- a/pages/special/single_con_detail.vue +++ b/pages/special/single_con_detail.vue @@ -322,8 +322,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/special/single_details.vue b/pages/special/single_details.vue index b81ef51..24799c9 100644 --- a/pages/special/single_details.vue +++ b/pages/special/single_details.vue @@ -824,8 +824,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/special/task_text_info.vue b/pages/special/task_text_info.vue index 8ad35f9..97f5a6d 100644 --- a/pages/special/task_text_info.vue +++ b/pages/special/task_text_info.vue @@ -224,8 +224,8 @@ this.extendOrder(data.msg); break; case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_H5_PAY": this.payDialogOpen = false; diff --git a/pages/topic/subjectAnalysisDialog.vue b/pages/topic/subjectAnalysisDialog.vue index e6ec1f6..ffacbdd 100644 --- a/pages/topic/subjectAnalysisDialog.vue +++ b/pages/topic/subjectAnalysisDialog.vue @@ -100,8 +100,8 @@ this.orderId = data.data.result.orderId || ""; switch (data.data.status) { case "WECHAT_PAY": - // this.wechatPay(data.data.result.jsConfig); - this.$util.weixinAppPay(data.data.result.jsConfig,this); + this.wechatPay(data.data.result.jsConfig); + // this.$util.weixinAppPay(data.data.result.jsConfig,this); break; case "WECHAT_ROUTINE_PAY": this.$util.wechatRoutinePay(data.data.result.jsConfig, this);