1 rok pred · 799ad9a5e4
--- a/pages/order/createOrder.vue
+++ b/pages/order/createOrder.vue
--- a/pages/product/product.vue
+++ b/pages/product/product.vue
@@ -471,7 +471,7 @@ export default {
 
				 					if (obj.type == 1) {
			
 
				 						// 跳转到支付页
			
 
				 						uni.navigateTo({
			
 
				-							url: '/pages/order/createOrder?id=' + data.cartId + '&goodsType=' + obj.goodsType + '&is_xf=' + obj.is_xf + '&is_bk=' + obj.is_bk
			
 
				+							url: '/pages/order/createOrder?id=' + data.cartId + '&goodsType=' + obj.goodsType + '&is_xf=' + obj.is_xf + '&is_bk=' + obj.is_bk + '&isfg=' + obj.isfg
			
 
				 						});
			
 
				 					}
			
 
				 					if (obj.type == 2) {
			
--- a/pages/user/shareQrCode.vue
+++ b/pages/user/shareQrCode.vue
@@ -41,6 +41,7 @@
 
				 	import {

			
 
				 		weixindata

			
 
				 	} from '@/utils/wxAuthorized';

			
 
				+	import weixinObj from "@/plugin/jweixin-module/index.js";

			
 
				 	// #endif

			
 
				 	export default {

			
 
				 		data() {

			
@@ -63,6 +64,12 @@
 
				 				complete() {}

			
 
				 			});

			
 
				 			// #endif

			
 
				+			try{

			
 
				+				weixinObj.hideAllNonBaseMenuItem();

			
 
				+			}catch(e){

			
 
				+				//TODO handle the exception

			
 
				+			}

			
 
				+			

			
 
				 		},

			
 
				 		onShow() {

			
 
				 			if (this.loginInterceptor && !this.hasLogin) {

			
@@ -258,6 +265,7 @@
 
				 	page {

			
 
				 		height: 100%;

			
 
				 	}

			
 
				+

			
 
				 	.imgw750h375 {

			
 
				 		width: 100%;

			
 
				 		height: 958rpx;

			
@@ -342,4 +350,4 @@
 
				 	}

			
 
				 

			
 
				 	/* #endif */

			
 
				-</style>
			
 
				+</style>
			
--- a/unpackage/dist/build/h5/4-26-2.rar
+++ b/unpackage/dist/build/h5/4-26-2.rar
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/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><link rel=stylesheet href=/index/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d3a37645.js></script><script src=/index/static/js/index.2b03e372.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><link rel=stylesheet href=/index/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.48a05ccf.js></script><script src=/index/static/js/index.7ae88268.js></script></body></html>
			
--- a/unpackage/dist/build/h5/static/index.63b34199.css
+++ b/unpackage/dist/build/h5/static/index.63b34199.css
--- a/unpackage/dist/build/h5/static/index.b0707a6a.css
+++ b/unpackage/dist/build/h5/static/index.b0707a6a.css
--- a/unpackage/dist/build/h5/static/js/chunk-vendors.48a05ccf.js
+++ b/unpackage/dist/build/h5/static/js/chunk-vendors.48a05ccf.js
--- a/unpackage/dist/build/h5/static/js/chunk-vendors.d3a37645.js
+++ b/unpackage/dist/build/h5/static/js/chunk-vendors.d3a37645.js
--- a/unpackage/dist/build/h5/static/js/index.2b03e372.js
+++ b/unpackage/dist/build/h5/static/js/index.2b03e372.js
--- a/unpackage/dist/build/h5/static/js/index.7ae88268.js
+++ b/unpackage/dist/build/h5/static/js/index.7ae88268.js
--- a/unpackage/dist/build/h5/static/js/pages-cart-cart.79da9cca.js
+++ b/unpackage/dist/build/h5/static/js/pages-cart-cart.79da9cca.js
--- a/unpackage/dist/build/h5/static/js/pages-cart-cart.e0318c58.js
+++ b/unpackage/dist/build/h5/static/js/pages-cart-cart.e0318c58.js
--- a/unpackage/dist/build/h5/static/js/pages-category-category.4af0a489.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-category.4af0a489.js
--- a/unpackage/dist/build/h5/static/js/pages-category-category.95303808.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-category.95303808.js
--- a/unpackage/dist/build/h5/static/js/pages-index-artDetail.a76842e6.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-artDetail.a76842e6.js
--- a/unpackage/dist/build/h5/static/js/pages-index-artDetail.edb7293e.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-artDetail.edb7293e.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.bc57178e.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.bc57178e.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.bd8da300.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.bd8da300.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index~pages-user-user.22ae6950.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index~pages-user-user.22ae6950.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index~pages-user-user.929d6ce6.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index~pages-user-user.929d6ce6.js
--- a/unpackage/dist/build/h5/static/js/pages-money-account.605fcebe.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-account.605fcebe.js
--- a/unpackage/dist/build/h5/static/js/pages-money-account.9d7f8f7b.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-account.9d7f8f7b.js
--- a/unpackage/dist/build/h5/static/js/pages-money-pay.4d0b2dab.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-pay.4d0b2dab.js
--- a/unpackage/dist/build/h5/static/js/pages-money-pay.a53bd04c.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-pay.a53bd04c.js
--- a/unpackage/dist/build/h5/static/js/pages-money-paySuccess.1e9f74a4.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-paySuccess.1e9f74a4.js
--- a/unpackage/dist/build/h5/static/js/pages-money-paySuccess.92e34b7b.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-paySuccess.92e34b7b.js
--- a/unpackage/dist/build/h5/static/js/pages-money-recharge.13ea2212.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-recharge.13ea2212.js
--- a/unpackage/dist/build/h5/static/js/pages-money-recharge.ac9a7230.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-recharge.ac9a7230.js
--- a/unpackage/dist/build/h5/static/js/pages-money-wallet.831c9d89.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-wallet.831c9d89.js
--- a/unpackage/dist/build/h5/static/js/pages-money-wallet.90a1dbcd.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-wallet.90a1dbcd.js
--- a/unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-award~pages-user-favorites~pages-user-jf~pages-user-~27f9d3cc.00d982a7.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-award~pages-user-favorites~pages-user-jf~pages-user-~27f9d3cc.00d982a7.js
--- a/unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-award~pages-user-favorites~pages-user-jf~pages-user-~27f9d3cc.55a9bdc2.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-award~pages-user-favorites~pages-user-jf~pages-user-~27f9d3cc.55a9bdc2.js
--- a/unpackage/dist/build/h5/static/js/pages-money-withdrawal.102ed9ec.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-withdrawal.102ed9ec.js
--- a/unpackage/dist/build/h5/static/js/pages-money-withdrawal.a8ecb7fa.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-withdrawal.a8ecb7fa.js
--- a/unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-reply~pages-set-ad~51b461c3.a6600c73.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-reply~pages-set-ad~51b461c3.a6600c73.js
--- a/unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-reply~pages-set-ad~51b461c3.b0b4059b.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-reply~pages-set-ad~51b461c3.b0b4059b.js
--- a/unpackage/dist/build/h5/static/js/pages-order-createOrder.080da3ee.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-createOrder.080da3ee.js
--- a/unpackage/dist/build/h5/static/js/pages-order-createOrder.83b9c086.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-createOrder.83b9c086.js
--- a/unpackage/dist/build/h5/static/js/pages-order-evaluate.8b0858b1.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-evaluate.8b0858b1.js
--- a/unpackage/dist/build/h5/static/js/pages-order-evaluate.9a7cf19a.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-evaluate.9a7cf19a.js
--- a/unpackage/dist/build/h5/static/js/pages-order-expressInfo.1e6a33dc.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-expressInfo.1e6a33dc.js
--- a/unpackage/dist/build/h5/static/js/pages-order-expressInfo.cf669006.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-expressInfo.cf669006.js
--- a/unpackage/dist/build/h5/static/js/pages-order-order.1bedb6fa.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-order.1bedb6fa.js
--- a/unpackage/dist/build/h5/static/js/pages-order-order.9edbcf99.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-order.9edbcf99.js
--- a/unpackage/dist/build/h5/static/js/pages-order-orderDetail.7aefd5ee.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-orderDetail.7aefd5ee.js
--- a/unpackage/dist/build/h5/static/js/pages-order-orderDetail.ac9b96e2.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-orderDetail.ac9b96e2.js
--- a/unpackage/dist/build/h5/static/js/pages-order-orderRefund.24d16b09.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-orderRefund.24d16b09.js
--- a/unpackage/dist/build/h5/static/js/pages-order-orderRefund.e532adcf.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-orderRefund.e532adcf.js
--- a/unpackage/dist/build/h5/static/js/pages-product-list.3a52ae87.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-list.3a52ae87.js
--- a/unpackage/dist/build/h5/static/js/pages-product-list.ba27b561.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-list.ba27b561.js
--- a/unpackage/dist/build/h5/static/js/pages-product-product.48ea9ca5.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-product.48ea9ca5.js
--- a/unpackage/dist/build/h5/static/js/pages-product-product.bcf3f5a0.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-product.bcf3f5a0.js
--- a/unpackage/dist/build/h5/static/js/pages-product-reply.c0c3dfb8.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-reply.c0c3dfb8.js
--- a/unpackage/dist/build/h5/static/js/pages-product-reply.e237d599.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-reply.e237d599.js
--- a/unpackage/dist/build/h5/static/js/pages-product-search.045e9aaf.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-search.045e9aaf.js
--- a/unpackage/dist/build/h5/static/js/pages-product-search.1d62e4a8.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-search.1d62e4a8.js
--- a/unpackage/dist/build/h5/static/js/pages-public-forget.06242133.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-forget.06242133.js
--- a/unpackage/dist/build/h5/static/js/pages-public-forget.982df1ed.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-forget.982df1ed.js
--- a/unpackage/dist/build/h5/static/js/pages-public-login.65734acb.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-login.65734acb.js
--- a/unpackage/dist/build/h5/static/js/pages-public-login.91a63887.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-login.91a63887.js
--- a/unpackage/dist/build/h5/static/js/pages-public-register.8702c441.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-register.8702c441.js
--- a/unpackage/dist/build/h5/static/js/pages-public-register.913b8806.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-register.913b8806.js
--- a/unpackage/dist/build/h5/static/js/pages-public-wxLogin.06aae9eb.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-wxLogin.06aae9eb.js
--- a/unpackage/dist/build/h5/static/js/pages-public-wxLogin.8e5f51aa.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-wxLogin.8e5f51aa.js
--- a/unpackage/dist/build/h5/static/js/pages-redirect-redirect.daa21478.js
+++ b/unpackage/dist/build/h5/static/js/pages-redirect-redirect.daa21478.js
--- a/unpackage/dist/build/h5/static/js/pages-redirect-redirect.e8e476bc.js
+++ b/unpackage/dist/build/h5/static/js/pages-redirect-redirect.e8e476bc.js
--- a/unpackage/dist/build/h5/static/js/pages-set-address.2e62c4e9.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-address.2e62c4e9.js
--- a/unpackage/dist/build/h5/static/js/pages-set-address.be55ccce.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-address.be55ccce.js
--- a/unpackage/dist/build/h5/static/js/pages-set-addressManage.2e592aba.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-addressManage.2e592aba.js
--- a/unpackage/dist/build/h5/static/js/pages-set-addressManage.62f16d89.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-addressManage.62f16d89.js
--- a/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-user-user.12a46c03.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-user-user.12a46c03.js
--- a/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-user-user.aa52593a.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-user-user.aa52593a.js
--- a/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-user-xzdl.05236bba.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-user-xzdl.05236bba.js
--- a/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-user-xzdl.f4b73b37.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-user-xzdl.f4b73b37.js
--- a/unpackage/dist/build/h5/static/js/pages-set-password.4d4c224f.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-password.4d4c224f.js
--- a/unpackage/dist/build/h5/static/js/pages-set-password.e553f509.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-password.e553f509.js
--- a/unpackage/dist/build/h5/static/js/pages-set-phone.81c74420.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-phone.81c74420.js
--- a/unpackage/dist/build/h5/static/js/pages-set-phone.fe708b2d.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-phone.fe708b2d.js
--- a/unpackage/dist/build/h5/static/js/pages-set-set.3505280e.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-set.3505280e.js
--- a/unpackage/dist/build/h5/static/js/pages-set-set.76be72cc.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-set.76be72cc.js
--- a/unpackage/dist/build/h5/static/js/pages-set-userinfo.3293cb64.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-userinfo.3293cb64.js
--- a/unpackage/dist/build/h5/static/js/pages-set-userinfo.d7fbd278.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-userinfo.d7fbd278.js
--- a/unpackage/dist/build/h5/static/js/pages-user-award.574c4937.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-award.574c4937.js
--- a/unpackage/dist/build/h5/static/js/pages-user-award.d3094157.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-award.d3094157.js
--- a/unpackage/dist/build/h5/static/js/pages-user-favorites.51a554e6.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-favorites.51a554e6.js
--- a/unpackage/dist/build/h5/static/js/pages-user-favorites.cee0205d.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-favorites.cee0205d.js
--- a/unpackage/dist/build/h5/static/js/pages-user-jf.7fc4519a.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-jf.7fc4519a.js
--- a/unpackage/dist/build/h5/static/js/pages-user-jf.be4ba79b.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-jf.be4ba79b.js
--- a/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.5c853ce6.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.5c853ce6.js
--- a/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.df4a8f75.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.df4a8f75.js
--- a/unpackage/dist/build/h5/static/js/pages-user-team.600e94bb.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-team.600e94bb.js
--- a/unpackage/dist/build/h5/static/js/pages-user-team.9d94d5ab.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-team.9d94d5ab.js
--- a/unpackage/dist/build/h5/static/js/pages-user-user.100b0f52.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-user.100b0f52.js
--- a/unpackage/dist/build/h5/static/js/pages-user-user.e1b576a1.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-user.e1b576a1.js
--- a/unpackage/dist/build/h5/static/js/pages-user-withdrawal.6d1f7395.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-withdrawal.6d1f7395.js
--- a/unpackage/dist/build/h5/static/js/pages-user-withdrawal.9e5d36fa.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-withdrawal.9e5d36fa.js
--- a/unpackage/dist/build/h5/static/js/pages-user-xzdl.2908830d.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-xzdl.2908830d.js
--- a/unpackage/dist/build/h5/static/js/pages-user-xzdl.7b94a6c5.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-xzdl.7b94a6c5.js
--- a/unpackage/dist/build/h5/static/js/pages-user-yjzye.c2580eef.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-yjzye.c2580eef.js