From 101aa279d8cd81c3265241fae5444ee08b6c3f3d Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Tue, 19 Sep 2023 17:18:44 +0800
Subject: [PATCH 1/7] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E5=87=A0=E4=B8=AA=E5=B7=B2=E7=9F=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/cart/coupon/index.vue                        | 2 +-
 pages/order/afterSales/afterSalesDetailExpress.vue | 2 +-
 pages/product/product/shop/-shop.vue               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/cart/coupon/index.vue b/pages/cart/coupon/index.vue
index 97f3662..2261545 100644
--- a/pages/cart/coupon/index.vue
+++ b/pages/cart/coupon/index.vue
@@ -53,7 +53,7 @@
           <text>立即</text><br />
           <text>使用</text>
         </view>
-        <view class="used" v-else @click="clickWay(item)">
+        <view class="used" v-if="current == 0 && routerVal.selectedCoupon.includes(item.id)" @click="clickWay(item)">
           <text>取消</text><br />
           <text>使用</text>
         </view>
diff --git a/pages/order/afterSales/afterSalesDetailExpress.vue b/pages/order/afterSales/afterSalesDetailExpress.vue
index f5f6a54..77b3fb3 100644
--- a/pages/order/afterSales/afterSalesDetailExpress.vue
+++ b/pages/order/afterSales/afterSalesDetailExpress.vue
@@ -30,7 +30,7 @@
         <view class="opt-view">
           <view class="img-title" style="font-size: 30rpx">填写物流信息</view>
           <u-form-item label="返回方式" :label-width="150">
-            <u-input type="text" input-align="right" value="快递至第三方卖家" />
+            <div style="width: 100%; text-align: right;">快递至第三方卖家</div>
           </u-form-item>
           <u-form-item label="快递公司" :label-width="150">
             <div style="width: 100%; text-align: right;" @click="companySelectShow = true" >{{ form.courierCompany || '请选择快递公司' }}</div>
diff --git a/pages/product/product/shop/-shop.vue b/pages/product/product/shop/-shop.vue
index 63736b5..70662e5 100644
--- a/pages/product/product/shop/-shop.vue
+++ b/pages/product/product/shop/-shop.vue
@@ -67,7 +67,7 @@ export default {
 <style lang="scss" scoped>
 @import "../product.scss";
 .recommend-item-name {
-  height: 70rpx;
+  height: 60rpx;
   color: #333;
   font-weight: 400;
   font-size: 24rpx;

From fddceb5f368735651b55c9672fe6a495f7720f21 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Mon, 25 Sep 2023 15:21:46 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8h?=
 =?UTF-8?q?5=20=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E5=88=B7=E6=96=B0=E5=86=8D=E7=82=B9=E5=87=BB=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=E4=B8=8D=E7=94=9F=E6=95=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/m-search-revision/m-search-revision.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/components/m-search-revision/m-search-revision.vue b/components/m-search-revision/m-search-revision.vue
index 4318471..9c88a6d 100644
--- a/components/m-search-revision/m-search-revision.vue
+++ b/components/m-search-revision/m-search-revision.vue
@@ -121,7 +121,15 @@ export default {
      * 回退到上一级
      */
     onClickLeft() {
-      uni.navigateBack();
+      const paths = getCurrentPages();
+      console.log(paths)
+      if(paths.length > 1){
+        uni.navigateBack();
+      }else{
+        uni.switchTab({
+          url:"/pages/tabbar/home/index"
+        })
+      }
     },
 
     /**

From dae3e74a60c9898e410c31be6ec3ff80d713258d Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Tue, 26 Sep 2023 13:13:57 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E6=94=B9=E5=9C=A8?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=89=8B=E6=9C=BA=E5=88=86=E8=BE=A8=E7=8E=87?=
 =?UTF-8?q?=E4=B8=8B=E9=A6=96=E9=A1=B5=E6=96=87=E5=AD=97=E6=9C=89=E8=AF=AF?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabbar/home/template/tpl_goods.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/tabbar/home/template/tpl_goods.vue b/pages/tabbar/home/template/tpl_goods.vue
index bc0782c..d4e6d31 100644
--- a/pages/tabbar/home/template/tpl_goods.vue
+++ b/pages/tabbar/home/template/tpl_goods.vue
@@ -37,7 +37,7 @@
           </u-image>
         </div>
         <div class="goods-desc">
-          <div class="goods-title">
+          <div class="goods-title" :style="{ height: (proportion * 34) + 'rpx' }">
             {{ item.title }}
           </div>
           <div class="goods-bottom">
@@ -68,7 +68,7 @@
           </u-image>
         </div>
         <div class="goods-desc">
-          <div class="goods-title">
+          <div class="goods-title" :style="{ height: (proportion * 34) + 'rpx' }">
             {{ item.goodsName }}
           </div>
           <div class="goods-bottom">
@@ -100,6 +100,7 @@ export default {
       },
       goodsData: [], //商品循环内容
       goodsResult:"", //es总返回内容
+      proportion:0,
     };
   },
   props: ["res","enableBottomLoad"],
@@ -119,6 +120,10 @@ export default {
     },
   },
   mounted() {
+    const winWidth = uni.getSystemInfoSync().windowWidth
+    const proportion = 750 / winWidth
+    this.proportion = proportion
+
     uni.$on('onReachBottom',()=>{
       if(this.enableBottomLoad && this.goodsResult.totalElements >= this.params.pageNumber * this.params.pageSize){
         this.params.pageNumber++

From 1cc6cc4ac721b7cf104e8baea218314109b2d022 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Tue, 26 Sep 2023 19:22:58 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=9B=9E=E6=BB=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?goods=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/set/feedBack.vue              | 2 +-
 pages/tabbar/home/template/tpl_goods.vue | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/pages/mine/set/feedBack.vue b/pages/mine/set/feedBack.vue
index 3490a9a..bdd377a 100644
--- a/pages/mine/set/feedBack.vue
+++ b/pages/mine/set/feedBack.vue
@@ -84,7 +84,7 @@ export default {
       }
       if (!this.feedBack.context) {
         uni.showToast({
-          title: "请填写反馈类型",
+          title: "请填写反馈信息",
           duration: 2000,
           icon: "none",
         });
diff --git a/pages/tabbar/home/template/tpl_goods.vue b/pages/tabbar/home/template/tpl_goods.vue
index d4e6d31..bc0782c 100644
--- a/pages/tabbar/home/template/tpl_goods.vue
+++ b/pages/tabbar/home/template/tpl_goods.vue
@@ -37,7 +37,7 @@
           </u-image>
         </div>
         <div class="goods-desc">
-          <div class="goods-title" :style="{ height: (proportion * 34) + 'rpx' }">
+          <div class="goods-title">
             {{ item.title }}
           </div>
           <div class="goods-bottom">
@@ -68,7 +68,7 @@
           </u-image>
         </div>
         <div class="goods-desc">
-          <div class="goods-title" :style="{ height: (proportion * 34) + 'rpx' }">
+          <div class="goods-title">
             {{ item.goodsName }}
           </div>
           <div class="goods-bottom">
@@ -100,7 +100,6 @@ export default {
       },
       goodsData: [], //商品循环内容
       goodsResult:"", //es总返回内容
-      proportion:0,
     };
   },
   props: ["res","enableBottomLoad"],
@@ -120,10 +119,6 @@ export default {
     },
   },
   mounted() {
-    const winWidth = uni.getSystemInfoSync().windowWidth
-    const proportion = 750 / winWidth
-    this.proportion = proportion
-
     uni.$on('onReachBottom',()=>{
       if(this.enableBottomLoad && this.goodsResult.totalElements >= this.params.pageNumber * this.params.pageSize){
         this.params.pageNumber++

From 1046a1052efdc7b05aa91acf9b59c21acb76af75 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Thu, 28 Sep 2023 17:22:19 +0800
Subject: [PATCH 5/7] =?UTF-8?q?feat:=20=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E4=BC=98=E5=8C=96tool=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabbar/user/utils/tool.vue | 21 ++++++++++++++++++---
 utils/filters.js                 |  7 +++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index ae7f921..2fcb91e 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -123,10 +123,25 @@ export default {
   },
 	
   methods: {
+  	handleNavigate(url) {
+			uni.navigateTo({
+				url,
+			});
+		},
     navigateTo(url) {
-      uni.navigateTo({
-        url,
-      });
+      const ignores = [
+				'/pages/mine/set/setUp',
+				'/pages/mine/set/editionIntro',
+				'/pages/mine/set/feedBack'
+			]
+			if (!ignores.includes(url)) {
+				if (this.$options.filters.tipsToLogin('normal')) {
+					this.handleNavigate(url)
+				}
+			}
+			else {
+				this.handleNavigate(url)
+			}
     },
 	
 	linkMsgDetail(){
diff --git a/utils/filters.js b/utils/filters.js
index 0a27eda..5ea4136 100644
--- a/utils/filters.js
+++ b/utils/filters.js
@@ -376,7 +376,7 @@ export function talkIm (storeId, goodsId, id) {
   }
 }
 
-export function tipsToLogin () {
+export function tipsToLogin (type) {
   if (!isLogin("auth")) {
     uni.showModal({
       title: "提示",
@@ -388,7 +388,10 @@ export function tipsToLogin () {
         if (res.confirm) {
           navigateToLogin();
         } else if (res.cancel) {
-          uni.navigateBack();
+          if(type !== 'normal'){
+            uni.navigateBack();
+          }
+          
         }
       },
     });

From 3bf0be98cb6523a08e09013da1a09f042fe5f708 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Sat, 7 Oct 2023 16:12:04 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:=20:sparkles:=20=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=B6=B3=E8=BF=B9=E6=96=B0=E5=A2=9E=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine/myTracks.vue        | 95 ++++++++++++++++++++++++++++------
 pages/tabbar/cart/cartList.vue |  2 +-
 2 files changed, 79 insertions(+), 18 deletions(-)

diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue
index a03bede..01edc63 100644
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -1,22 +1,25 @@
 <template>
 	<view class="myTracks">
 		<u-navbar title="我的足迹">
-
+			<div slot="right">
+        <div class="light-color edit" @click="isEdit = !isEdit">{{ !isEdit ? '编辑' : '完成'}}</div>
+      </div>
 		</u-navbar>
+		<u-notice-bar mode="vertical" :list="['右划删除浏览记录']"></u-notice-bar>
 		<u-empty text="暂无历史记录" style="margin-top:200rpx;" mode="history" v-if="whetherEmpty"></u-empty>
 		<div v-else>
-			<view  v-if="item" v-for="(item, index) in trackList" :key="index">
-				<view class="myTracks-title" @click="navigateToStore(item)" v-if="item.storeName">{{item.storeName}}</view>
+			<view v-for="(item, index) in trackList" :key="index">
+				<view class="myTracks-title" @click="navigateToStore(item)">{{item.storeName}}</view>
 				<view class="myTracks-items">
 
 					<u-swipe-action style="width: 100%;" :show="item.show" :index="index" :key="item.id"
 						@click="delTracks" @open="open" :options="options">
-						<!-- 已失效商品 -->
-						<div class="myTracks-item lose-goods" v-if="!item.storeName && !item.goodsName && !item.price">
-							已失效商品 
-						</div>
-						<!-- 正常有效商品 -->
-						<view v-else class="myTracks-item">
+						
+						<view class="myTracks-item">
+							<u-checkbox-group v-if="isEdit" class="store-line-check">
+								<u-checkbox shape="circle" :active-color="lightColor" v-model="item.checked"
+                @change="checkboxChangeDP(item)"></u-checkbox>
+							</u-checkbox-group>
 							<view class="myTracks-item-img" @click.stop="navigateToDetail(item)">
 								<image :src="item.thumbnail"></image>
 							</view>
@@ -36,7 +39,9 @@
 				<view class="myTracks-divider"></view>
 
 			</view>
-
+			<div @click="handleClickDeleteSelected" v-if="isEdit" class="submit">
+				删除所选
+			</div>
 		</div>
 
 	</view>
@@ -51,7 +56,7 @@
 	export default {
 		data() {
 			return {
-
+				isEdit:false,
 				whetherEmpty: false, //是否数据为空
 				params: {
 					pageNumber: 1,
@@ -59,6 +64,7 @@
 					order: "desc",
 					sort: "updateTime",
 				},
+				lightColor:this.$lightColor,
 				options: [{
 					text: '删除',
 					style: {
@@ -86,6 +92,21 @@
 			this.getList();
 		},
 		methods: {
+			checkboxChangeDP(val){
+				console.log(val)
+			},
+			// 删除所选的数据
+			handleClickDeleteSelected(val){
+				const ids = this.trackList.filter(item=>item.checked).map(item=>item.goodsId);
+				if(!ids.length){
+					uni.showToast({
+						title:"请选择删除数据",
+						icon:"none"
+					})
+				}else{
+					this.delTracks(0,ids)
+				}
+			},
 			/**
 			 * 导航到店铺
 			 */
@@ -120,11 +141,12 @@
 				});
 				myTrackList(this.params).then((res) => {
 					uni.stopPullDownRefresh();
-					 if (this.$store.state.isShowToast){ uni.hideLoading() };
+					uni.hideLoading();
 					if (res.statusCode == 200) {
 						res.data.result.records.length &&
 							res.data.result.records.forEach((item) => {
 								item.show = false;
+								item.checked = false
 							});
 
 						let data = res.data.result.records;
@@ -141,10 +163,11 @@
 			/**
 			 * 删除足迹
 			 */
-			delTracks(index) {
-				deleteHistoryListId(this.trackList[index].goodsId).then((res) => {
+			delTracks(index,ids) {
+				deleteHistoryListId(ids || this.trackList[index].goodsId).then((res) => {
 					if (res.data.code == 200) {
 						this.trackList = [];
+						this.params.pageNumber = 1
 						this.getList();
 					} else {
 						uni.showToast({
@@ -160,9 +183,18 @@
 </script>
 
 <style lang="scss" scoped>
-	.lose-goods{
-		color: $main-color;
-		padding-left: 50rpx !important;
+	.submit{
+		position: fixed;
+		bottom: 20rpx;
+		left: 10%;
+		width: 80%;
+		height: 80rpx;
+		color: #fff;
+		border-radius: 100px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: $light-color;
 	}
 	.myTracks {
 		width: 100%;
@@ -234,10 +266,39 @@
 		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;
+		height: 60rpx;
+		line-height: 60rpx;
+	}
 
 	.myTracks-divider {
 		width: 100%;
 		height: 20rpx;
 	}
 
+
+
+	.myTracks-action-check {
+		align-items: center;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+	}
+	.edit{
+  	padding-right: 32rpx;
+	}
 </style>
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index 6d736cc..59bfaca 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -77,7 +77,7 @@
                 {{ skuItem.goodsSku.goodsName }}
               </p>
               <!-- 规格 -->
-              <p class="sp-type">{{skuItem.goodsSku.simpleSpecs}}</p>
+              <p class="sp-type" style="width:300rpx">{{skuItem.goodsSku.simpleSpecs}}</p>
               <p class="sp-type" v-if="skuItem.goodsSku.salesModel == 'WHOLESALE'">批发商品</p>
               <p class="sp-number">
                 <view class="sp-price">

From 2d369ad729368f2fd87399f28c6d0b39665f3fa3 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Thu, 12 Oct 2023 18:30:47 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20:bug:=20=E8=A7=A3=E5=86=B3=E5=9C=A8?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E4=B8=8A=E6=8B=BC=E5=9B=A2=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E7=8E=B0=E5=AE=9E=E6=8A=A2=E8=B4=AD=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=A0=8F=E7=9C=8B=E4=B8=8D=E5=88=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages.json b/pages.json
index e16ad50..eca83d4 100644
--- a/pages.json
+++ b/pages.json
@@ -532,7 +532,7 @@
 					"style": {
 						"navigationBarTitleText": "限时抢购",
 						"navigationStyle": "custom", // 隐藏系统导航栏
-						"navigationBarTextStyle": "white" ,
+						"navigationBarTextStyle": "black" ,
 						"app-plus": {
 							"titleNView": {
 								"homeButton":true
@@ -546,7 +546,7 @@
 					"style": {
 						"navigationBarTitleText": "拼团活动",
 						"navigationStyle": "custom", // 隐藏系统导航栏
-						"navigationBarTextStyle": "white" ,
+						"navigationBarTextStyle": "black" ,
 						"app-plus": {
 							// 将回弹属性关掉
 							"bounce": "none"