Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

# Conflicts:
#	plugin/api.js

pages/order-submit/order-submit2.vue

@@ -445,6 +445,7 @@
 				}
 				this.requestJJSWAdmin(testCmd, postMsg,
 					(res) => {
+						console.log("111",res);
 						if (res.data.Data.length > 0) {
 							this.namelist = res.data.Data
 							this.Thename = res.data.Data[0].StuName
@@ -560,6 +561,20 @@
 								},
 								res => {
 									if (res.resultCode == 1) {
+										that.payInfo.OrderId = res.data.OrderId;
+										that.payInfo.total_price = that.ds.total_price;
+										if(res.data.OrderStatus==5){
+											let info = {
+												OrderId:that.payInfo.OrderId,
+												total_price: that.ds.total_price,
+												StuId:that.JJSWStuId,
+												TeacherIds:that.mrk,
+											}
+											uni.reLaunch({
+												url: '/pages/order-submit/pay-success2?payInfo=' +
+													JSON.stringify(info)
+											})
+										}else {
 											if (that.checked == true) {
 												that.zhaoren = true;
 												let u = uni.getStorageSync("mall_UserInfo");
@@ -574,8 +589,7 @@
 													"&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({
@@ -586,6 +600,8 @@
 													that.payBtn = true;
 												}
 											}
+										}
+										
 									} else {
 										that.$refs.uToast.show({
 											title: res.data.message,
@@ -737,13 +753,10 @@
 									list.push(j.EduTeacherId) 
 								})
 							})
-							// console.log('88888888888888888',list)
 							this.mrk = list.toString()
-							// console.log('88888888888888888',this.mrk)
 							this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0, 10);
 							this.formdata.DeliveryMethod = this.mchs[0].delivery.send_type;
 							this.ds = res.data;
-							console.log("this.ds ", this.ds)
 							this.expressPrice = 0.0;
 							this.goodPrice = 0.0;
 							this.couponPrice = 0.0;
@@ -791,12 +804,10 @@
 									0) {
 									rootItem.GoodsRelevanceList.forEach(qitem => {
 										tempRelevancePrice += parseFloat(qitem.RelevancePrice);
-										console.log("tempRelevancePrice1", tempRelevancePrice)
 									})
 								}
 							})
 						}
-						console.log("tempRelevancePrice2", tempRelevancePrice)
 						//HK 2022-10-11 新增结束
 						this.goodPrice += parseFloat(x.total_goods_price) + parseFloat(tempRelevancePrice);
 						this.expressPrice += parseFloat(x.express_price);

pages/order-submit/pay-success2.vue

@@ -75,12 +75,12 @@
 		onLoad(option) {
 			if (option.payInfo) {
 				this.payInfo = JSON.parse(option.payInfo)
+				if (this.payInfo.StuId) {
+					this.StuId = this.payInfo.StuId
 				}
-			if (option.StuId) {
-				this.StuId = option.StuId
+				if (this.payInfo.TeacherIds) {
+					this.TeacherIds = this.payInfo.TeacherIds
 				}
-			if (option.TeacherIds) {
-				this.TeacherIds = option.TeacherIds
 			}
 			uni.setNavigationBarTitle({
 				title: "支付成功",

plugin/api.js

@@ -3,6 +3,7 @@ export default {
 		Vue.prototype.host = "https://wx.weibaoge.cn/web/index.php?_mall_id=1285"
 
 		Vue.prototype.host2 = "http://192.168.10.128:8200"//本地
+
 		// Vue.prototype.host2 = "http://192.168.10.46:8200"
 		 // Vue.prototype.host2 = "https://mallApi.oytour.com"//测试
 		//进阶思维后台地址
@@ -139,20 +140,25 @@ export default {
 					msg: postMsg
 				},
 				success: res => {
-					if (res.Code == 10000) {
+					if (res.data.Code == 10000) {
 						let u = uni.getStorageSync("mall_UserInfo");
 						if (u) {
 							this.getLogin_t(u)
 						}
+
 					} else if (res.Code == 1) {
+
+					} else if (res.data.Code != 1) {
+
 						if (res.Message != '') {
 							uni.showToast({
 								title: res.Message,
 								icon: "none",
 							});
 						}
-						typeof failed == "function" && failed(res
-						);
+
+
+						typeof failed == "function" && failed(res);
 					} else {
 						typeof success == "function" && success(res);
 					}