Merge branch 'fix/goods-0525' into msb_test

pages/order/payResult.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-08 01:11:33
  * @LastEditors: ch
- * @LastEditTime: 2022-05-27 19:32:59
+ * @LastEditTime: 2022-05-27 19:59:09
  * @Description: file content
 -->
 <template>
@@ -13,25 +13,34 @@
 		<div>
 			<UiButton type="grey" @click="goHome" :radius="true">返回首页</UiButton>
 			<UiButton type="yellow_gradual" @click="goDetail" :radius="true">查看订单</UiButton>
-			<UiButton type="yellow_gradual" v-if="orderInfo.orderType !== ORDER_TYPE.VIRTUAL" @click="goMessage" :radius="true">收货信息</UiButton>
 		</div>
+
 	</div>
 </template>
 <script>
 import UiButton from '../../components/UiButton.vue';
 import {ApiGetOrderPaySatus} from '@/plugins/api/order';
-import {ORDER_TYPE} from '@/plugins/dicts/order';
 export default {
 	components: { UiButton },
 	data(){
 		return {
 			orderInfo : {},
-			ORDER_TYPE,
+			type : this.$route.query.type,
 			reuqestNum : 0
 		}
 	},
 	mounted(){
-		this.getOrderInfo();
+		// this.getOrderInfo();
+
+      this.$confirm("虚拟商品已自动发货，前往消息中心查看?", "提示", {
+        confirmButtonText: "前往",
+        cancelButtonText: "取消",
+        callback: async (e) => {
+          if (e == `confirm`) {
+			window.open('https://you.mashibing.com/account/message','_black');
+          }
+		}
+	  })
 	},
 	methods:{
 		async getOrderInfo(){
@@ -55,9 +64,6 @@ export default {
 		goDetail(){
 			this.$router.replace(`/account/order/detail?id=${this.$route.query.id}`)
 		},
-		goMessage(){
-			window.open('https://you.mashibing.com/account/message','_black');
-		}
 	}
 }
 </script>

pages/order/submit/index.vue

@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-26 20:20:23
+ * @LastEditTime: 2022-05-27 19:54:39
  * @Description: file content
 -->
 
@@ -142,14 +142,14 @@ export default {
 				}, 5000)
 				return false;
 			}
-			this.$router.replace(`/order/payResult?id=${this.payOrder.orderId}`)
+			this.$router.replace(`/order/payResult?id=${this.payOrder.orderId}&type=${this.productType}`)
 
 		},
 		cancelPay(){
 			this.$router.replace(`/account/order/detail?id=${this.payOrder.orderId}`);
 		},
 		finishPay(){
-			this.$router.replace(`/order/payResult?id=${this.payOrder.orderId}`)
+			this.$router.replace(`/order/payResult?id=${this.payOrder.orderId}&type=${this.productType}`)
 		}
 	}
 }