修改

pages/annunciate/annunciateList/index.wxml

@@ -1,21 +1,21 @@
 <view class="ann-box" wx:for="{{list}}" data-index="{{index}}" catchtap="toDetails">
-        <view class="ann-img">
-            <image wx:if="{{item.attinfos[0].fobsurl}}" src="{{item.attinfos[0].fobsurl}}" mode="aspectFill"></image>
-            <image src="/static/tacitly-approve/MRproduct.png" mode="aspectFill"></image>
-        </view>
-        <view class="ann-text">
-            <view class="ann-text-title  u-line-1">{{item.ftitle}}</view>
-            <view class="ann-text-center u-line-2">{{item.fsummary}}</view>
-            <view class="ann-text-bottom u-line-1" style="margin-top: 22rpx;">
-                <view class="userMsg">
-                    <view class="img">
-                        <image wx:if="{{item.headportraiturl}}" src="{{item.headportraiturl}}"></image>
-                        <image wx:else src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/userCenter/userImg.png"></image>
-                    </view>
-                    <view class="u-line-1" style="max-width: 160rpx; padding-top: 3rpx;">{{item.fbrand!=null?item.fbrand:'匿名用户'}}</view>
-                    <view style="margin-left: 8rpx; padding-top: 3rpx;">{{item.checkdate}}</view>
+    <view class="ann-img">
+        <image wx:if="{{item.attinfos[0].fobsurl}}" src="{{item.attinfos[0].fobsurl}}" mode="aspectFill"></image>
+        <image src="/static/tacitly-approve/MRproduct.png" mode="aspectFill"></image>
+    </view>
+    <view class="ann-text">
+        <view class="ann-text-title  u-line-1">{{item.ftitle}}</view>
+        <view class="ann-text-center u-line-2">{{item.fsummary!=null?item.fsummary:''}}</view>
+        <view class="ann-text-bottom u-line-1" style="margin-top: 22rpx;">
+            <view class="userMsg">
+                <view class="img">
+                    <image wx:if="{{item.headportraiturl}}" src="{{item.headportraiturl}}"></image>
+                    <image wx:else src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/userCenter/userImg.png"></image>
                 </view>
-                <view>{{item.freadcount}}次浏览</view>
+                <view class="u-line-1" style="max-width: 160rpx; padding-top: 3rpx;">{{item.fbrand!=null?item.fbrand:item.ftype}}</view>
+                <view style="margin-left: 8rpx; padding-top: 3rpx;">{{item.checkdate}}</view>
             </view>
+            <view>{{item.freadcount}}次浏览</view>
         </view>
-    </view>
+    </view>
+</view>

pages/annunciate/details.wxml

@@ -8,7 +8,7 @@
                     <image wx:if="{{msgObj.headportraiturl}}" src="{{msgObj.headportraiturl}}" mode="aspectFill"></image>
                     <image wx:else src="/static/tacitly-approve/MRuserImg.png" mode="aspectFill"></image>
                 </view>
-                <view class="header-userMessage-textMsg">{{msgObj.changeby}} {{msgObj.checkdate}}</view>
+                <view class="header-userMessage-textMsg">{{msgObj.fbrand!=null?msgObj.fbrand:msgObj.ftype}} {{msgObj.checkdate}}</view>
             </view>
         </view>
     </view>

pages/annunciate/index.js

@@ -70,6 +70,7 @@ Page({
             data.content.where.ftype = '';
         };
         _Http.basic(data).then(res => {
+            console.log("通告列表",res)
             let list = processingData.annunciateCheckdate(res.data),
                 data = [];
             if (this.data.pageNumber == 1) {

pages/businessPartner/applyFor.wxml

@@ -7,12 +7,13 @@
     <image slot="display-box-img" class="display-title_image" src="/static/icon-05.png" mode="aspectFit"></image>
     <scroll-view class="list-scroll-view" scroll-y bindscrolltolower="scrolltolower">
         <view class="company-data" wx:for="{{requestList}}" data-index="{{index}}" bindtap="showBtnIndex">
-            <image class="company-data-image" src="{{item.attinfos[0].fobsurl}}"></image>
+            <image wx:if="{{item.attinfos[0]}}" class="company-data-image" src="{{item.attinfos[0].fobsurl}}"></image>
+            <image wx:else class="company-data-image" src="/static/tacitly-approve/MRuserImg.png" mode="aspectFill"></image>
             <view class="company-data-brandName u-line-1">
                 {{item.fbrand}}
             </view>
-            <!-- 按钮 -->
-            <view wx:if="{{showBtn==index}}" class="company-data-but">
+            <!-- 按钮  wx:if="{{showBtn==index}}" -->
+            <view class="company-data-but">
                 <van-button data-index="{{index}}" custom-class="custom-class-company-data jujue" style="margin-right: 20rpx;" catchtap="refuse">拒绝</van-button>
                 <van-button data-index="{{index}}" custom-class="custom-class-company-data" catchtap="ratify">同意</van-button>
             </view>

pages/portal/details.js

@@ -24,7 +24,6 @@ Page({
                 "tagentsid": options.tagentsid
             }
         }).then(res => {
-            console.log(res)
             res.data[0].checkdate = res.data[0].checkdate.slice(0, res.data[0].checkdate.lastIndexOf('.'));
             this.setData({
                 particulars: res.data[0]

pages/portal/details.wxml

@@ -10,10 +10,10 @@
                 </view>
                 <view class="header-userMessage-textMsg">{{particulars.createby}} {{particulars.checkdate}}</view>
             </view>
-            <view class="but-box">
+            <!-- <view class="but-box">
                 <van-button wx:if="{{particulars.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut details-custom-slotBut">一键联系</van-button>
                 <van-button wx:else color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-NoSlotBut details-custom-slotBut">{{particulars.fstatus}}</van-button>
-            </view>
+            </view> -->
         </view>
     </view>
     <scroll-view scroll-y style="flex: 1; height: 1px;">
@@ -34,8 +34,8 @@
                     <view class="dataAndBut_data">
                         浏览次数:{{item.freadtimes}}次 意向沟通人数:{{item.fcommunicationtimes}}次
                     </view>
-                    <van-button wx:if="{{item.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="contact">一键联系</van-button>
-                    <van-button wx:else color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-NoSlotBut" catchtap="stop">{{item.fstatus}}</van-button>
+                    <!-- <van-button wx:if="{{item.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut" catchtap="contact">一键联系</van-button>
+                    <van-button wx:else color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-NoSlotBut" catchtap="stop">{{item.fstatus}}</van-button> -->
                 </view>
             </view>
         </My_SupplyAndDemandItemBox>

pages/portal/index.wxss

@@ -522,7 +522,7 @@ page {
 .footer .footer-button {
     width: 356rpx !important;
     height: 78rpx !important;
-    background: linear-gradient(180deg, #84E3EC 0%, #4DC2D4 100%) !important;
+    background: linear-gradient(180deg, #FFDC00 0%, #FFB600 100%) !important;
     box-shadow: 2rpx 2rpx 8rpx 0px rgba(0, 0, 0, 0.12) !important;
     border-radius: 39rpx;
     font-size: 36rpx !important;

pages/tabbar-pages/home/index.js

@@ -18,7 +18,7 @@ Page({
             text: '即时通讯',
             icon: '/static/home-grid/icon-01.png'
         }, {
-            text: '私域直播',
+            text: '直播',
             icon: '/static/home-grid/icon-02.png'
         }, {
             text: '通告',
@@ -72,7 +72,7 @@ Page({
             wx.switchTab({
                 url: '/pages/tabbar-pages/supplyAndDemand/index',
             })
-        } else if (name == '私域直播') {
+        } else if (name == '直播') {
             wx.navigateTo({
                 url: '/pages/liveStreaming/index',
             })
@@ -235,16 +235,28 @@ Page({
                 'tabbarList[3].fcount': getApp().globalData.msgFcount
             })
         }, 500)
+        if (wx.getStorageSync('liveUrl')) {
+            wx.navigateTo({
+                url: '/pages/webView/index?url=' + wx.getStorageSync('liveUrl'),
+            })
+            wx.removeStorage({
+                key: 'liveUrl',
+            })
+        }
     },
     /* 判断二维码类型 */
     ifQrCodeType(data) {
         let MyModelText = '';
         let tagentsid = wx.getStorageSync('account_list')[0].tagentsid;
         console.log(tagentsid, data.id)
-        if (data.id == tagentsid) return wx.showToast({
-            title: "您已经加入该团队",
-            icon: "none"
-        })
+        if (data.id == tagentsid) {
+            wx.showToast({
+                title: "您已经加入该团队",
+                icon: "none"
+            })
+            wx.removeStorageSync('qrCodeMsg');
+            return;
+        }
         if (data.type == 'partner') {
             //申请合作
             MyModelText = '是否向“' + data.name + '”发送合作申请';
@@ -257,6 +269,7 @@ Page({
             codeMsg: data,
             MyModelShow: true
         })
+        wx.removeStorageSync('qrCodeMsg');
     },
     /* 首页模态框回调 */
     MyShowModelCallBack({

pages/tabbar-pages/home/index.wxml

@@ -28,15 +28,15 @@
             <image src="/static/annunciate/cover.png" mode="aspectFill"></image>
         </view>
         <view class="ann-text">
-            <view class="ann-text-title  u-line-1">{{item.ftitle}}</view>
-            <view class="ann-text-center u-line-2">{{item.fsummary}}</view>
+            <view class="ann-text-title  u-line-1">{{item.ftitle!=null?item.ftitle:''}}</view>
+            <view class="ann-text-center u-line-2">{{item.fsummary!=null?item.fsummary:''}}</view>
             <view class="ann-text-bottom u-line-1" style="margin-top: 22rpx;">
                 <view class="userMsg">
                     <view class="img">
                         <image wx:if="{{item.headportraiturl}}" src="{{item.headportraiturl}}"></image>
                         <image wx:else src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/WeChat/userCenter/userImg.png"></image>
                     </view>
-                    <view class="u-line-1" style="max-width: 160rpx; padding-top: 3rpx;">{{item.fbrand!=null?item.fbrand:'匿名用户'}}</view>
+                    <view class="u-line-1" style="max-width: 160rpx; padding-top: 3rpx;">{{item.fbrand!=null?item.fbrand:item.ftype}}</view>
                     <view style="margin-left: 8rpx; padding-top: 3rpx;">{{item.checkdate}}</view>
                 </view>
                 <view>{{item.freadcount}}次浏览</view>

pages/tradeShow/index.wxml

@@ -76,8 +76,9 @@
     <swiper class="exhibition-swiper" style="height: {{showAgentList[0].length>2?'700':'355'}}rpx;" indicator-dots indicator-active-color="#4DC2D4" indicator-color="#D8D8D8">
         <swiper-item wx:for="{{showAgentList}}" class="exhibition-swiper-item">
             <view wx:for="{{item}}" class="exhibition">
-                <image class="exhibition-img" src="{{item.attinfos[0].fobsurl}}" mode="aspectFill"></image>
-                <view class="showLocation">{{item.flocation}}</view>
+                <image class="exhibition-img" wx:if="{{item.attinfos[0]}}" src="{{item.attinfos[0].fobsurl}}" mode="aspectFill"></image>
+                <image class="exhibition-img" wx:else src="/static/annunciate/cover.png" mode="aspectFill"></image>
+                <view class="showLocation">{{item.flocation!=null?item.flocation:'未知区域'}}</view>
                 <view class="exhibition-bottom">
                     <view class="exhibition-bottom-title u-line-1">{{item.fbrand}}</view>
                     <view class="exhibition-bottom-data">

pages/webView/index.js

@@ -18,6 +18,7 @@ Page({
         //判断是否存在登录态
         if (!wx.getStorageSync('userData').token) {
             getApp().globalData.liveUrl = url;
+            wx.setStorageSync('liveUrl', url)
             wx.reLaunch({
                 url: '/pages/login/index'
             })
@@ -30,6 +31,7 @@ Page({
             }).then(res => {
                 if (res.msg != '成功') {
                     getApp().globalData.liveUrl = url;
+                    wx.setStorageSync('liveUrl', url)
                     wx.reLaunch({
                         url: '/pages/login/index'
                     })

project.config.json

@@ -1,7 +1,8 @@
 {
     "description": "项目配置文件",
     "packOptions": {
-        "ignore": []
+        "ignore": [],
+        "include": []
     },
     "setting": {
         "urlCheck": true,
@@ -55,10 +56,8 @@
     },
     "scripts": {},
     "staticServerOptions": {
-        "baseURL": "",
         "servePath": ""
     },
-    "isGameTourist": false,
     "condition": {
         "search": {
             "list": []
@@ -78,5 +77,8 @@
         "miniprogram": {
             "list": []
         }
+    },
+    "watchOptions": {
+        "ignore": []
     }
 }

project.private.config.json

@@ -1,15 +1,36 @@
 {
-    "setting": {},
-    "condition": {
-        "plugin": {
-            "list": []
-        },
-        "game": {
-            "list": []
-        },
-        "gamePlugin": {
-            "list": []
+    "setting": {
+        "urlCheck": true,
+        "es6": true,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "coverView": true,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "lazyloadPlaceholderEnable": false,
+        "useMultiFrameRuntime": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
         },
+        "packNpmManually": false,
+        "packNpmRelationList": [],
+        "minifyWXSS": true,
+        "disableUseStrict": false,
+        "showES6CompileOption": false,
+        "useCompilerPlugins": false,
+        "ignoreUploadUnusedFiles": true,
+        "useStaticServer": true,
+        "minifyWXML": true
+    },
+    "condition": {
         "miniprogram": {
             "list": [
                 {
@@ -259,5 +280,6 @@
                 }
             ]
         }
-    }
+    },
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }