Merge branch 'feature/task1.0.0-0505-ch' into msb_test

pages/order/payResult.vue

@@ -2,15 +2,17 @@
  * @Author: ch
  * @Date: 2022-05-08 01:11:33
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 22:27:35
+ * @LastEditTime: 2022-05-10 15:48:51
  * @Description: file content
 -->
 <template>
-	<div class="c-white-main" style="padding-top:350px">
+	<div class="main">
 		<img class="icon" src="@/assets/img/order/pay_success.png" />
-		<p>交易成功</p>
+		<b>交易成功</b>
+		<p>您的包裹整装待发~</p>
 		<div>
 			<UiButton type="grey" @click="goHome" :radius="true">返回首页</UiButton>
+			<UiButton type="yellow_gradual" @click="goDetail" :radius="true">查看订单</UiButton>
 		</div>
 	</div>
 </template>
@@ -43,20 +45,30 @@ export default {
 		},
 		goHome(){
 			this.$router.replace('/');
+		},
+		goDetail(){
+			this.$router.replace(`/account/order/detail?id=${this.$route.query.id}`)
 		}
 	}
 }
 </script>
 <style lang="scss" scoped>
-.c-white-main{
+.main{
+	@include layout-box; 
 	text-align: center;
-	padding-bottom: 40px;
+	padding: 100px 0 40px;
 }
 .icon{
 	width: 239px;
 }
+b{
+	display: block;
+}
 p{
 	margin: 10px 0 25px 0;
 	color: #999;
 }
+button{
+	margin: 0 10px;
+}
 </style>

pages/order/submit/index.vue

@@ -2,17 +2,17 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 12:22:53
+ * @LastEditTime: 2022-05-10 15:49:36
  * @Description: file content
 -->
 
 <template>
 	<div class="main">
-		<h3 class="title">支付方式</h3>
+		<!-- <h3 class="title">支付方式</h3>
 		<div class="pay-type">
 			<el-radio label="微信支付" />
 			<el-radio label="支付宝支付" />
-		</div>
+		</div> -->
 		<h3 class="title">确认商品信息</h3>
 		<OrderInfo :products="orderInfo.products" />
 		<Message :orderInfo="orderInfo" :message.sync="userMessage"/>