feat: update

kitchen/pay/index.vue

@@ -84,15 +84,24 @@
 					shop_id: this.id,
 				}, { silent: false, nested: true}).then((res) => {
 					console.log('esa', res);
-					wx.hideLoading();
+					uni.hideLoading();
-					this.password = '',
+					this.password = '';
-					wx.showToast({
+					// 根据code 判断当前是否支付成功，1 成功 0 失败
+					if (res.code === 1) {
+						uni.showToast({
 							title: res.msg,
 							icon:"none"
 						})
-					// setTimeout(()=>{
+						setTimeout(()=>{
-					// 		wx.navigateBack({delta:1})
+							uni.navigateBack({delta:1})
-					// },1500)
+						},1500)
+					} else {
+						// 否则判定支付失败
+						uni.showToast({
+							title: res.msg,
+							icon:"none"
+						})
+					}
 				})
 			},
 		}

kitchen/recharge/index.vue

@@ -89,7 +89,7 @@
 				console.log('拉卡拉预下单接口调用成功', res1);
 				
 				const {resp_data,msg} = res1;
-				wx.hideLoading()
+				uni.hideLoading()
 				if(msg == '成功'){
 					const provider = await getProviderPromise('payment');
 					console.log('获取当前支付渠道', provider);

pages/login/login.vue

@@ -79,7 +79,7 @@
 							      }
 							    });
 							  } else {
-							    wx.showToast({
+							    uni.showToast({
 							      title: '登录失败',
 							      icon: 'error',
 							      mask: true,

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -19355,7 +19355,7 @@ var request = function request(url) {
     silent = _options$silent === void 0 ? true : _options$silent,
     _options$nested = options.nested,
     nested = _options$nested === void 0 ? false : _options$nested;
-  var ctoken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkZWFsZXJfaWQiOjAsImV4cCI6MTc0NDg1MDI4NywiaW1nIjoiIiwibXNob3BfaWQiOjAsIm9wZW5faWQiOiJvV2MxODY3b2dYZ0RHektneWtkLUpTM0dVT2tFIiwicm9sZV9pZCI6MSwidXNlcl9pZCI6MTAzLCJ1c2VyX25hbWUiOiLlvq7kv6HnlKjmiLciLCJ3c2hvcF9pZCI6MH0.TpANZ_g9UHz6HqyTTk7-2BazRB-gQcK_CsgdLqEBXSQ';
+  var ctoken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkZWFsZXJfaWQiOjIsImV4cCI6MTc0NDk2ODc1NCwiaW1nIjoiIiwibXNob3BfaWQiOjksIm9wZW5faWQiOiJvV2MxODY3b2dYZ0RHektneWtkLUpTM0dVT2tFIiwicm9sZV9pZCI6MSwidXNlcl9pZCI6MTAzLCJ1c2VyX25hbWUiOiLlvq7kv6HnlKjmiLciLCJ3c2hvcF9pZCI6OX0.fwtxEHXgdX68jPi8nffCha1VFnua78_qmuXdr2LHTQE';
 
   // if (options.token) {
   // 	ctoken = options.token;
@@ -19545,9 +19545,7 @@ var upload = function upload(filename, fn) {
 exports.upload = upload;
 var menuButtonInfo = function menuButtonInfo() {
   var systemInfo = uni.getSystemInfoSync();
-  console.log('123133123131131', systemInfo);
   var platform = systemInfo.platform;
-  console.log('执行不到后边', systemInfo.uniPlatform);
   if (platform === 'ios') {
     // TODO: ios待测试
     return {
@@ -19556,7 +19554,6 @@ var menuButtonInfo = function menuButtonInfo() {
     };
   }
   if (platform === 'android') {
-    console.log('走到这列 andro');
     return {
       height: systemInfo.statusBarHeight,
       top: 44 // 自定义导航栏默认高度

utils/index.js

@@ -37,7 +37,7 @@ export const NavgateTo = (path, options = {}) => {
 export const request = (url, method = 'POST', data = {}, options = {}) => {
 	console.log('options', options);
 	const { silent = true, nested = false  } = options;
-	  let ctoken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkZWFsZXJfaWQiOjAsImV4cCI6MTc0NDg1MDI4NywiaW1nIjoiIiwibXNob3BfaWQiOjAsIm9wZW5faWQiOiJvV2MxODY3b2dYZ0RHektneWtkLUpTM0dVT2tFIiwicm9sZV9pZCI6MSwidXNlcl9pZCI6MTAzLCJ1c2VyX25hbWUiOiLlvq7kv6HnlKjmiLciLCJ3c2hvcF9pZCI6MH0.TpANZ_g9UHz6HqyTTk7-2BazRB-gQcK_CsgdLqEBXSQ';
+	  let ctoken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkZWFsZXJfaWQiOjIsImV4cCI6MTc0NDk2ODc1NCwiaW1nIjoiIiwibXNob3BfaWQiOjksIm9wZW5faWQiOiJvV2MxODY3b2dYZ0RHektneWtkLUpTM0dVT2tFIiwicm9sZV9pZCI6MSwidXNlcl9pZCI6MTAzLCJ1c2VyX25hbWUiOiLlvq7kv6HnlKjmiLciLCJ3c2hvcF9pZCI6OX0.fwtxEHXgdX68jPi8nffCha1VFnua78_qmuXdr2LHTQE';
 
 	// if (options.token) {
 	// 	ctoken = options.token;
@@ -228,9 +228,7 @@ export const upload = (filename, fn) => {
 // 
 export const menuButtonInfo = () => {
 	const systemInfo = uni.getSystemInfoSync();
-	console.log('123133123131131', systemInfo);
 	const platform = systemInfo.platform;
-	console.log('执行不到后边', systemInfo.uniPlatform);
 	
 	if (platform === 'ios') {
 		// TODO: ios待测试
@@ -241,7 +239,6 @@ export const menuButtonInfo = () => {
 	  }
 		
 		if (platform === 'android') {
-			console.log('走到这列 andro')
 	    return {
 				height: systemInfo.statusBarHeight,
 				top: 44, // 自定义导航栏默认高度