Merge branch 'dev' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x

pages/member/index.vue

@@ -234,9 +234,22 @@
 								title: "支付成功"
 							})
 							uni.hideLoading()
-							setTimeout(res => {
-								uni.navigateBack()
-							}, 500)
+							let pages = getCurrentPages()
+							if ( pages.length > 1) {
+								setTimeout(res => {
+									uni.navigateBack()
+								}, 500)
+							} else {
+								uni.exitMiniProgram({
+								    success: function () {
+								      console.log('退出成功');
+								    },
+								    fail: function () {
+								      console.log('退出失败');
+								    }
+								});
+							}
+						
 						},
 						fail: (res) => {
 							uni.hideLoading()