bug fix

config/prod.js

@@ -5,10 +5,9 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.0.218:8080"',
     // WSS_HOST: '"ws://192.168.0.218:8080"',
-    HOST: '"https://dev.jinchengjiaye.com"',
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
+    HOST: '"https://lt.pawoma.cn"',
+    WSS_HOST: '"wss://lt.pawoma.cn"',
+    Version:'V3.5.2.2_1210'
   },
   weapp: {},
   h5: {}

src/app.js

@@ -189,37 +189,37 @@ class App extends Component {
     // 获取城市列表
     queryCityList().then(payload => {
       store.dispatch({ type: CITY_LIST, payload })
+    })
 
-      // 获取router参数
-      this.getRouterParams().then(router => {
-        Taro.setStorageSync('router', router)
-        console.info('router2:', router)
-        console.info('-----------')
-        const { query: payload } = router
+    // 获取router参数
+    this.getRouterParams().then(router => {
+      Taro.setStorageSync('router', router)
+      console.info('router2:', router)
+      console.info('-----------')
+      const { query: payload } = router
 
-        payload.path = router.path
-        payload.scene = router.scene
+      payload.path = router.path
+      payload.scene = router.scene
 
-        // login
-        login(payload, res => {
-          // 获取未读消息
-          const { person: { personId } } = res
-          queryUserInfo(personId).then(info => {
-            const { unReadNum } = info
-            store.dispatch({ type: ASSIGN_UNREADNUM, payload: { unReadNum } });
-            socket.createSocket({ id: personId });
-            socket.wss.onMessage(data => {
-              store.dispatch({ type: INCREASE_UNREADNUM })
-            })
+      // login
+      login(payload, res => {
+        // 获取未读消息
+        const { person: { personId } } = res
+        queryUserInfo(personId).then(info => {
+          const { unReadNum } = info
+          store.dispatch({ type: ASSIGN_UNREADNUM, payload: { unReadNum } });
+          socket.createSocket({ id: personId });
+          socket.wss.onMessage(data => {
+            store.dispatch({ type: INCREASE_UNREADNUM })
           })
+        })
 
-          const data = Object.assign({}, payload, {
-            event: 'start',
-            propertyName: '进入小程序',
-            data: ''
-          })
-          savePoint(data)
+        const data = Object.assign({}, payload, {
+          event: 'start',
+          propertyName: '进入小程序',
+          data: ''
         })
+        savePoint(data)
       })
     })
   }

src/constants/api.js

@@ -37,6 +37,7 @@ export const API_CHAT_HISTORY = resolvePath('chat/history')
 export const API_CHAT_SEND = wss_host + '/wx/chat'
 export const API_CHAT_FRIENDS = resolvePath('chat/with')
 export const API_UPLOAD_IMAGE = resolvePath('image')
+export const API_CHAT_READED = resolvePath('chat/message')
 
 // card
 export const API_CARDS_LIST = resolvePath('cards')

src/pages/im/index.js

@@ -6,7 +6,7 @@ import MsgItem from './msgItem'
 import FormIdCollector from '@components/formIdCollector'
 import BackHomeBtn from '@components/BackHomeBtn'
 
-import { queryChatHistory } from '@services/chat'
+import { queryChatHistory, setMessageReaded } from '@services/chat'
 import { uploadFiles, fetch } from '@utils/request'
 import { deepClone } from '@utils/tools'
 
@@ -193,14 +193,14 @@ export default class Chat extends Component {
 
       socket.sendNotice(payload, res => {
         console.log('发送成功')
-        this.appendData(payload)
+        // this.appendData(payload)
       })
 
       this.setState({
         nickname: chattingName,
         avatarurl: res.picture || res.avatar,
         personType: res.personType,
-      })
+      }, this.toBottom)
     })
   }
 
@@ -232,7 +232,10 @@ export default class Chat extends Component {
 
   handlerRecive = (data) => {
     // debugger
+
     this.appendData(data)
+    // 更新消息为已读
+    setMessageReaded(data.chatId)
   }
 
   loadList = (cb) => {

src/pages/im/list/index.js

@@ -64,13 +64,14 @@ export default class Index extends Component {
     })
   }
 
-  handleItemClick = ({ unReadNum }) => {
+  handleItemClick = ({ unReadNum }) => person => {
+
     if (unReadNum > 0) {
       const { dispatch } = getStore()
       dispatch({ type: DECREASE_UNREADNUM, payload: unReadNum })
     }
 
-    return this.toChat.bind(this);
+    return this.toChat(person);
   }
 
   render() {

src/pages/person/index.js

@@ -10,8 +10,10 @@ import * as actions from '@actions/user'
 import Authorize from '@components/authorize'
 import { transferImage } from '@utils/tools'
 import { menus } from './menus'
+export const version = Version
 
 @connect(({ user, city }) => ({ user, city }), { ...actions })
+
 export default class Person extends Component {
   config = {
     navigationBarTitleText: '我的'
@@ -24,8 +26,7 @@ export default class Person extends Component {
     consultant: false,//置业顾问
     tourist: false,//普通用户,
     menus: [],
-    roleName: '普通用户',
-
+    roleName: '普通用户'
   }
 
   componentDidShow () {
@@ -35,10 +36,10 @@ export default class Person extends Component {
   }
 
   loadUserInfo () {
-  
+
     queryUserInfo().then(user => {
       const [roleSetting, roleName] = this.getRoleName(user.personType)
-     
+
       this.setState({
         user,
         phone: user.phone,
@@ -92,7 +93,7 @@ export default class Person extends Component {
       }
     }
     else {
-      putRegisterConsultant().then(res => {    
+      putRegisterConsultant().then(res => {
 
         // if (res) {
           Taro.showToast({
@@ -234,6 +235,7 @@ export default class Person extends Component {
             })
           }
         </View>
+        <View style="text-align:center;line-height:50px;color:#cccccc;">{version}</View>
       </View>
     );
   }

src/pages/person/index.scss

@@ -41,7 +41,7 @@
 
 .person {
   width: 100vw;
-  padding-bottom: 100px;
+  padding-bottom: 20px;
   position: relative;
   overflow: hidden;
 }
@@ -71,7 +71,7 @@
     }
   }
 
-  
+
   .left-icon{
     width:46px;
     height:42px;
@@ -112,7 +112,7 @@
       border:2px solid #ddd;
       border-radius: 12px;
     }
- 
+
   }
   .bg {
     width: 100%;
@@ -385,7 +385,7 @@
         border-bottom: 4px solid #EDCA73;
         line-height: 28px;
       }
-      
+
     }
     .right-icon{
       position: absolute;
@@ -433,7 +433,7 @@
       background-color: #fff;
       border-radius: 12px;
       padding: 20px 20px;
-      
+
       .scroll-con{
         height: 500px;
         width: 100%;
@@ -456,11 +456,11 @@
         }
 
       }
-    
+
     }
     .close{
       font-size: 48px;
       color: rgba(0,0,0,0.3);
       float: right;
     }
-}
+}

src/pages/project/h5Page.js

@@ -108,6 +108,7 @@ export default class Index extends Component {
           console.log(res, "解析二维码返回值")
         })
       }
+
       console.log(this.$router, "this.$router")
       const router = Taro.getStorageSync('router')
       console.log(router, "router")
@@ -115,10 +116,21 @@ export default class Index extends Component {
       console.log(hFiveId, "hFiveId")
       // h5id 、第一个分享人ID、置业顾问ID、分享人ID 
       getHFiveDetail(hFiveId).then(res => {
-        // debugger
-        this.setState({
-          pageInfo: res
-        })
+        if(res.status==1){
+          this.setState({
+            pageInfo: res
+          })
+        }else{
+          Taro.showModal({
+            title: '提示',
+            content: '活动已下架(无法进入或者参加活动)',
+            showCancel:false,
+          }).then(()=>{
+            Taro.switchTab({
+              url: '/pages/project/index'
+            })
+          })
+        }
       })
       const { userInfo: { person: { avatarurl, phone } } } = this.props
       console.log(this.props, "this.propsthis.propsthis.props")

src/services/chat.js

@@ -3,7 +3,8 @@ import {
   API_CHAT_SEND,
   API_CHAT_HISTORY,
   API_CHAT_FRIENDS,
-  API_UPLOAD_IMAGE
+  API_UPLOAD_IMAGE,
+  API_CHAT_READED,
 } from '@constants/api'
 
 
@@ -32,4 +33,8 @@ export const queryChatFriends = payload => fetch({ url: API_CHAT_FRIENDS, payloa
  */
 export const uploadImage = payload => fetch({ url: API_UPLOAD_IMAGE, payload })
 
-
+/**
+ * 更新消息为已读
+ * @param {*} payload 
+ */
+export const setMessageReaded = chatID => fetch({ url: `${API_CHAT_READED}/${chatID}`, method: 'PUT' })

src/utils/im.js

@@ -116,7 +116,11 @@ class IMManager {
         }
       })
     } else {
-      this.socketMsgQueue.push(payload)
+      // this.socketMsgQueue.push(payload)
+          Taro.showToast({
+            title: '失败: 请退出小程序重试',
+            icon: 'none'
+          })
     }
   }
 }