feats

config/dev.js

@@ -3,8 +3,8 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://xlk.njyz.tech"',
-    // HOST: '"https://xlj.newlandsh.com"',
+    // HOST: '"https://xlk.njyz.tech"',
+    HOST: '"https://xlj.newlandsh.com"',
     // HOST: '"http://127.0.0.1:8081"',
     WSS_HOST: '"wss://xlk.njyz.tech"',
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

src/components/ChatIcon/index.jsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react'
 import Taro from '@tarojs/taro'
 import { MovableArea, MovableView } from '@tarojs/components'
+import { showSubscribeMessage, MESSAGE_TYPE } from '@/utils/subscribeMessage'
 import './style.scss'
 
 export default function ChatIcon(props) {
@@ -8,8 +9,14 @@ export default function ChatIcon(props) {
   const [PageX] = useState(Taro.getSystemInfoSync().windowWidth - 20)
   const [PageY] = useState(Taro.getSystemInfoSync().windowHeight - 20)
 
+  const handleClick = () => {
+    showSubscribeMessage(MESSAGE_TYPE.NOTICE).then((res) => {
+      //
+    })
+  }
+
   return (
-    <MovableArea className='components ChatIcon'>
+    <MovableArea className='components ChatIcon' onClick={handleClick}>
       <MovableView className='MoveItem' x={PageX} y={PageY} direction='all'>text</MovableView>
     </MovableArea>
   )

src/layout/index.js

@@ -13,7 +13,6 @@ import FirstScreen from '@/components/FirstScreen'
 import ShareToCircle from '@/components/ShareToCircle'
 import { report as reportCustomer } from '@/utils/customer'
 import nav2Target from '@/utils/nav2Target'
-import { showSubscribeMessage } from '@/utils/subscribeMessage'
 import { ROLE_CODE } from '@/constants/user'
 import useAuth from './useAuth'
 import useScreen from './useScreen'
@@ -62,8 +61,6 @@ export default (ChildComponent) => (props) => {
     })
   }
 
-  showSubscribeMessage()
-
   // 报备客户
   useEffect(() => {
     if (isSinglePage) return;

src/pages/index/index.jsx

@@ -65,7 +65,7 @@ export default withLayout((props) => {
 
   return (
     <view className='Page Index'>
-      <ChatIcon></ChatIcon>
+      {/* <ChatIcon></ChatIcon> */}
       {/* <ShareToCircle visible></ShareToCircle> */}
       <ScrollView scroll-y>
         <view className='PageContent'>

src/utils/chatDate.js

@@ -1,4 +1,5 @@
 
+import Taro from '@tarojs/taro'
 
 export const MILLISECONDS_A_SECOND = 1e3
 export const MILLISECONDS_A_MINUTE = 60 * MILLISECONDS_A_SECOND
@@ -16,12 +17,18 @@ export const diff = (dt1, dt2) => {
   return [bw, day, hour, min, sec]
 }
 
+let systemInfo = null;
+
 //例子 getDateFormat(new Date().valueOf(),true,'yyyy/M/d')
 export function formatDate(dt, fmt) {
   if (!dt) return dt;
 
+  if (!systemInfo) {
+    systemInfo = Taro.getSystemInfoSync()
+  }
+
   // 解决苹果手机不能正常初始化的问题
-  const dtStr = typeof dt === 'string' ? dt.replace(/-/g, "/") : dt;
+  const dtStr = systemInfo.system.indexOf('iOS') > -1 && typeof dt === 'string' ? dt.replace(/-/g, "/") : dt;
   const date = new Date(dtStr)
 
   var o = {

src/utils/subscribeMessage.js

@@ -1,4 +1,4 @@
-
+import Taro from '@tarojs/taro'
 import store from '../store'
 
 export const MESSAGE_TYPE = {
@@ -7,6 +7,14 @@ export const MESSAGE_TYPE = {
 
 export function showSubscribeMessage (messageType) {
   const { user } = store.getState()
-  const { miniApp } = (user || {}).userInfo || {}
+  const { miniApp = {} } = (user || {}).userInfo || {}
 
+  const tmplIds = (miniApp.tpls || []).filter(x => x.tplType === messageType).map(x => x.tplId)
+  if (tmplIds.length > 0) {
+    return new Promise((resolve) => {
+      Taro.requestSubscribeMessage({ tmplIds, fail: (e) => { console.error(e) }, complete: resolve })
+    })
+  } else {
+    return Promise.resolve()
+  }
 }