From f600b628ce131f31fcb333d62eb808fc2c66dff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 22 Nov 2021 15:25:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=B6=B3=E8=BF=B9=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json              | 10 +--------
 pages/mine/myTracks.vue | 49 +++++++++++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/pages.json b/pages.json
index 1666bc6..9ecf839 100644
--- a/pages.json
+++ b/pages.json
@@ -86,15 +86,7 @@
 					"style": {
 						"navigationBarTitleText": "我的足迹",
 						"enablePullDownRefresh": true,
-						"app-plus": {
-							"titleNView": {
-								"buttons": [{
-									"text": "编辑",
-									"fontSize": "14"
-
-								}]
-							}
-						}
+						"navigationStyle": "custom"
 					}
 				}, {
 					"path": "myCollect",
diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue
index fbbf6ce..8fc4a8a 100644
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -1,5 +1,10 @@
 <template>
   <view class="myTracks">
+    <u-navbar title="我的足迹">
+      <div @click="changeRightBtn" slot="right" style="margin-right:32rpx">
+        {{edit}}
+      </div>
+    </u-navbar>
     <u-empty text="暂无历史记录" style="margin-top:200rpx;" mode="history" v-if="whetherEmpty"></u-empty>
     <div v-else>
       <view v-for="(item, index) in trackList" :key="index">
@@ -30,7 +35,6 @@
       <uni-load-more :status="loadStatus"></uni-load-more>
     </div>
     <view v-if="editFlag">
-      <view class="myTracks-action-placeholder"></view>
       <view class="myTracks-action">
         <view class="myTracks-action-check">
           <u-checkbox-group>
@@ -41,7 +45,7 @@
         </view>
 
         <view>
-          <u-button type="warning" plain="true" @click="delAllTracks" class="myTracks-action-btn">
+          <u-button type="warning"  @click="delAllTracks" class="myTracks-action-btn">
             删除
           </u-button>
         </view>
@@ -56,6 +60,7 @@ import { myTrackList, deleteHistoryListId } from "@/api/members.js";
 export default {
   data() {
     return {
+      edit: "编辑",
       editFlag: false, //是否编辑
       allChecked: false, //是否全选
       loadStatus: "more", //底部下拉加载状态
@@ -172,6 +177,18 @@ export default {
       this.allChecked = isCheckedAll;
     },
 
+    /**
+     * 右侧标签栏切换
+     */
+    changeRightBtn(e) {
+      if (!this.editFlag) {
+        this.edit = "完成";
+      } else {
+        this.edit = "编辑";
+      }
+      this.editFlag = !this.editFlag;
+    },
+
     /**
      * 点击全选按钮
      */
@@ -208,18 +225,6 @@ export default {
       });
     },
   },
-
-  /**
-   * 右侧标签栏切换
-   */
-  onNavigationBarButtonTap(e) {
-    if (!this.editFlag) {
-      this.setStyle("完成");
-    } else {
-      this.setStyle("编辑");
-    }
-    this.editFlag = !this.editFlag;
-  },
 };
 </script>
 
@@ -292,6 +297,18 @@ export default {
   color: $light-color;
   padding: 10rpx 0 0 0;
 }
+.myTracks-action{
+  display: flex;
+  justify-content: space-between;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  background: #fff;
+  height: 75rpx;
+  align-items: center;
+  padding: 0 32rpx;
+}
 
 .myTracks-action-btn {
   width: 130rpx;
@@ -304,9 +321,7 @@ export default {
   height: 20rpx;
 }
 
-.myTracks-action-placeholder {
-  height: 110rpx;
-}
+
 
 .myTracks-action-check {
   align-items: center;