diff --git a/components/UiLineBox.vue b/components/UiLineBox.vue
index 0f7b95f..676c722 100644
--- a/components/UiLineBox.vue
+++ b/components/UiLineBox.vue
@@ -2,20 +2,27 @@
  * @Author: ch
  * @Date: 2022-05-07 22:40:55
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 16:04:47
+ * @LastEditTime: 2022-05-10 13:48:39
  * @Description: file content
 -->
 <template>
 	<div class="ui-line-box">
 		<div class="ui-line-box--head">
-			<slot name="head"></slot>
+			<slot name="head">
+				<b class="ui-line-box--title">{{title}}</b>
+			</slot>
 		</div>
 		<slot name="body"></slot>
 	</div>
 </template>
 <script>
 export default {
-	
+	props : {
+		title : {
+			type : String,
+			default : ''
+		}
+	}
 }
 </script>
 <style lang="scss" scoped>
@@ -27,5 +34,8 @@ export default {
 		padding: 0 30px;
 		background: #f8f8f8;
 	}
+	&--title{
+		font-weight: normal;
+	}
 }
 </style>
\ No newline at end of file
diff --git a/components/UiMoney.vue b/components/UiMoney.vue
index 230095e..0dea6d2 100644
--- a/components/UiMoney.vue
+++ b/components/UiMoney.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:44:29
  * @LastEditors: ch
- * @LastEditTime: 2022-05-08 17:24:29
+ * @LastEditTime: 2022-05-10 13:55:12
  * @Description: 金额显示UI组件，金额￥和小数点显示大小不同，以及需不需要小数点
  props
  money 金额 数组或字符串
diff --git a/nuxt.config.js b/nuxt.config.js
index 04e0028..fc23462 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-03 22:14:16
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 09:56:10
+ * @LastEditTime: 2022-05-10 12:56:34
  * @Description: file content
  */
 export default {
@@ -10,7 +10,11 @@ export default {
   head: {
     title: 'shop-pc',
     htmlAttrs: {
-      lang: 'en'
+      lang: 'zh'
+    },
+    server: {
+      port: 3000, // default: 3000
+      host: '0.0.0.0' // default: localhost,
     },
     meta: [
       { charset: 'utf-8' },
diff --git a/package-lock.json b/package-lock.json
index c4298af..599a175 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3875,7 +3875,7 @@
       "dependencies": {
         "core-js": {
           "version": "2.6.12",
-          "resolved": "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
           "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
         },
         "regenerator-runtime": {
@@ -3917,7 +3917,7 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -3926,7 +3926,7 @@
         },
         "globals": {
           "version": "9.18.0",
-          "resolved": "https://registry.npmmirror.com/globals/-/globals-9.18.0.tgz",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
           "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
           "dev": true
         },
@@ -6386,7 +6386,7 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "requires": {
             "ms": "2.0.0"
@@ -6444,7 +6444,7 @@
       "dependencies": {
         "is-extendable": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "requires": {
             "is-plain-object": "^2.0.4"
@@ -13737,7 +13737,7 @@
       "dependencies": {
         "is-arrayish": {
           "version": "0.3.2",
-          "resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
           "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
         }
       }
@@ -16214,7 +16214,7 @@
         },
         "make-dir": {
           "version": "1.3.0",
-          "resolved": "https://registry.npmmirror.com/make-dir/-/make-dir-1.3.0.tgz",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
           "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
           "requires": {
             "pify": "^3.0.0"
diff --git a/pages/account/index.vue b/pages/account/index.vue
index 241e5df..f484ddc 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -2,24 +2,14 @@
  * @Author: ch
  * @Date: 2022-05-08 17:48:36
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 22:06:37
+ * @LastEditTime: 2022-05-10 12:19:04
  * @Description: file content
 -->
 <template>
-<<<<<<< HEAD
-	<div class="c-white-main" style="padding-top:350px">
-		<div class="account">
-			<div class="account--nav">左侧栏</div>
-			<nuxt-child class="account--main"/>
-		</div>
-	</div>
-	
-=======
   <div class="account">
     <div class="account--nav">左侧栏</div>
     <nuxt-child class="account--main" />
   </div>
->>>>>>> feature/task1.0.0
 </template>
 <script>
 export default {
@@ -54,16 +44,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-<<<<<<< HEAD
-.account{
-  padding: 30px 0;
-  margin:  0 auto;
-=======
 .account {
   @include layout-box;
-  padding-top: 370px;
+  padding: 30px 0;
   margin: 0 auto;
->>>>>>> feature/task1.0.0
   display: flex;
   &--nav {
     width: 170px;
diff --git a/pages/account/index/order/detail/module/GoodsInfo.vue b/pages/account/index/order/detail/module/GoodsInfo.vue
index 88b3e26..279ee23 100644
--- a/pages/account/index/order/detail/module/GoodsInfo.vue
+++ b/pages/account/index/order/detail/module/GoodsInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-09 16:24:49
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 21:31:33
+ * @LastEditTime: 2022-05-10 13:55:36
  * @Description: file content
 -->
 <template>
@@ -56,7 +56,8 @@
 					<label>
 						{{orderInfo.orderStatus == 1 ? '应付款：' : '实付款：'}}
 					</label>
-					<UiMoney :money="orderInfo.payAmount" float prefix suffix/>
+					<UiMoney class="message--pay-amount" size="20px" preSize="14px" sufSize="14px"  
+						:money="orderInfo.payAmount" float prefix suffix/>
 				</p>
 			</div>
 		</div>
@@ -122,5 +123,9 @@ export default {
 			margin: 20px 0;
 		}
 	}
+	&--pay-amount{
+		color: #FF512B;
+		font-weight: bold;
+	}
 }
 </style>
\ No newline at end of file
diff --git a/pages/account/index/order/detail/module/LogisitcsInfo.vue b/pages/account/index/order/detail/module/LogisitcsInfo.vue
index a5b9045..ad88299 100644
--- a/pages/account/index/order/detail/module/LogisitcsInfo.vue
+++ b/pages/account/index/order/detail/module/LogisitcsInfo.vue
@@ -2,15 +2,12 @@
  * @Author: ch
  * @Date: 2022-05-09 15:52:51
  * @LastEditors: ch
- * @LastEditTime: 2022-05-09 18:05:32
+ * @LastEditTime: 2022-05-10 13:50:29
  * @Description: file content
 -->
 <template>
 	<div class="logisitcs">
 		<UiLineBox class="logisitcs--info" title="收货人信息">
-			<div class="title"  slot="head">
-				<b>收货人信息</b>
-			</div>
 			<div slot="body" class="info">
 				<p>
 					<label>收货人：</label>
@@ -29,7 +26,7 @@
 		<UiLineBox class="logisitcs--list" v-if="logisitcsList.length">
 			<div slot="head" class="title">
 				<b>物流信息</b>
-				<span>中嘻嘻嘻</span>
+				<span>{{logisitcsInfo.companyName}}<small>{{logisitcsInfo.trackingNo}}</small></span>
 			</div>
 			<ul slot="body" class="list">
 				<li v-for="(item, idx) in logisitcsList" :key="idx">
@@ -73,6 +70,18 @@ export default {
 		margin-left: 28px;
 	}
 }
+.title{
+	display: flex;
+	justify-content: space-between;
+	span{
+		color: #666;
+		small{
+			font-size: 14px;
+			color: #999;
+			margin-left: 15px;
+		}
+	}
+}
 .info{
 	padding: 20px 30px;
 	color: #666;
diff --git a/pages/account/index/order/detail/module/StatusStep.vue b/pages/account/index/order/detail/module/StatusStep.vue
index 67b518a..2755456 100644
--- a/pages/account/index/order/detail/module/StatusStep.vue
+++ b/pages/account/index/order/detail/module/StatusStep.vue
@@ -2,16 +2,18 @@
  * @Author: ch
  * @Date: 2022-05-09 14:41:37
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 10:53:08
+ * @LastEditTime: 2022-05-10 13:33:57
  * @Description: file content
 -->
 <template>
 	<ul class="step">
 		<li v-for="item in steps" :key="item.id" :class="item.active && 'active'">
-			<img :src="item.active ? item.iconActive :item.icon"/>
-			<b>{{item.name}}</b>
-			<span>{{item.date}}</span>
-			<span>{{item.time}}</span>
+			<div>
+				<img :src="item.active ? item.iconActive :item.icon"/>
+				<b>{{item.name}}</b>
+				<span>{{item.date}}</span>
+				<span>{{item.time}}</span>
+			</div>
 		</li>
 	</ul>
 </template>
@@ -118,7 +120,35 @@ export default {
 	flex: 1;
 	justify-content: space-between;
 	li{
-		text-align: center;
+		flex: 1;
+		position: relative;
+		&::after{
+			display: block;
+			content: '........................................';
+			width: calc(100% - 65px);
+			height: 20px;
+			line-height: 0;
+			overflow: hidden;
+			position: absolute;
+			color: #eee;
+			font-size: 40px;
+			top: 25px;
+			left: -8px;
+			z-index: 1;
+		}
+		&:first-child{
+			flex: 0;
+			&::after{
+				content: '';
+			}
+		}
+		div{
+			position: relative;
+			z-index: 2;
+			width: 80px;
+			text-align: center;
+			float: right;
+		}
 		img{
 			width: 66px;
 		}
@@ -136,6 +166,9 @@ export default {
 			b{
 				color: #FF875B;
 			}
+			&::after{
+				color: #FFF3ED;
+			}
 		}
 	}
 }
diff --git a/pages/account/index/order/list/index.vue b/pages/account/index/order/list/index.vue
index 21ffa75..2ff5887 100644
--- a/pages/account/index/order/list/index.vue
+++ b/pages/account/index/order/list/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 20:47:29
  * @LastEditors: ch
- * @LastEditTime: 2022-05-08 21:17:05
+ * @LastEditTime: 2022-05-10 13:16:44
  * @Description: file content
 -->
 <template>
@@ -98,9 +98,6 @@ export default {
 			}
 			this.orderList = result.records;
 			this.orderTotal = result.total
-		},
-		pageChange(){
-			
 		}
 	}
 }
diff --git a/pages/order/submit/index.vue b/pages/order/submit/index.vue
index bebd3a9..111e9f3 100644
--- a/pages/order/submit/index.vue
+++ b/pages/order/submit/index.vue
@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-10 11:37:51
+ * @LastEditTime: 2022-05-10 12:22:53
  * @Description: file content
 -->
 
 <template>
-	<div class="c-white-main" style="padding-top:350px">
+	<div class="main">
 		<h3 class="title">支付方式</h3>
 		<div class="pay-type">
 			<el-radio label="微信支付" />
@@ -154,6 +154,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.main{
+	@include layout-box
+}
 .title{
 	margin: 24px 0 13px;
 }