Merge branch 'master' of http://192.168.40.220/dmc/jz_applet into master

pages/recharge/recharge.vue

@@ -233,7 +233,7 @@
 	function go() {
 		uni.showModal({
 			title: '提示',
-			content: '检测到你有一笔未充值的订单，请先进行充值！',
+			content: '待消费订单',
 			success: () => {
 				//走蓝牙进行修复
 				uni.redirectTo({

utils/network/request.js

@@ -117,6 +117,9 @@ export function request(code, options = {}, start = false) {
 						showCancel: false,
 						success: function(res) {
 							if (res.confirm) {
+								uni.navigateBack({
+									delta: 1
+								})
 								uni.navigateTo({
 									url: '/login/login',
 								})