From 09e2f9fa93ee2468e0ec10c77bed996d22d40767 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Mon, 15 Apr 2024 17:43:06 +0800
Subject: [PATCH] 1

---
 pages/store/home/index.vue |   21 +-
 pages/whole_sale/index.vue | 1401 ++++++++++++++++++------------------
 2 files changed, 731 insertions(+), 691 deletions(-)

diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 763d619..e636089 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -96,6 +96,8 @@
 
 			<view class="tab-cont" :style="viewColor,{'height':'calc(100vh - '+listHeight+' - 84rpx)'}"
 				:class="{noPointer : preview}">
+
+
 				<view v-show="diyActive == 0 && tabActive == 1">
 					<!-- #ifdef H5 -->
 					<view v-for="(item, index) in styleConfig" :key="index">
@@ -110,11 +112,14 @@
 					<!-- #ifdef MP  || APP-PLUS-->
 					<block v-for="(item, index) in styleConfig" :key="index">
 						<view>
-							<activeParty v-if="item.name == 'activeParty'" :merId="id" :dataConfig="item"></activeParty>
-							<articleList v-if="item.name == 'articleList'" :merId="id" :dataConfig="item"></articleList>
+							<activeParty v-if="item.name == 'activeParty'" :merId="id" :dataConfig="item">
+							</activeParty>
+							<articleList v-if="item.name == 'articleList'" :merId="id" :dataConfig="item">
+							</articleList>
 							<bargain v-if="item.name == 'bargain'" :merId="id" :dataConfig="item"></bargain>
 							<blankPage v-if="item.name == 'blankPage'" :merId="id" :dataConfig="item"></blankPage>
-							<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item"></combination>
+							<combination v-if="item.name == 'combination'" :merId="id" :dataConfig="item">
+							</combination>
 							<topic v-if="item.name == 'topic'" :merId="id" :dataConfig="item"></topic>
 							<coupon v-if="item.name == 'coupon'" :merId="id" :dataConfig="item"></coupon>
 							<goodList v-if="item.name == 'goodList'" :merId="id" :dataConfig="item"
@@ -124,11 +129,13 @@
 							<liveBroadcast v-if="item.name == 'liveBroadcast'" :merId="id" :dataConfig="item">
 							</liveBroadcast>
 							<menus v-if="item.name == 'menus'" :merId="id" :dataConfig="item"></menus>
-							<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item"></presellList>
+							<presellList v-if="item.name == 'presellList'" :merId="id" :dataConfig="item">
+							</presellList>
 							<richText v-if="item.name == 'richText'" :merId="id" :dataConfig="item"></richText>
 							<seckill v-if="item.name == 'seckill'" :merId="id" :dataConfig="item"></seckill>
 							<swiperBg v-if="item.name == 'swiperBg'" :merId="id" :dataConfig="item"></swiperBg>
-							<pictureCube v-if="item.name == 'pictureCube'" :merId="id" :dataConfig="item"></pictureCube>
+							<pictureCube v-if="item.name == 'pictureCube'" :merId="id" :dataConfig="item">
+							</pictureCube>
 							<swipers v-if="item.name == 'swipers'" :merId="id" :dataConfig="item"></swipers>
 							<titles v-if="item.name == 'titles'" :merId="id" :dataConfig="item"></titles>
 						</view>
@@ -169,8 +176,8 @@
 
 									<view class="price">
 										<view class="price-num">
-											<text class="unit-price">¥{{ item.price }}</text><text
-												class="unit-name" v-if="item.unit_name&&item.unit_name!='无'">/{{ item.unit_name }}</text>
+											<text class="unit-price">¥{{ item.price }}</text><text class="unit-name"
+												v-if="item.unit_name&&item.unit_name!='无'">/{{ item.unit_name }}</text>
 										</view>
 										<view class="price-icon iconfont icon-gouwuche"></view>
 									</view>
diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue
index 52ac6cb..55f8e49 100644
--- a/pages/whole_sale/index.vue
+++ b/pages/whole_sale/index.vue
@@ -1,747 +1,780 @@
 <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-item {
+					margin-right: 30rpx;
+					font-size: 28rpx;
+					color: #FFFFFF;
+				}
 
-        .scrollview-active {
-          position: relative;
-          font-weight: bold;
-          font-size: 36rpx;
-          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;
-          }
-        }
-      }
-    }
+					&::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;
+		.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 {
+				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%;
+				.search_content_wrap {
+					width: 100%;
 
-          .icon-sousuo {
-            font-size: 26.32rpx;
-            font-weight: bold;
-            color: #c8c7c6;
-            margin-right: 17.54rpx;
-          }
+					.icon-sousuo {
+						font-size: 26.32rpx;
+						font-weight: bold;
+						color: #c8c7c6;
+						margin-right: 17.54rpx;
+					}
 
-          input {
-            width: 80%;
-          }
-        }
+					input {
+						width: 80%;
+					}
+				}
 
-        .search_btn {
-          width: 106rpx;
-          height: 60rpx;
-          line-height: 60rpx;
-          background: #40AE36;
-          border-radius: 100px;
-          font-size: 28rpx;
-          color: #fff;
-        }
-      }
+				.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 {
+				width: 100%;
+				overflow: auto;
+				margin-bottom: 20rpx;
 
-        .category-wrap {
-          display: flex;
-          padding-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;
+					.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;
-            }
+						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-text {
+							width: 120rpx;
+							text-align: center;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
 
-          .category-item-active {
-            position: relative;
+					.category-item-active {
+						position: relative;
 
-            .category-item-img {
-              border: 2px solid #40AE36;
-              border-radius: 50%;
-            }
+						.category-item-img {
+							border: 2px solid #40AE36;
+							border-radius: 50%;
+						}
 
-            text {
-              background-color: #40AE36;
-              color: #fff;
-              padding: 2rpx 10rpx 6rpx 10rpx;
-              border-radius: 50rpx;
-            }
-          }
-        }
-      }
+						text {
+							background-color: #40AE36;
+							color: #fff;
+							padding: 2rpx 10rpx 6rpx 10rpx;
+							border-radius: 50rpx;
+						}
+					}
+				}
+			}
 
-      .cate {
-        width: 100%;
-        overflow: auto;
-        margin-bottom: 30rpx;
+			.cate {
+				width: 100%;
+				overflow: auto;
+				margin-bottom: 30rpx;
 
-        .cate-wrap {
-          display: flex;
-          padding-bottom: 8rpx;
+				.cate-wrap {
+					display: flex;
+					padding-bottom: 8rpx;
 
-          .cate-item {
+					.cate-item {
 
-            text {
-              padding: 4rpx 16rpx;
-              white-space: nowrap;
-              font-size: 30rpx;
-              color: #333;
-            }
-          }
+						text {
+							padding: 4rpx 16rpx;
+							white-space: nowrap;
+							font-size: 30rpx;
+							color: #333;
+						}
+					}
 
-          .cate-item-active {
-            text {
-              color: #40AE36;
-              font-weight: bold;
-            }
-          }
-        }
-      }
+					.cate-item-active {
+						text {
+							color: #40AE36;
+							font-weight: bold;
+						}
+					}
+				}
+			}
 
-      .comprehensive {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding: 20rpx 50rpx;
+			.comprehensive {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 20rpx 50rpx;
 
-        [class^=comprehensive-] {
-          display: flex;
-          align-items: center;
+				[class^=comprehensive-] {
+					display: flex;
+					align-items: center;
 
-          text {
-            margin-right: 12rpx;
-            font-size: 26rpx;
-            color: #666666;
-          }
+					text {
+						margin-right: 12rpx;
+						font-size: 26rpx;
+						color: #666666;
+					}
 
-          image {
-            width: 28rpx;
-            height: 28rpx;
-          }
+					image {
+						width: 28rpx;
+						height: 28rpx;
+					}
 
-          .loudou {
-            width: 24rpx;
-            height: 24rpx;
-          }
-        }
+					.loudou {
+						width: 24rpx;
+						height: 24rpx;
+					}
+				}
 
 
-        .comp-color {
+				.comp-color {
 
-          text {
-            margin-right: 12rpx;
-            font-size: 26rpx;
-            color: #40ae36 !important;
-          }
+					text {
+						margin-right: 12rpx;
+						font-size: 26rpx;
+						color: #40ae36 !important;
+					}
 
-        }
-      }
-    }
-  }
+				}
+			}
+		}
+	}
 
-  .pictrue {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    color: #999;
+	.pictrue {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		color: #999;
 
-    image {
-      width: 414rpx;
-      height: 305rpx;
-    }
-  }
+		image {
+			width: 414rpx;
+			height: 305rpx;
+		}
+	}
 
-  .goods_list {
-    .goods {
-      // width: 690rpx;
-      height: 200rpx;
-      margin: 20rpx auto;
-      margin-top: 0;
-      background-color: #fff;
-      border-radius: 24rpx;
-      display: flex;
+	.goods_list {
+		.goods {
+			// width: 690rpx;
+			height: 200rpx;
+			margin: 20rpx auto;
+			margin-top: 0;
+			background-color: #fff;
+			border-radius: 24rpx;
+			display: flex;
 
-      .avatar {
-        height: 160rpx;
-        width: 160rpx;
-        margin: 20rpx;
-        border-radius: 12rpx;
-        overflow: hidden;
-        position: relative;
-      }
+			.avatar {
+				height: 160rpx;
+				width: 160rpx;
+				margin: 20rpx;
+				border-radius: 12rpx;
+				overflow: hidden;
+				position: relative;
+			}
 
-      .content {
-        margin: 20rpx 0;
-        width: 470rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
+			.content {
+				margin: 20rpx 0;
+				width: 470rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
 
-        .content-head {
-          width: 470rpx;
-          display: flex;
-          justify-content: space-between;
-          align-items: flex-end;
-          font-size: 28rpx;
-          color: #333;
+				.content-head {
+					width: 470rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: flex-end;
+					font-size: 28rpx;
+					color: #333;
 
-          .title {
-            width: 360rpx;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-          }
-        }
+					.title {
+						width: 360rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
 
-        .content-two {
-          display: flex;
-          font-size: 24rpx;
-          color: #666;
-        }
-      }
-    }
-  }
+				.content-two {
+					display: flex;
+					font-size: 24rpx;
+					color: #666;
+					align-items: center;
+
+					.star {
+						position: relative;
+						width: 111rpx;
+						height: 19rpx;
+						margin-right: 10rpx;
+						background: url(../columnGoods/images/star.png) left top/100% 100% no-repeat;
+						overflow: hidden;
+
+						view {
+							position: absolute;
+							top: 0;
+							left: 0;
+							width: 100%;
+							height: 100%;
+							background: url(../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat;
+
+							&.star_purple {
+								background: url(../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 </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>
+			<!-- 滚动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);">
-      <u-subsection v-if="tabsCurr==2" :list="subList" @change="changeSub" :current="subCurr" mode="subsection"
-        activeColor="#40ae36" fontSize="14" style="margin-bottom: 24rpx;"></u-subsection>
+		<!-- 内容 -->
+		<view class="wholeSale-con" style="padding-top: calc(var(--status-bar-height) + 120rpx);">
+			<u-subsection v-if="tabsCurr==2" :list="subList" @change="changeSub" :current="subCurr" mode="subsection"
+				activeColor="#40ae36" fontSize="14" style="margin-bottom: 24rpx;"></u-subsection>
 
-      <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}&shop=${subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? false : true}`)"
-          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="subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? '搜索您需要批发进货的产品名称': '搜索店铺名称'"
-              :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="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}&shop=${subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? false : true}`)"
+					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="subCurr!=1 || (subCurr==1 && tabsCurr!=2) ? '搜索您需要批发进货的产品名称': '搜索店铺名称'"
+							: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)">
-                <block v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
-                  <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>
-                </block>
-                <block v-else>
-                  <u--image class="category-item-img" width="108rpx" :src="item.background" height="108rpx"
-                    shape="circle">
-                    <template v-slot:loading>
-                      <u-loading-icon color="#999" size="15" />
-                    </template>
-                  </u--image>
-                  <text class="category-item-text">{{item.category_name}}</text>
-                </block>
-              </view>
-            </block>
-          </view>
-        </scroll-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)">
+								<block v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
+									<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>
+								</block>
+								<block v-else>
+									<u--image class="category-item-img" width="108rpx" :src="item.background"
+										height="108rpx" shape="circle">
+										<template v-slot:loading>
+											<u-loading-icon color="#999" size="15" />
+										</template>
+									</u--image>
+									<text class="category-item-text">{{item.category_name}}</text>
+								</block>
+							</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="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" v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
-        <view class="comprehensive-price" :class="{'comp-color': orderCurr==1}" @click="toOrder('price', 1)">
-          <text>价格</text>
-          <image v-if="orderCurr==1" style="width: 15rpx;height: 21rpx;"
-            :src="where.order == 'price_asc' ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
-          </image>
-          <view v-else style="width: 15rpx;height: 21rpx;"></view>
-        </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 && tabsCurr==1">
-        <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>
+			<!-- 综合查询 -->
+			<view class="comprehensive" v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)">
+				<view class="comprehensive-price" :class="{'comp-color': orderCurr==1}" @click="toOrder('price', 1)">
+					<text>价格</text>
+					<image v-if="orderCurr==1" style="width: 15rpx;height: 21rpx;"
+						:src="where.order == 'price_asc' ? domain+'/static/diy/up'+keyColor+'.png' : domain+'/static/diy/down'+keyColor+'.png'">
+					</image>
+					<view v-else style="width: 15rpx;height: 21rpx;"></view>
+				</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 && tabsCurr==1">
+				<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 v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)" :wfList='hostProduct' @itemTap="goDetail"
-        :type="0" :sale_type="2" />
+			<!-- 流水瀑布 -->
+			<WaterfallsFlow v-if="subCurr!=1 || (subCurr==1 && tabsCurr!=2)" :wfList='hostProduct' @itemTap="goDetail"
+				:type="0" :sale_type="2" />
 
 
-      <!-- 列表 -->
-      <view class="goods_list" v-else>
-        <view class="goods" v-for="(item, index) in shopList" :key="index" @click="goStore(item.mer_id)">
-          <view class="avatar">
-            <!-- <image style="width: 100%;height: 100%;" :src="item.mer_avatar" mode="aspectFill" lazy-load>
+			<!-- 列表 -->
+			<view class="goods_list" v-else>
+				<view class="goods" v-for="(item, index) in shopList" :key="index" @click="goStore(item.mer_id)">
+					<view class="avatar">
+						<!-- <image style="width: 100%;height: 100%;" :src="item.mer_avatar" mode="aspectFill" lazy-load>
             </image> -->
-            <u--image width="160rpx" height="160rpx" :src="item.mer_avatar" mode="aspectFill">
-              <template v-slot:loading>
-                <u-loading-icon color="#999" size="15" />
-              </template>
-            </u--image>
-          </view>
-          <view class="content">
-            <view class="content-head">
-              <view class="title">{{item.mer_name}}</view>
-              <text style="font-size: 21.03rpx;color: #aaa;" v-if="item.sales>=100">月销{{item.sales}}</text>
-            </view>
-            <view class="content-two">
-              <view class="score">
-                <view class="star">
-                  <view
-                    :style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
-                  </view>
-                </view>
-              </view>
-              <text style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text>
-              <text v-if="item.distance"
-                style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text>
-            </view>
-            <view class="content-two">
-              <u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
-                height="33.85rpx"></u--image>
-              <text> {{item.service_phone}}</text>
-              <u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true"
-                src="/static/images/GXSC/SJ.png" width="33.85rpx" height="33.85rpx"></u--image>
-              <text v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
-            </view>
-            <view class="content-two">
-              <u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
-                height="33.85rpx"></u--image>
-              <text class="address">{{item.mer_address}}</text>
-            </view>
-          </view>
-        </view>
-      </view>
+						<u--image width="160rpx" height="160rpx" :src="item.mer_avatar" mode="aspectFill">
+							<template v-slot:loading>
+								<u-loading-icon color="#999" size="15" />
+							</template>
+						</u--image>
+					</view>
+					<view class="content">
+						<view class="content-head">
+							<view class="title">{{item.mer_name}}</view>
+							<text style="font-size: 21.03rpx;color: #aaa;"
+								v-if="item.sales>=100">月销{{item.sales}}</text>
+						</view>
+						<view class="content-two">
+							<view class="score">
+								<view class="star">
+									<view
+										:style="{width: `${(item.service_score / 5 * 100).toFixed(0)}%`, backgroundImage: `url(${domain}/static/diy/score1${keyColor}.png)`}">
+									</view>
+								</view>
+							</view>
+							<text
+								style="margin-left: 20rpx;color: #FF6D20;font-size: 22.78rpx; ">{{item.service_score}}</text>
+							<text v-if="item.distance"
+								style="margin-left: 20rpx;font-size: 21.03rpx;color: #aaa;">{{item.distance}}</text>
+
+							<text style="margin-left: 20rpx;">{{item.category_name}}</text>
+						</view>
+						<view class="content-two">
+							<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text> {{item.service_phone}}</text>
+							<u--image style="margin-left: 28rpx;" v-if="item.mer_take_time" :showLoading="true"
+								src="/static/images/GXSC/SJ.png" width="33.85rpx" height="33.85rpx"></u--image>
+							<text v-if="item.mer_take_time">{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+						</view>
+						<view class="content-two">
+							<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text class="address">{{item.mer_address}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
 
 
-      <loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0" style="padding: 40rpx 0 150rpx; 0">
-      </loadmore>
-      <view class='pictrue' v-if="!isLoading && hostProduct.length == 0">
-        <image :src="`${domain}/static/images/noCart.png`"></image>
-        <view>暂无商品，看点别的吧</view>
-      </view>
-    </view>
+			<loadmore :type="isLoading" v-if="isLoading || hostProduct.length > 0" style="padding: 40rpx 0 150rpx; 0">
+			</loadmore>
+			<view class='pictrue' v-if="!isLoading && hostProduct.length == 0">
+				<image :src="`${domain}/static/images/noCart.png`"></image>
+				<view>暂无商品，看点别的吧</view>
+			</view>
+		</view>
 
-    <!--自定义底部tab栏-->
-    <customTab :newData="newData" :activeRouter="activeRouter"></customTab>
-  </view>
+		<!--自定义底部tab栏-->
+		<customTab :newData="newData" :activeRouter="activeRouter"></customTab>
+	</view>
 </template>
 
 <script>
-  import {
-    goShopDetail
-  } from '@/libs/order.js'
-  import {
-    getStoreCategory,
-    getProductslist,
-    getCategoryIndexList,
-    merClassifly,
-    storeMerchantList
-  } from "@/api/store.js"
-  import customTab from '@/components/customTab';
-  import {
-    getVersion,
-    getNavigation
-  } from "@/api/public";
-  import {
-    configMap
-  } from "@/utils"
-  import {
-    mapGetters
-  } from "vuex";
-  import {
-    HTTP_REQUEST_URL
-  } from '@/config/app';
-  import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
-  export default {
-    components: {
-      WaterfallsFlow,
-      customTab
-    },
-    data() {
-      return {
-        domain: HTTP_REQUEST_URL,
-        tabsArr: [{
-          name: '里海云仓批发',
-          val: 1
-        }, {
-          name: '供销云市场批发',
-          val: 2
-        }, {
-          name: '名优农特产批发',
-          val: 3
-        }],
-        tabsCurr: 1,
-        orderCurr: 3, //当前选择的排序类型
-        subList: ['批发市场', '批发商户'],
-        subCurr: 0,
-        newData: {},
-        activeRouter: '',
-        hostProduct: [],
-        shopList: [], //商户分类
-        store_category: [], //商品大分类
-        store_category_shop: [], //商户分类
-        store_category_children: [], //商品小分类
-        cate_change: 0,
-        cate_change_children: 0,
-        isLoading: 0,
-        deduction_rate: false, //是否显示  
-        where: {
-          page: 1,
-          limit: 20,
-          sale_type: 2, //1为零售, 2为批发   
-          mer_type: 1,
-          mer_cate_id: '', //
-          cate_id: '',
-          keyword: '',
-          deduction_rate: '', //抵扣比例
-          order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc
-          rand: 1,
-        }
-      }
-    },
-    computed: {
-      ...configMap({
-        margin_ico_switch: 0,
-        margin_ico: '',
-      }, mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
-    },
-    onLoad() {
-      this.getNav();
-      this.initData();
-    },
-    onPageScroll() {
-      uni.$emit('scroll');
-    },
-    onPullDownRefresh() {
-      this.initData(true, true);
-    },
-    onReachBottom() {
-      this.initData();
-    },
-    methods: {
-      initData(re = false, stop = false) {
-        if (!stop) this.getStoreCategory();
-        if (this.tabsCurr == 2 && this.subCurr == 1) this.storeMerchantList(re, stop);
-        else this.getProductslist(re, stop);
-      },
-      changeDeduction(e) {
-        this.where.deduction_rate = e;
-        this.getProductslist(true);
-      },
-      changeSub(e) {
-        this.subCurr = e;
-        this.where = {
-          page: 1,
-          limit: this.where.limit,
-          sale_type: this.where.sale_type,
-          keyword: this.where.keyword,
-        }
-        if (this.subCurr != 1) this.where.mer_type = 2;
-        this.cate_change = 0;
-        this.cate_change_children = 0;
-        this.initData(true);
-      },
-      toOrder(type, index = -1) {
-        if (this.where.order == type) {
-          type = "";
-          this.orderCurr = -1
-        } else 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,
-          success: () => {
-            uni.$once('searchValue', (e) => {
-              this.$nextTick(() => {
-                this.where.keyword = e;
-                this.initData(true);
-              })
-            })
-          }
-        })
-      },
-      getNav() {
-        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;
-        this.orderCurr = -1;
-        this.where = {
-          page: 1,
-          limit: this.where.limit,
-          sale_type: this.where.sale_type,
-          keyword: this.where.keyword,
-          order: '',
-          rand: this.where.rand,
-        }
-        this.cate_change = 0;
-        this.cate_change_children = 0;
-        if (this.tabsCurr != 2 || (this.tabsCurr == 2 && this.subCurr != 1)) this.where.mer_type = e;
-        this.initData(true);
-      },
-      changeCate(e) {
-        this.cate_change = e;
-        this.store_category_children = [];
-        if (this.tabsCurr == 2 && this.subCurr == 1) {
-          this.where.merchant_category_id = this.store_category[e].merchant_category_id;
-          return this.storeMerchantList(true);
-        }
-        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: ''
-        })
-        this.cate_change_children = 0;
-        if (this.tabsCurr == 1) this.where.mer_cate_id = this.store_category[e].store_category_id;
-        else {
-          this.where.cate_pid = this.store_category[e].store_category_id;
-          this.where.cate_id = "";
-        }
-        this.getProductslist(true);
-      },
-      changeChildrenCate(e) {
-        this.cate_change_children = e;
-        let key = 'mer_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
-        this.getProductslist(true);
-      },
-      getStoreCategory() {
-        this.store_category = [];
-        if (this.tabsCurr == 1) getStoreCategory(259).then(res => {
-          this.initStoreCate(res);
-        })
-        else if (this.tabsCurr == 2 && this.subCurr == 1) merClassifly().then(res => {
-          this.store_category = [{
-            category_name: '全部',
-            merchant_category_id: '',
-            background: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png'
-          }, ...res.data];
-        })
-        else getCategoryIndexList({ mer_type: this.where.mer_type, sale_type: this.where.sale_type }).then(res => {
-          this.initStoreCate(res);
-        })
-      },
-      initStoreCate(res) {
-        this.store_category = [{
-          cate_name: '全部',
-          pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png',
-          store_category_id: ''
-        }, ...res.data];
-        this.store_category_children = this.store_category[0].children || [];
-        this.store_category_children.unshift({
-          cate_name: '全部',
-          store_category_id: ''
-        })
-      },
-      getProductslist(reLoad = false, stop = false) {
-        if (reLoad) {
-          this.where.page = 1;
-          this.hostProduct = [];
-          this.isLoading = 0;
-        }
-        if (this.isLoading == -1) return;
-        this.isLoading = 1;
-        if(this.where.order) this.where.rand=0;
-        else this.where.rand=1;
-        getProductslist(this.where, true).then(res => {
-          this.where.limit = res.data.limit
-          this.where.page = res.data.page
-          if (stop) uni.stopPullDownRefresh();
-          if (reLoad) this.hostProduct = [];
-          this.hostProduct = [...this.hostProduct, ...res.data.list];
-          this.isLoading = 0;
-          if (res.data.list.length < this.where.limit) this.isLoading = -1;
-          this.where.page++;
-        })
-      },
-      storeMerchantList(reLoad = false, stop) {
-        if (reLoad) {
-          this.where.page = 1;
-          this.shopList = [];
-          this.isLoading = 0;
-        }
-        if (this.isLoading == -1) return;
-        this.isLoading = 1;
-        storeMerchantList(this.where).then(res => {
-          if (stop) uni.stopPullDownRefresh()
-          this.shopList = [...this.shopList, ...res.data.list];
-          this.isLoading = 0;
-          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();
-          }
-        })
-      },
-      // 进店
-      goStore(id) {
-        uni.navigateTo({
-          url: `/pages/store/home/index?id=${id}&sale_type=${this.where.sale_type}`
-        })
-      },
-    }
-  }
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import {
+		getStoreCategory,
+		getProductslist,
+		getCategoryIndexList,
+		merClassifly,
+		storeMerchantList
+	} from "@/api/store.js"
+	import customTab from '@/components/customTab';
+	import {
+		getVersion,
+		getNavigation
+	} from "@/api/public";
+	import {
+		configMap
+	} from "@/utils"
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
+	export default {
+		components: {
+			WaterfallsFlow,
+			customTab
+		},
+		data() {
+			return {
+				domain: HTTP_REQUEST_URL,
+				tabsArr: [{
+					name: '里海云仓批发',
+					val: 1
+				}, {
+					name: '供销云市场批发',
+					val: 2
+				}, {
+					name: '名优农特产批发',
+					val: 3
+				}],
+				tabsCurr: 1,
+				orderCurr: 3, //当前选择的排序类型
+				subList: ['批发市场', '批发商户'],
+				subCurr: 0,
+				newData: {},
+				activeRouter: '',
+				hostProduct: [],
+				shopList: [], //商户分类
+				store_category: [], //商品大分类
+				store_category_shop: [], //商户分类
+				store_category_children: [], //商品小分类
+				cate_change: 0,
+				cate_change_children: 0,
+				isLoading: 0,
+				deduction_rate: false, //是否显示  
+				where: {
+					page: 1,
+					limit: 20,
+					sale_type: 2, //1为零售, 2为批发   
+					mer_type: 1,
+					mer_cate_id: '', //
+					cate_id: '',
+					keyword: '',
+					deduction_rate: '', //抵扣比例
+					order: '', // 销量sales, 价格低到高price_asc, 价格高到低price_desc
+					rand: 1,
+				}
+			}
+		},
+		computed: {
+			...configMap({
+				margin_ico_switch: 0,
+				margin_ico: '',
+			}, mapGetters(['isLogin', 'uid', 'viewColor', 'keyColor'])),
+		},
+		onLoad() {
+			this.getNav();
+			this.initData();
+		},
+		onPageScroll() {
+			uni.$emit('scroll');
+		},
+		onPullDownRefresh() {
+			this.initData(true, true);
+		},
+		onReachBottom() {
+			this.initData();
+		},
+		methods: {
+			initData(re = false, stop = false) {
+				if (!stop) this.getStoreCategory();
+				if (this.tabsCurr == 2 && this.subCurr == 1) this.storeMerchantList(re, stop);
+				else this.getProductslist(re, stop);
+			},
+			changeDeduction(e) {
+				this.where.deduction_rate = e;
+				this.getProductslist(true);
+			},
+			changeSub(e) {
+				this.subCurr = e;
+				this.where = {
+					page: 1,
+					limit: this.where.limit,
+					sale_type: this.where.sale_type,
+					keyword: this.where.keyword,
+				}
+				if (this.subCurr != 1) this.where.mer_type = 2;
+				this.cate_change = 0;
+				this.cate_change_children = 0;
+				this.initData(true);
+			},
+			toOrder(type, index = -1) {
+				if (this.where.order == type) {
+					type = "";
+					this.orderCurr = -1
+				} else 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,
+					success: () => {
+						uni.$once('searchValue', (e) => {
+							this.$nextTick(() => {
+								this.where.keyword = e;
+								this.initData(true);
+							})
+						})
+					}
+				})
+			},
+			getNav() {
+				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;
+				this.orderCurr = -1;
+				this.where = {
+					page: 1,
+					limit: this.where.limit,
+					sale_type: this.where.sale_type,
+					keyword: this.where.keyword,
+					order: '',
+					rand: this.where.rand,
+				}
+				this.cate_change = 0;
+				this.cate_change_children = 0;
+				if (this.tabsCurr != 2 || (this.tabsCurr == 2 && this.subCurr != 1)) this.where.mer_type = e;
+				this.initData(true);
+			},
+			changeCate(e) {
+				this.cate_change = e;
+				this.store_category_children = [];
+				if (this.tabsCurr == 2 && this.subCurr == 1) {
+					this.where.merchant_category_id = this.store_category[e].merchant_category_id;
+					return this.storeMerchantList(true);
+				}
+				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: ''
+				})
+				this.cate_change_children = 0;
+				if (this.tabsCurr == 1) this.where.mer_cate_id = this.store_category[e].store_category_id;
+				else {
+					this.where.cate_pid = this.store_category[e].store_category_id;
+					this.where.cate_id = "";
+				}
+				this.getProductslist(true);
+			},
+			changeChildrenCate(e) {
+				this.cate_change_children = e;
+				let key = 'mer_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
+				this.getProductslist(true);
+			},
+			getStoreCategory() {
+				this.store_category = [];
+				if (this.tabsCurr == 1) getStoreCategory(259).then(res => {
+					this.initStoreCate(res);
+				})
+				else if (this.tabsCurr == 2 && this.subCurr == 1) merClassifly().then(res => {
+					this.store_category = [{
+						category_name: '全部',
+						merchant_category_id: '',
+						background: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png'
+					}, ...res.data];
+				})
+				else getCategoryIndexList({
+					mer_type: this.where.mer_type,
+					sale_type: this.where.sale_type
+				}).then(res => {
+					this.initStoreCate(res);
+				})
+			},
+			initStoreCate(res) {
+				this.store_category = [{
+					cate_name: '全部',
+					pic: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0bc7a202404021652194310.png',
+					store_category_id: ''
+				}, ...res.data];
+				this.store_category_children = this.store_category[0].children || [];
+				this.store_category_children.unshift({
+					cate_name: '全部',
+					store_category_id: ''
+				})
+			},
+			getProductslist(reLoad = false, stop = false) {
+				if (reLoad) {
+					this.where.page = 1;
+					this.hostProduct = [];
+					this.isLoading = 0;
+				}
+				if (this.isLoading == -1) return;
+				this.isLoading = 1;
+				if (this.where.order) this.where.rand = 0;
+				else this.where.rand = 1;
+				getProductslist(this.where, true).then(res => {
+					this.where.limit = res.data.limit
+					this.where.page = res.data.page
+					if (stop) uni.stopPullDownRefresh();
+					if (reLoad) this.hostProduct = [];
+					this.hostProduct = [...this.hostProduct, ...res.data.list];
+					this.isLoading = 0;
+					if (res.data.list.length < this.where.limit) this.isLoading = -1;
+					this.where.page++;
+				})
+			},
+			storeMerchantList(reLoad = false, stop) {
+				if (reLoad) {
+					this.where.page = 1;
+					this.shopList = [];
+					this.isLoading = 0;
+				}
+				if (this.isLoading == -1) return;
+				this.isLoading = 1;
+				storeMerchantList(this.where).then(res => {
+					if (stop) uni.stopPullDownRefresh()
+					this.shopList = [...this.shopList, ...res.data.list];
+					this.isLoading = 0;
+					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();
+					}
+				})
+			},
+			// 进店
+			goStore(id) {
+				uni.navigateTo({
+					url: `/pages/store/home/index?id=${id}&sale_type=${this.where.sale_type}`
+				})
+			},
+		}
+	}
 </script>
\ No newline at end of file