Merge branch 'master' of http://git.ycjcjy.com/xiangsong/miniapp

src/app.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
 import { StoreRoot, store } from './store'
-import { deepCopy } from './utils'
+// import { deepCopy } from './utils'
 import request, { apis } from './utils/request'
 import { trackUserSource } from './utils/track'
 import * as log from './utils/rtLog'
@@ -10,12 +10,16 @@ import './app.less'
 class App extends Component {
   updateTracing;
 
-  onLaunch (options) {
+  onLaunch () {
+
+    Taro.setEnableDebug({
+      enableDebug: true
+    })
     // 此处获取不到 state, 因为 app 不会刷新
     const { setSysInfo } = store.getModel('sys').getState()
 
     // 预拉取数据
-    wx.getBackgroundFetchData({
+    Taro.getBackgroundFetchData({
       fetchType: 'pre',
       success (res) {
         if (res.errMsg === 'getBackgroundFetchData:ok') {
@@ -44,14 +48,14 @@ class App extends Component {
     // scene 与其它参数时互斥的. 有 scene 说明时扫码进来的
     const params = router.params || {}
     const { from = '', recommender = '', scene = '', mpOpenId = '' } = params
-    setAppParams({...params})
+    setAppParams({ ...params })
 
     // 登录
     Taro.login({
       success: res => {
         if (res.errMsg === 'login:ok') {
           request({ ...apis.login, params: { code: res.code, from, recommender, scene, mpOpenId } }).then(x => {
-            setUser({...x.person, ShowIndexAdv: false, FirstComing: true})
+            setUser({ ...x.person, ShowIndexAdv: false, FirstComing: true })
             Taro.setStorage({ key: 'token', data: x.token })
             Taro.setStorage({ key: 'sessionKey', data: x.sessionKey })
 

src/pages/ShouYe/index.jsx

@@ -47,9 +47,17 @@ export default function Index (props) {
 
   useEffect(() => {
     if (NoticeInfo !== null) {
-      window.setTimeout(() => {
-        let QueryParent = Taro.createSelectorQuery()
-        let QueryChild = Taro.createSelectorQuery()
+      let WidthTimer = null
+      CalcWidth(WidthTimer)
+    }
+  }, [NoticeInfo])
+
+  const CalcWidth = (timer = null) => {
+    timer = setTimeout(() => {
+      let QueryParent = Taro.createSelectorQuery()
+      let QueryChild = Taro.createSelectorQuery()
+      if (QueryParent.select('#NoticeParent')) {
+        clearTimeout(timer)
         QueryParent.select('#NoticeParent').boundingClientRect()
         QueryChild.select('#NoticeText').boundingClientRect()
         QueryParent.exec((res) => {
@@ -58,11 +66,11 @@ export default function Index (props) {
             setNoticeWidth(cres[0].width)
           })
         })
-      }, 100)
-      // let NoticeText = document.getElementById('NoticeText')
-      // console.log(NoticeText.boundingClientRect[0].width)
-    }
-  }, [NoticeInfo])
+      } else {
+        CalcWidth(timer)
+      }
+    }, 100)
+  }
 
   const Init = (done = () => { }) => { // 初始化
     GetNotice() // 获取通知
@@ -203,7 +211,7 @@ export default function Index (props) {
                 <view>
 
                   {/* 通知栏 */}
-                  <view className='NoticeContent' style={{display: ShowNotice ? 'block' : 'none'}}>
+                  <view className='NoticeContent' style={{ display: ShowNotice ? 'block' : 'none' }}>
                     <view className='flex-h'>
                       <text className='iconfont icontongzhi1'></text>
                       <view id='NoticeParent' className='flex-item' onClick={() => { Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${NoticeInfo.id}` }) }}>