Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/pages/news/detail/index.js

@@ -24,8 +24,10 @@ import {
   cancelFavorNews
 } from '@services/news'
 import { connect } from '@tarojs/redux'
+import { withUtils } from '@utils/page'
 
 @connect(state => state.user)
+// @withUtils()
 export default class NewsDetail extends Component {
   config = {
     navigationBarTitleText: '资讯详情'
@@ -47,7 +49,7 @@ export default class NewsDetail extends Component {
   }
 
   componentWillMount(options) {
-    console.info('ready status3', ready)
+    console.info('=====news ========>', this)
     ready.queue(() => {
       const router = Taro.getStorageSync('router') || { query: {} }
       console.info('news-1:', router)

src/utils/page.js

@@ -0,0 +1,61 @@
+import Taro from '@tarojs/taro'
+import { getQrCodeParams } from '@utils/qrcode'
+import { savePoint, updatePoint } from '@services/common'
+
+function isFunction(fn) {
+  return typeof fn === 'function'
+}
+
+export function withUtils(opts = {}) {
+  let trackEnd;
+
+  return function (OrigComp) {  
+    class WrapperComponent extends OrigComp {
+      async componentWillMount() {
+        if (this.$router.params.scene) {
+          this._$_scene = await getQrCodeParams(this.$router.params.scene)
+        }
+  
+        if (super.componentWillMount) {
+          super.componentWillMount();
+        }
+      }
+  
+      async componentDidShow() {
+        // 埋点
+        if (isFunction(this._$_track)) {
+          const { recordId } = await savePoint(this._$_track())
+
+          trackEnd = () => updatePoint(recordId)
+        }
+  
+        if (super.componentDidShow) {
+          super.componentDidShow();
+        }
+      }
+  
+      componentDidHide() {
+        // 埋点
+        if (isFunction(trackEnd)) {
+          trackEnd()
+        }
+  
+        if (super.componentDidHide) {
+          super.componentDidHide();
+        }
+      }
+  
+      onShareAppMessage() {
+        const { title, path, image }  = isFunction(this._$shareContent) ? this._$shareContent() : {}
+
+        return {
+          title,
+          path,
+          imageUrl: image,
+        }
+      }
+    }
+
+    return WrapperComponent
+  }
+}