From ade8c79e8ee599c4686e77c933e6a0db14d768d7 Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Tue, 1 Nov 2022 14:31:42 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                               |  8 +--
 pages/activity/GroupDetails/index.vue         |  2 +-
 pages/activity/SeckillDetails/index.vue       |  2 +-
 pages/activity/activity/index.vue             | 67 +++++++++++++------
 .../Evaluations/EvaluationDetail/index.vue    |  5 --
 5 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/config/index.js b/config/index.js
index c081c7e..e2ada4c 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
 // export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
-export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
-// export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
+// export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
+export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
 // export const VUE_APP_API_URL = 'https://xiaohui.shop.cyjyyjy.com/xiaohuiapp'
 export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
-// export const BXG_TENANT_ID = 129
-export const BXG_TENANT_ID = 138
+export const BXG_TENANT_ID = 129
+// export const BXG_TENANT_ID = 138
 // export const BXG_TENANT_ID = 128
\ No newline at end of file
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index bb1f420..1ef85c1 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -358,7 +358,7 @@ export default {
       }
     },
   },
-  onShow: function() {
+  onLoad: function() {
     this.mountedStart()
   },
   methods: {
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index 5f199ce..e6a4122 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -275,7 +275,7 @@ export default {
 			}
     }
   },
-  onShow: function() {
+  onLoad: function() {
     this.mountedStart()
   },
   methods: {
diff --git a/pages/activity/activity/index.vue b/pages/activity/activity/index.vue
index 99b0433..567fa15 100644
--- a/pages/activity/activity/index.vue
+++ b/pages/activity/activity/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="bargain on">
 		<view class="header">
-			<cu-custom :isBack="true" :isCenter="true">
+			<cu-custom :isBack="true" :isCenter="true" :bgColor="bgColor">
 				<block slot="backText">
 					<view class="backImg">
 						<image src="@/static/images/back-btn.png" mode=""></image>
@@ -26,7 +26,7 @@
 		</view>
 		
 		<view class="activity-content">
-			<view class="top-nav-box" :style="activityType !== 0?'height: 104rpx;':''">
+			<view class="top-nav-box" :style="(activityType !== 0?'height: 104rpx;':'')+(navStyle?'position: fixed;top:'+CustomBar+'px;left: 0;':'')">
 				<view class="activity-type-box acea-row row-center">
 					<view class="item" @click="setActivityType(0)">
 						<view :class="'title ' + (activityType === 0? 'active' : '')">秒杀专区</view>
@@ -43,7 +43,7 @@
 					<view :class="'tab ' + (tabType === 1 ? 'active' : '')" @click="setTabType(1)">下期预告</view>
 				</view>
 			</view>
-			<view class="list-box" :style="activityType !== 0?'height: calc(100% - 104rpx);':''">
+			<view class="list-box" :style="navStyle?(activityType !== 0?'padding-top:104rpx':'padding-top:186rpx'):''">
 				<view class="countdown-box acea-row row-between-wrapper" v-if="activityType === 0 && tabType === 0 && timeList[seckillActive].stop">
 					<view class="acea-row row-middle">
 						<view class="text">{{timeList[seckillActive].status == 2 ? timeList[seckillActive].time + '即将开始' : '本轮结束仅剩'}}</view>
@@ -105,10 +105,13 @@
 		},
 		data() {
 			return {
+				CustomBar: this.CustomBar,
+				bgColor: '',
 				banner: [],
 				swiperCurrent: 0,
 				activityType: 0,
 				tabType: 0,
+				navStyle: false,
 				goodsList: [],
 				timeList: [],
 				seckillList: [],
@@ -133,15 +136,13 @@
 				bargainList: [],
 				bargainLoaded: false,
 				isShowRule: false, // 显示砍价规则弹框
-				 active: false,
+				active: false,
 			};
 		},
 		mounted() {
 			this.seckillInfo();
 			this.getGrouponList();
 			this.getBargainList();
-			
-			
 		},
 		onLoad() {
 			getBanner(3).then(
@@ -149,6 +150,30 @@
 					this.$set(this,'banner',res.data.banner)
 				})
 		},
+		onPageScroll(e) {
+			if (e.scrollTop > 130) {
+				this.bgColor = '#F1F1F1';
+				this.navStyle = true;
+			} else {
+				this.bgColor = '',
+				this.navStyle = false;
+			};
+		},
+		onReachBottom() {
+			switch (this.activityType) {
+				case 0:
+					this.getSeckillList();
+					break;
+				case 1:
+					this.getGrouponList();
+					break;
+				case 2:
+					this.getBargainList();
+					break;
+				default:
+					break;
+			}
+		},
 		methods: {
 			// 关闭弹窗
 			close: function () {
@@ -177,7 +202,6 @@
 					// this.goodsList = this.seckillList;
 				} else if (i === 1) {
 					this.goodsList = this.grouponList;
-					console.log('this.goodsList', this.goodsList)
 				} else {
 					this.goodsList = this.bargainList;
 				}
@@ -274,14 +298,20 @@
 				  this.grouponList = this.grouponList.concat(res.data.storeCombinationQueryVos)
 				  this.groupForm.page++;
 				  this.groupLoaded = res.data.storeCombinationQueryVos.length < this.groupForm.limit;
+					if(this.activityType === 1) {
+						this.goodsList = this.grouponList;
+					}
 				})
 			},
 			getBargainList() {
 			  if (this.bargainLoaded) return;
 			  getBargainList(this.bargainForm).then(res => {
-			    this.bargainLoaded = res.data.length < this.bargainForm.limit;
 			    this.bargainList.push.apply(this.bargainList, res.data);
 			    this.bargainForm.page++;
+			    this.bargainLoaded = res.data.length < this.bargainForm.limit;
+					if(this.activityType === 2) {
+						this.goodsList = this.bargainList;
+					}
 			  });
 			},
 		}
@@ -304,6 +334,11 @@
 		}
 	}
 	.header {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 20;
+		width: 750rpx;
 		.tab-title {
 			font-size: 32rpx;
 			font-family: PingFang SC;
@@ -325,9 +360,6 @@
 	.banner-box {
 		width: 750rpx;
 		height: 488rpx;
-		position: absolute;
-		top: 0;
-		z-index: -1;
 		.swiper {
 			width: 100%;
 			height: 100%;
@@ -361,15 +393,13 @@
 	}
 	
 	.activity-content {
-		position: absolute;
-		bottom: 0;
+		position: relative;
+		top: -64rpx;
 		width: 750rpx;
-		height: calc(100vh - 424rpx);
-		background: #FFFFFF;
-		border-radius: 28rpx 28rpx 0rpx 0rpx;
 		.top-nav-box {
-			height: 186rpx;
-			position: relative;
+			width: 750rpx;
+			background: #FFFFFF;
+			border-radius: 28rpx 28rpx 0rpx 0rpx;
 			.activity-type-box {
 				height: 104rpx;
 				padding: 34rpx 0rpx 26rpx;
@@ -411,7 +441,6 @@
 			
 			.tab-box {
 				width: 100%;
-				position: absolute;
 				bottom: 0;
 				height: 82rpx;
 				overflow: hidden;
diff --git a/pages/shop/Evaluations/EvaluationDetail/index.vue b/pages/shop/Evaluations/EvaluationDetail/index.vue
index 1f13b20..2143d1f 100644
--- a/pages/shop/Evaluations/EvaluationDetail/index.vue
+++ b/pages/shop/Evaluations/EvaluationDetail/index.vue
@@ -16,12 +16,7 @@
 		<view class="synopsis-box acea-row" v-if="info.synopsis">
 			<view class="left-circle"></view>
 			<view class="info">
-
 				<!-- <text>甄选评测介绍</text> -->{{' ' + info.synopsis}}
-
-				{{' ' + info.synopsis}}
-				<!-- <text>甄选评测介绍</text>{{' ' + info.synopsis}} -->
-
 			</view>
 			<image src="../../../../static/images/evaluation-icon.png" mode=""></image>
 		</view>

From 439e67697233b97ebfca97c01928b48062eaeaf9 Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Tue, 1 Nov 2022 16:21:43 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=A6=9C=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/store.js                     |  21 ++-
 config/index.js                  |   8 +-
 pages.json                       |   3 +-
 pages/shop/HotNewGoods/index.vue | 252 ++++++++++++++++++++++++++++++-
 4 files changed, 263 insertions(+), 21 deletions(-)

diff --git a/api/store.js b/api/store.js
index 3945c17..a05034e 100644
--- a/api/store.js
+++ b/api/store.js
@@ -226,24 +226,12 @@ export function getBrandByName() {
 		login: false
 	});
 }
-// <<<<<<< HEAD
-// /**
-//  * 添加收藏
-//  *
-//  */
-// export function getUserCollection(data) {
-// 	console.log(9999999966);
-// 	return request.post("/collectEvaluation/add", data, {
-// 		login: true
-// 	});
-// =======
 /**
  * 添加收藏
  *
  */
 export function getUserCollection(data) {
 	return request.post("/collectEvaluation/add",data);
-// >>>>>>> sxx
 }
 /**
  * 
@@ -269,4 +257,13 @@ export function getEntry(data) {
 	return request.get("/entryByName", data, {
 		login: false
 	});
+}
+
+/**
+ * 热门榜单
+ */
+export function getHotList(data) {
+	return request.get("/hotList/"+ data, {}, {
+		login: false
+	});
 }
\ No newline at end of file
diff --git a/config/index.js b/config/index.js
index e2ada4c..c081c7e 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
 // export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
-// export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
-export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
+export const VUE_APP_API_URL = 'http://192.168.10.113:48080/bxgApp'
+// export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
 // export const VUE_APP_API_URL = 'https://xiaohui.shop.cyjyyjy.com/xiaohuiapp'
 export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
-export const BXG_TENANT_ID = 129
-// export const BXG_TENANT_ID = 138
+// export const BXG_TENANT_ID = 129
+export const BXG_TENANT_ID = 138
 // export const BXG_TENANT_ID = 128
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 52ce28d..6ba560b 100644
--- a/pages.json
+++ b/pages.json
@@ -142,7 +142,8 @@
     {
       "path": "pages/shop/HotNewGoods/index",
       "style": {
-        "navigationBarTitleText": "热门商品"
+        "navigationBarTitleText": "热门榜单",
+        "navigationStyle": "custom"
       }
     },
     {
diff --git a/pages/shop/HotNewGoods/index.vue b/pages/shop/HotNewGoods/index.vue
index 88b3766..a5cc3a1 100644
--- a/pages/shop/HotNewGoods/index.vue
+++ b/pages/shop/HotNewGoods/index.vue
@@ -1,27 +1,90 @@
 <template>
   <view class="quality-recommend">
-    <view class="title acea-row row-center-wrapper">
+		<view class="header">
+			<cu-custom :isBack="true" :isCenter="true" bgColor="''">
+				<block slot="backText">
+					<view class="backImg">
+						<image src="@/static/images/back-btn.png" mode=""></image>
+					</view>
+				</block>
+				<block slot="content">
+					<view class="tab-title">热门榜单</view>
+				</block>
+			</cu-custom>
+		</view>
+		
+		<view class="banner-box">
+			<swiper class="swiper" circular @change="swiperChange" :autoplay="true">
+				<swiper-item v-for="(item, index) in banner" :key="index" class="swiper-item" @click="goBannerDetail">
+					<image class="swiper-image " :src="item" mode="aspectFill" lazy-load>
+					</image>
+				</swiper-item>
+			</swiper>
+			<!-- <view class="dots acea-row">
+				<view :class="'dot ' + (swiperCurrent === index ? 'dot-active' : '')" v-for="(dot, index) in banner.length" :key="index"></view>
+			</view> -->
+		</view>
+		
+		<view class="content-box">
+			<scroll-view scroll-x="true">
+				<view class="classify-box">
+					<view v-for="(item,index) in 4" :key="index" @click="changeClassify(index)">
+						<image :class="'classify-item ' + (classifyType == index?'on':'')" :src="item.listImage" mode=""></image>
+					</view>
+				</view>
+			</scroll-view>
+			
+			<view class="nav-box acea-row">
+				<view class="item on">全部</view>
+				<view class="item acea-row row-middle">
+					<view class="">2022年10月</view>
+					<view class="jiantou-down"></view>
+				</view>
+			</view>
+			
+			
+			<view class="notice-box acea-row row-middle">
+				<image src="@/static/images/laba.png" mode="aspectFill"></image>
+				<view class="uni-notice-bar-box">
+					榜单每月30号统计，下月1号左右更新
+					<!-- <uni-notice-bar color="#999999" backgroundColor="#F5F6F8" scrollable="true" single="true" :speed="60" text="热花今将机支物极十争才线来理始"></uni-notice-bar> -->
+				</view>
+			</view>
+			
+			<view class="list-box">
+				<view class="item">
+					
+				</view>
+			</view>
+			
+		</view>
+		
+		
+    <!-- <view class="title acea-row row-center-wrapper">
       <view class="line"></view>
       <view class="name">
         <text class="iconfont" :class="icon"></text>{{ name }}
       </view>
       <view class="line"></view>
     </view>
-    <GoodList :good-list="goodsList" :is-sort="false"></GoodList>
+    <GoodList :good-list="goodsList" :is-sort="false"></GoodList> -->
   </view>
 </template>
 <script>
-
+import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
 import GoodList from "@/components/GoodList";
-import { getGroomList } from "@/api/store";
+import { getBanner, getHotList, getGroomList } from "@/api/store";
 export default {
   name: "HotNewGoods",
   components: {
+		UniNoticeBar,
     GoodList
   },
   props: {},
   data: function() {
     return {
+			banner: [],
+			classifyType: 0,
       imgUrls: [],
       goodsList: [],
       name: "",
@@ -45,8 +108,31 @@ export default {
   mounted: function() {
     this.titleInfo();
     this.getIndexGroomList();
+		getBanner(3).then(res => {
+			this.$set(this,'banner',res.data.banner)
+		})
+		this.getHotList();
   },
   methods: {
+		goBannerDetail(item){
+			if (item.uniapp_url) {
+				this.$yrouter.push(item.uniapp_url)
+			}
+		},
+		swiperChange(e) {
+			this.swiperCurrent = e.detail.current;
+		},
+		getHotList() {
+			let mouth = '2022-10'
+			getHotList(mouth),then(res => {
+				
+			})
+		},
+		changeClassify(i) {
+			if(this.classifyType == i) return
+			this.classifyType = i;
+		},
+		
     titleInfo: function() {
       let type = this.$yroute.query.type;
       if (type === "1") {
@@ -82,3 +168,161 @@ export default {
   }
 };
 </script>
+<style lang="less" scoped>
+	.header {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 20;
+		width: 750rpx;
+		.tab-title {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 600;
+			color: #2DB5AE;
+			line-height: 42rpx;
+		}
+		.backImg {
+			width: 88rpx;
+			height: 62rpx;
+			padding-left: 26rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	
+	.banner-box {
+		width: 750rpx;
+		height: 472rpx;
+		.swiper {
+			width: 100%;
+			height: 100%;
+			.swiper-item {
+				.swiper-image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+		/* .dots {
+			position: absolute;
+			bottom: 82rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			z-index: 1;
+			.dot {
+				width: 8rpx;
+				height: 8rpx;
+				background: #FFFFFF;
+				border-radius: 6rpx;
+				margin: 0rpx 8rpx;
+				transition: width .5s cubic-bezier(.18,.89,.17,.88);
+			}
+			.dot-active {
+				width: 34rpx;
+				background: #3A3A3C;
+				transition: width .5s cubic-bezier(.18,.89,.17,.88);
+			}
+		} */
+	}
+	
+	.content-box {
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100vw;
+		height: calc(100vh - 412rpx);
+		background: #FFFFFF;
+		box-shadow: 0rpx -4rpx 38rpx 0rpx rgba(0,0,0,0.1);
+		border-radius: 28rpx 28rpx 0rpx 0rpx;
+		scroll-view {
+			position: relative;
+			top: -60rpx;
+			margin-bottom: -60rpx;
+			height: 120rpx;
+			overflow:hidden;
+			white-space:nowrap;
+			.classify-box {
+				padding-left: 32rpx;
+				padding-right: 12rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				.classify-item {
+					width: 176rpx;
+					height: 96rpx;
+					margin-right: 20rpx;
+					border-radius: 16rpx;
+					background: linear-gradient(135deg, #39D396 0%, #2DB7AD 43%, #1B8DCC 100%);
+				}
+				.classify-item.on {
+					width: 220rpx;
+					height: 120upx;
+				}
+			}
+		}
+	}
+	
+	.content-box .nav-box {
+		padding: 20rpx 32rpx;
+		.item {
+			// width: 87px;
+			height: 40rpx;
+			border-radius: 16rpx;
+			border: 2rpx solid #2EB5AE;
+			padding: 0rpx 18rpx;
+			font-size: 24rpx;
+			font-family: PingFang SC;
+			font-weight: 600;
+			color: #2DB5AE;
+			line-height: 36rpx;
+			margin-right: 20rpx;
+		}
+		.item.on {
+			width: 124rpx;
+			background: #2DB5AE;
+			color: #FFFFFF;
+			text-align: center;
+		}
+	}
+	
+	.notice-box {
+		margin: 0rpx 32rpx 18rpx;
+		padding: 0rpx 16rpx;
+		height: 38rpx;
+		background: #F5F6F8;
+		border-radius: 16rpx;
+		image {
+			width: 26rpx;
+			height: 26rpx;
+		}
+		.uni-notice-bar-box {
+			padding-left: 8rpx;
+			font-size: 20rpx;
+			font-family: PingFang SC;
+			font-weight: 600;
+			color: #999999;
+			line-height: 26rpx;
+		}
+	}
+	
+	.list-box {
+		height: calc(100% - 196rpx);
+		overflow-y: scroll;
+		.item {
+			
+		}
+	}
+	
+	.jiantou-down {
+		width: 0;
+		height: 0;
+		border-top: 10rpx solid #2EB5AE;
+		border-bottom: 0rpx;
+		border-left: 6rpx solid transparent;
+		border-right: 6rpx solid transparent;
+		margin-left: 2rpx;
+	}
+</style>
\ No newline at end of file

From 58b4c07fce0267d46eaaab7cb1acac447688fff2 Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Tue, 1 Nov 2022 17:00:58 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E6=97=B6=E8=B0=83=E8=B5=B7=E8=AE=A2=E9=98=85=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/coupon/GetCoupon/index.vue  | 41 +++++++++++--------
 pages/user/coupon/UserCoupon/index.vue | 55 +++++++++++++++-----------
 2 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/pages/user/coupon/GetCoupon/index.vue b/pages/user/coupon/GetCoupon/index.vue
index bd277d1..f7c3a2d 100644
--- a/pages/user/coupon/GetCoupon/index.vue
+++ b/pages/user/coupon/GetCoupon/index.vue
@@ -158,23 +158,30 @@ export default {
 		},
     getCoupon: function(id, index) {
       let that = this
-      let list = that.couponsList
-      getCouponReceive(id)
-        .then(function(res) {
-          list[index].isUse = true
-          uni.showToast({
-            title: '领取成功',
-            icon: 'success',
-            duration: 2000,
-          })
-        })
-        .catch(function(err) {
-          uni.showToast({
-            title: err.msg || err.response.data.msg || err.response.data.message,
-            icon: 'none',
-            duration: 2000,
-          })
-        })
+      let list = that.couponsList,
+					tmplIds = ['lOOnpYASRMKy81gh5tNMR7OXSHMKw05x-aosYjvhK-E', 'lejbsmRtheMLXEGNx_UhVHuq5P6Yjwfokc183n9oMek'];
+			uni.requestSubscribeMessage({
+				tmplIds,
+				fail(err) {
+					console.log("requestSubscribeMessage err",  err)
+				},
+				complete() {
+					getCouponReceive(id).then(function(res) {
+						list[index].isUse = true
+						uni.showToast({
+							title: '领取成功',
+							icon: 'success',
+							duration: 2000,
+						})
+					}).catch(function(err) {
+						uni.showToast({
+							title: err.msg || err.response.data.msg || err.response.data.message,
+							icon: 'none',
+							duration: 2000,
+						})
+					})
+				}
+			})
     },
     getUseCoupons() {
       if (this.loading) return //阻止下次请求（false可以进行请求）；
diff --git a/pages/user/coupon/UserCoupon/index.vue b/pages/user/coupon/UserCoupon/index.vue
index 6de1f05..0e182d6 100644
--- a/pages/user/coupon/UserCoupon/index.vue
+++ b/pages/user/coupon/UserCoupon/index.vue
@@ -150,23 +150,30 @@
 				  })
 				  return
 			  }
-			  let list = that.couponsList
-			  getCouponReceive(id)
-			    .then(function(res) {
-			      list[index].isUse = true
-			      uni.showToast({
-			        title: '领取成功',
-			        icon: 'success',
-			        duration: 2000,
-			      })
-			    })
-			    .catch(function(err) {
-			      uni.showToast({
-			        title: err.msg || err.response.data.msg || err.response.data.message,
-			        icon: 'none',
-			        duration: 2000,
-			      })
-			    })
+			  let list = that.couponsList,
+						tmplIds = ['lOOnpYASRMKy81gh5tNMR7OXSHMKw05x-aosYjvhK-E', 'lejbsmRtheMLXEGNx_UhVHuq5P6Yjwfokc183n9oMek'];
+				uni.requestSubscribeMessage({
+					tmplIds,
+					fail(err) {
+						console.log("requestSubscribeMessage err",  err)
+					},
+					complete() {
+						getCouponReceive(id).then(function(res) {
+							list[index].isUse = true
+							uni.showToast({
+								title: '领取成功',
+								icon: 'success',
+								duration: 2000,
+							})
+						}).catch(function(err) {
+							uni.showToast({
+								title: err.msg || err.response.data.msg || err.response.data.message,
+								icon: 'none',
+								duration: 2000,
+							})
+						})
+					}
+				})
 			},
 			
 			getUseCoupons: function(i) {
@@ -191,14 +198,14 @@
 					})
 				}else if(i===0){
 					getCanReceive(q).then(res => {
-					res.data.forEach(item=>{
-						if(!item.isUse){
-							this.couponsList.push(item)
-						}
+						res.data.forEach(item=>{
+							if(!item.isUse){
+								this.couponsList.push(item)
+							}
+						})
+						this.loading = false
+						this.page = this.page + 1
 					})
-					this.loading = false
-					this.page = this.page + 1
-				})
 				}else{
 					getUserFailure(type).then(res=>{
 							res.data.forEach(item=>{

From 30989c2a33b8436c9906fd482005954dbe0ca1a7 Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Tue, 1 Nov 2022 18:20:34 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=A6=9C=E5=8D=95?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/HotNewGoods/index.vue | 192 +++++++++++++++++++++++++++++--
 1 file changed, 183 insertions(+), 9 deletions(-)

diff --git a/pages/shop/HotNewGoods/index.vue b/pages/shop/HotNewGoods/index.vue
index a5cc3a1..ad6a23e 100644
--- a/pages/shop/HotNewGoods/index.vue
+++ b/pages/shop/HotNewGoods/index.vue
@@ -52,8 +52,34 @@
 			</view>
 			
 			<view class="list-box">
-				<view class="item">
-					
+				<view class="top-box">
+					<view class="top-item acea-row" v-for="(item,index) in goodsList" :key="index" @tap="goGoodsCon(item)">
+					<!-- <view class="top-item acea-row" v-for="(item,index) in topList" :key="index" @tap="goGoodsCon(item)"> -->
+						<view class="top-num-box">
+							<view class="">{{index+1}}</view>
+							<view class="tip">{{index===0?'ST':index===1?'ND':index===2?'RD':'TH'}}</view>
+						</view>
+						<image class="img" :src="item.image" mode="aspectFill"></image>
+						<view class="info-box">
+							<view class="title more-t">{{item.storeName}}</view>
+							<view class="price-box" v-if="item.isIntegral === 1">{{ item.integral }}积分</view>
+							<view class="price-box" v-else>¥{{ item.price }}<text>¥{{item.otPrice}}</text></view>
+							<view class="original">{{ item.sales }}+人购买</view>
+						</view>
+					</view>
+				</view>
+				<view class="goods-list acea-row row-between" v-if="goodsList.length">
+					<view class="goods-item" v-for="(item, promotionGoodIndex) in goodsList"
+						:key="promotionGoodIndex" @tap="goGoodsCon(item)">
+						<view class="img-box">
+							<image class="img" :src="item.image" lazy-load mode="aspectFill"></image>
+						</view>
+						<view class="name more-t">{{ item.storeName }}</view>
+						<view class="price-box">
+							<view class="current" v-if="item.isIntegral === 1">{{ item.integral }}积分</view>
+							<view class="current" v-else>¥{{ item.price }}<text>¥{{item.otPrice}}</text></view>
+						</view>
+					</view>
 				</view>
 			</view>
 			
@@ -71,13 +97,13 @@
   </view>
 </template>
 <script>
-import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
+// import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
 import GoodList from "@/components/GoodList";
 import { getBanner, getHotList, getGroomList } from "@/api/store";
 export default {
   name: "HotNewGoods",
   components: {
-		UniNoticeBar,
+		// UniNoticeBar,
     GoodList
   },
   props: {},
@@ -85,7 +111,7 @@ export default {
     return {
 			banner: [],
 			classifyType: 0,
-      imgUrls: [],
+			topList: [],
       goodsList: [],
       name: "",
       icon: "",
@@ -123,7 +149,7 @@ export default {
 			this.swiperCurrent = e.detail.current;
 		},
 		getHotList() {
-			let mouth = '2022-10'
+			let mouth = '2022-9'
 			getHotList(mouth),then(res => {
 				
 			})
@@ -132,6 +158,23 @@ export default {
 			if(this.classifyType == i) return
 			this.classifyType = i;
 		},
+		goGoodsCon(item) {
+			if(item.isIntegral === 1) {
+				this.$yrouter.push({
+				  path: '/pages/shop/IntegralGoodsCon/index',
+				  query: {
+				    id: item.id,
+				  },
+				})
+			} else {
+				this.$yrouter.push({
+					path: '/pages/shop/GoodsCon/index',
+					query: {
+						id: item.id,
+					},
+				})
+			}
+		},
 		
     titleInfo: function() {
       let type = this.$yroute.query.type;
@@ -154,7 +197,7 @@ export default {
       let type = this.$yroute.query.type;
       getGroomList(type)
         .then(res => {
-          that.imgUrls = res.data.banner;
+          // that.banner = res.data.banner;
           that.goodsList = res.data.list;
         })
         .catch((err)=> {
@@ -311,8 +354,139 @@ export default {
 	.list-box {
 		height: calc(100% - 196rpx);
 		overflow-y: scroll;
-		.item {
-			
+		.top-box {
+			padding: 0rpx 32rpx 12rpx;
+		
+			.top-item {
+				width: 686rpx;
+				height: 174rpx;
+				background: #F5F6F8;
+				box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
+				border-radius: 16rpx;
+				margin-bottom: 20rpx;
+		
+				.top-num-box {
+					width: 146rpx;
+					height: 174rpx;
+					padding: 24rpx 0rpx 24rpx 12rpx;
+					font-size: 80rpx;
+					font-family: Futura;
+					font-weight: 700;
+					color: #2DB5AE;
+					line-height: 106rpx;
+					text-align: center;
+		
+					.tip {
+						font-size: 32rpx;
+						line-height: 42rpx;
+						position: relative;
+						top: -22rpx;
+					}
+				}
+		
+				.img {
+					width: 168rpx;
+					height: 162rpx;
+					border-radius: 8rpx;
+					margin: 6rpx 0rpx;
+				}
+		
+				.info-box {
+					width: 370rpx;
+					height: 174rpx;
+					padding: 16rpx 18rpx 16rpx 10rpx;
+		
+					.title {
+						height: 76rpx;
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #3A3A3C;
+						line-height: 38rpx;
+					}
+		
+					.price-box {
+						font-size: 30rpx;
+						font-family: Futura;
+						font-weight: 600;
+						color: #3A3A3C;
+						line-height: 40rpx;
+		
+						text {
+							font-size: 20rpx;
+							font-weight: 500;
+							color: #999999;
+							line-height: 26rpx;
+							text-decoration: line-through;
+							padding-left: 10rpx;
+						}
+					}
+		
+					.original {
+						font-size: 20rpx;
+						color: #999999;
+						line-height: 26rpx;
+					}
+				}
+			}
+		}
+	}
+	
+	.list-box .goods-list {
+		padding: 0rpx 32rpx 8rpx;
+	
+		.goods-item {
+			width: 332rpx;
+			background: #F5F6F8;
+			box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
+			border-radius: 16rpx;
+			margin-bottom: 20rpx;
+	
+			.img-box {
+				width: 332rpx;
+				height: 316rpx;
+				border-radius: 16rpx 16rpx 0rpx 0rpx;
+				overflow: hidden;
+	
+				.img {
+					width: 100%;
+					height: 100%;
+					background-color: #fff;
+				}
+			}
+	
+			.name {
+				font-size: 26rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #3A3A3C;
+				line-height: 38rpx;
+				height: 76rpx;
+				margin: 10rpx 16rpx;
+			}
+	
+			.price-box {
+				padding: 0rpx 16rpx 26rpx;
+				width: 100%;
+				box-sizing: border-box;
+				text-align: center;
+	
+				.current {
+					font-size: 30rpx;
+					font-family: Futura;
+					font-weight: 600;
+					color: #3A3A3C;
+					line-height: 40rpx;
+	
+					text {
+						padding-left: 10rpx;
+						font-size: 20rpx;
+						color: #999999;
+						line-height: 26rpx;
+						font-weight: 500;
+						text-decoration: line-through;
+					}
+				}
+			}
 		}
 	}
 	

From d64de6abd00d8f7510d0205f571b52928b028c21 Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Wed, 2 Nov 2022 17:08:54 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=93=81=E7=89=8C=E4=BB=8B=E7=BB=8D?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4;?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E5=88=A0=E9=99=A4=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=B1=95=E7=A4=BA=E6=A0=87=E9=A2=98;=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA=E9=82=AE=E8=B4=B9=E3=80=81=E6=97=A0?=
 =?UTF-8?q?=E7=90=86=E7=94=B1=E3=80=81=E4=BF=9D=E4=BB=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/DargainDetails/index.vue       |  2 +-
 pages/activity/DargainGoodsDetails/index.vue  | 38 +++++++++++-----
 pages/activity/GroupDetails/index.vue         | 37 +++++++++------
 pages/activity/SeckillDetails/index.vue       | 37 +++++++++------
 .../Evaluations/EvaluationDetail/index.vue    |  2 +-
 pages/shop/GoodsCon/index.vue                 | 45 +++++++++++--------
 pages/shop/brands/brandDetail/index.vue       |  9 ++--
 .../user/address/AddressManagement/index.vue  | 12 +++--
 8 files changed, 112 insertions(+), 70 deletions(-)

diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index ba8a7a7..5c88c0a 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -259,7 +259,7 @@
       </view>
       <view class="cutOff on" v-else>
         <view class="help font-color-red" v-text="'成功帮砍' + bargainHelpPrice + '元'"></view>
-        ，您也可以砍价低价拿哦，快去挑选心仪的商品吧~
+        您也可以砍价低价拿哦，快去挑选心仪的商品吧~
       </view>
 			<button class="tipBnt" open-type="share" v-if="bargainUid === userInfo.uid" @click="close">邀请好友帮砍价</button>
       <!-- <view class="tipBnt" @click="goPoster" v-if="bargainUid === userInfo.uid">邀请好友帮砍价</view> -->
diff --git a/pages/activity/DargainGoodsDetails/index.vue b/pages/activity/DargainGoodsDetails/index.vue
index 516f8d1..109b14d 100644
--- a/pages/activity/DargainGoodsDetails/index.vue
+++ b/pages/activity/DargainGoodsDetails/index.vue
@@ -41,13 +41,16 @@
 			</view>
 		</view>
 		
-		<view class="safeguard-info acea-row row-between-wrapper">
-			<view class="safeguard-item">
+		<view class="safeguard-info acea-row" v-if="tempName || goodsDetail.config">
+			<view class="safeguard-item" v-if="tempName">
 				<image class="img" src="@/static/images/by.png" mode=""></image>
-				<view>满{{199}}包邮</view>
+				<view class="line1">{{tempName}}</view>
 			</view>
-			<view class="line"></view>
-			<view class="safeguard-item">
+			<view class="safeguard-item" v-for="(item,index) in goodsDetail.config" :key="index">
+				<image class="img" :src="item.configuration" mode=""></image>
+				<view class="line1">{{item.content}}</view>
+			</view>
+			<!-- <view class="safeguard-item">
 				<image class="img" src="@/static/images/fxt.png" mode=""></image>
 				<view>7天无理由</view>
 			</view>
@@ -55,7 +58,7 @@
 			<view class="safeguard-item">
 				<image class="img" src="@/static/images/bj.png" mode=""></image>
 				<view>30天保价</view>
-			</view>
+			</view> -->
 		</view>
 		
 		<!-- 用户评价 -->
@@ -71,7 +74,7 @@
 		</view> -->
 		
 		<view class="product-intro">
-		  <view class="title">商品展示</view>
+		  <!-- <view class="title">商品展示</view> -->
 			<view class="conter">
 				<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
 					:content="goodsDetail.description" @linktap="linktap" />
@@ -136,10 +139,13 @@
 				goodsDetail: {
 					minPrice: 0,
 					price: 0,
+					stock: '',
+					unitName: '',
 				},
 				bargainId: 0,
 				bargainUid: 0,
 				imgUrls: [],
+				tempName: '',
 				styleAllStyle: 'width:30rpx;height:24rpx;background:#F5F6F8;border-radius:8rpx;font-size:20rpx;color:#3A3A3C;line-height:24rpx;',
 				timeTxtStyle: 'font-size:20rpx;color:#F5F6F8;line-height:24rpx;padding:0rpx 4rpx;',
 				entryInfo: {},
@@ -183,6 +189,7 @@
 					// console.log(this.goodsDetail);
 					this.goodsDetail.description = this.goodsDetail.description.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"');
 					this.goodsDetail.rule = this.goodsDetail.rule.replace(/\<img/gi, '<img style="max-width:100%;height:auto;"');
+					this.tempName = res.data.tempName;
 				}).catch(res => {
 					uni.hideLoading()
 					uni.showToast({
@@ -388,7 +395,10 @@
 		padding: 18rpx 0rpx;
 		margin: 0rpx 32rpx 20rpx;
 		.safeguard-item {
-			width: 226rpx;
+			flex: 1;
+			// width: 226rpx;
+			height: 84rpx;
+			border-right: 2rpx solid #979797;
 			font-size: 20rpx;
 			font-family: SourceHanSansSCVF;
 			font-weight: 600;
@@ -398,13 +408,17 @@
 			.img {
 				width: 46rpx;
 				height: 46rpx;
+				margin-top: 2rpx;
 			}
 		}
-		.line {
-			width: 2rpx;
-			height: 84rpx;
-			background-color: #979797;
+		.safeguard-item:last-child {
+			border-right: 0;
 		}
+		// .line {
+		// 	width: 2rpx;
+		// 	height: 84rpx;
+		// 	background-color: #979797;
+		// }
 	}
 	
 	.tui-operation {
diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue
index 1ef85c1..7b7db6e 100644
--- a/pages/activity/GroupDetails/index.vue
+++ b/pages/activity/GroupDetails/index.vue
@@ -86,13 +86,16 @@
       <!-- <view class="iconfont icon-jiantou"></view> -->
     </view>
 		
-		<view class="safeguard-info acea-row row-between-wrapper">
-			<view class="safeguard-item">
+		<view class="safeguard-info acea-row" v-if="tempName || storeInfo.config">
+			<view class="safeguard-item" v-if="tempName">
 				<image class="img" src="@/static/images/by.png" mode=""></image>
-				<view>满{{199}}包邮</view>
+				<view class="line1">{{tempName}}</view>
 			</view>
-			<view class="line"></view>
-			<view class="safeguard-item">
+			<view class="safeguard-item" v-for="(item,index) in storeInfo.config" :key="index">
+				<image class="img" :src="item.configuration" mode=""></image>
+				<view class="line1">{{item.content}}</view>
+			</view>
+			<!-- <view class="safeguard-item">
 				<image class="img" src="@/static/images/fxt.png" mode=""></image>
 				<view>7天无理由</view>
 			</view>
@@ -100,7 +103,7 @@
 			<view class="safeguard-item">
 				<image class="img" src="@/static/images/bj.png" mode=""></image>
 				<view>30天保价</view>
-			</view>
+			</view> -->
 		</view>
 
     <!-- 拼团信息 -->
@@ -187,7 +190,7 @@
 
     <!-- 产品介绍 -->
     <view class="product-intro">
-      <view class="title">商品展示</view>
+      <!-- <view class="title">商品展示</view> -->
 			<view class="conter">
 				<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
 					:content="storeInfo.description" @linktap="linktap" />
@@ -314,6 +317,7 @@ export default {
       reply: [],
       replyCount: 0,
       replyChance: 0,
+			tempName: '',
       imgUrls: [],
       storeInfo: {},
       itemNew: {},
@@ -422,6 +426,7 @@ export default {
         that.$set(that, 'reply', [res.data.reply])
         that.$set(that, 'replyCount', res.data.replyCount)
         that.$set(that, 'replyChance', res.data.replyChance)
+        that.$set(that, 'tempName', res.data.tempName);
         that.posterData.image = that.storeInfo.image
         if (that.storeInfo.title.length > 30) {
           that.posterData.title = that.storeInfo.title.substring(0, 30) + '...'
@@ -1669,7 +1674,10 @@ export default {
 	padding: 18rpx 0rpx;
 	margin: 0rpx 32rpx 20rpx;
 	.safeguard-item {
-		width: 226rpx;
+		flex: 1;
+		// width: 226rpx;
+		height: 84rpx;
+		border-right: 2rpx solid #979797;
 		font-size: 20rpx;
 		font-family: SourceHanSansSCVF;
 		font-weight: 600;
@@ -1679,14 +1687,17 @@ export default {
 		.img {
 			width: 46rpx;
 			height: 46rpx;
-			// background-color: #FFFFFF;
+			margin-top: 2rpx;
 		}
 	}
-	.line {
-		width: 2rpx;
-		height: 84rpx;
-		background-color: #979797;
+	.safeguard-item:last-child {
+		border-right: 0;
 	}
+	// .line {
+	// 	width: 2rpx;
+	// 	height: 84rpx;
+	// 	background-color: #979797;
+	// }
 }
 
 .userEvaluation .title .replyCount {
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index e6a4122..758f114 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -87,13 +87,16 @@
       <!-- <view class="iconfont icon-jiantou"></view> -->
     </view>
 		
-		<view class="safeguard-info acea-row row-between-wrapper">
-			<view class="safeguard-item">
+		<view class="safeguard-info acea-row" v-if="tempName || storeInfo.config">
+			<view class="safeguard-item" v-if="tempName">
 				<image class="img" src="@/static/images/by.png" mode=""></image>
-				<view>满{{199}}包邮</view>
+				<view class="line1">{{tempName}}</view>
 			</view>
-			<view class="line"></view>
-			<view class="safeguard-item">
+			<view class="safeguard-item" v-for="(item,index) in storeInfo.config" :key="index">
+				<image class="img" :src="item.configuration" mode=""></image>
+				<view class="line1">{{item.content}}</view>
+			</view>
+			<!-- <view class="safeguard-item">
 				<image class="img" src="@/static/images/fxt.png" mode=""></image>
 				<view>7天无理由</view>
 			</view>
@@ -101,7 +104,7 @@
 			<view class="safeguard-item">
 				<image class="img" src="@/static/images/bj.png" mode=""></image>
 				<view>30天保价</view>
-			</view>
+			</view> -->
 		</view>
 		
 		<!-- 用户评价 -->
@@ -117,7 +120,7 @@
 		</view>
 		
     <view class="product-intro">
-      <view class="title">商品展示</view>
+      <!-- <view class="title">商品展示</view> -->
 			<view class="conter">
 				<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
 					:content="storeInfo.description" @linktap="linktap" />
@@ -253,6 +256,7 @@ export default {
       replyCount: 0,
 			// replyChance: '',
       reply: [],
+			tempName: '',
       cartNum: 1,
       attrTxt: '请选择',
       productValue: [],
@@ -348,6 +352,7 @@ export default {
         that.$set(that, 'imgUrls', res.data.storeInfo.sliderImageArr)
         that.$set(that, 'replyCount', res.data.replyCount)
         that.$set(that, 'reply', res.data.reply)
+        that.$set(that, 'tempName', res.data.tempName)
         that.posterData.image = that.storeInfo.image_base
         that.updateTitle()
         if (that.storeInfo.title.length > 30) {
@@ -1160,7 +1165,10 @@ export default {
 	padding: 18rpx 0rpx;
 	margin: 0rpx 32rpx 20rpx;
 	.safeguard-item {
-		width: 226rpx;
+		flex: 1;
+		// width: 226rpx;
+		height: 84rpx;
+		border-right: 2rpx solid #979797;
 		font-size: 20rpx;
 		font-family: SourceHanSansSCVF;
 		font-weight: 600;
@@ -1170,14 +1178,17 @@ export default {
 		.img {
 			width: 46rpx;
 			height: 46rpx;
-			// background-color: #FFFFFF;
+			margin-top: 2rpx;
 		}
 	}
-	.line {
-		width: 2rpx;
-		height: 84rpx;
-		background-color: #979797;
+	.safeguard-item:last-child {
+		border-right: 0;
 	}
+	// .line {
+	// 	width: 2rpx;
+	// 	height: 84rpx;
+	// 	background-color: #979797;
+	// }
 }
 
 .userEvaluation .title .replyCount {
diff --git a/pages/shop/Evaluations/EvaluationDetail/index.vue b/pages/shop/Evaluations/EvaluationDetail/index.vue
index 2143d1f..7617b8d 100644
--- a/pages/shop/Evaluations/EvaluationDetail/index.vue
+++ b/pages/shop/Evaluations/EvaluationDetail/index.vue
@@ -227,7 +227,7 @@
 		margin: 20rpx 32rpx 0rpx 90rpx;
 		padding: 20rpx 0rpx 20rpx 50rpx;
 		width: 628rpx;
-		// height: 146rpx;
+		min-height: 146rpx;
 		background: #F5F6F8;
 		box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
 		border-radius: 16rpx;
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 94bf1e7..9b42bd2 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -97,21 +97,22 @@
 				<!-- <view class="iconfont icon-jiantou"></view> -->
 			</view>
 
-			<view class="safeguard-info acea-row row-between-wrapper">
-				<view class="safeguard-item">
+			<view class="safeguard-info acea-row" v-if="tempName || storeInfo.config">
+				<view class="safeguard-item" v-if="tempName">
 					<image class="img" src="../../../static/images/by.png" mode=""></image>
-					<view>满{{199}}包邮</view>
+					<view class="line1">{{tempName}}</view>
 				</view>
-				<view class="line"></view>
-				<view class="safeguard-item">
+				<view class="safeguard-item" v-for="(item,index) in storeInfo.config" :key="index">
+					<image class="img" :src="item.configuration" mode=""></image>
+					<view class="line1">{{item.content}}</view>
+				</view>
+				<!-- <view class="line"></view> -->
+				<!-- <view class="safeguard-item">
 					<image class="img" src="../../../static/images/fxt.png" mode=""></image>
 					<view>7天无理由</view>
-				</view>
-				<view class="line"></view>
-				<view class="safeguard-item">
 					<image class="img" src="../../../static/images/bj.png" mode=""></image>
 					<view>30天保价</view>
-				</view>
+				</view> -->
 			</view>
 
 			<!-- 门店信息 -->
@@ -200,7 +201,7 @@
 
 			<!-- 商品详情 -->
 			<view class="product-intro">
-				<view class="title">商品展示</view>
+				<!-- <view class="title">商品展示</view> -->
 				<view class="conter">
 					<mp-html id="article" :setTitle="false" :lazy-load="true" :copy-link="false" :tag-style="tagStyle"
 						:content="storeInfo.description" @linktap="linktap" />
@@ -407,7 +408,7 @@
 				systemStore: {},
 				qqmapsdk: null,
 				productConClass: 'product-con',
-				tempName: '全国包邮',
+				tempName: '',
 				isIntegral: false,
 				isUnfold: false, // 商品参数是否展开
 				entryInfo: {},
@@ -1076,7 +1077,7 @@
 			}
 
 			.info {
-				font-size: 16rpx;
+				font-size: 20rpx;
 				font-family: PingFang SC;
 				color: #2DB5AE;
 				line-height: 22rpx;
@@ -1162,7 +1163,10 @@
 		margin: 0rpx 32rpx 20rpx;
 
 		.safeguard-item {
-			width: 226rpx;
+			flex: 1;
+			// width: 226rpx;
+			height: 84rpx;
+			border-right: 2rpx solid #979797;
 			font-size: 20rpx;
 			font-family: SourceHanSansSCVF;
 			font-weight: 600;
@@ -1173,15 +1177,18 @@
 			.img {
 				width: 46rpx;
 				height: 46rpx;
-				// background-color: #FFFFFF;
+				margin-top: 2rpx;
 			}
 		}
-
-		.line {
-			width: 2rpx;
-			height: 84rpx;
-			background-color: #979797;
+		.safeguard-item:last-child {
+			border-right: 0;
 		}
+		
+		// .line {
+		// 	width: 2rpx;
+		// 	height: 84rpx;
+		// 	background-color: #979797;
+		// }
 	}
 
 	.userEvaluation .title .replyCount {
diff --git a/pages/shop/brands/brandDetail/index.vue b/pages/shop/brands/brandDetail/index.vue
index b356d8d..91ac689 100644
--- a/pages/shop/brands/brandDetail/index.vue
+++ b/pages/shop/brands/brandDetail/index.vue
@@ -259,15 +259,16 @@
 				}
 			}
 			.info {
-				// height: 56rpx;
 				min-height: 58rpx;
 				max-height: 124rpx;
-				padding-top: 14rpx;
-				font-size: 16rpx;
+				padding-top: 6rpx;
+				// padding-top: 14rpx;
+				font-size: 18rpx;
+				// font-size: 16rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
 				color: #2DB5AE;
-				line-height: 22rpx;
+				line-height: 24rpx;
 				word-break: break-all;
 				display: -webkit-box;
 				-webkit-line-clamp: 5;
diff --git a/pages/user/address/AddressManagement/index.vue b/pages/user/address/AddressManagement/index.vue
index da70cd8..c0b4d65 100644
--- a/pages/user/address/AddressManagement/index.vue
+++ b/pages/user/address/AddressManagement/index.vue
@@ -65,16 +65,14 @@
 			</view>
 		</view>
     
-    <Loading :loaded="loadend" :loading="loading"></Loading>
+    <Loading :loaded="loadend" :loading="loading" v-if="addressList.length > 0"></Loading>
     <view class="no-address" v-if="addressList.length < 1 && page > 1">
     <!-- <view class="noCommodity"> -->
-      <view class="no-address">
-				<image class="image" src="../../../../static/images/no-address.png" mode="widthFix"></image>
-				<view class="">等我们也造火箭或许能寄到火星</view>
-				<view class="tip">赶快添加收货地址吧</view>
-				<view class="add-icon" @click="addAddress">＋</view>
+			<image class="image" src="../../../../static/images/no-address.png" mode="widthFix"></image>
+			<view class="">等我们也造火箭或许能寄到火星</view>
+			<view class="tip">赶快添加收货地址吧</view>
+			<view class="add-icon" @click="addAddress">＋</view>
         <!-- <image :src="`${$VUE_APP_RESOURCES_URL}/images/noAddress.png`" class="image" /> -->
-      </view>
     </view>
 		
     <!-- <view style="height:100rpx;"></view> -->

From a9a549119c38c6d77de2c268f852c2ed2824415e Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Wed, 2 Nov 2022 18:38:38 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                        |  3 +-
 pages/user/PersonalData/index.vue | 58 +++++++++++++++++++++++--------
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/pages.json b/pages.json
index 52ce28d..ec34a29 100644
--- a/pages.json
+++ b/pages.json
@@ -264,7 +264,8 @@
     {
       "path": "pages/user/PersonalData/index",
       "style": {
-        "navigationBarTitleText": "个人资料"
+        "navigationBarTitleText": "个人资料",
+        "navigationStyle": "custom"
       }
     },
     {
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index 6d9890f..3fd1099 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -1,5 +1,17 @@
 <template>
 	<view class="personal-data">
+		<view class="header">
+			<cu-custom :isBack="true" :isCenter="true">
+				<block slot="backText">
+					<view class="backImg">
+						<image src="@/static/images/back-btn.png" mode=""></image>
+					</view>
+				</block>
+				<block slot="content">
+					<view class="tab-title">个人资料</view>
+				</block>
+			</cu-custom>
+		</view>
 		<!-- <view class="wrapper"> -->
 		<view class="wrapList acea-row row-between-wrapper">
 			<!-- <view class="item acea-row row-between-wrapper on"> -->
@@ -42,12 +54,11 @@
 			<view class="item acea-row row-between-wrapper">
 				<view>生日</view>
 				<view class="input">
-					<picker mode="date" :value="birth" @change="bindDateChange">
-						<view v-if="!birth" class="empty">点击完善生日</view>
-						<view v-else>
-			  		{{birth}}
-						</view>
+					<picker v-if="!userInfo.birthday" mode="date" :value="birthday" @change="bindDateChange">
+						<view v-if="!birthday" class="empty">点击完善生日</view>
+						<view v-else>{{birthday}}</view>
 					</picker>
+					<view v-else>{{birthday}}</view>
 				</view>
 			</view>
 			<view class="item acea-row row-between-wrapper">
@@ -109,12 +120,13 @@
 				currentAccounts: 0,
 				switchUserInfo: [],
 				userIndex: 0,
-				birth: '',
+				birthday: '',
 			};
 		},
 		computed: mapGetters(["userInfo"]),
 		mounted: function() {
 			this.avatar = this.userInfo.avatar;
+			this.birthday = this.userInfo.birthday;
 			this.isWeixin = isWeixin();
 			// this.getUserInfo();
 		},
@@ -239,7 +251,7 @@
 			},
 			bindDateChange(e) {
 				console.log(e)
-				this.birth = e.detail.value;
+				this.birthday = e.detail.value;
 			},
 			// 绑定微信用户手机号
 			phoneLogin(e) {
@@ -248,7 +260,6 @@
 					uni.showLoading({
 						title: '绑定中',
 					})
-					// this.wxappBindPhone(e, e.mp.detail.code)
 					uni.login({
 						success: (loginRes) => {
 							wxappBindingPhone({
@@ -288,14 +299,10 @@
 					})
 				}
 			},
-			wxappBindPhone(e, code) {
-				
-			},
 
 			submit: function() {
-
 				let userInfo = this.userInfo;
-				console.log(userInfo, '==============');
+				// console.log(userInfo, '==============');
 				let data = {
 					nickname: '',
 					avatar: ''
@@ -306,6 +313,10 @@
 				if (this.avatar) {
 					data.avatar = this.avatar;
 				}
+				if(this.birthday) {
+					data.birthday = this.birthday;
+				}
+				if (!this.userInfo.nickname && !this.avatar && !this.birthday) return
 				postUserEdit(data).then(
 					(res) => {
 						this.$store.dispatch("userInfo", true);
@@ -353,6 +364,25 @@
 	};
 </script>
 <style lang="less" scoped>
+	.header {
+		.tab-title {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 600;
+			color: #2DB5AE;
+			line-height: 42rpx;
+		}
+		.backImg {
+			width: 88rpx;
+			height: 62rpx;
+			padding-left: 26rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	
 	.wrapList {
 		padding: 20rpx 32rpx 32rpx;
 
@@ -429,4 +459,4 @@
 			}
 		}
 	}
-</style>
+</style>

From 6c2e4c53e97e9de4b2b0604b230301a209470efd Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Thu, 3 Nov 2022 18:25:32 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=93=81=E7=89=8C=E9=A6=86=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E4=BF=A1=E6=81=AF;=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E9=A1=B5=E5=B8=83=E5=B1=80=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?;=E6=B4=BB=E5=8A=A8=E4=B8=93=E5=8C=BA=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/store.js                           |  22 ++-
 pages/activity/activity/index.vue      |   3 +-
 pages/shop/GoodsCollection/index.vue   | 198 ++++++++++---------------
 pages/shop/brands/index.vue            |  24 +--
 pages/user/coupon/UserCoupon/index.vue |   2 +-
 5 files changed, 109 insertions(+), 140 deletions(-)

diff --git a/api/store.js b/api/store.js
index 3945c17..7145105 100644
--- a/api/store.js
+++ b/api/store.js
@@ -226,24 +226,13 @@ export function getBrandByName() {
 		login: false
 	});
 }
-// <<<<<<< HEAD
-// /**
-//  * 添加收藏
-//  *
-//  */
-// export function getUserCollection(data) {
-// 	console.log(9999999966);
-// 	return request.post("/collectEvaluation/add", data, {
-// 		login: true
-// 	});
-// =======
+
 /**
  * 添加收藏
  *
  */
 export function getUserCollection(data) {
 	return request.post("/collectEvaluation/add",data);
-// >>>>>>> sxx
 }
 /**
  * 
@@ -262,6 +251,15 @@ export function getBrandDetail(id) {
 	});
 }
 
+/**
+ * 品牌馆滚动条信息
+ */
+export function getBrandNoticeInfo() {
+	return request.get("/brandInfo", {}, {
+		login: false
+	});
+}
+
 /**
  * 词条名查询
  */
diff --git a/pages/activity/activity/index.vue b/pages/activity/activity/index.vue
index 567fa15..44586a6 100644
--- a/pages/activity/activity/index.vue
+++ b/pages/activity/activity/index.vue
@@ -16,7 +16,7 @@
 		<view class="banner-box">
 			<swiper class="swiper" circular @change="swiperChange" :autoplay="true">
 				<swiper-item v-for="(item, index) in banner" :key="index" class="swiper-item" @click="goBannerDetail">
-					<image class="swiper-image " :src="item" mode="aspectFill" lazy-load>
+					<image class="swiper-image " :src="item.pic" mode="aspectFill" lazy-load>
 					</image>
 				</swiper-item>
 			</swiper>
@@ -358,6 +358,7 @@
 	}
 	
 	.banner-box {
+		position: relative;
 		width: 750rpx;
 		height: 488rpx;
 		.swiper {
diff --git a/pages/shop/GoodsCollection/index.vue b/pages/shop/GoodsCollection/index.vue
index df680db..95525b1 100644
--- a/pages/shop/GoodsCollection/index.vue
+++ b/pages/shop/GoodsCollection/index.vue
@@ -13,9 +13,9 @@
 			</cu-custom>
 		</view>
 
-		<view class="content-box" :style="'height:calc(100vh - '+CustomBar+'px);'">
-			<view class="content">
-				<view class="nav acea-row row-around" :style="'top:calc('+CustomBar+'px+2px)'">
+		<view class="content" :style="'min-height:calc(100vh - '+CustomBar+'px);'">
+			<view class="nav-box" :style="'top:'+CustomBar+'px;'">
+				<view class="nav acea-row row-around">
 					<view class="item" @click="changeType(0)">
 						<view :class="'title ' + (navType == 0? 'active' : '')">甄选商品</view>
 					</view>
@@ -23,56 +23,50 @@
 						<view :class="'title ' + (navType === 1 ? 'active' : '')">甄选评测</view>
 					</view>
 				</view>
+			</view>
 
-				<view class="collectionGoods" v-if="collectProductList.length > 0">
-					<view class="item" v-for="(item, collectProductListIndex) in collectProductList"
-						:key="collectProductListIndex" :data-index="collectProductListIndex" @touchstart="drawStart"
-						@touchmove="drawMove" @touchend="drawEnd" :style="'right:' + item.right + 'rpx'">
-						<view v-if="navType==0" class="info-box acea-row row-between-wrapper" @click="goGoodsCon(item)">
-							<view class="pictrue">
-								<image :src="item.image" />
-							</view>
-							<view class="text">
-								<view class="infor line1">{{ item.storeName }}</view>
-								<view class="acea-row sku-box">
-									<view class="sku" v-if="item.productInfo.attrInfo">
-										{{ item.productInfo.attrInfo.sku }}</view>
-								</view>
-								<view class="money" v-if="isIntegral == 1">{{ item.costPrice }}积分</view>
-								<view class="money" v-else>￥{{ item.price }}</view>
-							</view>
+			<view class="collectionGoods" v-if="collectProductList.length > 0">
+				<view class="item" v-for="(item, collectProductListIndex) in collectProductList"
+					:key="collectProductListIndex" :data-index="collectProductListIndex" @touchstart="drawStart"
+					@touchmove="drawMove" @touchend="drawEnd" :style="'right:' + item.right + 'rpx'">
+					<view v-if="navType==0" class="info-box acea-row row-between-wrapper" @click="goGoodsCon(item)">
+						<view class="pictrue">
+							<image :src="item.image" />
 						</view>
-						<!-- 评测 -->
-						<!-- <view v-else class="review-box acea-row row-between" @click="goEvaluation(item)">
-							<view class="left acea-row row-column-between">
-								<view class="acea-row row-column-between">
-									<view class="title"></view>
-									<view class="title1"></view>
-									<view class="title2"></view>
-								</view>
-								<view @tap.stop="goMore" class="more">
-									MORE
-								</view>
-							</view>
-							<view class="right">
-								<image src="../../../static/images/earth-white.png" mode=""></image>
+						<view class="text">
+							<view class="infor line1">{{ item.storeName }}</view>
+							<view class="acea-row sku-box">
+								<view class="sku" v-if="item.productInfo.attrInfo">
+									{{ item.productInfo.attrInfo.sku }}</view>
 							</view>
-						</view> -->
-						<view v-else class="review-box acea-row row-between" @click="goEvaluation(item)">
-							<image class="img" :src="item.homeImage" mode="aspectFill"></image>
-							<!-- <view class="more">
-								MORE
-							</view> -->
+							<view class="money" v-if="isIntegral == 1">{{ item.costPrice }}积分</view>
+							<view class="money" v-else>￥{{ item.price }}</view>
 						</view>
-						<view class="delete" @tap.stop="delCollection(collectProductListIndex)"
-							:style="item.right?'right: -122rpx;':''" :class="{'del-height':navType==1}">删除</view>
 					</view>
+					<!-- 评测 -->
+					<view v-else class="review-box acea-row row-between" @click="goEvaluation(item)">
+						<image class="img" :src="item.homeImage" mode="aspectFill"></image>
+						<!-- <view class="more">MORE</view> -->
+					</view>
+					<view class="delete" @tap.stop="delCollection(collectProductListIndex)"
+						:style="item.right?'right: -122rpx;':''" :class="{'del-height':navType==1}">删除</view>
 				</view>
-
-
 				<Loading :loaded="loadend" :loading="loading"></Loading>
+			</view>
 
+			<!--暂无收藏-->
+			<view v-else class="noCommodity" style="padding-top:208rpx;">
+				<view class="noPictrue">
+					<image src="@/static/images/no-more.png" class="image" />
+				</view>
+				<view class="text-big">
+					什么都没有，大概被外星人带走了
+				</view>
+				<!-- <view class="text-small">
+					快去领取福利优惠券吧
+				</view> -->
 			</view>
+
 		</view>
 
 
@@ -283,70 +277,7 @@
 	}
 </script>
 <style lang="less" scoped>
-	// .review-box{
-	// 	padding: 30rpx 30rpx 20rpx 30rpx;
-	// 	width: 687rpx;
-	// 	height: 250rpx;
-	// 	border-radius: 16rpx;
-	// 	background: #F5F6F8;
-	// 	box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
-	// 	.left{
-	// 		max-width: 460rpx;
-
-	// 		.title{
-	// 			font-size: 36rpx;
-	// 			font-weight: 500;
-	// 			text-transform: uppercase;
-	// 		}
-	// 		.title1{
-	// 			margin: 10rpx 0 5rpx 0;
-	// 			font-size: 24rpx;
-	// 			text-transform: uppercase;
-	// 		}
-	// 		.title2{
-	// 			font-size: 28rpx;
-
-
-	// 		}
-	// 		.more{
-	// 			font-size: 24rpx;
-	// 			position: relative;
-	// 		}
-	// 		.more::before{
-	// 			position: absolute;
-	// 			border-bottom: 1rpx solid black;
-	// 			bottom: -8rpx;
-	// 			left: -4rpx;
-	// 			content: '';
-	// 			width: 100rpx;
-	// 			background-color: black;
-	// 			height: 1rpx;
-	// 		}
-	// 		.more::after{
-	// 			margin-left: 10rpx;
-	// 			content: '';
-	// 			display: inline-block;
-	// 			width: 0;
-	// 			height: 0;
-	// 			border-top: 10rpx solid transparent;
-	// 			border-left: 10rpx solid black;
-	// 			border-bottom: 10rpx solid transparent;
-	// 			border-right: 10rpx solid transparent;
-	// 		}
-	// 	}
-	// 	.right{
-	// 		image{
-	// 			width: 200rpx;
-	// 			height: 100%;
-	// 		}
-
-	// 	}
-	// }
-
 	.review-box {
-		// padding: 30rpx 30rpx 20rpx 30rpx;
-		// width: 687rpx;
-		// height: 240rpx;
 		border-radius: 16rpx;
 		background: #F5F6F8;
 		box-shadow: 0rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.06);
@@ -417,10 +348,10 @@
 		}
 	}
 
-	.content-box {
-		padding-top: 4rpx;
-		width: 100vw;
-		position: relative;
+	// .content-box {
+	// 	padding-top: 4rpx;
+	// 	width: 100vw;
+	// 	position: relative;
 
 		.content {
 			width: 100%;
@@ -428,15 +359,20 @@
 			overflow-y: scroll;
 			background: #FFFFFF;
 			border-radius: 28rpx 28rpx 0rpx 0rpx;
-
+			
+			.nav-box {
+				width: 100vw;
+				padding-top: 4rpx;
+				position: fixed;
+				left: 0;
+				z-index: 5;
+				background: #F1F1F1;
+			}
 			.nav {
 				width: 100vw;
 				background: #FFFFFF;
 				height: 92rpx;
 				padding: 34rpx 32rpx 16rpx;
-				position: fixed;
-				left: 0;
-				z-index: 5;
 				border-radius: 28rpx 28rpx 0rpx 0rpx;
 
 				.item {
@@ -478,7 +414,7 @@
 				}
 			}
 		}
-	}
+	// }
 
 	.info-box {
 		width: 686rpx;
@@ -505,7 +441,10 @@
 			line-height: 46rpx;
 		}
 	}
-
+	
+	.collectionGoods {
+		padding-top: 114rpx;
+	}
 	.collectionGoods .item .delete {
 		position: absolute;
 		top: 0;
@@ -528,4 +467,29 @@
 		height: 240rpx !important;
 		line-height: 240rpx !important;
 	}
+	
+	.noCommodity{
+		.noPictrue{
+			width: 428rpx;
+			height: 526rpx;
+		}
+		.text-big{
+			padding: 0 30rpx;
+			text-align: center;
+			font-family: PingFangSC-Medium, PingFang SC;
+			font-style: 36rpx;
+			font-weight: 600;
+			color: #3A3A3C;
+			line-height: 50rpx;
+		}
+		.text-small{
+			padding: 0 80rpx;
+			font-family: PingFangSC-Medium, PingFang SC;
+			text-align: center;
+			font-style: 28rpx;
+			font-weight: 400;
+			color: #3A3A3C;
+			line-height: 40rpx;
+		}
+	}
 </style>
diff --git a/pages/shop/brands/index.vue b/pages/shop/brands/index.vue
index a09b298..47488c3 100644
--- a/pages/shop/brands/index.vue
+++ b/pages/shop/brands/index.vue
@@ -30,16 +30,16 @@
 			</view>
 		</view>
 		
-		<view class="notice-box acea-row row-middle">
+		<view class="notice-box acea-row row-middle" v-if="noticeInfo.info">
 			<view class="title">
 				<image src="../../../static/images/yanjie-logo.png" mode=""></image>
 			</view>
 			<view class="min-title acea-row row-between-wrapper">
-				<view class="">选品标准</view>
+				<view class="">{{noticeInfo.title}}</view>
 				<image src="../../../static/images/laba.png" mode="aspectFill"></image>
 			</view>
 			<view class="uni-notice-bar-box">
-				<uni-notice-bar color="#2DB5AE" backgroundColor="#F1F1F1" scrollable="true" single="true" :speed="60" text="热花今将机支物极十争才线来理始"></uni-notice-bar>
+				<uni-notice-bar color="#2DB5AE" backgroundColor="#F1F1F1" scrollable="true" single="true" :speed="50" :text="noticeInfo.info"></uni-notice-bar>
 			</view>
 		</view>
 		
@@ -97,7 +97,7 @@
 
 <script>
 	import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
-	import { getBrands, getProducts ,getBanner} from '@/api/store';
+	import { getBrands, getProducts ,getBanner, getBrandNoticeInfo} from '@/api/store';
 	import Loading from '@/components/Loading';
 	export default {
 		components: {
@@ -108,6 +108,10 @@
 			return {
 				currents: 0,
 				imgUrls: [],
+				noticeInfo: {
+					title: '',
+					info: ''
+				},
 				brandList: [],
 				where: {
 				  page: 1,
@@ -125,11 +129,13 @@
 		onLoad() {
 			this.getBrandList();
 			this.getNewProducts();
-			getBanner(1).then(
-					res => {
-						this.$set(this,'imgUrls',res.data.banner)
-					})
-			
+			getBanner(1).then(res => {
+				this.$set(this,'imgUrls',res.data.banner)
+			})
+			getBrandNoticeInfo().then(res => {
+				this.noticeInfo.title = res.data.title;
+				this.noticeInfo.info = res.data.info;
+			})
 		},
 		onReachBottom() {
 			!this.loading && this.getNewProducts();
diff --git a/pages/user/coupon/UserCoupon/index.vue b/pages/user/coupon/UserCoupon/index.vue
index 0e182d6..3618b5d 100644
--- a/pages/user/coupon/UserCoupon/index.vue
+++ b/pages/user/coupon/UserCoupon/index.vue
@@ -14,7 +14,7 @@
 		</view>
 
 		<view class="content" :style="'min-height:calc(100vh - '+CustomBar+'px);'">
-			<view class="nav-box" :style="'top:calc('+CustomBar+'px)'">
+			<view class="nav-box" :style="'top:'+CustomBar+'px'">
 				<view class="nav acea-row row-around">
 					<view class="item" @click="setType(0)">
 						<view :class="'title ' + (navType == 0? 'active' : '')">待领取</view>

From 1b7142507cf9668b591d5db140ba1221db51996b Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Fri, 4 Nov 2022 11:25:28 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E7=A0=8D=E4=BB=B7bug;=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=8C=89=E9=92=AE=E8=BE=B9=E6=A1=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/DargainDetails/index.vue | 4 ++--
 pages/shop/brands/brandDetail/index.vue | 9 ++++-----
 pages/user/PersonalData/index.vue       | 3 +++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index 5c88c0a..56537e4 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -343,11 +343,11 @@ export default {
       if (url) {
         // 通过二维码进来
         that.bargainId = url.bargainId
-        that.bargainUid = url.partake
+        that.bargainUid = Number(url.partake);
       } else {
         // 正常途径进来
         that.bargainId = that.$yroute.query.id
-        that.bargainUid = that.$yroute.query.partake
+        that.bargainUid = Number(that.$yroute.query.partake);
       }
       if (this.bargainUid == 0 || !this.bargainUid) {
         // url未携带用户uid，填上登录用户uid，跳转
diff --git a/pages/shop/brands/brandDetail/index.vue b/pages/shop/brands/brandDetail/index.vue
index 91ac689..e425a52 100644
--- a/pages/shop/brands/brandDetail/index.vue
+++ b/pages/shop/brands/brandDetail/index.vue
@@ -261,14 +261,13 @@
 			.info {
 				min-height: 58rpx;
 				max-height: 124rpx;
-				padding-top: 6rpx;
-				// padding-top: 14rpx;
-				font-size: 18rpx;
-				// font-size: 16rpx;
+				// padding-top: 6rpx;
+				padding-top: 14rpx;
+				font-size: 16rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
 				color: #2DB5AE;
-				line-height: 24rpx;
+				line-height: 22rpx;
 				word-break: break-all;
 				display: -webkit-box;
 				-webkit-line-clamp: 5;
diff --git a/pages/user/PersonalData/index.vue b/pages/user/PersonalData/index.vue
index 3fd1099..6ba5e4b 100644
--- a/pages/user/PersonalData/index.vue
+++ b/pages/user/PersonalData/index.vue
@@ -456,6 +456,9 @@
 				border-radius: 8rpx;
 				margin: 0;
 				padding: 0;
+				&::after{
+					border:none;
+				}
 			}
 		}
 	}

From 5c0b14a34864b4ce9f38bad43881ee7b871be3c4 Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Fri, 4 Nov 2022 18:41:40 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=A6=9C=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/store.js                     |  11 +-
 pages/shop/HotNewGoods/index.vue | 213 ++++++++++++++++++++++---------
 pages/user/User/index.vue        |   4 +-
 3 files changed, 168 insertions(+), 60 deletions(-)

diff --git a/api/store.js b/api/store.js
index 71e53dc..55b0222 100644
--- a/api/store.js
+++ b/api/store.js
@@ -273,7 +273,16 @@ export function getEntry(data) {
  * 热门榜单
  */
 export function getHotList(data) {
-	return request.get("/hotList/"+ data, {}, {
+	return request.get("/hotList", data, {
+		login: false
+	});
+}
+
+/**
+ * 热门榜单信息
+ */
+export function getHotListData() {
+	return request.get("/hotListData", {}, {
 		login: false
 	});
 }
\ No newline at end of file
diff --git a/pages/shop/HotNewGoods/index.vue b/pages/shop/HotNewGoods/index.vue
index ad6a23e..c789f21 100644
--- a/pages/shop/HotNewGoods/index.vue
+++ b/pages/shop/HotNewGoods/index.vue
@@ -16,7 +16,7 @@
 		<view class="banner-box">
 			<swiper class="swiper" circular @change="swiperChange" :autoplay="true">
 				<swiper-item v-for="(item, index) in banner" :key="index" class="swiper-item" @click="goBannerDetail">
-					<image class="swiper-image " :src="item" mode="aspectFill" lazy-load>
+					<image class="swiper-image " :src="item.pic" mode="aspectFill" lazy-load>
 					</image>
 				</swiper-item>
 			</swiper>
@@ -26,22 +26,35 @@
 		</view>
 		
 		<view class="content-box">
-			<scroll-view scroll-x="true">
+			<scroll-view class="classify-scroll" scroll-x="true">
 				<view class="classify-box">
-					<view v-for="(item,index) in 4" :key="index" @click="changeClassify(index)">
-						<image :class="'classify-item ' + (classifyType == index?'on':'')" :src="item.listImage" mode=""></image>
+					<!-- <view v-for="(item,index) in 4" :key="index" @click="changeClassify(index)"> -->
+					<view v-for="(item,index) in classifyList" :key="index" @click="changeClassify(index)">
+						<view :class="'classify-item acea-row row-middle ' + (classifyType == index?'on':'')">
+							<image :src="item.listImage" mode="aspectFill"></image>
+						</view>
 					</view>
 				</view>
 			</scroll-view>
 			
-			<view class="nav-box acea-row">
-				<view class="item on">全部</view>
-				<view class="item acea-row row-middle">
-					<view class="">2022年10月</view>
-					<view class="jiantou-down"></view>
+			<scroll-view class="nav-scroll" scroll-x="true">
+				<view class="nav-box">
+					<view class="item on">全部</view>
+					<picker class="item" @change="bindPickerChange" :value="mouthIndex" :range="mouthList" v-if="mouthList.length">
+						<view class="nav-name">{{form.mouth}}</view>
+						<view class="jiantou-down"></view>
+					</picker>
+					<view class="item">
+						<view class="nav-name">价格</view>
+						<view class="jiantou-down"></view>
+					</view>
+					<picker class="item" @change="bindPickerSubclassChange" :value="subclassIndex" :range="subclassList" range-key="cateName" v-if="subclassList.length">
+						<view class="nav-name">{{subclass.cateName}}</view>
+						<view class="jiantou-down"></view>
+					</picker>
+					<view><view class="nav-name" style="margin-right: 12rpx;"></view></view>
 				</view>
-			</view>
-			
+			</scroll-view>
 			
 			<view class="notice-box acea-row row-middle">
 				<image src="@/static/images/laba.png" mode="aspectFill"></image>
@@ -53,8 +66,7 @@
 			
 			<view class="list-box">
 				<view class="top-box">
-					<view class="top-item acea-row" v-for="(item,index) in goodsList" :key="index" @tap="goGoodsCon(item)">
-					<!-- <view class="top-item acea-row" v-for="(item,index) in topList" :key="index" @tap="goGoodsCon(item)"> -->
+					<view class="top-item acea-row" v-for="(item,index) in topList" :key="index" @tap="goGoodsCon(item)">
 						<view class="top-num-box">
 							<view class="">{{index+1}}</view>
 							<view class="tip">{{index===0?'ST':index===1?'ND':index===2?'RD':'TH'}}</view>
@@ -69,8 +81,7 @@
 					</view>
 				</view>
 				<view class="goods-list acea-row row-between" v-if="goodsList.length">
-					<view class="goods-item" v-for="(item, promotionGoodIndex) in goodsList"
-						:key="promotionGoodIndex" @tap="goGoodsCon(item)">
+					<view class="goods-item" v-for="(item, promotionGoodIndex) in goodsList" :key="promotionGoodIndex" @tap="goGoodsCon(item)">
 						<view class="img-box">
 							<image class="img" :src="item.image" lazy-load mode="aspectFill"></image>
 						</view>
@@ -99,7 +110,7 @@
 <script>
 // import UniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar'
 import GoodList from "@/components/GoodList";
-import { getBanner, getHotList, getGroomList } from "@/api/store";
+import { getBanner, getHotListData, getHotList, getGroomList } from "@/api/store";
 export default {
   name: "HotNewGoods",
   components: {
@@ -111,33 +122,49 @@ export default {
     return {
 			banner: [],
 			classifyType: 0,
+			classifyList: [],
+			mouthList: [],
+			mouthIndex: 0,
+			// mouth: '',
+			subclassList: [],
+			subclassIndex: 0,
+			subclass: {},
+			form: {
+				mouth: '',					// 所属月份
+				hotListId: null,		// 榜单ID
+				cateId: null,				// 商品分类ID
+				page: 1,
+				limit: 20,
+				priceOrder: '',			// desc降序/asc升序
+				salesOrder: '',
+			},
 			topList: [],
       goodsList: [],
-      name: "",
-      icon: "",
-      RecommendSwiper: {
-        pagination: {
-          el: ".swiper-pagination",
-          clickable: true
-        },
-        autoplay: {
-          disableOnInteraction: false,
-          delay: 2000
-        },
-        loop: true,
-        speed: 1000,
-        observer: true,
-        observeParents: true
-      }
+      // name: "",
+      // icon: "",
+      // RecommendSwiper: {
+      //   pagination: {
+      //     el: ".swiper-pagination",
+      //     clickable: true
+      //   },
+      //   autoplay: {
+      //     disableOnInteraction: false,
+      //     delay: 2000
+      //   },
+      //   loop: true,
+      //   speed: 1000,
+      //   observer: true,
+      //   observeParents: true
+      // }
     };
   },
   mounted: function() {
-    this.titleInfo();
-    this.getIndexGroomList();
-		getBanner(3).then(res => {
+    // this.titleInfo();
+    // this.getIndexGroomList();
+		getBanner(4).then(res => {
 			this.$set(this,'banner',res.data.banner)
 		})
-		this.getHotList();
+		this.getHotListData();
   },
   methods: {
 		goBannerDetail(item){
@@ -148,15 +175,61 @@ export default {
 		swiperChange(e) {
 			this.swiperCurrent = e.detail.current;
 		},
-		getHotList() {
-			let mouth = '2022-9'
-			getHotList(mouth),then(res => {
-				
+		getHotListData() {
+			getHotListData().then(res => {
+				this.hotListData = res.data;
+				this.mouthList = res.data.mouthList;
+				this.form.mouth = this.mouthList[0];
+				this.classifyList = this.hotListData[this.form.mouth].hotListDTOS;
+				this.subclassList = this.hotListData[this.form.mouth].cateDtos;
+				this.form.hotListId = this.classifyList[this.classifyType].id;
+				this.subclass = this.subclassList[0];
+				this.form.cateId = this.subclass.cateId;
+				this.getHotList();
 			})
 		},
+		bindPickerChange(e) {
+			this.mouthIndex = e.detail.value;
+			this.form.mouth = this.mouthList[this.mouthIndex];
+			this.classifyList = this.hotListData[this.form.mouth].hotListDTOS;
+			this.subclassList = this.hotListData[this.form.mouth].cateDtos;
+			this.form.hotListId = this.classifyList[this.classifyType].id;
+			this.subclass = this.subclassList[0];
+			
+			this.form.cateId = this.subclass.cateId;
+			this.goodsList = [];
+			this.getHotList();
+		},
 		changeClassify(i) {
 			if(this.classifyType == i) return
 			this.classifyType = i;
+			this.form.hotListId = this.classifyList[this.classifyType].id;
+			this.goodsList = [];
+			this.getHotList();
+		},
+		bindPickerSubclassChange(e) {
+			this.subclassIndex = e.detail.value;
+			this.subclass = this.subclassList[this.subclassIndex];
+			this.form.cateId = this.subclass.cateId;
+			this.goodsList = [];
+			this.getHotList();
+		},
+		getHotList() {
+			getHotList(this.form).then(res => {
+				this.goodsList = this.sortData(res.data, 5);
+			})
+		},
+		// 数据分层
+		sortData(oArr, length) {
+			let arr = [];
+			let minArr = [];
+			if (oArr.length > length) {
+				this.topList = oArr.slice(0, length);
+				arr = oArr.slice(length, oArr.length);
+			} else {
+				this.topList = oArr;
+			}
+			return arr;
 		},
 		goGoodsCon(item) {
 			if(item.isIntegral === 1) {
@@ -176,7 +249,7 @@ export default {
 			}
 		},
 		
-    titleInfo: function() {
+    /* titleInfo: function() {
       let type = this.$yroute.query.type;
       if (type === "1") {
         this.name = "精品推荐";
@@ -207,7 +280,7 @@ export default {
 							duration: 2000
 						});
         });
-    }
+    } */
   }
 };
 </script>
@@ -280,7 +353,7 @@ export default {
 		background: #FFFFFF;
 		box-shadow: 0rpx -4rpx 38rpx 0rpx rgba(0,0,0,0.1);
 		border-radius: 28rpx 28rpx 0rpx 0rpx;
-		scroll-view {
+		.classify-scroll {
 			position: relative;
 			top: -60rpx;
 			margin-bottom: -60rpx;
@@ -296,22 +369,41 @@ export default {
 				.classify-item {
 					width: 176rpx;
 					height: 96rpx;
+					text-align: center;
 					margin-right: 20rpx;
-					border-radius: 16rpx;
-					background: linear-gradient(135deg, #39D396 0%, #2DB7AD 43%, #1B8DCC 100%);
+					image {
+						width: 176rpx;
+						height: 96rpx;
+						border-radius: 16rpx;
+						transition: all .3s linear;
+						// background: linear-gradient(135deg, #39D396 0%, #2DB7AD 43%, #1B8DCC 100%);
+					}
+					transition: width .3s linear;
 				}
 				.classify-item.on {
 					width: 220rpx;
-					height: 120upx;
+					height: 120rpx;
+					transition: width .3s linear;
+					image {
+						width: 220rpx;
+						height: 120rpx;
+						transition: all .3s linear;
+					}
 				}
 			}
 		}
 	}
 	
+	.content-box .nav-scroll {
+		overflow:hidden;
+		white-space:nowrap;
+	}
 	.content-box .nav-box {
+		display: flex;
+		flex-wrap: nowrap;
 		padding: 20rpx 32rpx;
+		margin-right: 32rpx;
 		.item {
-			// width: 87px;
 			height: 40rpx;
 			border-radius: 16rpx;
 			border: 2rpx solid #2EB5AE;
@@ -322,6 +414,12 @@ export default {
 			color: #2DB5AE;
 			line-height: 36rpx;
 			margin-right: 20rpx;
+			.nav-name,.jiantou-down {
+				display: inline-block;
+			}
+			.jiantou-down {
+				margin-bottom: 4rpx;
+			}
 		}
 		.item.on {
 			width: 124rpx;
@@ -331,6 +429,16 @@ export default {
 		}
 	}
 	
+	.jiantou-down {
+		width: 0;
+		height: 0;
+		border-top: 10rpx solid #2EB5AE;
+		border-bottom: 0rpx;
+		border-left: 6rpx solid transparent;
+		border-right: 6rpx solid transparent;
+		margin-left: 2rpx;
+	}
+	
 	.notice-box {
 		margin: 0rpx 32rpx 18rpx;
 		padding: 0rpx 16rpx;
@@ -352,7 +460,7 @@ export default {
 	}
 	
 	.list-box {
-		height: calc(100% - 196rpx);
+		height: calc(100% - 200rpx);
 		overflow-y: scroll;
 		.top-box {
 			padding: 0rpx 32rpx 12rpx;
@@ -490,13 +598,4 @@ export default {
 		}
 	}
 	
-	.jiantou-down {
-		width: 0;
-		height: 0;
-		border-top: 10rpx solid #2EB5AE;
-		border-bottom: 0rpx;
-		border-left: 6rpx solid transparent;
-		border-right: 6rpx solid transparent;
-		margin-left: 2rpx;
-	}
 </style>
\ No newline at end of file
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index bf59558..cc66b24 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -71,7 +71,7 @@
 			<view class="user-info acea-row row-between">
 				<view class="coupon-box acea-row row-between-wrapper" @click="goUserCoupon">
 					<view class="title">我的券包</view>
-					<view class="acea-row row-right">
+					<view class="acea-row row-right" v-if="userInfo.couponCount !== undefined">
 						<view v-if="String(userInfo.couponCount).length == 1" class="item acea-row row-column-between">
 							<view class="top"></view>
 							<view class="bottom"></view>
@@ -86,7 +86,7 @@
 				</view>
 				<view class="coupon-box integral-box acea-row row-between-wrapper" @click="goIntegral()">
 					<view class="title">我的积分</view>
-					<view class="acea-row row-right">
+					<view class="acea-row row-right" v-if="userInfo.integral !== undefined">
 						<view v-if="5-String(userInfo.integral).length > 0" class="item acea-row row-column-between" v-for="(item,index) in 5-String(userInfo.integral).length" :key="index">
 							<view class="top"></view>
 							<view class="bottom"></view>

From c2cfef9da42d2137be931c5371ed4dad2ce37971 Mon Sep 17 00:00:00 2001
From: whyneedname <542399163@qq.com>
Date: Sat, 5 Nov 2022 10:39:02 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=A6=9C=E5=8D=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=81=E4=BB=B7=E6=A0=BC=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/uni-notice-bar/uni-notice-bar.vue |  7 +-
 pages/shop/HotNewGoods/index.vue             | 69 ++++++++++++++------
 2 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/components/uni-notice-bar/uni-notice-bar.vue b/components/uni-notice-bar/uni-notice-bar.vue
index a429e3d..d006242 100644
--- a/components/uni-notice-bar/uni-notice-bar.vue
+++ b/components/uni-notice-bar/uni-notice-bar.vue
@@ -17,7 +17,7 @@
 		<view ref="textBox" class="uni-noticebar__content-wrapper" :class="{'uni-noticebar__content-wrapper--scrollable':scrollable, 'uni-noticebar__content-wrapper--single':!scrollable && (single || moreText)}">
 			<view :id="elIdBox" class="uni-noticebar__content" :class="{'uni-noticebar__content--scrollable':scrollable, 'uni-noticebar__content--single':!scrollable && (single || moreText)}">
 				<text :id="elId" ref="animationEle" class="uni-noticebar__content-text" :class="{'uni-noticebar__content-text--scrollable':scrollable,'uni-noticebar__content-text--single':!scrollable && (single || moreText)}"
-				 :style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay}">{{text}}</text>
+				 :style="{color:color, width:wrapWidth+'px', 'animationDuration': animationDuration, '-webkit-animationDuration': animationDuration ,animationPlayState: webviewHide?'paused':animationPlayState,'-webkit-animationPlayState':webviewHide?'paused':animationPlayState, animationDelay: animationDelay, '-webkit-animationDelay':animationDelay, 'font-size':fontSize}">{{text}}</text>
 			</view>
 		</view>
 		<!-- <view v-if="showGetMore === true || showGetMore === 'true'" class="uni-noticebar__more" @click="clickMore">
@@ -43,6 +43,7 @@
 	 * @property {String} backgroundColor 背景颜色
 	 * @property {String} color 文字颜色
 	 * @property {String} moreColor 查看更多文字的颜色
+	 * @property {String} fontSize 文字字号
 	 * @property {String} moreText 设置“查看更多”的文本
 	 * @property {Boolean} single = [true|false] 是否单行
 	 * @property {Boolean} scrollable = [true|false] 是否滚动，为true时，NoticeBar为单行
@@ -85,6 +86,10 @@
 				type: String,
 				default: '#999999'
 			},
+			fontSize: {
+				type: String,
+				default: '24rpx'
+			},
 			single: {
 				// 是否单行
 				type: [Boolean, String],
diff --git a/pages/shop/HotNewGoods/index.vue b/pages/shop/HotNewGoods/index.vue
index c789f21..b9f49d0 100644
--- a/pages/shop/HotNewGoods/index.vue
+++ b/pages/shop/HotNewGoods/index.vue
@@ -28,7 +28,6 @@
 		<view class="content-box">
 			<scroll-view class="classify-scroll" scroll-x="true">
 				<view class="classify-box">
-					<!-- <view v-for="(item,index) in 4" :key="index" @click="changeClassify(index)"> -->
 					<view v-for="(item,index) in classifyList" :key="index" @click="changeClassify(index)">
 						<view :class="'classify-item acea-row row-middle ' + (classifyType == index?'on':'')">
 							<image :src="item.listImage" mode="aspectFill"></image>
@@ -44,9 +43,10 @@
 						<view class="nav-name">{{form.mouth}}</view>
 						<view class="jiantou-down"></view>
 					</picker>
-					<view class="item">
+					<view class="item" @click="setSort">
 						<view class="nav-name">价格</view>
-						<view class="jiantou-down"></view>
+						<view class="jiantou-up" v-if="form.priceOrder == 'asc'"></view>
+						<view class="jiantou-down" v-else-if="form.priceOrder == 'desc'"></view>
 					</view>
 					<picker class="item" @change="bindPickerSubclassChange" :value="subclassIndex" :range="subclassList" range-key="cateName" v-if="subclassList.length">
 						<view class="nav-name">{{subclass.cateName}}</view>
@@ -60,13 +60,14 @@
 				<image src="@/static/images/laba.png" mode="aspectFill"></image>
 				<view class="uni-notice-bar-box">
 					榜单每月30号统计，下月1号左右更新
-					<!-- <uni-notice-bar color="#999999" backgroundColor="#F5F6F8" scrollable="true" single="true" :speed="60" text="热花今将机支物极十争才线来理始"></uni-notice-bar> -->
+					<!-- <uni-notice-bar color="#999999" backgroundColor="#F5F6F8" scrollable="true" single="true" :speed="50" fontSize="20rpx" text="榜单每月30号统计，下月1号左右更新"></uni-notice-bar> -->
 				</view>
 			</view>
 			
 			<view class="list-box">
 				<view class="top-box">
-					<view class="top-item acea-row" v-for="(item,index) in topList" :key="index" @tap="goGoodsCon(item)">
+					<view class="top-item acea-row" v-for="(item,index) in goodsList" :key="index" @tap="goGoodsCon(item)">
+					<!-- <view class="top-item acea-row" v-for="(item,index) in topList" :key="index" @tap="goGoodsCon(item)"> -->
 						<view class="top-num-box">
 							<view class="">{{index+1}}</view>
 							<view class="tip">{{index===0?'ST':index===1?'ND':index===2?'RD':'TH'}}</view>
@@ -80,7 +81,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="goods-list acea-row row-between" v-if="goodsList.length">
+				<!-- <view class="goods-list acea-row row-between" v-if="goodsList.length">
 					<view class="goods-item" v-for="(item, promotionGoodIndex) in goodsList" :key="promotionGoodIndex" @tap="goGoodsCon(item)">
 						<view class="img-box">
 							<image class="img" :src="item.image" lazy-load mode="aspectFill"></image>
@@ -91,7 +92,7 @@
 							<view class="current" v-else>¥{{ item.price }}<text>¥{{item.otPrice}}</text></view>
 						</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			
 		</view>
@@ -134,11 +135,11 @@ export default {
 				hotListId: null,		// 榜单ID
 				cateId: null,				// 商品分类ID
 				page: 1,
-				limit: 20,
+				limit: 30,
 				priceOrder: '',			// desc降序/asc升序
 				salesOrder: '',
 			},
-			topList: [],
+			// topList: [],
       goodsList: [],
       // name: "",
       // icon: "",
@@ -181,25 +182,29 @@ export default {
 				this.mouthList = res.data.mouthList;
 				this.form.mouth = this.mouthList[0];
 				this.classifyList = this.hotListData[this.form.mouth].hotListDTOS;
-				this.subclassList = this.hotListData[this.form.mouth].cateDtos;
 				this.form.hotListId = this.classifyList[this.classifyType].id;
+				this.subclassList = this.classifyList[this.classifyType].cateDtos;
 				this.subclass = this.subclassList[0];
 				this.form.cateId = this.subclass.cateId;
 				this.getHotList();
 			})
 		},
+		// 月份
 		bindPickerChange(e) {
+			if(this.mouthIndex == e.detail.value) return;
 			this.mouthIndex = e.detail.value;
 			this.form.mouth = this.mouthList[this.mouthIndex];
-			this.classifyList = this.hotListData[this.form.mouth].hotListDTOS;
-			this.subclassList = this.hotListData[this.form.mouth].cateDtos;
-			this.form.hotListId = this.classifyList[this.classifyType].id;
-			this.subclass = this.subclassList[0];
-			
-			this.form.cateId = this.subclass.cateId;
 			this.goodsList = [];
-			this.getHotList();
+			this.classifyList = this.hotListData[this.form.mouth].hotListDTOS;
+			if(this.classifyList[this.classifyType]) {
+				this.form.hotListId = this.classifyList[this.classifyType].id;
+				this.subclassList = this.classifyList[this.classifyType].cateDtos;
+				this.subclass = this.subclassList[0];
+				this.form.cateId = this.subclass.cateId;
+				this.getHotList();
+			}
 		},
+		// 榜单
 		changeClassify(i) {
 			if(this.classifyType == i) return
 			this.classifyType = i;
@@ -207,7 +212,9 @@ export default {
 			this.goodsList = [];
 			this.getHotList();
 		},
+		// 子分类
 		bindPickerSubclassChange(e) {
+			if(this.subclassIndex == e.detail.value) return;
 			this.subclassIndex = e.detail.value;
 			this.subclass = this.subclassList[this.subclassIndex];
 			this.form.cateId = this.subclass.cateId;
@@ -215,8 +222,13 @@ export default {
 			this.getHotList();
 		},
 		getHotList() {
+			uni.showLoading({
+				title: ''
+			})
 			getHotList(this.form).then(res => {
-				this.goodsList = this.sortData(res.data, 5);
+				this.goodsList = res.data;
+				uni.hideLoading();
+				// this.goodsList = this.sortData(res.data, 5);
 			})
 		},
 		// 数据分层
@@ -231,6 +243,13 @@ export default {
 			}
 			return arr;
 		},
+		setSort() {
+			if (this.form.priceOrder == '') this.form.priceOrder = 'asc'
+			else if (this.form.priceOrder == 'asc') this.form.priceOrder = 'desc'
+			else if (this.form.priceOrder == 'desc') this.form.priceOrder = ''
+			this.goodsList = [];
+			this.getHotList();
+		},
 		goGoodsCon(item) {
 			if(item.isIntegral === 1) {
 				this.$yrouter.push({
@@ -414,10 +433,10 @@ export default {
 			color: #2DB5AE;
 			line-height: 36rpx;
 			margin-right: 20rpx;
-			.nav-name,.jiantou-down {
+			.nav-name,.jiantou-down,.jiantou-up {
 				display: inline-block;
 			}
-			.jiantou-down {
+			.jiantou-down,.jiantou-up {
 				margin-bottom: 4rpx;
 			}
 		}
@@ -438,6 +457,15 @@ export default {
 		border-right: 6rpx solid transparent;
 		margin-left: 2rpx;
 	}
+	.jiantou-up {
+		width: 0;
+		height: 0;
+		border-bottom: 10rpx solid #2EB5AE;
+		border-top: 0rpx;
+		border-left: 6rpx solid transparent;
+		border-right: 6rpx solid transparent;
+		margin-left: 2rpx;
+	}
 	
 	.notice-box {
 		margin: 0rpx 32rpx 18rpx;
@@ -450,6 +478,7 @@ export default {
 			height: 26rpx;
 		}
 		.uni-notice-bar-box {
+			width: 628rpx;
 			padding-left: 8rpx;
 			font-size: 20rpx;
 			font-family: PingFang SC;