Merge branch 'feat/liujie'
This commit is contained in:
@@ -60,8 +60,10 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
|
||||
show: async (publish_flag = false) => {
|
||||
setPublishFlag(publish_flag);
|
||||
if (publish_flag) {
|
||||
const url = await generateShareImageUrl();
|
||||
setShareImageUrl(url);
|
||||
try {
|
||||
const url = await generateShareImageUrl();
|
||||
setShareImageUrl(url);
|
||||
} catch (e) {}
|
||||
}
|
||||
setVisible(true);
|
||||
},
|
||||
@@ -81,6 +83,7 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
|
||||
const endTime = dayjs(end_time);
|
||||
const dayofWeek = DayOfWeekMap.get(startTime.day());
|
||||
const gameLength = `${endTime.diff(startTime, "hour")}小时`;
|
||||
console.log(userInfo, "userInfo");
|
||||
const url = await generateShareImage({
|
||||
userAvatar: userInfo.avatar_url,
|
||||
userNickname: userInfo.nickname,
|
||||
|
||||
Reference in New Issue
Block a user