3 years ago · 8b6b021ea8
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -48,7 +48,7 @@
 
				 					<text>附近门店</text>
			
 
				 				</view>
			
 
				 			</navigator>
			
 
				-			<navigator url="/pages/index/sign">
			
 
				+			<navigator url="/pages/user/shareQrCode">
			
 
				 				<view class="cate-item">
			
 
				 					<image src="/static/img/index-nav4.png"></image>
			
 
				 					<text>邀请有礼</text>
			
@@ -80,7 +80,8 @@
 
				 	import {
			
 
				 		setCoupons
			
 
				 	} from '@/api/functionalUnit.js';
			
 
				-	import {
			
 
				+	import {

			
 
				+		saveUrl,
			
 
				 		interceptor
			
 
				 	} from '@/utils/loginUtils';
			
 
				 	import {
			
@@ -132,9 +133,11 @@
 
				 		},
			
 
				 		onShow: function() {
			
 
				 			// 判断是否强制登录
			
 
				-			if (this.loginInterceptor && !this.hasLogin) {
			
 
				+			if (this.loginInterceptor && !this.hasLogin) {

			
 
				+				saveUrl()
			
 
				 				// 登录拦截
			
 
				-				interceptor();
			
 
				+				// interceptor();

			
 
				+				return
			
 
				 			}
			
 
				 			this.loadData();
			
 
				 			this.getBargainList();
			
--- a/pages/money/pay.vue
+++ b/pages/money/pay.vue
@@ -93,6 +93,11 @@ export default {
 
				 			// 获取余额
			
 
				 			this.now_money = data.now_money;
			
 
				 		});
			
 
				+	},

			
 
				+	computed: {

			
 
				+		// #ifdef H5

			
 
				+		...mapState(['weichatObj']),

			
 
				+		// #endif

			
 
				 	},
			
 
				 	methods: {
			
 
				 		//选择支付方式
			
@@ -157,7 +162,7 @@ export default {
 
				 						};
			
 
				 						// #ifdef H5
			
 
				 						if(obj.payName == 'weixin'){
			
 
				-						weichatObj.chooseWXPay(data);
			
 
				+						obj.weichatObj.chooseWXPay(data);
			
 
				 						}
			
 
				 						// #endif
			
 
				 						// #ifdef MP-WEIXIN
			
--- a/pages/money/recharge.vue
+++ b/pages/money/recharge.vue
@@ -89,10 +89,13 @@ export default {
 
				 	},
			
 
				 	computed: {
			
 
				 		// #ifdef H5
			
 
				-		...mapState('user',['userInfo'])
			
 
				+		...mapState('user',['userInfo']),
			
 
				 		// #endif
			
 
				 		// #ifdef MP
			
 
				-		...mapState(['userInfo'])
			
 
				+		...mapState(['userInfo']),
			
 
				+		// #endif

			
 
				+		// #ifdef H5

			
 
				+		...mapState(['weichatObj']),

			
 
				 		// #endif
			
 
				 	},
			
 
				 	methods: {
			
--- a/pages/product/newPeople.vue
+++ b/pages/product/newPeople.vue
@@ -221,7 +221,7 @@
 
				 			width: 345rpx;

			
 
				 			height: 345rpx;

			
 
				 			border-radius: 10rpx 10rpx 0 0;

			
 
				-			background-color: #bfa;

			
 
				+			// background-color: #bfa;

			
 
				 		}

			
 
				 

			
 
				 		.good-tit {

			
--- 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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.d22f25e6.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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.4ef260ca.js></script></body></html>
			
--- a/unpackage/dist/build/h5/static/icon/close.png
+++ b/unpackage/dist/build/h5/static/icon/close.png
--- a/unpackage/dist/build/h5/static/icon/i8.png
+++ b/unpackage/dist/build/h5/static/icon/i8.png
--- a/unpackage/dist/build/h5/static/icon/pf-logo.png
+++ b/unpackage/dist/build/h5/static/icon/pf-logo.png
--- a/unpackage/dist/build/h5/static/img/pf-logo.4e107b3c.png
+++ b/unpackage/dist/build/h5/static/img/pf-logo.4e107b3c.png
--- a/unpackage/dist/build/h5/static/js/index.4ef260ca.js
+++ b/unpackage/dist/build/h5/static/js/index.4ef260ca.js
--- a/unpackage/dist/build/h5/static/js/index.d22f25e6.js
+++ b/unpackage/dist/build/h5/static/js/index.d22f25e6.js
--- a/unpackage/dist/build/h5/static/js/pages-activity-bargain-index.aec65b1b.js
+++ b/unpackage/dist/build/h5/static/js/pages-activity-bargain-index.aec65b1b.js
--- a/unpackage/dist/build/h5/static/js/pages-activity-goods_bargain-index.c9d79086.js
+++ b/unpackage/dist/build/h5/static/js/pages-activity-goods_bargain-index.c9d79086.js
--- a/unpackage/dist/build/h5/static/js/pages-activity-goods_bargain_details-index.372d9353.js
+++ b/unpackage/dist/build/h5/static/js/pages-activity-goods_bargain_details-index.372d9353.js
--- a/unpackage/dist/build/h5/static/js/pages-cart-cart.42d9db48.js
+++ b/unpackage/dist/build/h5/static/js/pages-cart-cart.42d9db48.js
--- a/unpackage/dist/build/h5/static/js/pages-cart-cart.fec91bdb.js
+++ b/unpackage/dist/build/h5/static/js/pages-cart-cart.fec91bdb.js
--- a/unpackage/dist/build/h5/static/js/pages-category-apply.b20a44f4.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-apply.b20a44f4.js
--- a/unpackage/dist/build/h5/static/js/pages-category-apply.fc7fb6d0.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-apply.fc7fb6d0.js
--- a/unpackage/dist/build/h5/static/js/pages-category-fillTable.e367c3f1.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-fillTable.e367c3f1.js
--- a/unpackage/dist/build/h5/static/js/pages-category-fillTable.f27ac052.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-fillTable.f27ac052.js
--- a/unpackage/dist/build/h5/static/js/pages-category-vip.4b303299.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-vip.4b303299.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.39ed906b.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.39ed906b.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.7b706d72.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.7b706d72.js
--- a/unpackage/dist/build/h5/static/js/pages-money-account.11b55a6c.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-account.11b55a6c.js
--- a/unpackage/dist/build/h5/static/js/pages-money-moneyPwd.600542c1.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-moneyPwd.600542c1.js
--- a/unpackage/dist/build/h5/static/js/pages-money-pay.76649a05.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-pay.76649a05.js
--- a/unpackage/dist/build/h5/static/js/pages-money-pay.f7325516.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-pay.f7325516.js
--- a/unpackage/dist/build/h5/static/js/pages-money-recharge.2259703a.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-recharge.2259703a.js
--- a/unpackage/dist/build/h5/static/js/pages-money-recharge.b3a45b8b.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-recharge.b3a45b8b.js
--- a/unpackage/dist/build/h5/static/js/pages-money-wallet.95d38b2b.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-wallet.95d38b2b.js
--- a/unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-product-wholesale~pages-user-JDcool~pages-user-award~page~212eb539.911f5f63.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-product-wholesale~pages-user-JDcool~pages-user-award~page~212eb539.911f5f63.js
--- a/unpackage/dist/build/h5/static/js/pages-money-withdrawal.0d868aa3.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-withdrawal.0d868aa3.js
--- a/unpackage/dist/build/h5/static/js/pages-money-withdrawal.77fcfd7a.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-withdrawal.77fcfd7a.js
--- a/unpackage/dist/build/h5/static/js/pages-order-createOrder.0b260052.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-createOrder.0b260052.js
--- a/unpackage/dist/build/h5/static/js/pages-order-createOrder.ac932895.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-createOrder.ac932895.js
--- a/unpackage/dist/build/h5/static/js/pages-order-order.be0af5e0.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-order.be0af5e0.js
--- a/unpackage/dist/build/h5/static/js/pages-order-order.d92a0b1e.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-order.d92a0b1e.js
--- a/unpackage/dist/build/h5/static/js/pages-product-exchange.8844a9f7.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-exchange.8844a9f7.js
--- a/unpackage/dist/build/h5/static/js/pages-product-exchange.f319441e.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-exchange.f319441e.js
--- a/unpackage/dist/build/h5/static/js/pages-product-jindouProduct.dc50b449.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-jindouProduct.dc50b449.js
--- a/unpackage/dist/build/h5/static/js/pages-product-newPeople.34f75b9f.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-newPeople.34f75b9f.js
--- a/unpackage/dist/build/h5/static/js/pages-product-newPeople.58aaa6e4.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-newPeople.58aaa6e4.js
--- a/unpackage/dist/build/h5/static/js/pages-product-product.42bf6206.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-product.42bf6206.js
--- a/unpackage/dist/build/h5/static/js/pages-product-product.f198a721.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-product.f198a721.js
--- a/unpackage/dist/build/h5/static/js/pages-product-realyWhole.ce56f5fd.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-realyWhole.ce56f5fd.js
--- a/unpackage/dist/build/h5/static/js/pages-product-store.b5cc00d1.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-store.b5cc00d1.js
--- a/unpackage/dist/build/h5/static/js/pages-product-store.c88313dc.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-store.c88313dc.js
--- a/unpackage/dist/build/h5/static/js/pages-product-wholesale.1bcbffd8.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-wholesale.1bcbffd8.js
--- a/unpackage/dist/build/h5/static/js/pages-product-wholesale.66026afd.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-wholesale.66026afd.js
--- a/unpackage/dist/build/h5/static/js/pages-product-wholesaleDetail.7bbc1927.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-wholesaleDetail.7bbc1927.js
--- a/unpackage/dist/build/h5/static/js/pages-product-wholesaleDetail.cdf9783e.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-wholesaleDetail.cdf9783e.js
--- a/unpackage/dist/build/h5/static/js/pages-public-login.4ff50950.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-login.4ff50950.js
--- a/unpackage/dist/build/h5/static/js/pages-public-login.942ca270.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-login.942ca270.js
--- a/unpackage/dist/build/h5/static/js/pages-public-register.1f4b259a.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-register.1f4b259a.js
--- a/unpackage/dist/build/h5/static/js/pages-public-register.3306d6a0.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-register.3306d6a0.js
--- a/unpackage/dist/build/h5/static/js/pages-redirect-redirect.4aa7aafa.js
+++ b/unpackage/dist/build/h5/static/js/pages-redirect-redirect.4aa7aafa.js
--- a/unpackage/dist/build/h5/static/js/pages-redirect-redirect.a49dfc68.js
+++ b/unpackage/dist/build/h5/static/js/pages-redirect-redirect.a49dfc68.js
--- a/unpackage/dist/build/h5/static/js/pages-set-address.fbb23572.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-address.fbb23572.js
--- a/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-user-user.b63db7fb.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-user-user.b63db7fb.js
--- a/unpackage/dist/build/h5/static/js/pages-set-password.04cbc0a0.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-password.04cbc0a0.js
--- a/unpackage/dist/build/h5/static/js/pages-set-userinfo.c606cd7e.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-userinfo.c606cd7e.js
--- a/unpackage/dist/build/h5/static/js/pages-set-userinfo.e60032ac.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-userinfo.e60032ac.js
--- a/unpackage/dist/build/h5/static/js/pages-user-JDcool.16631ac6.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-JDcool.16631ac6.js
--- a/unpackage/dist/build/h5/static/js/pages-user-JDcool.be410617.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-JDcool.be410617.js
--- a/unpackage/dist/build/h5/static/js/pages-user-award.ba3ff6f2.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-award.ba3ff6f2.js
--- a/unpackage/dist/build/h5/static/js/pages-user-award.c9190fd8.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-award.c9190fd8.js
--- a/unpackage/dist/build/h5/static/js/pages-user-buySellDetail.5f7b468d.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-buySellDetail.5f7b468d.js
--- a/unpackage/dist/build/h5/static/js/pages-user-buySellDetail.ae67189c.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-buySellDetail.ae67189c.js
--- a/unpackage/dist/build/h5/static/js/pages-user-buySellDetail~pages-user-myWholesale.aa63b4e2.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-buySellDetail~pages-user-myWholesale.aa63b4e2.js
--- a/unpackage/dist/build/h5/static/js/pages-user-favorites.2a86a61f.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-favorites.2a86a61f.js
--- a/unpackage/dist/build/h5/static/js/pages-user-favorites.70c6995f.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-favorites.70c6995f.js
--- a/unpackage/dist/build/h5/static/js/pages-user-integralTransforms.c3265c66.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-integralTransforms.c3265c66.js
--- a/unpackage/dist/build/h5/static/js/pages-user-integralTransforms.fc71b9dc.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-integralTransforms.fc71b9dc.js
--- a/unpackage/dist/build/h5/static/js/pages-user-jindou.aed9af47.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-jindou.aed9af47.js
--- a/unpackage/dist/build/h5/static/js/pages-user-jindou.cd9b358f.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-jindou.cd9b358f.js
--- a/unpackage/dist/build/h5/static/js/pages-user-jinquan.71c6979d.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-jinquan.71c6979d.js
--- a/unpackage/dist/build/h5/static/js/pages-user-myWholesale.0c0255cc.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-myWholesale.0c0255cc.js
--- a/unpackage/dist/build/h5/static/js/pages-user-myWholesale.48d3be72.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-myWholesale.48d3be72.js
--- a/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.e26e22c1.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.e26e22c1.js
--- a/unpackage/dist/build/h5/static/js/pages-user-team.7dde5f2e.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-team.7dde5f2e.js
--- a/unpackage/dist/build/h5/static/js/pages-user-team.b1acb989.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-team.b1acb989.js
--- a/unpackage/dist/build/h5/static/js/pages-user-user.f7a71d93.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-user.f7a71d93.js
--- a/unpackage/dist/build/h5/static/js/pages-user-user.ff07feeb.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-user.ff07feeb.js
--- a/unpackage/dist/build/h5/static/js/pages-user-withdrawal.17611d9d.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-withdrawal.17611d9d.js
--- a/unpackage/dist/build/h5/static/js/pages-user-withdrawal.c6ef132a.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-withdrawal.c6ef132a.js
--- a/unpackage/dist/build/h5/static/user/jinquan.png
+++ b/unpackage/dist/build/h5/static/user/jinquan.png
--- a/unpackage/dist/build/h5/static/user/jjbg.png
+++ b/unpackage/dist/build/h5/static/user/jjbg.png
--- a/unpackage/dist/build/h5/static/user/tuiguang1.png
+++ b/unpackage/dist/build/h5/static/user/tuiguang1.png
--- a/unpackage/dist/build/h5/static/user/u7.png
+++ b/unpackage/dist/build/h5/static/user/u7.png
--- a/unpackage/dist/build/h5/tl-1-4-5.rar
+++ b/unpackage/dist/build/h5/tl-1-4-5.rar
--- a/utils/wxAuthorized.js
+++ b/utils/wxAuthorized.js
@@ -75,7 +75,8 @@ function weixinSq() {
 
				 
			
 
				 // 微信注册
			
 
				 export async function weixindata(config) {
			
 
				-	let url;
			
 
				+	let url;

			
 
				+	store.commit('setWeiChatObj', weixinObj)
			
 
				 	try {
			
 
				 		// 判断是否存在router
			
 
				 		if (!router) {