分享参数

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: '白马精选',
+						desc: this.GetShopInfor.restaurant_name || '欢迎来到白马精选',
+						title: this.BrandInfor.brand_name,
 						link: shareUrl + '&spread=' + this.GetSpread,
 						imgUrl: 'https://imgs.agrimedia.cn/shop/logo.jpg'
 					})

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`;
 							}
 						})
 						

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`;

unpackage/dist/build/web/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>在线点餐</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.05bba68b.js></script><script src=/privilege/static/js/index.f708f952.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><script src="https://h5.dhcc.wang/api/apilink-native.min.js?v=20200701"></script><link rel=stylesheet href=/privilege/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/privilege/static/js/chunk-vendors.05bba68b.js></script><script src=/privilege/static/js/index.2a8fcb42.js></script></body></html>