Browse Source

no message

sys 1 year ago
parent
commit
03eecef4ee
4 changed files with 9 additions and 29 deletions
  1. 4 4
      pages/login/localPhoneLogin.vue
  2. 1 1
      pages/my/index.vue
  3. 1 1
      pages/my/set/blacklist.vue
  4. 3 23
      pages/wallet/bill.vue

+ 4 - 4
pages/login/localPhoneLogin.vue

@@ -1,6 +1,6 @@
 <template>
   <view>
-    <en-nav @navHeight="setNavHeight" ></en-nav>
+<!--    <en-nav @navHeight="setNavHeight" ></en-nav>-->
     <view class="login-box" v-show="isWap" :style="{'height':'calc(100vh - '+navHeight+'px)'}">
       <view class="login-top">
         <view class="login-title">
@@ -31,7 +31,7 @@ export default {
   components: {OtherLogin, LoginAgreement, EnNav},
   data() {
     return {
-      navHeight:40,
+      navHeight:0,
       isWap:false
     }
   },
@@ -40,7 +40,7 @@ export default {
       this.getPhoneNum()
     //#endif
 
-    //#ifndef APP-NVUE
+    //#ifdef H5
       this.isWap=true
     //#endif
 
@@ -185,7 +185,7 @@ export default {
 <style scoped lang="scss">
 
 .login-box{
-  padding: 82rpx 80rpx 0 80rpx;
+  padding: 162rpx 80rpx 0 80rpx;
   box-sizing: border-box;
   position: relative;
   .login-top{

+ 1 - 1
pages/my/index.vue

@@ -36,7 +36,7 @@
               </view>
             </view>
             <view class="content-statistics">
-              <view class="statistics-item" @click="goToUrl(4)">
+              <view class="statistics-item" @click="goToUrl(4)" v-if="false">
                 <view class="statistics-num sys-color-black sys-weight-600">{{memberInfo.mylikeCount}}
                   <view class="statistics-dot sys-color-white" v-show="memberInfo.newMylikeCount>0">{{memberInfo.newMylikeCount>99?'..':memberInfo.newMylikeCount}}</view>
                 </view>

+ 1 - 1
pages/my/set/blacklist.vue

@@ -92,7 +92,7 @@ export default {
       }
       this.isAjax=true
       let that=this
-      getBlackList({'pageNo':this.page,'pageSize':20}).then((res)=>{
+      getBlackList({'pageNo':this.page,'pageSize':'20'}).then((res)=>{
         this.isAjax=false
         if(res.code===0){
           res.data.data.forEach((item)=>{

+ 3 - 23
pages/wallet/bill.vue

@@ -80,38 +80,18 @@
         this.isAjax=false
         this.total=undefined
         this.page=1
-        if(this.navIndex===0){
-          this.getCashFlowHistoryPage()
-        }else {
-          this.getDailyEarnings()
-        }
+        this.getCashFlowHistoryPage()
 
 
       },
-      getDailyEarnings(){
-        if(this.isAjax){
-          return
-        }
-        this.isAjax=true
-        let that=this
-        getDailyEarnings({'pageNo':this.page,'pageSize':20,'month':this.fromData.time}).then((res)=>{
-          this.isAjax=false
-          if(res.code===0){
-            res.data.data.forEach((item)=>{
-              that.list.push(item )
-            })
-            ++that.page
-            that.total=res.data.total
-          }
-        })
-      },
+
       getCashFlowHistoryPage(){
         if(this.isAjax){
           return
         }
         this.isAjax=true
         let that=this
-        getCashFlowHistoryPage({'pageNo':this.page,'pageSize':20,'month':this.fromData.time}).then((res)=>{
+        getCashFlowHistoryPage({'pageNo':this.page,'pageSize':20,'type':this.navId,'month':this.fromData.time}).then((res)=>{
           this.isAjax=false
           if(res.code===0){
             res.data.data.forEach((item)=>{