3 vuotta sitten · fd074e8943
--- a/pages/money/pay.vue
+++ b/pages/money/pay.vue
@@ -225,16 +225,30 @@ export default {
 
				 				mask: true
			
 
				 			})
			
 
				 			// 判断是否余额不足
			
 
				-			if (obj.payName == 'yue' && +obj.now_money < obj.money) {
			
 
				+			if (obj.payName == 'pink_integral' && +obj.userInfo.pink_integral < obj.money) {
			
 
				 				uni.showModal({
			
 
				 					title: '提示',
			
 
				-					content: '账户余额不足！',
			
 
				+					content: '拼团积分不足！',
			
 
				 					showCancel: false,
			
 
				 					success: res => {},
			
 
				 					fail: () => {},
			
 
				 					complete: () => {}
			
 
				-				});
			
 
				+				});

			
 
				+				uni.hideLoading()
			
 
				 				return;
			
 
				+			}

			
 
				+			// 判断是否拼团积分不足

			
 
				+			if (obj.payName == 'yue' && +obj.now_money < obj.money) {

			
 
				+				uni.showModal({

			
 
				+					title: '提示',

			
 
				+					content: '账户余额不足！',

			
 
				+					showCancel: false,

			
 
				+					success: res => {},

			
 
				+					fail: () => {},

			
 
				+					complete: () => {}

			
 
				+				});

			
 
				+				uni.hideLoading()

			
 
				+				return;

			
 
				 			}
			
 
				 			// 支付中
			
 
				 			obj.payLoding = true;
			
--- a/store/index.js
+++ b/store/index.js
@@ -12,8 +12,7 @@ Vue.use(Vuex)
 
				 const store = new Vuex.Store({
			
 
				 	state: {
			
 
				 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
			
 
				-		// baseURL:'http://lnpt.frp.liuniu946.com',//请求地址配置 
			
 
				-		baseURL:'https://xl.liuniu946.com/',//请求地址配置 
			
 
				+		baseURL:'https://xl.liuniu946.com',//请求地址配置 
			
 
				 		urlFile:'/index',//项目部署所在文件夹
			
 
				 		userInfo: {}, //登录信息
			
 
				 		loginInterceptor:false,//是否打开强制登录
			
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,10 @@
 
				 <!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.520954c1.js></script><script src=/index/static/js/index.c33995df.js></script></body></html>
			
 
				+<<<<<<< HEAD
			
 
				+            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.520954c1.js></script><script src=/index/static/js/index.c33995df.js></script></body></html>
			
 
				+=======
			
 
				+<<<<<<< HEAD
			
 
				+            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.fd8e0a16.js></script><script src=/index/static/js/index.fbde1233.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.520954c1.js></script><script src=/index/static/js/index.18db8cbc.js></script></body></html>
			
 
				+>>>>>>> 36454b703a427b7eecd45bbd3f7a0b56c9aa477d
			
 
				+>>>>>>> bdca7df13a2787003bb166924df55385c0b76707
			
--- a/unpackage/dist/build/h5/static/js/chunk-vendors.fd8e0a16.js
+++ b/unpackage/dist/build/h5/static/js/chunk-vendors.fd8e0a16.js
--- a/unpackage/dist/build/h5/static/js/index.fbde1233.js
+++ b/unpackage/dist/build/h5/static/js/index.fbde1233.js
--- a/unpackage/dist/build/h5/static/js/pages-activity-bargain-index.a226ea3f.js
+++ b/unpackage/dist/build/h5/static/js/pages-activity-bargain-index.a226ea3f.js
--- a/unpackage/dist/build/h5/static/js/pages-activity-goods_bargain-index.3019ab1e.js
+++ b/unpackage/dist/build/h5/static/js/pages-activity-goods_bargain-index.3019ab1e.js
--- a/unpackage/dist/build/h5/static/js/pages-activity-goods_bargain_details-index.c8ca1336.js
+++ b/unpackage/dist/build/h5/static/js/pages-activity-goods_bargain_details-index.c8ca1336.js
--- a/unpackage/dist/build/h5/static/js/pages-cart-cart.db6276b7.js
+++ b/unpackage/dist/build/h5/static/js/pages-cart-cart.db6276b7.js
--- a/unpackage/dist/build/h5/static/js/pages-category-category.88f12c53.js
+++ b/unpackage/dist/build/h5/static/js/pages-category-category.88f12c53.js
--- a/unpackage/dist/build/h5/static/js/pages-index-index.b0a209f7.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-index.b0a209f7.js
--- a/unpackage/dist/build/h5/static/js/pages-index-sign.753c2e4d.js
+++ b/unpackage/dist/build/h5/static/js/pages-index-sign.753c2e4d.js
--- a/unpackage/dist/build/h5/static/js/pages-money-account.f099545c.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-account.f099545c.js
--- a/unpackage/dist/build/h5/static/js/pages-money-pay.2d008c5a.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-pay.2d008c5a.js
--- a/unpackage/dist/build/h5/static/js/pages-money-paySuccess.78d0c12d.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-paySuccess.78d0c12d.js
--- a/unpackage/dist/build/h5/static/js/pages-money-recharge.58b6357a.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-recharge.58b6357a.js
--- a/unpackage/dist/build/h5/static/js/pages-money-wallet.8c33a812.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-wallet.8c33a812.js
--- a/unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-award~pages-user-coupon~pages-user-favorites~pages-u~bf4a43c1.d78b0581.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-wallet~pages-order-order~pages-user-award~pages-user-coupon~pages-user-favorites~pages-u~bf4a43c1.d78b0581.js
--- a/unpackage/dist/build/h5/static/js/pages-money-withdrawal.d727ed28.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-withdrawal.d727ed28.js
--- a/unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-groupBooking-produ~ce3fa962.0bb45eb4.js
+++ b/unpackage/dist/build/h5/static/js/pages-money-withdrawal~pages-order-evaluate~pages-order-expressInfo~pages-product-groupBooking-produ~ce3fa962.0bb45eb4.js
--- a/unpackage/dist/build/h5/static/js/pages-order-createOrder.f50851d4.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-createOrder.f50851d4.js
--- a/unpackage/dist/build/h5/static/js/pages-order-evaluate.8325171f.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-evaluate.8325171f.js
--- a/unpackage/dist/build/h5/static/js/pages-order-expressInfo.029b00d5.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-expressInfo.029b00d5.js
--- a/unpackage/dist/build/h5/static/js/pages-order-order.23d6f036.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-order.23d6f036.js
--- a/unpackage/dist/build/h5/static/js/pages-order-orderDetail.c7ee0e3a.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-orderDetail.c7ee0e3a.js
--- a/unpackage/dist/build/h5/static/js/pages-order-orderRefund.df3e15d3.js
+++ b/unpackage/dist/build/h5/static/js/pages-order-orderRefund.df3e15d3.js
--- a/unpackage/dist/build/h5/static/js/pages-product-classify.efc8f3ca.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-classify.efc8f3ca.js
--- a/unpackage/dist/build/h5/static/js/pages-product-groupBooking-detail.d89bce8d.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-groupBooking-detail.d89bce8d.js
--- a/unpackage/dist/build/h5/static/js/pages-product-groupBooking-index.bacbd205.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-groupBooking-index.bacbd205.js
--- a/unpackage/dist/build/h5/static/js/pages-product-groupBooking-inviteImg.90af2692.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-groupBooking-inviteImg.90af2692.js
--- a/unpackage/dist/build/h5/static/js/pages-product-groupBooking-productCollage.104b6351.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-groupBooking-productCollage.104b6351.js
--- a/unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.460bdf9a.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup.460bdf9a.js
--- a/unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup~pages-product-product.e561713c.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-groupBooking-productGroup~pages-product-product.e561713c.js
--- a/unpackage/dist/build/h5/static/js/pages-product-list.1faeca9a.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-list.1faeca9a.js
--- a/unpackage/dist/build/h5/static/js/pages-product-product.f5c076ee.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-product.f5c076ee.js
--- a/unpackage/dist/build/h5/static/js/pages-product-reply.3c537e00.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-reply.3c537e00.js
--- a/unpackage/dist/build/h5/static/js/pages-product-search.e2e0011f.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-search.e2e0011f.js
--- a/unpackage/dist/build/h5/static/js/pages-product-seckill.b9c717ce.js
+++ b/unpackage/dist/build/h5/static/js/pages-product-seckill.b9c717ce.js
--- a/unpackage/dist/build/h5/static/js/pages-public-forget.9303a859.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-forget.9303a859.js
--- a/unpackage/dist/build/h5/static/js/pages-public-login.7b986234.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-login.7b986234.js
--- a/unpackage/dist/build/h5/static/js/pages-public-register.d0942762.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-register.d0942762.js
--- a/unpackage/dist/build/h5/static/js/pages-public-wxLogin.6c81f680.js
+++ b/unpackage/dist/build/h5/static/js/pages-public-wxLogin.6c81f680.js
--- a/unpackage/dist/build/h5/static/js/pages-redirect-redirect.95b18648.js
+++ b/unpackage/dist/build/h5/static/js/pages-redirect-redirect.95b18648.js
--- a/unpackage/dist/build/h5/static/js/pages-set-address.ca1b533b.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-address.ca1b533b.js
--- a/unpackage/dist/build/h5/static/js/pages-set-addressManage.d82c557a.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-addressManage.d82c557a.js
--- a/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-user-user.27f58955.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-addressManage~pages-set-set~pages-user-user.27f58955.js
--- a/unpackage/dist/build/h5/static/js/pages-set-password.77bc0b29.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-password.77bc0b29.js
--- a/unpackage/dist/build/h5/static/js/pages-set-phone.11af2a44.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-phone.11af2a44.js
--- a/unpackage/dist/build/h5/static/js/pages-set-set.0a0c5370.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-set.0a0c5370.js
--- a/unpackage/dist/build/h5/static/js/pages-set-userinfo.2c7ec5a5.js
+++ b/unpackage/dist/build/h5/static/js/pages-set-userinfo.2c7ec5a5.js
--- a/unpackage/dist/build/h5/static/js/pages-user-award.c4a2ede2.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-award.c4a2ede2.js
--- a/unpackage/dist/build/h5/static/js/pages-user-coupon.698025f1.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-coupon.698025f1.js
--- a/unpackage/dist/build/h5/static/js/pages-user-favorites.dd05c6b1.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-favorites.dd05c6b1.js
--- a/unpackage/dist/build/h5/static/js/pages-user-notice.e3b18590.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-notice.e3b18590.js
--- a/unpackage/dist/build/h5/static/js/pages-user-scoreAccumulate.8a668d9d.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-scoreAccumulate.8a668d9d.js
--- a/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.1ec77227.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-shareQrCode.1ec77227.js
--- a/unpackage/dist/build/h5/static/js/pages-user-user.e070eefe.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-user.e070eefe.js
--- a/unpackage/dist/build/h5/static/js/pages-user-withdrawal.ee80005d.js
+++ b/unpackage/dist/build/h5/static/js/pages-user-withdrawal.ee80005d.js
--- a/utils/wxAuthorized.js
+++ b/utils/wxAuthorized.js
@@ -55,9 +55,15 @@ function weixinSq() {
 
				 	// 微信授权后跳转页面
			
 
				 	try {
			
 
				 		// 判断是否真实路由模式
			
 
				+<<<<<<< HEAD
			
 
				 		// const type = router.mode === "history"?'':'/#'
			
 
				 		// let ul = encodeURIComponent(store.state.baseURL + store.state.urlFile +type+ '/pages/redirect/redirect');
			
 
				 		let ul = encodeURIComponent(store.state.baseURL + store.state.urlFile + '/#/pages/redirect/redirect');
			
 
				+=======
			
 
				+		const type = router.mode === "history"?'':'/#'
			
 
				+		console.log(type)
			
 
				+		let ul = encodeURIComponent(store.state.baseURL + store.state.urlFile +type+ '/pages/redirect/redirect');
			
 
				+>>>>>>> bdca7df13a2787003bb166924df55385c0b76707
			
 
				 		// 打开微信授权页面
			
 
				 		let url =
			
 
				 			'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +