From 2e3f80110a01a5000ac6ff4a07061b04a163f400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E6=9C=9D=E4=BC=9F?= <2211960668@qq.com>
Date: Tue, 31 May 2022 10:25:59 +0800
Subject: [PATCH] fix

---
 .../pages/userEntityGrant/detail/index.ts     | 23 +++++++++++++++----
 .../pages/userEntityGrant/detail/index.wxml   |  4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/wechatMp/pages/userEntityGrant/detail/index.ts b/wechatMp/pages/userEntityGrant/detail/index.ts
index cb2229796..5fdd61d1a 100644
--- a/wechatMp/pages/userEntityGrant/detail/index.ts
+++ b/wechatMp/pages/userEntityGrant/detail/index.ts
@@ -31,11 +31,24 @@ OakPage({
         },
     },
     isList: false,
-    formData: async ([userEntityGrant]) => ({
-        relation: userEntityGrant && userEntityGrant.relation,
-        qrcodeUrl: userEntityGrant && userEntityGrant.wechatQrCode$entity[0]
-            && userEntityGrant.wechatQrCode$entity[0].url || 'data:image/jpeg;base64,' + wx.arrayBufferToBase64(userEntityGrant.wechatQrCode$entity[0].buffer)
-    }),
+    formData: async ([userEntityGrant]) => {
+        let qrcodeUrl;
+        const str = userEntityGrant?.wechatQrCode$entity[0]?.buffer;
+        console.log('str', str);
+        if (str) {
+            const buf = new ArrayBuffer(str.length * 2);
+            const buf2 = new Uint16Array(buf);
+            for (let i = 0; i < str.length; i++) {
+                buf2[i] = str.charCodeAt(i);
+            }
+            qrcodeUrl = 'data:image/jpeg;base64,' + wx.arrayBufferToBase64(buf2);
+            console.log('url', qrcodeUrl);
+        }
+        return {
+            relation: userEntityGrant?.relation,
+            url: qrcodeUrl || userEntityGrant?.wechatQrCode$entity[0]?.url
+        }
+    },
 }, {
     data: {
     },
diff --git a/wechatMp/pages/userEntityGrant/detail/index.wxml b/wechatMp/pages/userEntityGrant/detail/index.wxml
index 5a34a6621..5f4cdf949 100644
--- a/wechatMp/pages/userEntityGrant/detail/index.wxml
+++ b/wechatMp/pages/userEntityGrant/detail/index.wxml
@@ -2,14 +2,14 @@
 <view class="page-body">
     <view class="qrcode_view">
         <view class="row">
-            <text class="text">邀请权限</text>
+            <text class="text">赋予权限</text>
             <view class="icon-view">
                 <g-icon name="person_add" size="30" />
             </view>
         </view>
         <view class="col">
             <text class="relation">{{relation || '-'}}</text>
-            <image src="{{qrcodeUrl}}" mode="aspectFit" class="image" />
+            <image src="{{url}}" mode="aspectFit" class="image" />
             <text class="text">微信扫一扫 添加用户权限</text>
         </view>
     </view>