diff --git a/App.vue b/App.vue
index cde7143..f684f4f 100644
--- a/App.vue
+++ b/App.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2019-04-01 01:47:12
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 10:44:33
+ * @LastEditTime: 2022-04-22 14:47:06
  * @Description: file content
 -->
 <script>
@@ -30,5 +30,12 @@
 		font-size: $font-size-base;
 		color: $color-grey6;
 	}
+	body{
+		padding-bottom: constant(safe-area-inset-bottom);
+		/* 兼容 iOS < 11.2 */
+		padding-bottom: env(safe-area-inset-bottom);
+		/* 兼容 iOS >= 11.2 */
+	}
+
 	
 </style>
\ No newline at end of file
diff --git a/common/plugins/msbUniRequest.js b/common/plugins/msbUniRequest.js
index 272a883..58e2d65 100644
--- a/common/plugins/msbUniRequest.js
+++ b/common/plugins/msbUniRequest.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 16:36:59
  * @LastEditors: ch
- * @LastEditTime: 2022-04-20 16:07:24
+ * @LastEditTime: 2022-04-22 20:30:03
  * @Description: 针对uniapp request请求做了一次封装，使用思维参考axios
  * 
  * 
@@ -81,7 +81,7 @@ class MsbUniRequest {
 						}else{
 							let newRes = this.hook.success(response, option);
 							// 业务结果处理可能为一个Promise对象，根据结果调用错误或正确状态
-							if(newRes.constructor === Promise){
+							if(newRes && newRes.constructor === Promise){
 								newRes.then(res => {
 									resolve(res);
 								}, error =>{
diff --git a/common/utils/requset.js b/common/utils/requset.js
index b42323d..5b0888d 100644
--- a/common/utils/requset.js
+++ b/common/utils/requset.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-17 17:42:32
  * @LastEditors: ch
- * @LastEditTime: 2022-04-22 11:12:36
+ * @LastEditTime: 2022-04-22 16:37:06
  * @Description: 项目接口请求统一处理器，返回一个需要token和不需要token的请求封装方法
  */
 
diff --git a/components/BsEmpty.vue b/components/BsEmpty.vue
index 1491442..2338c7c 100644
--- a/components/BsEmpty.vue
+++ b/components/BsEmpty.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 13:11:55
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 16:00:40
+ * @LastEditTime: 2022-04-22 11:37:16
  * @Description: file content
 -->
 <template>
@@ -59,7 +59,8 @@ export default {
 	}
 
 	&--icon {
-		width: 280rpx;
+		width: 380rpx;
+		height: 240rpx;
 	}
 }
 </style>
diff --git a/components/BsPay.vue b/components/BsPay.vue
index f0ff43e..3fb82bf 100644
--- a/components/BsPay.vue
+++ b/components/BsPay.vue
@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-04-19 11:37:50
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 14:42:49
+ * @LastEditTime: 2022-04-22 18:11:00
  * @Description: file content
 -->
 <template>
 	<UiRadioPicker title="请选择支付方式" :show="show" :options="options" 
-		@close="close"	@confirm="confirm" />
+		@close="close" @confirm="confirm" />
 </template>
 <script>
 import UiRadioPicker from './UiRadioPicker.vue'
diff --git a/components/UiButton.vue b/components/UiButton.vue
index 4eafad9..7b6b279 100644
--- a/components/UiButton.vue
+++ b/components/UiButton.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-26 10:06:38
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 14:38:07
+ * @LastEditTime: 2022-04-22 20:07:26
  * @Description: file content
 -->
 <template>
@@ -26,7 +26,7 @@ export default {
 	},
 	methods:{
 		click(){
-			!this.disabed && this.$emit('click');
+			!this.disable && this.$emit('click');
 		}
 	}
 }
@@ -36,18 +36,25 @@ export default {
 	display: inline-block;
 	padding: 0 50rpx;
 	border-radius: 50rpx;
+	&::after{
+		display: none;
+	}
 	&__normal{
 		height: 70rpx;
 		line-height: 70rpx;
 		font-size: $font-size-base;
 	}
 	&__min{
+		height: 60rpx;
+		line-height: 60rpx;
+		font-size: $font-size-base;
+	}
+	&__small{
 		height: 50rpx;
 		line-height: 50rpx;
 		font-size: $font-size-base;
 	}
 	&__max{
-		width: 690rpx;
 		height: 80rpx;
 		line-height: 80rpx;
 		font-size: $font-size-lg;
@@ -63,7 +70,7 @@ export default {
 	&__line{
 		background: none;
 		color: $color-grey6;
-		border: 1px solid rgb(192, 185, 185);
+		border: 1px solid $color-grey4;
 	}
 	&__primaryLine{
 		background: none;
diff --git a/components/UiCell.vue b/components/UiCell.vue
index 7119194..93b79b3 100644
--- a/components/UiCell.vue
+++ b/components/UiCell.vue
@@ -2,21 +2,21 @@
  * @Author: ch
  * @Date: 2022-03-26 18:29:19
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:01:40
+ * @LastEditTime: 2022-04-22 15:54:57
  * @Description: file content
 -->
 <template>
-	<view class="uiCell" @click="$emit('click')">
+	<view class="ui-cell" @click="$emit('click')">
 		<slot name="icon"></slot>
-		<view class="uiCell--left">
-			<text class="uiCell--title">{{title}}</text>
-			<text class="uiCell--label">{{label}}</text>
+		<view class="ui-cell--left">
+			<text class="ui-cell--title">{{title}}</text>
+			<text class="ui-cell--label" v-if="label">{{label}}</text>
 		</view>
 		<slot name="value">
-			<text class="uiCell--value">{{value}}</text>
+			<text class="ui-cell--value">{{value}}</text>
 		</slot>
 		<slot name="right-icon" v-if="rightIcon">
-			<image class="uiCell--rightIcon" src="@/static/common/arrow.png"/>
+			<image class="ui-cell--rightIcon" src="@/static/common/arrow.png"/>
 		</slot>
 	</view>
 </template>
@@ -43,9 +43,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.uiCell{
+.ui-cell{
 	min-height: 100rpx;
-	border-bottom: 1px solid $color-grey2;
+	border-bottom: 1px solid $color-grey1;
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
@@ -53,6 +53,7 @@ export default {
 	&--title{
 		color: $color-grey6;
 		font-size: $font-size-base;
+		line-height: $font-size-base;
 		display: block;
 	}
 	&--label{
diff --git a/components/UiGoodsInfo.vue b/components/UiGoodsInfo.vue
index 1ce548a..0fa7f12 100644
--- a/components/UiGoodsInfo.vue
+++ b/components/UiGoodsInfo.vue
@@ -2,17 +2,17 @@
  * @Author: ch
  * @Date: 2022-03-31 14:49:33
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 16:27:29
+ * @LastEditTime: 2022-04-22 18:24:57
  * @Description: file content
 -->
 <template>
 	<view class="ui-goods">
 		<view class="ui-goods-item">
-			<image class="ui-goods-item--image" mode="widthFix" :src="data.productImageUrl" />
+			<image class="ui-goods-item--image" mode="aspectFit" :src="data.productImageUrl" />
 			<view class="ui-goods-item--right">
 				<view class="ui-goods-item--con">
 					<text class="ui-goods-item--title">{{data.productName}}</text>
-					<UiMoney :money="data.realAmount"></UiMoney>
+					<UiMoney :money="data.realAmount" prefix float suffix></UiMoney>
 				</view>
 				<view class="ui-goods-item--desc">
 					<text>{{data.skuDescribe}}</text>
@@ -59,11 +59,13 @@ export default {
 		line-height: 39rpx;
 	}
 	&--title{
+		width: 300rpx;
 		overflow:hidden; 
 		text-overflow:ellipsis;
 		display:-webkit-box; 
 		-webkit-box-orient:vertical;
 		-webkit-line-clamp:2; 
+		font-weight: bold;
 	}
 	&--pirce{
 		font-size: 22rpx;
@@ -86,4 +88,15 @@ export default {
 		}
 	}
 }
+/deep/{
+	.ui-money{
+		text{
+			font-size: $font-size-base;
+			font-weight: bold;
+		}
+		.ui-money--prefix,.ui-money--suffix{
+			font-size: $font-size-sm;
+		}
+	}
+}
 </style>
\ No newline at end of file
diff --git a/components/UiGoodsInfoMax.vue b/components/UiGoodsInfoMax.vue
new file mode 100644
index 0000000..b1f31b1
--- /dev/null
+++ b/components/UiGoodsInfoMax.vue
@@ -0,0 +1,96 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-04-22 16:48:11
+ * @LastEditors: ch
+ * @LastEditTime: 2022-04-22 17:03:48
+ * @Description: file content
+-->
+<template>
+	<view class="goods-item">
+		<image class="goods-item--image" mode="aspectFit" :src="data.productImageUrl" />
+		<view class="goods-item--con">
+			<view class="goods-item--title-box">
+				<text class="goods-item--title">{{data.productName}}</text>
+				<UiMoney :money="data.realAmount" float prefix suffix/>
+				<!-- <text class="goods-item--pirce">￥{{data.realAmount}}</text> -->
+			</view>
+			<view class="goods-item--desc">
+				<text>{{data.skuDescribe}}</text>
+				<text class="goods-item--num">x{{data.quantity}}</text>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import UiMoney from './UiMoney.vue'
+export default {
+	components: { UiMoney },
+	props : {
+		data : {
+			type : Object,
+			default : ()=> ({})
+		}
+	}
+}
+</script>
+<style lang="scss" scoped>
+.goods-item{
+	display: flex;
+	justify-content: space-between;
+	padding: 30rpx 0 0;
+
+	&--image{
+		width: 180rpx;
+		height: 180rpx;
+	}
+	&--con{
+		width: 480rpx;
+	}
+	&--title-box{
+		display: flex;
+		justify-content: space-between;
+		font-size: $font-size-base;
+		color: $color-grey6;
+		line-height: 39rpx;
+	}
+	&--title{
+		width: 320rpx;
+		overflow:hidden; 
+		text-overflow:ellipsis;
+		display:-webkit-box; 
+		-webkit-box-orient:vertical;
+		-webkit-line-clamp:2; 
+		font-weight: bold;
+	}
+	&--pirce{
+		font-size: 22rpx;
+		margin-left: 60rpx;
+	}
+	&--desc{
+		margin-top: 20rpx;
+		line-height: 39rpx;
+		display: flex;
+		justify-content: space-between;
+		text{
+			font-size: $font-size-sm;
+			color: $color-grey4;
+		}
+	}
+	&--num{
+		font-size: $font-size-base;
+		margin-left: 60rpx;
+	}
+}
+/deep/{
+	.ui-money{
+		text{
+			font-size: $font-size-base;
+			font-weight: bold;
+		}
+		.ui-money--prefix,.ui-money--suffix{
+			font-size: $font-size-sm;
+		}
+
+	}
+}
+</style>
\ No newline at end of file
diff --git a/components/UiMoney.vue b/components/UiMoney.vue
index 2f26c68..3ef78a9 100644
--- a/components/UiMoney.vue
+++ b/components/UiMoney.vue
@@ -2,14 +2,14 @@
  * @Author: ch
  * @Date: 2022-04-21 09:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 17:44:58
+ * @LastEditTime: 2022-04-22 19:43:05
  * @Description: file content
 -->
 <template>
 	<view class="ui-money">
 		<text v-if="prefix" class="ui-money--prefix">￥</text>
 		<text class="ui-money--price">{{moneyStr}}</text>
-		<text v-if="flaot && suffix" class="ui-money--suffix">.{{moneyArr[1]}}</text>
+		<text v-if="float && suffix" class="ui-money--suffix">.{{moneyArr[1]}}</text>
 	</view>
 </template>
 <script>
@@ -19,7 +19,7 @@ export default {
 			type : Number | String,
 			default : '0'
 		},
-		flaot : {
+		float : {
 			type : Boolean,
 			default : false
 		},
@@ -52,15 +52,13 @@ export default {
 		moneyArr (){
 			let moneyArr = (this.money || '0').toString().split('.');
 			// 如果需要补0 则整数时补00
-			console.log(this.flaot);
-			if(this.flaot){
+			if(this.float){
 				if(!moneyArr[1]){
 					moneyArr[1] = '00';
 				}else if(moneyArr[1] < 10){
 					moneyArr[1] = `0${moneyArr[1]}`;
 				}
 			}
-			console.log(moneyArr);
 			return moneyArr;
 		}
 
diff --git a/components/UiPageHeader.vue b/components/UiPageHeader.vue
index 9b194ca..248995c 100644
--- a/components/UiPageHeader.vue
+++ b/components/UiPageHeader.vue
@@ -2,12 +2,12 @@
  * @Author: ch
  * @Date: 2022-03-25 10:11:37
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 15:27:05
+ * @LastEditTime: 2022-04-22 14:16:14
  * @Description: file content
 -->
 <template>
 	<view class="header">
-		<image class="header--back" v-if="back" src="@/static/search/arrow.png" @click="$Router.back()"></image>
+		<image class="header--back" v-if="back" src="@/static/common/back.png" @click="$Router.back()"></image>
 		<slot name="custom">
 			<text class="header--title">{{title}}</text>
 			<view class="header--operation">
diff --git a/components/UiRadioPicker.vue b/components/UiRadioPicker.vue
index b0f214e..b3f0156 100644
--- a/components/UiRadioPicker.vue
+++ b/components/UiRadioPicker.vue
@@ -2,14 +2,14 @@
  * @Author: ch
  * @Date: 2022-04-12 10:37:24
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 14:38:12
+ * @LastEditTime: 2022-04-22 18:13:08
  * @Description: file content
 -->
 <template>
 	<u-popup :show="show" @close="close" round="16rpx" closeable>
 		<view class="ui-select--title" v-if="title">{{title}}</view>
-		<radio-group class="ui-select--cell" @change="change">
-			<UiCell :title="item.label" v-for="item in options" :key="item.value">
+		<radio-group class="ui-select--cell">
+			<UiCell :title="item.label" v-for="item in options" @click="change(item)" :key="item.value">
 				<radio slot="right-icon" class="ui-select--radio" color="#FF875B"
 					:value="item.value" :checked="item.value === selected.value"/>
 			</UiCell>
@@ -53,7 +53,7 @@ export default {
 	},
 	methods:{
 		change(val){
-			this.selected = this.options.find(item => val.detail.value === item.value);
+			this.selected = this.options.find(item => val.value === item.value);
 		},
 		confirm(){
 			if(!this.selected.value){
@@ -87,6 +87,9 @@ export default {
 		padding: 68rpx 40rpx;
 		display: flex;
 		justify-content: space-between;
+		.ui-btn{
+			width: 690rpx;
+		}
 	}
 }
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 8876996..e6b22f4 100644
--- a/pages.json
+++ b/pages.json
@@ -15,7 +15,7 @@
 			"aliasPath" : "/login",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -23,7 +23,7 @@
 			"aliasPath" : "/seckill",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -31,7 +31,7 @@
 			"aliasPath" : "/category",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -39,7 +39,7 @@
 			"aliasPath" : "/search",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -47,7 +47,7 @@
 			"aliasPath" : "/goodsList",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -55,7 +55,7 @@
 			"aliasPath" : "/goodsDetail",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -63,7 +63,7 @@
 			"aliasPath" : "/account",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -72,7 +72,7 @@
 			"aliasPath" : "/cart",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -81,7 +81,7 @@
 			"aliasPath" : "/tabBarCart",
 			"style": {
 				"navigationStyle" : "custom",
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		},
 		{
@@ -229,7 +229,7 @@
 		{
 			"path": "pages/account/message/list",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "马士兵严选"
 			}
 		}
 	],
@@ -237,7 +237,7 @@
 		"color": "#BBBBBB",
 		"selectedColor": "#FF875B",
 		"backgroundColor": "#FFF",
-		"borderStyle" : "white",
+		"borderStyle" : "#eee",
 		"fontSize" : "24rpx",
 		"height" : "120rpx",
 		"list": [
diff --git a/pages/account/address/create.vue b/pages/account/address/create.vue
index 585ff19..6fd78ee 100644
--- a/pages/account/address/create.vue
+++ b/pages/account/address/create.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 14:12:18
  * @LastEditors: ch
- * @LastEditTime: 2022-04-20 19:23:18
+ * @LastEditTime: 2022-04-22 19:04:06
  * @Description: file content
 -->
 <template>
@@ -119,9 +119,10 @@ page {
 	position: fixed;
 	bottom: 89rpx;
 	left: 30rpx;
+	width: 670rpx;
 }
 /deep/ {
-	.form--city .uiCell{
+	.form--city .ui-cell{
 		padding: 0 40rpx;
 	}
 }
diff --git a/pages/account/address/edit.vue b/pages/account/address/edit.vue
index 137ef12..e0e345b 100644
--- a/pages/account/address/edit.vue
+++ b/pages/account/address/edit.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 14:12:18
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 21:14:45
+ * @LastEditTime: 2022-04-22 19:04:16
  * @Description: file content
 -->
 <template>
@@ -138,12 +138,13 @@ page {
 	position: fixed;
 	bottom: 89rpx;
 	left: 30rpx;
+	width: 670rpx;
 }
 /deep/ {
 	.del-address .uiCell--title{
 		color: $color-yellow3;
 	}
-	.form--city .uiCell{
+	.form--city .ui-cell{
 		padding: 0 40rpx;
 	}
 }
diff --git a/pages/account/address/list.vue b/pages/account/address/list.vue
index dee8217..74a2bb1 100644
--- a/pages/account/address/list.vue
+++ b/pages/account/address/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 13:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 21:01:49
+ * @LastEditTime: 2022-04-22 18:58:37
  * @Description: file content
 -->
 <template>
@@ -166,13 +166,6 @@ page{
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	&::before{
-		display: inline-block;
-		content: "+";
-		margin-right: 20rpx;
-		font-size: 46rpx;
-		font-weight: bold;
-		padding-top: 10rpx;
-	}
+	width: 670rpx;
 }
 </style>
diff --git a/pages/account/index.vue b/pages/account/index.vue
index 8a22f7a..86574b1 100644
--- a/pages/account/index.vue
+++ b/pages/account/index.vue
@@ -3,7 +3,7 @@
 	components: { UiCell },: ch
  * @Date: 2019-08-22 19:41:20
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 15:39:04
+ * @LastEditTime: 2022-04-22 18:25:50
  * @Description: file content
 -->
 <template>
@@ -14,7 +14,6 @@
 		</view>
 		<UiCell class="header--cell" :title="userInfo.nickname" label="第一个青春是上帝给的..."
 			@click="$Router.push('/setUserInfo')">
-			<!-- <image slot="icon" class="head-img" src="@/static/account/tx.png" shape="circle" /> -->
 			<image slot="icon" class="head-img" :src="userInfo.avatar || require('@/static/account/tx.png')" shape="circle" />
 		</UiCell>
 		<view class="order">
@@ -105,24 +104,25 @@ page{
 }
 .header{
 	height: 88rpx;
-	display: flex;
-	justify-content: end;
-	align-items: center;
 	padding: 0 40rpx;
 	position: relative;
+	width: 100%;
 	&--msg{
 		width: 34rpx;
-		height: 40rpx
+		height: 40rpx;
+		float: right;
+		margin-top: 22rpx;
 	}
 	&--badge{
 		position: absolute;
 		right: 30rpx;
 		top: 10rpx;
 		z-index: 99;
+		border: 1px solid #fff;
 	}
 	&--cell{
 		border: 0;
-		padding: 0 40rpx;
+		padding: 0 60rpx 0 40rpx;
 		background: none;
 	}
 }
@@ -139,7 +139,7 @@ page{
 	border-radius: 16rpx;
 	margin: 40rpx auto;
 	padding: 30rpx;
-	box-shadow: 0 0 13rpx 1px rgba(0, 0, 0, .05);
+	// box-shadow: 0 0 13rpx 1px rgba(0, 0, 0, .05);
 	&--title{
 		display: flex;
 		justify-content: space-between;
@@ -160,9 +160,11 @@ page{
 		justify-content: space-around;
 		&--item{
 			text-align: center;
-			font-size: $font-size-sm;
-			color: $color-grey5;
 			position: relative;
+			view{
+				font-size: $font-size-sm;
+				color: $color-grey5;
+			}
 			.item-icon{
 				width: 60rpx;
 				height: 60rpx;
@@ -172,6 +174,7 @@ page{
 				top: -10rpx;
 				right: 0;
 				z-index: 99;
+				border: 1px solid #fff;
 			}
 		}
 	}
@@ -190,4 +193,10 @@ page{
 		border: 0;
 	}
 }
+/deep/{
+	.header--cell .ui-cell--title{
+		font-weight: bold;
+		font-size: $font-size-lg;
+	}
+}
 </style>
diff --git a/pages/account/setting/setName.vue b/pages/account/setting/setName.vue
index 2cc93a6..5cf3cf6 100644
--- a/pages/account/setting/setName.vue
+++ b/pages/account/setting/setName.vue
@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-03-28 15:38:23
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:03:41
+ * @LastEditTime: 2022-04-22 19:16:20
  * @Description: file content
 -->
 <template>
 	<view>
-		<UiPageHeader title="设置昵称">
-			<view slot="operation" class="headerBtn" @click="confirm">确定</view>
+		<UiPageHeader class="header" title="设置昵称">
+			<view slot="operation" class="header-btn" @click="confirm">确定</view>
 		</UiPageHeader>
 		<u--input class="input" v-model="userInfo.nickname" maxlength="10" placeholder="请输入昵称" clearable ></u--input>
 		<view class="tips">
@@ -47,15 +47,19 @@ export default {
 page{
 	background: $color-grey1;
 }
-.headerBtn{
+.header{
+	background: $color-grey0;
+}
+.header-btn{
 	height: 88rpx;
 	line-height: 88rpx;
 	font-size: $font-size-base;
 	color: $color-yellow3;
 }
 .input{
+	margin-top: 20rpx;
 	padding: 20rpx 40rpx !important;
-	height: 60rpx;
+	height: 100rpx;
 	background: $color-grey0;
 	border: 0;
 	font-size: $font-size-base;
@@ -63,9 +67,11 @@ page{
 }
 .tips{
 	padding: 20rpx 40rpx;
-	font-size: $font-size-sm;
-	color: $color-grey4;
 	display: flex;
 	justify-content: space-between;
+	text{
+		font-size: $font-size-sm;
+		color: $color-grey4;
+	}
 }
 </style>
\ No newline at end of file
diff --git a/pages/cart/cart.vue b/pages/cart/cart.vue
index 6ba0700..920508a 100644
--- a/pages/cart/cart.vue
+++ b/pages/cart/cart.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2019-08-22 19:41:20
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 18:05:32
+ * @LastEditTime: 2022-04-22 14:47:49
  * @Description: file content
 -->
 <template>
diff --git a/pages/cart/components/PageCtx.vue b/pages/cart/components/PageCtx.vue
index b8ff6d3..2ef6a8a 100644
--- a/pages/cart/components/PageCtx.vue
+++ b/pages/cart/components/PageCtx.vue
@@ -65,8 +65,8 @@
 				<UiMoney class="goods-price" :money="totalPrice" prefix/>
 			</view>
 			<view class="cart-action">
-				<UiButton v-if="mode == 'edit'" :disable="!checkedIds.length" @click="handleDelete">删除</UiButton>
-				<UiButton v-else type="gradual" :disable="!checkedIds.length" @click="handleOrder">去结算({{list.length}})</UiButton>
+				<UiButton v-if="mode == 'edit'" size="max" :disable="!checkedIds.length" @click="handleDelete">删除</UiButton>
+				<UiButton v-else type="gradual" size="max" :disable="!checkedIds.length" @click="handleOrder">去结算({{list.length}})</UiButton>
 			</view>
 		</view>
 	</view>
@@ -293,6 +293,7 @@ export default {
   page {
 	background: $color-grey1;
 	padding-bottom: 240rpx;
+	
   }
 </style>
 <style lang="scss" scoped>
@@ -309,6 +310,7 @@ export default {
 	z-index: 999;
 	&--title text{
 		font-size: 36rpx;
+		font-weight: bold;
 	}
 	&--totla{
 		font-size: 36rpx;
@@ -337,16 +339,13 @@ export default {
     display: flex;
     align-items: center;
     padding: 50rpx 40rpx 40rpx 24rpx;
-    margin: 20rpx auto;
+    margin: 0 auto 20rpx;
     &--radio {
 		width: 56rpx;
 		height: 80rpx;
 		line-height: 80rpx;
 		margin-right: 10rpx;
 		text-align: center;
-		.radio {
-			transform: scale(0.76)
-		}
     }
     &--image {
 		width: 170rpx;
@@ -362,7 +361,8 @@ export default {
 
     &--title {
 		font-size: $font-size-base;
-		line-height: 39rpx;
+		line-height: 36rpx;
+		font-weight: bold;
 		max-height: 76rpx;
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -447,28 +447,30 @@ export default {
 .footer {
     display: flex;
     align-items: center;
-    height: 96rpx;
+    height: 140rpx;
     background: $color-grey0;
     padding: 0 30rpx;
-    position: fixed;
-    bottom: 120rpx;
+	position: fixed;
+	bottom: 120rpx;
     left: 0;
     right: 0;
-    z-index: 11;
+	z-index: 11;
+	margin-bottom: constant(safe-area-inset-bottom);
+   	margin-bottom: env(safe-area-inset-bottom);
 	&__inner{
-    	bottom: 0;
-
+		bottom: 0;
 	}
     .all-radio {
       width: 140rpx;
       display: flex;
 	  align-items: center;
-	  color: $color-grey5;
-	  font-size: $font-size-sm;
+	  text{
+		  color: $color-grey5;
+		  font-size: $font-size-base;
+	  }
 
       .radio {
-        margin-bottom: -4rpx;
-        transform: scale(0.76)
+		  margin-right: 5rpx;
       }
     }
 
@@ -478,8 +480,11 @@ export default {
       align-items: center;
       justify-content: flex-end;
 	  padding-right: 30rpx;
-	  font-size: $font-size-sm;
-	  color: $color-grey5;
+	  text{
+		font-size: $font-size-base;
+		color: $color-grey5;
+
+	  }
     }
 
 
@@ -487,17 +492,24 @@ export default {
 /deep/{
 	.cart-item--price{
 		text{
-			font-size: $font-size-base;
+			font-size: $font-size-lg;
 			color: $color-yellow4;
+			font-weight: bold;
 		}
 		.ui-money--prefix{
 			font-size: $font-size-sm;
 		}
 	}
+	.uni-radio-input{
+		width: 36rpx;
+		height: 36rpx;
+	}
 	.goods-price{
+		margin-bottom: 10rpx;
 		text{
 			font-size: 40rpx;
 			color: $color-yellow4;
+			font-weight: bold;
 		}
 		.ui-money--prefix{
 			font-size: $font-size-lg;
diff --git a/pages/cart/tabBarCart.vue b/pages/cart/tabBarCart.vue
index 058db54..6c961f2 100644
--- a/pages/cart/tabBarCart.vue
+++ b/pages/cart/tabBarCart.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-08 18:36:14
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 15:46:55
+ * @LastEditTime: 2022-04-22 14:47:43
  * @Description: file content
 -->
 <template>
diff --git a/pages/goods/category.vue b/pages/goods/category.vue
index b2795f5..f47f326 100644
--- a/pages/goods/category.vue
+++ b/pages/goods/category.vue
@@ -30,7 +30,8 @@
 					</view>
 				</view>
 				<!-- </view> -->
-				<BsEmpty v-if="!categoryData[curIndex].children.length && !categoryData[curIndex].isLoading" />
+				<BsEmpty class="empty" v-if="!categoryData[curIndex].children.length && !categoryData[curIndex].isLoading" 
+					:icon="require('@/static/common/empty_goods.png')" />
 				<u-loadmore status="loading" v-if="categoryData[curIndex].isLoading" />
 			</scroll-view>
 		</view>
@@ -118,6 +119,7 @@ page {
 <style lang="scss" scoped>
 .search{
 	padding: 0 30rpx;
+	background: $color-grey0;
 }
 .search--input{
 	display: block;
@@ -126,7 +128,7 @@ page {
 	box-sizing: border-box;
 	background: $color-grey1;
 	&__placeholder{
-		font-size: 26rpx;
+		font-size: $font-size-base;
 		color: $color-grey5;
 	}
 }
@@ -146,7 +148,7 @@ page {
 
 .cate-right {
 	height: 100%;
-	padding: 40rpx 0 0;
+	padding: 30rpx 0 0;
 	overflow: hidden;
 	box-sizing: border-box;
 }
@@ -164,11 +166,12 @@ page {
 	background: $color-grey0;
 	color: $color-yellow3;
 	font-size: $font-size-base;
+	font-weight: bold;
 }
 
 .cate-tow-img{
 	width:480rpx;
-	margin: 0 40rpx 40rpx;
+	margin: 0 40rpx 20rpx;
 	height: 164rpx;
 	background: $color-grey3;
 	border-radius: 16rpx;
@@ -176,12 +179,14 @@ page {
 .cate-tow-group{
 	display: flex;
 	flex-wrap: wrap;
-	margin-bottom: 40rpx;
+	// margin-bottom: 20rpx;
 	&--title{
 		padding: 20rpx 40rpx;
 		display: block;
 		width: 100%;
 		font-size: 30rpx;
+		line-height: 30rpx;
+		font-weight: bold;
 		color: $color-grey6;
 	}
 	&--item{
@@ -197,8 +202,8 @@ page {
 		width: 130rpx;
 		text-align: center;
 		font-size: $font-size-sm;
-		line-height: 36rpx;
-		margin: 10rpx 0 40rpx;
+		line-height: 30rpx;
+		margin: 14rpx 0 20rpx;
 		color: $color-grey6;
 		  display: -webkit-box;
 		/*! autoprefixer: off */
@@ -210,6 +215,9 @@ page {
 		padding-bottom: 200rpx;
 	}
 }
+.empty{
+	margin-top: 100rpx;
+}
 
 </style>
 
diff --git a/pages/goods/detail/components/SkuPopup.vue b/pages/goods/detail/components/SkuPopup.vue
index db3fa3c..64b4cbb 100644
--- a/pages/goods/detail/components/SkuPopup.vue
+++ b/pages/goods/detail/components/SkuPopup.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-24 11:30:55
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 14:42:04
+ * @LastEditTime: 2022-04-22 20:21:28
  * @Description: file content
 -->
 <template>
@@ -13,7 +13,7 @@
 				<view>
 					<view class="product-info--price">￥{{curSku.sellPrice}}</view>
 					<view class="product-info--sku">{{curSku.name}}</view>
-					<!-- <view>库存：{{curSku.stock}}</view> -->
+					<view>库存：{{curSku.stock}}</view>
 				</view>
 			</view>
 			<view class="attr-group" v-for="(item, index) in attributeGroupList" :key="item.id">
@@ -29,7 +29,7 @@
 				<view class="sku-num--single-box">
 					<template>
 						<text>数量</text>
-						<text class="sku-num--single">{{maxBuyNum}}</text>
+						<!-- <text class="sku-num--single">{{maxBuyNum}}</text> -->
 					</template>
 				</view>
 				<u-number-box :min="1" :max="maxBuyNum" button-size="40rpx" bgColor="#F5F6FA" 
@@ -40,8 +40,8 @@
 			</view>
 			<view class="footer">
 				<view class="btn-bg" v-if="mode == 1">
-					<UiButton class="btn" @click="addCart" size="max">加入购物车</UiButton>
-					<UiButton class="btn btn__buy" @click="buyNow" size="max">立即购买</UiButton>
+					<UiButton class="btn" @click="addCart" size="max" :disable="curSku.stock == 0">加入购物车</UiButton>
+					<UiButton class="btn btn__buy" @click="buyNow" size="max" :disable="curSku.stock == 0">立即购买</UiButton>
 				</view>
 				<UiButton v-else class="btn__confirm" type="gradual" size="max" @click="confirm">确认</UiButton>
 			</view>
@@ -116,7 +116,8 @@ export default {
 			const skuSymbolList = this.attributeGroupList.map(item => {
 				const activeAttr = item.attributes.find(i => i.active);
 				return activeAttr ? activeAttr.symbol : ''
-			}).filter(i => i);
+			}).filter(i => i).sort();
+			console.log(skuSymbolList);
 			return this.skuInfo.find(i => i.attributeSymbolList === skuSymbolList.join(',')) || {};
 		},
 		/**
@@ -136,6 +137,9 @@ export default {
 		 */
 		setDefaultAttr(){
 			const curSku = this.skuInfo.find(i => i.stock > 0);
+			if(!curSku){
+				return false
+			}
 			this.attributeGroupList.forEach((item, index) => {
 				for(let i of item.attributes){
 					if(curSku.attributeSymbolList.includes(i.symbol)){
@@ -191,6 +195,10 @@ export default {
 		 * 加入购物车
 		 */
 		async addCart(){
+			if(!this.curSku.skuId){
+				uni.$u.toast('请选择规格~');
+				return false;
+			}
 			const {error, result} = await ApiPutAddCart({
 				productSkuId : this.curSku.skuId,
 				productId : this.goodsInfo.id,
@@ -208,6 +216,10 @@ export default {
 		 * 立即购买
 		 */
 		buyNow(){
+			if(!this.curSku.skuId){
+				uni.$u.toast('请选择规格~');
+				return false;
+			}
 			this.$Router.push({
 				path : '/orderSubmit',
 				query: {
@@ -332,6 +344,7 @@ export default {
 
 	.btn__confirm{
 		margin: 0;
+		width: 670rpx;
 	}
 }
 </style>
diff --git a/pages/goods/detail/index.vue b/pages/goods/detail/index.vue
index 6fc6018..c573e7b 100644
--- a/pages/goods/detail/index.vue
+++ b/pages/goods/detail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 17:27:21
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 14:49:48
+ * @LastEditTime: 2022-04-22 20:09:27
  * @Description: file content
 -->
 <template>
@@ -36,9 +36,9 @@
 				<view class="icon cart" @click="$Router.push('/cart')">购物车</view>
 			</view>
 			<view class="footer--btns">
-				<UiButton class="btn" v-if="activityStatus !== 'startActivity' " @click="onShowSkuPopup(2)">加入购物车</UiButton>
-				<UiButton class="btn btn--buy" v-if="activityStatus === 'noStartActivity'" @click="onShowSkuPopup(3)">原价购买</UiButton>
-				<UiButton class="btn btn--buy" v-else @click="onShowSkuPopup(3)"> 立即购买</UiButton>
+				<UiButton class="btn" :disable="stock == 0" v-if="activityStatus !== 'startActivity' " @click="onShowSkuPopup(2)">加入购物车</UiButton>
+				<UiButton class="btn btn--buy" :disable="stock == 0" v-if="activityStatus === 'noStartActivity'" @click="onShowSkuPopup(3)">原价购买</UiButton>
+				<UiButton class="btn btn--buy" :disable="stock == 0" v-else @click="onShowSkuPopup(3)"> 立即购买</UiButton>
 			</view>
 		</view>
 	</view>
@@ -82,6 +82,13 @@ export default {
 				status = 'startActivity';
 			}
 			return status;
+		},
+		stock(){
+			let stock = 0;
+			this.skuInfoData.forEach(i => {
+				stock += i.stock
+			})
+			return stock
 		}
 	},
 	onLoad(){
@@ -132,7 +139,7 @@ export default {
 <style lang="scss" scoped>
 page{
 	background: $color-grey1;
-	padding-bottom: 138rpx;
+	padding-bottom: 206rpx;
 }
 .back{
 	position: absolute;
@@ -184,8 +191,8 @@ page{
 	padding: 20rpx;
 }
 .footer{
-	height: 138rpx;
-	padding: 0 30rpx;
+	height: 206rpx;
+	padding: 0 30rpx 68rpx 30rpx;
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
diff --git a/pages/goods/search.vue b/pages/goods/search.vue
index 9836ada..e5d4fce 100644
--- a/pages/goods/search.vue
+++ b/pages/goods/search.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-21 11:29:38
  * @LastEditors: ch
- * @LastEditTime: 2022-04-22 11:01:26
+ * @LastEditTime: 2022-04-22 14:14:25
  * @Description: file content
 -->
 <template>
@@ -130,7 +130,7 @@ page{
 		box-sizing: border-box;
 		background: $color-grey1;
 		&__placeholder{
-			font-size: 26rpx;
+			font-size: $font-size-base;
 			color: $color-grey5;
 		}
 	}
diff --git a/pages/index/components/Banner.vue b/pages/index/components/Banner.vue
index a581e91..71060b2 100644
--- a/pages/index/components/Banner.vue
+++ b/pages/index/components/Banner.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 10:31:12
  * @LastEditors: ch
- * @LastEditTime: 2022-04-20 18:29:40
+ * @LastEditTime: 2022-04-22 18:02:47
  * @Description: file content
 -->
 <template>
@@ -46,9 +46,9 @@ export default {
 <style lang="scss" scoped>
 
 .banner{
-	height: 388rpx;
+	height: 368rpx;
 	position: relative;
-	padding: 50rpx 30rpx 0;
+	padding: 40rpx 30rpx 0;
 	overflow: hidden;
 	&::before{
 		display: block;
diff --git a/pages/index/components/Pick.vue b/pages/index/components/Pick.vue
index cbffd75..187ee69 100644
--- a/pages/index/components/Pick.vue
+++ b/pages/index/components/Pick.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-23 10:29:07
  * @LastEditors: ch
- * @LastEditTime: 2022-04-22 10:34:09
+ * @LastEditTime: 2022-04-22 19:15:35
  * @Description: file content
 -->
 <template>
@@ -19,7 +19,8 @@
 			<!-- <view class="price">￥{{max.startingPrice}}</view> -->
 			<UiMoney class="price" :money="max.startingPrice" prefix></UiMoney>
 			<view class="img-box">
-				<image class="img" :src="max.recommendPicture"/>
+				<!-- <image class="img" :src="max.recommendPicture"/> -->
+				<image class="img" src="https://msb-edu-dev.oss-cn-beijing.aliyuncs.com/uc/account-avatar/1111111.png"/>
 			</view>
 		</view>
 		<view class="min" @click="$Router.push(`/goodsDetail?id=${minOne.id}`)">
diff --git a/pages/login.vue b/pages/login.vue
index 97ee213..92006ff 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-03-22 15:36:46
  * @LastEditors: ch
- * @LastEditTime: 2022-04-22 11:18:14
+ * @LastEditTime: 2022-04-22 11:28:03
  * @Description: file content
 -->
 <template>
 	<view class="container">
 		<view class="header">
-			<image class="arrow" src="@/static/search/arrow.png" @click="goBack"/>
+			<image class="arrow" src="@/static/common/back.png" @click="goBack"/>
 		</view>
 		<view class="logo">马士兵严选</view>
 		<u--form class="login">
@@ -23,7 +23,7 @@
 					@click="getCode">{{tips}}</text>
 			</u-form-item>
 		</u--form>
-		<UiButton class="login--btn" type="gradual" @click="login">登录</UiButton>
+		<UiButton class="login--btn" type="gradual" size="max" @click="login">登录</UiButton>
 		<label class="login--agreement">
 			<radio class="radio" :checked="checked" @click="checked = !checked" color="#FF875B"/>
 			同意<text class="link">《用户协议》</text><text class="link">《隐私协议》</text>首次登录将自动注册
@@ -168,8 +168,6 @@ export default {
 	}
 	&--btn{
 		width: 650rpx;
-		height: 88rpx;
-		line-height: 88rpx;
 		font-size: $font-size-lg;
 		margin: 60rpx 50rpx 40rpx;
 	}
diff --git a/pages/order/detail/components/LogisitcsInfo.vue b/pages/order/detail/components/LogisitcsInfo.vue
index 1e25fe6..5b5bb7f 100644
--- a/pages/order/detail/components/LogisitcsInfo.vue
+++ b/pages/order/detail/components/LogisitcsInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 16:36:02
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 18:38:25
+ * @LastEditTime: 2022-04-22 18:28:23
  * @Description: file content
 -->
 <template>
@@ -54,10 +54,6 @@ export default {
 </script>
 <style lang="scss" scoped>
 .address{
-	/deep/.u-cell__body__content{
-		padding: 10rpx 0;
-
-	}
 	&--title{
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -80,4 +76,17 @@ export default {
 		}
 	}
 }
+
+/deep/{
+	.u-cell__body__content{
+		padding: 10rpx 0;
+	}
+	.u-cell__title{
+		font-weight: bold;
+		line-height: 36rpx;
+	}
+	.address--label{
+		font-weight: normal;
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/detail/components/OrderInfo.vue b/pages/order/detail/components/OrderInfo.vue
index 1a569ff..cd6bc18 100644
--- a/pages/order/detail/components/OrderInfo.vue
+++ b/pages/order/detail/components/OrderInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-15 16:04:28
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 17:45:16
+ * @LastEditTime: 2022-04-22 15:30:50
  * @Description: file content
 -->
 <template>
@@ -23,6 +23,10 @@
 				<text class="cell--title">支付方式:</text>
 				<text class="cell--value">{{orderInfo.payTypeDesc}}</text>
 			</view>
+			<view class="cell" v-if="orderInfo.logistics.companyName">
+				<text class="cell--title">配送方式:</text>
+				<text class="cell--value">{{orderInfo.logistics.companyName}}</text>
+			</view>
 			<view class="cell">
 				<text class="cell--title">买家留言:</text>
 				<text class="cell--value">{{orderInfo.userMessage}}</text>
@@ -36,11 +40,12 @@
 			</view>
 			<view class="cell">
 				<text class="cell--title">运费:</text>
-				<text class="cell--value">{{orderInfo.shippingAmount}}</text>
+				<text class="cell--value">￥{{orderInfo.shippingAmount}}</text>
 			</view>
 			<view class="amount-box">
-				<text class="amount-label">实付款：</text>
-				<UiMoney :money="orderInfo.payAmount" flaot prefix suffix/>
+				<text class="amount-label" v-if="orderInfo.orderStatus == 1">应付款：</text>
+				<text class="amount-label" v-else>实付款：</text>
+				<UiMoney :money="orderInfo.payAmount" float prefix suffix/>
 				<!-- <text class="amount">￥{{orderInfo.payAmount}}</text> -->
 			</view>
 			
diff --git a/pages/order/detail/components/StatusTips.vue b/pages/order/detail/components/StatusTips.vue
index f37274f..1691d20 100644
--- a/pages/order/detail/components/StatusTips.vue
+++ b/pages/order/detail/components/StatusTips.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 17:53:43
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 17:24:22
+ * @LastEditTime: 2022-04-22 18:20:00
  * @Description: file content
 -->
 <template>
@@ -89,7 +89,7 @@ export default {
 <style lang="scss" scoped>
 
 .status{
-	padding: 48rpx 60rpx 0;
+	padding: 40rpx 60rpx 0;
 	margin-bottom: 48rpx;
 	min-height: 130rpx;
 	position: relative;
@@ -98,14 +98,17 @@ export default {
 		height: 100rpx;
 		position: absolute;
 		right: 60rpx;
-		top: 10rpx;
+		top: 40rpx;
 	}
 	&--name{
 		font-size: 36rpx;
-		margin-bottom: 20rpx;
+		line-height: 36rpx;
+		margin: 8rpx 0 20rpx;
+		font-weight: bold;
 	}
 	&--desc{
 		font-size: $font-size-base;
+		line-height: $font-size-base;
 		color: $color-grey4;
 		margin-bottom: 48rpx;
 	}
diff --git a/pages/order/detail/index.vue b/pages/order/detail/index.vue
index a8fc169..13b4ef7 100644
--- a/pages/order/detail/index.vue
+++ b/pages/order/detail/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-31 14:26:09
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 14:49:52
+ * @LastEditTime: 2022-04-22 18:48:28
  * @Description: file content
 -->
 <template>
@@ -12,14 +12,18 @@
 			<UiGoodsInfo :class="index === orderInfo.products.length - 1 && 'goods-info__last'"
 				v-for="(item, index) in orderInfo.products" :data="item" :key="index">
 				<template slot="operation">
-					<view class="goods-info-operation" v-if="item.afterSaleApplyFlag || [3,4].includes(item.detailStatus)">
+					<view class="goods-info-operation" v-if="item.afterSaleApplyFlag || [2,3,4].includes(item.detailStatus)">
 						<UiButton size="min" type="primaryLine" v-if="item.afterSaleApplyFlag" 
 						 @click="$Router.push(`/saleAfterSelect?id=${item.orderProductId}`)">申请售后</UiButton>
 						<template v-else>
-							<UiButton size="min" type="line" v-if="item.detailStatus === 3"
+							<UiButton size="min" type="line"
+								 @click="$Router.push(`/saleAfterDetail?orderProductId=${item.orderProductId}`)">
+								 {{ item.detailStatus === 2 ? '退款中' :  item.detailStatus === 3 ? '已退款' : '退款关闭'}}
+							</UiButton>
+							<!-- <UiButton size="min" type="line" v-if="item.detailStatus === 3"
 								 @click="$Router.push(`/saleAfterDetail?orderProductId=${item.orderProductId}`)">已退款</UiButton>
 							<UiButton size="min" type="line" v-if="item.detailStatus === 4"
-								 @click="$Router.push(`/saleAfterDetail?orderProductId=${item.orderProductId}`)">退款关闭</UiButton>
+								 @click="$Router.push(`/saleAfterDetail?orderProductId=${item.orderProductId}`)">退款关闭</UiButton> -->
 						</template>
 					</view>
 				</template>
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 4809136..340d894 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 10:58:24
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 18:30:09
+ * @LastEditTime: 2022-04-22 18:07:49
  * @Description: file content
 -->
 <template>
@@ -21,34 +21,31 @@
 				<text class="orders--name">官方自营</text>
 				<text class="orders--status" :class="[1,3].includes(item.orderStatus) && 'orders--status__warn'">{{item.orderStatusDesc}}</text>
 			</view>
-			<view class="orders--item" v-for="i in item.products" :key="i.orderProductId" @click="$Router.push(`/orderDetail?id=${item.orderId}`)">
-				<image class="orders--item-image" mode="widthFix" :src="i.productImageUrl" />
-				<view >
-					<view class="orders--item-con">
-						<text class="orders--item-title">{{i.productName}}</text>
-						<text class="orders--item-pirce">￥{{i.realAmount}}</text>
-					</view>
-					<view class="orders--item-desc">
-						<text>{{i.skuDescribe}}</text>
-						<text class="orders--item-num">x{{i.quantity}}</text>
-					</view>
-				</view>
-			</view>
+			<UiGoodsInfoMax v-for="item in item.products" :key="item.orderProductId" 
+				:data="item" @click="$Router.push(`/orderDetail?id=${item.orderId}`)" />
 			<view class="orders--total">
-				<text>合计</text>
-				<text class="orders--total__amount">￥{{item.totalAmount}}</text>
-				<text class="orders--total__pay">应付</text>
-				<text class="orders--total__amount orders--total__pay">￥{{item.payAmount}}</text>
+				<text class="orders--total__amount">合计</text>
+				<UiMoney class="orders--total__amount" :money="item.totalAmount" float prefix suffix/>
+				<text class="orders--total__pay ">应付</text>
+				<UiMoney class="orders--total__pay" :money="item.totalAmount" float prefix suffix/>
 			</view>
+
 			<view class="orders--footer">
-				<button class="orders--footer-btn orders--footer-btn__red" 
-					v-if="item.orderStatus === 1" @click="pay(item)">去支付</button>
+				<UiButton size="min" type="gradual"
+					v-if="item.orderStatus === 1" @click="pay(item)">去支付</UiButton>
+				<UiButton size="min" v-if="[2,3].includes(item.orderStatus)" 
+					@click="$Router.push(`/orderDetail?id=${item.orderId}`)">查看详情</UiButton>
+				<UiButton size="min" v-if="item.orderStatus >= 4" 
+					@click="$Router.push(`/logisitcsInfo?orderId=${item.orderId}`)">查看物流</UiButton>
+				<UiButton size="min" type="gradual" v-if="item.orderStatus === 4" @click="receive(item)">确认收货</UiButton>
+				<!-- <button class="orders--footer-btn orders--footer-btn__red" 
+					>去支付</button>
 				<button class="orders--footer-btn" v-if="item.orderStatus === 2" 
 					@click="$Router.push(`/orderDetail?id=${item.orderId}`)">查看详情</button>
 				<button class="orders--footer-btn" v-if="item.orderStatus >= 4" 
 					@click="$Router.push(`/logisitcsInfo?orderId=${item.orderId}`)">查看物流</button>
 				<button class="orders--footer-btn orders--footer-btn__red"  
-					v-if="item.orderStatus == 4" @click="receive(item)">确认收货</button>
+					v-if="item.orderStatus == 4" @click="receive(item)">确认收货</button> -->
 			</view>
 		</view>
 		<u-loadmore :status="loadingStatus" v-if="loadingStatus === 'loading'"/>
@@ -61,17 +58,20 @@ import BsEmpty from '@/components/BsEmpty.vue';
 import UiButton from '@/components/UiButton.vue';
 import { ApiGetOrderList, ApiPutOrderReceive } from '@/common/api/order';
 import BsPay from '../../components/BsPay.vue';
+import UiGoodsInfo from '../../components/UiGoodsInfo.vue';
+import UiGoodsInfoMax from '../../components/UiGoodsInfoMax.vue';
+import UiMoney from '../../components/UiMoney.vue';
 
 export default {
-	components: { BsEmpty, UiButton, BsPay },
+	components: { BsEmpty, UiButton, BsPay, UiGoodsInfo, UiGoodsInfoMax, UiMoney },
 	data () {
 		return {
 			tabListData : [
 				{key : '-1', name : '全部'},
 				{key : '1', name : '待付款'},
 				{key : '3', name : '待发货'},
-				{key : '4', name : '待收货'},
-				{key : '6', name : '待评价'}
+				{key : '4', name : '待收货'}
+				// {key : '6', name : '待评价'}
 			],
 			currentTabKey : this.$Route.query.tab || '-1',
 			orderListData : [],
@@ -201,6 +201,7 @@ page{
 	&--name{
 		font-size: $font-size-lg;
 		color: $color-grey6;
+		font-weight: bold;
 	}
 	&--status{
 		font-size: $font-size-sm;
@@ -209,92 +210,51 @@ page{
 			color: $color-yellow3;
 		}
 	}
-	&--item{
-		display: flex;
-		justify-content: space-between;
-		padding: 30rpx 0 0;
-	}
-
-	&--item-image{
-		width: 180rpx;
-		height: 180rpx;
-		margin-right: 30rpx;
-	}
-	&--item-con{
-		width: 510rpx;
-		display: flex;
-		justify-content: space-between;
-		font-size: $font-size-base;
-		color: $color-grey6;
-		line-height: 39rpx;
-	}
-	&--item-title{
-		overflow:hidden; 
-		text-overflow:ellipsis;
-		display:-webkit-box; 
-		-webkit-box-orient:vertical;
-		-webkit-line-clamp:2; 
-	}
-	&--item-pirce{
-		font-size: 22rpx;
-		margin-left: 60rpx;
-	}
-	&--item-desc{
-		width: 510rpx;
-		font-size: $font-size-sm;
-		color: $color-grey4;
-		margin-top: 20rpx;
-		line-height: 39rpx;
-		display: flex;
-		justify-content: space-between;
-	}
-	&--item-num{
-		font-size: $font-size-base;
-		margin-left: 60rpx;
-	}
 
 	&--total{
-		font-size: $font-size-sm;
-		color: $color-grey4;
 		display: flex;
 		align-items: center;
-		justify-content: end;
+		justify-content: flex-end;
 		margin-top: 30rpx;
-		&__amount{
-			font-size: $font-size-base;
-			margin-right: 20rpx;
-		}
-		&__pay{
-			color: $color-grey6;
-		}
 	}
 	&--footer{
 		display: flex;
-		justify-content: end;
+		justify-content: flex-end;
 		align-items: center;
 		margin-top: 30rpx;
-		&-btn{
-			height: 58rpx;
-			line-height: 58rpx;
-			border-radius: 30rpx;
-			margin: 0 0 0 30rpx;
-			border: 1px solid $color-grey6;
-			color: $color-grey6;
-			background: none;
-			font-size: 26rpx;
-			&__red{
-				background: linear-gradient(270deg, $color-yellow2 0%, $color-yellow1 100%);
-				color: $color-grey0;
-				border: 0;
-				height: 60rpx;
-				line-height: 60rpx;
-			}
-		}
 		
 	}
 }
-
-	
-// 空数据按钮
+/deep/{
+	.orders--footer{
+		.ui-btn{
+			margin: 0 0 0 20rpx;
+			width: 180rpx;
+			padding: 0;
+		}
+	}
+	.orders--total__amount,.orders--total__pay{
+		font-size: $font-size-sm;
+		text{
+			font-size: 36rpx;
+			font-weight: bold;
+		}
+		.ui-money--prefix{
+			font-size: $font-size-sm;
+		}
+		.ui-money--suffix{
+			font-size: $font-size-sm;
+		}
+	}
+	.orders--total__amount {
+		color: $color-grey4;
+		text{
+			color: $color-grey4;
+		}
+		.ui-money--suffix{
+			margin-right: 20rpx;
+		}
+	}
+}
 
 </style>
\ No newline at end of file
diff --git a/pages/order/logisitcsInfo.vue b/pages/order/logisitcsInfo.vue
index 2ea3398..da029bc 100644
--- a/pages/order/logisitcsInfo.vue
+++ b/pages/order/logisitcsInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-18 15:28:14
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 17:13:27
+ * @LastEditTime: 2022-04-22 19:28:13
  * @Description: file content
 -->
 <template>
@@ -13,12 +13,15 @@
 		</UiWhiteBox>
 		<UiWhiteBox class="company">
 			<text class="company--name">{{orderInfo.companyName}}</text>
-			<view class="company--no">{{orderInfo.trackingNo}}</view>
+			<view class="company--no">
+				<text>{{orderInfo.trackingNo}}</text>
+				<UiCopy :value="orderInfo.trackingNo"/>
+			</view>
 		</UiWhiteBox>
 		<UiWhiteBox>
 			<view class="title">
 				<text>物流信息</text>
-				<text class="title--desc">本服务有快递100提供</text>
+				<text class="title--desc">本服务由快递100提供</text>
 			</view>
 			<view class="group">
 				<view class="item" :class="idx === orderInfo.logisticsDataList.length - 1 ? 'item__last' : ''" 
@@ -34,8 +37,9 @@
 import UiGoodsInfo from '@/components/UiGoodsInfo.vue'
 import UiWhiteBox from '@/components/UiWhiteBox.vue'
 import {ApiGetOrderLogistics} from '@/common/api/order';
+import UiCopy from '../../components/UiCopy.vue';
 export default {
-	components: { UiWhiteBox, UiGoodsInfo },
+	components: { UiWhiteBox, UiGoodsInfo, UiCopy },
 	data(){
 		return {
 			orderInfo : {}
diff --git a/pages/order/saleAfter/saleAfterApply.vue b/pages/order/saleAfter/saleAfterApply.vue
index 04078cc..3a584c4 100644
--- a/pages/order/saleAfter/saleAfterApply.vue
+++ b/pages/order/saleAfter/saleAfterApply.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-11 13:51:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 17:55:17
+ * @LastEditTime: 2022-04-22 18:53:35
  * @Description: file content
 -->
 <template>
@@ -203,5 +203,6 @@ textarea{
 	position: fixed;
 	bottom: 40rpx;
 	left: 30rpx;
+	width: 670rpx;
 }
 </style>
\ No newline at end of file
diff --git a/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue b/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
index 751e5ad..45fe0a1 100644
--- a/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
+++ b/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-14 14:19:41
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 18:14:30
+ * @LastEditTime: 2022-04-22 19:24:49
  * @Description: file content
 -->
 <template>
@@ -66,6 +66,9 @@ export default {
 		font-size: $font-size-sm;
 		color: $color-grey5;
 		text-align: right;
+		max-width: 500rpx;
+		word-wrap: break-word;
+		word-break: normal;
 	}
 }
 .recipient{
diff --git a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue b/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
index fa6eadc..aedb3dd 100644
--- a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
+++ b/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-14 13:44:30
  * @LastEditors: ch
- * @LastEditTime: 2022-04-19 17:28:01
+ * @LastEditTime: 2022-04-22 18:53:55
  * @Description: file content
 -->
 <template>
@@ -246,6 +246,7 @@ export default {
 	position: fixed;
 	bottom: 30rpx;
 	left: 30rpx;
-	z-index:999
+	z-index:999;
+	width: 670rpx;
 }
 </style>
\ No newline at end of file
diff --git a/pages/order/saleAfter/saleAfterEdit.vue b/pages/order/saleAfter/saleAfterEdit.vue
index aa5f4ab..00ad5da 100644
--- a/pages/order/saleAfter/saleAfterEdit.vue
+++ b/pages/order/saleAfter/saleAfterEdit.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-04-11 13:51:10
  * @LastEditors: ch
- * @LastEditTime: 2022-04-14 17:55:55
+ * @LastEditTime: 2022-04-22 18:53:25
  * @Description: file content
 -->
 <template>
@@ -225,5 +225,6 @@ textarea{
 	position: fixed;
 	bottom: 40rpx;
 	left: 30rpx;
+	width: 670rpx;
 }
 </style>
\ No newline at end of file
diff --git a/pages/order/submit.vue b/pages/order/submit.vue
index f23e601..dbc6e4c 100644
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-04-21 19:58:02
+ * @LastEditTime: 2022-04-22 19:51:14
  * @Description: file content
 -->
 <template>
@@ -166,15 +166,26 @@ export default {
 				uni.$u.toast(error.message);
 				return false;
 			}
-			// this.wxpay(result.orderId);
+			this.wxpay(result.orderId);
 		},
-		async wxpay(orderId){
-			const {error, result} = await ApiPostWxPay({orderId,payTypeEnum:'WXPAY'});
-			if(error){
-				this.$Router.replace(`/payFail?ordId=${orderId}`)
-			}else{
-				this.$Router.replace(`/paySuccess?ordId=${orderId}`)
-			}
+		wxpay(orderId){
+			this.$msb.confirm({
+				content : '您确定要支付吗？',
+				cancelText : '暂不支付',
+				confirmText : '立即支付',
+				confirm : async () => {
+					const {error, result} = await ApiPostWxPay({orderId,payTypeEnum:'WXPAY'});
+					if(error){
+						this.$Router.replace(`/payFail?ordId=${orderId}`)
+					}else{
+						this.$Router.replace(`/paySuccess?ordId=${orderId}`)
+					}
+				},
+				cancel : ()=>{
+					this.$Router.replace(`/orderDetail?id=${orderId}`)
+				}
+			})
+			
 
 		}
 	}
diff --git a/static/account/dz.png b/static/account/dz.png
index e8ec946..bd7fb04 100644
Binary files a/static/account/dz.png and b/static/account/dz.png differ
diff --git a/static/account/fh.png b/static/account/fh.png
index eafbc58..6ae5ca9 100644
Binary files a/static/account/fh.png and b/static/account/fh.png differ
diff --git a/static/account/fk.png b/static/account/fk.png
index f02340e..5f6f94d 100644
Binary files a/static/account/fk.png and b/static/account/fk.png differ
diff --git a/static/account/kf.png b/static/account/kf.png
index 663c826..437492d 100644
Binary files a/static/account/kf.png and b/static/account/kf.png differ
diff --git a/static/account/sh.png b/static/account/sh.png
index 6dcd756..a0407b4 100644
Binary files a/static/account/sh.png and b/static/account/sh.png differ
diff --git a/static/account/sz.png b/static/account/sz.png
index 6ef78cb..2c0cbb1 100644
Binary files a/static/account/sz.png and b/static/account/sz.png differ
diff --git a/static/account/tk.png b/static/account/tk.png
index 961bfcb..b686f10 100644
Binary files a/static/account/tk.png and b/static/account/tk.png differ
diff --git a/static/common/back.png b/static/common/back.png
new file mode 100644
index 0000000..4400d54
Binary files /dev/null and b/static/common/back.png differ
diff --git a/static/common/back_white.png b/static/common/back_white.png
new file mode 100644
index 0000000..705538b
Binary files /dev/null and b/static/common/back_white.png differ
diff --git a/static/common/empty_goods.png b/static/common/empty_goods.png
new file mode 100644
index 0000000..84b1c4c
Binary files /dev/null and b/static/common/empty_goods.png differ