1.1.0

components/My_SupplyAndDemandItemBox/index.wxml

@@ -18,7 +18,7 @@
             <image wx:elif="{{type=='商业培训'}}" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/supplyAndDemand/icon-05.png" mode="aspectFit"></image>
             <image wx:elif="{{type=='寻找主播'}}" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/supplyAndDemand/icon-06.png" mode="aspectFit"></image>
             <image wx:elif="{{type=='面料设计'}}" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/supplyAndDemand/icon-07.png" mode="aspectFit"></image>
-            <image wx:else src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/tacitly-approve/MRproduct.png" mode="aspectFit"></image>
+            <image wx:else src="/static/supplyAndDemand/default.jpg" mode="aspectFit"></image>
         </view>
         <view class="supply-and-demand-time">{{time}}</view>
     </view>

pages/liveStreaming/index.js

@@ -9,7 +9,7 @@ Page({
    */
   data: {
     dataTypes: 0, //0-全部数据 1-单独数据
-    tabsList: ["私域直播", "展会直播", "合作商直播"], //tabs列表
+    tabsList: ["我要直播", "合作商直播"], //"展会直播" tabs列表
     buttonTabs: ["当前直播", "历史直播"], //按钮tabs
     tabsIndex: 0, //tabs下标
     accountStatus: -1, //直播账号状态 1-账号正常 2-账号审核中 3-没有账号
@@ -25,6 +25,7 @@ Page({
     isSy: true, //是否为私域直播
     myShowModel: false, //自定义model
     myShowModel2: false, // 真正申请中提示
+    myShowMode3: false,
     listRowIndex: -1, //列表选中项
     CheckTheType: '当前直播', //查看类型
     onlineNumber: 0, //实时观看人数
@@ -165,14 +166,24 @@ Page({
   }) {
     if (detail == 'true') this.copyTheAddress(this.data.accountMsg.fliveurl_web);
   },
+  showModelCallBack1({
+    detail
+  }) {
+    if (detail == 'true') this.copyTheAddress(this.data.accountMsg.fliveurl_client);
+  },
   /* 显示自定义model */
   showMyModel() {
     this.setData({
       myShowModel: true
     })
   },
+  showMyMode3() {
+    this.setData({
+      myShowMode3: true
+    })
+  },
   /* 申请直播账号 */
-  applyForLive() {
+  /* applyForLive() {
     _Http.basic({
       "accesstoken": wx.getStorageSync('userData').token,
       "classname": "customer.live.live",
@@ -193,7 +204,7 @@ Page({
         })
       }
     })
-  },
+  }, */
   /* 复制地址 */
   copyTheAddress(e) {
     const url = (typeof e == "string" || typeof e == String) ? e : e.target.dataset.url;
@@ -210,7 +221,8 @@ Page({
   },
   /* 获取直播账号详情 */
   getLiveInfo() {
-    const method = (this.data.tabsIndex == 0) ? 'getSYLiveInfo' : 'getLiveInfo';
+    /* const method = (this.data.tabsIndex == 0) ? 'getSYLiveInfo' : 'getLiveInfo'; */
+    const method = 'getLiveInfo';
     _Http.basic({
       "accesstoken": wx.getStorageSync('userData').token,
       "classname": "customer.live.live",
@@ -232,7 +244,8 @@ Page({
   },
   /* 直播场次列表查询 */
   getLiveSessionList() {
-    const method = (this.data.tabsIndex == 0) ? "getSYLiveSessionList" : "getLiveSessionList"
+    /*  const method = (this.data.tabsIndex == 0) ? "getSYLiveSessionList" : "getLiveSessionList" */
+    const method = "getLiveSessionList";
     _Http.basic({
       "accesstoken": wx.getStorageSync('userData').token,
       "classname": "customer.live.live",
@@ -274,11 +287,13 @@ Page({
       showStartTime: this.data.liveSessionList[index].starttime,
       sessionid
     })
+    /*  const method = (this.data.tabsIndex == 0) ? "getSYLiveDataCountForSession" : "getLiveDataCountForSession" */
+    const method = 'getLiveDataCountForSession';
     /* 场次详情统计 */
     _Http.basic({
       "accesstoken": wx.getStorageSync('userData').token,
       "classname": "customer.live.live",
-      "method": "getSYLiveDataCountForSession",
+      "method": method,
       "content": {
         "sessionid": sessionid
       }
@@ -301,7 +316,8 @@ Page({
   /* 观看用户列表 */
   LiveUserList() {
     /* 用户观看列表 */
-    const method = (this.data.tabsIndex == 0) ? "getSYLiveUserList" : "getLiveUserList";
+    /* const method = (this.data.tabsIndex == 0) ? "getSYLiveUserList" : "getLiveUserList"; */
+    const method = "getLiveUserList";
     _Http.basic({
       "accesstoken": wx.getStorageSync('userData').token,
       "classname": "customer.live.live",
@@ -391,8 +407,9 @@ Page({
       userPageNumber: 1,
       userPageTotal: 1
     });
-    if (detail != 2) this.getLiveInfo();
-    if (detail == 2) this.getCooperationAgentsLiveList();
+    // if (detail != 2) this.getLiveInfo();
+    if (detail == 0) this.getLiveInfo();
+    if (detail == 1) this.getCooperationAgentsLiveList();
   },
   /* 获取合作商直播列表 */
   getCooperationAgentsLiveList() {
@@ -408,38 +425,38 @@ Page({
     })
   },
   /* 查看合作商直播 */
-  toLive(e) {
-    const {
-      index
-    } = e.currentTarget.dataset,
-      data = this.data.partnerLiveList[index];
-    if (data.fisneedauth == 1) {
-      _Http.basic({
-        "accesstoken": wx.getStorageSync('userData').token,
-        "classname": "enterprise.live.live",
-        "method": "liveauthorization",
-        "content": {
-          "tliveid": data.tliveid
-        }
-      }).then(res => {
-        console.log(res)
-        if (res.data != '成功') return wx.showToast({
-          title: '网络错误，请稍后再试',
+  /*   toLive(e) {
+      const {
+        index
+      } = e.currentTarget.dataset,
+        data = this.data.partnerLiveList[index];
+      if (data.fisneedauth == 1) {
+        _Http.basic({
+          "accesstoken": wx.getStorageSync('userData').token,
+          "classname": "enterprise.live.live",
+          "method": "liveauthorization",
+          "content": {
+            "tliveid": data.tliveid
+          }
+        }).then(res => {
+          console.log(res)
+          if (res.data != '成功') return wx.showToast({
+            title: '网络错误，请稍后再试',
+          })
+          let str = res.msg;
+          const url = str.slice(0, 8) + '04de51d4c1.' + str.slice(8);
+          wx.navigateTo({
+            url: '/pages/webView/index?url=' + encodeURIComponent(url),
+          })
         })
-        let str = res.msg;
+      } else {
+        let str = data.fliveshowurl;
         const url = str.slice(0, 8) + '04de51d4c1.' + str.slice(8);
         wx.navigateTo({
-          url: '/pages/webView/index?url=' + encodeURIComponent(url),
+          url: '/pages/webView/index?url=' + encodeURIComponent(url)
         })
-      })
-    } else {
-      let str = data.fliveshowurl;
-      const url = str.slice(0, 8) + '04de51d4c1.' + str.slice(8);
-      wx.navigateTo({
-        url: '/pages/webView/index?url=' + encodeURIComponent(url)
-      })
-    }
-  },
+      }
+    }, */
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/liveStreaming/index.json

@@ -1,6 +1,7 @@
 {
   "usingComponents": {
     "My_liveAccountMsg": "/components/My_liveAccountMsg/index",
-    "My_RoundedCornerButtonTabs": "/components/My_RoundedCornerButtonTabs/index"
+    "My_RoundedCornerButtonTabs": "/components/My_RoundedCornerButtonTabs/index",
+    "liveList": "/pages/portal/portalLive/live"
   }
 }

pages/liveStreaming/index.wxml

@@ -1,8 +1,9 @@
 <My_NavTabs tabsList="{{tabsList}}" tabsIndex="{{tabsIndex}}" bindsetIndex="setIndex" />
-<view hidden="{{tabsIndex==2}}">
+<view hidden="{{tabsIndex==1}}">
     <!-- 直播账号信息 -->
     <My_liveAccountMsg title='直播账号信息'>
         <view slot='but' wx:if="{{accountStatus==1}}" class="msgBox-but">
+            <van-button custom-class="custom-class-msgBox-but setButton" catchtap="showMyMode3">直播间设置</van-button>
             <van-button custom-class="custom-class-msgBox-but" catchtap="showMyModel">我要开播</van-button>
         </view>
         <view slot='con'>
@@ -20,13 +21,19 @@
                     <view class="row-content u-line-1">{{accountMsg.fliveurl_web}}</view>
                     <view class="row-title copy" data-url='{{accountMsg.fliveurl_web}}' catchtap="copyTheAddress">复制</view>
                 </view>
+                <view class="live-msg-row">
+                    <view class="row-title">管理端开播地址</view>
+                    <view class="row-content u-line-1">{{accountMsg.fliveurl_client}}</view>
+                    <view class="row-title copy" data-url='{{accountMsg.fliveurl_client}}' catchtap="copyTheAddress">复制</view>
+                </view>
             </view>
-            <view wx:if="{{accountStatus!=1 && isSy}}" class="go-to-apply-for" catchtap="applyForLive">
-                {{accountStatus==3?'暂无账号 点击申请 ':'正在申请中 请稍等 '}}<image style="width: 20rpx; height: 22rpx; margin-left: 8rpx;" src="/static/icon-07.png"></image>
+            <!-- {{accountStatus!=1 && isSy}} 暂无账号 点击申请 -->
+            <view wx:if="{{accountStatus!=1}}" class="go-to-apply-for" catchtap="applyForLive">
+                {{accountStatus==3?'暂无账号':'正在申请中 请稍等 '}}<image style="width: 20rpx; height: 22rpx; margin-left: 8rpx;" src="/static/icon-07.png"></image>
             </view>
-            <view wx:if="{{accountStatus!=1 && !isSy}}" class="go-to-apply-for">
+            <!-- <view wx:if="{{accountStatus!=1 && !isSy}}" class="go-to-apply-for">
                 暂无展会直播账号
-            </view>
+            </view> -->
         </view>
     </My_liveAccountMsg>
     <!-- 观看信息 -->
@@ -127,23 +134,14 @@
         <My_paging show="{{liveSessionList.length>=1}}" count='{{dataTypes==0?pageNumber:userPageNumber}}' bind:lifeClick='buttonLifeClick' bind:rightClick='buttonRightClick'></My_paging>
     </view>
 </view>
-<view hidden="{{tabsIndex!=2}}">
+<view hidden="{{tabsIndex!=1}}">
     <My_liveAccountMsg title='观看信息'>
-        <view slot='con' class="clearfix" style="padding-left: 10rpx;">
-            <view wx:for="{{partnerLiveList}}" class="exhibition" data-index="{{index}}" catchtap="toLive">
-                <image class="exhibition-img" src="{{item.channelcoverimageurl}}" mode="aspectFill"></image>
-                <view class="exhibition-bottom">
-                    <view class="exhibition-bottom-title u-line-1">{{item.fagentname}}</view>
-                    <view class="exhibition-bottom-data">
-                        <image src="/static/icon-11.png" />
-                        <view class="exhibition-bottom-data-text u-line-1">{{item.viewers}}</view>
-                    </view>
-                </view>
-            </view>
-        </view>
+        <liveList slot='con' list='{{partnerLiveList}}'></liveList>
     </My_liveAccountMsg>
 </view>
 <!-- 自定义model -->
+<My_showModel isShow='{{myShowMode3}}' content="管理地址:{{accountMsg.fliveurl_client}}" confirm='一键复制' cancel='知道了' bindcallBack='showModelCallBack1' />
+<!-- 自定义model -->
 <My_showModel isShow='{{myShowModel}}' content="直播地址:{{accountMsg.fliveurl_web}}" confirm='一键复制' cancel='知道了' bindcallBack='showModelCallBack' />
 <!-- 自定义model -->
-<My_showModel isShow='{{myShowModel2}}' content="您的私域直播账号正在申请中" hideCancel />
+<My_showModel isShow='{{myShowModel2}}' content="您的直播账号正在申请中" hideCancel />

pages/liveStreaming/index.wxss

@@ -98,7 +98,11 @@
     font-family: PingFangSC-Medium, PingFang SC;
     border: 0 !important;
 }
-
+.setButton {
+    width: 128rpx !important;
+    background: #4DC2D4 !important;
+    margin-right: 14rpx !important;
+}
 /* 直播账号信息 */
 .live-msg {
     width: 100%;
@@ -173,11 +177,6 @@
     height: 386rpx;
 }
 
-.exhibition {
-    float: left;
-    margin-top: 10rpx;
-}
-
 .live-chat-mag {
     display: flex;
     width: 100%;

pages/portal/index.js

@@ -37,10 +37,9 @@ Page({
         _Http.basic({
             "classname": "publicmethod.homepage.homepage",
             "method": "getNewestNoticeList",
-            "content": {
-                "pageSize": 3
-            }
+            "content": {}
         }).then(res => {
+            console.log(res)
             if (res.msg != '成功') {
                 wx.showToast({
                     title: res.data,
@@ -48,8 +47,14 @@ Page({
                 });
             } else {
                 processingData.imageType(res.data, 'cover');
+                let list = [];
+                if (res.data.length > 3) {
+                    list=res.data.slice(0,3)
+                } else {
+                    list = res.data;
+                }
                 this.setData({
-                    annunciateList: res.data
+                    annunciateList: list
                 })
             }
         });
@@ -67,12 +72,17 @@ Page({
                     icon: "none"
                 });
             } else {
+                res.data.unshift({
+                    ftype: "全部"
+                })
+                // return console.log(res.data)
                 this.setData({
                     sadClassify: res.data
                 })
             }
         });
-        //获取全部供需列表 this.query_supplyanddemandList('')
+        //获取全部供需列表 
+        this.query_supplyanddemandList('');
         //获取直播列表
         _Http.basic({
             "classname": "publicmethod.live.live",
@@ -280,19 +290,6 @@ Page({
         })
         if (ftype == '沙发布') this.getHotAgentsList('窗帘布')
     },
-    /* 老 品牌关注榜选项 */
-    /*     selectOption(e) {
-            let index = null;
-            if (e.target.dataset.index) {
-                index = e.target.dataset.index;
-            } else {
-                index = e.detail.current;
-            }
-            if (index == this.data.brandSelect) return;
-            this.setData({
-                brandSelect: index
-            })
-        }, */
     /* 跳转供需详情 */
     toDetails(e) {
         const {
@@ -318,8 +315,12 @@ Page({
         this.setData({
             tabsActive: index
         })
-        if (index != 0) this.query_supplyanddemandList(title);
-        // (title == '全部供需') ? this.query_supplyanddemandList(''): this.query_supplyanddemandList(title);
+        console.log(title)
+        if (title == '全部') {
+            this.query_supplyanddemandList('')
+        } else {
+            this.query_supplyanddemandList(title);
+        }
     },
     /* 拉取供需分类列表 */
     query_supplyanddemandList(type) {

pages/portal/index.wxml

@@ -5,7 +5,7 @@
 <!-- 轮播图 -->
 <My_BannerSwiper swiperBannerList="{{swiperBannerList}}"></My_BannerSwiper>
 <!-- 最新通告 -->
-<view class="annunciate">
+<view class="annunciate" wx:if="{{annunciateList.length!=0}}">
     <!-- 标题 -->
     <view class="annunciate_title">
         <view class="annunciate_decorate"></view>
@@ -15,7 +15,8 @@
     <view class="annunciate_content">
         <swiper class="annunciate_content_swiper" autoplay circular indicator-dots indicator-color='rgba(216,216,216,.58)' indicator-active-color='#57C7D3'>
             <swiper-item wx:key="index" wx:for="{{annunciateList}}">
-                <image src="{{item.attinfos[0].fobsurl}}"></image>
+                <image wx:if="{{item.attinfos[0]}}" src="{{item.attinfos[0].fobsurl}}"></image>
+                <image src="/static/annunciate/cover.png"></image>
             </swiper-item>
         </swiper>
         <view class="annunciate_show">
@@ -30,7 +31,7 @@
     </view>
 </view>
 <!-- 广告位1 -->
-<My_BannerSwiper type="advertising" marTop='40' swiperBannerList="{{portal_middle_1}}" />
+<!-- <My_BannerSwiper type="advertising" marTop='40' swiperBannerList="{{portal_middle_1}}" /> -->
 <!-- 品牌关注榜 -->
 <view class="annunciate" style="padding-top: 40rpx;">
     <!-- 标题 -->
@@ -59,81 +60,38 @@
         </view>
     </view>
 </view>
-<!-- 老 品牌关注榜 -->
-<!-- <view class="concerns-box">
-    <view class="concerns-con">
-        <view class="concerns-title">品牌关注榜</view>
-        <view class="option-box" bindtap="selectOption">
-            <view class="brand-type type-top {{brandSelect=='0'?'typeavtion':''}}">沙发布</view>
-            <view class="brand-type type-bot {{brandSelect=='1'?'typeavtion':''}}">窗帘布</view>
-            <view class="option op-top {{brandSelect=='0'?'opavtion':''}}" data-index="0"></view>
-            <view class="option op-bot {{brandSelect=='1'?'opavtion':''}}" data-index="1"></view>
-        </view>
-        <swiper class="option-swiper" current='{{brandSelect}}' circular vertical bindchange='selectOption'>
-            <swiper-item>
-                <view class="brand-item u-line-1" wx:key="index" wx:for="{{brandList0}}">
-                    <text>{{item.queryrow<10?'0'+item.queryrow:item.queryrow}} </text>{{item.fname}}
-                </view>
-            </swiper-item>
-            <swiper-item>
-                <view class="brand-item u-line-1" wx:key="index" wx:for="{{brandList1}}">
-                    <text>{{item.queryrow<10?'0'+item.queryrow:item.queryrow}} </text>{{item.fname}}
-                </view>
-            </swiper-item>
-        </swiper>
-    </view>
-    <image class="concerns-bg" src="/static/portal/bg.png"></image>
-</view> -->
-<!-- 新品推荐 -->
-<view class="new-product">
-    <view>
-        <view class="new-product-title">
-            <view></view> 窗帘布新品 <view></view>
-        </view>
-        <swiper class="new-product-swiper" circular current='{{newProductIndex1}}' indicator-dots indicator-color='rgba(216,216,216,.58)' indicator-active-color='#57C7D3' bindchange='newProduct1'>
-            <swiper-item wx:key="index" wx:for="{{newProduct1}}">
-                <image src="{{item.attinfos[0].fobsurl}}" mode="aspectFill"></image>
-            </swiper-item>
-        </swiper>
-        <view class="new-product-name u-line-1">{{newProduct1[newProductIndex1].fname}}[{{newProduct1[newProductIndex1].ftype}}]</view>
-    </view>
-    <view>
-        <view class="new-product-title">
-            <view></view> 沙发布新品 <view></view>
-        </view>
-        <swiper class="new-product-swiper" circular current='{{newProductIndex2}}' indicator-dots indicator-color='rgba(216,216,216,.58)' indicator-active-color='#57C7D3' bindchange='newProduct2'>
-            <swiper-item wx:key="index" wx:for="{{newProduct2}}">
-                <image src="{{item.attinfos[0].fobsurl}}" mode="aspectFill"></image>
-            </swiper-item>
-        </swiper>
-        <view class="new-product-name u-line-1">{{newProduct2[newProductIndex2].fname}}[{{newProduct2[newProductIndex2].ftype}}]</view>
+<!-- 直播列表 -->
+<view class="annunciate" style="padding-top: 40rpx;">
+    <!-- 标题 -->
+    <view class="annunciate_title">
+        <view class="annunciate_decorate"></view>
+        <view class="annunciate_text">正在直播</view>
     </view>
+    <portalLice list='{{tiveList}}' />
+    <van-empty wx:if="{{tiveList.length==0}}" description="暂无直播" />
 </view>
+
 <!-- 广告位1 -->
-<My_BannerSwiper type="advertising" marTop='40' swiperBannerList="{{portal_middle_2}}" />
+<!-- <My_BannerSwiper type="advertising" marTop='40' swiperBannerList="{{portal_middle_2}}" /> -->
 <!-- 供需 -->
 <van-tabs active="{{ tabsActive }}" color='#00C1D2' line-width='15' line-height='3' custom-class='tabs-custom-class' tab-class='tabs-tab-class' tab-active-class='tabs-tab-active-class' bind:change="tabsOnChange">
-    <van-tab title="私域直播">
-        <portalLice list='{{tiveList}}' />
-        <van-empty wx:if="{{tiveList.length==0}}" description="暂无直播" />
-    </van-tab>
     <van-tab wx:key="index" wx:for="{{sadClassify}}" title="{{item.ftype}}" />
 </van-tabs>
 <!-- 列表展示区 -->
-<block wx:if="{{tabsActive!=0}}">
+<block>
     <supplyanddemandList list='{{sadList}}'></supplyanddemandList>
     <van-empty wx:if="{{1>sadList.length}}" description="暂无数据" />
 </block>
 <!-- 展厅照片 -->
-<view class="exhibition-hall">
+<!-- <view class="exhibition-hall">
     <image src="{{portal_middle_3[0].attinfos[0].fobsurl}}" mode="aspectFill"></image>
-</view>
+</view> -->
 <!-- 招商表单 -->
 <view class="annunciate" style="margin-top: 20rpx;">
     <!-- 标题 -->
     <view class="annunciate_title">
         <view class="annunciate_decorate"></view>
-        <view class="annunciate_text">招商入口</view>
+        <view class="annunciate_text">我要咨询</view>
     </view>
     <!-- 招商表单 -->
     <view class="recruit-box">
@@ -183,10 +141,37 @@
         </view>
     </view>
 </view>
+<!-- 新品推荐 -->
+<view class="new-product">
+    <view>
+        <view class="new-product-title">
+            <view></view> 窗帘布新品 <view></view>
+        </view>
+        <swiper class="new-product-swiper" circular current='{{newProductIndex1}}' indicator-dots indicator-color='rgba(216,216,216,.58)' indicator-active-color='#57C7D3' bindchange='newProduct1'>
+            <swiper-item wx:key="index" wx:for="{{newProduct1}}">
+                <image wx:if="{{item.attinfos[0]}}" src="{{item.attinfos[0].fobsurl}}" mode="aspectFill"></image>
+                <image wx:else src="/static/annunciate/cover.png" mode="aspectFill"></image>
+            </swiper-item>
+        </swiper>
+        <view class="new-product-name u-line-1">{{newProduct1[newProductIndex1].fname}}[{{newProduct1[newProductIndex1].ftype}}]</view>
+    </view>
+    <view>
+        <view class="new-product-title">
+            <view></view> 沙发布新品 <view></view>
+        </view>
+        <swiper class="new-product-swiper" circular current='{{newProductIndex2}}' indicator-dots indicator-color='rgba(216,216,216,.58)' indicator-active-color='#57C7D3' bindchange='newProduct2'>
+            <swiper-item wx:key="index" wx:for="{{newProduct2}}">
+                <image wx:if="{{item.attinfos[0]}}" src="{{item.attinfos[0].fobsurl}}" mode="aspectFill"></image>
+                <image wx:else src="/static/annunciate/cover.png" mode="aspectFill"></image>
+            </swiper-item>
+        </swiper>
+        <view class="new-product-name u-line-1">{{newProduct2[newProductIndex2].fname}}[{{newProduct2[newProductIndex2].ftype}}]</view>
+    </view>
+</view>
 <!-- 招商图片 -->
-<view class="attract-investment">
+<!-- <view class="attract-investment">
     <image src="{{portal_middle_4[0].attinfos[0].fobsurl}}" mode="aspectFill"></image>
-</view>
+</view> -->
 <view style="height: 50px;"></view>
 <!-- 吸底 -->
 <view class="footer">

pages/portal/index.wxss

@@ -106,46 +106,6 @@ page {
     height: 14rpx;
 }
 
-/* 老 品牌关注榜 */
-/* .concerns-box {
-    position: relative;
-    width: 670rpx;
-    height: 412rpx;
-    margin: 48rpx auto 0;
-}
-
-.concerns-con {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    z-index: 9;
-    top: 0;
-    left: 0;
-}
-
-.concerns-title {
-    position: absolute;
-    display: inline-block;
-    height: 44rpx;
-    font-size: 32rpx;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 550;
-    color: #000000;
-    padding: 0 8rpx 0 20rpx;
-    background-color: #ffffff;
-    margin-left: 46rpx;
-    top: -10rpx;
-}
-
-.concerns-bg {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    z-index: 1;
-    top: 0;
-    left: 0;
-} */
-
 /* 新 品牌关注 */
 .concerns-box {
     width: 670rpx;

pages/portal/portalLive/live.js

@@ -9,6 +9,10 @@ Component({
     properties: {
         list: {
             type: Array
+        },
+        isShow: {
+            type: Boolean,
+            value: false
         }
     },
 

pages/portal/portalLive/live.wxml

@@ -1,14 +1,21 @@
 <view class="live-list" style="padding-bottom: 20rpx;">
     <view class="list-box">
         <view class="live-item" wx:for="{{list}}" catchtap="toViewLive" data-item="{{item}}">
-            <image class="img" src="{{item.channelcoverimageurl}}" mode="aspectFill" />
+            <view class="img">
+                <image src="{{item.channelcoverimageurl}}" mode="aspectFill" />
+                <view class="livestatus" wx:if="{{item.livestatus=='live'}}">
+                    直播中
+                    <image src="/static/live.gif"></image>
+                </view>
+            </view>
             <view class="brand-audience">
-                <view class="brand u-line-1">{{item.fagentname!=null?item.fagentname:'暂无'}}</view>
+                <view class="brand u-line-1">{{item.fagentname!=null?item.fagentname:'暂无名称'}}</view>
                 <view class="audience">
-                    <image src="/static/icon-11.png" />{{item.viewers}}
+                    {{item.viewers}}人
                 </view>
             </view>
-            <view class="explain u-line-1">{{item.faddress!=null?item.faddress:'暂无'}}</view>
+            <view wx:if="{{!isShow}}" class="explain u-line-1">{{item.faddress!=null?item.faddress:'暂无地址'}}</view>
+            <view wx:else class="explain u-line-1">{{item.flocation!=null?item.flocation:'暂无地址'}}</view>
         </view>
     </view>
 </view>

pages/portal/portalLive/live.wxss

@@ -2,7 +2,6 @@
     width: 100vw;
     box-sizing: border-box;
 }
-
 .list-box {
     display: flex;
     flex-wrap: wrap;
@@ -10,7 +9,6 @@
     width: 662rpx;
     margin: 0 auto;
 }
-
 .live-item {
     width: 322rpx;
     height: 332rpx;
@@ -19,13 +17,38 @@
     margin-top: 20rpx;
     overflow: hidden;
 }
-
 .img {
+    position: relative;
     width: 322rpx;
     height: 240rpx;
     overflow: hidden;
 }
-
+.img image {
+    width: 100%;
+    height: 100%;
+}
+.livestatus {
+    display: flex;
+    align-items: center;
+    position: absolute;
+    width: 96rpx;
+    height: 32rpx;
+    background: #F44093;
+    border-radius: 4rpx;
+    font-size: 20rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFFFFF;
+    z-index: 999;
+    bottom: 8rpx;
+    left: 8rpx;
+    padding-left: 4rpx;
+}
+.livestatus image {
+    width: 22rpx;
+    height: 20rpx;
+    margin-left: 6rpx;
+}
 .explain {
     width: 100%;
     height: 34rpx;
@@ -35,7 +58,6 @@
     padding: 0 10rpx;
     box-sizing: border-box;
 }
-
 .brand-audience {
     width: 100%;
     display: flex;
@@ -44,8 +66,8 @@
     line-height: 40rpx;
     padding: 0 10rpx;
     box-sizing: border-box;
+    margin-top: 8rpx;
 }
-
 .brand {
     flex: 1;
     font-size: 28rpx;
@@ -53,17 +75,9 @@
     font-weight: 550;
     color: #000000;
 }
-
 .audience {
-    font-size: 28rpx;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 550;
-    color: #4DC2D4;
     flex-shrink: 0;
-}
-
-.audience image {
-    width: 20rpx;
-    height: 20rpx;
-    margin-right: 4rpx;
+    font-size: 28rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #000000;
 }

pages/portal/supplyanddemandList/index.wxml

@@ -10,7 +10,7 @@
         <image wx:elif="{{item.ftype=='商业培训'}}" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/supplyAndDemand/icon-05.png" mode="aspectFit"></image>
         <image wx:elif="{{item.ftype=='寻找主播'}}" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/supplyAndDemand/icon-06.png" mode="aspectFit"></image>
         <image wx:elif="{{item.ftype=='面料设计'}}" src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/supplyAndDemand/icon-07.png" mode="aspectFit"></image>
-        <image wx:else src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/tacitly-approve/MRproduct.png" mode="aspectFit"></image>
+        <image wx:else src="/static/supplyAndDemand/default.jpg" mode="aspectFit"></image>
     </view>
     <view class="ann-text">
         <view class="ann-text-title  u-line-1">[{{item.ftype}}]{{item.ftitle}}</view>

pages/tabbar-pages/home/index.js

@@ -206,7 +206,7 @@ Page({
             "content": {
                 "getdatafromdbanyway": true,
                 "pageNumber": 1,
-                "pageSize": 8,
+                "pageSize": 3,
                 "where": {
                     "condition": "",
                     "ftype": ""

pages/tabbar-pages/home/index.wxml

@@ -18,6 +18,24 @@
     </view>
 </My_DisplayBox>
 
+<My_DisplayBox title="最新供需" bind:getExhibitionTitle="getExhibitionTitle">
+    <!-- 标题前图片 -->
+    <image slot="display-box-img" class="display-title_image" src="/static/icon-03.png" mode="aspectFit"></image>
+    <!-- 圆角按钮tabs -->
+    <!-- <My_RoundedCornerButtonTabs list="{{roundedList}}" bind:tabsSelectedIitem="tabsSelectedIitem"></My_RoundedCornerButtonTabs> -->
+    <!-- 列表展示区 -->
+    <view slot="display-box-showList">
+        <My_DisplayItem wx:for="{{productList}}" content="{{item}}" padTop="{{index==0?'0':'20'}}" borTop="{{index==0?'0':'2'}}" anonymity="true">
+            <!-- <view class="display-box-showList-button-box" slot="button">
+                <van-button custom-class="display-box-showList-button" data-item="{{item}}" catchtap="toLinkUp" color="linear-gradient(180deg, #84E3EC 0%, #4DC2D4 100%)"></van-button>
+                <view class="display-box-showList-button-text">
+                    一键联系
+                </view>
+            </view> -->
+        </My_DisplayItem>
+    </view>
+</My_DisplayBox>
+
 <My_DisplayBox title="通告" bind:getExhibitionTitle="getExhibitionTitle">
     <!-- 标题前图片 -->
     <image slot="display-box-img" class="display-title_image" src="/static/icon-02.png" mode="aspectFit"></image>
@@ -45,23 +63,6 @@
     </view>
 </My_DisplayBox>
 
-<My_DisplayBox title="最新供需" bind:getExhibitionTitle="getExhibitionTitle">
-    <!-- 标题前图片 -->
-    <image slot="display-box-img" class="display-title_image" src="/static/icon-03.png" mode="aspectFit"></image>
-    <!-- 圆角按钮tabs -->
-    <!-- <My_RoundedCornerButtonTabs list="{{roundedList}}" bind:tabsSelectedIitem="tabsSelectedIitem"></My_RoundedCornerButtonTabs> -->
-    <!-- 列表展示区 -->
-    <view slot="display-box-showList">
-        <My_DisplayItem wx:for="{{productList}}" content="{{item}}" padTop="{{index==0?'0':'20'}}" borTop="{{index==0?'0':'2'}}" anonymity="true">
-            <!-- <view class="display-box-showList-button-box" slot="button">
-                <van-button custom-class="display-box-showList-button" data-item="{{item}}" catchtap="toLinkUp" color="linear-gradient(180deg, #84E3EC 0%, #4DC2D4 100%)"></van-button>
-                <view class="display-box-showList-button-text">
-                    一键联系
-                </view>
-            </view> -->
-        </My_DisplayItem>
-    </view>
-</My_DisplayBox>
 
 <My_DisplayBox wx:if="{{partnerList.length>=1}}" title="合作商家" bind:getExhibitionTitle="getExhibitionTitle">
     <!-- 标题前图片 -->

pages/tradeShow/index.js

@@ -9,6 +9,9 @@ Page({
      * 页面的初始数据
      */
     data: {
+        pageNumber: 1, //当前页码
+        pageTotal: 1, //全部页码
+        tactivityid: 0, //展会id
         //轮播图列表
         swiperBannerList: [],
         liveList: [], //云展会直播大厅
@@ -32,40 +35,22 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        this.setData({
+            tactivityid: options.id
+        })
         let data = {
             "classname": "publicmethod.live.live",
-            "method": "getLiveChannelData",
+            "method": "agentList",
             "content": {
                 "tactivityid": options.id,
                 "siteid": "BWJ"
             }
         }
         /* 云展会直播大厅 */
-        _Http.basic(data).then(res => {
-            console.log(res)
-            if (res.msg != "成功") {
-                wx.showToast({
-                    title: '直播大厅加载失败，请重新进入页面',
-                    icon: "none",
-                    duration: 5000
-                })
-            } else {
-                let data = JSON.parse(JSON.stringify(res.data.tlivelist));
-                const ClassifyList = this.setClassifyList(data);
-                const liveList = handleList.twoDimensionalArr(data, 4, 10);
-                this.setData({
-                    liveList: res.data.tlivelist,
-                    showLiveList: liveList,
-                    liveClassifyList: ClassifyList,
-                    fagentcount: res.data.fagentcount,
-                    flivecount: res.data.flivecount,
-                    ftotalcustcount: res.data.ftotalcustcount
-                })
-            }
-        });
+        this.getLiveChannelData()
         /* 热门展商 */
-        data.method = "agentList";
         _Http.basic(data).then(res => {
+            console.log("热门展商", res)
             if (res.msg != "成功") {
                 wx.showToast({
                     title: '热门展商加载失败，请重新进入页面',
@@ -87,6 +72,7 @@ Page({
         /* 热门展品 */
         data.method = "prodList";
         _Http.basic(data).then(res => {
+            console.log("热门展品", res)
             if (res.msg != "成功") {
                 wx.showToast({
                     title: '热门展品加载失败，请重新进入页面',
@@ -106,6 +92,53 @@ Page({
             swiperBannerList: bannerList[0].banner
         });
     },
+    /* 云展会直播大厅 */
+    getLiveChannelData() {
+        if (this.data.pageTotal < this.data.pageNumber) return;
+        _Http.basic({
+            "classname": "publicmethod.live.live",
+            "method": "getLiveChannelData",
+            "content": {
+                "tactivityid": this.data.tactivityid,
+                "siteid": "BWJ",
+                "pageSize": 20,
+                "pageNumber": this.data.pageNumber
+            }
+        }, false).then(res => {
+            console.log("云展会直播大厅", res)
+            if (res.msg != "成功") {
+                wx.showToast({
+                    title: '直播大厅加载失败，请重新进入页面',
+                    icon: "none",
+                    duration: 5000
+                })
+            } else {
+                let data = JSON.parse(JSON.stringify(res.data.tlivelist));
+                const ClassifyList = this.setClassifyList(data);
+                /* const liveList = handleList.twoDimensionalArr(data, 4, 10);
+                showLiveList: liveList, */
+                let liveList = [];
+                if (res.data.pageNumber == 1) {
+                    liveList = res.data.tlivelist;
+                } else {
+                    let l = this.data.liveList;
+                    liveList = l.concat(res.data.tlivelist)
+                }
+                this.setData({
+                    liveList,
+                    liveClassifyList: ClassifyList,
+                    fagentcount: res.data.fagentcount,
+                    flivecount: res.data.flivecount,
+                    ftotalcustcount: res.data.ftotalcustcount,
+                    pageNumber: res.data.pageNumber + 1,
+                    pageTotal: res.data.pageTotal
+                })
+            }
+        });
+    },
+    scrolltolower() {
+        this.getLiveChannelData();
+    },
     /* 分类 */
     setClassifyList(data) {
         let List = [];

pages/tradeShow/index.json

@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "usingComponents": {
+    "liveList": "/pages/portal/portalLive/live"
+  }
 }

pages/tradeShow/index.wxml

@@ -4,7 +4,7 @@
 <!-- 数据展示 -->
 <view class="data-display">
     <view>
-        <view class="data-display-title">展示商</view>
+        <view class="data-display-title">参展企业</view>
         <view class="data-display-num">{{fagentcount}}</view>
     </view>
     <view>
@@ -12,12 +12,12 @@
         <view class="data-display-num">{{flivecount}}</view>
     </view>
     <view>
-        <view class="data-display-title">观众人数</view>
+        <view class="data-display-title">正在观看</view>
         <view class="data-display-num">{{ftotalcustcount}}</view>
     </view>
 </view>
-
-<My_DisplayBox wx:if="{{liveList.length>=1}}" title="云展会直播大厅" isMore="{{false}}">
+<!-- wx:if="{{liveList.length>=1}}" -->
+<My_DisplayBox title="云展会直播大厅" isMore="{{false}}">
     <!-- 分类和搜索 -->
     <view class="classify-and-search">
         <view class="classify" data-index="1" catchtap="showPullDown">
@@ -40,7 +40,10 @@
     <!-- 标题前图片 -->
     <image slot="display-box-img" class="display-title_image" src="/static/icon-06.png" mode="aspectFit"></image>
     <!-- 主要展示 -->
-    <swiper class="exhibition-swiper" style="height: {{showLiveList[0].length>2?'700':'355'}}rpx;" indicator-dots indicator-active-color="#4DC2D4" indicator-color="#D8D8D8">
+    <scroll-view scroll-y class="live-scroll-view" bindscrolltolower='scrolltolower'>
+        <liveList list="{{liveList}}" isShow='{{true}}' />
+    </scroll-view>
+    <!-- <swiper class="exhibition-swiper" style="height: {{showLiveList[0].length>2?'700':'355'}}rpx;" indicator-dots indicator-active-color="#4DC2D4" indicator-color="#D8D8D8">
         <swiper-item wx:for="{{showLiveList}}" class="exhibition-swiper-item">
             <view wx:for="{{item}}" class="exhibition" style="float: right;">
                 <image class="exhibition-img" src="{{item.channelcoverimageurl}}" mode="aspectFill"></image>
@@ -53,10 +56,11 @@
                 </view>
             </view>
         </swiper-item>
-    </swiper>
+    </swiper> -->
 </My_DisplayBox>
 
-<My_DisplayBox wx:if="{{agentList.length>=1}}" title="热门展商" isMore="{{false}}">
+<!-- wx:if="{{agentList.length>=1}}" -->
+<My_DisplayBox wx:if="{{false}}" title="热门展商" isMore="{{false}}">
     <!-- 分类和搜索 -->
     <view class="classify-and-search">
         <view class="classify" data-index="2" catchtap="showPullDown">
@@ -89,8 +93,8 @@
         </swiper-item>
     </swiper>
 </My_DisplayBox>
-
-<My_DisplayBox wx:if="{{prodList.length>=1}}" title="热门商品" isMore="{{false}}">
+<!-- wx:if="{{prodList.length>=1}}" -->
+<My_DisplayBox wx:if="{{false}}" title="热门商品" isMore="{{false}}">
     <!-- 标题前图片 -->
     <image slot="display-box-img" class="display-title_image" src="/static/icon-04.png" mode="aspectFit"></image>
     <swiper class="show-prod-list" style="height: {{prodList[0].length>2?'600':'325'}}rpx;" autoplay circular indicator-active-color="#4DC2D4" indicator-color="#D8D8D8" indicator-dots snap-to-edge>

pages/tradeShow/index.wxss

@@ -63,7 +63,7 @@
     height: 32rpx;
     line-height: 32rpx;
     background: #4DC2D4;
-    border-radius: 10rpx 0px 10rpx 0px;
+    border-radius: 0rpx 0px 10rpx 0px;
     padding: 0 10rpx;
     top: 0;
     left: 0;
@@ -213,4 +213,9 @@
     color: #4DC2D4 !important;
     font-weight: 550;
     z-index: 9999 !important;
+}
+
+.live-scroll-view {
+    width: 100%;
+    height: 50vh;
 }

project.private.config.json

@@ -1,4 +1,5 @@
 {
+    "libVersion": "2.19.6",
     "setting": {
         "urlCheck": true,
         "es6": true,