From 682a742497ebc69afee76ae72ecd2109787ae48e Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Wed, 2 Jun 2021 01:18:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/Logistics/index.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pages/order/Logistics/index.vue b/pages/order/Logistics/index.vue
index e9bb225..4044dbb 100644
--- a/pages/order/Logistics/index.vue
+++ b/pages/order/Logistics/index.vue
@@ -135,11 +135,7 @@ export default {
       }
       express(params)
         .then(res => {
-<<<<<<< HEAD
-          this.logisticsList = res.data.traces.reverse()
-=======
           this.logisticsList = res.data.Traces.reverse();
->>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
         })
         .catch(err => {
           uni.showToast({

From ff411fa641cff6e90a529c4dc271103cc39c5865 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 2 Jun 2021 09:34:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/UserBill/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/user/UserBill/index.vue b/pages/user/UserBill/index.vue
index 86ff4fd..b230713 100644
--- a/pages/user/UserBill/index.vue
+++ b/pages/user/UserBill/index.vue
@@ -7,7 +7,7 @@
     </view>
     <view class="sign-record">
       <view class="list">
-        <view class="item" v-for="(item, listIndex) in list[0]" :key="listIndex">
+        <view class="item" v-for="(item, listIndex) in list" :key="listIndex">
           <view class="data">{{ item.time }}</view>
           <view class="listn" v-for="(val, key) in item.list" :key="key">
             <view class="itemn acea-row row-between-wrapper">