Merge branch 'trunk' into feat/material-list-updat

src/components/partner-banner/index.tsx

@@ -61,7 +61,7 @@ export default function PartnerBanner() {
         <div className={`${PREFIX}__close`} onClick={handlePartnerBannerClose} />
       </div>
       {visible && (
-        <LoginDialog disableCheck onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />
+        <LoginDialog onCancel={() => setVisible(false)} onSuccess={handleBind} needPhone={needPhone} />
       )}
     </>
   );

src/components/partner-intro/index.tsx

@@ -1,19 +1,19 @@
 import { Button, Canvas } from '@tarojs/components';
 import Taro from '@tarojs/taro';
 
-import { useCallback, useState } from 'react';
+import { useCallback } from 'react';
 
 import { openCustomerServiceChat } from '@/utils/common';
-import { getPartnerQrcode } from '@/utils/partner';
+import { getCouponQrCode, generateMembershipCoupon } from '@/utils/coupon';
 import './index.less';
 
 const PREFIX = 'partner-intro';
 
 export default function PartnerIntro() {
-  const [posterPath, setPosterPath] = useState('');
   const getQrcode = async () => {
     try {
-      const data = await getPartnerQrcode(); // 假设 getPartnerQrcode 返回 ArrayBuffer
+      const { code } = await generateMembershipCoupon();
+      const data = await getCouponQrCode(code);
       const base64 = Taro.arrayBufferToBase64(data);
       return `data:image/png;base64,${base64}`;
     } catch (error) {
@@ -36,11 +36,9 @@ export default function PartnerIntro() {
             height: 2668, // 实际绘制高度
             destWidth: 750, // 目标显示宽度
             destHeight: 1334, // 目标显示高度
-            fileType: 'jpg',
+            fileType: 'png',
           });
 
-          setPosterPath(tempFilePath.tempFilePath);
-
           resolve(tempFilePath.tempFilePath);
         });
       } catch (error) {
@@ -57,21 +55,21 @@ export default function PartnerIntro() {
         const canvas = res[0].node;
         const ctx = canvas.getContext('2d');
 
-        canvas.width = 1500;
-        canvas.height = 2668;
+        canvas.width = 550 * 2;
+        canvas.height = 918 * 2;
         ctx.scale(2, 2);
 
         // 绘制背景图片
         const bgImage = canvas.createImage();
-        const poster = 'https://publiccdn.neighbourhood.com.cn/img/poster.png'
+        const poster = 'https://publiccdn.neighbourhood.com.cn/img/share-coupon-poster.png';
         bgImage.src = poster;
         bgImage.onload = () => {
-          ctx.drawImage(bgImage, 0, 0, 750, 1334);
+          ctx.drawImage(bgImage, 0, 0, 550, 918);
 
           const qrCodeImage = canvas.createImage();
           qrCodeImage.src = qrCode; // 假设 getQrcode() 返回的是二维码图片的路径
           qrCodeImage.onload = () => {
-            ctx.drawImage(qrCodeImage, 235, 894, 280, 280); // 绘制二维码，位置和大小
+            ctx.drawImage(qrCodeImage, 196, 600, 160, 160); // 绘制二维码，位置和大小
             saveCanvasToTempFile().then(tempPath => {
               resolve(tempPath);
             });
@@ -84,13 +82,10 @@ export default function PartnerIntro() {
     });
   };
   const savePoster = async () => {
-    let filePath = posterPath;
-    if (!filePath) {
-      Taro.showLoading({ title: '正在生成海报' });
-      const qrCode = await getQrcode();
-      filePath = await drawCanvas(qrCode);
-      Taro.hideLoading();
-    }
+    Taro.showLoading({ title: '正在生成海报' });
+    const qrCode = await getQrcode();
+    const filePath = await drawCanvas(qrCode);
+    Taro.hideLoading();
 
     const res = await Taro.getSetting();
     const hasPermission = res.authSetting['scope.writePhotosAlbum'];
@@ -144,7 +139,9 @@ export default function PartnerIntro() {
         <div className={`${PREFIX}__block`}>
           <div className={`${PREFIX}__title`}>分享方法</div>
           <div className={`${PREFIX}__card`}>
-            <div className={`${PREFIX}__body`}>分享小程序任意页面到群、朋友圈、好友即可</div>
+            <div className={`${PREFIX}__body`}>
+              点击底部按钮向好友群友赠送会员，或者分享通告列表、通告详情等页面给朋友即可
+            </div>
           </div>
         </div>
         <div className={`${PREFIX}__block`}>
@@ -163,10 +160,10 @@ export default function PartnerIntro() {
 
       <div className={`${PREFIX}__footer`}>
         <Button className={`${PREFIX}__download-button`} onClick={savePoster}>
-          下载海报
+          朋友圈海报
         </Button>
         <Button className={`${PREFIX}__share-button`} openType="share">
-          分享邀请
+          赠送会员给好友
         </Button>
       </div>
     </div>