From 55e0bc7cd9b2c2f22fc1752b3430860902b99c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Tue, 13 Oct 2020 14:29:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E6=81=AF-=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E8=BE=BE=E4=BA=BA=E6=94=B9=E4=B8=BA=E5=B1=95=E7=A4=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=98=B5=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 7a2edcfd1c0fc7c546389a3e63dd0d7892e65e0a.
---
 pageD/attention/attention.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pageD/attention/attention.vue b/pageD/attention/attention.vue
index 1005c6c..38b17ba 100644
--- a/pageD/attention/attention.vue
+++ b/pageD/attention/attention.vue
@@ -5,7 +5,7 @@
 				<image :src="item.friend_tomavatar" mode="aspectFill"></image>
 				<view class="tishi" v-if="item.unread_message"></view>
 			</view>
-			<view>{{item.friend_tomname}}</view>
+			<view>{{item.friend_tomnickname}}</view>
 			<view>{{item.live_status ? '正在直播' : '未直播'}}</view>
 			<view  class="cur_two"  @click="tapClick(index)">已关注</view>
 			<!-- <view class="cur"   @click="tapClick(index)" v-else = "item.about == 2">未关注</view> -->

From f8f3cf08f2fafd94238d9cdb937c13ede0af57e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=93=E9=9B=AA=E5=B3=B0?= <634123426@qq.com>
Date: Tue, 13 Oct 2020 14:30:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=88=90=E5=8A=9F=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageE/order/RefundOrder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pageE/order/RefundOrder.vue b/pageE/order/RefundOrder.vue
index c13e6d1..a9ff1be 100644
--- a/pageE/order/RefundOrder.vue
+++ b/pageE/order/RefundOrder.vue
@@ -137,7 +137,6 @@ export default {
 			return true;
 		},
 		applyRefund() {
-			
 			if(this.type !=2 && !this.verifyParams()) return false;
 			// addrefundall 只需要订单id 和 说明
 			let params = {
@@ -154,6 +153,7 @@ export default {
 					if(res.errCode == 0) {
 						this.$refs.uToast.show({
 							title: res.message,
+							type: 'success',
 							back: true,
 						})
 					} else {