Merge branch 'feat-230721' into dev

src/components/site/order_modal/order_modal.vue

@@ -358,10 +358,22 @@ export default {
 							isDefaultGet: false,
 						})
 						.then(res => {
-							if (!(res.data.code == 0 && res.data.data.success)) {
-								this.isShowFail = true;
+							if (res.data.code == 0 && res.data.data && res.data.data.data) {
+								let result = JSON.parse(res.data.data.data[res.data.data.data.length - 1].result);
+								res.data.data.data.forEach(item => {
+									const resultTemp = JSON.parse(item.result);
+									if (resultTemp && resultTemp.orderStatus === 'SUCCESS') {
+										result = resultTemp;
+									}
+								});
+								console.log(result);
+								if (!(result && result.orderStatus === 'SUCCESS')) {
+									this.isShowFail = true;
+								} else {
+									this.$emit('refresh');
+								}
 							} else {
-								this.$emit('refresh');
+								this.isShowFail = true;
 							}
 						}).catch(() => {
 							this.$emit('refresh');