From a3e20397f9cf5280853e1306b4fb731031172074 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 18 Mar 2024 17:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/recommend/index.vue |   6 +-
 manifest.json                  |   4 +-
 pages/whole_sale/index.vue     | 769 +++++++++++++++++----------------
 3 files changed, 403 insertions(+), 376 deletions(-)

diff --git a/components/recommend/index.vue b/components/recommend/index.vue
index cb25b7a..2932d8e 100644
--- a/components/recommend/index.vue
+++ b/components/recommend/index.vue
@@ -8,7 +8,7 @@
 		<view class="nav" v-if="showTab">
 			<view class="nav-item" @click="navTo('/pages/cloud_warehouse/home/home')">
 				<view class="nav-item-up">
-					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1c050202403121539159687.png" mode=""></image>
+					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/10c5e202403181723158647.webp" mode=""></image>
 				</view>
 				<view class="nav-item-down">
 					<view class="nav-item-down-title">里海云仓</view>
@@ -17,7 +17,7 @@
 			</view>
 			<view class="nav-item" @click="navTo('/pages/cloud_warehouse/market/market')">
 				<view class="nav-item-up">
-					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/9d4d720240312153933187.png" mode=""></image>
+					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/2d5b3202403181723524392.webp" mode=""></image>
 				</view>
 				<view class="nav-item-down">
 					<view class="nav-item-down-title">供销云市场</view>
@@ -26,7 +26,7 @@
 			</view>
 			<view class="nav-item" @click="navTo('/pages/cloud_warehouse/specialty/specialty')">
 				<view class="nav-item-up">
-					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/cef80202403121539479409.png" mode=""></image>
+					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0fccd202403181724074622.webp" mode=""></image>
 				</view>
 				<view class="nav-item-down">
 					<view class="nav-item-down-title">名优特产</view>
diff --git a/manifest.json b/manifest.json
index 84e4e98..19fe2a3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "2.0.0",
-    "versionCode" : 200,
+    "versionName" : "2.0.1",
+    "versionCode" : 201,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 1b12013..b0d624a 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -1,302 +1,324 @@
 <style lang="scss" scoped>
-	page {
-		background-color: #F8F9FA;
-	}
+  page {
+    background-color: #F8F9FA;
+  }
 
-	.wholeSale {
-		.wholeSale-header {
-			margin-bottom: 20rpx;
-			background-color: #40AE36;
+  .wholeSale {
+    .wholeSale-header {
+      margin-bottom: 20rpx;
+      background-color: #40AE36;
 
-			.scrollview {
-				display: flex;
-				align-items: center;
-				height: 98rpx;
-				padding-left: 32rpx;
+      .scrollview {
+        display: flex;
+        align-items: center;
+        height: 98rpx;
+        padding-left: 32rpx;
 
-				.scrollview-item {
-					margin-right: 30rpx;
-					font-size: 28rpx;
-					color: #FFFFFF;
-				}
-
-				.scrollview-active {
-					position: relative;
-					font-weight: bold;
-					font-size: 36rpx;
-					color: #FFFFFF;
-
-					&::after {
-						content: "";
-						display: inline-block;
-						position: absolute;
-						bottom: -6rpx;
-						left: 50%;
-						transform: translateX(-50%);
-						width: 100%;
-						height: 6rpx;
-						background-color: #FFFFFF;
-					}
-				}
-			}
-		}
-
-		.wholeSale-con {
-			margin: 0 10px;
-
-			.search_content {
-				margin-bottom: 40rpx;
-				height: 70rpx;
-				padding: 2px 2px 2px 21.05rpx;
-				border-radius: 80rpx;
-				background: #EDEFF2;
-				position: relative;
-				box-sizing: border-box;
-
-				.search_content_wrap {
-					width: 100%;
-
-					.icon-sousuo {
-						font-size: 26.32rpx;
-						font-weight: bold;
-						color: #c8c7c6;
-						margin-right: 17.54rpx;
-					}
-
-					input {
-						width: 80%;
-					}
-				}
-
-				.search_btn {
-					width: 106rpx;
-					height: 60rpx;
-					line-height: 60rpx;
-					background: #40AE36;
-					border-radius: 100px;
-					font-size: 28rpx;
-					color: #fff;
-				}
-			}
-
-			.category {
-				width: 100%;
-				overflow: auto;
-				margin-bottom: 20rpx;
-			
-				.category-wrap {
-				  display: flex;
-				  padding-bottom: 20rpx;
-				
-				  .category-item {
-				    display: flex;
-				    flex-direction: column;
-				    justify-content: center;
-				    align-items: center;
-				    margin-right: 38rpx;
-				
-				    text {
-				      margin-top: 16rpx;
-				      font-size: 24rpx;
-				      color: #666666;
-				      white-space: nowrap;
-				    }
-				
-				    .category-item-text {
-				      width: 120rpx;
-				      text-align: center;
-				      overflow: hidden;
-				      white-space: nowrap;
-				      text-overflow: ellipsis;
-				    }
-				  }
-				
-				  .category-item-active {
-				    position: relative;
-				
-				    .category-item-img {
-				      border: 2px solid #40AE36;
-				      border-radius: 50%;
-				    }
-				
-				    text {
-				      background-color: #40AE36;
-				      color: #fff;
-				      padding: 2rpx 10rpx 6rpx 10rpx;
-				      border-radius: 50rpx;
-				    }
-				  }
-				}
-			}
-			.cate {
-				width: 100%;
-				overflow: auto;
-				margin-bottom: 30rpx;
-
-				.cate-wrap {
-					display: flex;
-					padding-bottom: 8rpx;
-
-					.cate-item {
-
-						text {
-							padding: 4rpx 16rpx;
-							white-space: nowrap;
-							font-size: 30rpx;
-							color: #333;
-						}
-					}
-
-					.cate-item-active {
-						text {
-							color: #40AE36;
-							font-weight: bold;
-						}
-					}
-				}
-			}
-
-			.comprehensive {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 20rpx 50rpx;
-
-				[class^=comprehensive-] {
-					display: flex;
-					align-items: center;
-
-					text {
-						margin-right: 12rpx;
-						font-size: 26rpx;
-						color: #666666;
-					}
-
-					image {
-						width: 28rpx;
-						height: 28rpx;
-					}
-
-					.loudou {
-						width: 24rpx;
-						height: 24rpx;
-					}
-				}
-        
-        
-        .comp-color{
-          
-          text {
-          	margin-right: 12rpx;
-          	font-size: 26rpx;
-          	color: #40ae36 !important;
-          }
-          
+        .scrollview-item {
+          margin-right: 30rpx;
+          font-size: 28rpx;
+          color: #FFFFFF;
         }
-			}
-		}
-	}
+
+        .scrollview-active {
+          position: relative;
+          font-weight: bold;
+          font-size: 36rpx;
+          color: #FFFFFF;
+
+          &::after {
+            content: "";
+            display: inline-block;
+            position: absolute;
+            bottom: -6rpx;
+            left: 50%;
+            transform: translateX(-50%);
+            width: 100%;
+            height: 6rpx;
+            background-color: #FFFFFF;
+          }
+        }
+      }
+    }
+
+    .wholeSale-con {
+      margin: 0 10px;
+
+      .search_content {
+        margin-bottom: 40rpx;
+        height: 70rpx;
+        padding: 2px 2px 2px 21.05rpx;
+        border-radius: 80rpx;
+        background: #EDEFF2;
+        position: relative;
+        box-sizing: border-box;
+
+        .search_content_wrap {
+          width: 100%;
+
+          .icon-sousuo {
+            font-size: 26.32rpx;
+            font-weight: bold;
+            color: #c8c7c6;
+            margin-right: 17.54rpx;
+          }
+
+          input {
+            width: 80%;
+          }
+        }
+
+        .search_btn {
+          width: 106rpx;
+          height: 60rpx;
+          line-height: 60rpx;
+          background: #40AE36;
+          border-radius: 100px;
+          font-size: 28rpx;
+          color: #fff;
+        }
+      }
+
+      .category {
+        width: 100%;
+        overflow: auto;
+        margin-bottom: 20rpx;
+
+        .category-wrap {
+          display: flex;
+          padding-bottom: 20rpx;
+
+          .category-item {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            margin-right: 38rpx;
+
+            text {
+              margin-top: 16rpx;
+              font-size: 24rpx;
+              color: #666666;
+              white-space: nowrap;
+            }
+
+            .category-item-text {
+              width: 120rpx;
+              text-align: center;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+            }
+          }
+
+          .category-item-active {
+            position: relative;
+
+            .category-item-img {
+              border: 2px solid #40AE36;
+              border-radius: 50%;
+            }
+
+            text {
+              background-color: #40AE36;
+              color: #fff;
+              padding: 2rpx 10rpx 6rpx 10rpx;
+              border-radius: 50rpx;
+            }
+          }
+        }
+      }
+
+      .cate {
+        width: 100%;
+        overflow: auto;
+        margin-bottom: 30rpx;
+
+        .cate-wrap {
+          display: flex;
+          padding-bottom: 8rpx;
+
+          .cate-item {
+
+            text {
+              padding: 4rpx 16rpx;
+              white-space: nowrap;
+              font-size: 30rpx;
+              color: #333;
+            }
+          }
+
+          .cate-item-active {
+            text {
+              color: #40AE36;
+              font-weight: bold;
+            }
+          }
+        }
+      }
+
+      .comprehensive {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20rpx 50rpx;
+
+        [class^=comprehensive-] {
+          display: flex;
+          align-items: center;
+
+          text {
+            margin-right: 12rpx;
+            font-size: 26rpx;
+            color: #666666;
+          }
+
+          image {
+            width: 28rpx;
+            height: 28rpx;
+          }
+
+          .loudou {
+            width: 24rpx;
+            height: 24rpx;
+          }
+        }
+
+
+        .comp-color {
+
+          text {
+            margin-right: 12rpx;
+            font-size: 26rpx;
+            color: #40ae36 !important;
+          }
+
+        }
+      }
+    }
+  }
 </style>
 <template>
-	<view class="wholeSale">
+  <view class="wholeSale">
 
-		<!-- 顶部 -->
-		<view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
-			<!-- 适配不同机 -->
-			<view style="height: var(--status-bar-height);"></view>
+    <!-- 顶部 -->
+    <view class="wholeSale-header" style="position: fixed;top: 0;left: 0;width: 100%;z-index: 999;">
+      <!-- 适配不同机 -->
+      <view style="height: var(--status-bar-height);"></view>
 
-			<!-- 滚动tab -->
-			<scroll-view scroll-x="true" :scroll-top="100" :show-scrollbar="false" scroll-into-view="a1">
-				<view class="scrollview">
-					<block v-for="(item,indx) in tabsArr" :key="indx">
-						<view class="scrollview-item" :id="'a' + indx"
-							:class="{'scrollview-active':tabsCurr == item.val}" @click="tabsChange(item.val)">
-							{{item.name}}
-						</view>
-					</block>
-				</view>
-			</scroll-view>
-		</view>
-
-		<!-- 内容 -->
-		<view class="wholeSale-con"  style="padding-top: calc(var(--status-bar-height) + 120rpx);">
-		  <view class="wholeSale-nav">
-		    <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
-		    <!-- 搜索 -->
-		    <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)" hover-class="none"
-		    	class="search_content flex_a_c_j_sb">
-		    	<view class="flex_a_c search_content_wrap">
-		    		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
-		    		<input type="text" placeholder="搜索您需要批发进货的产品名称" :value="where.keyword" placeholder-style="font-size: 30rpx;color:#999;"
-		    			disabled style="pointer-events: none;">
-		    	</view>
-		    	<!-- <button class="search_btn">搜索</button> -->
-		    </view>
-		  </view>
-		
-			<!-- 商品大分类 -->
-			<view class="category">
-				<scroll-view scroll-x="true">
-					<view class="category-wrap">
-						<block v-for="(item,index) in store_category" :key="index">
-							<view class="category-item" :class="{'category-item-active': index==cate_change}" @click="changeCate(index)">
-								<u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx" shape="circle">
-									<template v-slot:loading>
-										<u-loading-icon color="#999" size="15" />
-									</template>
-								</u--image>
-								<text class="category-item-text">{{item.cate_name}}</text>
-							</view>
-						</block>
-					</view>
-				</scroll-view>
-			</view>
-		
-			<!-- 商品小分类 -->
-			<view class="cate" v-if="store_category_children.length>1">
-				<scroll-view scroll-x="true">
-					<view class="cate-wrap">
-						<block v-for="(item,index) in store_category_children" :key="index">
-							<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}" @click="changeChildrenCate(index)">
-								<text>{{item.cate_name}}</text>
-							</view>
-						</block>
-					</view>
-				</scroll-view>
-			</view>
-		
-			<!-- 综合查询 -->
-			<view class="comprehensive">
-				<view class="comprehensive-price" :class="{'comp-color': orderCurr==1}" @click="toOrder('price', 1)">
-					<text>价格</text>
-					<image src="@/static/new_define/priceChange.png"></image>
-				</view>
-				<view class="comprehensive-sales_num" :class="{'comp-color': orderCurr==2}" @click="toOrder('sales', 2)">
-					<text>销量</text>
-				</view>
-        <view class="comprehensive-discount" :class="{'comp-color': orderCurr==3}" v-if="tabsCurr!=1" @click="toOrder('', 3)">
-        	<text>综合</text>
+      <!-- 滚动tab -->
+      <scroll-view scroll-x="true" :scroll-top="100" :show-scrollbar="false" scroll-into-view="a1">
+        <view class="scrollview">
+          <block v-for="(item,indx) in tabsArr" :key="indx">
+            <view class="scrollview-item" :id="'a' + indx" :class="{'scrollview-active':tabsCurr == item.val}"
+              @click="tabsChange(item.val)">
+              {{item.name}}
+            </view>
+          </block>
         </view>
-				<view class="comprehensive-discount" v-else >
-					<text>抵扣</text>
-					<image class="loudou" src="@/static/new_define/loudou.png"></image>
-				</view>
-			</view>
-		
-			<!-- 流水瀑布 -->
-			<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" :sale_type="2"/>
-		  <loadmore :type="isLoading" style="padding: 40rpx 0 150rpx; 0"></loadmore>
-		</view>
-    
+      </scroll-view>
+    </view>
+
+    <!-- 内容 -->
+    <view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 120rpx);">
+      <view class="wholeSale-nav">
+        <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
+        <!-- 搜索 -->
+        <view @click="navTo(`/pages/columnGoods/goods_search/index?back=true&searchVal=${where.keyword}`)"
+          hover-class="none" class="search_content flex_a_c_j_sb">
+          <view class="flex_a_c search_content_wrap">
+            <view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+            <input type="text" placeholder="搜索您需要批发进货的产品名称" :value="where.keyword"
+              placeholder-style="font-size: 30rpx;color:#999;" disabled style="pointer-events: none;">
+          </view>
+          <!-- <button class="search_btn">搜索</button> -->
+        </view>
+      </view>
+
+      <!-- 商品大分类 -->
+      <view class="category">
+        <scroll-view scroll-x="true">
+          <view class="category-wrap">
+            <block v-for="(item,index) in store_category" :key="index">
+              <view class="category-item" :class="{'category-item-active': index==cate_change}"
+                @click="changeCate(index)">
+                <u--image class="category-item-img" width="108rpx" :src="item.pic" height="108rpx" shape="circle">
+                  <template v-slot:loading>
+                    <u-loading-icon color="#999" size="15" />
+                  </template>
+                </u--image>
+                <text class="category-item-text">{{item.cate_name}}</text>
+              </view>
+            </block>
+          </view>
+        </scroll-view>
+      </view>
+
+      <!-- 商品小分类 -->
+      <view class="cate" v-if="store_category_children.length>1">
+        <scroll-view scroll-x="true">
+          <view class="cate-wrap">
+            <block v-for="(item,index) in store_category_children" :key="index">
+              <view class="cate-item" :class="{'cate-item-active':index == cate_change_children}"
+                @click="changeChildrenCate(index)">
+                <text>{{item.cate_name}}</text>
+              </view>
+            </block>
+          </view>
+        </scroll-view>
+      </view>
+
+      <!-- 综合查询 -->
+      <view class="comprehensive">
+        <view class="comprehensive-price" :class="{'comp-color': orderCurr==1}" @click="toOrder('price', 1)">
+          <text>价格</text>
+          <image src="@/static/new_define/priceChange.png"></image>
+        </view>
+        <view class="comprehensive-sales_num" :class="{'comp-color': orderCurr==2}" @click="toOrder('sales', 2)">
+          <text>销量</text>
+        </view>
+        <view class="comprehensive-discount" :class="{'comp-color': orderCurr==3}" v-if="tabsCurr!=1"
+          @click="toOrder('', 3)">
+          <text>综合</text>
+        </view>
+        <view class="comprehensive-discount" v-else @click="deduction_rate=!deduction_rate;">
+          <text>抵扣</text>
+          <image class="loudou" src="@/static/new_define/loudou.png"></image>
+        </view>
+      </view>
+      <!-- 综合查询 -->
+      <view class="comprehensive" v-if="deduction_rate">
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate==''}" @click="changeDeduction('')">
+          <text>全部</text>
+        </view>
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='10'}" @click="changeDeduction('10')">
+          <text>1:9</text>
+        </view>
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='15'}" @click="changeDeduction('15')">
+          <text>2:8</text>
+        </view>
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='20'}" @click="changeDeduction('20')">
+          <text>3:7</text>
+        </view>
+        <view class="comprehensive-sales_num" :class="{'comp-color': where.deduction_rate=='25'}" @click="changeDeduction('25')">
+          <text>4:6</text>
+        </view>
+      </view>
+
+      <!-- 流水瀑布 -->
+      <WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" :sale_type="2" />
+      <loadmore :type="isLoading" style="padding: 40rpx 0 150rpx; 0"></loadmore>
+    </view>
+
     <!--自定义底部tab栏-->
     <customTab :newData="newData" :activeRouter="activeRouter"></customTab>
-	</view>
+  </view>
 </template>
 
 <script>
-	import {
-		goShopDetail
-	} from '@/libs/order.js'
+  import {
+    goShopDetail
+  } from '@/libs/order.js'
   import {
     getStoreCategory,
     getProductslist,
@@ -304,28 +326,28 @@
   } from "@/api/store.js"
   import customTab from '@/components/customTab';
   import {
-  	getVersion,
-  	getNavigation
+    getVersion,
+    getNavigation
   } from "@/api/public";
-	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
-	export default {
-		components: {
-			WaterfallsFlow,
+  import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
+  export default {
+    components: {
+      WaterfallsFlow,
       customTab
-		},
-		data() {
-			return {
-				tabsArr: [{
-					name: '里海云仓批发',
-					val: 1
-				}, {
-					name: '供销云市场批发',
-					val: 2
-				}, {
-					name: '名优特产批发',
-					val: 3
-				}],
-				tabsCurr: 1,
+    },
+    data() {
+      return {
+        tabsArr: [{
+          name: '里海云仓批发',
+          val: 1
+        }, {
+          name: '供销云市场批发',
+          val: 2
+        }, {
+          name: '名优特产批发',
+          val: 3
+        }],
+        tabsCurr: 1,
         orderCurr: 3, //当前选择的排序类型
         newData: {},
         activeRouter: '',
@@ -335,7 +357,8 @@
         cate_change: 0,
         cate_change_children: 0,
         isLoading: 0,
-        where:{
+        deduction_rate: false, //是否显示
+        where: {
           page: 1,
           limit: 20,
           sale_type: 2, //1为零售, 2为批发
@@ -346,8 +369,8 @@
           deduction_rate: '', //抵扣比例
           order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc
         }
-			}
-		},
+      }
+    },
     onLoad() {
       this.getNav();
       this.getStoreCategory();
@@ -359,40 +382,44 @@
     onReachBottom() {
       this.getProductslist();
     },
-		methods: {
-      toOrder(type, index = -1){
-        this.orderCurr = index;
-        if(type=='price'){
-          if(this.where.order=='price_asc') this.where.order = 'price_desc';
-          else this.where.order = 'price_asc';
-        }else this.where.order = type;
+    methods: {
+      changeDeduction(e){
+        this.where.deduction_rate = e;
         this.getProductslist(true);
       },
-      navTo(url){
+      toOrder(type, index = -1) {
+        this.orderCurr = index;
+        if (type == 'price') {
+          if (this.where.order == 'price_asc') this.where.order = 'price_desc';
+          else this.where.order = 'price_asc';
+        } else this.where.order = type;
+        this.getProductslist(true);
+      },
+      navTo(url) {
         uni.navigateTo({
-          url:url,
+          url: url,
           success: () => {
-            uni.$once('searchValue', (e)=>{
-              this.$nextTick(()=>{
+            uni.$once('searchValue', (e) => {
+              this.$nextTick(() => {
                 this.where.keyword = e;
                 this.getProductslist(true);
               })
             })
           }
-        })        
+        })
       },
       getNav() {
-      	getNavigation().then(res => {
-      		this.newData = res.data
-      		if (this.newData.status && this.newData.status.status) {
-      			uni.hideTabBar()
-      		} else {
-      			uni.showTabBar()
-      		}
-      	})
+        getNavigation().then(res => {
+          this.newData = res.data
+          if (this.newData.status && this.newData.status.status) {
+            uni.hideTabBar()
+          } else {
+            uni.showTabBar()
+          }
+        })
       },
-			tabsChange(e) {
-				this.tabsCurr = e;
+      tabsChange(e) {
+        this.tabsCurr = e;
         this.where = {
           page: 1,
           limit: this.where.limit,
@@ -405,37 +432,37 @@
         this.where.mer_type = e;
         this.getStoreCategory();
         this.getProductslist(true);
-			},
-      changeCate(e){
+      },
+      changeCate(e) {
         this.cate_change = e;
         this.store_category_children = [];
-        if(this.store_category[e].children) this.store_category_children = [...this.store_category[e].children];
+        if (this.store_category[e].children) this.store_category_children = [...this.store_category[e].children];
         this.store_category_children.unshift({
-            cate_name: '全部',
-            store_category_id: ''
-          })
+          cate_name: '全部',
+          store_category_id: ''
+        })
         this.cate_change_children = 0;
-        if(this.tabsCurr==1) this.where.mer_cate_id = this.store_category[e].store_category_id;
+        if (this.tabsCurr == 1) this.where.mer_cate_id = this.store_category[e].store_category_id;
         else this.where.cate_id = this.store_category[e].store_category_id
         this.getProductslist(true);
       },
-      changeChildrenCate(e){
+      changeChildrenCate(e) {
         this.cate_change_children = e;
         let key = 'mer_cate_id';
-        if(this.tabsCurr!=1) key = 'cate_id';
+        if (this.tabsCurr != 1) key = 'cate_id';
         this.where[key] = this.store_category_children[e].store_category_id;
-        if(e==0) this.where[key] = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id
+        if (e == 0) this.where[key] = this.store_category[this.cate_change].store_category_id; // 如若选中全部, 则取父级id
         this.getProductslist(true);
       },
-      getStoreCategory(){
-        if(this.tabsCurr==1) getStoreCategory(259).then(res=>{
+      getStoreCategory() {
+        if (this.tabsCurr == 1) getStoreCategory(259).then(res => {
           this.initStoreCate(res);
         })
-        else getCategoryIndexList().then(res=>{
-         this.initStoreCate(res);
+        else getCategoryIndexList().then(res => {
+          this.initStoreCate(res);
         })
       },
-      initStoreCate(res){
+      initStoreCate(res) {
         this.store_category = [{
           cate_name: '全部',
           pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/de2be202312151001024597.png',
@@ -447,41 +474,41 @@
           store_category_id: ''
         })
       },
-      getProductslist(reLoad=false){
-        if(reLoad){
+      getProductslist(reLoad = false) {
+        if (reLoad) {
           this.where.page = 1;
           this.hostProduct = [];
           this.isLoading = 0;
         }
-        if(this.isLoading==-1)return;
+        if (this.isLoading == -1) return;
         this.isLoading = 1;
-        getProductslist(this.where).then(res=>{
+        getProductslist(this.where).then(res => {
           this.hostProduct = [...this.hostProduct, ...res.data.list];
           this.isLoading = 0;
-          if(res.data.list.length<this.where.limit) this.isLoading = -1;
+          if (res.data.list.length < this.where.limit) this.isLoading = -1;
           this.where.page++;
         })
       },
-			goDetail(item) {
-				goShopDetail(item, this.uid, 2).then(res => {
-					if (this.isLogin) {
-						initiateAssistApi(item.activity_id).then(res => {
-							let id = res.data.product_assist_set_id;
-							uni.hideLoading();
-							uni.navigateTo({
-								url: `/pages/activity/assist_detail/index?id=${id}&sale_type=2`
-							});
-						}).catch((err) => {
-							uni.showToast({
-								title: err,
-								icon: 'none'
-							})
-						});
-					} else {
-						toLogin();
-					}
-				})
-			}
-		}
-	}
+      goDetail(item) {
+        goShopDetail(item, this.uid, 2).then(res => {
+          if (this.isLogin) {
+            initiateAssistApi(item.activity_id).then(res => {
+              let id = res.data.product_assist_set_id;
+              uni.hideLoading();
+              uni.navigateTo({
+                url: `/pages/activity/assist_detail/index?id=${id}&sale_type=2`
+              });
+            }).catch((err) => {
+              uni.showToast({
+                title: err,
+                icon: 'none'
+              })
+            });
+          } else {
+            toLogin();
+          }
+        })
+      }
+    }
+  }
 </script>
\ No newline at end of file