From 67d56b0e9ab091489f423a1d7ec436f5131f2541 Mon Sep 17 00:00:00 2001
From: fishcui <fishcui@tencent.com>
Date: Mon, 15 Nov 2021 21:21:43 +0800
Subject: [PATCH 01/22] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E8=B7=B3=E8=BD=AC=E5=90=8E=E6=87=92=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/pages/plugin/[...path].jsx | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/web/pages/plugin/[...path].jsx b/web/pages/plugin/[...path].jsx
index adf8dddaf..9b6c5b3c4 100644
--- a/web/pages/plugin/[...path].jsx
+++ b/web/pages/plugin/[...path].jsx
@@ -1,11 +1,16 @@
 /* eslint-disable spaced-comment */
 /* eslint-disable new-cap */
 import React from 'react';
+import { Spin } from '@discuzq/design';
 import { inject, observer } from 'mobx-react';
 import { withRouter } from 'next/router';
 import HOCFetchSiteData from '@middleware/HOCFetchSiteData';
 import DZQPluginCenterInjectionPolyfill from '../../utils/DZQPluginCenterInjectionPolyfill';
 
+const PageLoading = () => {
+  return <Spin>页面加载中...</Spin>;
+};
+
 // 插件插槽埋入
 /**DZQ->plugin->register<plugin_system@add_page_hook>**/
 
@@ -21,11 +26,19 @@ class PagePlugin extends React.Component {
     };
   }
 
+  componentDidUpdate(prevProps) {
+    // when router path changed
+    if (prevProps.router.asPath !== this.props.router.asPath) {
+      this.props.router.reload();
+    }
+  }
+
   getTargetPlugin = () => (
     <DZQPluginCenterInjectionPolyfill
       target="plugin_system"
       hookName="add_page_hook"
-      condition={pluginInfo => pluginInfo.path === this.state.pluginPath}
+      condition={(pluginInfo) => pluginInfo.path === this.state.pluginPath}
+      loading={() => <PageLoading />}
     />
   );
 
@@ -35,6 +48,8 @@ class PagePlugin extends React.Component {
   };
 
   render() {
+    const { plugin } = this.props;
+
     return this.renderTargetPlugin();
   }
 }
-- 
Gitee


From 87ae62167510a3b8ae4e00364614148e63a87f88 Mon Sep 17 00:00:00 2001
From: jsl <Jiangsl1@hua-cloud.com.cn>
Date: Tue, 23 Nov 2021 11:20:18 +0800
Subject: [PATCH 02/22] =?UTF-8?q?fix:=203771=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F-=E6=8E=A8=E5=B9=BF=E9=82=80=E8=AF=B7-=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E3=80=91=E6=98=B5=E7=A7=B0=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E6=97=B6=EF=BC=8C=E6=8E=A8=E5=B9=BF=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E5=BC=82=E5=B8=B8=20http:/?=
 =?UTF-8?q?/bug.eims.com.cn/bug-view-3771.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mini/src/layout/invite/index.module.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mini/src/layout/invite/index.module.scss b/mini/src/layout/invite/index.module.scss
index 523058b16..cf2221a49 100644
--- a/mini/src/layout/invite/index.module.scss
+++ b/mini/src/layout/invite/index.module.scss
@@ -69,6 +69,8 @@
     color: $text-color-primary;
     opacity: 1;
     margin-top: rem(68);
+    max-width: rem(343);
+    @include text-ellipsis();
   }
   .user_info_tag{
     font-weight: normal;
-- 
Gitee


From cfe4b147e6346c3d5018761a494863d138191a49 Mon Sep 17 00:00:00 2001
From: v_zjxzzheng <v_zjxzzheng@tencent.com>
Date: Wed, 24 Nov 2021 10:18:52 +0800
Subject: [PATCH 03/22] =?UTF-8?q?feat:=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=B7=BB=E5=8A=A0=E5=A4=8D=E5=88=B6=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/server/genParamScheme.js          |  5 ++
 common/server/index.js                   |  1 +
 mini/src/components/site-share/index.jsx | 60 ++++++++++++++++++++++--
 mini/src/layout/invite/index.jsx         |  2 -
 mini/src/pages/index/index.jsx           |  3 ++
 5 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 common/server/genParamScheme.js

diff --git a/common/server/genParamScheme.js b/common/server/genParamScheme.js
new file mode 100644
index 000000000..dc55c576c
--- /dev/null
+++ b/common/server/genParamScheme.js
@@ -0,0 +1,5 @@
+import { readGenParamScheme } from '@discuzq/sdk/dist/api/content/read-genparamscheme';
+export default async function genParamScheme(opts, ctx = null) {
+  const res = await readGenParamScheme({ ...opts, __context: ctx });
+  return res;
+}
\ No newline at end of file
diff --git a/common/server/index.js b/common/server/index.js
index 10a414880..8322ea5c6 100644
--- a/common/server/index.js
+++ b/common/server/index.js
@@ -57,6 +57,7 @@ export { default as h5WechatCodeBind } from './h5WechatCodeBind';
 export { default as miniQrcodeLogin } from './login/miniQrcodeLogin';
 export { default as miniQrcodeBind } from './login/miniQrcodeBind';
 export { default as genMiniScheme } from './genMiniScheme';
+export { default as genParamScheme } from './genParamScheme';
 export { default as genMiniBindScheme } from './genMiniBindScheme';
 export { default as miniBind } from './login/miniBind';
 export { default as miniLogin } from './login/miniLogin';
diff --git a/mini/src/components/site-share/index.jsx b/mini/src/components/site-share/index.jsx
index 66bfe1650..4cace3316 100644
--- a/mini/src/components/site-share/index.jsx
+++ b/mini/src/components/site-share/index.jsx
@@ -1,13 +1,17 @@
-import React from 'react'
+import React, { useRef } from 'react'
 import { View, Button, Text } from '@tarojs/components'
-import styles from './index.module.scss'
+import { genParamScheme } from '@server';
 import Icon from '@discuzq/design/dist/components/icon/index';
-import Taro from '@tarojs/taro'
+import Toast from '@discuzq/design/dist/components/toast/index';
+import Taro, { setClipboardData } from '@tarojs/taro'
 import classNames from 'classnames';
 import Popup from '@discuzq/design/dist/components/popup/index';
 import setUrlParam from '@common/utils/set-url-param';
+import styles from './index.module.scss'
 
 const Index = ({ show, onShareClose, site, customShareData, inviteCode = '', type }) => {
+    const copyOver = useRef(true);
+
     const shareData = {
         title: customShareData?.title || site.webConfig?.setSite?.siteName || '',
         path: setUrlParam(customShareData?.path  || 'pages/index/index', { inviteCode }),
@@ -23,6 +27,47 @@ const Index = ({ show, onShareClose, site, customShareData, inviteCode = '', typ
             url: `/subPages/create-card/index`,
         })
     }
+
+    const CreateScheme = async () => {
+        if(!copyOver.current) {
+            return;
+        }
+        try {
+            copyOver.current = false;
+            const resp = await genParamScheme({
+                params: {
+                    type: "share_mini",
+                    query:{
+                        scene : '',
+                        inviteCode,
+                    }
+                }
+            });
+            if(resp.code !== 0) {
+                throw resp;
+            }
+            setClipboardData({
+                data: resp?.data?.openLink,
+                fail: (err) => {
+                    console.error(err);
+                    Toast.error({
+                        content: '创建邀请链接失败',
+                        duration: 1000,
+                    });
+                },
+                complete: () => {
+                    copyOver.current = true;
+                }
+            })
+
+        } catch (e) {
+            Toast.error({
+                content: e.msg || e,
+            });
+            copyOver.current = true;
+        }
+    }
+
     return (
       <Popup
         position="bottom"
@@ -40,6 +85,15 @@ const Index = ({ show, onShareClose, site, customShareData, inviteCode = '', typ
                             生成海报
                         </Text>
                     </View>
+                    <View className={styles.moreItem} onClick={CreateScheme}>
+                        <View className={styles.icon}>
+                            <Icon name='PaperClipOutlined' size={20}>
+                            </Icon>
+                        </View>
+                        <Text className={styles.text}>
+                            复制链接
+                        </Text>
+                    </View>
                     <Button className={styles.moreItem} openType='share' plain='true' data-shareData={shareData} onClick={onShareClose}>
                         <View className={styles.icon}>
                             <Icon name='WeChatOutlined' size={20}>
diff --git a/mini/src/layout/invite/index.jsx b/mini/src/layout/invite/index.jsx
index 3c0bfb751..0cdb66fd3 100644
--- a/mini/src/layout/invite/index.jsx
+++ b/mini/src/layout/invite/index.jsx
@@ -80,11 +80,9 @@ class InviteH5Page extends React.Component {
                       groupName={inviteData.groupName}
                     />
                   </View>
-                  
                   :
                   <View className={layout.user_info_tag}>{inviteData.groupName}</View>
                 }
-                
                 <View className={layout.user_info_invite}>
                   <View className={layout.invite_num}>
                     <View className={layout.invite_num_title}>已邀人数</View>
diff --git a/mini/src/pages/index/index.jsx b/mini/src/pages/index/index.jsx
index a364bef54..ef2a7cccd 100644
--- a/mini/src/pages/index/index.jsx
+++ b/mini/src/pages/index/index.jsx
@@ -176,6 +176,9 @@ class Index extends React.Component {
         const r = sikpPath.match(reg);
         r && this.props.invite.setInviteCode(r[2])
       }
+      if(router.params && router.params.inviteCode) {
+        this.props.invite.setInviteCode(router.params.inviteCode)
+      }
 
       const isGoToHome = await this.isPass();
       if (isGoToHome ) {
-- 
Gitee


From 612acdceca72f3bffdc7a322fd1e6513ea887508 Mon Sep 17 00:00:00 2001
From: jsl <Jiangsl1@hua-cloud.com.cn>
Date: Fri, 26 Nov 2021 09:02:35 +0800
Subject: [PATCH 04/22] =?UTF-8?q?fix:=203795=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F-=E8=AF=84=E8=AE=BA=E8=AF=A6=E6=83=85=E9=A1=B5-?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E3=80=91=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E7=82=B9=E5=87=BB=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E6=97=A0=E6=B3=95=E6=8B=89=E8=B5=B7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E3=80=81=E5=A4=8D=E5=88=B6=E7=9A=84=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=E5=8F=AA=E8=83=BD=E7=82=B9=E5=87=BB=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=84=E5=8F=B3=E8=BE=B9=E7=9A=84=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9=E6=89=8D=E8=83=BD=E6=8B=89=E8=B5=B7?=
 =?UTF-8?q?=EF=BC=88iPhone11=20http://bug.eims.com.cn/bug-view-3795.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mini/src/components/thread/post-content/index.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mini/src/components/thread/post-content/index.jsx b/mini/src/components/thread/post-content/index.jsx
index 06e2def27..c4ec89bce 100644
--- a/mini/src/components/thread/post-content/index.jsx
+++ b/mini/src/components/thread/post-content/index.jsx
@@ -108,7 +108,7 @@ const PostContent = ({
   }, [content]);
 
   const onShowMore = useCallback((e) => {
-    e && e.stopPropagation();
+    e && e.stopPropagation(); 
     updateViewCount();
 
     if (contentTooLong) {
@@ -131,7 +131,7 @@ const PostContent = ({
 
   const handleClick = (e, node) => {
     if(node && node.name === 'image') return
-    e && e.stopPropagation();
+    // e && e.stopPropagation();
     const { url, isExternaLink } = handleLink(node)
     if (isExternaLink) return
 
@@ -245,7 +245,7 @@ const PostContent = ({
       <View
         ref={contentWrapperRef}
         className={`${styles.contentWrapper} ${openedMore && showMore ? styles.hideCover : ''} ${customHoverBg ? styles.bg : ''}`}
-        onClick={!showMore ? onShowMore : handleClick}
+        onClick={ handleClick } 
       >
         <View className={styles.content}>
           <RichText
-- 
Gitee


From 23ad795596573305b47af609380dcbd360f2b574 Mon Sep 17 00:00:00 2001
From: jsl <Jiangsl1@hua-cloud.com.cn>
Date: Fri, 26 Nov 2021 17:03:34 +0800
Subject: [PATCH 05/22] =?UTF-8?q?fix:=203657=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F-=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E3=80=91=E3=80=90=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=E3=80=91=E7=82=B9=E8=B5=9E=E6=98=BE=E7=A4=BA=E6=9C=89=201=20?=
 =?UTF-8?q?=E6=9D=A1=EF=BC=8C=E7=82=B9=E5=87=BB=E7=82=B9=E8=B5=9E=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=BF=9B=E5=85=A5=E7=82=B9=E8=B5=9E=E9=A1=B5?=
 =?UTF-8?q?=E7=A1=AE=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=20http://bug.eims?=
 =?UTF-8?q?.com.cn/bug-view-3657.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/components/thread/index.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/components/thread/index.jsx b/web/components/thread/index.jsx
index ee37b6614..bcab957ea 100644
--- a/web/components/thread/index.jsx
+++ b/web/components/thread/index.jsx
@@ -118,6 +118,8 @@ class Index extends React.Component {
         typeof onPraise === 'function' && onPraise({isLiked: result.data.isLiked})
         // const { recomputeRowHeights = noop } = this.props;
         // recomputeRowHeights();
+      }else{
+        Toast.info({ content: `${result?.msg}` });
       }
       this.setState({ isSendingLike: false });
     });
-- 
Gitee


From b7ca64b8c4530aaed5d7ccc47bd1c00dbdb4d901 Mon Sep 17 00:00:00 2001
From: VS-ZX <2417818740@qq.com>
Date: Mon, 29 Nov 2021 10:25:24 +0800
Subject: [PATCH 06/22] =?UTF-8?q?fix:=203784=E3=80=90PC-=E5=8F=91=E5=B8=96?=
 =?UTF-8?q?-=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E3=80=91=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BB=98=E8=B4=B9=E8=AE=BE=E7=BD=AE=E4=BB=98=E8=B4=B9?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=EF=BC=8C=E8=BE=93=E5=85=A5=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E5=85=89=E6=A0=87=E4=BD=8D=E7=BD=AE=E8=B7=B3=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/part-paid/units/priceUnit.jsx          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/components/thread-post/payment/part-paid/units/priceUnit.jsx b/web/components/thread-post/payment/part-paid/units/priceUnit.jsx
index 8b3529f81..dcd292125 100644
--- a/web/components/thread-post/payment/part-paid/units/priceUnit.jsx
+++ b/web/components/thread-post/payment/part-paid/units/priceUnit.jsx
@@ -8,6 +8,11 @@ const PriceUnit = inject('threadPost')(observer(({ ...props }) => {
   const { partPayInfo } = threadPost;
   const { payPrice } = partPayInfo;
 
+  const handlePrice = (val) => {
+    const arr = val.match(/([1-9]\d{0,5}|0)(\.\d{0,2})?/);
+    partPayInfo.payPrice = arr ? arr[0] : '';
+  };
+
   return (
       <Unit
         title={'设置付费价格'}
@@ -15,13 +20,10 @@ const PriceUnit = inject('threadPost')(observer(({ ...props }) => {
             <>
               <Input
                 mode={'number'}
-                htmlType={'number'}
-                placeholder={'金额'}
-                trim={true}
                 value={payPrice}
-                onChange={(e) => {
-                  partPayInfo.payPrice = e.target.value;
-                }}
+                placeholder={'金额'}
+                maxLength={9}
+                onChange={e => handlePrice(e.target.value)}
               />
               <span>&nbsp;元</span>
             </>
-- 
Gitee


From 9f18f0945daa00a3cc01d1b896170099c22c2560 Mon Sep 17 00:00:00 2001
From: VS-ZX <2417818740@qq.com>
Date: Mon, 29 Nov 2021 10:58:47 +0800
Subject: [PATCH 07/22] =?UTF-8?q?fix:=203769=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F-=E5=8F=91=E5=B8=96-=E6=B5=8B=E8=AF=95=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E3=80=91=E8=AE=BE=E7=BD=AE=E9=83=A8=E5=88=86=E4=BB=98?=
 =?UTF-8?q?=E8=B4=B9=E7=9A=84=E6=97=B6=E5=80=99=E4=BB=B7=E6=A0=BC=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E6=B2=A1=E6=9C=89=E5=81=9A=E4=BB=BB=E4=BD=95?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E4=BB=BB=E4=BD=95=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E9=83=BD=E5=8F=AF=E4=BB=A5=E8=BE=93=E5=85=A5=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E5=9C=A8=E5=8F=91=E5=B8=96=E9=A1=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AF=E4=BB=98=E8=B4=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/part-paid/units/priceUnit.jsx      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/mini/src/components/thread-post/payment/part-paid/units/priceUnit.jsx b/mini/src/components/thread-post/payment/part-paid/units/priceUnit.jsx
index d303a5656..ecd174517 100644
--- a/mini/src/components/thread-post/payment/part-paid/units/priceUnit.jsx
+++ b/mini/src/components/thread-post/payment/part-paid/units/priceUnit.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { inject, observer } from 'mobx-react';
 import Unit from '@components/thread-post/payment/part-paid/units/unit';
 import { Text } from '@tarojs/components';
@@ -6,10 +6,17 @@ import { Input } from '@discuzq/design';
 
 const PriceUnit = inject('threadPost')(
   observer(({ ...props }) => {
+    const [refresh, setRefresh] = useState(false); // 强制刷新，保证输入框显示最新值
     const { threadPost } = props;
     const { partPayInfo } = threadPost;
     const { payPrice } = partPayInfo;
 
+    const handlePrice = (val) => {
+      const arr = val.match(/([1-9]\d{0,5}|0)(\.\d{0,2})?/);
+      partPayInfo.payPrice = arr ? arr[0] : '';
+      setRefresh(!refresh);
+    };
+
     return (
       <Unit
         title="设置付费价格"
@@ -17,13 +24,10 @@ const PriceUnit = inject('threadPost')(
           <>
             <Input
               mode="number"
-              htmlType="number"
-              placeholder="金额"
-              trim
               value={payPrice}
-              onChange={(e) => {
-                partPayInfo.payPrice = e.target.value;
-              }}
+              placeholder="金额"
+              maxLength={9}
+              onChange={e => handlePrice(e.target.value)}
             />
             <Text>&nbsp;元</Text>
           </>
-- 
Gitee


From a6b5b47cfe03082858e50d24805b799f7f572f2b Mon Sep 17 00:00:00 2001
From: v_zjxzzheng <v_zjxzzheng@tencent.com>
Date: Mon, 29 Nov 2021 12:01:09 +0800
Subject: [PATCH 08/22] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mini/src/components/member-badge/index.module.scss | 2 +-
 mini/src/userPages/user/wx-auth/index.jsx          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mini/src/components/member-badge/index.module.scss b/mini/src/components/member-badge/index.module.scss
index 3579252b3..c7ed0384f 100644
--- a/mini/src/components/member-badge/index.module.scss
+++ b/mini/src/components/member-badge/index.module.scss
@@ -5,7 +5,7 @@
   align-items: center;
 
   .memberBadgeIcon {
-    flex: 0 0 16px;
+    flex: auto;
     z-index: 1;
   }
 
diff --git a/mini/src/userPages/user/wx-auth/index.jsx b/mini/src/userPages/user/wx-auth/index.jsx
index e849b666d..7336dc6c9 100644
--- a/mini/src/userPages/user/wx-auth/index.jsx
+++ b/mini/src/userPages/user/wx-auth/index.jsx
@@ -79,6 +79,7 @@ class MiniAuth extends React.Component {
       checkUserStatus(resp);
       if (resp.code === 0) {
         LoginHelper.restore();
+        await this.props.site.getSiteInfo();
         return;
       }
       // 落地页开关打开
-- 
Gitee


From 0486ef0f7308f9e9890e7827c6ff5b2bbbe0c9bf Mon Sep 17 00:00:00 2001
From: jsl <Jiangsl1@hua-cloud.com.cn>
Date: Mon, 29 Nov 2021 15:12:03 +0800
Subject: [PATCH 09/22] =?UTF-8?q?fix:=203657=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F-=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E3=80=91=E3=80=90=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=E3=80=91=E7=82=B9=E8=B5=9E=E6=98=BE=E7=A4=BA=E6=9C=89=201=20?=
 =?UTF-8?q?=E6=9D=A1=EF=BC=8C=E7=82=B9=E5=87=BB=E7=82=B9=E8=B5=9E=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E8=BF=9B=E5=85=A5=E7=82=B9=E8=B5=9E=E9=A1=B5?=
 =?UTF-8?q?=E7=A1=AE=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AEmini=20=20http://b?=
 =?UTF-8?q?ug.eims.com.cn/bug-view-3657.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mini/src/components/thread/index.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mini/src/components/thread/index.jsx b/mini/src/components/thread/index.jsx
index 6973dcc1d..423b661fd 100644
--- a/mini/src/components/thread/index.jsx
+++ b/mini/src/components/thread/index.jsx
@@ -117,6 +117,8 @@ class Index extends React.Component {
       if (result.code === 0 && result.data) {
         updateThreadAssignInfoInLists(threadId, { updateType: 'like', updatedInfo: result.data, user: user.userInfo });
         typeof onPraise === 'function' && onPraise({ isLiked: result.data.isLiked })
+      }else{
+        Toast.info({ content: `${result?.msg}` });
       }
       this.setState({ isSendingLike: false, minHeight: 0 }, () => {
         // 点赞更新完数据后，重新修正帖子高度
-- 
Gitee


From 1d6c2f69ed85fe0a137da50eafc571dac1081620 Mon Sep 17 00:00:00 2001
From: VS-ZX <2417818740@qq.com>
Date: Mon, 29 Nov 2021 15:40:33 +0800
Subject: [PATCH 10/22] =?UTF-8?q?fix:=20=E9=A6=96=E6=AC=A1=E5=8F=91?=
 =?UTF-8?q?=E5=B8=96=EF=BC=8C=E9=80=89=E6=8B=A9=E9=83=A8=E5=88=86=E4=BB=98?=
 =?UTF-8?q?=E8=B4=B9=E6=97=B6=EF=BC=8C=E4=B8=BA=E9=80=89=E6=8B=A9=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=AE=BE=E7=BD=AE=E5=88=9D=E5=A7=8B=E5=8C=96=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/store/thread/post/action.js            |  2 +
 .../thread-post/payment/part-paid/index.jsx   | 45 +++++++++++++++++++
 .../thread-post/payment/part-paid/index.jsx   | 45 +++++++++++++++++++
 3 files changed, 92 insertions(+)

diff --git a/common/store/thread/post/action.js b/common/store/thread/post/action.js
index 3c4321135..da2adeaee 100644
--- a/common/store/thread/post/action.js
+++ b/common/store/thread/post/action.js
@@ -249,6 +249,8 @@ class ThreadPostAction extends ThreadPostStore {
       selectedImages,
       textFreeValue,
     } = this.partPayInfo;
+  
+    if (!payPrice) return;
 
     if (selectedAttachments && selectedAttachments.length > 0) {
       this.filesPriceList = [...selectedAttachments];
diff --git a/mini/src/components/thread-post/payment/part-paid/index.jsx b/mini/src/components/thread-post/payment/part-paid/index.jsx
index 6eb898294..8540bcb96 100644
--- a/mini/src/components/thread-post/payment/part-paid/index.jsx
+++ b/mini/src/components/thread-post/payment/part-paid/index.jsx
@@ -11,7 +11,52 @@ import AudioUnit from '@components/thread-post/payment/part-paid/units/audioUnit
 import AttachmentUnit from '@components/thread-post/payment/part-paid/units/attachmentUnit';
 import PriceUnit from '@components/thread-post/payment/part-paid/units/priceUnit';
 
+import { inject, observer } from 'mobx-react';
+import { THREAD_STATUS } from '@common/constants/thread-post';
+
+@inject('threadPost')
+@observer
 class PartPaid extends React.Component {
+
+  // 设置首次发帖时，部分付费内容默认全选
+  componentDidMount() {
+    const { threadStatus, postData, partPayInfo } = this.props.threadPost;
+
+    if (threadStatus !== THREAD_STATUS.create) return;
+
+    const { images = {}, files = {}, video = {}, audio = {} } = postData;
+    const {
+      hasDefaultImages,
+      hasDefaultFiles,
+      hasDefaultVideo,
+      hasDefaultAudio,
+    } = partPayInfo;
+
+    setTimeout(() => {
+      if (Object.keys(images).length > 0 && !hasDefaultImages) {
+        partPayInfo.selectedImages = Object.values(images).map(i => i.id);
+        partPayInfo.hasDefaultImages = true;
+      }
+
+      if (Object.keys(files).length > 0 && !hasDefaultFiles) {
+        partPayInfo.selectedAttachments = Object.values(files).map(i => i.id);
+        partPayInfo.hasDefaultFiles = true;
+      }
+
+      if (Object.keys(video).length > 0 && !hasDefaultVideo) {
+        partPayInfo.selectedVideo = [video.id];
+        partPayInfo.hasDefaultVideo = true;
+      }
+
+      if (Object.keys(audio).length > 0 && !hasDefaultAudio) {
+        partPayInfo.selectedAudio = [audio.id];
+        partPayInfo.hasDefaultAudio = true;
+      }
+
+      this.props.threadPost.partPayInfo = { ...partPayInfo };
+    }, 100)
+  }
+
   render() {
     return (
       <View>
diff --git a/web/components/thread-post/payment/part-paid/index.jsx b/web/components/thread-post/payment/part-paid/index.jsx
index b5062cf8f..1d2943d4d 100644
--- a/web/components/thread-post/payment/part-paid/index.jsx
+++ b/web/components/thread-post/payment/part-paid/index.jsx
@@ -10,7 +10,52 @@ import AudioUnit from '@components/thread-post/payment/part-paid/units/audioUnit
 import AttachmentUnit from '@components/thread-post/payment/part-paid/units/attachmentUnit';
 import PriceUnit from '@components/thread-post/payment/part-paid/units/priceUnit';
 
+import { inject, observer } from 'mobx-react';
+import { THREAD_STATUS } from '@common/constants/thread-post';
+
+@inject('threadPost')
+@observer
 class PartPaid extends React.Component {
+
+  // 设置首次发帖时，部分付费内容默认全选
+  componentDidMount() {
+    const { threadStatus, postData, partPayInfo } = this.props.threadPost;
+
+    if (threadStatus !== THREAD_STATUS.create) return;
+
+    const { images = {}, files = {}, video = {}, audio = {} } = postData;
+    const {
+      hasDefaultImages,
+      hasDefaultFiles,
+      hasDefaultVideo,
+      hasDefaultAudio,
+    } = partPayInfo;
+
+    setTimeout(() => {
+      if (Object.keys(images).length > 0 && !hasDefaultImages) {
+        partPayInfo.selectedImages = Object.values(images).map(i => i.id);
+        partPayInfo.hasDefaultImages = true;
+      }
+
+      if (Object.keys(files).length > 0 && !hasDefaultFiles) {
+        partPayInfo.selectedAttachments = Object.values(files).map(i => i.id);
+        partPayInfo.hasDefaultFiles = true;
+      }
+
+      if (Object.keys(video).length > 0 && !hasDefaultVideo) {
+        partPayInfo.selectedVideo = [video.id];
+        partPayInfo.hasDefaultVideo = true;
+      }
+
+      if (Object.keys(audio).length > 0 && !hasDefaultAudio) {
+        partPayInfo.selectedAudio = [audio.id];
+        partPayInfo.hasDefaultAudio = true;
+      }
+
+      this.props.threadPost.partPayInfo = { ...partPayInfo };
+    }, 100)
+  }
+
   render() {
     return (
       <div>
-- 
Gitee


From 4edb6fc2819050bcd32d02ebd3a60f6c9d2fa84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?zonewellhe=28=E8=B4=BA=E9=87=8D=E5=A8=81=29?=
 <zonewellhe@tencent.com>
Date: Mon, 29 Nov 2021 16:46:25 +0800
Subject: [PATCH 11/22] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/thread/comment/comment-list/index.jsx | 12 +++++++-----
 mini/src/layout/create-card/index.jsx                |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mini/src/components/thread/comment/comment-list/index.jsx b/mini/src/components/thread/comment/comment-list/index.jsx
index f429b0090..8bb5cf76b 100644
--- a/mini/src/components/thread/comment/comment-list/index.jsx
+++ b/mini/src/components/thread/comment/comment-list/index.jsx
@@ -1,17 +1,20 @@
 import React from 'react';
 import { inject, observer } from 'mobx-react';
+import Taro from '@tarojs/taro';
 import Toast from '@discuzq/design/dist/components/toast';
 import CommentList from '@layout/thread/components/comment-list/index';
 import AboptPopup from '@layout/thread/components/abopt-popup';
 import { View } from '@tarojs/components'
 import { parseContentData } from '@layout/thread/utils';
-import InputPopup from '@layout/thread/components/input-popup';
+// import InputPopup from '@layout/thread/components/input-popup';
 import DeletePopup from '@layout/thread/components/delete-popup';
 import goToLoginPage from '@common/utils/go-to-login-page';
 import { debounce } from '@common/utils/throttle-debounce';
+import { withRouter } from 'next/router';
 import comment from './index.module.scss';
 import Operate from '../operate';
 
+
 /**
  * 评论列表
  * 移动端不需要回复按钮 - disabledReply={true}
@@ -27,7 +30,6 @@ class RenderCommentList extends React.Component {
       showAboptPopup: false, // 是否弹出采纳弹框
       showDeletePopup: false, // 是否弹出删除弹框
       showReplyDeletePopup: false, // 是否弹出回复删除弹框
-
       inputText: '请输入内容', // 默认回复框placeholder内容
     };
 
@@ -187,7 +189,7 @@ class RenderCommentList extends React.Component {
   // 跳转评论详情
   onCommentClick(data) {
     if (data.id && this.props.thread?.threadData?.id) {
-      this.props.router.push(`/thread/comment/${data.id}?threadId=${this.props.thread?.threadData?.id}`);
+      Taro.navigateTo({ url: `/indexPages/thread/index?id=${this.props.thread?.threadData?.id}` });
     }
   }
 
@@ -245,7 +247,7 @@ class RenderCommentList extends React.Component {
   avatarClick(data) {
     const { userId } = data;
     if (!userId) return;
-    this.props.router.push(`/user/${userId}`);
+    Taro.navigateTo({ url: `/userPages/user/index?id=${userId}` });
   }
 
   // 点击回复头像
@@ -325,4 +327,4 @@ class RenderCommentList extends React.Component {
   }
 }
 
-export default RenderCommentList;
+export default withRouter(RenderCommentList);
diff --git a/mini/src/layout/create-card/index.jsx b/mini/src/layout/create-card/index.jsx
index bdf2f992e..f49f56edf 100644
--- a/mini/src/layout/create-card/index.jsx
+++ b/mini/src/layout/create-card/index.jsx
@@ -37,7 +37,7 @@ class Index extends React.Component {
         }
 
         try {
-            const paramPath = `/pages/index/index?path=${encodeURIComponent(setUrlParam(path, { inviteCode }))}`;
+            const paramPath = `/pages/index/index?path=${encodeURIComponent(commentId?path:setUrlParam(path, { inviteCode }))}`;
             const res = await getMiniCode({ params: { path: paramPath } });
             if(res?.code === 0) {
                 this.setState({miniCode: res?.data});
-- 
Gitee


From c39287d69572eb7e0cb541150625b83c35aadf86 Mon Sep 17 00:00:00 2001
From: jsl <Jiangsl1@hua-cloud.com.cn>
Date: Mon, 29 Nov 2021 17:06:56 +0800
Subject: [PATCH 12/22] =?UTF-8?q?fix:=203778=20=E3=80=90H5/PC-=E5=8F=91?=
 =?UTF-8?q?=E5=B8=96-=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E3=80=91?=
 =?UTF-8?q?=E5=8F=91=E5=B8=96=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=99=84=E4=BB=B6=E5=A4=A7=E5=B0=8F=E6=9C=AA=E9=9D=A0?=
 =?UTF-8?q?=E5=8F=B3=E5=AF=B9=E9=BD=90=EF=BC=8C=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E5=B1=95=E7=A4=BA=E5=BA=94=E4=B8=8E=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=EF=BC=88?=
 =?UTF-8?q?PC=E4=B9=9F=E6=98=AF=E6=B2=A1=E6=9C=89=E5=AF=B9=E9=BD=90?=
 =?UTF-8?q?=EF=BC=89=20http://bug.eims.com.cn/bug-view-3778.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/components/upload/index.module.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/components/upload/index.module.scss b/web/components/upload/index.module.scss
index b7467bc74..cd92ff0fe 100644
--- a/web/components/upload/index.module.scss
+++ b/web/components/upload/index.module.scss
@@ -92,8 +92,9 @@ $width: rem(169);
       .dzq-upload-list-list {
         flex-direction: column;
         .dzq-upload-list-list__name {
-          max-width: 170px;
+          width: 45vw;
           line-height: rem(32);
+          @include text-ellipsis();
         }
         .dzq-button--text {
           width: 100%;
-- 
Gitee


From 11943c19f6e851c4a57c7858fb03c0a9d4e3748e Mon Sep 17 00:00:00 2001
From: jsl <Jiangsl1@hua-cloud.com.cn>
Date: Mon, 29 Nov 2021 17:49:01 +0800
Subject: [PATCH 13/22] =?UTF-8?q?fix:=20=E3=80=90H5-=E5=88=86=E4=BA=AB-?=
 =?UTF-8?q?=E7=8E=B0=E7=BD=91=E3=80=91=EF=BC=88=E6=8F=90=E5=87=BA=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=9A=E6=A0=B8=E5=BF=83=E7=BE=A4=20=E4=B8=89=E7=BB=B4?=
 =?UTF-8?q?=E6=A0=91=EF=BC=89=E6=B8=B8=E5=AE=A2=E7=8A=B6=E6=80=81H5?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=86=85=E7=82=B9=E5=8F=B3=E4=B8=8A=E8=A7=92?=
 =?UTF-8?q?=E4=B8=89=E4=B8=AA=E7=82=B9=E5=88=86=E4=BA=AB=E5=88=B0=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=EF=BC=8C=E6=9C=89undefined=E5=AD=97=E6=A0=B7=20http:/?=
 =?UTF-8?q?/bug.eims.com.cn/bug-view-3813.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/middleware/HOCFetchSiteData.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/middleware/HOCFetchSiteData.jsx b/web/middleware/HOCFetchSiteData.jsx
index e34ca5087..61743e751 100644
--- a/web/middleware/HOCFetchSiteData.jsx
+++ b/web/middleware/HOCFetchSiteData.jsx
@@ -293,7 +293,7 @@ export default function HOCFetchSiteData(Component, _isPass) {
 
       // 首页、推广邀请
       if (route.includes('/invite') || route === '/') {
-        title = `${nickname}邀请您加入${siteName}`;
+        title = `${nickname || ''}邀请您加入${siteName}`;
       }
 
       // 私聊页面分享出去点击访问消息模块首页
-- 
Gitee


From aaaf5da9fff75740d506e862637eede2b0a72073 Mon Sep 17 00:00:00 2001
From: jsl <Jiangsl1@hua-cloud.com.cn>
Date: Mon, 29 Nov 2021 18:48:06 +0800
Subject: [PATCH 14/22] =?UTF-8?q?fix:=203806=20=E3=80=90PC-=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83-=E6=B5=8B=E8=AF=95=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E3=80=91=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E8=B4=AD=E4=B9=B0=E3=80=81=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E3=80=81=E6=88=91=E7=9A=84=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=9B=E5=85=A5=E5=90=8E=E5=85=88?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=9A=82=E6=97=A0=E5=85=B6=E4=BB=96=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=90=8E=EF=BC=8C=E5=86=8D=E6=98=BE=E7=A4=BA=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E7=9A=84=E5=B8=96=E5=AD=90=EF=BC=8C=E6=9C=9F=E6=9C=9B?=
 =?UTF-8?q?=EF=BC=9A=E5=B0=86=E2=80=9C=E6=9A=82=E6=97=A0=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=9B=B4=E5=A4=9A=E2=80=9D=E3=80=82=20http://bug.eims?=
 =?UTF-8?q?.com.cn/bug-view-3806.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/layout/my/buy/pc/index.jsx     | 2 +-
 web/layout/my/collect/pc/index.jsx | 2 +-
 web/layout/my/like/pc/index.jsx    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/layout/my/buy/pc/index.jsx b/web/layout/my/buy/pc/index.jsx
index 32b6121e8..8cd397dc5 100644
--- a/web/layout/my/buy/pc/index.jsx
+++ b/web/layout/my/buy/pc/index.jsx
@@ -71,7 +71,7 @@ class BuyPCPage extends React.Component {
           type='normal'
           isShowMore={false}
           noData={!buyThreadsList?.length}
-          isLoading={!buyThreadsList}
+          isLoading={!buyThreadsList?.length}
           icon={{ type: 3, name: 'ShoppingCartOutlined' }}
           rightText={totalCount !== undefined ? `共有${totalCount}条购买` : null}
           mold='plane'
diff --git a/web/layout/my/collect/pc/index.jsx b/web/layout/my/collect/pc/index.jsx
index d0735b159..ae721781d 100644
--- a/web/layout/my/collect/pc/index.jsx
+++ b/web/layout/my/collect/pc/index.jsx
@@ -74,7 +74,7 @@ class CollectPCPage extends React.Component {
             type="normal"
             isShowMore={false}
             noData={!collectThreadsList?.length}
-            isLoading={!collectThreadsList}
+            isLoading={!collectThreadsList?.length}
             icon={{ type: 3, name: 'CollectOutlined' }}
             rightText={totalCount !== undefined ? `共有${totalCount}条收藏` : ''}
             mold="plane"
diff --git a/web/layout/my/like/pc/index.jsx b/web/layout/my/like/pc/index.jsx
index 55de58de6..f81eb40d5 100644
--- a/web/layout/my/like/pc/index.jsx
+++ b/web/layout/my/like/pc/index.jsx
@@ -78,7 +78,7 @@ class LikePCPage extends React.Component {
           type="normal"
           isShowMore={false}
           noData={!likeThreadList?.length}
-          isLoading={!likeThreadList}
+          isLoading={!likeThreadList?.length}
           icon={{ type: 3, name: 'LikeOutlined' }}
           rightText={totalCount !== undefined ? `共有${totalCount}条点赞` : null}
           className={styles.container}
-- 
Gitee


From 3636de6100658fc196281d7bb3c6dec59dc168d7 Mon Sep 17 00:00:00 2001
From: jsl <Jiangsl1@hua-cloud.com.cn>
Date: Tue, 30 Nov 2021 09:18:58 +0800
Subject: [PATCH 15/22] =?UTF-8?q?fix:=203806=20=E3=80=90PC-=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83-=E6=B5=8B=E8=AF=95=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E3=80=91=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E8=B4=AD=E4=B9=B0=E3=80=81=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E3=80=81=E6=88=91=E7=9A=84=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=9B=E5=85=A5=E5=90=8E=E5=85=88?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=9A=82=E6=97=A0=E5=85=B6=E4=BB=96=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=90=8E=EF=BC=8C=E5=86=8D=E6=98=BE=E7=A4=BA=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E7=9A=84=E5=B8=96=E5=AD=90=EF=BC=8C=E6=9C=9F=E6=9C=9B?=
 =?UTF-8?q?=EF=BC=9A=E5=B0=86=E2=80=9C=E6=9A=82=E6=97=A0=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=9B=B4=E5=A4=9A=E2=80=9D=E3=80=82=20http://bug.eims?=
 =?UTF-8?q?.com.cn/bug-view-3806.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/layout/my/buy/pc/index.jsx     | 2 +-
 web/layout/my/collect/pc/index.jsx | 2 +-
 web/layout/my/like/pc/index.jsx    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/layout/my/buy/pc/index.jsx b/web/layout/my/buy/pc/index.jsx
index 8cd397dc5..68d2f1879 100644
--- a/web/layout/my/buy/pc/index.jsx
+++ b/web/layout/my/buy/pc/index.jsx
@@ -71,7 +71,7 @@ class BuyPCPage extends React.Component {
           type='normal'
           isShowMore={false}
           noData={!buyThreadsList?.length}
-          isLoading={!buyThreadsList?.length}
+          isLoading={!(totalCount>=0)}
           icon={{ type: 3, name: 'ShoppingCartOutlined' }}
           rightText={totalCount !== undefined ? `共有${totalCount}条购买` : null}
           mold='plane'
diff --git a/web/layout/my/collect/pc/index.jsx b/web/layout/my/collect/pc/index.jsx
index ae721781d..696a340d3 100644
--- a/web/layout/my/collect/pc/index.jsx
+++ b/web/layout/my/collect/pc/index.jsx
@@ -74,7 +74,7 @@ class CollectPCPage extends React.Component {
             type="normal"
             isShowMore={false}
             noData={!collectThreadsList?.length}
-            isLoading={!collectThreadsList?.length}
+            isLoading={!(totalCount>=0)}
             icon={{ type: 3, name: 'CollectOutlined' }}
             rightText={totalCount !== undefined ? `共有${totalCount}条收藏` : ''}
             mold="plane"
diff --git a/web/layout/my/like/pc/index.jsx b/web/layout/my/like/pc/index.jsx
index f81eb40d5..bb56a0a89 100644
--- a/web/layout/my/like/pc/index.jsx
+++ b/web/layout/my/like/pc/index.jsx
@@ -78,7 +78,7 @@ class LikePCPage extends React.Component {
           type="normal"
           isShowMore={false}
           noData={!likeThreadList?.length}
-          isLoading={!likeThreadList?.length}
+          isLoading={!(totalCount>=0)}
           icon={{ type: 3, name: 'LikeOutlined' }}
           rightText={totalCount !== undefined ? `共有${totalCount}条点赞` : null}
           className={styles.container}
-- 
Gitee


From 06512b550cf06ee314dfe9f7dd70f512a204f5c4 Mon Sep 17 00:00:00 2001
From: VS-ZX <2417818740@qq.com>
Date: Tue, 30 Nov 2021 09:34:40 +0800
Subject: [PATCH 16/22] =?UTF-8?q?style:=203088=20=E3=80=90H5-=E5=8F=91?=
 =?UTF-8?q?=E5=B8=96-=E8=8B=B9=E6=9E=9C=E3=80=81=E5=AE=89=E5=8D=93?=
 =?UTF-8?q?=E3=80=91=E6=B5=8F=E8=A7=88=E5=99=A8=E5=8F=91=E5=B8=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=8A=A5=E5=90=8D=E5=B8=96=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8D=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/src/entry/adapter/index.module.scss  | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/common/plugin/custom-apply/View/src/entry/adapter/index.module.scss b/common/plugin/custom-apply/View/src/entry/adapter/index.module.scss
index 1b2e60158..e538e114f 100644
--- a/common/plugin/custom-apply/View/src/entry/adapter/index.module.scss
+++ b/common/plugin/custom-apply/View/src/entry/adapter/index.module.scss
@@ -203,25 +203,34 @@
     .dzq-modal__container {
       width: 100% !important;
       height: 100% !important;
-      padding-left: 0;
-      padding-right: 0;
+      padding: 0;
+      display: flex;
+      flex-direction: column;
     }
     .dzq-modal__header {
-      margin: 0 $padding-6n;
+      margin: $padding-4n $padding-6n;
+      padding: 0;
     }
     .dzq-modal__body,
     .dzq-modal__footer {
       padding: 0 $padding-6n;
     }
     .dzq-modal__body {
-      height: calc(100vh - 120px - constant(safe-area-inset-bottom));
-      height: calc(100vh - 120px - env(safe-area-inset-bottom));
+      flex: 1;
+      margin-bottom: 60px;
+      margin-bottom: calc(60px + constant(safe-area-inset-bottom));
+      margin-bottom: calc(60px + env(safe-area-inset-bottom));
       overflow-x: hidden;
       overflow-y: auto;
     }
     .dzq-modal__footer {
+      position: fixed;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      padding: $padding-2n $padding-6n;
       border-top: $border-solid-1;
-      padding-top: 10px;
+      background: $white;
       display: flex;
       justify-content: space-between;
       .dzq-button {
-- 
Gitee


From 0839476aa6fb2a799cbfdb44c66274bd745889a5 Mon Sep 17 00:00:00 2001
From: jsl <Jiangsl1@hua-cloud.com.cn>
Date: Tue, 30 Nov 2021 10:50:21 +0800
Subject: [PATCH 17/22] =?UTF-8?q?fix:=203757=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F/H5-=E6=94=AF=E4=BB=98=E5=BC=B9=E7=AA=97-=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E3=80=911.=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=94=AF=E4=BB=98=E5=BC=B9=E7=AA=97=E7=9A=84=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E6=A1=86=E5=A4=AA=E5=B0=8F=E4=B8=8Eui=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=9B=BE=E4=B8=8D=E4=B8=80=E8=87=B4=E3=80=822.H5?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E7=AA=97=E8=BF=87=E5=A4=A7=EF=BC=8C=E5=BA=94?=
 =?UTF-8?q?=E4=B8=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BF=9D=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=20http://bug.eims.com.cn/bug-view-3757.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mini/src/components/payBox/payPwd/index.module.scss | 4 ++--
 web/components/payBox/h5/payPwd/index.module.scss   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mini/src/components/payBox/payPwd/index.module.scss b/mini/src/components/payBox/payPwd/index.module.scss
index 47fed0b14..9d35c24b4 100644
--- a/mini/src/components/payBox/payPwd/index.module.scss
+++ b/mini/src/components/payBox/payPwd/index.module.scss
@@ -13,7 +13,7 @@
 .paypwdDialogWrapper {
   :global {
     .dzq-modal__container {
-      width: 283px;
+      width: 283px !important;
       top: 36%;
       box-sizing: border-box;
       border-radius: $border-radius-small;
@@ -91,7 +91,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  width: 251px;
+  width: 98%;
   .payListItem {
     flex: 1;
     display: flex;
diff --git a/web/components/payBox/h5/payPwd/index.module.scss b/web/components/payBox/h5/payPwd/index.module.scss
index 18eadaa02..2d2f6da99 100644
--- a/web/components/payBox/h5/payPwd/index.module.scss
+++ b/web/components/payBox/h5/payPwd/index.module.scss
@@ -47,7 +47,7 @@
 .paypwdDialogWrapper {
   :global {
     .dzq-modal__container {
-      width: rem(283);
+      width: rem(283) !important;
       top: 36%;
       box-sizing: border-box;
       border-radius: $border-radius-small;
-- 
Gitee


From 771ef13c37ce5c2077ffd5ebc8940d43e3eaa3f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E5=8F=8C=E9=9A=86?= <18797662499@163.com>
Date: Tue, 30 Nov 2021 17:39:06 +0800
Subject: [PATCH 18/22] =?UTF-8?q?fix:=203795=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F-=E8=AF=84=E8=AE=BA=E8=AF=A6=E6=83=85=E9=A1=B5-?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E3=80=91=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E7=82=B9=E5=87=BB=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E6=97=A0=E6=B3=95=E6=8B=89=E8=B5=B7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E3=80=81=E5=A4=8D=E5=88=B6=E7=9A=84=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=E5=8F=AA=E8=83=BD=E7=82=B9=E5=87=BB=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=84=E5=8F=B3=E8=BE=B9=E7=9A=84=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9=E6=89=8D=E8=83=BD=E6=8B=89=E8=B5=B7?=
 =?UTF-8?q?2=EF=BC=88iPhone11=20http://bug.eims.com.cn/bug-view-3795.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mini/src/components/thread/post-content/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mini/src/components/thread/post-content/index.jsx b/mini/src/components/thread/post-content/index.jsx
index c4ec89bce..4955ae346 100644
--- a/mini/src/components/thread/post-content/index.jsx
+++ b/mini/src/components/thread/post-content/index.jsx
@@ -108,7 +108,7 @@ const PostContent = ({
   }, [content]);
 
   const onShowMore = useCallback((e) => {
-    e && e.stopPropagation(); 
+    e && e.stopPropagation();
     updateViewCount();
 
     if (contentTooLong) {
-- 
Gitee


From 20381ba80294482d956cfdaf6e86cd6877298f2d Mon Sep 17 00:00:00 2001
From: VS-ZX <2417818740@qq.com>
Date: Wed, 1 Dec 2021 15:03:06 +0800
Subject: [PATCH 19/22] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0@discuzq?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mini/package.json | 8 ++++----
 web/package.json  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mini/package.json b/mini/package.json
index 77fd1ab51..6b49349d5 100644
--- a/mini/package.json
+++ b/mini/package.json
@@ -30,12 +30,12 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "7.7.7",
-    "@discuzq/design": "1.1.3",
+    "@discuzq/design": "1.1.6",
     "@discuzq/discuz-babel-plugin-import": "0.0.1",
     "@discuzq/discuz-plugin-loader": "2.1.8",
-    "@discuzq/plugin-center": "2.0.14",
-    "@discuzq/sdk": "1.0.53",
-    "@discuzq/theme": "1.0.31",
+    "@discuzq/plugin-center": "2.0.15",
+    "@discuzq/sdk": "1.0.54",
+    "@discuzq/theme": "1.0.32",
     "@discuzq/vditor": "1.0.26",
     "@tarojs/components": "3.2.2",
     "@tarojs/react": "3.2.2",
diff --git a/web/package.json b/web/package.json
index f5e5c4dd6..10770802f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -16,12 +16,12 @@
     "sls:publish": "cd ./.sls && sls deploy"
   },
   "dependencies": {
-    "@discuzq/design": "1.1.3",
+    "@discuzq/design": "1.1.6",
     "@discuzq/discuz-babel-plugin-import": "0.0.1",
     "@discuzq/discuz-plugin-loader": "2.1.8",
-    "@discuzq/plugin-center": "2.0.14",
-    "@discuzq/sdk": "1.0.53",
-    "@discuzq/theme": "1.0.31",
+    "@discuzq/plugin-center": "2.0.15",
+    "@discuzq/sdk": "1.0.54",
+    "@discuzq/theme": "1.0.32",
     "@discuzq/vditor": "1.0.26",
     "@popperjs/core": "^2.10.1",
     "@sandstreamdev/react-swipeable-list": "^1.0.1",
-- 
Gitee


From e2b2c496fc7fd6bb05bcc78f9e6d352726f584ff Mon Sep 17 00:00:00 2001
From: v_zjxzzheng <v_zjxzzheng@tencent.com>
Date: Thu, 2 Dec 2021 16:05:20 +0800
Subject: [PATCH 20/22] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=A0=BC=E5=BC=8F=E4=B8=8D=E5=85=BC=E5=AE=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/utils/before-upload.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/utils/before-upload.js b/common/utils/before-upload.js
index f3665b874..509c3b8d7 100644
--- a/common/utils/before-upload.js
+++ b/common/utils/before-upload.js
@@ -29,9 +29,12 @@ export default function (cloneList, showFileList, type, site) {
 
     let isAllLegal = true; // 状态：此次上传图片是否全部合法
     cloneList.forEach((item, index) => {
-      const arr = item.name.split('.').pop();
-      const imageType = arr.toLocaleLowerCase();
-      const isLegalType = supportImgExt.toLocaleLowerCase().includes(imageType);
+      let imgType = item.imageType;
+      if (!imgType) {
+        const arr = item.name.split('.').pop();
+        imgType = arr.toLocaleLowerCase();
+      }
+      const isLegalType = supportImgExt.toLocaleLowerCase().includes(imgType);
 
       // 存在不合法图片时，从上传图片列表删除
       if (!isLegalType) {
-- 
Gitee


From 4834425a4414d8da53cd87515034ae9fdfe41937 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E5=8F=8C=E9=9A=86?= <18797662499@163.com>
Date: Wed, 8 Dec 2021 09:33:48 +0800
Subject: [PATCH 21/22] =?UTF-8?q?fix:=203795=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F-=E8=AF=84=E8=AE=BA=E8=AF=A6=E6=83=85=E9=A1=B5-?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E3=80=91=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E7=82=B9=E5=87=BB=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E6=97=A0=E6=B3=95=E6=8B=89=E8=B5=B7?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E3=80=81=E5=A4=8D=E5=88=B6=E7=9A=84=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=E5=8F=AA=E8=83=BD=E7=82=B9=E5=87=BB=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=84=E5=8F=B3=E8=BE=B9=E7=9A=84=E7=A9=BA=E7=99=BD?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9=E6=89=8D=E8=83=BD=E6=8B=89=E8=B5=B7?=
 =?UTF-8?q?=EF=BC=88iPhone11=20=E5=8F=96=E6=B6=88=E4=B8=89=E7=BA=A7@?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E5=9B=9E=E5=A4=8D=20http://bug.eims.com.cn/b?=
 =?UTF-8?q?ug-view-3795.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thread/components/reply-list/index.jsx    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/mini/src/layout/thread/components/reply-list/index.jsx b/mini/src/layout/thread/components/reply-list/index.jsx
index 1eb0db216..f0eb6e9b1 100644
--- a/mini/src/layout/thread/components/reply-list/index.jsx
+++ b/mini/src/layout/thread/components/reply-list/index.jsx
@@ -31,8 +31,9 @@ export default class ReplyList extends React.Component {
     typeof this.props.likeClick === 'function' && this.props.deleteClick();
   }
 
-  avatarClick(floor) {
+  avatarClick(e,floor) {
     typeof this.props.avatarClick === 'function' && this.props.avatarClick(floor);
+    e?.stopPropagation();
   }
 
   generatePermissions(data = {}) {
@@ -76,8 +77,8 @@ export default class ReplyList extends React.Component {
           <View className={styles.iconAt}>@</View>
           <View
             className={styles.replyedAvatar}
-            onClick={() => {
-              this.avatarClick(3);
+            onClick={(e) => {
+              this.avatarClick(e,3);
             }}
           >
             <Avatar
@@ -93,8 +94,8 @@ export default class ReplyList extends React.Component {
           </View>
           <Text
             className={styles.replyedUserName}
-            onClick={() => {
-              this.avatarClick(3);
+            onClick={(e) => {
+              this.avatarClick(e,3);
             }}
           >
             {this.props.data.commentUser.nickname || this.props.data.commentUser.userName || '用户异常'}
@@ -128,8 +129,8 @@ export default class ReplyList extends React.Component {
       <View className={styles.replyList} id={`position${this.props.data?.id}`}>
         <View
           className={styles.replyListAvatar}
-          onClick={() => {
-            this.avatarClick(2);
+          onClick={(e) => {
+            this.avatarClick(e,2);
           }}
         >
           <Avatar
@@ -147,8 +148,8 @@ export default class ReplyList extends React.Component {
               <View className={styles.userInfo}>
                 <View
                   className={styles.replyListName}
-                  onClick={() => {
-                    this.avatarClick(2);
+                  onClick={(e) => {
+                    this.avatarClick(e,2);
                   }}
                 >
                   <Text className={styles.replyListNameText}>{this.props.data?.user?.nickname || this.props.data?.user?.userName || '用户异常'}</Text>
-- 
Gitee


From 9c4b437a8ed5f44a3bfaf15f53fac2e188e5ea0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?zonewellhe=28=E8=B4=BA=E9=87=8D=E5=A8=81=29?=
 <zonewellhe@tencent.com>
Date: Wed, 8 Dec 2021 14:48:51 +0800
Subject: [PATCH 22/22] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E5=8F=91=E7=A7=81=E4=BF=A1=E7=82=B9=E5=87=BB=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/layout/thread/comment/pc/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/layout/thread/comment/pc/index.jsx b/web/layout/thread/comment/pc/index.jsx
index 7e1dd4dc2..d47953fb7 100644
--- a/web/layout/thread/comment/pc/index.jsx
+++ b/web/layout/thread/comment/pc/index.jsx
@@ -327,7 +327,7 @@ class CommentPCPage extends React.Component {
       return;
     }
 
-    const { userId, nickname } = this.props.comment?.authorInfo;
+    const { id: userId, nickname } = this.props.comment?.authorInfo;
     if (!userId) return;
     Router.push({ url: `/message?page=chat&userId=${userId}&nickname=${nickname}` });
   }
-- 
Gitee