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/Poster/Poster.jsx

@@ -70,29 +70,6 @@ export default (props) => {
         }
       }, 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

@@ -1,9 +1,8 @@
 import React, { useRef, useState } from 'react'
 import Taro from '@tarojs/taro'
-// import PageModal from '@/components/PageModal'
-import { authorize } from '@/utils/wxAuth'
 import { View, Image, Button } from '@tarojs/components'
 import Spin2 from '@/components/Spin/Spin2'
+import { save2Album } from '@/utils/image'
 import Poster from './Poster'
 import './style.scss'
 
@@ -37,44 +36,16 @@ export default (props) => {
       return
     }
 
-    authorize('scope.writePhotosAlbum').then(() => {
-      setLoading(true)
-
-      // 先生成到临时位置
-      sdkRef.current.download().then((tempPath) => {
-        // 再保存到相册
-        Taro.saveImageToPhotosAlbum({
-          filePath: tempPath,
-          success: () => {
-            Taro.showToast({
-              title: '保存成功',
-              icon: 'none',
-              duration: 3000,
-            })
-            onSuccess()
-          },
-          fail: (err) => {
-            console.error(err)
-            const message = err.errMsg || err.message || err
-            Taro.showToast({
-              title: message,
-              icon: 'none',
-            })
-          },
-          complete: () => {
-            setLoading(false)
-          }
-        })
-      }).catch((err) => {
+    // 保存到相册
+    setLoading(true)
+    sdkRef.current.download().then((tempPath) => {
+      save2Album(tempPath).then(() => {
         setLoading(false)
-        console.error(err)
-        const message = err.errMsg || err.message || err
-        Taro.showToast({
-          title: message,
-          icon: 'none',
-        })
-      })
+        onSuccess()
+        Taro.showToast({ title: '保存成功', icon: 'none' })
+      }, () => setLoading(false))
     }).catch((err) => {
+      setLoading(false)
       console.error(err)
       const message = err.errMsg || err.message || err
       Taro.showToast({
@@ -85,7 +56,7 @@ export default (props) => {
   }
 
   const handleImage = (e) => {
-    Taro.previewImage({ current: img, urls: [img] })
+    Taro.previewImage({ current: img, urls: [img], showmenu: true })
   }
 
   return (

src/pages/mine/myRecommendCode/index.jsx

@@ -1,11 +1,11 @@
 import { useState, useEffect } from 'react'
 import { Image } from '@tarojs/components'
 import withLayout from '@/layout'
-import '@/assets/css/iconfont.css'
 import { fetch } from '@/utils/request'
 import { API_QRCODE } from '@/constants/api'
-import { getImgURL } from '@/utils/image'
+import { getImgURL, save2Album } from '@/utils/image'
 import Taro from '@tarojs/taro'
+import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default withLayout((props) => {
@@ -27,15 +27,15 @@ export default withLayout((props) => {
     Taro.downloadFile({
       url: QrCodeUrl,
       success: function(res) {
-        let tempFilePath = res.tempFilePath
-        Taro.saveFile({
-          tempFilePath: tempFilePath,
-          success: function() {
-            Taro.showToast({title: '保存成功', icon: 'none'})
-          },
-          fail: function() {
-            Taro.showToast({title: '保存失败', icon: 'none'})
-          }
+        save2Album(res.tempFilePath).then(() => {
+          Taro.showToast({ title: '保存成功', icon: 'none' })
+        })
+      },
+      fail: function(err) {
+        console.error(err)
+        Taro.showToast({
+          title: '操作失败, 您可以试试预览保存',
+          icon: 'none'
         })
       }
     })
@@ -44,7 +44,8 @@ export default withLayout((props) => {
   const PreviewImage = () => {
     Taro.previewImage({
       current: QrCodeUrl,
-      urls: [QrCodeUrl]
+      urls: [QrCodeUrl],
+      showmenu: true,
     })
   }
 

src/utils/image.js

@@ -1,4 +1,6 @@
 
+import Taro from '@tarojs/taro'
+import { authorize } from './wxAuth'
 // eslint-disable-next-line no-undef
 const host = HOST;
 
@@ -9,3 +11,46 @@ export function getImgURL(img) {
 
   return `${host}${img}`;
 }
+
+/**
+ * 保存到相册
+ * @param {*} tempPath 
+ * @returns 
+ */
+export function save2Album(tempPath) {
+  return new Promise((resolve, reject) => {
+    authorize('scope.writePhotosAlbum').then(() => {
+      // 再保存到相册
+      Taro.saveImageToPhotosAlbum({
+        filePath: tempPath,
+        success: () => {
+          resolve()
+        },
+        fail: (err) => {
+          console.error(err)
+          let message = err.errMsg || err.message || err
+          if (message.indexOf('cancel') > -1) {
+            message = '您已取消'
+          }
+          Taro.showToast({
+            title: message,
+            icon: 'none',
+          })
+          reject(err)
+        }
+      })
+    }).catch((err) => {
+      console.error(err)
+      let message = err.errMsg || err.message || err
+      if (message.indexOf('cancel') > -1) {
+        message = '您已取消'
+      }
+
+      Taro.showToast({
+        title: message,
+        icon: 'none',
+      })
+      reject(err)
+    })
+  })
+}