feats

src/app.js

@@ -48,7 +48,7 @@ class App extends Component {
             Taro.setStorage({ key: 'sessionKey', data: x.sessionKey })
 
             // 埋点
-            this.updateTracing = trackUserSource(router, x.scene)
+            trackUserSource(router, x.scene).then(res => this.updateTracing = res)
           })
         }
       }

src/components/Spin/index.jsx

@@ -8,7 +8,8 @@ const inCenter = {
   display: 'block',
   width: '40vw',
   height: '40vw',
-  margin: '15vh auto'
+  margin: '15vh auto',
+  position: 'relative'
 }
 
 export default props => {
@@ -16,7 +17,7 @@ export default props => {
   const color = props.color || '#9e1068'
   const tipText = props.tips || 'LOADING'
   const cubeStyle = { backgroundColor: color }
-  const tipStyle = { color, textAlign: 'center', marginTop: '-18vh' }
+  const tipStyle = { color, textAlign: 'center', position: 'absolute', top: '45vw', left: 0, width: '100%' }
 
   return (
     <>

src/pages/ShouYe/index.config.js

@@ -1,4 +1,5 @@
 export default {
   navigationStyle: 'custom',
-  navigationBarTextStyle: 'white'
+  navigationBarTextStyle: 'white',
+  enableShareAppMessage: true
 }

src/pages/ShouYe/index.jsx

@@ -147,7 +147,8 @@ export default function Index (props) {
 
   // 分享转发
   Taro.useShareAppMessage(() => {
-    return getShareObject({ title: '远道智慧社区' }, user)
+    const shareObj = getShareObject({ title: '远道智慧社区' }, user)
+    return shareObj
   })
 
   return (
@@ -205,22 +206,6 @@ export default function Index (props) {
                     }
                   </view>
 
-                  {/* 热门活动 */}
-                  {
-                    propagandaList.length > 0 &&
-                    <view className='HotActivityContainer'>
-                      <view>
-                        <view className='Title'>
-                          <Text>热门活动</Text>
-                          <Text className='iconfont icongengduo'></Text>
-                        </view>
-                        <view className='Activity' onClick={() => nav2detail({type: propagandaList[0].contentType, id: propagandaList[0].targetId})}>
-                          <image className='centerLabel' mode='aspectFill' src={propagandaList[0].image}></image>
-                        </view>
-                      </view>
-                    </view>
-                  }
-
                   {/* 业主专区 */}
                   <view className='OwnerContainer'>
                     <view>
@@ -240,6 +225,21 @@ export default function Index (props) {
                     </view>
                   </view>
 
+                  {/* 热门活动 */}
+                  {
+                    propagandaList.length > 0 &&
+                    <view className='HotActivityContainer'>
+                      <view>
+                        {/* <view className='Title'>
+                          <Text>热门推荐</Text>
+                        </view> */}
+                        <view className='Activity' onClick={() => nav2detail({type: propagandaList[0].contentType, id: propagandaList[0].targetId})}>
+                          <image className='centerLabel' mode='aspectFill' src={propagandaList[0].image}></image>
+                        </view>
+                      </view>
+                    </view>
+                  }
+
                   {/* 热门资讯 */}
                   <view className='NewsContainer'>
                     <view>

src/pages/ShouYe/index.less

@@ -1,8 +1,12 @@
+
+@radius-large: 24rpx;
+@radius-middle: 16rpx;
+
 .ShouYe {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  background: #f8f8f8;
+  background: #f0f0f0;
 
   >view {
     position: relative;
@@ -43,15 +47,15 @@
               display: block;
               font-size: 30px;
               color: #fff;
-              margin-top: 20px;
               text-indent: 30px;
+              margin-bottom: 20px;
             }
 
             >.BannerContainer {
               padding: 0 30px;
               position: relative;
               overflow: hidden;
-              margin-top: 50px;
+              // margin-top: 50px;
 
               >view {
                 width: 100%;
@@ -59,7 +63,7 @@
                 overflow: hidden;
                 padding-bottom: 50%;
                 background: #f8f8f8;
-                border-radius: 24px;
+                border-radius: @radius-middle;
                 height: 0;
 
                 >view {
@@ -75,14 +79,14 @@
                     height: 100%;
                     position: relative;
                     overflow: hidden;
-                    border-radius: 24px;
+                    border-radius: @radius-middle;
 
                     .BannerItem {
                       width: 100%;
                       height: 100%;
                       position: relative;
                       overflow: hidden;
-                      border-radius: 24px;
+                      border-radius: @radius-middle;
 
                       image {
                         width: 100%;
@@ -99,7 +103,7 @@
               overflow: hidden;
               align-items: center;
               padding: 0 30px;
-              margin-top: 40px;
+              margin-top: 30px;
 
               >view {
                 margin-left: 30px;
@@ -177,7 +181,7 @@
                       font-size: 26px;
 
                       &:first-child {
-                        font-size: 50px;
+                        font-size: 64px;
                         line-height: 60px;
                         margin-bottom: 10px;
                       }
@@ -197,7 +201,7 @@
                 width: 100%;
                 position: relative;
                 overflow: hidden;
-                border-radius: 40px;
+                border-radius: @radius-large;
                 background: #fff;
 
                 >.Title {
@@ -216,7 +220,7 @@
                       font-size: 34px;
                       color: #333;
                       line-height: 40px;
-                      font-weight: bold;
+                      // font-weight: bold;
                       margin-right: 20px;
                     }
                   }
@@ -246,7 +250,7 @@
                 width: 100%;
                 position: relative;
                 overflow: hidden;
-                border-radius: 40px;
+                border-radius: @radius-large;
                 background: #fff;
 
                 >.Title {
@@ -265,7 +269,7 @@
                       font-size: 34px;
                       color: #333;
                       line-height: 40px;
-                      font-weight: bold;
+                      // font-weight: bold;
                       margin-right: 20px;
                     }
                   }
@@ -307,7 +311,7 @@
                 position: relative;
                 overflow: hidden;
                 background: #fff;
-                border-radius: 40px;
+                border-radius: @radius-large;
 
                 >.Title {
                   align-items: center;