Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/app.scss

@@ -23,12 +23,12 @@
   border-radius: 0;
   border:none;
 }
-.at-tabs-pane--active{
-  height: 100vh!important;
-  overflow: scroll;
-  padding-bottom: 100px;
+// .at-tabs-pane--active{
+//   height: 100vh!important;
+//   overflow: scroll;
+//   padding-bottom: 100px;
 
-}
+// }
 @keyframes fadeBottomIn {
   0% {
     transform: translateY(10%);

src/pages/activity/index.js

@@ -134,6 +134,7 @@ export default class Index extends Component {
     return (
       <ListView
         className="wrap"
+        style="height: calc(100vh - 118rpx);"
         needInit
         isEmpty={isEmpty}
         emptyText="暂无活动~"

src/pages/activity/index.scss

@@ -31,3 +31,9 @@
   }
 
 }
+.at-tabs-pane--active{
+  height: 100vh!important;
+  overflow: scroll;
+  padding-bottom: 100px;
+
+}

src/pages/news/index.js

@@ -115,6 +115,7 @@ export default class Index extends Component {
     return (
       <ListView
         className="wrap"
+        style="height: calc(100vh - 118rpx);"
         needInit
         isEmpty={isEmpty}
         emptyText="暂无资讯~"

src/pages/person/spread/index.js

@@ -78,7 +78,7 @@ export default class Index extends Component {
       <Block>
         {/* 生成海报 */}
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
-        <View className='page'>
+        <View className='spread-page'>
           <View className='spread-code'>
             <View className='spread-code-head'>
               <Image src={avatarurl} className='spread-code-head_img'></Image>

src/pages/person/spread/index.scss

@@ -1,8 +1,8 @@
 @import "@/styles/theme.scss";
-.page {
+.spread-page {
   position: relative;
   width: 100%;
-  height: 100%;
+  height: 100vh;
   background: #f0f0f0;
 }
 .spread-code {

src/pages/shop/index.scss

@@ -156,7 +156,12 @@
     font-weight: bold;
   }
 }
+.at-tabs-pane--active{
+  height: 100vh!important;
+  overflow: scroll;
+  padding-bottom: 100px;
 
+}
 .list__wrap {
   margin-top: 20px;
   overflow: hidden;

src/useless/pages/person/customerAnalysis/followUpCustomer/index.js

@@ -284,6 +284,7 @@ export default class followUpCustomer extends Taro.Component {
         <View style="padding:0 10px 10px 10px">
           <ListView
             className="wrap"
+            style="height: calc(100vh - 234rpx)"
             needInit
             isEmpty={isEmpty}
             emptyText="暂无跟进客户~"

src/useless/pages/person/customerAnalysis/index.scss

@@ -3,7 +3,7 @@
 .wrap {
   background: white;
   position: relative;
-  height:100vh;
+  // height:100vh;
 }
 .my-customer{
   flex: 0 0 50%;
@@ -55,6 +55,9 @@
   
   }
 }
+.at-tabs{
+  height: 100vh;
+}
 .tab-box{
   .at-tabs__header{
     width: 86%;

src/useless/pages/person/customerAnalysis/transactionCustomer/index.js

@@ -115,6 +115,7 @@ export default class transactionCustomer extends Taro.Component {
       <View style="padding:0 10px 10px 10px">
         <ListView
           className="wrap"
+          style="height: calc(100vh - 78rpx)"
           needInit
           isEmpty={isEmpty}
           emptyText="暂无成交客户~"