Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/CompoentsOrder/complete/index.jsx

@@ -41,9 +41,12 @@ export default (props) => {
       pageSize: 10,
       ...(type !== undefined ? dict[type] : null),
     }).then((res) => {
-      setList(
-        pageNum === 1 ? res.records || [] : list.concat(res.records || [])
-      );
+      if (pageNum === 1) {
+        setList(res.records || [])
+      } else {
+        setList(res.records || [])
+      }
+
       setHasNextPage(res.current < res.pages);
       setLoading(false)
 

src/pages/MineUserAll/ContactMe/index.jsx

@@ -24,7 +24,7 @@ export default withLayout((props) => {
         content
       }).then(() => {
         Taro.showToast({
-          title: '我们已经收到亲亲的反馈了哟~',
+          title: '收到啦~',
           icon: 'success',
           duration: 1500
         }).then(
@@ -57,15 +57,10 @@ export default withLayout((props) => {
         <view className='weChate-image' >
           <Image mode='aspectFit' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210918145337.png' />
         </view>
-
         <view className='button-info'>
-
           <Button className='button-box' onClick={submit} loading={loading}  >提交</Button>
-
           <Button className='button-box-Cancel' onClick={back} >取消</Button>
-
         </view>
-
       </view>
     </view >
   )