From 4c5e4b829f33065d87baccda8d45ac70d032c758 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Mon, 18 Apr 2022 18:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/account/address/list.vue                |  6 +--
 pages/account/setting/index.vue               |  4 +-
 .../order/detail/components/LogisitcsInfo.vue |  5 ++-
 .../components/LogisticsInfo.vue              | 11 +++--
 .../components/SubmitLogistics.vue            | 41 +++++++++++++++----
 pages/order/submit.vue                        |  4 +-
 6 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/pages/account/address/list.vue b/pages/account/address/list.vue
index 10ad7fa..87aaf47 100644
--- a/pages/account/address/list.vue
+++ b/pages/account/address/list.vue
@@ -2,19 +2,17 @@
  * @Author: ch
  * @Date: 2022-03-22 13:54:15
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:03:39
+ * @LastEditTime: 2022-04-18 18:36:28
  * @Description: file content
 -->
 <template>
 	<view class="container">
 		<view class="address">
-			
 			<u-loadmore v-if="isLoading" status="loading" />
 			<BsEmpty tips="暂无收货地址呢~" v-if="!isLoading && !addresList.length"></BsEmpty>
 			<view class="addressItem" v-for="(item, index) in addresList" :key="item.id"
 				:class="{'addressItem__last' : index === addresList.length - 1,'addressItem__default':item.isDefault}">
-				
-				<radio :checked="item.id === selectedId" @click="changeAds(item)"/>
+				<radio v-if="query.source" :checked="item.id === selectedId" @click="changeAds(item)"/>
 				<view>
 					<view class="addressItem--city">{{item.province}}{{item.city}}{{item.area}}</view>
 					<view class="addressItem--detail">{{item.detailAddress}}</view>
diff --git a/pages/account/setting/index.vue b/pages/account/setting/index.vue
index d9cb63c..ab39f0a 100644
--- a/pages/account/setting/index.vue
+++ b/pages/account/setting/index.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-03-22 15:09:06
  * @LastEditors: ch
- * @LastEditTime: 2022-04-09 15:03:40
+ * @LastEditTime: 2022-04-18 18:40:02
  * @Description: file content
 -->
 <template>
@@ -28,7 +28,7 @@ export default {
 	},
 	methods:{
 		logout(){
-			// this.$store.commit('SET_TOKEN');
+			this.$store.commit('SET_TOKEN');
 			this.$Router.replace('/login')
 		}
 	}
diff --git a/pages/order/detail/components/LogisitcsInfo.vue b/pages/order/detail/components/LogisitcsInfo.vue
index 6fe1dac..1e25fe6 100644
--- a/pages/order/detail/components/LogisitcsInfo.vue
+++ b/pages/order/detail/components/LogisitcsInfo.vue
@@ -2,12 +2,13 @@
  * @Author: ch
  * @Date: 2022-04-15 16:36:02
  * @LastEditors: ch
- * @LastEditTime: 2022-04-18 16:31:12
+ * @LastEditTime: 2022-04-18 18:38:25
  * @Description: file content
 -->
 <template>
 		<UiWhiteBox>
-			<u-cell class="address" isLink v-if="lastLogisitcs" @click="$Router.push('/addressList')">
+			<u-cell class="address" isLink v-if="lastLogisitcs" 
+				@click="$Router.push(`/logisitcsInfo?orderId=${orderInfo.orderId}`)">
 				<view slot="title" class="address--title">{{lastLogisitcs.context}}</view>
 				<image class="address--icon" slot="icon" src="@/static/order/fj.png" />
 				<view slot="label" class="address--label">
diff --git a/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue b/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
index 25b5462..751e5ad 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-15 11:17:27
+ * @LastEditTime: 2022-04-18 18:14:30
  * @Description: file content
 -->
 <template>
@@ -12,8 +12,8 @@
 			<view class="info--cell">
 				<text class="info--cell-label">收货信息：</text>
 				<view class="info--cell-value">
-					<view>{{data.recipientName}} {{data.recipientPhone}}</view>
-					<view>{{data.recipientAddress}}</view>
+					<view class="recipient">{{data.recipientName}} {{data.recipientPhone}}</view>
+					<view class="recipient">{{data.recipientAddress}}</view>
 				</view>
 			</view>
 			<view class="info--cell">
@@ -68,4 +68,9 @@ export default {
 		text-align: right;
 	}
 }
+.recipient{
+	color: $color-grey5;
+	font-size: $font-size-sm;
+	margin-bottom: 10rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue b/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
index 60f3d59..eb38ed8 100644
--- a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
+++ b/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
@@ -2,16 +2,20 @@
  * @Author: ch
  * @Date: 2022-04-14 13:44:30
  * @LastEditors: ch
- * @LastEditTime: 2022-04-15 11:08:54
+ * @LastEditTime: 2022-04-18 18:08:29
  * @Description: file content
 -->
 <template>
 	<view>
 		<UiWhiteBox>
 			<view class="title">商家已同意退货申请，请尽早退货。</view>
-			<u-cell class="address" :title="data.refundLogistics.recipientAddress" :label="`收货人：${data.refundLogistics.recipientName} ${data.refundLogistics.recipientPhone}`" 
-				:border="false">
+			<u-cell class="address" :border="false">
+				<view slot="title" class="address--title">{{data.refundLogistics.recipientAddress}}</view>
 				<image class="address--icon" slot="icon" src="@/static/order/dw.png" />
+				<view slot="label" class="address--label">
+					<text>收货人：{{data.refundLogistics.recipientName}}</text>
+					<text>{{data.refundLogistics.recipientPhone}}</text>
+				</view>
 			</u-cell>
 		</UiWhiteBox>
 		<UiWhiteBox>
@@ -164,10 +168,33 @@ export default {
 .box{
 	padding: 0 30rpx;
 }
-.address--icon{
-	width: 40rpx;
-	height: 48rpx;
-	margin-right: 10rpx;
+.address{
+	/deep/.u-cell__body__content{
+		padding: 10rpx 0;
+
+	}
+	&--title{
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		width: 500rpx;
+		&__grey{
+			color: $color-grey4;
+		}
+	}
+	&--icon{
+		width: 28rpx;
+		height: 34rpx;
+		margin-right: 30rpx;
+	}
+	&--label{
+		margin-top: 26rpx;
+		text{
+			font-size: $font-size-sm;
+			color: $color-grey4;
+			margin-right: 40rpx;
+		}
+	}
 }
 .title{
 	height: 98rpx;
diff --git a/pages/order/submit.vue b/pages/order/submit.vue
index 81d51b9..3bc583a 100644
--- a/pages/order/submit.vue
+++ b/pages/order/submit.vue
@@ -2,13 +2,13 @@
  * @Author: ch
  * @Date: 2022-03-20 14:14:53
  * @LastEditors: ch
- * @LastEditTime: 2022-04-11 18:08:06
+ * @LastEditTime: 2022-04-18 18:33:51
  * @Description: file content
 -->
 <template>
 	<view>
 		<u-cell class="address" :title="address.province + address.city + address.area" :label="address.name + address.phone" 
-			:border="false" isLink @click="$Router.push('/addressList')">
+			:border="false" isLink @click="$Router.push('/addressList?source=submitOrder')">
 			<image class="address--icon" slot="icon" src="@/static/order/dw.png" />
 		</u-cell>