diff --git a/pages/restaurant/home/shop_home/shop_home.vue b/pages/restaurant/home/shop_home/shop_home.vue index 9bc8541..5dfc63e 100644 --- a/pages/restaurant/home/shop_home/shop_home.vue +++ b/pages/restaurant/home/shop_home/shop_home.vue @@ -95,7 +95,6 @@ } from '@/static/js/share.js' import wx from 'weixin-js-sdk' import { mapGetters, mapMutations } from 'vuex'; - let self; export default { mixins: [mixin, restaurantmixins], @@ -148,7 +147,9 @@ } }, - + ...mapGetters({ + BrandInfor: 'shopping/BrandInfor', + }), watch: { firstModal: { deep: true, @@ -292,7 +293,6 @@ const brand_name = data['data']['brand_name']; const brand_id = res['brand_id']; - // 设置进入品牌 this.SETBRANDINFOR({ brand_id, @@ -543,15 +543,15 @@ wx.ready(() => { // 自定义分享朋友信息 wx.updateAppMessageShareData({ - desc: '欢迎来到白马精选', - title: '白马精选', + desc: this.GetShopInfor.restaurant_name || '欢迎来到白马精选', + title: this.BrandInfor.brand_name, link: shareUrl + '&spread=' + uid, imgUrl: 'https://imgs.agrimedia.cn/shop/logo.jpg' }) // 自定义分享朋友圈信息 - wx.updateTimelineShareData({ - desc: '欢迎来到白马精选', - title: '白马精选', + wx.updateTimelineShareData({ + desc: this.GetShopInfor.restaurant_name || '欢迎来到白马精选', + title: this.BrandInfor.brand_name, link: shareUrl + '&spread=' + this.GetSpread, imgUrl: 'https://imgs.agrimedia.cn/shop/logo.jpg' }) diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue index f192990..63d56b9 100644 --- a/pages/restaurant/order/orders-settlement/orders-settlement.vue +++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue @@ -479,7 +479,7 @@ }else { //非小程序环境 const orderData = { price: this.realPayment }; - window.location.href = `${HTTP_REQUEST_URL}/h5_pay/?token=${this.removeBearerPrefix(state['getters']['GetToken'])}&dat=${encodeURIComponent(JSON.stringify(res.data))}&orderData=${encodeURIComponent(JSON.stringify(orderData))}&from_type=food`; + window.location.href = `${HTTP_REQUEST_URL}/h5_pay/?token=${this.removeBearerPrefix(state['getters']['GetToken'])}&dat=${encodeURIComponent(JSON.stringify(res.data))}&orderData=${encodeURIComponent(JSON.stringify(orderData))}&tabIndex=1&from_type=food`; } }) diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue index e9c7cc9..c9bcf4e 100644 --- a/pages/restaurant/order/orders-settlement/settlement.vue +++ b/pages/restaurant/order/orders-settlement/settlement.vue @@ -484,7 +484,7 @@ }else { //非小程序环境 const orderData = { price: this.realPayment }; - window.location.href = `${HTTP_REQUEST_URL}/h5_pay/?token=${this.removeBearerPrefix(state['getters']['GetToken'])}&dat=${encodeURIComponent(JSON.stringify(res.data))}&orderData=${encodeURIComponent(JSON.stringify(orderData))}&from_type=food`; + window.location.href = `${HTTP_REQUEST_URL}/h5_pay/?token=${this.removeBearerPrefix(state['getters']['GetToken'])}&dat=${encodeURIComponent(JSON.stringify(res.data))}&orderData=${encodeURIComponent(JSON.stringify(orderData))}&tabIndex=1&from_type=food`; // 本地 // window.location.href = `http://10.210.254.149:8080/h5_pay/?token=${this.removeBearerPrefix(state['getters']['GetToken'])}&dat=${encodeURIComponent(JSON.stringify(res.data))}&orderData=${encodeURIComponent(JSON.stringify(orderData))}&from_type=food`; diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html index 77912c7..a2258d0 100644 --- a/unpackage/dist/build/web/index.html +++ b/unpackage/dist/build/web/index.html @@ -1,2 +1,2 @@