xuxueyang
2024-08-28 7e738f69cf7b353492edefa1768005f19ea7e7ee
update上线更新
已修改5个文件
12 ■■■■ 文件已修改
environments/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/order-detail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/order/order.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/shopping/confirm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
environments/index.js
@@ -1,7 +1,7 @@
export default {
    
    // httpBaseUri: 'https://www.hmyxianhua.com/flower',
    httpBaseUri: 'http://47.99.58.211/flower',
    httpBaseUri: 'https://www.hmyxianhua.com/flower',
    // httpBaseUri: 'http://47.99.58.211/flower',
    // httpBaseUri: 'http://localhost:8080/flower',
    clientId: '',
    secret: '',
manifest.json
@@ -49,7 +49,7 @@
    "quickapp" : {},
    /* 快应用特有相关 */
    "mp-weixin" : {
        "appid" : "wx1441324401626290",
        "appid" : "wx3203fd935a6ffe09",
        "setting" : {
            "urlCheck" : false,
            "es6" : true,
pages/order/order-detail.vue
@@ -162,7 +162,7 @@
                                    // merchant_trade_no: '',
                                    transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
                                },
                                success() {
                                async success() {
                                    //dosomething
                                    // 发送请求
                                    tmp.$message.showLoading()
pages/order/order.vue
@@ -139,7 +139,7 @@
                                    // merchant_trade_no: '1234323JKHDFE1243252',
                                    transaction_id: item.paymentTrId
                                },
                                success() {
                                async success() {
                                    //dosomething
                                    // 发送请求
                                    tmp.$message.showLoading()
sub_pages/customer/shopping/confirm.vue
@@ -179,7 +179,7 @@
                                console.log('pay,', data)
                                // /api/pub/init/callback?orderId=
                                // if(env.pro)
                                if (data && (data['_testV2OrderId'] || data['_testOrderId']) &&
                                if (false && data && (data['_testV2OrderId'] || data['_testOrderId']) &&
                                    environments.httpBaseUri.startsWith(
                                        'http://47.99.58.211/flower')) {
                                    //回调