From 7c06941d59e63b4ea1d3a96c69872f15b47782aa Mon Sep 17 00:00:00 2001
From: cc_zbp <487602586@qq.com>
Date: Wed, 24 May 2023 18:25:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E4=BB=93=E5=95=86=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                            |   17 +-
 config/app.js                         |    3 +-
 libs/order.js                         |   54 +-
 pages.json                            |    6 +
 pages/goods_details/index.vue         |    9 +-
 pages/nongKe/cloud_entrepot/index.vue |  133 +++-
 pages/nongKe/goods_list/index.vue     | 1008 +++++++++++++++++++++++++
 pages/store/home/index.vue            |   34 +-
 pages/supply_chains/supply_chains.vue |    8 +-
 9 files changed, 1185 insertions(+), 87 deletions(-)
 create mode 100644 pages/nongKe/goods_list/index.vue

diff --git a/api/api.js b/api/api.js
index 586a609..17cf5dc 100644
--- a/api/api.js
+++ b/api/api.js
@@ -1,4 +1,19 @@
 import request from "@/utils/request.js";
+
+/**
+ * 获取云仓分类
+ * 
+ */
+export function cloudWarehouse(data) {
+  return request.get("store/product/cloudWarehouse", data);
+}
+/**
+ * 获取云仓分类
+ * 
+ */
+export function getCityCloundShop(data) {
+  return request.get("city/get_cloud_shop", data);
+}
 /**
  * 商品扫码枪查询商品是否存在
  * 
@@ -19,7 +34,7 @@ export function get_cloud_shop(street_code) {
   return request.get(`city/get_cloud_shop?street_code=${street_code}`, {}, { noAuth: true });
 }
 export function post_product_import(id) {
-  return request.post(`micro/product_import`,{ id: id }, { noAuth: true });
+  return request.post(`micro/product_import`, { id: id }, { noAuth: true });
 }
 /**
  * 公共接口 ，优惠券接口 , 行业此讯 , 手机号码注册
diff --git a/config/app.js b/config/app.js
index 94b6bed..f541cb0 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,7 +9,8 @@ let httpApiThree
 // 网络接口修改此字符 小程序域名要求https
 // let httpApi = 'http://192.168.31.110:8324' // 测试
 if (process.env.NODE_ENV === "development") {
-  httpApi = "https://crmeb-test.shop.lihaink.cn"
+  // httpApi = "https://crmeb-test.shop.lihaink.cn"
+  httpApi = "http://192.168.0.109:8325"
   // #ifdef MP-WEIXIN
   httpApiTwo = "http://cms.com"
   httpApiThree = 'http://ceshi-oa.lihaink.cn'
diff --git a/libs/order.js b/libs/order.js
index c434121..f187ad6 100644
--- a/libs/order.js
+++ b/libs/order.js
@@ -7,30 +7,30 @@
 // +----------------------------------------------------------------------
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
-export function goShopDetail(item,uid) {	
-	return new Promise(resolve => {
-		if (item.product_type === 1) {
-			uni.navigateTo({
-				url: `/pages/activity/goods_seckill_details/index?id=${item.product_id}&time=${item.stop_time}`
-			})
-		} else if (item.product_type === 2) {
-			uni.navigateTo({
-				url: `/pages/activity/presell_details/index?id=${item.activity_id}`
-			})
-		} else if (item.product_type === 0 || item.product_type === 10) {
-			uni.navigateTo({
-				url: `/pages/goods_details/index?id=${item.product_id}`
-			})	
-		}else if (item.product_type === 4) {
-			uni.navigateTo({
-				url: `/pages/activity/combination_details/index?id=${item.activity_id}`
-			})
-		}else if (item.product_type === 40) {
-			uni.navigateTo({
-				url: `/pages/activity/combination_status/index?id=${item.activity_id}`
-			})
-		}else {
-			resolve(item);
-		}
-	});
-}
+export function goShopDetail(item, uid) {
+  return new Promise(resolve => {
+    if (item.product_type === 1) {
+      uni.navigateTo({
+        url: `/pages/activity/goods_seckill_details/index?id=${item.product_id}&time=${item.stop_time}`
+      })
+    } else if (item.product_type === 2) {
+      uni.navigateTo({
+        url: `/pages/activity/presell_details/index?id=${item.activity_id}`
+      })
+    } else if (item.product_type === 0 || item.product_type === 10) {
+      uni.navigateTo({
+        url: `/pages/goods_details/index?id=${item.product_id}&referer=${item.referer}`
+      })
+    } else if (item.product_type === 4) {
+      uni.navigateTo({
+        url: `/pages/activity/combination_details/index?id=${item.activity_id}`
+      })
+    } else if (item.product_type === 40) {
+      uni.navigateTo({
+        url: `/pages/activity/combination_status/index?id=${item.activity_id}`
+      })
+    } else {
+      resolve(item);
+    }
+  });
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 00f8750..87af6d9 100644
--- a/pages.json
+++ b/pages.json
@@ -169,6 +169,12 @@
             "navigationBarTitleText": "",
             "enablePullDownRefresh": true
           }
+        }, {
+          "path": "goods_list/index",
+          "style": {
+            "navigationBarTitleText": "里海云仓",
+            "enablePullDownRefresh": true
+          }
         },
         {
           "path": "supply_chain/goods_list",
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index f94facc..3e71e54 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -275,7 +275,8 @@
               <!-- #endif -->
               <view v-else class="product_content">
                 <view v-if="description.content && description.content.title" class="title">
-                  {{description.content.title}}</view>
+                  {{description.content.title}}
+                </view>
                 <view v-if="description.content && description.content.image" class="pictures">
                   <image v-for="(item,index) in description.content.image" :key="index" :src="item"></image>
                 </view>
@@ -571,7 +572,8 @@
           show: false,
           params: []
         },
-        product_type: 0
+        product_type: 0,
+        referer: ''
       };
     },
     computed: {
@@ -580,6 +582,7 @@
       ])),
     },
     onLoad(options) {
+      this.referer = options.referer
       if (options.product_type) {
         this.product_type = options.product_type
       }
@@ -1336,7 +1339,7 @@
             that.isOpen = that.attr.cartAttr = false;
             if (news) {
               uni.navigateTo({
-                url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id
+                url: `/pages/users/order_confirm/index?cartId=${res.data.cart_id}&referer=${that.referer}`
               });
             } else {
               that.$util.Tips({
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index ddd84c4..5931f37 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -1,88 +1,159 @@
 <template>
-  <view class="cloud_entrepot">
+  <view class="cloud_entrepot" :style="{'min-height': winHeight + 'px'}">
     <view class="head-wrapper"></view>
-    <view class="town-title">通滩镇里海云仓</view>
+    <view class="town-title">{{town}}里海云仓</view>
     <view class="body-wrapper">
       <block v-for="(item,index) in cloudList" :key="index">
-        <view class="item" :style="{'background-image': `url(${item.bg})`}">
-          <text class="item-title">{{item.title}}</text>
+        <navigator class="item"
+          :url="`/pages/nongKe/goods_list/index?cate_id=${item.category_id}&street=${street_code}&name=${item.title}`"
+          :style="{'background-image': `url(${item.bg})`}">
+          <text class="item-title">{{item.title}}云仓服务</text>
           <text>{{item.text}}</text>
           <view class="chakan-btn" @click="navigator">查看</view>
-        </view>
+        </navigator>
       </block>
     </view>
   </view>
 </template>
 
 <script>
-  let url = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
+  import { getCityCloundShop } from '@/api/api.js'
+  import { Toast } from '@/libs/uniApi';
   export default {
     data() {
+      let src = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13';
       return {
+        winHeight: 0,
         cloudList: [{
-            title: '商超服务云仓服务',
+            title: '商超服务',
             text: '便捷商超购物，包送到家',
-            bg: url + '/shangchao.png'
+            bg: src + '/shangchao.png',
+            show: false,
+            category_id: 25
           },
           {
-            title: '农副产品云仓服务',
+            title: '农副产品',
             text: '瓜果蔬菜线上购买',
-            bg: url + '/nongfu.png'
+            bg: src + '/nongfu.png',
+            show: false,
+            category_id: 26
           },
           {
-            title: '生活服务云仓服务',
+            title: '生活服务',
             text: '生活服务样样齐全',
-            bg: url + '/shenghuo.png'
+            bg: src + '/shenghuo.png',
+            show: false,
+            category_id: 23
           },
           {
-            title: '农业生产云仓服务',
+            title: '农业生产',
             text: '种子化肥送到家',
-            bg: url + '/nongye.png'
+            bg: src + '/nongye.png',
+            show: false,
+            category_id: 22
           },
           {
-            title: '物流溯源云仓服务',
+            title: '物流溯源',
             text: '追溯产品源头',
-            bg: url + '/wuliu.png'
+            bg: src + '/wuliu.png',
+            show: false,
+            category_id: 2541
           },
           {
-            title: '坝坝宴云仓服务',
+            title: '坝坝宴',
             text: '农家各种酒席宴会',
-            bg: url + '/yan.png'
+            bg: src + '/yan.png',
+            show: false,
+            category_id: 21
           },
           {
-            title: '文娱旅游云仓服务',
+            title: '文娱旅游',
             text: '周边好玩景点',
-            bg: url + '/shangchao.png'
+            bg: src + '/shangchao.png',
+            show: false,
+            category_id: 2542
           },
           {
-            title: '民生公益云仓服务',
+            title: '民生公益',
             text: '扶贫助学项目',
-            bg: url + '/minsheng.png'
+            bg: src + '/minsheng.png',
+            show: false,
+            category_id: 2543
           },
           {
-            title: '医疗保健云仓服务',
+            title: '医疗保健',
             text: '便捷医疗服务',
-            bg: url + '/yiliao.png'
+            bg: src + '/yiliao.png',
+            show: false,
+            category_id: 2544
           },
           {
-            title: '教育培训云仓服务',
+            title: '教育培训',
             text: '更完善的教育系统',
-            bg: url + '/jiaoyu.png'
+            bg: src + '/jiaoyu.png',
+            show: false,
+            category_id: 2545
           },
           {
-            title: '装修建筑云仓服务',
+            title: '装修建筑',
             text: '个人家庭商铺装修',
-            bg: url + '/zhuangxiu.png'
+            bg: src + '/zhuangxiu.png',
+            show: false,
+            category_id: 2547
+          },
+          {
+            title: '交金融宝',
+            text: '个人家庭商铺装修',
+            bg: src + '/zhuangxiu.png',
+            show: false,
+            category_id: 2546
+          },
+          {
+            title: '农贸基地',
+            text: '个人家庭商铺装修',
+            bg: src + '/zhuangxiu.png',
+            show: false,
+            category_id: 2548
+          },
+          {
+            title: '供销综合',
+            text: '个人家庭商铺装修',
+            bg: src + '/zhuangxiu.png',
+            show: false,
+            category_id: 2549
           }
-        ]
+        ],
+        street_code: '',
+        town: ''
       }
     },
-    onLoad() {},
+    onLoad(e) {
+      uni.getSystemInfo({
+        success: (res) => {
+          this.winHeight = res.windowHeight
+        },
+      });
+      this.street_code = e.street
+      this.town = e.town
+      this.getCloundShop()
+    },
     onShow() {},
     onPullDownRefresh() {
       uni.stopPullDownRefresh()
     },
     methods: {
+      async getCloundShop() {
+        const { data } = await getCityCloundShop({ street_code: 510502102 })
+        data.length < 1 ? Toast("暂无云仓") : ''
+        data.map(item => {
+          this.cloudList.forEach(itens => {
+            itens.show = true
+            // if (itens.category_id == item.category_id) {
+            //   itens.show = true
+            // }
+          })
+        })
+      },
       navigator() {
         uni.navigateTo({
           url: '/pages/user/index'
@@ -96,6 +167,7 @@
   .cloud_entrepot {
     background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/13/ycbg.png") no-repeat;
     background-size: cover;
+    padding-bottom: 92.98rpx;
   }
 
   .head-wrapper {
@@ -149,6 +221,7 @@
       margin-bottom: 21.05rpx;
       background-repeat: no-repeat;
       background-size: 100% 100%;
+      box-sizing: border-box;
 
       text {
         display: block;
diff --git a/pages/nongKe/goods_list/index.vue b/pages/nongKe/goods_list/index.vue
new file mode 100644
index 0000000..31033ee
--- /dev/null
+++ b/pages/nongKe/goods_list/index.vue
@@ -0,0 +1,1008 @@
+<template>
+  <view :style="viewColor">
+    <view class='productList'>
+      <view class='search acea-row row-between-wrapper'>
+        <!--#ifdef H5-->
+        <view class="back" @click='set_where(1)'>
+          <view class="iconfont icon-xiangzuo"></view>
+        </view>
+        <!--#endif-->
+        <view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
+          <input placeholder='搜索商品名称' placeholder-class='placeholder' confirm-type='search' name="search"
+            :value='where.keyword' @confirm="searchSubmit"></input>
+        </view>
+        <view style="text-align: right;" class='iconfont' :class='is_switch==true?"icon-pailie":"icon-tupianpailie"'
+          @click='Changswitch'></view>
+      </view>
+      <view class="nav-wrapper">
+        <view class='nav acea-row row-middle'>
+          <view class='item' @click="set_where(4)" :class="{'t-color':firstKey == 0}">
+            综合
+          </view>
+          <view class='item' :class="{'t-color':firstKey == 3}" @click='set_where(3)'>
+            销量
+          </view>
+          <view class='item' :class="{'t-color':firstKey == 2}" @click='set_where(2)'>
+            价格
+            <image v-if="price==1" :src="domain+'/static/diy/up'+keyColor+'.png'"></image>
+            <image v-else-if="price==2" :src="domain+'/static/diy/down'+keyColor+'.png'"></image>
+            <image v-else src='/static/images/horn.png'></image>
+          </view>
+          <!-- down -->
+          <!-- <view class='item' :class="{'t-color':firstKey == 4}" @click='bindRight'>
+            筛选
+            <text class="iconfont icon-shaixuan"></text>
+          </view> -->
+        </view>
+      </view>
+      <!-- 商品 -->
+      <block v-if="tabIndex == 1">
+        <view v-if="!is_switch" class='list acea-row row-between-wrapper on'>
+          <view class='item on' hover-class='none' v-for="(item,index) in productList" :key="index"
+            @click="godDetail(item)">
+            <view class='pictrue on'>
+              <image :src='item.image' class="on"></image>
+              <view v-if="item.border_pic" :style="{ backgroundImage: `url(${item.border_pic})` }"
+                class="border-picture"></view>
+            </view>
+            <view class='text on'>
+              <view class='name line1'>
+                <text class="text_name line2">{{item.store_name}}</text>
+              </view>
+              <view class='money on'>￥<text class='num'>{{item.price}}</text></view>
+              <view class="item_tags">
+                <text v-if="item.merchant.type_name && item.product_type == 0"
+                  class="font-bg-red bt-color">{{item.merchant.type_name}}</text>
+                <text v-else-if="item.merchant.is_trader && item.product_type == 0"
+                  class="font-bg-red bt-color">自营</text>
+                <text v-if="item.product_type != 0"
+                  :class="'font_bg-red bt-color type'+item.product_type">{{item.product_type == 1 ? "秒杀" : item.product_type == 2 ? "预售" : item.product_type == 3 ? "助力" : item.product_type == 4 ? "拼团" : ""}}</text>
+                <text class="tags_item ticket" v-if="item.issetCoupon">领券</text>
+                <text class="tags_item delivery" v-if="item.delivery_free == 1">包邮</text>
+              </view>
+              <view class="score">{{item.rate}}评分 {{item.reply_count}}条评论</view>
+              <view class="company" v-if="item.merchant" @click.stop="goShop(item.mer_id)">
+                <text class="line1">{{item.merchant.mer_name}}</text>
+                <view class="flex">
+                  进店
+                  <text class="iconfont icon-xiangyou"></text>
+                </view>
+              </view>
+            </view>
+            <!-- 返佣 -->
+            <block v-if="item.max_extension>0 && (item.product_type == 0 || item.product_type == 2)">
+              <view class="foot-bar on">
+                最高赚 ¥{{item.max_extension}}
+              </view>
+            </block>
+          </view>
+        </view>
+        <view v-else class='list'>
+          <WaterfallsFlow :wfList='productList' @itemTap="godDetail" :type="1" @goShop="goShop" />
+        </view>
+        <view class='noCommodity' v-if="productList.length==0 && where.page > 1">
+          <view class='pictrue' style="margin: 60rpx auto;">
+            <image src='/static/images/noCart.png'></image>
+            <view>暂无商品</view>
+          </view>
+          <!-- <recommend v-if="recommend_switch == 1" :hostProduct="hostProduct" :isLogin="isLogin"></recommend> -->
+        </view>
+      </block>
+      <rightSlider v-if="rightBox" :status="rightBox" :brandList="brandList" @confirm="confirm" @close="close">
+      </rightSlider>
+    </view>
+    <view class="down-wrapper" v-if="downStatus">
+      <view class="bg"></view>
+      <view class="down-box">
+        <view class="down-item" v-for="(item,index) in downMenu" :key="item.key" :class="{'on':index == downKey}"
+          @click="bindDown(item,index)">
+          {{item.title}}
+          <text v-if="index == downKey" class="iconfont icon-gou"></text>
+        </view>
+      </view>
+    </view>
+    <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+    <!-- #ifndef H5 -->
+    <passwordPopup></passwordPopup>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+  import {
+    getProductslist,
+    getProductHot,
+    getBrandlist,
+    storeMerchantList
+  } from '@/api/store.js';
+  import recommend from '@/components/recommend';
+  import rightSlider from '@/components/rightSlider.vue'
+  import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
+  import { initiateAssistApi } from '@/api/activity.js';
+  import { cloudWarehouse } from '@/api/api.js'
+  import { configMap } from "@/utils";
+  import { mapGetters } from "vuex";
+  // #ifndef H5
+  import passwordPopup from '@/components/passwordPopup';
+  // #endif
+  import authorize from '@/components/Authorize';
+  import {
+    goShopDetail
+  } from '@/libs/order.js'
+  import { HTTP_REQUEST_URL } from '@/config/app';
+  const app = getApp();
+  export default {
+    computed: configMap({ hide_mer_status: 1, recommend_switch: 0 }, mapGetters(['uid', 'isLogin', 'scrollTop',
+      'viewColor', 'keyColor'
+    ])),
+    components: {
+      // #ifndef H5
+      passwordPopup,
+      // #endif
+      recommend,
+      rightSlider,
+      WaterfallsFlow,
+      authorize,
+    },
+    watch: {
+      tabIndex(nVal, oVal) {
+        if (nVal == 1) {
+          this.loadend = false;
+          this.$set(this.where, 'page', 1)
+          this.get_product_list(true);
+        } else {
+          this.downStatus = false
+          this.storeMerchantList()
+        }
+      }
+    },
+    data() {
+      return {
+        domain: HTTP_REQUEST_URL,
+        productList: [],
+        list: [],
+        is_switch: true,
+        where: {
+          cate_pid: '',
+          order: '',
+          price_on: '',
+          price_off: '',
+          brand_id: '',
+          keyword: '',
+          page: 1,
+          limit: 30,
+          category_id: '',
+          street_code: ''
+        },
+        price: 0,
+        stock: 0,
+        nows: false,
+        loadend: false,
+        loading: false,
+        loadTitle: '加载更多',
+        title: '',
+        hostProduct: [],
+        hotPage: 1,
+        hotLimit: 10,
+        hotScroll: false,
+        // 筛选框
+        rightBox: false,
+        //品牌列表
+        brandList: [],
+        downKey: 0,
+        downStatus: false,
+        // 下拉菜单
+        downMenu: [{
+            title: '综合',
+            key: 1,
+          },
+          {
+            title: '评分',
+            key: 2,
+          },
+          {
+            title: '新品',
+            key: 3,
+          }
+        ],
+        // 是否第一个
+        firstKey: 0,
+        // tab切换
+        tabIndex: 1,
+        // 商铺列表
+        storeList: [],
+        sotreParam: {
+          keyword: '',
+          page: 1,
+          limit: 30,
+          order: ''
+        },
+        storeKey: 0,
+        storeScroll: true,
+        isShowAuth: false, //是否隐藏授权
+        isAuto: false, //没有授权的不会自动授权
+      };
+    },
+    // 滚动监听
+    onPageScroll() {
+      uni.$emit('scroll');
+    },
+    onLoad: function(options) {
+      uni.setNavigationBarTitle({
+        title: options.name
+      })
+      this.where.category_id = options.cate_id
+      this.where.street_code = options.street
+      this.$set(this.where, 'cate_pid', options.id || '');
+      this.title = options.title || '';
+      this.$set(this.where, 'keyword', options.searchValue || '');
+      this.get_product_list(true);
+      this.get_host_product();
+    },
+    onReady() {},
+    mounted: function() {},
+    methods: {
+      // 授权回调
+      onLoadFun() {
+        this.isShowAuth = false
+      },
+      // 授权关闭
+      authColse: function(e) {
+        this.isShowAuth = e
+      },
+      // 去店铺
+      goShop(id) {
+        if (this.hide_mer_status != 1) {
+          uni.navigateTo({
+            url: `/pages/store/home/index?id=${id}`
+          })
+        }
+      },
+      // 查找店铺
+      storeMerchantList() {
+        if (!this.storeScroll) return
+        storeMerchantList({
+          keyword: this.where.keyword,
+          page: this.sotreParam.page,
+          limit: this.sotreParam.limit,
+          order: this.sotreParam.order
+        }).then(res => {
+          this.storeScroll = res.data.list.length >= this.sotreParam.limit
+          this.sotreParam.page += 1
+          this.storeList = this.storeList.concat(res.data.list)
+        })
+      },
+      // 店铺排序
+      storeTab(key) {
+        this.storeKey = key
+        if (key == 0) {
+          this.sotreParam.order = ''
+        } else if (key == 1) {
+          this.sotreParam.order = 'sales'
+        } else {
+          this.sotreParam.order = 'rate'
+        }
+        this.sotreParam.page = 1
+        this.storeScroll = true
+        this.storeList = []
+        this.storeMerchantList()
+      },
+      // 右侧切换
+      bindRight() {
+        this.price = 0;
+        this.firstKey = 4
+        this.getBrandlist()
+
+      },
+      // 品牌列表
+      getBrandlist() {
+        let temp = []
+        getBrandlist({
+          cate_pid: this.where.cate_pid,
+          keyword: this.where.keyword
+        }).then(res => {
+          temp = res.data.list.map(item => {
+            return {
+              ...item,
+              check: false
+            }
+          })
+          if (this.where.brand_id.length > 0) {
+            this.where.brand_id.forEach((ids, index) => {
+              temp.forEach(el => {
+                if (ids == el.brand_id) {
+                  el.check = true
+                }
+              })
+            })
+          }
+          this.brandList = temp
+          this.rightBox = true
+        })
+      },
+      // 去详情页
+      godDetail(item) {
+        goShopDetail(item, this.uid).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
+              });
+            }).catch((err) => {
+              uni.showToast({
+                title: err,
+                icon: 'none'
+              })
+            });
+          } else {
+            this.isAuto = true;
+            this.isShowAuth = true
+          }
+
+        })
+      },
+      // 组件确定
+      confirm(data) {
+        let arr = []
+        if (data.brandList.length == 0) {
+          this.where.brand_id = ''
+        } else {
+          data.brandList.forEach(item => {
+            arr.push(item.brand_id)
+          })
+          this.where.brand_id = arr
+        }
+        this.rightBox = data.status
+        this.where.price_on = data.price_on
+        this.where.price_off = data.price_off
+        this.loadend = false;
+        this.$set(this.where, 'page', 1)
+        this.get_product_list(true);
+
+      },
+      // 组件关闭
+      close() {
+        this.rightBox = false
+      },
+      // 下拉选项
+      bindDown(item, index) {
+        this.firstKey = 0
+        if (index == 0) {
+          this.where.order = ''
+        } else if (index == 1) {
+          this.where.order = 'rate'
+        } else if (index == 2) {
+          this.where.order = 'is_new'
+        }
+        this.downKey = index
+        this.downStatus = false
+        this.loadend = false;
+        this.$set(this.where, 'page', 1)
+        this.get_product_list(true);
+      },
+      Changswitch: function() {
+        let that = this;
+        that.is_switch = !that.is_switch
+      },
+      searchSubmit: function(e) {
+        let that = this;
+        that.$set(that.where, 'keyword', e.detail.value);
+        if (this.tabIndex == 1) {
+          that.loadend = false;
+          that.$set(that.where, 'page', 1)
+          this.get_product_list(true);
+        } else {
+          this.sotreParam.page = 1
+          this.storeScroll = true
+          this.storeList = []
+          this.storeMerchantList()
+        }
+
+      },
+      /**
+       * 获取我的推荐
+       */
+      get_host_product: function() {
+        let that = this;
+        if (that.hotScroll) return
+        getProductHot(
+          that.hotPage,
+          that.hotLimit,
+        ).then(res => {
+          that.hotPage++
+          that.hotScroll = res.data.length < that.hotLimit
+          that.hostProduct = that.hostProduct.concat(res.data.list)
+          // that.$set(that, 'hostProduct', res.data)
+        });
+      },
+      //点击事件处理
+      set_where: function(e) {
+        switch (e) {
+          case 1:
+            uni.setStorageSync('storeIndex', this.where.cate_pid);
+            uni.navigateBack()
+            break
+          case 2:
+            this.firstKey = e
+            if (this.price == 0) {
+              this.price = 1;
+              this.where.order = 'price_asc'
+            } else if (this.price == 1) {
+              this.price = 2;
+              this.where.order = 'price_desc'
+            } else if (this.price == 2) {
+              this.price = 0;
+              this.where.order = ''
+            }
+            this.$set(this.where, 'page', 1)
+            this.get_product_list(true);
+            break;
+          case 3:
+            this.price = 0;
+            this.loadend = false;
+            this.$set(this.where, 'order', 'sales')
+            this.$set(this.where, 'page', 1)
+            this.get_product_list(true);
+            this.firstKey = e
+            break;
+          case 4:
+            this.firstKey = 0
+            this.$set(this.where, 'order', '')
+            this.$set(this.where, 'page', 1)
+            break;
+        }
+        this.loadend = false;
+        this.$set(this.where, 'page', 1);
+        this.get_product_list(true);
+      },
+      //查找产品
+      get_product_list: function(isPage) {
+        let that = this;
+        if (that.loadend) return;
+        if (that.loading) return;
+        if (isPage === true) that.$set(that, 'productList', []);
+        that.loading = true;
+        that.loadTitle = '';
+        cloudWarehouse(that.where).then(res => {
+          let list = res.data.list;
+          let productList = that.$util.SplitArray(list, that.productList);
+          let loadend = list.length < that.where.limit;
+          that.loadend = loadend;
+          that.loading = false;
+          that.loadTitle = loadend ? '已全部加载' : '加载更多';
+          that.$set(that, 'productList', productList);
+          that.$set(that.where, 'page', that.where.page + 1);
+        }).catch(err => {
+          that.loading = false;
+          that.loadTitle = '加载更多';
+        });
+      },
+    },
+    onPullDownRefresh() {
+
+    },
+    onReachBottom() {
+      if (this.tabIndex == 1) {
+        if (this.productList.length > 0) {
+          this.get_product_list('');
+        } else {
+          this.get_host_product();
+        }
+      } else {
+        this.storeMerchantList()
+      }
+    },
+    onPullDownRefresh() {
+      // 模拟上拉刷新
+      setTimeout(() => {
+        const newList = this.productList.reverse();
+        this.productList = newList;
+        uni.stopPullDownRefresh();
+      }, 500)
+    }
+  }
+</script>
+<style lang="scss">
+  .productList .search {
+    width: 100%;
+    height: 86rpx;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+    position: fixed;
+    left: 0;
+    top: 0;
+    z-index: 9;
+    background-color: var(--view-theme);
+  }
+
+  .bt-color {
+    background-color: var(--view-theme);
+    border: 1px solid var(--view-theme);
+
+    &.type2 {
+      background-color: #FD6523;
+      border: 1px solid #FD6523;
+    }
+  }
+
+  .productList .search .back {
+    display: flex;
+    align-items: center;
+    width: 40rpx;
+    height: 60rpx;
+
+    .iconfont {
+      color: #fff;
+      font-size: 36rpx;
+    }
+  }
+
+  .productList .search .input {
+    width: 570rpx;
+    height: 60rpx;
+    background-color: #fff;
+    border-radius: 50rpx;
+    padding: 0 20rpx;
+    box-sizing: border-box;
+  }
+
+  .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: $theme-color;
+
+    .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;
+          }
+        }
+      }
+    }
+  }
+
+  .productList .nav {
+    height: 86rpx;
+    color: #454545;
+    font-size: 28rpx;
+    background-color: #fff;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 28rpx;
+  }
+
+  .productList .nav .item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex: 1;
+
+    &.t-color {
+      // color: var(--view-theme);
+      font-weight: bold;
+    }
+  }
+
+
+  .productList .nav .item image {
+    width: 15rpx;
+    height: 19rpx;
+    margin-left: 10rpx;
+  }
+
+  .productList .list {
+    padding: 0 20rpx;
+    margin-top: 168rpx;
+    // min-height: 100vh;
+  }
+
+  .productList .list.on {
+    background-color: #fff;
+    border-top: 1px solid #f6f6f6;
+  }
+
+  .noCommodity {
+    background-color: #fff;
+    padding-bottom: 30rpx;
+  }
+
+  .spin {
+    display: block;
+    transform: rotate(180deg);
+    font-size: 36rpx;
+  }
+
+  .icon-xiala1 {
+    margin-top: 6rpx;
+  }
+
+  .icon-shaixuan {
+    font-size: 30rpx;
+    margin-left: 10rpx;
+  }
+
+  .down-wrapper {
+    .bg {
+      z-index: 8;
+      position: fixed;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: 100%;
+      background: rgba(0, 0, 0, .5);
+    }
+
+    .down-box {
+      z-index: 8;
+      position: fixed;
+      left: 0;
+      top: 170rpx;
+      width: 100%;
+      padding: 0 40rpx 28rpx 74rpx;
+      background-color: #F8F8F8;
+      border-radius: 0 0 24rpx 24rpx;
+
+      .down-item {
+        margin-top: 28rpx;
+        font-size: 24rpx;
+        color: #454545;
+
+        &.on {
+          color: var(--view-theme);
+        }
+
+        .iconfont {
+          float: right;
+        }
+      }
+    }
+  }
+
+  .store-wrapper {
+    margin-top: 240rpx;
+    border-top: 1px solid #F6F6F6;
+
+    .star-box {
+      display: flex;
+      align-items: center;
+
+      .star {
+        position: relative;
+        width: 111rpx;
+        height: 19rpx;
+        background: url(~pages/columnGoods/images/star.png);
+        background-size: 111rpx 19rpx;
+      }
+
+      .star-active {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 111rpx;
+        height: 19rpx;
+        overflow: hidden;
+        background: url(~pages/columnGoods/images/star_active.png);
+        background-size: 111rpx 19rpx;
+      }
+
+      .num {
+        color: $theme-color;
+        font-size: 24rpx;
+        margin-left: 10rpx;
+      }
+    }
+
+    .store-item {
+      margin-bottom: 12rpx;
+      padding: 40rpx 20rpx;
+      background-color: #fff;
+
+      .head {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .left-wrapper {
+          display: flex;
+          align-items: center;
+
+          .logo {
+            width: 80rpx;
+            height: 80rpx;
+
+            image {
+              width: 80rpx;
+              height: 80rpx;
+              border-radius: 6rpx;
+            }
+          }
+
+          .con-box {
+            margin-left: 20rpx;
+
+            .name {
+              font-size: 30rpx;
+              color: #333;
+              font-weight: bold;
+            }
+          }
+        }
+
+        .link {
+          width: 114rpx;
+          height: 50rpx;
+          line-height: 50rpx;
+          background: linear-gradient(-90deg, rgba(246, 122, 56, 1) 0%, rgba(241, 27, 9, 1) 100%);
+          border-radius: 25rpx;
+          text-align: center;
+          color: #fff;
+          font-size: 24rpx;
+        }
+      }
+
+      .pic-wrapper {
+        display: flex;
+        margin-top: 30rpx;
+
+        .pic-item {
+          position: relative;
+          width: 226rpx;
+          height: 226rpx;
+          margin-right: 16rpx;
+
+          image {
+            width: 226rpx;
+            height: 226rpx;
+            border-radius: 16rpx;
+          }
+
+          .price {
+            position: absolute;
+            right: 0;
+            bottom: 0;
+            height: 36rpx;
+            padding: 0 10rpx;
+            line-height: 36rpx;
+            text-align: center;
+            background: rgba(0, 0, 0, .5);
+            border-radius: 16rpx 2rpx 16rpx 2rpx;
+            color: #fff;
+            font-size: 24rpx;
+
+            text {
+              font-size: 18rpx;
+            }
+          }
+
+          &:nth-child(3n) {
+            margin-right: 0;
+          }
+        }
+      }
+    }
+  }
+
+  .productList .list .item.on {
+    width: 100%;
+    display: flex;
+    border-bottom: 1px solid #f6f6f6;
+    padding: 30rpx 0;
+    margin: 0;
+    position: relative;
+  }
+
+  .productList .list .item .pictrue.on {
+    position: relative;
+    width: 260rpx;
+    height: 260rpx;
+
+    .border-picture {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background: center/cover no-repeat;
+    }
+  }
+
+  .productList .list .item .pictrue image {
+    width: 260rpx;
+    height: 260rpx;
+    border-radius: 20rpx 20rpx 0 0;
+  }
+
+  .productList .list .item .pictrue image.on {
+    border-radius: 6rpx;
+  }
+
+  .productList .list .item .text {
+    font-size: 30rpx;
+    color: #222;
+    width: 460rpx;
+    padding: 0 0 0 22rpx;
+
+    .name {
+      height: 80rpx;
+    }
+  }
+
+  .item_tags {
+    margin-top: 8rpx;
+  }
+
+  .item_tags .tags_item {
+    display: inline-block;
+    font-size: 20rpx;
+    text-align: center;
+    border-radius: 5rpx;
+    padding: 0 4rpx;
+    line-height: 28rpx;
+    margin-right: 8rpx;
+  }
+
+  .item_tags .tags_item.ticket {
+    color: #E93323;
+    border: 1px solid #E93323;
+  }
+
+  .item_tags .tags_item.delivery {
+    color: #FF9000;
+    border: 1px solid #FF9000;
+  }
+
+  .productList .list .item .text .money {
+    display: flex;
+    align-items: center;
+    font-size: 26rpx;
+    font-weight: bold;
+    margin-top: 10rpx;
+    color: var(--view-priceColor);
+  }
+
+  .productList .list .item .text .money .num {
+    font-size: 34rpx;
+  }
+
+  .productList .distance {
+    display: flex;
+    align-items: center;
+    font-size: 24rpx;
+    color: #999999;
+
+    .icon-xiangyou {
+      font-size: 24rpx;
+      line-height: 24rpx;
+    }
+  }
+
+  .productList .list .item .text .money .ticket-big {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 163rpx;
+    height: 28rpx;
+    margin-left: 10rpx;
+    background-image: url(~static/images/yh.png);
+    background-size: 100% 100%;
+    font-size: 20rpx;
+    font-weight: normal;
+    padding: 0 10rpx;
+  }
+
+  .productList .list .item .text .score {
+    margin-top: 10rpx;
+    color: #737373;
+    font-size: 20rpx;
+  }
+
+  .productList .list .item .text .company {
+    display: flex;
+    align-items: center;
+    color: #737373;
+    font-size: 20rpx;
+    margin-top: 10rpx;
+
+    .name {
+      display: inline-block;
+      width: 200rpx;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    .flex {
+      display: flex;
+      align-items: center;
+      margin-left: 10rpx;
+      color: #282828;
+
+      .iconfont {
+        font-size: 16rpx;
+        margin-top: 4rpx;
+      }
+    }
+  }
+
+  .productList .list .item .foot-bar {
+    width: 100%;
+    height: 52rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-image: linear-gradient(-90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
+    border-radius: 0px 0px 16rpx 16rpx;
+    color: #fff;
+    font-size: 24rpx;
+
+    .icon-fenxiang {
+      font-size: 24rpx;
+      margin-right: 10rpx;
+    }
+
+    &.on {
+      position: absolute;
+      right: 0;
+      bottom: 30rpx;
+      width: 180rpx;
+      height: 44rpx;
+      border-radius: 22rpx;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 68db3b7..495d896 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -418,15 +418,6 @@
 </template>
 
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
   import request from "@/utils/request.js";
   import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
   import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
@@ -1084,20 +1075,21 @@
       },
       // 去商品详情页
       goGoodsDetail(item) {
+        console.log('item111', item);
         goShopDetail(item, this.uid).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
-              });
-            }).catch((err) => {
-              uni.showToast({
-                title: err,
-                icon: 'none'
-              })
-            });
+            // 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}`
+            //   });
+            // }).catch((err) => {
+            //   uni.showToast({
+            //     title: err,
+            //     icon: 'none'
+            //   })
+            // });
           } else {
             this.isAuto = true;
             this.isShowAuth = true
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index f9a63f8..0f20fe4 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -161,11 +161,11 @@
         })
       },
       go_shop() {
-        if (this.mer_id == 0) {
-          return Toast('当前区域没有云仓库')
-        }
+        // if (this.mer_id == 0) {
+        //   return Toast('当前区域没有云仓库')
+        // }
         uni.navigateTo({
-          url: '/pages/nongKe/cloud_entrepot/index'
+          url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}`
         })
         // uni.navigateTo({
         //   url: '/pages/store/home/index?id=' + this.mer_id + '&LihaiYun=Lihai'