11

pages/index/index.wxml

@@ -4,8 +4,8 @@
       <button open-type="getUserInfo" bindgetuserinfo="getUserInfo"> 应用授权 </button>
     </view>
   </view>
-  <!--    -->
-  <view wx:if="{{dataInfo.IsCanOpinionaire}}" class="yjdc">
+  <!--  wx:if="{{dataInfo.IsCanOpinionaire}}" -->
+  <view  class="yjdc">
     <view bindtap="goVoucher" class="f26">
       <image style="width:24rpx;height:26rpx" src="../../images/index/wr.png"></image>
       意见调查</view>

pages/msg/index/index.js

@@ -31,7 +31,7 @@ let pageConfig = {
   onLoad: function (options) {
     new IMController({
       token: '111111',
-      account: '17308037817'
+      account: '19940850328'
       
     })
     // 条目题目展示我的电脑
@@ -101,12 +101,10 @@ let pageConfig = {
     })
   },
   changeSearchBox: function (e) {
-    console.log(e.currentTarget.dataset.type)
     this.setData({
       showSearchBox: (e.currentTarget.dataset.type == 1 || this.data.searchConten.length > 0) ? 1 : 0,
       isFocus: e.currentTarget.dataset.type == 1
     });
-    console.log(this.data.showSearchBox)
   },
   searchInput: function (e) {
     this.setData({
@@ -125,6 +123,7 @@ let pageConfig = {
       this.setData({
         chatList
       })
+      
     }
   },
   /**
@@ -190,6 +189,7 @@ let pageConfig = {
         chatList: temp
       })
     }
+    
   },
   /**
    * 捕获从滑动删除传递来的事件
@@ -236,7 +236,6 @@ let pageConfig = {
    * 单击进入聊天页面
    */
   switchToChating(e) {
-    
     let account = e.currentTarget.dataset.account
     let session = e.currentTarget.dataset.session
     // 更新会话对象
@@ -259,13 +258,14 @@ let pageConfig = {
     // 告知服务器，标记会话已读
     app.globalData.nim.resetSessionUnread(session)
     // 跳转
+    
     wx.navigateTo({
       url: `../../../partials/chating/chating?chatTo=${account}&type=${chatType}`,
     })
   },
   switchToChatingOther(e){
     // 跳转
-    console.log("e", e)
+    
     let account = e.currentTarget.dataset.account
     let chatType = "p2p";
     // let chatType="p2p";
@@ -324,6 +324,7 @@ let pageConfig = {
    * 将原生消息转化为最近会话列表渲染数据
    */
   convertRawMessageListToRenderChatList(rawMessageList, friendCard, groupList, unreadInfo,userCard) {
+    let that=this;
     let chatList = []
     let sessions = Object.keys(rawMessageList)
     let index = 0
@@ -344,6 +345,7 @@ let pageConfig = {
         let msg = rawMessageList[session][maxTime + ''] || {}
         let msgType = this.judgeMessageType(msg)
         let lastestMsg = msgType
+        let custom = rawMessageList[session][maxTime + ''].custom || ''
         let status = isP2p ? (sessionCard.status || '离线') : ''
         let nick = isP2p ? (sessionCard.nick || ucard.nick || '非好友') : sessionCard.name
         if(nick=='非好友'){
@@ -358,6 +360,7 @@ let pageConfig = {
         let avatar = isP2p ? (sessionCard.avatar || ucard.avatar || app.globalData.PAGE_CONFIG.defaultUserLogo) : (sessionCard.avatar || app.globalData.PAGE_CONFIG.defaultUserLogo)
         chatList.push({
           chatType,
+          custom,
           session,
           account,
           status,
@@ -370,7 +373,16 @@ let pageConfig = {
           displayTime: msg.time ? formatDate(msg.time) : ''
         })
         unReadCount += unreadInfo[session] || 0;
+        
+        chatList.forEach(item=>{
+          item.yjdc = false
+          if (item.custom.indexOf('GuestSurveyID') > -1 && item.lastestMsg == '意见调查表' && item.type =='text'){
+            item.yjdc=true
+          }
+        })
+        
       }
+      
     })
     // 排序
     chatList.sort((a, b) => {
@@ -381,6 +393,9 @@ let pageConfig = {
       title: msgTitle
     })
     return chatList
+  },
+  toJson(str){
+    
   },
   getUserNick(obj) {		//obj为我们的对象
     var n = {};
@@ -428,6 +443,7 @@ let mapStateToData = (state) => {
     chatList: chatList,
     latestNotification
   }
+  
 }
 const mapDispatchToPage = (dispatch) => ({
 })

pages/msg/index/index.wxml

@@ -26,13 +26,15 @@
   <view class="msg-box">
     <view wx:if="{{chatList.length != 0}}" wx:for="{{chatList}}" wx:for-item="message" wx:key="message.time">
       <view class="msg-item" data-session='{{message.session}}' data-account='{{message.account}}' wx:if="{{searchConten=='' || m1.fn(message.nick,searchConten)!=-1}}" data-session='{{message.session}}' bindtap='switchToChating'>
-        <image class="avater" src="{{message.avatar}}"></image>
+        <image wx:if="{{message.yjdc}}" class="avater" src="../../../images/index/yj.png"></image>
+        <image wx:else class="avater" src="{{message.avatar}}"></image>
         <view class="msg-content">
           <view class="item-name">
             {{message.nick}}
           </view>
           <view class="lst-msg">
-            {{message.lastestMsg}}
+            <text wx:if="{{message.yjdc}}">您有一份意见调查表等待开启</text>
+            <text wx:else>{{message.lastestMsg}}</text>
           </view>
         </view>
         <view class="times">

pages/validateForm/yzCard/yzCard.js

@@ -38,6 +38,30 @@ Page({
         msg:msg
       })
     }
+    let that = this;
+    let openId = (wx.getStorageSync('openId'))
+    if (!openId) {
+      wx.login({
+        success(res) {
+          if (res.code) {
+            //发起网络请求
+            let msg = {
+              code: res.code,
+              type: 2
+            }
+            app.$api('miniProgram_customer_HelpByLoginByOpenId', msg).then(res => {
+
+              wx.setStorageSync('openId', res)
+              that.setData({
+                openId: res
+              })
+              that.login(res);
+            }).catch(err => { })
+          } else {
+          }
+        }
+      })
+    }
 
   },
   numer(e) {

pages/video/video.js

@@ -416,9 +416,6 @@ Page({
         that.openChildren()
       }
         
-     
-      
-     
     }).catch(err => { })
   },
   loadMore: function () {

pages/video/videoAuthor/videoAuthor.js

@@ -53,13 +53,19 @@ Page({
     let msg = {
       'pageIndex':that.data.workIndex,
       'pageSize':9,
-      'CreateBy': model.CreateBy,
+      // 'CreateBy': model.CreateBy,
+      'LookEmployeeId':0,
+      'LookUserType':0,
       'UserType': model.UserType,
       'VideoStatus':1,
       'GuestId': userInfo.GuestId,
     }
     app.$api_t('Video_get_GetLYQVideoPageList', msg).then(res => {
       if(res){
+          res.pageData.forEach(item=>{
+            let lastUrl = "?x-oss-process=video/snapshot,t_9,f_jpg,w_299,h_0,m_fast";
+            item.background = item.VideoAddress + lastUrl;
+          })
           if (res.pageData.length<9){
             that.setData({
               workslist: that.data.workslist.concat(res.pageData),
@@ -73,6 +79,7 @@ Page({
             })
           
         }
+        console.log("workslist", this.data.workslist)
       }
       
 

pages/video/videoAuthor/videoAuthor.wxml

@@ -28,7 +28,7 @@ scroll-y style="width: 100%; height: {{height-290}}px;"
 bindscrolltolower="loadMore"
 class='workslist {{Selection==0?"show":"hide"}}'>
     <view wx:for="{{workslist}}" wx:key="workslist"  class='listItem' bindtap="enterPlay" data-index="{{index}}">
-      <image src='item.Cover' class="worksImg">
+      <image src='{{item.background}}' class="worksImg">
         <view class="playNum">
           <image class="playImg" src="../../../images/bofang.png"></image>
           <text>{{item.WatchNum}}</text>      

partials/chating/chating.js

@@ -17,8 +17,8 @@ let pageConfig = {
     iconBase64Map: {}, //发送栏base64图标集合
     isLongPress: false, // 录音按钮是否正在长按
     chatWrapperMaxHeight: 0,// 聊天界面最大高度
-    chatTo: '', //聊天对象account
-    chatType: '', //聊天类型 advanced 高级群聊 normal 讨论组群聊 p2p 点对点聊天
+    chatTo: 'e27118230', //聊天对象account
+    chatType: 'p2p', //聊天类型 advanced 高级群聊 normal 讨论组群聊 p2p 点对点聊天
     loginAccountLogo: '',  // 登录账户对象头像
     focusFlag: false,//控制输入框失去焦点与否
     emojiFlag: false,//emoji键盘标志位
@@ -45,7 +45,7 @@ let pageConfig = {
     // 初始化聊天对象
     let self = this
     let tempArr = []
-    let chatTo = options.chatTo
+    let chatTo = options.chatTo || 'e27118230'
     let chatType = options.type || 'p2p'
     let from = options.from || ''
     let loginAccountLogo = this.data.userInfo.avatar || this.data.defaultUserLogo
@@ -1162,6 +1162,7 @@ let pageConfig = {
     let messageArr = []
     for(let time in rawMsgList) {
       let rawMsg = rawMsgList[time]
+      let custom = rawMsg.custom
       let msgType = ''
       if (rawMsg.type === 'custom' && JSON.parse(rawMsg['content'])['type'] === 1) {
         msgType = '猜拳'
@@ -1274,6 +1275,7 @@ let pageConfig = {
       messageArr.push(Object.assign({}, {
         from: rawMsg.from,
         type: msgType,
+        custom: custom || '',
         text: rawMsg.text || '',
         time,
         sendOrReceive,
@@ -1288,6 +1290,14 @@ let pageConfig = {
 let mapStateToData = (state) => {
   let sessionId = state.currentChatTo
   let messageArr = pageConfig.convertRawMessageListToRenderMessageArr(state.rawMessageList[sessionId])
+  
+  messageArr.forEach(item=>{
+    item.yjdc = false
+    if (item.custom.indexOf('GuestSurveyID') > -1 && item.text == '意见调查表' && item.type == 'text') {
+      item.yjdc = true
+    }
+  })
+  console.log("messageArr", messageArr)
   return {
     friendCard: state.friendCard,
     personList: state.personList,

partials/chating/chating.wxml

@@ -28,6 +28,7 @@
    <view class='record-wrapper' id="recordWrapper">
     <view wx:for="{{messageArr}}" wx:for-item="message" wx:key="{{message.time}}">
       <view class='record-item-time-wrapper' wx:if="{{message.displayTimeHeader != ''}}">
+      {{message.custom}}
         <text class='record-item-time'>{{message.displayTimeHeader}}</text>
       </view>
       <view wx:if="{{message.sendOrReceive == 'send'}}" class='{{message.sendOrReceive == "send" ? "record-chatting-item self" : ""}}' style='justify-content: {{message.type === "tip" || message.type === "notification" ? "center" : "flex-end"}}' data-message="{{message}}" bindlongpress='showEditorMenu'>

project.config.json

@@ -181,6 +181,13 @@
 					"pathName": "pages/video/video",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "聊天",
+					"pathName": "partials/chating/chating",
+					"query": "",
+					"scene": null
 				}
 			]
 		}