From 9d087e61415733d127dfbd8e3f3a58c14bc6498f Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Tue, 25 Jan 2022 14:12:14 +0800
Subject: [PATCH] 订单修改

---
 packageA/pages/cart2_ser/cart2_ser.js                     | 23 +++++++++++++++++------
 packageA/pages/details_serviceCard/details_serviceCard.js | 13 +++++++------
 pages/user/order_list/order_list.js                       |  9 +++------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js
index 157b074..34a44ab 100644
--- a/packageA/pages/cart2_ser/cart2_ser.js
+++ b/packageA/pages/cart2_ser/cart2_ser.js
@@ -166,13 +166,21 @@ Page({
 				for (var i = 0; i < carr.length; i++) {
 					var good = null;
 					var item = carr[i];
-					await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {}).then(
+					await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {})
+					.then(
 						res => {
-							good = res.data.data;
+							console.log('+++++++++', res.data.code);
+							if(res.data.code == 0) {
+								good = res.data.data;
+								item.img_url = oo.imghost + good.imgUrl;
+								item.erpItemID = good.erpItemID;
+							}
+							
 						})
-
-					item.img_url = oo.imghost + good.imgUrl;
-					item.erpItemID = good.erpItemID;
+						
+						// console.log('+++++++++', good);
+					// item.img_url = oo.imghost + good.imgUrl;
+					// item.erpItemID = good.erpItemID;
 
 					/*----接口要弄出来的，先顶着-----*/
 					var pcid = item.pick_id;
@@ -542,6 +550,7 @@ Page({
 				if (res.statusCode == 200) {
 					var data = res.data;
 					if (data.code == 0) {
+						th.data.order_id = data.data.order_id;
 						// console.log('myyyyyyyyyyyyyyyyyy', data.data);
 						if (th.data.is_cart) {
 							var list = th.data.cartlist_y;
@@ -563,7 +572,9 @@ Page({
 									store_id: oo.stoid
 								},
 								success: function(su) {
+									
 									var n = su.data.data;
+									// console.log('su---->', n);
 									let order_id = data.data.order_id;
 									th.weixinPay(n,
 										function() {
@@ -623,7 +634,7 @@ Page({
 				console.log(n), getApp().showSuccess("支付成功！");
 				"function" == typeof success && success();
 				wx.redirectTo({
-					url: "../deposit/deposit"
+					url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id,
 				});
 			},
 			fail: function(n) {
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index 94e7fd0..b914d4a 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -434,11 +434,11 @@ Page({
 				var n = res.data.data;
 				self.weixinPay(n, function() {
 					app.showWarning('支付成功');
-					setTimeout(function() {
-						wx.reLaunch({
-							url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
-						})
-					}, 1000)
+					// setTimeout(function() {
+					// 	wx.reLaunch({
+					// 		url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
+					// 	})
+					// }, 1000)
 				}, function() {
 					app.showWarning('支付失败');
 					// setTimeout(function() {
@@ -455,6 +455,7 @@ Page({
 	//------调起支付框--------
 	weixinPay: function(n, success, fail) {
 		if (!n) return false;
+		let order_id = this.data.details.order_id;
 		wx.requestPayment({
 			timeStamp: String(n.timeStamp),
 			nonceStr: n.nonceStr,
@@ -465,7 +466,7 @@ Page({
 				console.log(n), getApp().showSuccess("支付成功！");
 				"function" == typeof success && success();
 				wx.redirectTo({
-					url: "../deposit/deposit"
+					url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
 				});
 			},
 			fail: function(n) {
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index d85e0c2..db9c5d2 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -2230,11 +2230,7 @@ Page({
 				var n = res.data.data;
 				self.weixinPay(n, function() {
 					app.showWarning('支付成功');
-					setTimeout(function() {
-						wx.reLaunch({
-							url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
-						})
-					}, 1000)
+					
 				}, function() {
 					app.showWarning('支付失败');
 					// setTimeout(function() {
@@ -2250,6 +2246,7 @@ Page({
 	//------调起支付框--------
 	weixinPay: function(n, success, fail) {
 		if (!n) return false;
+		let order_id = item.order_id;
 		wx.requestPayment({
 			timeStamp: String(n.timeStamp),
 			nonceStr: n.nonceStr,
@@ -2260,7 +2257,7 @@ Page({
 				console.log(n), getApp().showSuccess("支付成功！");
 				"function" == typeof success && success();
 				wx.redirectTo({
-					url: "../deposit/deposit"
+					url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
 				});
 			},
 			fail: function(n) {
--
libgit2 0.21.4