diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index b87f7f7..0579e56 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -4,8 +4,8 @@
-
-
+
+
市级供应链
@@ -38,8 +38,8 @@
-
-
+
+
我的店铺
@@ -99,8 +99,8 @@
-
-
+
+
里海云仓
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index bfede4f..c540736 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -1,1069 +1,1113 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{recommend_address}}
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
- 筛选
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.mer_name}}
-
- {{item.type_name}}
- 自营
-
-
-
- {{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
-
-
-
-
- {{item.distance}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{itemn.price}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.mer_name}}
- {{item.type_name}}
- 自营
-
-
-
- {{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
-
-
-
-
- {{item.distance}}
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{itemn.price}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.mer_name}}
- {{item.type_name}}
- 自营
-
-
-
- {{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
-
-
-
-
- {{item.distance}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ￥{{itemn.price}}
-
-
-
-
-
-
- {{loadTitle}}
-
-
-
-
-
- 暂无店铺，快去搜索其他店铺吧
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{recommend_address}}
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+ 筛选
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+
+ {{item.type_name}}
+ 自营
+
+
+
+ {{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+
+
+
+
+ {{item.distance}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{itemn.price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+ {{item.type_name}}
+ 自营
+
+
+
+ {{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+
+
+
+
+ {{item.distance}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{itemn.price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+ {{item.type_name}}
+ 自营
+
+
+
+ {{item.care_count<10000 ? item.care_count : (item.care_count/10000).toFixed(2)+'万'}}人关注
+
+
+
+
+ {{item.distance}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥{{itemn.price}}
+
+
+
+
+
+
+
+ {{loadTitle}}
+
+
+
+
+
+ 暂无店铺，快去搜索其他店铺吧
+
+
+
+
+
+
\ No newline at end of file
+ .productList .search {
+ width: 100%;
+ height: 86rpx;
+ padding: 0 20rpx;
+ box-sizing: border-box;
+ position: fixed;
+ left: 0;
+ top: 0;
+ z-index: 9;
+ display: flex;
+ flex-wrap: nowrap;
+ background-color: #fff;
+
+ &.styleType1 {
+ background-color: var(--view-theme);
+ }
+
+ .search-right {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ max-width: max-content;
+ flex: 1;
+ padding-left: 20rpx;
+ }
+
+ .right-text {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 28rpx;
+ width: max-content;
+ color: #fff;
+ padding: 0 10rpx;
+ }
+
+ .icon-xiangyou,
+ .icon-dingwei {
+ font-size: 30rpx;
+ color: #fff;
+ }
+ }
+
+ .search-right.styleType2 .right-text,
+ .search-right.styleType3 .right-text {
+ color: #282828;
+ }
+
+ .search-right.styleType2 .icon-xiangyou,
+ .search-right.styleType3 .icon-xiangyou {
+ color: #999999;
+ }
+
+ .search-right.styleType2 .icon-dingwei,
+ .search-right.styleType3 .icon-dingwei {
+ color: #8A8A8A;
+ }
+
+ .productList .search .back {
+ display: flex;
+ align-items: center;
+ width: 40rpx;
+ height: 60rpx;
+
+ .iconfont {
+ color: #fff;
+ font-size: 36rpx;
+ }
+ }
+
+ .productList .search .input {
+ flex: 1;
+ height: 60rpx;
+ background-color: #fff;
+ border-radius: 50rpx;
+ padding: 0 20rpx;
+ box-sizing: border-box;
+ }
+
+ .productList .search.styleType2 .input,
+ .productList .search.styleType3 .input {
+ background: #EDEDED;
+ }
+
+ .productList .search .input input {
+ flex: 1;
+ height: 100%;
+ font-size: 26rpx;
+ margin-left: 10rpx;
+ }
+
+ .productList .search .input .placeholder {
+ color: #999;
+ }
+
+ .productList .search .input .iconfont {
+ font-size: 35rpx;
+ color: #555;
+ }
+
+ .productList .search .icon-pailie,
+ .productList .search .icon-tupianpailie {
+ color: #fff;
+ width: 62rpx;
+ font-size: 40rpx;
+ height: 86rpx;
+ line-height: 86rpx;
+ }
+
+ .productList .nav-wrapper {
+ z-index: 9;
+ position: fixed;
+ left: 0;
+ top: 0;
+ width: 100%;
+ margin-top: 86rpx;
+ background-color: #fff;
+
+ &.styleType1 {
+ background-color: var(--view-theme);
+ }
+
+ .tab-bar {
+ display: flex;
+ align-items: center;
+
+ .tab-item {
+ position: relative;
+ flex: 1;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 8rpx 0 20rpx;
+ color: #fff;
+ font-size: 28rpx;
+ font-weight: bold;
+
+ &::after {
+ content: ' ';
+ position: absolute;
+ left: 50%;
+ bottom: 18rpx;
+ width: 30rpx;
+ height: 3rpx;
+ background: transparent;
+ transform: translateX(-50%);
+ }
+
+ &.on {
+ &::after {
+ background: #fff;
+ }
+ }
+ }
+ }
+ }
+
+ .border-picture {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background: center/cover no-repeat;
+ }
+
+ .productList .nav {
+ height: 86rpx;
+ color: #454545;
+ font-size: 28rpx;
+ display: flex;
+ justify-content: space-between;
+ padding: 0 28rpx;
+ }
+
+ .productList .nav .item {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ color: #FFFFFF;
+ flex: 1;
+ }
+
+ .productList .nav.styleType2 .item,
+ .productList .nav.styleType3 .item {
+ color: #282828;
+ }
+
+ .productList .nav .item.font-colors {
+ font-weight: 500;
+ color: #FFFFFF;
+ }
+
+ .productList .nav.styleType2 .item.font-colors,
+ .productList .nav.styleType3 .item.font-colors {
+ color: var(--view-theme);
+ }
+
+ .productList .nav .item .font-line {
+ height: 4rpx;
+ background-color: #fff;
+ margin-top: 3rpx;
+ width: 28rpx;
+ animation: line 0.3s;
+ -moz-animation: line 0.3s;
+ /* Firefox */
+ -webkit-animation: line 0.3s;
+ /* Safari 和 Chrome */
+ -o-animation: line 0.3s;
+ /* Opera */
+ }
+
+ .productList .nav.styleType2 .item .font-line,
+ .productList .nav.styleType3 .item .font-line {
+ background-color: var(--view-theme);
+ }
+
+ @keyframes line {
+ from {
+ width: 0rpx;
+ }
+
+ to {
+ width: 28rpx;
+ }
+ }
+
+ .productList .nav .item image {
+ width: 15rpx;
+ height: 19rpx;
+ margin-left: 10rpx;
+ }
+
+ .mer-box {
+ padding: 20rpx 20rpx;
+ margin-top: 168rpx;
+
+ .store-margin {
+ width: 30rpx !important;
+ height: 32rpx !important;
+ margin: 0 0 0 10rpx !important;
+ border: none !important;
+ border-radius: 0 !important;
+ }
+
+ .mer-item {
+ margin-bottom: 20rpx;
+ background-color: #fff;
+ border-radius: 16rpx;
+
+ &.mer-item3 {
+ background-size: cover;
+ background-repeat: no-repeat;
+ }
+
+ .mer-hd {
+ position: relative;
+ width: 100%;
+ height: 134rpx;
+ border-radius: 16rpx 16rpx 0 0;
+ overflow: hidden;
+ display: flex;
+
+ image {
+ width: 100%;
+ height: 100%;
+ }
+
+ .mer-name {
+ position: absolute;
+ left: 20rpx;
+ top: 30rpx;
+ display: flex;
+ align-items: center;
+ padding: 0 10rpx;
+
+ image {
+ width: 79rpx;
+ height: 79rpx;
+ border: 1px solid #fff;
+ border-radius: 50%;
+ margin-right: 10rpx;
+ }
+
+ .txt {
+ flex: 1;
+ }
+ }
+ }
+
+ /deep/.easy-loadimage {
+ width: 100%;
+ height: 214rpx;
+ border-radius: 8rpx;
+ }
+
+ .pro-box {
+ display: flex;
+ align-items: center;
+ padding: 20rpx 20rpx 30rpx;
+
+ .pro-item {
+ width: 218rpx;
+ margin-right: 14rpx;
+
+ .picture,
+ /deep/image,
+ uni-image {
+ width: 100%;
+ height: 214rpx;
+ border-radius: 8rpx;
+ position: relative;
+ }
+
+ .price {
+ margin-top: 5rpx;
+ font-size: 28rpx;
+ color: var(--view-priceColor);
+ font-weight: bold;
+
+ text {
+ font-size: 28rpx;
+ }
+ }
+
+ &:last-child {
+ margin-right: 0;
+ }
+ }
+
+ &.styleType3 {
+ padding: 20rpx;
+
+ .pro-item {
+ background-color: #fff;
+ border-radius: 16rpx;
+ text-align: center;
+ padding: 10rpx 0 20rpx;
+
+ .picture,
+ /deep/image,
+ uni-image {
+ width: 194rpx;
+ height: 194rpx;
+ text-align: center;
+ border-radius: 8rpx;
+ position: relative;
+ margin: 0 auto;
+ }
+ }
+ }
+ }
+ }
+
+ .mer-top {
+ display: flex;
+ align-items: center;
+ color: #FFFFFF;
+ font-size: 28rpx;
+ font-weight: bold;
+ margin-bottom: 6rpx;
+
+ .font-bg-red {
+ margin-left: 20rpx;
+ font-size: 18rpx;
+ padding: 2rpx 10rpx;
+ color: #fff;
+ border-radius: 30rpx;
+ width: auto;
+ background-color: var(--view-theme);
+ border-color: var(--view-theme);
+ }
+ }
+
+ .mer-btn {
+ color: rgba($color: #fff, $alpha: 0.7);
+ font-size: 24rpx;
+ display: flex;
+ align-items: center;
+
+ .line {
+ width: 2rpx;
+ height: 18rpx;
+ color: rgba($color: #fff, $alpha: 0.7);
+ margin: 0 12rpx;
+ }
+
+ .distance {
+ display: flex;
+ align-items: center;
+ font-size: 24rpx;
+
+ .iconfont {
+ font-size: 24rpx;
+ line-height: 24rpx;
+ }
+ }
+ }
+
+ .more-shop {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #FFFFFF;
+ padding: 27rpx 0;
+ color: #999999;
+ font-size: 26rpx;
+
+ .icon-xiangyou {
+ font-size: 22rpx;
+ }
+ }
+ }
+
+ .mer-item2 {
+ padding: 20rpx;
+ background: #fff;
+ margin-bottom: 20rpx;
+ border-radius: 16rpx;
+
+ .mer-shop-count {
+ display: flex;
+
+ .mer-avatar {
+ width: 100rpx;
+ height: 100rpx;
+ }
+
+ .mer-top {
+ color: #282828;
+ }
+
+ .mer-shop-right {
+ margin-left: 20rpx;
+
+ .mer-btn {
+ color: #666666;
+ }
+
+ }
+
+ .pro-box {
+ display: flex;
+ align-items: center;
+ margin-top: 20rpx;
+
+ .pro-item {
+ width: 170rpx;
+ margin-right: 20rpx;
+
+ .picture,
+ /deep/image,
+ uni-image,
+ /deep/.easy-loadimage {
+ width: 100%;
+ height: 170rpx;
+ border-radius: 8rpx;
+ position: relative;
+ }
+
+ .price {
+ margin-top: 5rpx;
+ font-size: 28rpx;
+ color: var(--view-priceColor);
+ font-weight: bold;
+
+ text {
+ font-size: 28rpx;
+ }
+ }
+
+ &:last-child {
+ margin-right: 0;
+ }
+ }
+ }
+ }
+
+ }
+
+ .no-shop {
+ background-color: #fff;
+ padding-bottom: calc(100% - 176rpx);
+
+ .pictrue {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ color: $uni-nothing-text;
+
+ image {
+ width: 414rpx;
+ height: 380rpx;
+ }
+ }
+ }
+
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index d08503b..42d52ff 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -674,6 +674,12 @@
this.getCategory();
break;
case 3:
+ this.where={
+ order: '',
+ keyword: '',
+ page: 1,
+ limit: 30
+ };
this.getGoods();
break;
case 4: