积分抵扣、霸王餐、优惠券分享新增

framework/0-conf.js

@@ -6,10 +6,10 @@ const proxyApi = "/api"
 // const proxyApi = 'http://192.168.1.15:9888/cashierService' // 王伟
 // const proxyApi = 'http://192.168.1.27:9888/cashierService' // 帆哥
 // const proxyApiwws = 'ws://192.168.1.15:9888/netty' // 测试
-// const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试
-// const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/netty' // 测试
-const proxyApi = 'https://cashier.sxczgkj.cn/cashierService' // 线上
-const proxyApiwws = 'wss://cashier.sxczgkj.cn/netty' // 线上
+const proxyApi = 'https://wxcashiertest.sxczgkj.cn/cashierService' // 测试
+const proxyApiwws = 'wss://wxcashiertest.sxczgkj.cn/netty' // 测试
+// const proxyApi = 'https://cashier.sxczgkj.cn/cashierService' // 线上
+// const proxyApiwws = 'wss://cashier.sxczgkj.cn/netty' // 线上 
 // #endif
 
 // #ifdef H5

framework/1-utils.js

@@ -260,6 +260,7 @@ const getUserInfo = function (successCallback, failCallback) {
 						},
 						fail: (err) => {}
 					});
+					
 				
 				}
 			});
@@ -269,23 +270,23 @@ const getUserInfo = function (successCallback, failCallback) {
 	// #ifdef MP-ALIPAY	
 		return new Promise((resolve, reject) => {
 			my.getAuthCode({
-				scopes: 'auth_user',
-				success: (data) => {
+				scopes: 'auth_base',
+				success: async (data) => {
 					console.log(data)
 					// 支付宝小程序环境
-					my.getAuthUserInfo({
-					  success: async (infoRes) => {
+					// my.getAuthUserInfo({
+					  // success: async (infoRes) => {
 						let res = await Api.userwxlogin({
 							code: data.authCode, //临时登录凭证
-							rawData: JSON.stringify(infoRes),
+							// rawData: JSON.stringify(infoRes),
 							source: 'alipay'
 						})
 						if (res.code == 0) {
 							resolve(res)
 						}
-					  },
-					  fail: (err) => {}
-					});
+					  // },
+					  // fail: (err) => {}
+					// });
 				}
 			});
 		})

framework/11-api.js

@@ -125,7 +125,6 @@ async function request(options) {
 				uni.cache.set('storage:offset-time', offset, -1)
 				return await request(options)
 			} else {
-				console.log(options)
 				uni.showToast({
 					title: res.message || res.msg || res.error,
 					icon: "none",