提交

app.js

@@ -59,6 +59,7 @@ App({
       }); */
     })
     this.globalData.SocketTask.onMessage(function (res) {
+      console.log("onMessage",res)
       that.globalData.callback(res)
     })
     this.globalData.SocketTask.onError(function (res) {

pages/chatRoom/dialogbox.js

@@ -206,9 +206,12 @@ Page({
                             "tattachmentid": data[0].tattachmentid
                         }
                     }),
-                    success(res) {}
+                    success(res) {
+                        console.log(res)
+                    }
                 })
             } else {
+            console.log(type, data)
                 if (content == '') return;
                 app.globalData.SocketTask.send({
                     data: JSON.stringify({
@@ -220,6 +223,7 @@ Page({
                         }
                     }),
                     success(res) {
+                        console.log(56465,res)
                         that.setData({
                             sendText: ''
                         })
@@ -614,6 +618,33 @@ Page({
      */
     onShow: function () {
         var that = this;
+        app.globalData.callback = function (res) {
+            console.log(654654)
+            //res  接收websocket onMessage事件返回的数据
+            let objs = JSON.parse(res.data),
+                unreadCount = that.data.unreadCount; /* triggered */
+            console.log('接收', objs)
+            if (objs.message) {
+                if (objs.message.timdialogid != that.data.timdialogid) return;
+            }
+            that.data.socketMsgQueue.push(objs);
+            /* 接受信息 */
+            that.setData({
+                socketMsgQueue: that.data.socketMsgQueue
+            })
+            if (objs.message.sendfrom) that.setData({
+                sendfrom: objs.message.sendfrom
+            })
+            that.toBotton()
+            /* if (wx.getStorageSync('userData').userid == objs.message.sendfrom.userid) {
+            } else {
+                that.setData({
+                    socketMsgQueue: that.data.socketMsgQueue
+                })
+            } */
+            /* ,
+                toView: `item${that.data.socketMsgQueue.length - 1}` */
+        };
         //详情
         _Http.basic({
             "accesstoken": wx.getStorageSync('userData').token,
@@ -657,7 +688,8 @@ Page({
                 ownerid: res.data[0].ownerid,
                 joinHands,
                 fimuserid: res.data[0].fimuserid,
-                fimdialogtype: res.data[0].fimdialogtype
+                fimdialogtype: res.data[0].fimdialogtype,
+                timdialogid:res.data[0].timdialogid
             })
             //判断是否为话题类型对话框
             if (res.data[0].fimdialogtype == '话题') {
@@ -686,32 +718,7 @@ Page({
                 this.query_imdialogMessage(); //非话题类型对话框，直接获取历史记录
             }
         });
-        app.globalData.callback = function (res) {
-            //res  接收websocket onMessage事件返回的数据
-            let objs = JSON.parse(res.data),
-                unreadCount = that.data.unreadCount; /* triggered */
-            console.log('接收', objs)
-            if (objs.message) {
-                if (objs.message.timdialogid != that.data.timdialogid) return;
-            }
-            that.data.socketMsgQueue.push(objs);
-            /* 接受信息 */
-            that.setData({
-                socketMsgQueue: that.data.socketMsgQueue
-            })
-            if (objs.message.sendfrom) that.setData({
-                sendfrom: objs.message.sendfrom
-            })
-            that.toBotton()
-            /* if (wx.getStorageSync('userData').userid == objs.message.sendfrom.userid) {
-            } else {
-                that.setData({
-                    socketMsgQueue: that.data.socketMsgQueue
-                })
-            } */
-            /* ,
-                toView: `item${that.data.socketMsgQueue.length - 1}` */
-        };
+
     },
 
     /**

pages/chatRoom/dialogbox.wxml

@@ -32,17 +32,20 @@
 <view class="input-box" style="bottom:{{keyboardHeight}}px;" wx:if="{{fimuserid==userid||fimdialogtype!='话题'}}">
     <!-- 普通输入框 -->
     <!-- bindblur="sendMsg" -->
-    <textarea class="input-text" bindfocus="textareaFocus" style="padding-right: {{timsubjectid==0?'25rpx':'150rpx'}};" adjust-position='{{false}}' bindconfirm='sendMsg' show-confirm-bar='{{false}}' confirm-type='send' confirm-hold='true' cursor-spacing='45' bindinput='sendInput' value='{{sendText}}' maxlength='-1' fixed='true' type="text" bindlinechange='linechange' bindkeyboardheightchange='keyboardheightchange'>
-    <!-- 话题 -->
-    <block wx:if="{{fimdialogtype=='话题'}}">
-        <view class="gambit" wx:if="{{timsubjectid==0}}" catchtap="createGambit">
-            发起会话
-        </view>
-        <navigator wx:else url='#' class="gambit-end" catchtap="endGambit">
-            <image src="/static/icon-20.png" mode="aspectFill"></image>
-        </navigator>
-    </block>
-    </textarea>
+    <view class="text-row">
+        <textarea class="input-text" bindfocus="textareaFocus" style="padding-right: {{timsubjectid==0?'25rpx':'150rpx'}};" adjust-position='{{false}}' bindconfirm='sendMsg' show-confirm-bar='{{false}}' confirm-type='send' confirm-hold='true' cursor-spacing='45' bindinput='sendInput' value='{{sendText}}' maxlength='-1' fixed='true' type="text" bindlinechange='linechange' bindkeyboardheightchange='keyboardheightchange'>
+        <!-- 话题 -->
+        <block wx:if="{{fimdialogtype=='话题'}}">
+            <view class="gambit" wx:if="{{timsubjectid==0}}" catchtap="createGambit">
+                发起会话
+            </view>
+            <navigator wx:else url='#' class="gambit-end" catchtap="endGambit">
+                <image src="/static/icon-20.png" mode="aspectFill"></image>
+            </navigator>
+        </block>
+        </textarea>
+        <van-button catchtap="sendMsg" round custom-class='sendButCalss'>发送</van-button>
+    </view>
     <view class="functionalZone" catchtap="selectionFunction">
         <image data-name='表情' mode="heightFix" src="/static/chatRoom/icon-01.png" />
         <image data-name='图片' mode="heightFix" src="/static/chatRoom/icon-02.png" />

pages/chatRoom/dialogbox.wxss

@@ -73,6 +73,13 @@ page {
     z-index: 99;
 }
 
+.text-row{
+    display: flex;
+    width: 100vw;
+    box-sizing: border-box;
+    padding: 25rpx 20rpx;
+}
+
 .input-text {
     position: relative;
     width: 710rpx;
@@ -80,9 +87,16 @@ page {
     line-height: 64rpx;
     background-color: #ffffff;
     border-radius: 32rpx;
-    margin: 20rpx auto !important;
-    padding: 0 25rpx 0;
     box-sizing: border-box;
+    padding: 0 25rpx;
+}
+
+.sendButCalss{
+    width: 130rpx !important;
+    height: 64rpx !important;
+    margin-left: 15rpx;
+    color: #ffffff !important;
+    background-color: #4DC2D4 !important;
 }
 
 /* 功能 */
@@ -144,12 +158,12 @@ page {
     width: 118rpx !important;
     height: 52rpx !important;
     background: #FFB600 !important;
-    border-radius: 10rpx;
-    padding: 0;
-    margin-right: 20rpx;
-    font-size: 24rpx;
-    font-family: PingFangSC-Medium, PingFang SC;
-    color: #FFFFFF;
+    border-radius: 10rpx !important;
+    padding: 0 !important;
+    margin-right: 20rpx !important;
+    font-size: 24rpx !important;
+    font-family: PingFangSC-Medium, PingFang SC !important;
+    color: #FFFFFF !important;
 }
 
 /* 群聊按钮 */
@@ -158,7 +172,7 @@ page {
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 710rpx;
+    width: 100%;
     height: 100%;
     background: linear-gradient(180deg, #FFFFFF 0%, #F4F4F4 100%);
     box-shadow: 0px 0px 4rpx 0px rgba(0, 0, 0, 0.1);

pages/liveStreaming/index.js

@@ -253,10 +253,11 @@ Page({
       "content": {
         "getdatafromdbanyway": true,
         "pageNumber": this.data.pageNumber,
-        "pageSize": 10,
+        "pageSize": 999,
         "channelid": this.data.accountMsg.channelid
       }
     }).then(res => {
+      console.log("6545654",res)
       if (res.msg != '成功') return wx.showToast({
         title: res.data,
         icon: "none"

pages/login/index.js

@@ -137,8 +137,6 @@ Page({
             console.log('WebSocket连接已关闭！readyState=' + that.globalData.SocketTask.readyState)
             that.globalData.socketEstablish = false;
         });
-        //建立链接
-        getApp().initSocket();
     },
     /* 登录页面提交数据 */
     loginSubmit() {

pages/portal/details.js

@@ -64,6 +64,43 @@ Page({
             url: './details?tagentsid=' + data.tagentsid + '&tsupplyanddemandid=' + data.tsupplyanddemandid,
         })
     },
+    callOut(e){
+        const {fphonenumber} = e.currentTarget.dataset.item;
+        wx.makePhoneCall({
+            phoneNumber:fphonenumber
+        }).catch((e) => {})
+    },
+    /* 一键联系 */
+    toLinkUp(e) {
+        const {
+            tsupplyanddemandid,
+            tenterprise_userid
+        } = e.currentTarget.dataset.item;
+        if (tenterprise_userid == wx.getStorageSync('userData').userid) return;
+        _Http.basic({
+            "accesstoken": wx.getStorageSync('userData').token,
+            "classname": "customer.supplyanddemand.supplyanddemand",
+            "method": "OpenImDialog",
+            "content": {
+                "tsupplyanddemandid": tsupplyanddemandid
+            }
+        }).then(res => {
+            if (res.msg != '成功') {
+                wx.navigateTo({
+                  url: '/pages/login/index',
+                })
+                wx.showToast({
+                    title: "当前还未登录，请登录后联系",
+                    icon: "none"
+                })
+            } else {
+                getApp().initSocket()
+                wx.navigateTo({
+                    url: '/pages/chatRoom/dialogbox?id=' + res.data[0].timdialogid,
+                })
+            }
+        })
+    },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

pages/portal/details.wxml

@@ -8,12 +8,13 @@
                     <image wx:if="{{particulars.headportraiturl}}" src="{{particulars.headportraiturl}}" mode="aspectFit"></image>
                     <image wx:else src="/static/tacitly-approve/MRuserImg.png" mode="aspectFit"></image>
                 </view>
-                <view class="header-userMessage-textMsg">{{particulars.createby}} {{particulars.checkdate}}</view>
+                <view class="header-userMessage-textMsg u-line-1" style="max-width: 330rpx;">{{particulars.createby}} {{particulars.checkdate}}</view>
             </view>
-            <!-- <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>
+            <view class="but-box">
+                <van-button wx:if="{{particulars.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut details-custom-slotBut" data-item="{{particulars}}" catchtap="toLinkUp">一键联系</van-button>
                 <van-button wx:else color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-NoSlotBut details-custom-slotBut">{{particulars.fstatus}}</van-button>
-            </view> -->
+                <van-button  color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut details-custom-slotBut call-out" data-item='{{particulars}}' catchtap="callOut">电话联系</van-button>
+            </view>
         </view>
     </view>
     <scroll-view scroll-y style="flex: 1; height: 1px;">

pages/portal/index.js

@@ -367,9 +367,25 @@ Page({
     },
     /* 跳转登录 */
     toLogin() {
-        wx.navigateTo({
-            url: '/pages/login/index',
+        _Http.basic({
+            "accesstoken": wx.getStorageSync('userData').token,
+            "classname": "customer.usercenter.usermsg.usermsg",
+            "method": "query_usermsg",
+            "content": {}
+        }).then(res=>{
+            console.log("个人信息",res)
+            if(res.msg=='失败'){
+                wx.navigateTo({
+                    url: '/pages/login/index',
+                })
+            }else{
+                wx.switchTab({
+                    url: '/pages/tabbar-pages/home/index',
+                })
+                // getApp().initSocket();
+            }
         })
+        /*  */
         // getApp().getUserProfile();
     },
     /**

pages/portal/portalLive/live.wxml

@@ -13,9 +13,9 @@
                 <view class="audience">
                     {{item.viewers}}人
                 </view>
-            </view>
-            <view wx:if="{{!isShow}}" class="explain u-line-1">{{item.faddress==null&&item.faddress=='null'?item.faddress:'暂无地址'}}</view>
-            <view wx:else class="explain u-line-1">{{item.flocation!=null?item.flocation:'暂无地址'}}</view>
+            </view><!-- wx:if="{{!isShow}}" -->
+            <view class="explain u-line-1">{{item.faddress!=null&&item.faddress!='null'?item.faddress:'暂无地址'}}</view>
+            <!-- <view wx:else class="explain u-line-1">{{item.flocation!=null?item.flocation:'暂无地址'}}</view> -->
         </view>
     </view>
 </view>

pages/tabbar-pages/home/index.js

@@ -258,6 +258,8 @@ Page({
                 key: 'liveUrl',
             })
         }
+        //建立链接
+        getApp().initSocket();
     },
     /* 判断二维码类型 */
     ifQrCodeType(data) {

pages/tabbar-pages/supplyAndDemand/particulars.js

@@ -118,6 +118,12 @@ Page({
             })
         })
     },
+    callOut(e){
+        const {fphonenumber} = e.currentTarget.dataset.item;
+        wx.makePhoneCall({
+            phoneNumber:fphonenumber
+        }).catch((e) => {})
+    },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

pages/tabbar-pages/supplyAndDemand/particulars.wxml

@@ -8,12 +8,13 @@
                     <image wx:if="{{particulars.headportraiturl}}" src="{{particulars.headportraiturl}}" mode="aspectFit"></image>
                     <image wx:else src="/static/tacitly-approve/MRuserImg.png" mode="aspectFit"></image>
                 </view>
-                <view class="header-userMessage-textMsg">{{particulars.createby}} {{particulars.checkdate}}</view>
+                <view class="header-userMessage-textMsg u-line-1" style="max-width: 330rpx;">{{particulars.createby}} {{particulars.checkdate}}</view>
             </view>
             <view class="but-box">
-                <van-button wx:if="{{particulars.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut details-custom-slotBut" data-item='{{particulars}}' catchtap="toLinkUp">一键联系</van-button>
+                <van-button wx:if="{{particulars.fstatus == '待对接'}}" color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut details-custom-slotBut" data-item='{{particulars}}' catchtap="toLinkUp">在线联系</van-button>
                 <van-button wx:elif='{{particulars.fstatus == "新建"}}' color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-NoSlotBut 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>
+                <van-button  color="#4DC2D4" style="margin-left: 16rpx;" custom-class="custom-slotBut details-custom-slotBut call-out" data-item='{{particulars}}' catchtap="callOut">电话联系</van-button>
             </view>
         </view>
     </view>

pages/tabbar-pages/supplyAndDemand/particulars.wxss

@@ -136,4 +136,8 @@ page {
     float: right !important;
     margin-right: 16rpx;
     margin-top: 15rpx;
+}
+
+.call-out{
+    background-color: #4DC2D4 !important;
 }

pages/tradeShow/index.js

@@ -14,10 +14,11 @@ Page({
         tactivityid: 0, //展会id
         //轮播图列表
         swiperBannerList: [],
-        liveList: [], //云展会直播大厅
+        liveList: [], //云展会直播大厅liveList
+        copyLiveList: [], //备份
         showLiveList: [], //显示直播列表
         liveClassifyList: [], //直播分类
-        liveSelectClassify: '全部', //直播分类选择
+        liveSelectClassify: '全部', //直播分类选择showLiveList
 
         agentList: [], //热门展商
         showAgentList: [], //显示热门展商
@@ -101,10 +102,10 @@ Page({
             "content": {
                 "tactivityid": this.data.tactivityid,
                 "siteid": "BWJ",
-                "pageSize": 20,
+                "pageSize": 999,
                 "pageNumber": this.data.pageNumber
             }
-        }, false).then(res => {
+        }).then(res => {
             console.log("云展会直播大厅", res)
             if (res.msg != "成功") {
                 wx.showToast({
@@ -124,8 +125,10 @@ Page({
                     let l = this.data.liveList;
                     liveList = l.concat(res.data.tlivelist)
                 }
+                wx.stopPullDownRefresh()
                 this.setData({
                     liveList,
+                    copyLiveList: liveList,
                     liveClassifyList: ClassifyList,
                     fagentcount: res.data.fagentcount,
                     flivecount: res.data.flivecount,
@@ -157,48 +160,22 @@ Page({
         arr.unshift('全部');
         return arr
     },
-    /* 直播大厅搜索 */
-    searchBlur(e) {
-        const {
-            value
-        } = e.detail;
-        const va = value.trim();
-        let data = JSON.parse(JSON.stringify(this.data.liveList));
-        if (this.data.liveSelectClassify == '全部') {
-            if (va == '') {
-                this.setData({
-                    showLiveList: handleList.twoDimensionalArr(data, 4, 10)
-                })
-            } else {
-                let arrList = data.filter(item => {
-                    let arr = [];
-                    for (let i in item) {
-                        if (item[i] != null || item[i] != undefined) arr.push(item[i])
-                    }
-                    if (arr.includes(va)) {
-                        return item
-                    }
-                });
-                this.setData({
-                    showLiveList: handleList.twoDimensionalArr(arrList, 4, 10)
-                })
+    fiveSearch(e) {
+        const value = e.detail.value.trim();
+        if (value) {
+            let list = [],
+                copyLiveList = this.data.copyLiveList;
+            for (let index = 0; index < copyLiveList.length; index++) {
+                if (copyLiveList[index].fbrand.includes(value) || copyLiveList[index].faddress.includes(value)) {
+                    list.push(copyLiveList[index])
+                }
             }
+            this.setData({
+                liveList: list
+            })
         } else {
-            let cList = data.filter(item => item.flocationclass == this.data.liveSelectClassify),
-                list = cList;
-            if (va != '') {
-                list = cList.filter(item => {
-                    let arr = [];
-                    for (let i in item) {
-                        if (item[i] != null || item[i] != undefined) arr.push(item[i])
-                    }
-                    if (arr.includes(va)) {
-                        return item
-                    }
-                })
-            }
             this.setData({
-                showLiveList: handleList.twoDimensionalArr(list, 4, 10)
+                liveList: this.data.copyLiveList
             })
         }
     },
@@ -256,7 +233,6 @@ Page({
             });
         }
     },
-
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
@@ -267,9 +243,7 @@ Page({
     /**
      * 生命周期函数--监听页面显示
      */
-    onShow: function () {
-
-    },
+    onShow: function () {},
 
     /**
      * 生命周期函数--监听页面隐藏
@@ -289,7 +263,11 @@ Page({
      * 页面相关事件处理函数--监听用户下拉动作
      */
     onPullDownRefresh: function () {
-
+        this.setData({
+            pageNumber:1,
+            pageTotal:1
+        })
+        this.getLiveChannelData()
     },
 
     /**

pages/tradeShow/index.json

@@ -1,5 +1,8 @@
 {
   "usingComponents": {
     "liveList": "/pages/portal/portalLive/live"
-  }
+  },
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh":true,
+  "onReachBottomDistance":50 
 }

pages/tradeShow/index.wxml

@@ -31,7 +31,7 @@
             </view>
         </van-transition>
         <view class="liveSearch">
-            <input class="liveSearch-input" type="text" confirm-type='search' placeholder="搜索直播间" bindinput="searchBlur" />
+            <input class="liveSearch-input" type="search" confirm-type='search' placeholder="搜索直播间" bindconfirm="fiveSearch" />
             <view class="liveSearch-icon">
                 <image src="/static/icon-09.png" style="width: 20rpx; height: 20rpx; margin-bottom:6rpx;" mode="aspectFit"></image>
             </view>
@@ -43,7 +43,12 @@
     <scroll-view wx:if="{{liveList.length}}" scroll-y class="live-scroll-view" bindscrolltolower='scrolltolower'>
         <liveList list="{{liveList}}" isShow='{{true}}' />
     </scroll-view>
-    <van-empty wx:else class="custom-image" image="/static/zhanhui.png" description="暂未开放,敬请期待!" />
+    <van-empty wx:else class="custom-image" image="/static/zhanhui.png">
+        <view class="empty">
+            <view>开放日期：3月17日～3月19日</view>
+            <view>开放时间：每天19:30-20:30</view>
+        </view>
+    </van-empty>
     <!-- <view wx:else style="width: 100%; display: flex; justify-content: center; flex-direction: column; align-items: center;">
         <image style="height: 454rpx; width:480rpx;" src="/static/zhanh.png"></image>
         <view style="padding:15rpx 0 ; opacity: 0.6;">暂未开发,敬请期待!</view>

pages/tradeShow/index.wxss

@@ -220,6 +220,20 @@
     height: 50vh;
 }
 
-.custom-image{
+.custom-image {
     padding-bottom: 0px !important;
+}
+
+/* 空状态 */
+.empty {
+    width: 100%;
+    text-align: center;
+    margin: -20rpx 0;
+}
+
+.empty>view {
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-size: 24rpx;
+    line-height: 40rpx;
+    color: rgba(0, 0, 0, 0.3);
 }

project.config.json

@@ -1,5 +1,5 @@
 {
-    "description": "项目配置文件",
+    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "packOptions": {
         "ignore": [],
         "include": []
@@ -51,16 +51,6 @@
     "libVersion": "2.21.2",
     "appid": "wx5dc7fd18b6335214",
     "projectname": "%E5%B8%83%E4%B8%87%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F",
-    "debugOptions": {
-        "hidedInDevtools": []
-    },
-    "scripts": {},
-    "staticServerOptions": {
-        "servePath": ""
-    },
-    "watchOptions": {
-        "ignore": []
-    },
     "simulatorType": "wechat",
     "simulatorPluginLibVersion": {
         "qywx_simulator_plugin": "2.4.0"
@@ -84,5 +74,9 @@
         "miniprogram": {
             "list": []
         }
+    },
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
     }
 }

project.private.config.json

@@ -2,46 +2,19 @@
     "libVersion": "2.19.6",
     "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,
-        "minifyWXML": true,
         "showES6CompileOption": false,
-        "useCompilerPlugins": false,
-        "ignoreUploadUnusedFiles": true,
         "useStaticServer": true
     },
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "condition": {
-        "plugin": {
-            "list": []
-        },
-        "game": {
-            "list": []
-        },
-        "gamePlugin": {
-            "list": []
-        },
         "miniprogram": {
             "list": [
                 {

utils/Http.js

@@ -1,5 +1,5 @@
-const baseUrl = "https://test.buwanjia.com/bwj/rest/webclientrest";
-// const baseUrl = "https://www.buwanjia.com/bwj/rest/webclientrest";
+// const baseUrl = "https://test.buwanjia.com/bwj/rest/webclientrest";
+const baseUrl = "https://www.buwanjia.com/bwj/rest/webclientrest";
 class HTTP {
     request({
         url,
@@ -37,7 +37,7 @@ class HTTP {
                 if (res.errMsg != 'request:ok') {
                     wx.hideLoading()
                     wx.showToast({
-                        title: '网络异常，请重新进入',
+                        title: '网络异常，请稍后再试',
                         icon: "none"
                     })
                 }