diff --git a/.gitignore b/.gitignore index 39f1622..553f265 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /unpackage /utils/request-1.js /node_modules/ +manifest.json \ No newline at end of file diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 9cba30d..34b613b 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,6 +2,10 @@ // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数 "version": "0.0", "configurations": [{ + "app-plus" : + { + "launchtype" : "remote" + }, "default" : { "launchtype" : "remote" diff --git a/core/payment/alipay.js b/core/payment/alipay.js index 7744309..9c45675 100644 --- a/core/payment/alipay.js +++ b/core/payment/alipay.js @@ -10,7 +10,7 @@ const paymentAsH5 = option => { const options = { formHtml: '', ...option } // 跳转到支付宝支付页 return new Promise((resolve, reject) => { - // console.log(options.formHtml) + console.log(options.formHtml) if (options.formHtml) { const div = document.createElement('div') div.innerHTML = options.formHtml diff --git a/manifest.json b/manifest.json index b19a4b8..56dad4c 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "吉媒婚恋网互动平台", - "appid" : "__UNI__EBF37B7", + "appid" : "__UNI__600B9D4", "description" : "吉媒婚恋网互动平台", "versionName" : "2.0.6", "versionCode" : 206, diff --git a/pages/checkout/cashier/index.vue b/pages/checkout/cashier/index.vue index 02bb4a5..da600d6 100644 --- a/pages/checkout/cashier/index.vue +++ b/pages/checkout/cashier/index.vue @@ -258,7 +258,7 @@ } // 发起支付宝支付 if (method === PayMethodEnum.ALIPAY.value) { - console.log('paymentData', paymentData) + console.log('paymentData', JSON.stringify(paymentData)) Alipay.payment(paymentData) .then(res => app.onPaySuccess(res)) .catch(err => app.onPayFail(err)) diff --git a/pages/user/settled/index.vue b/pages/user/settled/index.vue index 7c77fb2..fe6e6f7 100644 --- a/pages/user/settled/index.vue +++ b/pages/user/settled/index.vue @@ -1,1359 +1,1454 @@ \ No newline at end of file