feats

config/index.js

@@ -24,11 +24,12 @@ const config = {
     '@/store': path.resolve(__dirname, '..', 'src/store'),
     '@/services': path.resolve(__dirname, '..', 'src/services'),
     '@/utils': path.resolve(__dirname, '..', 'src/utils'),
+    '@/native': path.resolve(__dirname, '..', 'src/native'),
     '@/pages': path.resolve(__dirname, '..', 'src/pages'),
   },
   copy: {
     patterns: [
-      { from: 'src/native/', to: 'dist/native/' },
+      // { from: 'src/native/', to: 'dist/native/' },
     ],
     options: {
     }

src/components/Poster/Poster.jsx

@@ -39,32 +39,60 @@ export default (props) => {
         }
       })
 
-      Promise.all([
-        sdk.getImage(poster),
-        sdk.getImage(miniCode),
-        sdk.getImage(avatar),
-      ]).then((res) => {
-        const [posterImg, miniCodeImg, avatarImg] = res
+      // 名称
+      sdk.darwText(name, conf.name)
+      // 小程序码
+      sdk.darwText(desc, conf.desc)
 
-        // 封面
+      let cnt = 0
+      // 封面
+      sdk.getImage(poster).then((posterImg) => {
         sdk.drawImage(posterImg, conf.poster)
-        // 头像
+        cnt += 1
+      }).catch(() => cnt += 1)
+      // 头像
+      sdk.getImage(avatar).then((avatarImg) => {
         sdk.drawImage(avatarImg, conf.avatar)
-        // 小程序码
+        cnt += 1
+      }).catch(() => cnt += 1)
+      // 小程序码
+      sdk.getImage(miniCode).then((miniCodeImg) => {
         sdk.drawImage(miniCodeImg, conf.miniCode)
-        // 名称
-        sdk.darwText(name, conf.name)
-        // 小程序码
-        sdk.darwText(desc, conf.desc)
+        cnt += 1
+      }).catch(() => cnt += 1)
 
-        //
-        const image = sdk.toDataURL()
-        onEnd(image, sdk)
-      }).catch(([e1, e2, e3]) => {
-        if (onError) {
-          onError([e1, e2, e3])
+      const ticker = setInterval(() => {
+        if (cnt >= 3) {
+          // 图片全部处理完
+          const image = sdk.toDataURL()
+          onEnd(image, sdk)
+          clearInterval(ticker)
         }
-      })
+      }, 200);
+
+
+      // Promise.all([
+      //   // sdk.getImage(poster),
+      //   sdk.getImage(miniCode),
+      //   // sdk.getImage(avatar),
+      // ]).then((res) => {
+      //   const [posterImg, miniCodeImg, avatarImg] = res
+
+      //   // 封面
+      //   sdk.drawImage(posterImg, conf.poster)
+      //   // 头像
+      //   sdk.drawImage(avatarImg, conf.avatar)
+      //   // 小程序码
+      //   sdk.drawImage(miniCodeImg, conf.miniCode)
+
+      //   //
+      //   const image = sdk.toDataURL()
+      //   onEnd(image, sdk)
+      // }).catch(([e1, e2, e3]) => {
+      //   if (onError) {
+      //     onError([e1, e2, e3])
+      //   }
+      // })
     }
   }, [sdk, dataSource, onStart, onEnd, onError])
 

src/components/Poster/index.jsx

@@ -84,23 +84,27 @@ export default (props) => {
     })
   }
 
+  const handleImage = (e) => {
+    Taro.previewImage({ current: img, urls: [img] })
+  }
+
   return (
     // <Modal title={title} visible={show} onClose={onClose}>
     // eslint-disable-next-line react/jsx-no-undef
-    <page-container show={show} position='bottom' onClickOverlay={onClose}>
-      <View className='modal-poster' onClick={onClose}>
+    <page-modal show={show} position='bottom' onClickOverlay={onClose} height="60vh">
+      <View className='modal-poster'>
         <View className='modal-poster-img-box'>
-        {
+        {/* {
           !processing
-            ? <Image src={img} mode='scaleToFill' onClick={() => Taro.previewImage({ current: img, urls: [img] })} />
+            ? <Image src={img} mode='scaleToFill' onClick={handleImage} />
             : <Spin2 spinning={processing} size={32} />
-        }
+        } */}
         </View>
         <Button className='modal-poster-action' onClick={handleSave} disabled={!img} loading={loading}>
           {btnText}
         </Button>
       </View>
       <Poster dataSource={dataSource} onStart={() => setProcessing(true)} onEnd={handlePoster} />
-    </page-container>
+    </page-modal>
   )
 }

src/components/Poster/style.scss

@@ -1,19 +1,23 @@
 .modal-poster {
-  width: 100vw;
-  height: 100vh;
+  // width: 100vw;
+  // height: 100vh;
   // height: calc(100vh - 62rpx);
+  height: 100%;
   box-sizing: border-box;
   padding: 40rpx;
 
   &-img-box {
-    flex: auto;
-    width: 70%;
     height: calc(100% - 92rpx - 40rpx);
     margin: 0 auto;
     background: #fff;
     box-shadow: 0 14rpx 24rpx 0 rgba(0, 0, 0, 0.2);
     position: relative;
 
+    .empty-poster {
+      width: auto;
+      height: 100%;
+    }
+
     image {
       width: 100%;
       height: 100%;

src/pages/index/buildingDetail/index.config.js

@@ -2,6 +2,6 @@ export default {
   navigationBarTitleText: '楼盘详情',
   enableShareAppMessage: true,
   usingComponents: {
-    'page-container': '/native/PageContainer/index'
+    'page-modal': '@/native/PageContainer/index'
   }
 }

src/utils/hooks/usePoster.js

@@ -16,6 +16,13 @@ export default function usePoster(person, poster, router, paramsRef) {
           name: person.name || person.nickname,
           avatar: person.avatarurl,
         })
+      }).catch(() => {
+        setPosterData({
+          poster,
+          miniCode: undefined,
+          name: person.name || person.nickname,
+          avatar: person.avatarurl,
+        })
       })
     }
   // eslint-disable-next-line react-hooks/exhaustive-deps