更新

app.js

@@ -70,7 +70,9 @@ App({
     this.globalData.SocketTask.onClose(function (res) {
       console.log('WebSocket连接已关闭！readyState=' + that.globalData.SocketTask.readyState)
       if (that.globalData.socketEstablish == false) {
-        that.initSocket()
+        setTimeout(() => {
+          that.initSocket()
+        }, 1000)
       } else {
         that.globalData.socketEstablish = false;
       }

components/My_Checkbox/index.wxss

@@ -41,9 +41,9 @@
 /* 按钮 */
 .checkbox_but {
     display: flex;
-    justify-content:flex-end;
+    justify-content: flex-end;
     width: 100vw;
-    margin: 30rpx 0 80rpx 0;
+    margin: 30rpx 0 0 0;
     box-sizing: border-box;
 }
 

components/My_SearchInputBox/index.wxml

@@ -8,10 +8,10 @@
     <view class="searc" wx:else style="opacity: 0;"></view>
 </view>
 <view class='bot-but'>
-    <view class="searc_but" style="margin-right: 80rpx; background: #4BBECF;" catchtap="InvitedToEnter" wx:if="{{invitation}}">
+    <view class="searc_but" style="background: #4BBECF;" catchtap="InvitedToEnter" wx:if="{{invitation}}">
         邀请
     </view>
-    <view class="searc_but" bindtap="itemAdd" wx:if="{{fisadministrator}}">
+    <view class="searc_but" style="margin-left:{{invitation?'80rpx':''}};" bindtap="itemAdd" wx:if="{{fisadministrator}}">
         {{butText}}
     </view>
 </view>

components/My_SearchInputBox/index.wxss

@@ -45,14 +45,13 @@ input {
     align-items: center;
     justify-content: center;
     position: fixed;
-    width: 100vw;
     height: 128rpx;
+    width: 100vw;
     background: #FFFFFF;
     bottom: 0;
     box-shadow: 0px -4rpx 16rpx 0px rgba(0, 0, 0, 0.05);
 }
 
-
 .searc_but {
     width: 160rpx;
     height: 60rpx;

components/My_TwoDimensionalCode/analyze.js

@@ -15,7 +15,6 @@ function showModel(data, content) {
 //解析二维码链接
 function setDataUrl(url, login) {
     let q = url;
-    console.log("q", q);
     const data = {
         type: q.slice(q.indexOf("type=") + 5, q.indexOf('&')),
         id: q.slice(q.lastIndexOf('=') + 1),

components/My_TwoDimensionalCode/index.wxml

@@ -3,5 +3,5 @@
     <view class="two-code" bindtap="preViewImage">
         <image src="{{qrcodeURL}}" mode="aspectFit"></image>
     </view>
-    <view class="two-code-text">{{codeName}}<text catchtap="download">下载</text></view>
+    <view class="two-code-text">{{codeName}}<text wx:if="{{false}}" catchtap="download">下载</text></view>
 </My_DisplayBox>

pages/annunciate/newAndChange.wxml

@@ -11,7 +11,7 @@
                 编辑/预览
             </view>
         </My_GreyRectangleForm>
-        <My_GreyRectangleForm title="通告封面" required>
+        <My_GreyRectangleForm title="通告封面">
             <My_UploadFiles id="UploadFiles" fileList="{{coverFiles}}" upType="annunciate" UploadShow="2" previewSize="60px" maxCount="1" previewSize="63px" bindimageChange="imageChange"></My_UploadFiles>
         </My_GreyRectangleForm>
         <My_GreyRectangleForm title="上传附件">
@@ -27,7 +27,6 @@
         </My_GreyRectangleForm>
     </view>
 </My_GeneralTemplate>
-
 <!-- 发布类型弹出层 -->
 <van-action-sheet show="{{ popups }}" bind:close="showPop">
     <My_MultipleChoice type='annunciate' title="发布类型" pitchOnItem="{{ftype}}" bind:optionChange="radioChange" />

pages/businessPartner/index.js

@@ -17,7 +17,9 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad: function (options) {},
+    onLoad: function (options) {
+        console.log(options)
+    },
     /* 搜索 */
     searchQuery({
         detail

pages/chatRoom/create.wxml

@@ -3,7 +3,7 @@
     <view class="group-name">
         <view class="name">
             <text style="opacity: 0;">{{inputValue==''?'编辑群名':inputValue}}</text>
-            <input type="text" bindinput="nameInput" bindblur="changeName" bindconfirm="changeName" value="{{inputValue}}" placeholder="编辑群名" />
+            <input type="text" bindinput="nameInput" bindconfirm="changeName" value="{{inputValue}}" placeholder="编辑群名" />
         </view>
         <image confirm-type='done' src="/static/icon-17.png"></image>
     </view>

pages/chatRoom/dialogbox.js

@@ -29,6 +29,7 @@ Page({
         timdialogid: 0, //对话框id
         gambitList: [], //话题列表
         sendfrom: [],
+        isEndGambit: true, //是否结束话题，用于点击编辑不结束话题
     },
     /**
      * 生命周期函数--监听页面加载
@@ -49,6 +50,9 @@ Page({
         this.getMeme()
     },
     toCreate() {
+        this.setData({
+            isEndGambit: false
+        })
         wx.navigateTo({
             url: '/pages/chatRoom/create?timdialogid=' + this.data.timdialogid,
         })
@@ -334,33 +338,61 @@ Page({
     },
     /* 确认合作 */
     confirmTheCooperation() {
-        _Http.basic({
-            "accesstoken": wx.getStorageSync('userData').token,
-            "classname": "customer.supplyanddemand.supplyanddemand",
-            "method": "updatesupplyanddemandstatus",
-            "content": {
-                "tsupplyanddemandid": this.data.ownerid,
-                "fstatus": "已解决",
-                "tenterprise_userid": this.data.initiator,
-                "timdialogid": this.data.timdialogid
+        let that = this;
+        wx.showModal({
+            title: '提示',
+            content: '是否确定达成合作',
+            success: function (res) {
+                if (res.confirm) {
+                    _Http.basic({
+                        "accesstoken": wx.getStorageSync('userData').token,
+                        "classname": "customer.supplyanddemand.supplyanddemand",
+                        "method": "updatesupplyanddemandstatus",
+                        "content": {
+                            "tsupplyanddemandid": that.data.ownerid,
+                            "fstatus": "已解决",
+                            "tenterprise_userid": that.data.initiator,
+                            "timdialogid": that.data.timdialogid
+                        }
+                    }).then(res => {
+                        let text = ' 恭喜达成合作';
+                        if (res.msg != '成功') text = res.data;
+                        wx.showToast({
+                            title: text,
+                            icon: "none"
+                        })
+                    })
+                }
             }
-        }).then(res => {
-            console.log("确认合作", res)
         })
     },
     /* 拒绝合作 */
     refuseToCooperate() {
-        _Http.basic({
-            "accesstoken": wx.getStorageSync('userData').token,
-            "classname": "customer.supplyanddemand.supplyanddemand",
-            "method": "updatesupplyanddemandstatus",
-            "content": {
-                "tsupplyanddemandid": this.data.ownerid,
-                "fstatus": "待对接",
-                "timdialogid": this.data.timdialogid
+        let that = this;
+        wx.showModal({
+            title: '提示',
+            content: '是否确定拒绝',
+            success: function (res) {
+                if (res.confirm) {
+                    _Http.basic({
+                        "accesstoken": wx.getStorageSync('userData').token,
+                        "classname": "customer.supplyanddemand.supplyanddemand",
+                        "method": "updatesupplyanddemandstatus",
+                        "content": {
+                            "tsupplyanddemandid": that.data.ownerid,
+                            "fstatus": "待对接",
+                            "timdialogid": that.data.timdialogid
+                        }
+                    }).then(res => {
+                        let text = ' 拒绝成功';
+                        if (res.msg != '成功') text = res.data;
+                        wx.showToast({
+                            title: text,
+                            icon: "none"
+                        })
+                    })
+                }
             }
-        }).then(res => {
-            console.log("拒绝合作", res)
         })
     },
     /* 输入框数据绑定 */
@@ -634,7 +666,7 @@ Page({
                         this.setData({
                             timsubjectid: s.data[0].timsubjectid
                         })
-                        this.endGambit(true) //存在未关闭话题，调用关闭话题，并在关闭后重新获取历史话题
+                        if (this.data.isEndGambit) this.endGambit(true) //存在未关闭话题，调用关闭话题，并在关闭后重新获取历史话题
                     } else {
                         this.query_imdialogMessage(); //不存在未关闭话题，直接获取历史话题
                     }

pages/chatRoom/index.js

@@ -37,7 +37,7 @@ Page({
         if (value == '') {
             this.setData({
                 relationList: this.data.relationListCopy,
-                discussionGroup: this.data.discussionGroupListCopy
+                discussionGroupList: this.data.discussionGroupListCopy
             })
         } else {
             let relationList = this.data.relationListCopy,
@@ -47,12 +47,12 @@ Page({
             for (let i = 0; i < relationList.length; i++) {
                 let data = relationList[i];
                 data.users = ''
-                if (JSON.stringify(data).includes(value)) newRelationList.push(relationList[i])
+                if (data.fimdialogname.includes(value)) newRelationList.push(relationList[i])
             };
             for (let i = 0; i < discussionGroup.length; i++) {
                 let data = discussionGroup[i];
                 data.users = ''
-                if (JSON.stringify(data).includes(value)) newDiscussionGroup.push(discussionGroup[i])
+                if (data.fimdialogname.includes(value)) newDiscussionGroup.push(discussionGroup[i])
             }
             this.setData({
                 relationList: newRelationList,

pages/storeMessage/select.js

@@ -38,9 +38,17 @@ Page({
                     if (res.errMsg != 'scanCode:ok') return wx.showToast({
                         title: '扫码失败',
                     });
-                    wx.navigateTo({
-                        url: '/pages/login/QrCode?url=' + encodeURIComponent(res.result),
-                    });
+                    let q = res.result;
+                    const data = {
+                        type: q.slice(q.indexOf("type=") + 5, q.indexOf('&')),
+                        id: q.slice(q.lastIndexOf('=') + 1),
+                        name: q.slice(q.lastIndexOf('fbrand=') + 7, q.lastIndexOf('&'))
+                    }
+                    wx.setStorageSync('qrCodeMsg', data);
+                    console.log(wx.getStorageSync('qrCodeMsg'))
+                    wx.switchTab({
+                        url: '/pages/tabbar-pages/home/index',
+                    })
                 },
                 fail(err) {
                     console.log("扫码失败", err)

pages/tabbar-pages/home/index.js

@@ -239,6 +239,12 @@ Page({
     /* 判断二维码类型 */
     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.type == 'partner') {
             //申请合作
             MyModelText = '是否向“' + data.name + '”发送合作申请';

pages/tabbar-pages/message/index.js

@@ -8,7 +8,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-        tabsActive: 0, //tabs 下标
+        tabsActive: 1, //tabs 下标
         msgList: [],
         pageNumber: 1,
         pageTotal: 1