From 6c6e0df6b4e73768cb731cffbb5be31536d7d045 Mon Sep 17 00:00:00 2001
From: cc_zbp <487602586@qq.com>
Date: Wed, 17 May 2023 17:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=B1=BB=E5=9E=8B=E5=BA=97=E9=93=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8Ctabr;=E4=BF=AE=E6=94=B9=E8=BD=AE=E6=92=AD=E5=9B=BE;?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E6=A0=B7=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                              | 177 +++++++++++++-----------
 components/zbpSwiper.vue                |  45 ++----
 config/app.js                           |  40 +++---
 pages/home/index.vue                    | 129 +----------------
 pages/nongKe/supply_chain/supplier.vue  |   2 +-
 pages/short_video/nvueSwiper/index.nvue |  28 ++--
 pages/store/home/index.vue              |  56 +++++---
 pages/supply_chains/supply_chains.vue   |  22 ++-
 8 files changed, 200 insertions(+), 299 deletions(-)

diff --git a/api/api.js b/api/api.js
index 80e20dd..d1e19e5 100644
--- a/api/api.js
+++ b/api/api.js
@@ -8,191 +8,202 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 import request from "@/utils/request.js";
+/**
+ * 获取里海云仓商品
+ * 
+ */
+export function getProductSpuAPI(id) {
+  return request.get(`product/spu/cloud_merchant/${id}`, {}, { noAuth: true });
+}
+
 /**
  * 公共接口 ，优惠券接口 , 行业此讯 , 手机号码注册
  * 
-*/
+ */
 /**
  * 获取主页数据 无需授权
  * 
-*/
-export function getIndexData()
-{
-  return request.get("common/home",{},{ noAuth : true});
+ */
+export function getIndexData() {
+  return request.get("common/home", {}, { noAuth: true });
 }
 /**
  * 获取app版本
  */
 export function getAppVersion() {
-  return request.get('appVersion',{},{noAuth:true});
+  return request.get('appVersion', {}, { noAuth: true });
 }
 /**
  * 获取登录授权login
  * 
-*/
-export function getLogo()
-{
-  return request.get('wechat/get_logo', {}, { noAuth : true});
+ */
+export function getLogo() {
+  return request.get('wechat/get_logo', {}, { noAuth: true });
 }
 /**
  * 保存form_id
  * @param string formId 
  */
 export function setFormId(formId) {
-  return request.post("wechat/set_form_id", { formId: formId});
+  return request.post("wechat/set_form_id", { formId: formId });
 }
 /**
  * 领取优惠卷
  * @param int couponId
  * 
-*/
-export function setCouponReceive(couponId){
-  return request.post('coupon/receive/'+couponId);
+ */
+export function setCouponReceive(couponId) {
+  return request.post('coupon/receive/' + couponId);
 }
 /**
  * 商铺优惠券列表
  * @param object data
-*/
-export function getShopCoupons(id){
-  return request.get('coupon/store/'+id,{},{ noAuth: true})
+ */
+export function getShopCoupons(id) {
+  return request.get('coupon/store/' + id, {}, { noAuth: true })
 }
 /**
  * 商品优惠券列表
  * @param object data
-*/
-export function getCoupons(data){
-  return request.get('coupon/product',data,{ noAuth: true})
+ */
+export function getCoupons(data) {
+  return request.get('coupon/product', data, { noAuth: true })
 }
 /**
  * 我的优惠券
  * @param int types 0全部  1未使用 2已使用
-*/
-export function getUserCoupons(data){
-  return request.get('coupon/list',data)
+ */
+export function getUserCoupons(data) {
+  return request.get('coupon/list', data)
 }
 /**
  * 文章分类列表
  * 
-*/
-export function getArticleCategoryList(){
-  return request.get('article/category/lst',{},{noAuth:true})
+ */
+export function getArticleCategoryList() {
+  return request.get('article/category/lst', {}, { noAuth: true })
 }
 /**
  * 文章列表
  * @param int cid
  * 
-*/
-export function getArticleList(cid,data){
-  return request.get('article/lst/' + cid, data,{noAuth:true})
+ */
+export function getArticleList(cid, data) {
+  return request.get('article/lst/' + cid, data, { noAuth: true })
 }
 /**
  * 文章 热门列表
  * 
-*/
-export function getArticleHotList(){
-  return request.get('article/hot/list',{},{noAuth:true});
+ */
+export function getArticleHotList() {
+  return request.get('article/hot/list', {}, { noAuth: true });
 }
 /**
  * 文章 轮播列表
  * 
-*/
-export function getArticleBannerList(){
-  return request.get('article/banner/list',{},{noAuth:true})
+ */
+export function getArticleBannerList() {
+  return request.get('article/banner/list', {}, { noAuth: true })
 }
 /**
  * 文章详情
  * @param int id 
  * 
-*/
-export function getArticleDetails(id){
-  return request.get('article/detail/'+id,{},{noAuth:true});
+ */
+export function getArticleDetails(id) {
+  return request.get('article/detail/' + id, {}, { noAuth: true });
 }
 /**
  * 手机号+验证码登录接口
  * @param object data
-*/
-export function loginMobile(data){
-  return request.post('login/mobile',data,{noAuth:true})
+ */
+export function loginMobile(data) {
+  return request.post('login/mobile', data, { noAuth: true })
 }
 /**
  * 获取短信KEY
  * @param object phone
-*/
-export function verifyCode(){
-  return request.get('verify_code', {},{noAuth:true})
+ */
+export function verifyCode() {
+  return request.get('verify_code', {}, { noAuth: true })
 }
 /**
  * 验证码发送
  * @param object phone
-*/
-export function registerVerify(phone, reset, key, code){
-  return request.post('register/verify', { phone: phone, type: reset === undefined ? 'reset' : reset, key: key, code: code },{noAuth:true})
+ */
+export function registerVerify(phone, reset, key, code) {
+  return request.post('register/verify', {
+    phone: phone,
+    type: reset === undefined ? 'reset' : reset,
+    key: key,
+    code: code
+  }, { noAuth: true })
 }
 /**
  * 手机号注册
  * @param object data
  * 
-*/
-export function phoneRegister(data){
-  return request.post('register',data,{noAuth:true});
+ */
+export function phoneRegister(data) {
+  return request.post('register', data, { noAuth: true });
 }
 /**
  * 手机号修改密码
  * @param object data
  * 
-*/
-export function phoneRegisterReset(data){
-  return request.post('register/reset',data,{noAuth:true})
+ */
+export function phoneRegisterReset(data) {
+  return request.post('register/reset', data, { noAuth: true })
 }
 /**
  * 手机号+密码登录
  * @param object data
  * 
-*/
-export function phoneLogin(data){
-  return request.post('login',data,{noAuth:true})
+ */
+export function phoneLogin(data) {
+  return request.post('login', data, { noAuth: true })
 }
 /* h5切换公众号登陆 */
 export function switchH5Login(data) {
   return request.post("user/switch", data);
 }
 /** 绑定手机号 */
-export function bindingPhone(data){
-  return request.post('user/binding',data);
+export function bindingPhone(data) {
+  return request.post('user/binding', data);
 }
 /** 修改手机号 */
-export function modifyPhone(data){
-  return request.post('user/change/phone',data);
+export function modifyPhone(data) {
+  return request.post('user/change/phone', data);
 }
 /** 修改密码 */
-export function modifyPassword(data){
-  return request.post('user/change/password',data);
+export function modifyPassword(data) {
+  return request.post('user/change/password', data);
 }
 /** 退出登錄 */
-export function logout(){
+export function logout() {
   return request.get('logout');
 }
 /** 获取订阅消息id */
-export function getTemlIds(){
-  return request.get('wechat/teml_ids', {}, { noAuth:true});
+export function getTemlIds() {
+  return request.get('wechat/teml_ids', {}, { noAuth: true });
 }
 /** 首页拼团数据 */
-export function pink(){
-  return request.get('pink', {}, { noAuth:true});
+export function pink() {
+  return request.get('pink', {}, { noAuth: true });
 }
 /** 获取城市信息 */
 export function getCity() {
-  return request.get('system/city/lst', { }, { noAuth: true });
+  return request.get('system/city/lst', {}, { noAuth: true });
 }
 export function getCityV2(pid) {
-	return request.get('v2/system/city/lst/'+pid, {}, {noAuth: true});
+  return request.get('v2/system/city/lst/' + pid, {}, { noAuth: true });
 }
-export function getCityList(address){
-	return request.get('v2/system/city', {address}, {noAuth: true});
+export function getCityList(address) {
+  return request.get('v2/system/city', { address }, { noAuth: true });
 }
 /** 获取小程序直播列表 */
-export function getLiveList(page,limit) {
-  return request.get('wechat/live', { page, limit}, { noAuth: true });
+export function getLiveList(page, limit) {
+  return request.get('wechat/live', { page, limit }, { noAuth: true });
 }
 /* APP登录 */
 export function wechatAppAuth(data) {
@@ -210,31 +221,31 @@ export function appletsDecrypt(data) {
  * 获取首页DIY；
  */
 export function getDiy(data) {
-  return request.get('diy',data,{ noAuth: true });
+  return request.get('diy', data, { noAuth: true });
 }
 /**
  * 获取首页微页面；
  */
 export function getPageDiy(data) {
-	return request.get(`micro`, data, {
-		noAuth: true
-	});
+  return request.get(`micro`, data, {
+    noAuth: true
+  });
 }
 /**
  * 滑块信息
  * @param {Object} data
  */
 export function getAjcaptcha(data) {
-	return request.get("ajcaptcha", data, {
-		noAuth: true
-	});
+  return request.get("ajcaptcha", data, {
+    noAuth: true
+  });
 }
 /**
  * 滑块验证
  * @param {Object} data
  */
 export function ajcaptchaCheck(data) {
-	return request.post("ajcheck", data, {
-		noAuth: true
-	});
+  return request.post("ajcheck", data, {
+    noAuth: true
+  });
 }
\ No newline at end of file
diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index bd5f6e9..caef2b8 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -28,8 +28,7 @@
         indicator-active-color="#fff">
         <block v-for="(item,index) in swiper['url']" :key="index">
           <swiper-item class="swi_item">
-            <u--image radius="15" :showLoading="true" :src="item.img" width="694.74rpx" height="242.11rpx"
-              mode="aspectFill">
+            <u--image :showLoading="true" :src="item.img" width="694.74rpx" height="242.11rpx" mode="aspectFill">
             </u--image>
           </swiper-item>
         </block>
@@ -41,17 +40,11 @@
 </template>
 
 <script>
-  import {
-    getArea,
-    getStreet
-  } from '@/api/article.js';
-  import {
-    getIndexData,
-    getDiy
-  } from '@/api/api.js'
+  import { getArea, getStreet } from '@/api/article.js';
+  import { getIndexData, getDiy } from '@/api/api.js'
   import { getGeocoder } from '@/api/store.js';
-
   import { mapGetters } from 'vuex'
+  import { Toast } from '../libs/uniApi';
   export default {
     props: {
       isSelectPlace: {
@@ -83,13 +76,11 @@
     // computed: mapGetters(['location']),
     watch: {},
     created() {
-      //#ifdef APP
-      this.selfLocation()
-      //#endif
-      // const loca = JSON.parse(this.location)
-      // this.street = loca.address_component.street
       this.getBanner()
       this.Area()
+      this.selfLocation()
+      // const loca = JSON.parse(this.location)
+      // this.street = loca.address_component.street
     },
     methods: {
       selectLocation() {
@@ -149,27 +140,13 @@
               this.location_address = res.data.address;
               this.recommend_address = res.data.formatted_addresses.recommend.length > 4 ? res.data
                 .formatted_addresses.recommend.slice(0, 7) + '...' : res.data.formatted_addresses.recommend
-            }).catch(err => {
-              uni.showToast({
-                title: err,
-                icon: 'none'
-              })
-            })
-          },
-          fail: (res) => {
-            uni.showToast({
-              title: res,
-              icon: 'none',
-              duration: 1000
-            });
+            }).catch(err => Toast(err))
           },
+          fail: (err) => { Toast(err) },
         });
       },
       swiperChange(e) {
-        let {
-          current,
-          source
-        } = e.detail;
+        let { current, source } = e.detail;
         if (source === 'autoplay' || source === 'touch') {
           this.bgColor = this.swiper.url[e.detail.current]['img']
         }
@@ -309,6 +286,8 @@
         width: 694.74rpx;
         height: 242.11rpx;
         margin: 0 auto;
+        border-radius: 15px;
+        overflow: hidden;
 
         .swi_item {
           width: 100%;
diff --git a/config/app.js b/config/app.js
index cf87715..94b6bed 100644
--- a/config/app.js
+++ b/config/app.js
@@ -7,27 +7,25 @@ let httpApi
 let httpApiTwo
 let httpApiThree
 // 网络接口修改此字符 小程序域名要求https
-// let httpApi = 'http://192.168.31.110:8324' //测试
-httpApi = 'https://shop.lihaink.cn' //生产
-// httpApi = 'http://192.168.0.222:8324' //生产
-httpApiTwo = 'https://nk.lihaink.cn' //生产
-
-// if (process.env.NODE_ENV === "development") {
-//   httpApi = "https://crmeb-test.shop.lihaink.cn"
-//   // #ifdef MP-WEIXIN
-//   httpApiTwo = "http://cms.com"
-//   httpApiThree = 'http://ceshi-oa.lihaink.cn'
-//   // #endif
-//   // #ifdef H5
-//   // httpApiTwo = "baseUrl" // h5跨域配置
-//   httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
-//   // httpApiThree = 'baseUrlTest' // h5跨域配置
-//   // #endif
-// } else if (process.env.NODE_ENV === 'production') {
-//   httpApi = 'https://shop.lihaink.cn' // 生产
-//   httpApiTwo = 'https://nk.lihaink.cn' // 生产
-//   httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
-// }
+// let httpApi = 'http://192.168.31.110:8324' // 测试
+if (process.env.NODE_ENV === "development") {
+  httpApi = "https://crmeb-test.shop.lihaink.cn"
+  // #ifdef MP-WEIXIN
+  httpApiTwo = "http://cms.com"
+  httpApiThree = 'http://ceshi-oa.lihaink.cn'
+  // #endif
+  // #ifdef H5
+  // httpApiTwo = "baseUrl" // h5跨域配置
+  httpApiTwo = "https://nk.lihaink.cn" // h5跨域配置
+  // httpApiThree = 'baseUrlTest' // h5跨域配置
+  // #endif
+} else if (process.env.NODE_ENV === 'production') {
+  httpApi = 'https://shop.lihaink.cn' // 生产
+  httpApiTwo = 'https://nk.lihaink.cn' // 生产
+  httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
+}
+// httpApi = 'https://shop.lihaink.cn' // 生产
+// httpApiTwo = 'https://nk.lihaink.cn' // 生产
 
 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net
 // let wsApi = 'ws://192.168.3.20:8324'
diff --git a/pages/home/index.vue b/pages/home/index.vue
index c5a4647..11fd0cf 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -250,121 +250,6 @@
     // background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
   }
 
-  // 顶部
-  .head-wrapper {
-    position: relative;
-    padding-top: 78.95rpx;
-    overflow: hidden;
-
-    .color-lump {
-      z-index: 1;
-      position: absolute;
-      bottom: -86px;
-      left: 50%;
-      transform: translate(-50%, 0);
-      width: 102%;
-      height: 133px;
-      border-radius: 30px 30px 0 0;
-      background-color: #fff;
-    }
-
-    .bg-img {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      top: 0;
-      /* #ifdef MP || APP-PLUS */
-      z-index: -1;
-      /* #endif */
-      /* #ifdef H5 */
-      z-index: 0;
-      /* #endif */
-      z-index: 0;
-      filter: blur(0);
-      overflow: hidden;
-
-      img {
-        width: 100%;
-        height: 100%;
-        filter: blur(30rpx);
-        transform: scale(1.5);
-      }
-    }
-
-    .site-box {
-      margin: 0 auto;
-      width: 694.74rpx;
-      height: 66.67rpx;
-      margin-bottom: 26.32rpx;
-      position: relative;
-
-      // 位置
-      .place_wrapper {
-        color: #fff;
-        margin-right: 24.56rpx;
-        font-size: 31.58rpx;
-
-        .town_name {
-          margin-left: 10.53rpx;
-        }
-      }
-
-      .iconfont {
-        font-size: 35.09rpx;
-      }
-    }
-
-    .my-main {
-      transition: background-color .5s ease;
-    }
-
-    .search_content {
-      margin: 0 auto;
-      width: 694.74rpx;
-      height: 61.4rpx;
-      padding: 2px 2px 2px 21.05rpx;
-      border-radius: 100px;
-      background: #fff;
-      margin-bottom: 17.54rpx;
-      position: relative;
-      box-sizing: border-box;
-
-      .icon-sousuo {
-        font-size: 26.32rpx;
-        font-weight: bold;
-        color: #c8c7c6;
-        margin-right: 17.54rpx;
-      }
-
-      .search_btn {
-        color: #fff;
-        width: 105.26rpx;
-        height: 52.63rpx;
-        line-height: 52.63rpx;
-        background: #f84221;
-        border-radius: 100px;
-        font-size: 28.07rpx;
-      }
-    }
-
-    .supply_chains-head {
-      margin-bottom: 31.58rpx;
-      position: relative;
-      z-index: 2;
-
-      .swiper {
-        width: 694.74rpx;
-        height: 242.11rpx;
-        margin: 0 auto;
-
-        .swi_item {
-          width: 100%;
-          height: 242.11rpx;
-        }
-      }
-    }
-  }
-
   .Circle_friends {
     position: relative;
     padding: 0 0 87.72rpx 0;
@@ -377,18 +262,6 @@
   }
 
 
-
-  .bg_color {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 1;
-    width: 100%;
-    height: 940.35rpx;
-    background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/home_bg.png") no-repeat;
-    background-size: cover;
-  }
-
   .search_wrapper {
     width: 694.74rpx;
     margin: 0 auto;
@@ -396,7 +269,7 @@
 
   .tabs_wrapper {
     width: 694.74rpx;
-    margin: 38.6rpx auto;
+    margin: 0 auto;
     margin-bottom: 21.05rpx;
   }
 
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 85d5759..f308486 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -478,7 +478,7 @@
         } else {
           if (this.hide_mer_status != 1) {
             uni.navigateTo({
-              url: `/pages/store/home/index?id=${id}`
+              url: `/pages/store/home/index?id=${id}&type=7`
             })
           }
         }
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index c7e7139..2f3b8fb 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -193,7 +193,7 @@
         </view>
       </swiper-item>
     </swiper>
-    <view class="video-list" v-if="currentNav === 3"
+    <scroll-view scroll-y="true" v-if="currentNav === 3" class="video-list"
       :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
       <block v-for="(item,index) in cateGoods" :key="item.uid">
         <view class="goods_item" @click="gogogo(item)">
@@ -214,7 +214,11 @@
           </view>
         </view>
       </block>
-    </view>
+    </scroll-view>
+    <!-- <view class="video-list" v-if="currentNav === 3"
+      :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
+      
+    </view> -->
     <view class="noVideo acea-row row-center-wrapper" v-if="!dataList.length && !loadVideo && currentNav !== 3">
       <view>
         <image :src="imgHost+'/static/no-video.png'" class="pictrue"></image>
@@ -452,7 +456,8 @@
        * 视频列表相关方法
        * 获取视频列表
        */
-      gogogo() {
+      gogogo(item) {
+        this.videoID = item.community_id
         this.navTap(1)
       },
       async getGoods() {
@@ -1060,13 +1065,7 @@
 
 <style lang="scss" scoped>
   .video-list {
-    margin: 0 auto;
-    width: 694.74rpx;
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: initial;
-    justify-content: space-between;
-    padding: 122.81rpx 28.07rpx 0 28.07rpx;
+    padding: 200rpx 28.07rpx 28.07rpx 28.07rpx;
     /* #ifdef MP */
     padding-top: 200rpx;
     /* #endif */
@@ -1077,9 +1076,14 @@
       border-radius: 8px;
       overflow: hidden;
       background-color: #fff;
-      display: flex;
+      display: inline-block;
       flex-direction: column;
       margin-bottom: 10.53rpx;
+      margin-right: 10.53rpx;
+
+      &:nth-child(2n) {
+        margin-right: 0;
+      }
 
       .goods_img {
         width: 100%;
@@ -1155,6 +1159,8 @@
         }
       }
     }
+
+
   }
 
   .header {
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 9dd63f9..1ccc501 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -119,7 +119,7 @@
           {{ store.care ? '已关注' : '关注' }}
         </button>
       </view>
-      <view v-show="!navShow && tabActive === 3" class="nav">
+      <view v-show="!navShow && tabActive === 3 || tabActive === 7" class="nav">
         <view class="nav-cont">
           <view :class="{ active: navActive === 0 }" class="item" @click="navActive = 0;select.show = !select.show">
             <view class="cont">
@@ -217,7 +217,7 @@
           <!-- #endif -->
         </view>
         <!-- 首页 -->
-        <view v-show="(tabActive == 3 || diyActive == 1 || diyActive == 2) && tabActive != 5">
+        <view v-show="(tabActive == 3 || tabActive == 7 || diyActive == 1 || diyActive == 2) && tabActive != 5">
           <!-- 商品 -->
           <view v-if="goods.length" class="goods-wrap" id="goods" @touchmove="onTouchmove">
             <view v-if="isColumn" class="goods column">
@@ -439,7 +439,7 @@
     storeServiceList
   } from '@/api/store.js';
   import { initiateAssistApi, getTopicList } from '@/api/activity.js';
-  import { getShopCoupons, setCouponReceive, getDiy } from '@/api/api.js';
+  import { getShopCoupons, setCouponReceive, getDiy, getProductSpuAPI } from '@/api/api.js';
   import { getUserInfo } from '@/api/user.js';
   import { configMap } from "@/utils";
   import { mapGetters } from "vuex";
@@ -600,14 +600,24 @@
           }
         ],
         tabs3: [{
+            icon: 'icon-yizhan_o',
+            name: '云商品',
+            value: 7,
+          }, {
             icon: 'icon-gouwu_o',
             name: '商品',
             value: 3,
           },
           {
-            icon: 'icon-yizhan_o',
-            name: '里海云仓',
-            value: 6,
+            icon: 'icon-yingyongAPP_o',
+            name: '分类',
+            value: 2,
+          }
+        ],
+        tabs4: [{
+            icon: 'icon-gouwu_o',
+            name: '商品',
+            value: 3,
           },
           {
             icon: 'icon-yingyongAPP_o',
@@ -623,7 +633,8 @@
         topicList: [],
         service_open: false,
         type: 3,
-        statusBarHeight: 0
+        statusBarHeight: 0,
+        isLihaiYun: ''
       }
     },
     computed: {
@@ -677,10 +688,14 @@
           case 6:
             this.getCoupon();
             break;
+          case 7:
+            this.getProductSpu()
+            break;
         }
       },
     },
     onLoad: function(options) {
+      this.isLihaiYun = options.LihaiYun // 是否是里海云仓
       this.type = parseInt(options.type) || 3
       this.id = options.mer_id || options.id || 0;
       this.isCoupon = options.coupon || 0;
@@ -754,6 +769,12 @@
       }).exec();
     },
     methods: {
+      async getProductSpu() {
+        console.log('获取云仓商品', this.id);
+        const { data } = await getProductSpuAPI(this.id)
+        this.goods = data.list
+        console.log('data', data);
+      },
       //#ifndef H5
       call: function() {
         wx.makePhoneCall({
@@ -892,15 +913,15 @@
       getStore: function() {
         getStoreDetail(this.id).then(res => {
           this.store = res.data;
-          if ((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data.delivery_way
-            .length == 2) {
-            this.tabs = this.tabs1
-            this.service_open = true
-          } else {
-            this.tabs = this.tabs2
-            this.service_open = false
-          }
-          this.tabs = this.tabs3
+          // if ((res.data.delivery_way.length == 1 && res.data.delivery_way[0] == '1') || res.data.delivery_way
+          //   .length == 2) {
+          //   this.tabs = this.tabs1
+          //   this.service_open = true
+          // } else {
+          //   this.tabs = this.tabs2
+          //   this.service_open = false
+          // }
+          this.isLihaiYun === 'Lihai' ? this.tabs = this.tabs4 : this.tabs = this.tabs3
           this.tab(this.type)
           // #ifdef H5
           this.ShareInfo();
@@ -918,14 +939,12 @@
       },
       // 获取商铺商品
       getGoods: function() {
-        console.log('获取店铺商品');
         let that = this;
         if (that.loadend) return;
         if (that.loading) return;
         if (that.goodsLoading) return;
         that.goodsLoading = true;
         that.loadTitle = '';
-        console.log('111');
         getStoreGoods(that.id, that.where).then(res => {
           that.goodsLoading = false;
           let list = res.data.list;
@@ -1095,6 +1114,7 @@
       },
       // 商铺底部切换
       tab: function(param) {
+        this.goods = []
         this.tabActive = param;
         this.goodsLoading = this.loadend = this.loading = false
       },
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index eb58500..9dc42a2 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -4,13 +4,15 @@
       <zbpSwiper :isSelectPlace="true" @selectPlce="selectPlce"></zbpSwiper>
       <view class="shop_wrapper">
         <navigator class="l_yun" hover-class="none"
-          :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`">
-          <view class="text-name">
+          :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`"
+          :style=" {'background-image': `url(${bgData[0].pic})`}">
+          <view class=" text-name">
             <text>{{town||JSON.parse(location).address_component.street}}</text>
             <view class="name_town">-供销综合云市场-</view>
           </view>
         </navigator>
-        <navigator class="r_lihai" hover-class="none" :url="`/pages/store/home/index?id=322`">
+        <navigator class="r_lihai" hover-class="none" :url="`/pages/store/home/index?id=${store_id}&LihaiYun=Lihai`"
+          :style=" {'background-image': `url(${bgData[1].pic})`}">
           <view class="title">里海云仓</view>
         </navigator>
       </view>
@@ -83,6 +85,7 @@
   import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
   import { graphicStartApi } from '@/api/community.js'
   import { getArticleList, getArticleCategoryList } from '@/api/api.js'
+  import { getHotBanner } from '@/api/store.js'
   import { Toast } from '@/libs/uniApi'
   export default {
     components: {
@@ -99,10 +102,15 @@
         emptyShow: false,
         articleList: [],
         recoList: [],
-        street_id: ''
+        street_id: '',
+        bgData: [{ pic: '' }, { pic: '' }],
+        store_id: ''
       }
     },
     onLoad() {
+      getHotBanner('good').then(res => {
+        this.bgData = res.data
+      })
       uni.$on('resetLocation', function() {
         console.log('resetLocation');
       })
@@ -115,6 +123,8 @@
     computed: mapGetters(['location']),
     methods: {
       selectPlce(e) {
+        this.street_id = e.value[1].code
+        this.store_id = e.value[1].id
         this.town = e.value[1].name
       },
       navigat() {
@@ -163,6 +173,10 @@
 </script>
 
 <style lang="scss" scoped>
+  .Circle_friends {
+    background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
+  }
+
   .shop_wrapper {
     height: 192.98rpx;
     width: 694.74rpx;