修改

components/My_Checkbox/index.wxml

@@ -23,10 +23,10 @@
     </view>
 </checkbox-group>
 <view class="checkbox_but">
-    <radio-group wx:if="{{type=='annunciate'}}" class="radio" bindchange='allOrPart'>
+   <!--  <radio-group wx:if="{{type=='annunciate'}}" class="radio" bindchange='allOrPart'>
         <radio color='#4EBFCF' checked="{{isAll==0}}" value="0">全部</radio>
         <radio color='#4EBFCF' checked="{{isAll==1}}" value="1" style="margin-left: 18rpx;">指定</radio>
-    </radio-group>
+    </radio-group> -->
     <view class="button">
         <van-button type="info" size="large" color="#4EBFCF" custom-class="customClass" bindtap="confirm">确定</van-button>
     </view>

components/My_SearchInputBox/index.wxml

@@ -6,10 +6,12 @@
         </view>
     </view>
     <view class="searc" wx:else style="opacity: 0;"></view>
-    <view class="searc_but" catchtap="InvitedToEnter" wx:if="{{invitation}}">
-        <image style="width: 26rpx; height: 22rpx;" src="/static/icon-12.png" />邀请
+</view>
+<view class='bot-but'>
+    <view class="searc_but" style="margin-right: 80rpx; background: #4BBECF;" catchtap="InvitedToEnter" wx:if="{{invitation}}">
+        邀请
     </view>
     <view class="searc_but" bindtap="itemAdd" wx:if="{{fisadministrator}}">
-        <van-icon wx:if="{{butText=='新增'}}" name="add" />{{butText}}
+        {{butText}}
     </view>
 </view>

components/My_SearchInputBox/index.wxss

@@ -29,18 +29,6 @@ input {
     padding-left: 5rpx;
 }
 
-.searc_but {
-    width: 118rpx;
-    height: 60rpx;
-    line-height: 60rpx;
-    text-align: center;
-    background: #FFB600;
-    border-radius: 10rpx;
-    font-size: 28rpx;
-    font-weight: 500;
-    color: #FFFFFF;
-    margin-left: 16rpx;
-}
 
 .clear {
     display: flex;
@@ -50,4 +38,30 @@ input {
     height: 100%;
     line-height: 100%;
     z-index: 999;
+}
+
+.bot-but {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: fixed;
+    width: 100vw;
+    height: 128rpx;
+    background: #FFFFFF;
+    bottom: 0;
+    box-shadow: 0px -4rpx 16rpx 0px rgba(0, 0, 0, 0.05);
+}
+
+
+.searc_but {
+    width: 160rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    text-align: center;
+    background: #FFB600;
+    box-shadow: 0px 6rpx 6rpx 0px rgba(0, 0, 0, 0.1);
+    border-radius: 10rpx;
+    font-size: 28rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    color: #FFFFFF;
 }

components/My_navBar/index.wxss

@@ -21,7 +21,9 @@
     display: flex;
     position: absolute;
     font-size: 26rpx;
+    top: 50%;
     left: 30rpx;
+    transform: translate(0,-50%);
 }
 
 .header_user_choice>view{

custom-tab-bar/index.js

@@ -81,7 +81,6 @@ Component({
         },
         /* 呼叫电话 */
         CallOut() {
-            console.log(8451)
             wx.makePhoneCall({
                 phoneNumber: wx.getStorageSync('servicehotline')
             }).catch((e) => {})

custom-tab-bar/index.wxml

@@ -1,4 +1,4 @@
-<van-tabbar active="{{ active }}" placeholder>
+<van-tabbar active="{{ active }}" placeholder active-color='#00C1D2'>
     <van-tabbar-item bindtap="onChange" info="{{item.fcount}}" data-index="{{index}}" wx:for="{{tabbarList}}" wx:key="index">
         {{item.text}}
         <image slot="icon" src="{{ item.icon }}" data-index="{{index}}" mode="aspectFit" style="width: 30px; height: 18px;" />

pages/chatRoom/MsgBubble/index.wxss

@@ -28,7 +28,7 @@
 
 .msg-time {
     position: absolute;
-    width: 240rpx;
+    width: 250rpx;
     height: 34rpx;
     font-size: 24rpx;
     color: rgba(0, 0, 0, 0.39);

pages/chatRoom/dialogbox.js

@@ -36,6 +36,7 @@ Page({
             userid: wx.getStorageSync('userData').userid
         });
         //详情
+        console.log(this.data.timdialogid)
         _Http.basic({
             "accesstoken": wx.getStorageSync('userData').token,
             "classname": "system.im.imdialog.imdialog",
@@ -52,7 +53,7 @@ Page({
             let title = res.data[0].fimdialogname.split('-'),
                 headerTitle = (title[0] == res.data[0].fname) ? title[1] : title[0],
                 joinHands = false;
-            if (res.data[0].fimdialogtype == '供需' && res.data[0].fimuserid == this.data.userid) {
+            if (res.data[0].fimdialogtype == '供需' && res.data[0].fimuserid != this.data.userid) {
                 _Http.basic({
                     "accesstoken": wx.getStorageSync('userData').token,
                     "classname": "customer.supplyanddemand.supplyanddemand",
@@ -65,7 +66,6 @@ Page({
                 }, false).then(res => {
                     console.log("对接中", res)
                 })
-            } else {
                 joinHands = true
             }
             this.setData({

pages/chatRoom/index.js

@@ -60,7 +60,7 @@ Page({
             let relationList = [],
                 discussionGroupList = [];
             for (let i = 0; i < res.data.length; i++) {
-                if (res.data[i].fimdialogtype == '供需') {
+                if (res.data[i].fimdialogtype == '话题') {
                     discussionGroupList.push(res.data[i])
                 } else {
                     relationList.push(res.data[i])

pages/chatRoom/index.wxml

@@ -58,20 +58,18 @@
     </view>
     <My_pageReachBottom dummyStatus="{{relationList.length>0}}" loadMore='{{5>=0}}'></My_pageReachBottom>
 </view>
-
-
 <!-- 底部 -->
 <view class="footer">
     <view style="display: flex;justify-content: space-around;">
         <view class="option-item" data-index="0" catchtap="footerOption">
             <image hidden="{{optionItem!=0}}" mode="heightFix" src="/static/chatRoom/one-to-one-ac.png"></image>
             <image hidden="{{optionItem==0}}" mode="heightFix" src="/static/chatRoom/one-to-one.png"></image>
-            <view class="item-text">个聊</view>
+            <view class="item-text" style="color:{{optionItem==0?'#4DC2D4':''}};">个聊</view>
         </view>
         <view class="option-item" data-index="1" catchtap="footerOption">
             <image hidden="{{optionItem!=1}}" mode="heightFix" src="/static/chatRoom/group-of-people-ac.png"></image>
             <image hidden="{{optionItem==1}}" mode="heightFix" src="/static/chatRoom/group-of-people.png"></image>
-            <view class="item-text">群聊</view>
+            <view class="item-text" style="color:{{optionItem==1?'#4DC2D4':''}};">群聊</view>
         </view>
     </view>
     <view wx:if="{{iosX}}" style="height: 34rpx;"></view>

pages/chatRoom/stats.wxss

@@ -46,6 +46,8 @@ page {
     align-items: center;
     height: 70rpx;
     margin-bottom: 30rpx;
+    font-size: 32rpx;
+    color: rgba(0, 0, 0, .7);
 }
 
 .list .item image {

pages/liveStreaming/index.js

@@ -407,7 +407,6 @@ Page({
       index
     } = e.currentTarget.dataset,
       data = this.data.partnerLiveList[index];
-    console.log(data.fisneedauth)
     if (data.fisneedauth == 1) {
       _Http.basic({
         "accesstoken": wx.getStorageSync('userData').token,

pages/portal/index.js

@@ -79,7 +79,7 @@ Page({
             "method": "getHomeLive",
             "content": {
                 "getdatafromdbanyway": true,
-                "livestatus": "unStart"
+                "livestatus": "live"
             }
         }, false).then(res => {
             console.log("直播列表", res)

pages/portal/index.wxml

@@ -46,14 +46,14 @@
         <view class="concerns-content" hidden="{{brandSelect!=0}}">
             <view class="concerns-content-item u-line-1" wx:for="{{brandList0}}" wx:if="{{index<10}}">
                 <view class="img">
-                    <image src="/static/icon-02.png" mode="heightFix"></image>
+                    <image src="/static/portal/icon-{{index}}.png" mode="heightFix"></image>
                 </view>{{item.fname}}
             </view>
         </view>
         <view class="concerns-content" hidden="{{brandSelect!=1}}">
             <view class="concerns-content-item u-line-1" wx:for="{{brandList1}}" wx:if="{{index<10}}">
                 <view class="img">
-                    <image src="/static/icon-02.png" mode="heightFix"></image>
+                    <image src="/static/portal/icon-{{index}}.png" mode="heightFix"></image>
                 </view>{{item.fname}}
             </view>
         </view>
@@ -114,7 +114,8 @@
 <!-- 供需 -->
 <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}}'></portalLice>
+        <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>

pages/portal/portalLive/live.js

@@ -28,15 +28,24 @@ Component({
                 item
             } = e.currentTarget.dataset;
             if (item.fisneedauth == 1) {
-                console.log('需要授权')
-                /* {
-    "accesstoken": "5301810557137557e6a7ada3f2d96bba",
-    "classname": "enterprise.live.live",
-    "method": "liveauthorization",
-    "content": {
-        "tliveid": "2"
-    }
-} */
+                _Http.basic({
+                    "accesstoken": wx.getStorageSync('userData').token,
+                    "classname": "enterprise.live.live",
+                    "method": "liveauthorization",
+                    "content": {
+                        "tliveid": item.tliveid
+                    }
+                }).then(res => {
+                    if (res.data != '成功') return wx.showToast({
+                        title: res.data,
+                        icon: "none"
+                    })
+                    let str = res.msg;
+                    const url = str.slice(0, 8) + '04de51d4c1.' + str.slice(8);
+                    wx.navigateTo({
+                        url: '/pages/webView/index?url=' + encodeURIComponent(url),
+                    })
+                })
             } else {
                 let str = item.fliveshowurl;
                 const url = str.slice(0, 8) + '04de51d4c1.' + str.slice(8)

pages/tabbar-pages/home/index.js

@@ -15,17 +15,17 @@ Page({
         swiperBannerList: [],
         /* 宫格列表 */
         gridList: [{
-            text: '供需广场',
-            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-02.png'
+            text: '即时通讯',
+            icon: '/static/home-grid/icon-01.png'
         }, {
             text: '私域直播',
-            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-01.png'
+            icon: '/static/home-grid/icon-02.png'
         }, {
             text: '通告',
-            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-01.png'
+            icon: '/static/home-grid/icon-03.png'
         }, {
-            text: '即时沟通',
-            icon: 'https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/home-grid/icon-01.png'
+            text: '供需广场',
+            icon: '/static/home-grid/icon-04.png'
         }],
         /* 圆角按钮tabs列表 */
         roundedList: ["兴趣爱好", "关注板块", "最新发布"],
@@ -80,7 +80,7 @@ Page({
             wx.navigateTo({
                 url: '/pages/annunciate/index',
             })
-        } else if (name == '即时沟通') {
+        } else if (name == '即时通讯') {
             wx.navigateTo({
                 url: '/pages/chatRoom/index',
             })

pages/tabbar-pages/home/index.wxml

@@ -4,7 +4,7 @@
 <My_BannerSwiper swiperBannerList="{{swiperBannerList}}"></My_BannerSwiper>
 <!-- 宫格区域 -->
 <view class="grid_box">
-    <van-grid border="{{false}}" column-num="4" icon-size='40' bindtap="gridJumpPage">
+    <van-grid border="{{false}}" column-num="4" icon-size='58' bindtap="gridJumpPage">
         <van-grid-item wx:for="{{gridList}}" data-name="{{item.text}}" icon="{{item.icon}}" text="{{item.text}}" text-class="grid-text-class" />
     </van-grid>
 </view>

pages/tabbar-pages/supplyAndDemand/index.js

@@ -127,6 +127,7 @@ Page({
         let {
             item
         } = e.currentTarget.dataset;
+        
         let imdialogs = [];
         _Http.basic({
             "accesstoken": wx.getStorageSync('userData').token,

pages/tabbar-pages/supplyAndDemand/index.wxml

@@ -25,7 +25,7 @@
                 <view slot="dataAndBut">
                     <view class="dataAndBut">
                         <view class="dataAndBut_data">
-                            浏览次数:{{item.freadtimes}}次 意向沟通人数:{{item.fcommunicationtimes}}次
+                            浏览次数:{{item.freadtimes}}次 沟通人数:{{item.fcommunicationtimes}}次
                         </view>
                         <view class="dataAndBut_but">
                             <van-button wx:if="{{item.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut" data-item="{{item}}" catchtap="toLinkUp">一键联系</van-button>
@@ -46,6 +46,7 @@
                     <van-button custom-class="abutting-joint-but" data-item="{{item}}" catchtap="toLinkUpPage"><text class="abutting-joint-but-text">继续沟通</text></van-button>
                 </view>
             </view>
+            <view style="width: 100vw; height: 30rpx;"></view>
         </van-tab>
         <van-tab title="我的需求">
             <!-- 搜索 -->
@@ -59,10 +60,11 @@
             <My_SupplyAndDemandItemBox wx:for="{{productList}}" wx:key="index" title="【{{item.ftype}}】{{item.ftitle}}" time="{{item.checkdate}}" imageList="{{item.attinfos}}" data-index="{{index}}" bindtap="jumpForDetails" type='{{item.ftype}}' content="{{item.fcontent}}" bindstopOnShow="stopOnShow">
                 <!-- 我的需求左上状态插槽 -->
                 <view slot="myState" class="myState">
-                    <view class="myShowState {{item.fstatus=='正在对接'?'myNoSoldOut':''}} {{item.fstatus=='待对接'?'myNoSoldOut':''}}">
+                    <view class="myShowState {{item.fstatus=='正在对接'?'myNoSoldOut':''}}{{item.fstatus=='对接中'?'myNoSoldOut':''}} {{item.fstatus=='待对接'?'myNoSoldOut':''}}">
                         <view wx:if="{{item.fstatus=='已解决'}}">已下架</view>
                         <view wx:elif="{{item.fstatus=='新建'}}">未上架</view>
                         <view wx:elif="{{item.fstatus=='待对接'}}">上架中</view>
+                        <view wx:elif="{{item.fstatus=='对接中'}}">对接中</view>
                         <view wx:elif="{{item.fstatus=='正在对接'}}">对接中</view>
                         <view wx:else>已下架</view>
                     </view>
@@ -75,9 +77,10 @@
                 <view slot="dataAndBut">
                     <view class="dataAndBut">
                         <view class="dataAndBut_data">
-                            浏览次数:{{item.freadtimes}}<text data-item="{{item}}" catchtap="showCommunicationOfNumber">意向沟通人数</text>:{{item.fcommunicationtimes}}次
+                            浏览次数:{{item.freadtimes}} 沟通人数:{{item.fcommunicationtimes}}次
                         </view>
                         <view class="dataAndBut_but">
+                            <van-button color="#4DC2D4" data-item="{{item}}" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="showCommunicationOfNumber">沟通详情</van-button>
                             <van-button color="#4DC2D4" data-index="{{index}}" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="productEdit">编辑</van-button>
                         </view>
                     </view>
@@ -91,7 +94,7 @@
     <view class="CommunicationOfNumber">
         <view class="CommunicationOfNumber-title">沟通列表</view>
         <view class="CommunicationOfNumber-list">
-            <view wx:for="{{imdialogs}}" wx:key="index">{{item.createdate}}<text data-item="{{item}}" catchtap="toLinkUpPage" class="text">用户：{{item.fname}}</text><text wx:if="{{item.fdatastatus==0}}">发起联系，遗憾未达成合作</text><text wx:elif='{{item.fdatastatus==2}}'>发起联系，正在对接中</text><text wx:elif='{{item.fdatastatus==1}}'>发起联系，恭喜达成合作</text></view>
+            <view wx:for="{{imdialogs}}" wx:key="index">{{item.createdate}}<text data-item="{{item}}" catchtap="toLinkUpPage" class="text">用户：{{item.fname}}</text><text wx:if="{{item.fdatastatus==0}}">发起联系，遗憾未达成合作</text><text wx:elif='{{item.fdatastatus==1}}'>发起联系，恭喜达成合作</text><text wx:else>发起联系，正在对接中</text></view>
         </view>
     </view>
     <view style="height: 50px;"></view>

pages/tabbar-pages/supplyAndDemand/index.wxss

@@ -96,11 +96,13 @@
 
 .custom-slotBut {
     height: 44rpx !important;
+    font-size: 20rpx !important;
     background: linear-gradient(180deg, #84E3EC 0%, #4DC2D4 100%) !important;
     box-shadow: 0px 0px 12rpx 0px rgba(0, 0, 0, 0.1) !important;
     border-radius: 10rpx !important;
-    padding: 0 14rpx !important;
+    padding: 0 !important;
     border: 0 !important;
+    width: 108rpx;
 }
 
 .custom-NoSlotBut {

pages/tabbar-pages/user/index.wxml

@@ -1,6 +1,6 @@
 <!-- 自定义头部 -->
 <My_navBar></My_navBar>
-<My_GeneralTemplate padBot="20rpx" NavHeight="{{NavHeight}}">
+<My_GeneralTemplate padBot="0rpx" NavHeight="{{NavHeight}}">
     <!-- 用户头部 -->
     <view class="user_header">
         <view class="user_header_msg">
@@ -24,7 +24,7 @@
                 <van-icon name="arrow" color="#333333" size="34rpx" />
             </view>
         </view>
-        <view style="height: 2rpx; width: 100%; background-color: #979797; opacity: .3;"></view>
+        <view style="height: 2rpx; width: 100%; background-color: #979797; opacity: .1;"></view>
     </view>
     <!-- 宫格 -->
     <view class="grid_box">

pages/tabbar-pages/user/index.wxss

@@ -74,7 +74,7 @@
     width: 100%;
     padding: 0 30rpx;
     box-sizing: border-box;
-    margin-top: 5rpx;
+    margin-top: 10rpx;
 }
 
 .grid_text-class {