From aa2f1009e80e34e64e0de12bb872b6807f4da916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E6=98=9F=E6=98=9F?= <605893810@qq.com>
Date: Wed, 15 Jul 2026 20:06:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/choiceness/choiceness.vue          |   2 +-
 components/common/product-seckill-card.vue    |  17 +-
 manifest.json                                 |   2 +-
 pages/active/limited-time/limited-time.vue    |  63 +-
 .../newcomer-exclusive/newcomer-exclusive.vue |  38 +-
 pages/active/super-subsidy/super-subsidy.vue  |  34 +-
 pages/home/home.vue                           | 303 +++-------
 .../other_package/productInfo/productInfo.vue |  46 +-
 pages/rwa_package/dongjian/jia.vue            | 543 +++++++++---------
 pages/sort/sort.vue                           |  96 +---
 pages/supply_chain/supply_chain.vue           |   9 +-
 utils/config.js                               |   8 +-
 12 files changed, 538 insertions(+), 623 deletions(-)

diff --git a/components/choiceness/choiceness.vue b/components/choiceness/choiceness.vue
index e1bbcd8..3ff9438 100644
--- a/components/choiceness/choiceness.vue
+++ b/components/choiceness/choiceness.vue
@@ -86,7 +86,7 @@ export default {
 
 <style lang="scss" scoped>
 .choiceness_warp {
-  margin-top: 50rpx;
+  margin-top: 35rpx;
 }
 
 .choiceness_title {
diff --git a/components/common/product-seckill-card.vue b/components/common/product-seckill-card.vue
index 49544b6..3691c60 100644
--- a/components/common/product-seckill-card.vue
+++ b/components/common/product-seckill-card.vue
@@ -24,7 +24,7 @@
 
 			<!--  (秒杀券立减) -->
 			<view class="coupon_row" v-if="hasCoupon">
-				<view class="coupon_badge" v-if="activedType === 'seckill'">
+				<view class="coupon_badge" v-if="activedType === 'seckill' || activedType === 'actived'">
 					<text class="flash_icon">⚡</text>
 					<text class="coupon_text" v-if="item.secDiscount || item.subsidy">加倍补{{ item.secDiscount ||
 						item.subsidy }}元</text>
@@ -46,7 +46,7 @@
 				</view>
 				<!-- Alarm clock button -->
 				<view class="alarm_btn_wrapper">
-					<image class="uni-image" v-if="activedType === 'seckill'"
+					<image class="uni-image" v-if="activedType === 'actived'"
 						src="https://static.tbmall.xin/static/new-home/home_3.png"></image>
 					<image class="uni-image seckill-icon" v-else src="https://static.tbmall.xin/static/home/qiang.png">
 					</image>
@@ -110,6 +110,15 @@ export default {
 	methods: {
 		// 商品
 		onSelectProct(item) {
+			if (this.activedType === 'actived') {
+				uni.showToast({
+					title: '活动即将开始',
+					icon: 'none',
+					mask: true,
+					duration: 1500,
+				})
+				return;
+			}
 			let url = "/pages/other_package/productInfo/productInfo?id=" + item.id;
 			if (this.activedType === 'seckill') {
 				url = "/pages/other_package/productInfo/productInfo?id=" + item.id + "&activedType=" + this.activedType + "&activityId=" + item.activityId;
@@ -239,14 +248,14 @@ export default {
 	font-size: 26rpx;
 	color: #000;
 	font-weight: bold;
-	line-height: 40rpx;
+	line-height: 30rpx;
 	word-break: break-all;
 	text-overflow: ellipsis;
 	display: -webkit-box;
 	-webkit-box-orient: vertical;
 	-webkit-line-clamp: 2;
 	overflow: hidden;
-	margin-bottom: 12rpx;
+	// margin-bottom: 12rpx;
 }
 
 .coupon_row {
diff --git a/manifest.json b/manifest.json
index e7e6f00..88a4896 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__4910728",
     "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
     "versionName" : "1.0.3",
-    "versionCode" : 164,
+    "versionCode" : 165,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/active/limited-time/limited-time.vue b/pages/active/limited-time/limited-time.vue
index b5112c8..751d0f8 100644
--- a/pages/active/limited-time/limited-time.vue
+++ b/pages/active/limited-time/limited-time.vue
@@ -1,9 +1,9 @@
 <template>
     <view class="content-two">
-        <TopSafe></TopSafe>
 
         <view class="product_info_header_warp">
-            <up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper" @change="(e) => (currentNum = e.current)">
+            <up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
+                @change="(e) => (currentNum = e.current)">
                 <template #indicator>
                     <view class="indicator-num">
                         <text class="indicator-num__text">{{ currentNum + 1 }}/{{ swiperList.length }}</text>
@@ -11,26 +11,25 @@
                 </template>
             </up-swiper>
             <view class="img_comm left_warp">
-                <up-image src="/static/common/left_b_st.png" width="30" height="30" bgColor="#f1f6ff00" @click="jumpLeft"></up-image>
+                <up-image src="/static/common/left_b_st.png" width="30" height="30" bgColor="#f1f6ff00"
+                    @click="jumpLeft"></up-image>
             </view>
         </view>
 
         <view class="tab-view">
             <!-- 限时秒杀卡片 -->
             <view class="tab-card">
-                <view class="tab-item" :class="{ active: activeTab === index }" @click="onActiveTabChange(index)" v-for="(item, index) in activeTabList" :key="index">
+                <view class="tab-item" :class="{ active: activeTab === index }" @click="onActiveTabChange(index)"
+                    v-for="(item, index) in activeTabList" :key="index">
                     <text class="tab-text">{{ item.name }}</text>
                 </view>
             </view>
             <!-- 限时秒杀标签 -->
             <view class="tab-list-container">
                 <view class="tab-list" @click="onTab(index)" v-for="(item, index) in tabList" :key="index">
-                    <text
-                        class="text-28 text-space"
-                        :style="{
-                            color: curTab == index ? '#7A35F6' : '#666'
-                        }"
-                    >
+                    <text class="text-28 text-space" :style="{
+                        color: curTab == index ? '#7A35F6' : '#666'
+                    }">
                         {{ item.name }}
                     </text>
                     <!-- <view class="line" v-if="curTab == index"></view> -->
@@ -40,10 +39,11 @@
 
         <view class="setting-view">
             <view class="name-box">
-                <mescroll-uni ref="mescrollRef" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption" @init="mescrollInit" :fixed="false">
+                <mescroll-uni ref="mescrollRef" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
+                    @init="mescrollInit" :fixed="false">
                     <!-- 原来单个 v-for 替换成两列 -->
                     <view class="mescrollUniView" v-for="item in dataList" :key="item.id">
-                        <productSeckillCard :item="item" actived-type="seckill" :attributes="attributes" />
+                        <productSeckillCard :item="item" :actived-type="activedScekillType" :attributes="attributes" />
                     </view>
                 </mescroll-uni>
             </view>
@@ -83,8 +83,8 @@ export default {
             curTab: 0,
             activeTab: 0,
             activeTabList: [
-                { name: '今日秒杀', type: 'current' },
-                { name: '活动预告', type: 'preview' }
+                { name: '今日秒杀', type: 'current', activedType: 'seckill' },
+                { name: '活动预告', type: 'preview', activedType: "actived" }
             ],
             upOption: {
                 auto: false,
@@ -104,7 +104,8 @@ export default {
                 bgColor: 'rgba(0,0,0,0)'
             },
             mescroll: null,
-            attributes: {} // 限时秒杀卡片属性
+            attributes: {},// 限时秒杀卡片属性
+            activedScekillType: 'seckill'
         };
     },
     onLoad() {
@@ -179,9 +180,7 @@ export default {
         },
 
         downCallback() {
-            this.$nextTick(function () {
-                this.mescroll && this.mescroll.resetUpScroll();
-            });
+            this.mescroll && this.mescroll.resetUpScroll();
         },
 
         mescrollInit(mescroll) {
@@ -207,8 +206,12 @@ export default {
             if (index !== this.activeTab) {
                 this.activeTab = index;
                 this.dataList = [];
+                if (this.mescroll) {
+                    this.mescroll.isUpScrolling = true;
+                }
                 const item = this.activeTabList[index];
                 this.onGetSeckillCurrent(item.type);
+                this.activedScekillType = item.activedType;
             }
         },
 
@@ -234,27 +237,29 @@ export default {
 
 <style lang="scss" scoped>
 .content-two {
-    height: calc(100vh);
+    height: 100vh;
     background-color: #fff;
     display: flex;
     flex-direction: column;
+    overflow: hidden;
+    position: relative;
 }
 
 .product_info_header_warp {
     position: relative;
 
     .product_info_header_swiper {
-        height: 600rpx !important;
+        height: 660rpx !important;
         border-radius: 0 !important;
 
         ::v-deep(.u-swiper__wrapper) {
-            height: 600rpx !important;
+            height: 660rpx !important;
 
             .u-swiper__wrapper {
-                height: 600rpx !important;
+                height: 660rpx !important;
 
                 .u-swiper__wrapper__item__wrapper__image {
-                    height: 600rpx !important;
+                    height: 660rpx !important;
                     border-radius: 0 !important;
                 }
             }
@@ -376,7 +381,7 @@ export default {
     background-color: #fff;
     overflow-x: auto;
     position: absolute;
-    top: 520rpx;
+    top: 600rpx;
     left: 0;
 
     .tab-list-container {
@@ -386,6 +391,8 @@ export default {
         flex-direction: row;
         align-items: center;
         overflow-x: auto;
+        padding: 0 12rpx;
+        box-sizing: border-box;
     }
 
     .tab-list {
@@ -403,6 +410,7 @@ export default {
     margin-top: 0;
     width: 100%;
     flex: 1;
+    min-height: 0;
 
     display: flex;
     flex-direction: column;
@@ -411,11 +419,16 @@ export default {
     padding: 0 32rpx;
     box-sizing: border-box;
     position: relative;
-    margin-top: 106rpx;
+    margin-top: 126rpx;
+
+    /* #ifndef H5 || MP-WEIXIN */
+    margin-bottom: calc(100rpx + env(safe-area-inset-bottom));
+    /* #endif */
 
     .name-box {
         width: 100%;
         flex: 1;
+        min-height: 0;
         display: flex;
         flex-direction: column;
         align-items: center;
diff --git a/pages/active/newcomer-exclusive/newcomer-exclusive.vue b/pages/active/newcomer-exclusive/newcomer-exclusive.vue
index 59e3c46..4737324 100644
--- a/pages/active/newcomer-exclusive/newcomer-exclusive.vue
+++ b/pages/active/newcomer-exclusive/newcomer-exclusive.vue
@@ -1,6 +1,5 @@
 <template>
     <view class="content-two">
-        <TopSafe></TopSafe>
 
         <view class="product_info_header_warp">
             <up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
@@ -92,7 +91,7 @@ export default {
         };
     },
     onLoad() {
-            this.cascadeCategory();
+        this.cascadeCategory();
         this.getCarouselImage()
         this.upCallback({ num: 1, size: 10 });
     },
@@ -130,7 +129,7 @@ export default {
             let params = {
                 page: page.num,
                 pageSize: page.size,
-                // tag: 
+                tag: 3
             };
             if (this.curTab != 0) {
                 params["categoryId"] = this.tabList[this.curTab].id;
@@ -139,6 +138,7 @@ export default {
             }
             searchList(params).then((res) => {
                 let curPageLen = res.data ? res.data.length : 0;
+                if (page.num === 1) this.dataList = [];
                 if (res.data) {
                     this.dataList = page.num === 1 ? res.data : this.dataList.concat(res.data);
                 }
@@ -151,9 +151,7 @@ export default {
         },
 
         downCallback() {
-            this.$nextTick(function () {
-                this.mescroll && this.mescroll.resetUpScroll();
-            });
+            this.mescroll && this.mescroll.resetUpScroll();
         },
 
         mescrollInit(mescroll) {
@@ -193,25 +191,29 @@ export default {
 
 <style lang="scss" scoped>
 .content-two {
-    height: calc(100vh);
+    height: 100vh;
     background-color: #fff;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    position: relative;
 }
 
 .product_info_header_warp {
     position: relative;
 
     .product_info_header_swiper {
-        height: 600rpx !important;
+        height: 660rpx !important;
         border-radius: 0 !important;
 
         ::v-deep(.u-swiper__wrapper) {
-            height: 600rpx !important;
+            height: 660rpx !important;
 
             .u-swiper__wrapper {
-                height: 600rpx !important;
+                height: 660rpx !important;
 
                 .u-swiper__wrapper__item__wrapper__image {
-                    height: 600rpx !important;
+                    height: 660rpx !important;
                     border-radius: 0 !important;
                 }
             }
@@ -297,7 +299,7 @@ export default {
     background-color: #fff;
     overflow-x: auto;
     position: absolute;
-    top: 520rpx;
+    top: 600rpx;
     left: 0;
 
     .tab-list {
@@ -319,9 +321,10 @@ export default {
 }
 
 .setting-view {
-    margin-top: 20rpx;
+    margin-top: 40rpx;
     width: 100%;
-    height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
+    flex: 1;
+    min-height: 0;
 
     display: flex;
     flex-direction: column;
@@ -331,9 +334,14 @@ export default {
     box-sizing: border-box;
     position: relative;
 
+    /* #ifndef H5 || MP-WEIXIN */
+    margin-bottom: calc(100rpx + env(safe-area-inset-bottom));
+    /* #endif */
+
     .name-box {
         width: 100%;
-        height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
+        flex: 1;
+        min-height: 0;
         display: flex;
         flex-direction: column;
         align-items: center;
diff --git a/pages/active/super-subsidy/super-subsidy.vue b/pages/active/super-subsidy/super-subsidy.vue
index 30b26c3..d874b98 100644
--- a/pages/active/super-subsidy/super-subsidy.vue
+++ b/pages/active/super-subsidy/super-subsidy.vue
@@ -1,6 +1,5 @@
 <template>
     <view class="content-two">
-        <TopSafe></TopSafe>
 
         <view class="product_info_header_warp">
             <up-swiper :list="swiperList" class="product_info_header_swiper" @click="onSwiper"
@@ -120,6 +119,7 @@ export default {
             }
             searchList(params).then((res) => {
                 let curPageLen = res.data ? res.data.length : 0;
+                if (page.num === 1) this.dataList = [];
                 if (res.data) {
                     this.dataList = this.dataList.concat(res.data);
                 }
@@ -132,9 +132,7 @@ export default {
         },
 
         downCallback() {
-            this.$nextTick(function () {
-                this.mescroll && this.mescroll.resetUpScroll();
-            });
+            this.mescroll && this.mescroll.resetUpScroll();
         },
 
         mescrollInit(mescroll) {
@@ -175,25 +173,29 @@ export default {
 
 <style lang="scss" scoped>
 .content-two {
-    height: calc(100vh);
+    height: 100vh;
     background-color: #fff;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    position: relative;
 }
 
 .product_info_header_warp {
     position: relative;
 
     .product_info_header_swiper {
-        height: 600rpx !important;
+        height: 660rpx !important;
         border-radius: 0 !important;
 
         ::v-deep(.u-swiper__wrapper) {
-            height: 600rpx !important;
+            height: 660rpx !important;
 
             .u-swiper__wrapper {
-                height: 600rpx !important;
+                height: 660rpx !important;
 
                 .u-swiper__wrapper__item__wrapper__image {
-                    height: 600rpx !important;
+                    height: 660rpx !important;
                     border-radius: 0 !important;
                 }
             }
@@ -279,7 +281,7 @@ export default {
     background-color: #fff;
     overflow-x: auto;
     position: absolute;
-    top: 520rpx;
+    top: 600rpx;
     left: 0;
 
     .tab-list {
@@ -301,9 +303,10 @@ export default {
 }
 
 .setting-view {
-    margin-top: 20rpx;
+    margin-top: 40rpx;
     width: 100%;
-    height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
+    flex: 1;
+    min-height: 0;
 
     display: flex;
     flex-direction: column;
@@ -313,9 +316,14 @@ export default {
     box-sizing: border-box;
     position: relative;
 
+    /* #ifndef H5 || MP-WEIXIN */
+    margin-bottom: calc(100rpx + env(safe-area-inset-bottom));
+    /* #endif */
+
     .name-box {
         width: 100%;
-        height: calc(100vh - 88rpx - 80rpx - 100rpx - var(--status-bar-height));
+        flex: 1;
+        min-height: 0;
         display: flex;
         flex-direction: column;
         align-items: center;
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 4807089..192e90b 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,104 +1,55 @@
 <template>
-  <view
-    v-if="pageReady"
-    class="home_warp"
-    :class="platformType ? '' : 'iosplatformType'"
-  >
+  <view v-if="pageReady" class="home_warp" :class="platformType ? '' : 'iosplatformType'">
     <!-- 带背景的头部 -->
     <view class="home_content_z_warp">
       <view class="home_header_warp">
         <view class="header_title_warp">
-          <view
-            class="language_warp"
-            style="width: 100%; justify-content: flex-start"
-            @click="jumpSearch"
-          >
+          <view class="language_warp" style="width: 100%; justify-content: flex-start" @click="jumpSearch">
             <view style="margin-top: 10rpx">
-              <up-image
-                src="https://static.tbmall.xin/static/home/search_b.png"
-                width="20"
-                height="20"
-                bgColor="#f1f6ff00"
-              ></up-image>
+              <up-image src="https://static.tbmall.xin/static/home/search_b.png" width="20" height="20"
+                bgColor="#f1f6ff00"></up-image>
             </view>
             <text class="search_msg_warp">搜索</text>
           </view>
-          <image
-            src="https://static.tbmall.xin/static/chart.png"
-            class="chart_img"
-            @click.stop="jumpNewSearch('list')"
-          ></image>
+          <image src="https://static.tbmall.xin/static/chart.png" class="chart_img" @click.stop="jumpNewSearch('list')">
+          </image>
         </view>
         <view class="logo_banner">
           <view style="padding: 20rpx 0 0 20rpx">
-            <up-image
-              src="https://static.tbmall.xin/static/home/logo_banner.png"
-              width="108"
-              height="16"
-              bgColor="#f1f6ff00"
-            ></up-image>
+            <up-image src="https://static.tbmall.xin/static/home/logo_banner.png" width="108" height="16"
+              bgColor="#f1f6ff00"></up-image>
             <view class="logo_banner_title">TB聚合商城</view>
             <view class="logo_banner_msg">全民共创共享的电商平台</view>
           </view>
-          <up-image
-            src="https://static.tbmall.xin/static/logo_banner2.png"
-            width="140"
-            height="98"
-            bgColor="#f1f6ff00"
-          ></up-image>
+          <up-image src="https://static.tbmall.xin/static/logo_banner2.png" width="140" height="98"
+            bgColor="#f1f6ff00"></up-image>
         </view>
 
         <!-- 分类 -->
         <view class="home_sort_warp">
-          <view
-            class="sort_comm_warp"
-            v-if="sortList && sortList.length !== 0 && isBlockedDate"
-          >
-            <view
-              v-for="item in sortList"
-              :key="item.id"
-              class="sort_item_comm"
-              @click="jumpSort(item)"
-            >
-              <up-image
-                :src="item.icon"
-                width="40"
-                height="32"
-                bgColor="#f1f6ff00"
-              ></up-image>
+          <view class="sort_comm_warp" v-if="sortList && sortList.length !== 0 && isBlockedDate">
+            <view v-for="item in sortList" :key="item.id" class="sort_item_comm" @click="jumpSort(item)">
+              <up-image :src="item.icon" width="50" height="36" bgColor="#f1f6ff00"></up-image>
               <view class="sort_item_title_comm">{{ item.name }}</view>
             </view>
           </view>
           <view v-else class="not_order_warp">
-            <up-image
-              src="https://static.tbmall.xin/static/not_order.png"
-              width="80"
-              height="80"
-              bgColor="#f1f6ff00"
-            ></up-image>
+            <up-image src="https://static.tbmall.xin/static/not_order.png" width="80" height="80"
+              bgColor="#f1f6ff00"></up-image>
             <view class="not_order_msg_warp">暂无分类</view>
           </view>
         </view>
 
         <!-- 爆款专区-->
-        <view
-          class="home_content_warp Hot_Picks_Zone"
-          v-if="faddishProduct && faddishProduct.length !== 0"
-          @click="onJumpYou"
-        >
+        <view class="home_content_warp Hot_Picks_Zone" v-if="faddishProduct && faddishProduct.length !== 0"
+          @click="onJumpYou">
           <view class="product_comm_yp">
             <view class="yp_title">
               <view class="yp_title_left">
                 <text class="yp_title_main">信任桥优品</text>
-                <up-image
-                  src="https://static.tbmall.xin/static/home/youxuan.png"
-                  width="14"
-                  height="14"
-                  bgColor="#f1f6ff00"
-                ></up-image>
-                <text class="yp_title_sub" style="margin-left: 8rpx"
-                  >品牌五折秒杀福利</text
-                >
+                <up-image src="https://static.tbmall.xin/static/home/youxuan.png" width="14" height="14"
+                  bgColor="#f1f6ff00"></up-image>
+                <text class="yp_title_sub" style="margin-left: 8rpx">品牌五折秒杀福利</text>
               </view>
               <view class="yp_title_right">
                 <text>立即抢购</text>
@@ -109,27 +60,14 @@
             </view>
             <view class="yp_content">
               <!-- <up-loading-icon :show="productLoading"></up-loading-icon> -->
-              <view
-                class="yp_item"
-                v-for="item in faddishProduct"
-                :key="item.id"
-                @click.stop="jumpInfo(item)"
-              >
+              <view class="yp_item" v-for="item in faddishProduct" :key="item.id" @click.stop="jumpInfo(item)">
                 <view class="yp_item_image_wrapper">
-                  <up-image
-                    :src="item.url"
-                    width="100%"
-                    height="88"
-                    bgColor="#f1f6ff00"
-                    shape="square"
-                    radius="15"
-                  ></up-image>
+                  <up-image :src="item.url" width="100%" height="88" bgColor="#f1f6ff00" shape="square"
+                    radius="15"></up-image>
                 </view>
                 <view class="yp_item_info">
                   <view class="yp_item_name">{{ item.title }}</view>
-                  <view class="yp_item_price_tag"
-                    >优选价{{ item.price }}元</view
-                  >
+                  <view class="yp_item_price_tag">优选价{{ item.price }}元</view>
                 </view>
               </view>
             </view>
@@ -150,12 +88,8 @@
                 <view>好物随心兑</view>
               </view>
             </view>
-            <up-image
-              src="https://static.tbmall.xin/static/home/min_card_jfdh_2.png"
-              width="55"
-              height="55"
-              bgColor="#f1f6ff00"
-            ></up-image>
+            <up-image src="https://static.tbmall.xin/static/home/min_card_jfdh_2.png" width="55" height="55"
+              bgColor="#f1f6ff00"></up-image>
           </view>
           <!-- 红包抽奖 -->
           <view class="min_card_item" @click="jumpTurntable">
@@ -166,88 +100,46 @@
                 <view>现金红包等你拿！</view>
               </view>
             </view>
-            <up-image
-              src="https://static.tbmall.xin/static/home/min_card_hbcj_2.png"
-              width="45"
-              height="45"
-              bgColor="#f1f6ff00"
-            ></up-image>
+            <up-image src="https://static.tbmall.xin/static/home/min_card_hbcj_2.png" width="55" height="55"
+              bgColor="#f1f6ff00"></up-image>
           </view>
         </view>
 
         <view class="home_actived_warp">
-          <view
-            class="home_actived_item_warp"
-            v-for="item in homeActivedList"
-            :key="item.id"
-          >
-            <view
-              class="home_actived_item"
-              v-if="
-                (item.activedType === 'seckill' &&
-                  seckillGoodsList.length !== 0) ||
-                (item.activedType === 'super' && superGoodsList.length !== 0)
-              "
-            >
+          <view class="home_actived_item_warp" v-for="item in homeActivedList" :key="item.id">
+            <view class="home_actived_item">
               <view class="product_comm_tip" @click="jumpPage(item.path)">
                 <view class="product_comm_tip_left">
                   <image class="uni-image" :src="item.title_icon"></image>
-                  <view
-                    :class="[
-                      activedTabId === 'actived'
-                        ? 'tip_title_lable'
-                        : 'tip_title',
-                    ]"
-                    style="margin-right: 10rpx"
-                    v-if="item.title_text"
-                    @click.stop="jumpTab(item, 'actived')"
-                    >{{ item.title_text }}</view
-                  >
-                  <view
-                    :class="[
-                      activedTabId === 'seckill'
-                        ? 'tip_title_lable'
-                        : 'tip_title',
-                    ]"
-                    @click.stop="jumpTab(item, 'seckill')"
-                    >{{ item.title }}</view
-                  >
+                  <view :class="[
+                    activedTabId === 'actived'
+                      ? 'tip_title '
+                      : 'tip_title_lable',
+                  ]" style="margin-right: 10rpx" v-if="item.title_text" @click.stop="jumpTab(item, 'seckill')">{{
+                    item.title_text }}</view>
+                  <view v-if="item.activedType === 'seckill'" :class="[
+                    activedTabId === 'seckill'
+                      ? 'tip_title '
+                      : 'tip_title_lable',
+                  ]" @click.stop="jumpTab(item, 'actived')">{{ item.title }}</view>
+                  <view v-else class="tip_title_lable">{{ item.title }}</view>
                 </view>
 
-                <view class="product_comm_tip_right"
-                  >{{ item.rightText }}
-                  <up-image
-                    src="/static/common/right.png"
-                    width="15"
-                    height="15"
-                    bgColor="#f1f6ff00"
-                  ></up-image>
+                <view class="product_comm_tip_right">{{ item.rightText }}
+                  <image class="uni-image" src="/static/common/right.png"></image>
+                  <!-- <up-image src="/static/common/right.png" width="15" height="15" bgColor="#f1f6ff00"></up-image> -->
                 </view>
               </view>
               <!-- 限时秒杀 -->
               <view v-if="item.activedType === 'seckill'">
-                <view
-                  class="product_seckill_card"
-                  v-for="ele in seckillGoodsList"
-                  :key="ele.id"
-                >
-                  <productSeckillCard
-                    :item="ele"
-                    :actived-type="item.activedType"
-                  />
+                <view class="product_seckill_card" v-for="ele in seckillGoodsList" :key="ele.id">
+                  <productSeckillCard :item="ele" :actived-type="seckillActivedType" :attributes='attributes' />
                 </view>
               </view>
               <!-- 超级补贴 -->
               <view v-if="item.activedType === 'super'">
-                <view
-                  class="product_seckill_card"
-                  v-for="ele in superGoodsList"
-                  :key="ele.id"
-                >
-                  <productSeckillCard
-                    :item="ele"
-                    :actived-type="item.activedType"
-                  />
+                <view class="product_seckill_card" v-for="ele in superGoodsList" :key="ele.id">
+                  <productSeckillCard :item="ele" :actived-type="item.activedType" />
                 </view>
               </view>
             </view>
@@ -263,12 +155,7 @@
     <up-modal :show="openShow" :showConfirmButton="false">
       <view class="slot-content">
         <view class="close_warp" @click="openShow = false">
-          <up-image
-            src="/static/common/close.png"
-            width="20"
-            height="20"
-            bgColor="#f1f6ff00"
-          ></up-image>
+          <up-image src="/static/common/close.png" width="20" height="20" bgColor="#f1f6ff00"></up-image>
         </view>
         <view class="content_">
           <view class="content_1">温馨提示</view>
@@ -290,24 +177,14 @@
           <view class="banner_box">
             <view class="conter">{{ updateApkObj.content }}</view>
             <view class="banner_foot" v-if="!bannerPercentageShow">
-              <button
-                @click="goUpdate(updateApkObj, platformType)"
-                class="banner_foot_button"
-              >
+              <button @click="goUpdate(updateApkObj, platformType)" class="banner_foot_button">
                 立即更新
               </button>
-              <view
-                @click="bannerShow = false"
-                class="banner_foot_button_no"
-                v-if="!updateApkObj.isForce"
-                >暂不更新
+              <view @click="bannerShow = false" class="banner_foot_button_no" v-if="!updateApkObj.isForce">暂不更新
               </view>
             </view>
             <view v-else>
-              <up-line-progress
-                :percentage="bannerPercentage"
-                activeColor="#a85cfa"
-              ></up-line-progress>
+              <up-line-progress :percentage="bannerPercentage" activeColor="#a85cfa"></up-line-progress>
               <view class="banner_loading_msg">
                 更新中{{ bannerPercentage }}%
               </view>
@@ -330,11 +207,7 @@
         </view>
       </view>
     </up-overlay>
-    <HomePopup
-      :show="homeShow"
-      :dataObj="curData"
-      @jumpShop="onJumpShop"
-    ></HomePopup>
+    <HomePopup :show="homeShow" :dataObj="curData" @jumpShop="onJumpShop"></HomePopup>
   </view>
 </template>
 
@@ -390,22 +263,23 @@ export default {
         {
           id: 1,
           title: "超级补贴",
-          title_icon: "https://static.tbmall.xin/static/new-home/home_4.png",
+          title_icon: "https://static.tbmall.xin/static/new-home/home_9.png",
           path: "super-subsidy",
           rightText: "官方补贴 .100%正品",
           activedType: "super",
-        },
-        {
+        }, {
           id: 2,
-          title: "限时秒杀",
-          title_text: "活动预告",
-          title_icon: "https://static.tbmall.xin/static/new-home/home_3.png",
+          title: "活动预告",
+          title_text: "限时秒杀",
+          title_icon: "https://static.tbmall.xin/static/new-home/home_10.png",
           path: "limited-time",
           rightText: "专属补贴 . 低价秒杀",
           activedType: "seckill",
         },
       ], // 首页活动列表
       activedTabId: "seckill", // 当前选中的活动类型
+      attributes: {},
+      seckillActivedType: 'seckill'
     };
   },
   onShow() {
@@ -446,17 +320,21 @@ export default {
     // 不需要启动页，才渲染首页
     this.pageReady = true;
   },
-  mounted() {},
+  mounted() { },
   methods: {
     // 切换活动类型
     jumpTab(item, type) {
+      if (this.activedTabId === type) return;
       this.activedTabId = type;
+      // this.attributes = { activeSeckillType: type }
+      this.seckillActivedType = type;
       this.onGetSeckillCurrent();
     },
     // 获取秒杀
     onGetSeckillCurrent() {
       const url =
         this.activedTabId === "seckill" ? getSeckillCurrent : getSeckillPreview;
+      console.log('获取秒杀----', this.activedTabId)
       url().then((res) => {
         console.log("获取秒杀", res);
         if (res.bizcode === 100) {
@@ -480,11 +358,11 @@ export default {
         }
       });
     },
-	jumpSearch() {
-		uni.navigateTo({
-			url: "/pages/rwa_package/dongjian/search",
-		});
-	},
+    jumpSearch() {
+      uni.navigateTo({
+        url: "/pages/rwa_package/dongjian/search",
+      });
+    },
     // 商品列表
     onGetSuperGoodsList() {
       searchList({
@@ -691,7 +569,7 @@ export default {
                 prg = parseInt(
                   (parseFloat(task.downloadedSize) /
                     parseFloat(task.totalSize)) *
-                    100,
+                  100,
                 );
                 self.bannerPercentage = prg;
                 break;
@@ -798,8 +676,8 @@ export default {
 
 .home_header_warp {
   background: linear-gradient(270deg, #af39c4 0%, #7732ff 100%);
-  height: 900rpx;
-  padding: 160rpx 30rpx 0rpx;
+  height: auto;
+  padding: calc(var(--status-bar-height) + 80rpx) 30rpx 30rpx;
 }
 
 .home_content_z_warp {
@@ -817,8 +695,12 @@ export default {
     right: 0;
     z-index: 999;
     background: linear-gradient(270deg, #af39c4 0%, #7732ff 100%);
-    padding: 60rpx 30rpx 20rpx;
+    padding: calc(var(--status-bar-height) + 20rpx) 30rpx 20rpx;
+    /* 解决部分机型下 fixed 定位底部出现 1px 渲染缝隙（白线）的问题 */
+    border-bottom: 1px solid transparent;
+    border-image: linear-gradient(270deg, #af39c4 0%, #7732ff 100%) 1;
   }
+
   .header_right_warp {
     display: flex;
     align-items: center;
@@ -855,6 +737,7 @@ export default {
   justify-content: space-between;
   // padding: 0 30rpx;
   color: #ffffff;
+  margin-top: 50rpx;
 
   .logo_banner_title {
     font-weight: bold;
@@ -1163,13 +1046,13 @@ export default {
     display: flex;
     gap: 10rpx;
     justify-content: space-between;
-    padding: 30rpx 30rpx 0;
+    padding: 30rpx 30rpx 15rpx;
     background-color: #fff;
 
     .min_card_item {
       padding: 10rpx 12rpx;
       flex: 1;
-      height: 108rpx;
+      // height: 108rpx;
       border-radius: 30rpx;
       opacity: 0.8;
       border-radius: 16rpx;
@@ -1209,7 +1092,8 @@ export default {
     .home_actived_item_warp {
       padding: 0 30rpx 30rpx;
       background-color: #fff;
-      margin-bottom: 30rpx;
+      margin-bottom: 20rpx;
+
       &:last-child {
         margin-bottom: 0;
       }
@@ -1223,11 +1107,12 @@ export default {
       .product_comm_tip_left {
         display: flex;
         align-items: center;
-        font-size: 32rpx;
+        font-size: 36rpx;
 
         .uni-image {
-          width: 50rpx;
-          height: 100%;
+          width: 40rpx;
+          height: 40rpx;
+          margin-right: 10rpx;
         }
 
         .tip_title {
@@ -1246,11 +1131,12 @@ export default {
         font-size: 24rpx;
         color: #666666;
 
-        ::v-deep(.u-image) {
-          display: flex !important;
-          align-items: center !important;
-          margin-left: 10rpx;
+        .uni-image {
+          width: 30rpx;
+          height: 30rpx;
+          vertical-align: middle;
         }
+
       }
     }
   }
@@ -1259,8 +1145,7 @@ export default {
 .uni-banner-news {
   width: 540rpx;
   margin: 0 auto;
-  background: url(https://hashmall-prod.oss-cn-shenzhen.aliyuncs.com/common/image/%E9%9D%9E%E5%BC%BA%E5%88%B6%E5%8D%87%E7%BA%A7.png)
-    no-repeat;
+  background: url(https://hashmall-prod.oss-cn-shenzhen.aliyuncs.com/common/image/%E9%9D%9E%E5%BC%BA%E5%88%B6%E5%8D%87%E7%BA%A7.png) no-repeat;
   background-size: 100% 100%;
 
   .close_btn {
diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue
index 27e7343..21411e5 100644
--- a/pages/other_package/productInfo/productInfo.vue
+++ b/pages/other_package/productInfo/productInfo.vue
@@ -47,8 +47,9 @@
             }}</text>
             <text class="price_o">￥{{ orderInfo.adPrice }}</text>
           </view>
-          <view class="text-24" style="color: #ff5a5a; width: 120rpx; height: 38rpx" v-if="orderInfo.tag">
-            <image src="/static/shopping/tg.png" style="width: 120rpx; height: 38rpx"></image>
+          <view class="text-24" style="color: #ff5a5a; height: 38rpx; display: flex; align-items: center; gap: 5rpx" v-if="orderInfo?.goodsTagList">
+            <image v-for="val in orderInfo.goodsTagList" :src="val.icon" mode="heightFix" style="height: 38rpx">
+            </image>
           </view>
         </view>
         <view class="content_data_title">
@@ -125,7 +126,7 @@
         <text class="text-28 text-fu1">拆封后影响品质”或“影响二次销售的”不予退货。</text>
         <view class="tui-list">
           <view class="tui-box" :key="index" v-for="(item, index) in tuiList">
-            <image :src="`/static/new/tui_${index}.png`"></image>
+            <image :src="`https://static.tbmall.xin/static/new/tui_${index}.png`"></image>
             <text class="text-24 text-gray">{{ item }}</text>
           </view>
           <!-- tuiList -->
@@ -324,8 +325,9 @@
     <SharePopup ref="share" v-if="shareOpen" :show="shareShow" @close="onClose" @share="onShare" :id="id"
       :text="orderInfo.name ? orderInfo.name : ''" :price="orderInfo.minPrice ? orderInfo.minPrice : ''"
       :tu="swiperList.length && swiperList[0]"></SharePopup>
-    <EvaluateDialog ref="evaluateDialog" :show="evaluateDialogShow" @close="evaluateDialogShow = false" :evalId="id"
-      :mainGraph="orderInfo.mainGraph" :name="orderInfo.name"></EvaluateDialog>
+    <EvaluateDialog ref="evaluateDialog" v-if="evaluateDialogShow" :show="evaluateDialogShow"
+      @close="evaluateDialogShow = false" :evalId="id" :mainGraph="orderInfo.mainGraph" :name="orderInfo.name">
+    </EvaluateDialog>
     <view class="hideCanvasView">
       <canvas id="myCanvas" canvas-id="myCanvas" :style="{
         height: bgObj.height + 'px',
@@ -971,6 +973,10 @@ export default {
       if (this.isCoupon) {
         params.type = -1;
       }
+      if (this.activedType == "seckill") {
+        params["activityType"] = this.activedType; // 活动类型
+        params["activityId"] = this.activityId;// 秒杀活动ID
+      }
       const resp = await getGoodsSpecs(params);
       if (resp && resp.bizcode === 100) {
         const data = resp.data;
@@ -1145,9 +1151,10 @@ export default {
 }
 
 .product_info_warp {
-  height: 100vh;
+  min-height: 100vh;
   background-color: $app-bj;
-  overflow-y: auto;
+  padding-bottom: calc(160rpx + env(safe-area-inset-bottom) + 20rpx);
+  box-sizing: border-box;
 }
 
 .product_info_header_warp {
@@ -1359,7 +1366,7 @@ export default {
   border-radius: 24rpx;
   padding: 10rpx 10rpx 30rpx;
   margin-top: 30rpx;
-  margin-bottom: 200rpx;
+  // margin-bottom: 200rpx;
 
   .content_details_title {
     padding: 20rpx 30rpx;
@@ -1372,23 +1379,27 @@ export default {
 }
 
 .product_but_warp {
-  padding: 20rpx;
+  padding: 20rpx 20rpx calc(20rpx + env(safe-area-inset-bottom));
   position: fixed;
   bottom: 0;
-  height: 160rpx;
-  width: calc(100% - 40rpx);
+  left: 0;
+  right: 0;
+  height: calc(160rpx + env(safe-area-inset-bottom));
   background-color: #ffffff;
   display: flex;
   justify-content: space-between;
+  box-sizing: border-box;
+  z-index: 99;
 
   .product_but_left {
     display: flex;
     justify-content: space-between;
-    width: 36%;
+    // width: 225rpx;
     margin-top: 6rpx;
 
     .left_item {
-      width: 50%;
+      // width: 50%;
+      width: 78rpx;
       text-align: center;
       font-weight: 500;
       font-size: 20rpx;
@@ -1399,11 +1410,12 @@ export default {
 
 .product_but_right {
   display: flex;
-  justify-content: center;
+  justify-content: end;
+  flex: 1;
 
   .but_comm {
     text-align: center;
-    padding: 20rpx 40rpx;
+    padding: 20rpx 30rpx;
     color: #ffffff;
     height: 46rpx;
   }
@@ -1673,8 +1685,8 @@ export default {
   width: 100%;
   height: 100%;
   position: fixed;
-  top: 10000;
-  left: 10000;
+  top: 10000px;
+  left: 10000px;
   z-index: 1000000000000;
   // background-color: rgba(0,0,0,0.2);
   display: flex;
diff --git a/pages/rwa_package/dongjian/jia.vue b/pages/rwa_package/dongjian/jia.vue
index 63737d7..70bdbfb 100644
--- a/pages/rwa_package/dongjian/jia.vue
+++ b/pages/rwa_package/dongjian/jia.vue
@@ -10,17 +10,17 @@
 			<view class="box-panel" style="padding:0;margin-bottom:30rpx;">
 				<view class="box-top">
 					<view class="flex-c-lr" style="align-items: center;">
-						<text class="text-40 text-bold text-gray">{{lockedData ? lockedData.selfBuyLocked : 0}}</text>
+						<text class="text-40 text-bold text-gray">{{ lockedData ? lockedData.selfBuyLocked : 0 }}</text>
 						<text class="text-fu1 text-24 text-w-400">自购锁定量(数字积分)</text>
 					</view>
 					<view class="flex-c-lr" style="align-items: center;">
-						<text class="text-40 text-bold text-gray">{{lockedData ? lockedData.spreadLocked : 0}}</text>
+						<text class="text-40 text-bold text-gray">{{ lockedData ? lockedData.spreadLocked : 0 }}</text>
 						<text class="text-fu1 text-24 text-w-400">推广锁定量(数字积分)</text>
 					</view>
 				</view>
 				<view class="tab-view">
-					<view class="tab-list" @click="onTab(index)" v-for="(item,index) in tabList" :key="index">
-						<text class="text-32" :style="{color:index == curTab ? '#7934F6' : '#666666'}">{{item}}</text>
+					<view class="tab-list" @click="onTab(index)" v-for="(item, index) in tabList" :key="index">
+						<text class="text-32" :style="{ color: index == curTab ? '#7934F6' : '#666666' }">{{ item }}</text>
 						<view class="tab-line" v-if="index == curTab"></view>
 					</view>
 				</view>
@@ -35,28 +35,28 @@
 					<view class="box-li">
 						<view class="box-biao">
 							<view class="box-head">
-								<view class="box-head-view" v-for="(item,index) in topHead" :key="item" :style="{
-									borderRightWidth:index == 2 ? 0 : '1rpx'
+								<view class="box-head-view" v-for="(item, index) in topHead" :key="item" :style="{
+									borderRightWidth: index == 2 ? 0 : '1rpx'
 								}">
-									<text class="text-fu text-24">{{item}}</text>
+									<text class="text-fu text-24">{{ item }}</text>
 								</view>
 							</view>
 							<view class="list-all-view">
-								<view class="list-view" v-for="(item,index) in topList" :key="index">
+								<view class="list-view" v-for="(item, index) in topList" :key="index">
 									<view class="list-view-box">
-										<text class="text-fu text-24 text-bold">{{item.amount}}</text>
+										<text class="text-fu text-24 text-bold">{{ item.amount }}</text>
 									</view>
 									<view class="list-view-box">
-										<text class="text-fu text-24 text-bold">{{item.time}}</text>
+										<text class="text-fu text-24 text-bold">{{ item.time }}</text>
 									</view>
 									<view class="list-view-box" style="borderRightWidth:0">
-										<text class="text-fu text-24 text-bold">{{item.source}}</text>
+										<text class="text-fu text-24 text-bold">{{ item.source }}</text>
 									</view>
 								</view>
 							</view>
 						</view>
 					</view>
-					
+
 				</view>
 				<view class="box-list" style="margin-top:24rpx;">
 					<view class="head-box">
@@ -67,105 +67,100 @@
 					<view class="box-li">
 						<view class="box-biao">
 							<view class="box-head">
-								<view class="box-head-view" v-for="(item,index) in bottomHead" :key="item" :style="{
-									borderRightWidth:index == 1 ? 0 : '1rpx'
+								<view class="box-head-view" v-for="(item, index) in bottomHead" :key="item" :style="{
+									borderRightWidth: index == 1 ? 0 : '1rpx'
 								}">
-									<text class="text-fu text-24">{{item}}</text>
+									<text class="text-fu text-24">{{ item }}</text>
 								</view>
 							</view>
 							<view class="list-all-view">
-								<view class="list-view" v-for="(item,index) in bottomList" :key="index">
+								<view class="list-view" v-for="(item, index) in bottomList" :key="index">
 									<view class="list-view-box">
-										<text class="text-fu text-24 text-bold">{{item.amount}}</text>
+										<text class="text-fu text-24 text-bold">{{ item.amount }}</text>
 									</view>
 									<view class="list-view-box" style="borderRightWidth:0">
-										<text class="text-fu text-24 text-bold">{{item.time}}</text>
+										<text class="text-fu text-24 text-bold">{{ item.time }}</text>
 									</view>
 								</view>
 							</view>
-							
+
 						</view>
-						
+
 					</view>
-					
+
 				</view>
 			</view>
-			<view class="box-panel mt-32 mb-32"  v-if="curTab == 0">
+			<view class="box-panel mt-32 mb-32" v-if="curTab == 0">
 				<text class="text-gray text-28 text-bold" style="font-weight: bold;">数字积分获取说明</text>
-				<text class="text-fu text-24" style="margin-top:24rpx">1.商城优选区消费1:1获得贡献值，每消费1元获得1贡献值，次日根据当日商城营收占比获得数字积分。</text>
+				<text class="text-fu text-24"
+					style="margin-top:24rpx">1.商城优选区消费1:1获得贡献值，每消费1元获得1贡献值，次日根据当日商城营收占比获得数字积分。</text>
 				<text class="text-fu text-24 " style="margin-top:24rpx">2.直推用户消费10:1获得贡献值，直推用户优选区每消费10元您将获得1积分。</text>
 				<text class="text-fu text-24 " style="margin-top:24rpx">3.积分获得后均为锁定状态。</text>
 				<text class="text-gray text-28 text-bold" style="margin-top:48rpx">数字积分解锁说明</text>
 				<text class="text-fu text-24 " style="margin-top:24rpx">1.您本人在商城消费获得的积分，每日按1‰自然解锁。</text>
 				<text class="text-fu text-24 " style="margin-top:24rpx">2.直推用户消费获得的贡献值5：1解锁您本人消费获得的数字积分。</text>
-				<text class="text-fu text-24 " style="margin-top:24rpx">3.直推获得的奖励，根据您在商城的消费获得的贡献值2:1进行解锁，每获得2贡献值解锁1积分。</text>
-				<text class="text-fu text-24 " style="margin-top:24rpx">4.直推获得的奖励有效期7日，7日未解锁的部分将自动归属于上级，上级获得该奖励后也为锁定状态有效期7日，7日未解锁的部分将自动销毁</text>
-				<text class="text-fu text-24 " style="margin-top:24rpx">5.若发生退货退款等因素，信任桥将回收各部分奖励，若数字积分已兑换，则不符合7天无理由退货。</text>
+				<text class="text-fu text-24 "
+					style="margin-top:24rpx">3.直推获得的奖励，根据您在商城的消费获得的贡献值2:1进行解锁，每获得2贡献值解锁1积分。</text>
+				<text class="text-fu text-24 "
+					style="margin-top:24rpx">4.直推获得的奖励有效期7日，7日未解锁的部分将自动归属于上级，上级获得该奖励后也为锁定状态有效期7日，7日未解锁的部分将自动销毁</text>
+				<text class="text-fu text-24 "
+					style="margin-top:24rpx">5.若发生退货退款等因素，信任桥将回收各部分奖励，若数字积分已兑换，则不符合7天无理由退货。</text>
 				<text class="text-fu text-24 " style="margin-top:24rpx">6.最终解释权归信任桥所有。</text>
 			</view>
 			<!-- (2)转盘抽奖获得 -->
 			<view class="tab-two-panel" v-if="curTab == 1">
-				<mescroll-uni
-				  ref="mescrollRef"
-				  @down="downCallback"
-				  @up="upCallback"
-				  :up="upOption"
-				  :down="downOption"
-				  @init="mescrollInit"
-				  :fixed="false"
-				>
-				  <view class="mescrollUniView">
-				    <view class="dai-list-view" v-for="(item,index) in daiList" :key="index">
-						<view class="dai-top">
-							<view class="time-view">
-								<text class="text-zu text-24" style="margin-right:12rpx">距销毁</text>
-								<u-count-down
-									:time="item.time"
-									format="HH:mm:ss"
-									autoStart
-									millisecond
-									@finish="onFinish"
-									:ref="'time' + item.refId"
-									@change="onChange($event,index)"
-								>
-									<view class="time-panel">
-										<view class="time__custom">
-											<text class="text-24" style="color:#FE2E2E">{{ item.timeData.days>10?item.timeData.days:'0'+item.timeData.days}}</text>
+				<mescroll-uni ref="mescrollRef" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption"
+					@init="mescrollInit" :fixed="false">
+					<view class="mescrollUniView">
+						<view class="dai-list-view" v-for="(item, index) in daiList" :key="index">
+							<view class="dai-top">
+								<view class="time-view">
+									<text class="text-zu text-24" style="margin-right:12rpx">距销毁</text>
+									<u-count-down :time="item.time" format="HH:mm:ss" autoStart millisecond
+										@finish="onFinish" :ref="'time' + item.refId" @change="onChange($event, index)">
+										<view class="time-panel">
+											<view class="time__custom">
+												<text class="text-24" style="color:#FE2E2E">{{
+													item.timeData.days > 10 ? item.timeData.days : '0' + item.timeData.days}}</text>
+											</view>
+											<text class="text-zu text-24" style="margin:0 10rpx">天</text>
+											<view class="time__custom">
+												<text class="text-24" style="color:#FE2E2E">{{
+													item.timeData.hours > 10 ? item.timeData.hours : '0' + item.timeData.hours}}</text>
+											</view>
+											<text class="text-24" style="margin:0 10rpx">:</text>
+											<view class="time__custom">
+												<text class="text-24" style="color:#FE2E2E">{{ item.timeData.minutes
+													}}</text>
+											</view>
+											<text class="text-24" style="margin:0 10rpx">:</text>
+											<view class="time__custom">
+												<text class="text-24" style="color:#FE2E2E">{{ item.timeData.seconds
+													}}</text>
+											</view>
 										</view>
-										<text class="text-zu text-24" style="margin:0 10rpx">天</text>
-										<view class="time__custom">
-											<text class="text-24" style="color:#FE2E2E">{{ item.timeData.hours>10?item.timeData.hours:'0'+item.timeData.hours}}</text>
-										</view>
-										<text class="text-24" style="margin:0 10rpx">:</text>
-										<view class="time__custom">
-											<text class="text-24" style="color:#FE2E2E">{{ item.timeData.minutes }}</text>
-										</view>
-										<text class="text-24" style="margin:0 10rpx">:</text>
-										<view class="time__custom">
-											<text class="text-24" style="color:#FE2E2E">{{ item.timeData.seconds }}</text>
-										</view>
-									</view>
-								</u-count-down>
+									</u-count-down>
+								</view>
+
+							</view>
+							<view class="dai-mid" style="margin-top:40rpx;">
+								<text class="text-32 text-fu1">下级:</text>
+								<text class="text-32 text-gray">{{ item.lowerLevelPhone }}</text>
+							</view>
+							<view class="dai-mid" style="margin-top:32rpx;">
+								<text class="text-32 text-fu1">积分奖励总量:</text>
+								<text class="text-32 text-gray">{{ item.expendAmount }}</text>
+							</view>
+							<view class="dai-progress" style="margin-top:40rpx;">
+								<u-line-progress :percentage="item.unlockRatio" activeColor="#7934F6" height="16rpx"
+									:showText="true"></u-line-progress>
+							</view>
+							<view class="dai-bottom">
+								<text class="text-24 text-fu1">0</text>
+								<text class="text-24 text-fu1">{{ item.Tbclockacmont }}</text>
 							</view>
-						 
-						</view>
-						<view class="dai-mid" style="margin-top:40rpx;">
-							<text class="text-32 text-fu1">下级:</text>
-							<text class="text-32 text-gray">{{item.lowerLevelPhone}}</text>
-						</view>
-						<view class="dai-mid" style="margin-top:32rpx;">
-							<text class="text-32 text-fu1">积分奖励总量:</text>
-							<text class="text-32 text-gray">{{item.expendAmount}}</text>
-						</view>
-						<view class="dai-progress" style="margin-top:40rpx;">
-							<u-line-progress :percentage="item.unlockRatio" activeColor="#7934F6" height="16rpx" :showText="true" ></u-line-progress>
-						</view>
-						<view class="dai-bottom">
-							<text class="text-24 text-fu1">0</text>
-							<text class="text-24 text-fu1">{{item.Tbclockacmont}}</text>
 						</view>
 					</view>
-				  </view>
 				</mescroll-uni>
 			</view>
 		</view>
@@ -176,7 +171,7 @@
 
 <script>
 import { getUserInfo } from '@/api/auth.js';
-import { getVcoinLocked,getVcoinReleaseLog,getUserExpendTbcList } from '@/api/finance.js';
+import { getVcoinLocked, getVcoinReleaseLog, getUserExpendTbcList } from '@/api/finance.js';
 import Header from '@/components/common/header.vue';
 import TopSafe from '@/components/common/top-safe.nvue'
 import DownPopup from '@/components/common/down-popup.vue';
@@ -190,33 +185,33 @@ import MescrollUni from "@/components/mescroll-uni/mescroll-uni.vue";
 
 export default {
 	mixins: [MescrollMixin],
-	components: { Header, TopSafe, DownPopup,MescrollUni },
+	components: { Header, TopSafe, DownPopup, MescrollUni },
 	data() {
 		return {
-			lockedData:null,
-			topHead:['解锁数量','解锁时间','触发解锁订单'],
-			bottomHead:['解锁数量','解锁时间'],
-			topList:[],
-			bottomList:[],
-			tabList:['已解锁','待解锁'],
-			curTab:0,
-			daiList:[],
+			lockedData: null,
+			topHead: ['解锁数量', '解锁时间', '触发解锁订单'],
+			bottomHead: ['解锁数量', '解锁时间'],
+			topList: [],
+			bottomList: [],
+			tabList: ['已解锁', '待解锁'],
+			curTab: 0,
+			daiList: [],
 			upOption: {
-			  auto: false,
-			  page: {
-			    size: 10, // 每页数据的数量,默认10
-			  },
-			  noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
-			  empty: {
-			    tip: `空空如也`,
-			  },
-			  textColor: "#333",
-			  bgColor: "rgba(0,0,0,0)",
+				auto: false,
+				page: {
+					size: 10, // 每页数据的数量,默认10
+				},
+				noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
+				empty: {
+					tip: `空空如也`,
+				},
+				textColor: "#333",
+				bgColor: "rgba(0,0,0,0)",
 			},
 			downOption: {
-			  auto: false,
-			  textColor: "#333",
-			  bgColor: "rgba(0,0,0,0)",
+				auto: false,
+				textColor: "#333",
+				bgColor: "rgba(0,0,0,0)",
 			},
 		};
 	},
@@ -224,64 +219,64 @@ export default {
 		this.init();
 	},
 	methods: {
-		onChange(e,index){
-			this.daiList[index].timeData = e; 
-			
-			console.log('e',e)
-			
+		onChange(e, index) {
+			this.daiList[index].timeData = e;
+
+			console.log('e', e)
+
 		},
-		onFinish(){
+		onFinish() {
 			this.downCallback();
 		},
 		mescrollInit(mescroll) {
-		  this.mescroll = mescroll;
+			this.mescroll = mescroll;
 		},
 		upCallback(page) {
-		  let pageNum = page.num;
-		  let pageSize = page.size;
-		
-		  let params = {
-		    status:0,
-		    page: page.num,
-		    pageSize: page.size,
-		  };
-			 getUserExpendTbcList(params).then(res=>{
-				 let curPageLen = '';
-				 if(res.data.entitys){
-					 curPageLen = res.data.entitys.length;
-					 if (page.num === 1) this.daiList = [];
-					 this.daiList = this.daiList.concat(res.data.entitys);
-					 this.daiList.forEach(item=>{
-						 item.time = item.endDate - item.date;
-						 item.timeData = {};
-					 })
-					 console.log('daiList',this.daiList)
-				 }else{
-					 curPageLen = 0;
-				 }
-						
+			let pageNum = page.num;
+			let pageSize = page.size;
+
+			let params = {
+				status: 0,
+				page: page.num,
+				pageSize: page.size,
+			};
+			getUserExpendTbcList(params).then(res => {
+				let curPageLen = '';
+				if (res.data.entitys) {
+					curPageLen = res.data.entitys.length;
+					if (page.num === 1) this.daiList = [];
+					this.daiList = this.daiList.concat(res.data.entitys);
+					this.daiList.forEach(item => {
+						item.time = item.endDate - item.date;
+						item.timeData = {};
+					})
+					console.log('daiList', this.daiList)
+				} else {
+					curPageLen = 0;
+				}
+
 				this.mescroll.endBySize(curPageLen, res.data.totalCount);
-			 })
-		  
+			})
+
 		},
 		downCallback() {
-		  this.$nextTick(function () {
-		    this.mescroll && this.mescroll.resetUpScroll();
-		  });
+			this.$nextTick(function () {
+				this.mescroll && this.mescroll.resetUpScroll();
+			});
 		},
-		onTab(index){
-			if(this.curTab != index){
+		onTab(index) {
+			if (this.curTab != index) {
 				this.curTab = index;
-				if(this.curTab == 0){
+				if (this.curTab == 0) {
 					this.daiList = [];
-				}else{
+				} else {
 					this.downCallback();
 				}
 			}
 		},
-		onJump(item){
+		onJump(item) {
 			uni.navigateTo({
-				url:`/pages/other_package/productInfo/productInfo?id=${item.refId}`
+				url: `/pages/other_package/productInfo/productInfo?id=${item.refId}`
 			})
 		},
 		init() {
@@ -291,40 +286,40 @@ export default {
 			this.vcoinReleaseLog(2);
 			// this.getQuichens()
 		},
-		vcoinLocked(){
-			getVcoinLocked().then(res=>{
+		vcoinLocked() {
+			getVcoinLocked().then(res => {
 				if (res.bizcode == 100) {
 					this.lockedData = res.data;
 				}
-				
+
 			})
 		},
-		vcoinReleaseLog(val){
+		vcoinReleaseLog(val) {
 			let params = {
-				page:1,
-				pageSize:10000,
-				type:val
+				page: 1,
+				pageSize: 10000,
+				type: val
 			}
-			getVcoinReleaseLog(params).then(res=>{
+			getVcoinReleaseLog(params).then(res => {
 				if (res.bizcode == 100) {
-					if(val == 1){
+					if (val == 1) {
 						this.topList = res.data.entitys || [];
-					}else{
+					} else {
 						this.bottomList = res.data.entitys || [];
 					}
-					this.topList.forEach(item=>{
+					this.topList.forEach(item => {
 						item.time = func.formatDate(new Date(item.ctdate), 4);
 					})
-					this.bottomList.forEach(item=>{
+					this.bottomList.forEach(item => {
 						item.time = func.formatDate(new Date(item.ctdate), 4);
 					})
 				}
 			})
 		},
 		getQuichens() {
-			let params  ={
-				page:1,
-				pageSize:1000
+			let params = {
+				page: 1,
+				pageSize: 1000
 			}
 			quickens(params).then(res => {
 				if (res.bizcode == 100) {
@@ -381,66 +376,74 @@ export default {
 		width: 100%;
 		height: 240rpx;
 		display: flex;
-		min-height:240rpx;
-		margin-bottom:40rpx;
-	
+		min-height: 240rpx;
+		margin-bottom: 40rpx;
+
 		padding: 0 32rpx;
 		box-sizing: border-box;
 	}
-	.tab-two-panel{
-		width:100%;
-		height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
-		min-height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
+
+	.tab-two-panel {
+		width: 100%;
+		height: calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
+		min-height: calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
 		display: flex;
 		flex-direction: column;
 		padding: 0 32rpx;
 		box-sizing: border-box;
-		.mescrollUniView{
-			width:calc(100vw - 64rpx);
-			height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
-			min-height:calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
+
+		.mescrollUniView {
+			width: calc(100vw - 64rpx);
+			height: calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
+			min-height: calc(100% - 240rpx - 40rpx - 120rpx - 80rpx - 48rpx);
 			display: flex;
 			flex-direction: column;
-			.dai-list-view{
-				width:100%;
-				height:344rpx;
-				min-height:344rpx;
-				margin-bottom:24rpx;
+
+			.dai-list-view {
+				width: 100%;
+				height: 344rpx;
+				min-height: 344rpx;
+				margin-bottom: 24rpx;
 				display: flex;
 				flex-direction: column;
 				padding: 32rpx;
 				box-sizing: border-box;
 				border-radius: 16rpx;
 				border: 2rpx solid #EAEAEA;
-				.dai-bottom{
-					width:100%;
-					margin-top:12rpx;
+
+				.dai-bottom {
+					width: 100%;
+					margin-top: 12rpx;
 					display: flex;
 					flex-direction: row;
 					justify-content: space-between;
 				}
-				.dai-progress{
-					width:100%;
-					height:16rpx;
-					min-height:16rpx;
+
+				.dai-progress {
+					width: 100%;
+					height: 16rpx;
+					min-height: 16rpx;
 					display: flex;
 				}
-				.time-view{
-					width:100%;
-					height:40rpx;
-					min-height:40rpx;
+
+				.time-view {
+					width: 100%;
+					height: 40rpx;
+					min-height: 40rpx;
 					display: flex;
 					flex-direction: row;
 					align-items: center;
-					.time-panel{
-						height:40rpx;
+
+					.time-panel {
+						height: 40rpx;
 						display: flex;
-						flex:1;
+						flex: 1;
 						flex-direction: row;
 						align-items: center;
-						.time__custom{
-							width:48rpx;
-							height:40rpx;
+
+						.time__custom {
+							width: 48rpx;
+							height: 40rpx;
 							background-color: rgba(254, 46, 46, 0.10);
 							display: flex;
 							align-items: center;
@@ -449,17 +452,19 @@ export default {
 						}
 					}
 				}
-				.dai-mid{
-					width:100%;
-					height:32rpx;
+
+				.dai-mid {
+					width: 100%;
+					height: 32rpx;
 					display: flex;
 					flex-direction: row;
 					align-items: center;
 					justify-content: space-between;
 				}
-				.dai-top{
-					width:100%;
-					height:40rpx;
+
+				.dai-top {
+					width: 100%;
+					height: 40rpx;
 					display: flex;
 					flex-direction: row;
 					align-items: cneter;
@@ -467,8 +472,9 @@ export default {
 			}
 		}
 	}
+
 	.box-panel {
-		
+
 		position: relative;
 		z-index: 1;
 		display: flex;
@@ -476,9 +482,10 @@ export default {
 		width: 100%;
 		background-color: #fff;
 		box-sizing: border-box;
-		
+
 		padding: 0 32rpx;
 		box-sizing: border-box;
+
 		.box-top {
 			width: 100%;
 			height: 90rpx;
@@ -489,48 +496,52 @@ export default {
 			padding: 0 32rpx;
 			box-sizing: border-box;
 		}
-		.tab-view{
-			width:100%;
-			height:80rpx;
-			min-height:80rpx;
+
+		.tab-view {
+			width: 100%;
+			height: 80rpx;
+			min-height: 80rpx;
 			display: flex;
 			flex-direction: row;
 			justify-content: space-between;
 			align-items: center;
-			border-bottom:2rpx solid #D0D7DE;
+			border-bottom: 2rpx solid #D0D7DE;
 			box-sizing: border-box;
-			margin-top:48rpx;
-			.tab-list{
-				width:100%;
-				height:100%;
+			margin-top: 48rpx;
+
+			.tab-list {
+				width: 100%;
+				height: 100%;
 				display: flex;
 				align-items: center;
 				justify-content: center;
 				position: relative;
-				.tab-line{
-					width:48rpx;
+
+				.tab-line {
+					width: 48rpx;
 					background-color: #7934F6;
-					height:4rpx;
+					height: 4rpx;
 					position: absolute;
-					bottom:0;
+					bottom: 0;
 				}
 			}
-			
+
 		}
+
 		.box-list {
-			width:100%;
+			width: 100%;
 			display: flex;
-			padding:24rpx 0 4rpx;
+			padding: 24rpx 0 4rpx;
 			box-sizing: border-box;
-			background: rgba(121,52,246,0.08);
+			background: rgba(121, 52, 246, 0.08);
 			border-radius: 12rpx;
 			flex-direction: column;
 			align-items: center;
-			
-			.box-li{
-				width:calc(100% - 8rpx);
-				height:386rpx;
-				min-height:396rpx;
+
+			.box-li {
+				width: calc(100% - 8rpx);
+				height: 386rpx;
+				min-height: 396rpx;
 				border-radius: 12rpx;
 				background-color: #fff;
 				display: flex;
@@ -538,77 +549,83 @@ export default {
 				align-items: center;
 				padding: 16rpx 24rpx;
 				box-sizing: border-box;
-				.box-biao{
-					width:100%;
-					height:100%;
+
+				.box-biao {
+					width: 100%;
+					height: 100%;
 					display: flex;
 					flex-direction: column;
 					align-items: center;
-					border:1rpx solid #eaeaea;
+					border: 1rpx solid #eaeaea;
 					border-radius: 16rpx;
-					.list-all-view{
-						flex:1;
+
+					.list-all-view {
+						flex: 1;
 						display: flex;
 						overflow-y: auto;
-						width:100%;
+						width: 100%;
 						flex-direction: column;
-						.list-view{
-							width:100%;
-							height:64rpx;
+
+						.list-view {
+							width: 100%;
+							height: 64rpx;
 							display: flex;
 							flex-direction: row;
-							min-height:64rpx;
-							.list-view-box{
-								flex:1;
-								height:100%;
+							min-height: 64rpx;
+
+							.list-view-box {
+								flex: 1;
+								height: 100%;
 								display: flex;
 								align-items: center;
 								justify-content: center;
-								border-right:1rpx solid #EAEAEA;
+								border-right: 1rpx solid #EAEAEA;
 								box-sizing: border-box;
-								border-bottom:1rpx solid #EAEAEA;
+								border-bottom: 1rpx solid #EAEAEA;
 							}
-							
+
 						}
 					}
-					
-					.box-head{
-						width:100%;
-						height:80rpx;
-						min-height:80rpx;
+
+					.box-head {
+						width: 100%;
+						height: 80rpx;
+						min-height: 80rpx;
 						display: flex;
 						flex-direction: row;
-						.box-head-view{
-							flex:1;
-							height:100%;
+
+						.box-head-view {
+							flex: 1;
+							height: 100%;
 							display: flex;
 							align-items: center;
 							justify-content: center;
-							border-right:1rpx solid #EAEAEA;
+							border-right: 1rpx solid #EAEAEA;
 							box-sizing: border-box;
-							border-bottom:1rpx solid #EAEAEA;
+							border-bottom: 1rpx solid #EAEAEA;
 							background-color: #F8F8F8;
 						}
 					}
 				}
 			}
-			
-			.head-box{
-				
-				width:100%;
-				height:88rpx;
-				min-height:88rpx;
+
+			.head-box {
+
+				width: 100%;
+				height: 88rpx;
+				min-height: 88rpx;
 				position: relative;
 				display: flex;
 				flex-direction: column;
 				padding: 0 24rpx;
 				box-sizing: border-box;
-				.icon-img{
-					width:42rpx;
-					height:36rpx;
+
+				.icon-img {
+					width: 42rpx;
+					height: 42rpx;
 					position: absolute;
-					right:24rpx;
-					top:-8rpx;
+					right: 24rpx;
+					top: -8rpx;
 				}
 			}
 		}
diff --git a/pages/sort/sort.vue b/pages/sort/sort.vue
index 1d97c02..8eac6ba 100644
--- a/pages/sort/sort.vue
+++ b/pages/sort/sort.vue
@@ -1,16 +1,13 @@
 <template>
   <view class="sort_warp" :class="platformType ? '' : 'iosplatformType'">
+    <TopSafe></TopSafe>
     <view class="sort_header">
       <!-- 分类切换 -->
       <view class="sort_category_header">
-        <view
-          :class="
-            selCategory === 1
-              ? 'category_item category_item_sel'
-              : 'category_item'
-          "
-          @click="checkCategory(1)"
-        >
+        <view :class="selCategory === 1
+            ? 'category_item category_item_sel'
+            : 'category_item'
+          " @click="checkCategory(1)">
           <view>分类</view>
           <view v-if="selCategory === 1" class="category_item_sel_but"></view>
         </view>
@@ -21,31 +18,16 @@
       </view>
       <!-- 搜索 -->
       <view style="width: 200rpx" @click="jumpSearch" class="jump-search">
-        <up-search
-          shape="square"
-          bgColor="#EEEEEEFF"
-          color="#666666FF"
-          :showAction="false"
-          placeholder="搜索"
-        ></up-search>
+        <up-search shape="square" bgColor="#EEEEEEFF" color="#666666FF" :showAction="false"
+          placeholder="搜索"></up-search>
       </view>
     </view>
     <view class="u-menu-wrap">
       <!-- 左侧类别 -->
-      <scroll-view
-        scroll-y
-        scroll-with-animation
-        class="u-tab-view menu-scroll-view"
-        :scroll-top="scrollTop"
-      >
-        <view
-          v-for="(item, index) in tabbarList"
-          :key="index"
-          class="u-tab-item"
-          :class="[current == index ? 'u-tab-item-active' : '']"
-          :data-current="index"
-          @tap.stop="swichMenu(item, index)"
-        >
+      <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop">
+        <view v-for="(item, index) in tabbarList" :key="index" class="u-tab-item"
+          :class="[current == index ? 'u-tab-item-active' : '']" :data-current="index"
+          @tap.stop="swichMenu(item, index)">
           <text class="u-line-1">{{ item.name }}</text>
         </view>
       </scroll-view>
@@ -58,42 +40,20 @@
         <view class="page-view">
           <!-- 这里还有一层循环 -->
           <up-loading-page :loading="tabbarContentLoading"></up-loading-page>
-          <view
-            class="class-item"
-            v-for="(item, index) in tabbarContentList"
-            :key="index"
-          >
+          <view class="class-item" v-for="(item, index) in tabbarContentList" :key="index">
             <view class="item-title">
               <text>{{ item.name }}</text>
             </view>
-            <view
-              class="item-container"
-              v-if="item.foods && item.foods.length !== 0"
-            >
-              <view
-                class="thumb-box"
-                v-for="(item1, index1) in item.foods"
-                :key="index1"
-                @click="jumpInfo(item1)"
-              >
-                <image
-                  class="item-menu-image"
-                  :src="item1.icon ? item1.icon : '/static/common/def_img.jpg'"
-                  mode=""
-                >
+            <view class="item-container" v-if="item.foods && item.foods.length !== 0">
+              <view class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1" @click="jumpInfo(item1)">
+                <image class="item-menu-image" :src="item1.icon ? item1.icon : '/static/common/def_img.jpg'" mode="">
                 </image>
                 <view class="item-menu-name">{{ item1.name }}</view>
               </view>
             </view>
             <view v-else class="not_order_warp">
-              <view class="not_order_warp_img"
-                ><up-image
-                  src="https://static.tbmall.xin/static/not_shopping.png"
-                  width="100"
-                  height="100"
-                  bgColor="#f1f6ff00"
-                ></up-image
-              ></view>
+              <view class="not_order_warp_img"><up-image src="https://static.tbmall.xin/static/not_shopping.png"
+                  width="100" height="100" bgColor="#f1f6ff00"></up-image></view>
               <view class="not_order_msg_warp">暂无分类，快去添加吧~</view>
             </view>
           </view>
@@ -110,9 +70,10 @@
 import { getCascadeCategory, getCarouselImage } from "@/api/common.js";
 import CustomTabBar from "@/components/custom-tab-bar.vue";
 import { APP_PAGE_TYPE } from "@/utils/enumUtils.js";
+import TopSafe from '@/components/common/top-safe.nvue';
 
 export default {
-  components: { CustomTabBar },
+  components: { CustomTabBar, TopSafe },
   data() {
     return {
       selCategory: 1,
@@ -193,11 +154,11 @@ export default {
     },
     // 查询分类
     async getSort(pId) {
-   
+
       const params = {
         parentId: pId,
       };
-      console.log('查询分类', params,pId);
+      console.log('查询分类', params, pId);
       const resp = await getCascadeCategory(params);
       if (resp && resp.bizcode === 100) {
         return resp.data;
@@ -209,7 +170,7 @@ export default {
     },
     // 点击左边的栏目切换
     async swichMenu(item, index) {
-      console.log('点击左边的栏目切换',item, index, "item, index");
+      console.log('点击左边的栏目切换', item, index, "item, index");
       if (index == this.current) return;
       this.tabbarContentLoading = true;
       const firstData = await this.getSort(item.id);
@@ -257,13 +218,14 @@ export default {
 
 <style lang="scss" scoped>
 .sort_warp {
-  padding-top:env(safe-area-inset-top) ;
+  padding-top: env(safe-area-inset-top);
   height: calc(100vh - env(safe-area-inset-bottom) - 50rpx);
   display: flex;
   flex-direction: column;
   overflow-y: auto;
+
   &.iosplatformType {
-   
+
     .right-box {
       padding-bottom: 100rpx !important;
     }
@@ -281,7 +243,7 @@ export default {
     align-items: center;
   }
 
-  .jump-search{
+  .jump-search {
     display: flex;
   }
 
@@ -308,8 +270,7 @@ export default {
   }
 }
 
-.sort_content {
-}
+.sort_content {}
 
 .u-menu-wrap {
   flex: 1;
@@ -317,7 +278,7 @@ export default {
   // overflow: hidden;
   // margin-top: 20rpx;
   // height: calc(100vh - 216rpx - env(safe-area-inset-bottom));
-  padding-bottom:calc(100rpx + env(safe-area-inset-bottom));
+  padding-bottom: calc(100rpx + env(safe-area-inset-bottom));
 }
 
 .u-search-inner {
@@ -388,6 +349,7 @@ export default {
   background-color: #fff;
   padding: 16rpx;
   border-radius: 8rpx;
+
   &:last-child {
     margin-bottom: 0;
   }
diff --git a/pages/supply_chain/supply_chain.vue b/pages/supply_chain/supply_chain.vue
index 8523503..82bcebf 100644
--- a/pages/supply_chain/supply_chain.vue
+++ b/pages/supply_chain/supply_chain.vue
@@ -115,7 +115,6 @@ export default {
     if (this.tabArr.length > 0) {
       const sortParams = uni.getStorageSync('sortParams');
       if (sortParams) {
-
         const targetIndex = this.tabArr.find(item => item.name === sortParams.value)?.id;
         uni.removeStorageSync('sortParams');
         if (targetIndex) {
@@ -123,6 +122,9 @@ export default {
           this.dataList = [];
           this.downCallback();
         }
+      } else {
+
+        this.getSearchList()
       }
     }
   },
@@ -168,6 +170,7 @@ export default {
 
       searchList(params).then((res) => {
         let curPageLen = res.data.length;
+        if (page.num === 1) this.dataList = [];
         this.dataList = this.dataList.concat(res.data);
 
         this.waterfall();
@@ -175,9 +178,7 @@ export default {
       });
     },
     downCallback() {
-      this.$nextTick(function () {
-        this.mescroll && this.mescroll.resetUpScroll();
-      });
+      this.mescroll && this.mescroll.resetUpScroll();
     },
     onTab(index) {
       if (index != this.curTab) {
diff --git a/utils/config.js b/utils/config.js
index 441f66c..df11c16 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -3,11 +3,11 @@
 // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
 
 
-// export const BASE_URL = "https://api.tbmall.xin"; //生产
-// export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
+export const BASE_URL = "https://api.tbmall.xin"; //生产
+export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
  
-export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
-export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
+// export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
+// export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
 // https://h.o.tbmall.xin/#/