no message

components/pay/submit2Pay.vue

@@ -68,7 +68,6 @@
 				this.$emit('closePay');
 			},
 			Pay() {
-				let that = this
 				let msg = {
 					'pay_channel': this
 					.payType, //网页打开支付宝支付：alipay_wap 支付宝正扫：alipay_qr 支付宝app：alipay 微信小程序：wx_lite 微信公众号：wx_pub
@@ -88,25 +87,10 @@
 						this.loading = false
 						uni.hideLoading()
 						if (res.data != '') {
-							if(res.data.OrderStatus==5){
-								if (that.u && that.u.TenantId == 27) {
-									uni.navigateTo({
-										url: `/pages/order-submit/pay-success2?payInfo=${JSON.stringify(that.payInfo)}&StuId=${that.StuId}&TeacherIds=${that.TeacherIds}`
-									});
-									that.pay = false
-								} else {
-									uni.navigateTo({
-										url: '/pages/order-submit/pay-success?payInfo=' + JSON.stringify(that
-											.payInfo)
-									});
-									that.pay = false
-								}
-							}else{
-								if (this.payType != 'wx_lite') {
-									this.aliPay(res.data)
-								} else {
-									this.wxPay(JSON.parse(res.data))
-								}
+							if (this.payType != 'wx_lite') {
+								this.aliPay(res.data)
+							} else {
+								this.wxPay(JSON.parse(res.data))
 							}
 						} else {
 							uni.showToast({

pages/order-submit/order-submit2.vue

@@ -561,32 +561,41 @@
 								},
 								res => {
 									if (res.resultCode == 1) {
-										if (that.checked == true) {
-											that.zhaoren = true;
-											let u = uni.getStorageSync("mall_UserInfo");
-											let uid = u.UserId ? u.UserId : 0;
-											let Up = u.UserPageType ? u.UserPageType : 0;
-											let SmallShopId = u.SmallShopId ? u.SmallShopId : 0;
-											if (SmallShopId == 0) {
-												//如果微店id为0 去找所属微店id
-												SmallShopId = u.UserSmallShopId ? u.UserSmallShopId : 0;
-											}
-											that.path = '/pages/index/index?OrderId=' + res.data.OrderId +
-												"&user_id=" + uid + "&Up=" + Up +
-												"&SmallShopId=" + SmallShopId + '&JumpType=4';
-										} else {
-											that.payInfo.OrderId = res.data.OrderId;
-											that.payInfo.total_price = that.ds.total_price;
-											if (that.formdata.Use_Deposit_Id != 0 && that.ds.total_price ==
-												0) { //如果使用了储蓄卡 就直接支付成功 跳入支付结果
-												uni.reLaunch({
+										that.payInfo.OrderId = res.data.OrderId;
+										that.payInfo.total_price = that.ds.total_price;
+										if(res.data.OrderStatus==5){
+											uni.reLaunch({
 													url: '/pages/order-submit/pay-success?payInfo=' +
 														JSON.stringify(that.payInfo)
 												})
-											} else { //没使用的话 就弹出支付页面
-												that.payBtn = true;
+										}else {
+											if (that.checked == true) {
+												that.zhaoren = true;
+												let u = uni.getStorageSync("mall_UserInfo");
+												let uid = u.UserId ? u.UserId : 0;
+												let Up = u.UserPageType ? u.UserPageType : 0;
+												let SmallShopId = u.SmallShopId ? u.SmallShopId : 0;
+												if (SmallShopId == 0) {
+													//如果微店id为0 去找所属微店id
+													SmallShopId = u.UserSmallShopId ? u.UserSmallShopId : 0;
+												}
+												that.path = '/pages/index/index?OrderId=' + res.data.OrderId +
+													"&user_id=" + uid + "&Up=" + Up +
+													"&SmallShopId=" + SmallShopId + '&JumpType=4';
+											} else {
+												
+												if (that.formdata.Use_Deposit_Id != 0 && that.ds.total_price ==
+													0) { //如果使用了储蓄卡 就直接支付成功 跳入支付结果
+													uni.reLaunch({
+														url: '/pages/order-submit/pay-success?payInfo=' +
+															JSON.stringify(that.payInfo)
+													})
+												} else { //没使用的话 就弹出支付页面
+													that.payBtn = true;
+												}
 											}
 										}
+										
 									} else {
 										that.$refs.uToast.show({
 											title: res.data.message,