bug fix

src/components/Poster/index.js

@@ -1,30 +1,15 @@
 import Taro, { Component } from '@tarojs/taro';
 import { ScrollView, View, Block } from '@tarojs/components';
 import { TaroCanvasDrawer } from '@components/taro-plugin-canvas';
-import { getCanvasConfig } from './util';
 import './style.scss';
 
 export default class Poster extends Component {
-  static options = {
-    addGlobalClass: true,
-  }
-  static defaultProps = {
-    configs: {}
-  }
-
   state = {
     images: [],
     done: false,
     current: undefined,
   }
 
-  static transTPLs2Configs(tpls, params) {
-    return tpls.map((tpl) => {
-      const conf = getCanvasConfig(tpl.configs, params)
-      return { ...conf }
-    })
-  }
-
   componentWillMount() {
     if (!Array.isArray(this.props.configs)) {
       throw new Error('未设置海报配置信息')

src/components/Poster/util.js

@@ -1,42 +0,0 @@
-
-export function getCanvasConfig(config, params) {
-  if (!config || !params) {
-    throw new Error('转换海报配置出错: config 或 params 不能为空')
-  }
-
-  const { basic, items } = typeof config === 'string' ? JSON.parse(config) : config
-
-  const itemConf = items.reduce((conf, item) => {
-    const { type, remark, value, variable, ...others } = item
-    const settingOfType = conf[type] || []
-    let val = variable ? params[variable] : value
-
-    let mainVal = {}
-    switch (type) {
-      case 'texts':
-        mainVal = { text: val }
-        break;
-      case 'images':
-        mainVal = { url: val }
-        break;
-      default:
-        val = true
-        break;
-    }
-
-    if (val) {
-      settingOfType.push({
-        ...mainVal,
-        ...others,
-      })
-      conf[type] = settingOfType
-    }
-    
-    return conf
-  }, {})
-
-  return {
-    ...basic,
-    ...itemConf,
-  }
-}

src/pages/activity/detail/assemble.js

@@ -8,7 +8,7 @@ import dayjs from 'dayjs'
 // import WxParse from '@components/wxParse/wxParse'
 // import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
-import { getDownloadURL, times, formateLeftTime } from '@utils/tools'
+import { getDownloadURL, times, formateLeftTime, getCanvasConfig } from '@utils/tools'
 import {
   getGroupDetail,
   createGroupActivity,
@@ -444,6 +444,14 @@ export default class Detail extends Component {
       this.togglePosterVisible()
     })
   }
+  
+  transTPLs2Configs(tpls, params) {
+    return tpls.map((tpl) => {
+      const conf = getCanvasConfig(tpl.configs, params)
+      return { ...conf }
+    })
+  }
+
 
   render() {
     const {
@@ -480,7 +488,7 @@ export default class Detail extends Component {
 
     const joinedNum = detail.groupBuyPeople - (recordDetail.recordId ? 1 : 0) - memberList.length
 
-    const posterConfigs = Poster.transTPLs2Configs(posterTpls, posterData)
+    const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)
 
     console.log('------posterConfigs------', posterConfigs)
     return (

src/pages/activity/detail/assistance.js

@@ -8,7 +8,7 @@ import dayjs from 'dayjs'
 // import WxParse from '@components/wxParse/wxParse'
 // import getUserPhone from '@utils/getUserPhone'
 import ready from '@utils/ready'
-import { getDownloadURL, times, formateLeftTime } from '@utils/tools'
+import { getDownloadURL, times, formateLeftTime, getCanvasConfig } from '@utils/tools'
 import {
   getHelpDetail,
   createHelpActivity,
@@ -446,6 +446,13 @@ export default class Detail extends Component {
     })
   }
 
+  transTPLs2Configs(tpls, params) {
+    return tpls.map((tpl) => {
+      const conf = getCanvasConfig(tpl.configs, params)
+      return { ...conf }
+    })
+  }
+
   render() {
     const {
       initiateId,
@@ -477,7 +484,7 @@ export default class Detail extends Component {
       avatarurl: getDownloadURL(userInfo.person.avatarurl, 'avatar') || '',
     }
 
-    const posterConfigs = Poster.transTPLs2Configs(posterTpls, posterData)
+    const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)
 
     console.log('------posterConfigs------', posterConfigs)
     const isJoin = helpList.filter(x => x.personId === userInfo.person.personId)[0] || isStarter

src/utils/tools.js

@@ -413,4 +413,51 @@ export const isChineseMobilePhoneNumber = function (phoneNumber, strict) {
 export const isEmail = function (value) {
   var re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
   return re.test(value);
-}
+}
+
+/**
+ * 转换海报的数据库配置为可用配置
+ * @param {*} config 
+ * @param {*} params 
+ */
+export function getCanvasConfig(config, params) {
+  if (!config || !params) {
+    throw new Error('转换海报配置出错: config 或 params 不能为空')
+  }
+
+  const { basic, items } = typeof config === 'string' ? JSON.parse(config) : config
+
+  const itemConf = items.reduce((conf, item) => {
+    const { type, remark, value, variable, ...others } = item
+    const settingOfType = conf[type] || []
+    let val = variable ? params[variable] : value
+
+    let mainVal = {}
+    switch (type) {
+      case 'texts':
+        mainVal = { text: val }
+        break;
+      case 'images':
+        mainVal = { url: val }
+        break;
+      default:
+        val = true
+        break;
+    }
+
+    if (val) {
+      settingOfType.push({
+        ...mainVal,
+        ...others,
+      })
+      conf[type] = settingOfType
+    }
+    
+    return conf
+  }, {})
+
+  return {
+    ...basic,
+    ...itemConf,
+  }
+}