xuxueyang
2024-10-14 bb4b49f9045c92ad90c38943891663821aedaabd
update
已修改4个文件
21 ■■■■■ 文件已修改
environments/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
store/index.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sub_pages/customer/shopping/confirm.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | 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" : "wx6d0ecc4e18710458",
        "appid" : "wx1441324401626290",
        "setting" : {
            "urlCheck" : false,
            "es6" : true,
store/index.js
@@ -32,7 +32,8 @@
            'delivery': 0,
            'order': 0,
            'shopnum': 0,
            'coupon': 0
            'coupon': 0,
            'cache_topay':0,
        },
        cache: {
            coupon: {},
sub_pages/customer/shopping/confirm.vue
@@ -69,6 +69,7 @@
        async onShow() {
            // 支付回调
            // #ifdef PUB_CUSTOMER_DEV
            if (this.sign['cache_topay']) {
            let options = wx.getEnterOptionsSync();
            if (options.scene == '1038' && options.referrerInfo.appId=='wxef277996acc166c3') {
                // 代表从收银台小程序返回
@@ -96,13 +97,14 @@
                tmp.$store.dispatch('cache_coupon_select', {})
                tmp.$store.dispatch('cache_goods_select', [])
                
                await tmp.$message.showToast('支付成功',{
                    duration:500
                })
                    // await tmp.$message.showToast('支付操作', {
                    // duration: 500
                    // })
                uni.navigateBack()
                    await tmp.$store.dispatch('sign_clear', 'cache_topay')
                return
            }
            }
            // #endif
            //优惠券
@@ -385,6 +387,8 @@
                                        // sign: "签名,参考2.1",
                                        ...data,
                                    }
                                    await tmp.$store.dispatch('sign_add', 'cache_topay')
                                    wx.openEmbeddedMiniProgram({
                                        appId: 'wxef277996acc166c3',            
                                        extraData: param