Browse Source

mod 顶部导航

panqiuyao 1 year ago
parent
commit
1f31d667c1
100 changed files with 242 additions and 228 deletions
  1. 2 0
      .gitignore
  2. 1 1
      manifest.json
  3. 13 1
      pages/TitleHeader.vue
  4. 1 1
      pages/home/activity/Activitydetail.vue
  5. 2 2
      pages/home/activity/Activitylist.vue
  6. 2 2
      pages/home/article/Articleclass.vue
  7. 1 1
      pages/home/article/Articledetail.vue
  8. 3 3
      pages/home/article/Articlelist.vue
  9. 1 1
      pages/home/article/Document.vue
  10. 1 1
      pages/home/bargain/Bargainlist.vue
  11. 1 1
      pages/home/brand/Brand.vue
  12. 4 4
      pages/home/common/HomeCommonSearch.vue
  13. 1 1
      pages/home/goodsclass/GoodsclassBody.vue
  14. 1 1
      pages/home/goodsdetail/ChainList.vue
  15. 1 1
      pages/home/goodsdetail/DetailBody.vue
  16. 1 1
      pages/home/goodsdetail/DetailHeader.vue
  17. 1 1
      pages/home/goodsdetail/GoodsConsult.vue
  18. 7 7
      pages/home/goodsdetail/GoodsEvaluation.vue
  19. 2 2
      pages/home/goodsdetail/GoodsVideo.vue
  20. 1 1
      pages/home/goodsdetail/child/Shopping.vue
  21. 3 3
      pages/home/goodsdetail/child/Translate.vue
  22. 3 3
      pages/home/goodslist/Goodslist.vue
  23. 1 1
      pages/home/groupbuy/GroupBuyList.vue
  24. 1 1
      pages/home/map/Map.vue
  25. 3 3
      pages/home/marketmanage/Marketmanagelist.vue
  26. 1 1
      pages/home/memberbind/Bind.vue
  27. 1 1
      pages/home/memberforget/Forget.vue
  28. 3 3
      pages/home/memberlogin/Login.vue
  29. 1 1
      pages/home/memberregister/Register.vue
  30. 1 1
      pages/home/pintuan/PintuanList.vue
  31. 1 1
      pages/home/pointsgoods/DetailBody.vue
  32. 2 2
      pages/home/pointsgoods/DetailHeader.vue
  33. 1 1
      pages/home/pointsgoods/PointMallVoucher.vue
  34. 1 1
      pages/home/pointsgoods/PointProd.vue
  35. 1 1
      pages/home/pointsgoods/PointVoucher.vue
  36. 1 1
      pages/home/presell/PresellList.vue
  37. 2 2
      pages/home/storeabout/Storeabout.vue
  38. 1 1
      pages/home/storeclass/Storeclass.vue
  39. 1 1
      pages/home/storedetail/StoreVoucher.vue
  40. 2 2
      pages/home/storedetail/Storemap.vue
  41. 3 3
      pages/home/storegoodsclass/GoodsclassBody.vue
  42. 6 6
      pages/home/vrgroupbuy/GroupBuyList.vue
  43. 3 3
      pages/member/account/Account.vue
  44. 1 1
      pages/member/address/AddressForm.vue
  45. 1 1
      pages/member/address/AddressList.vue
  46. 6 6
      pages/member/address/ChainForm.vue
  47. 2 2
      pages/member/arrivalnotice/Arrivalnotice.vue
  48. 14 14
      pages/member/auth/Auth.vue
  49. 1 1
      pages/member/bank/BankForm.vue
  50. 1 1
      pages/member/bank/BankList.vue
  51. 1 1
      pages/member/bargain/Bargainlist.vue
  52. 2 2
      pages/member/bonusreceive/Bonusreceive.vue
  53. 1 1
      pages/member/browse/BrowseList.vue
  54. 2 2
      pages/member/buy/child/CheckoutStore.vue
  55. 8 8
      pages/member/buy/pay.vue
  56. 13 13
      pages/member/buy/step1.vue
  57. 1 1
      pages/member/cart/child/CartHeader.vue
  58. 9 9
      pages/member/cart/child/CartList.vue
  59. 2 2
      pages/member/chat/ChatInfo.vue
  60. 1 1
      pages/member/chat/ChatList.vue
  61. 2 2
      pages/member/complaint/ComplaintForm.vue
  62. 2 2
      pages/member/complaint/ComplaintList.vue
  63. 2 2
      pages/member/consult/ConsultList.vue
  64. 2 2
      pages/member/evaluate/EvaluateList.vue
  65. 1 1
      pages/member/favorite/Favorite.vue
  66. 2 2
      pages/member/feedback/Feedback.vue
  67. 6 6
      pages/member/friend/FriendList.vue
  68. 7 7
      pages/member/inform/InformForm.vue
  69. 2 2
      pages/member/inform/InformList.vue
  70. 7 7
      pages/member/inviter/InviterManage.vue
  71. 1 1
      pages/member/inviter/InviterOrder.vue
  72. 1 1
      pages/member/inviter/InviterUser.vue
  73. 1 1
      pages/member/invoice/InvoiceForm.vue
  74. 1 1
      pages/member/invoice/InvoiceList.vue
  75. 3 3
      pages/member/live/LiveList.vue
  76. 8 8
      pages/member/mallvoucher/MallVoucherList.vue
  77. 2 2
      pages/member/marketmanagelog/Marketmanagelog.vue
  78. 2 2
      pages/member/notice/NoticeList.vue
  79. 1 1
      pages/member/order/OrderDeliver.vue
  80. 1 1
      pages/member/order/OrderDetail.vue
  81. 2 2
      pages/member/order/OrderEvaluate.vue
  82. 2 2
      pages/member/order/OrderList.vue
  83. 1 1
      pages/member/orderreturn/Orderreturn.vue
  84. 3 3
      pages/member/point/PointList.vue
  85. 1 1
      pages/member/point/PointSignin.vue
  86. 1 1
      pages/member/pointsbuy/step1.vue
  87. 1 1
      pages/member/pointscart/child/CartHeader.vue
  88. 1 1
      pages/member/pointscart/child/CartList.vue
  89. 1 1
      pages/member/pointsorder/OrderDetail.vue
  90. 2 2
      pages/member/pointsorder/OrderList.vue
  91. 2 2
      pages/member/predeposit/PredepositList.vue
  92. 2 2
      pages/member/predeposit/RechargeCardList.vue
  93. 2 2
      pages/member/profile/ProfileSet.vue
  94. 2 2
      pages/member/recharge/RechargeList.vue
  95. 2 2
      pages/member/refund/RefundForm.vue
  96. 2 2
      pages/member/refund/RefundList.vue
  97. 1 1
      pages/member/refund/RefundView.vue
  98. 1 1
      pages/member/return/ReturnForm.vue
  99. 2 2
      pages/member/return/ReturnList.vue
  100. 1 1
      pages/member/return/ReturnSend.vue

+ 2 - 0
.gitignore

@@ -1 +1,3 @@
 unpackage/
 unpackage/
+/unpackage/
+/unpackage

+ 1 - 1
manifest.json

@@ -1,6 +1,6 @@
 {
 {
     "name" : "云咖交易",
     "name" : "云咖交易",
-    "appid" : "__UNI__BDAA79C",
+    "appid" : "__UNI__DC6E20E",
     "description" : "",
     "description" : "",
     "versionName" : "3.0.3",
     "versionName" : "3.0.3",
     "versionCode" : 303,
     "versionCode" : 303,

+ 13 - 1
pages/TitleHeader.vue

@@ -33,7 +33,19 @@
     },
     },
     mounted: function() {
     mounted: function() {
       // #ifdef  MP-WEIXIN
       // #ifdef  MP-WEIXIN
-      this.navHeight = uni.getMenuButtonBoundingClientRect().height+7
+	  
+	  switch (uni.getSystemInfoSync().platform) {
+	  	case 'android':
+		this.navHeight = uni.getMenuButtonBoundingClientRect().top + 7 
+	  		break;
+	  	case 'ios':
+		this.navHeight = uni.getMenuButtonBoundingClientRect().top - 40
+	  		break;
+	  	default:
+		this.navHeight = uni.getMenuButtonBoundingClientRect().top + 7 
+	  		break;
+	  }
+      
       // #endif
       // #endif
     },
     },
   }
   }

+ 1 - 1
pages/home/activity/Activitydetail.vue

@@ -82,7 +82,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 2 - 2
pages/home/activity/Activitylist.vue

@@ -7,7 +7,7 @@
           <view class="common-header-fixed">
           <view class="common-header-fixed">
             <title-header />
             <title-header />
             <uni-nav-bar title="活动列表" class="common-header" left-icon="back" @clickLeft="goBack()">
             <uni-nav-bar title="活动列表" class="common-header" left-icon="back" @clickLeft="goBack()">
-            </uni-nav-bar> 
+            </uni-nav-bar>
           </view>
           </view>
         </view>
         </view>
 		<view class="scroll-view div" style="position:relative">
 		<view class="scroll-view div" style="position:relative">
@@ -77,7 +77,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 2 - 2
pages/home/article/Articleclass.vue

@@ -6,7 +6,7 @@
           <view class="common-header-fixed">
           <view class="common-header-fixed">
             <title-header />
             <title-header />
             <uni-nav-bar title="文章分类" class="common-header" left-icon="back" @clickLeft="goBack()">
             <uni-nav-bar title="文章分类" class="common-header" left-icon="back" @clickLeft="goBack()">
-            </uni-nav-bar> 
+            </uni-nav-bar>
           </view>
           </view>
         </view>
         </view>
         <view class="div class-list">
         <view class="div class-list">
@@ -38,7 +38,7 @@ export default {
   name: 'Articleclass',
   name: 'Articleclass',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/home/article/Articledetail.vue

@@ -24,7 +24,7 @@ export default {
   name:'HomeDocument',
   name:'HomeDocument',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 3 - 3
pages/home/article/Articlelist.vue

@@ -6,8 +6,8 @@
           <view class="common-header-holder"></view>
           <view class="common-header-holder"></view>
           <view class="common-header-fixed">
           <view class="common-header-fixed">
             <title-header />
             <title-header />
-            <uni-nav-bar :title="article_type_name" class="common-header" left-icon="back" @clickLeft="goBack()">    
-            </uni-nav-bar> 
+            <uni-nav-bar :title="article_type_name" class="common-header" left-icon="back" @clickLeft="goBack()">
+            </uni-nav-bar>
           </view>
           </view>
         </view>
         </view>
 		<view class="scroll-view div" style="position:relative">
 		<view class="scroll-view div" style="position:relative">
@@ -39,7 +39,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/home/article/Document.vue

@@ -24,7 +24,7 @@ export default {
   name:'HomeDocument',
   name:'HomeDocument',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/home/bargain/Bargainlist.vue

@@ -101,7 +101,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/home/brand/Brand.vue

@@ -44,7 +44,7 @@ export default {
   name: 'Brand',
   name: 'Brand',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 4 - 4
pages/home/common/HomeCommonSearch.vue

@@ -15,11 +15,11 @@
           <input v-else type="text" placeholder="请输入您要搜索的商品" readonly="true" autocomplete="off" v-model="keyword" @click="onSearch">
           <input v-else type="text" placeholder="请输入您要搜索的商品" readonly="true" autocomplete="off" v-model="keyword" @click="onSearch">
         </view>
         </view>
         <view class="div right iconfont popup-menu-area" @click="popupMore">&#xe680;<view v-if="showDot" class="div dot"></view></view>
         <view class="div right iconfont popup-menu-area" @click="popupMore">&#xe680;<view v-if="showDot" class="div dot"></view></view>
-        
+
       </view>
       </view>
     </view>
     </view>
     <header-more v-show="popupVisible" @blur.native="popupVisible = false" :showDot="showDot"></header-more>
     <header-more v-show="popupVisible" @blur.native="popupVisible = false" :showDot="showDot"></header-more>
-    
+
   </view>
   </view>
 </template>
 </template>
 
 
@@ -54,12 +54,12 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     var pages = getCurrentPages()
     var pages = getCurrentPages()
     var page = pages[pages.length - 1]
     var page = pages[pages.length - 1]
     this.query = page.options
     this.query = page.options
-    
+
     if (this.isOnline) {
     if (this.isOnline) {
       getChatCount().then(res => {
       getChatCount().then(res => {
         if (res.result) {
         if (res.result) {

+ 1 - 1
pages/home/goodsclass/GoodsclassBody.vue

@@ -76,7 +76,7 @@ export default {
   },
   },
   mounted: function() {
   mounted: function() {
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
   },
   },
 }
 }

+ 1 - 1
pages/home/goodsdetail/ChainList.vue

@@ -59,7 +59,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     uni.getLocation({
     uni.getLocation({
         type: 'gcj02',
         type: 'gcj02',

+ 1 - 1
pages/home/goodsdetail/DetailBody.vue

@@ -45,7 +45,7 @@ export default {
 
 
   mounted: function() {
   mounted: function() {
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
   },
   },
 
 

+ 1 - 1
pages/home/goodsdetail/DetailHeader.vue

@@ -67,7 +67,7 @@ export default {
   },
   },
   mounted () {
   mounted () {
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     var pages = getCurrentPages()
     var pages = getCurrentPages()
       var page = pages[pages.length - 1]
       var page = pages[pages.length - 1]

+ 1 - 1
pages/home/goodsdetail/GoodsConsult.vue

@@ -110,7 +110,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
       // #ifdef  MP-WEIXIN
       // #ifdef  MP-WEIXIN
-      this.navHeight = uni.getMenuButtonBoundingClientRect().height
+      this.navHeight = uni.getMenuButtonBoundingClientRect().top
       // #endif
       // #endif
       this.screenWidth=uni.getSystemInfoSync().screenWidth
       this.screenWidth=uni.getSystemInfoSync().screenWidth
     // this.changePictureCode()
     // this.changePictureCode()

+ 7 - 7
pages/home/goodsdetail/GoodsEvaluation.vue

@@ -10,7 +10,7 @@
         </uni-nav-bar>
         </uni-nav-bar>
     </view>
     </view>
     </view>
     </view>
-    
+
     <view class="scroll-view-wrapper div ui-evaluation" style="height:100%">
     <view class="scroll-view-wrapper div ui-evaluation" style="height:100%">
     	<view class="div ui-evaluation-header">
     	<view class="div ui-evaluation-header">
     		<view class="div flex-header">
     		<view class="div flex-header">
@@ -50,7 +50,7 @@
     						>{{ getGrade(item.geval_scores) }}</view
     						>{{ getGrade(item.geval_scores) }}</view
     					>
     					>
     				</view>
     				</view>
-    
+
     				<text class="span">{{ getTime(item.geval_addtime) }}</text>
     				<text class="span">{{ getTime(item.geval_addtime) }}</text>
     			</view>
     			</view>
     			<view class="p" v-if="item.geval_content">{{ item.geval_content }}</view>
     			<view class="p" v-if="item.geval_content">{{ item.geval_content }}</view>
@@ -72,7 +72,7 @@
     		<image mode="aspectFit" class="img" :src="showimage" :style="getBannerStyle" @click="hidePopup('isshow')">
     		<image mode="aspectFit" class="img" :src="showimage" :style="getBannerStyle" @click="hidePopup('isshow')">
     	</uni-popup>
     	</uni-popup>
     </view>
     </view>
-    
+
 </view></home-base>
 </view></home-base>
 </template>
 </template>
 
 
@@ -126,7 +126,7 @@ export default {
 	},
 	},
 	mounted(){
 	mounted(){
 	    // #ifdef  MP-WEIXIN
 	    // #ifdef  MP-WEIXIN
-	    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+	    this.navHeight = uni.getMenuButtonBoundingClientRect().top
 	    // #endif
 	    // #endif
 	    this.screenWidth=uni.getSystemInfoSync().screenWidth
 	    this.screenWidth=uni.getSystemInfoSync().screenWidth
 	  // this.changePictureCode()
 	  // this.changePictureCode()
@@ -147,7 +147,7 @@ export default {
       if(this.loading){
       if(this.loading){
         return
         return
       }
       }
-      
+
       this.loading = true
       this.loading = true
       if (this.hasmore) {
       if (this.hasmore) {
         this.page = ++this.page
         this.page = ++this.page
@@ -297,7 +297,7 @@ export default {
 			}
 			}
       .explain{color:orange}
       .explain{color:orange}
 		}
 		}
-		
+
 	}
 	}
   .list-empty {
   .list-empty {
   	position: absolute;
   	position: absolute;
@@ -325,4 +325,4 @@ export default {
 		}
 		}
 	}
 	}
 }
 }
-</style>
+</style>

+ 2 - 2
pages/home/goodsdetail/GoodsVideo.vue

@@ -24,7 +24,7 @@ export default {
   name:'HomeGoodsVideo',
   name:'HomeGoodsVideo',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){
@@ -73,5 +73,5 @@ export default {
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
-    
+
 </style>
 </style>

+ 1 - 1
pages/home/goodsdetail/child/Shopping.vue

@@ -267,7 +267,7 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     const res = uni.getSystemInfoSync()
     const res = uni.getSystemInfoSync()
     this.screenWidth = res.windowWidth
     this.screenWidth = res.windowWidth

+ 3 - 3
pages/home/goodsdetail/child/Translate.vue

@@ -39,7 +39,7 @@ export default {
 
 
 
 
   created () {
   created () {
-	  
+
   },
   },
 
 
   computed: {
   computed: {
@@ -61,7 +61,7 @@ export default {
   },
   },
   mounted () {
   mounted () {
       // #ifdef  MP-WEIXIN
       // #ifdef  MP-WEIXIN
-      this.navHeight = uni.getMenuButtonBoundingClientRect().height
+      this.navHeight = uni.getMenuButtonBoundingClientRect().top
       // #endif
       // #endif
       const res = uni.getSystemInfoSync()
       const res = uni.getSystemInfoSync()
       this.screenHeight = res.windowHeight
       this.screenHeight = res.windowHeight
@@ -126,6 +126,6 @@ export default {
             }
             }
         }
         }
     }
     }
-    
+
 
 
 </style>
 </style>

+ 3 - 3
pages/home/goodslist/Goodslist.vue

@@ -41,11 +41,11 @@ export default {
     this.keyword=option.keywords ? option.keywords : ''
     this.keyword=option.keywords ? option.keywords : ''
   },
   },
   mounted: function() {
   mounted: function() {
-    // #ifdef  MP-WEIXIN 
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    // #ifdef  MP-WEIXIN
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     // #ifdef APP-PLUS
     // #ifdef APP-PLUS
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
   },
   },
 }
 }

+ 1 - 1
pages/home/groupbuy/GroupBuyList.vue

@@ -160,7 +160,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.screenWidth=uni.getSystemInfoSync().screenWidth
   },
   },

+ 1 - 1
pages/home/map/Map.vue

@@ -39,7 +39,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   created: function () {
   created: function () {

+ 3 - 3
pages/home/marketmanage/Marketmanagelist.vue

@@ -42,7 +42,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{
@@ -76,7 +76,7 @@ export default {
       this.loading = true
       this.loading = true
       this.params.page = ++this.params.page
       this.params.page = ++this.params.page
       if (this.isMore) {
       if (this.isMore) {
-        
+
         this.getMarketmanageList(true)
         this.getMarketmanageList(true)
       }
       }
     },
     },
@@ -131,7 +131,7 @@ export default {
                     margin-top: .5rem;
                     margin-top: .5rem;
                     border-bottom: 1px dotted #ded6c9;
                     border-bottom: 1px dotted #ded6c9;
                     .p{
                     .p{
-                        font-size:$fontSize;     
+                        font-size:$fontSize;
                     }
                     }
 }
 }
 </style>
 </style>

+ 1 - 1
pages/home/memberbind/Bind.vue

@@ -51,7 +51,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 1 - 1
pages/home/memberforget/Forget.vue

@@ -47,7 +47,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 3 - 3
pages/home/memberlogin/Login.vue

@@ -234,7 +234,7 @@ import {getFontSize} from '@/util/common'
     },
     },
     mounted(){
     mounted(){
       // #ifdef  MP-WEIXIN
       // #ifdef  MP-WEIXIN
-      this.navHeight = uni.getMenuButtonBoundingClientRect().height
+      this.navHeight = uni.getMenuButtonBoundingClientRect().top
       // #endif
       // #endif
       let isTokenInvalid = this.isTokenInvalid
       let isTokenInvalid = this.isTokenInvalid
       if (isTokenInvalid) {
       if (isTokenInvalid) {
@@ -463,7 +463,7 @@ import {getFontSize} from '@/util/common'
         if (referrer) { // 返回之前的页面
         if (referrer) { // 返回之前的页面
           referrer = decodeURIComponent(referrer)
           referrer = decodeURIComponent(referrer)
         }
         }
-        // #ifdef H5  
+        // #ifdef H5
         let ref = encodeURIComponent(referrer)
         let ref = encodeURIComponent(referrer)
         wechatLogin(ref?ref:'', this.inviter_id).then(res => {
         wechatLogin(ref?ref:'', this.inviter_id).then(res => {
           window.location.href = res.result
           window.location.href = res.result
@@ -516,7 +516,7 @@ import {getFontSize} from '@/util/common'
                   title: error.message
                   title: error.message
                 })
                 })
             })
             })
-            
+
           },
           },
           fail: function(err) {
           fail: function(err) {
             uni.showToast({
             uni.showToast({

+ 1 - 1
pages/home/memberregister/Register.vue

@@ -58,7 +58,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 1 - 1
pages/home/pintuan/PintuanList.vue

@@ -89,7 +89,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/home/pointsgoods/DetailBody.vue

@@ -40,7 +40,7 @@ export default {
 	},
 	},
   mounted: function() {
   mounted: function() {
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
   },
   },
 
 

+ 2 - 2
pages/home/pointsgoods/DetailHeader.vue

@@ -16,7 +16,7 @@
     	</view>
     	</view>
     </view>
     </view>
   </view>
   </view>
-	
+
 </template>
 </template>
 
 
 <script>
 <script>
@@ -36,7 +36,7 @@ export default {
   },
   },
   mounted () {
   mounted () {
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
   },
   },
 
 

+ 1 - 1
pages/home/pointsgoods/PointMallVoucher.vue

@@ -38,7 +38,7 @@ export default {
   name: 'index',
   name: 'index',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/home/pointsgoods/PointProd.vue

@@ -33,7 +33,7 @@ export default {
   name: 'index',
   name: 'index',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/home/pointsgoods/PointVoucher.vue

@@ -31,7 +31,7 @@ export default {
   name: 'index',
   name: 'index',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/home/presell/PresellList.vue

@@ -90,7 +90,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 2 - 2
pages/home/storeabout/Storeabout.vue

@@ -97,7 +97,7 @@ export default {
   name: 'Storeabout',
   name: 'Storeabout',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){
@@ -186,7 +186,7 @@ export default {
         uni.makePhoneCall({
         uni.makePhoneCall({
             phoneNumber:store_phone
             phoneNumber:store_phone
         })
         })
-        
+
     },
     },
     toggleFavorite () {
     toggleFavorite () {
       if (!this.store.is_favorate) {
       if (!this.store.is_favorate) {

+ 1 - 1
pages/home/storeclass/Storeclass.vue

@@ -36,7 +36,7 @@ export default {
   name: 'Storeclass',
   name: 'Storeclass',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/home/storedetail/StoreVoucher.vue

@@ -29,7 +29,7 @@ export default {
   name:'HomeStoreVoucher',
   name:'HomeStoreVoucher',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 2 - 2
pages/home/storedetail/Storemap.vue

@@ -27,7 +27,7 @@ import { getStoreInfo,getStoreMap } from '../../../api/homestoredetail'
 export default {
 export default {
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){
@@ -85,7 +85,7 @@ export default {
     getUrl: function () {
     getUrl: function () {
       if (this.d_lat && this.d_lng && this.o_lat && this.o_lng) {
       if (this.d_lat && this.d_lng && this.o_lat && this.o_lng) {
         getStoreMap({region:this.store.area_info,o_lng:this.o_lng,o_lat:this.o_lat,o_name:'我',d_lng:this.d_lng,d_lat:this.d_lat,d_name:this.store.store_name}).then(res=>{
         getStoreMap({region:this.store.area_info,o_lng:this.o_lng,o_lat:this.o_lat,o_name:'我',d_lng:this.d_lng,d_lat:this.d_lat,d_name:this.store.store_name}).then(res=>{
-          
+
           this.iframeUrl = res.result.url
           this.iframeUrl = res.result.url
           console.log(this.iframeUrl)
           console.log(this.iframeUrl)
         }).catch(error=>{
         }).catch(error=>{

+ 3 - 3
pages/home/storegoodsclass/GoodsclassBody.vue

@@ -38,7 +38,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     var pages = getCurrentPages()
     var pages = getCurrentPages()
     var page = pages[pages.length - 1]
     var page = pages[pages.length - 1]
@@ -125,8 +125,8 @@ export default {
 			}
 			}
 		}
 		}
 	  }
 	  }
-      
-	  
+
+
     }
     }
   }
   }
 </style>
 </style>

+ 6 - 6
pages/home/vrgroupbuy/GroupBuyList.vue

@@ -157,15 +157,15 @@ export default {
     this.loadMore()
     this.loadMore()
   },
   },
   mounted(){
   mounted(){
-  
+
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-  
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
-  
+
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
+
     // #endif
     // #endif
-  
+
     this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.screenWidth=uni.getSystemInfoSync().screenWidth
-  
+
   },
   },
   methods:{
   methods:{
     showPopup(id){
     showPopup(id){

+ 3 - 3
pages/member/account/Account.vue

@@ -97,7 +97,7 @@ export default {
 
 
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
 
 
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
 
 
   // #endif
   // #endif
 
 
@@ -133,7 +133,7 @@ export default {
      .available_predeposit{
      .available_predeposit{
        font-size:1.5rem;
        font-size:1.5rem;
      }
      }
- 
+
    }
    }
    .amount-wrapper{
    .amount-wrapper{
      margin-top: 1.5rem;
      margin-top: 1.5rem;
@@ -205,7 +205,7 @@ export default {
  .account{
  .account{
    padding: 0 $pageSpace;
    padding: 0 $pageSpace;
    background: #fff;
    background: #fff;
- 
+
    .menu{
    .menu{
      background: #fff;
      background: #fff;
    }
    }

+ 1 - 1
pages/member/address/AddressForm.vue

@@ -84,7 +84,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 1 - 1
pages/member/address/AddressList.vue

@@ -78,7 +78,7 @@ export default {
   name:'MemberAddressList',
   name:'MemberAddressList',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 6 - 6
pages/member/address/ChainForm.vue

@@ -146,15 +146,15 @@ export default {
   this.loadMore()
   this.loadMore()
   },
   },
   mounted(){
   mounted(){
-  
+
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-  
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
-  
+
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
+
     // #endif
     // #endif
-  
+
     this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.screenWidth=uni.getSystemInfoSync().screenWidth
-  
+
   },
   },
   methods:{
   methods:{
     switchChange(e){
     switchChange(e){

+ 2 - 2
pages/member/arrivalnotice/Arrivalnotice.vue

@@ -65,9 +65,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   methods:{
   methods:{
     goBack () {
     goBack () {

+ 14 - 14
pages/member/auth/Auth.vue

@@ -24,9 +24,9 @@
                     <view class="div user-avatar">
                     <view class="div user-avatar">
                       <uni-file-picker
                       <uni-file-picker
                         class="common-avatar"
                         class="common-avatar"
-                        v-model="imageValue['member_idcard_image1']" 
-                        fileMediatype="image" 
-                        mode="grid" 
+                        v-model="imageValue['member_idcard_image1']"
+                        fileMediatype="image"
+                        mode="grid"
                         :readonly="user.member_auth_state==1 || user.member_auth_state==3"
                         :readonly="user.member_auth_state==1 || user.member_auth_state==3"
                         :limit="1"
                         :limit="1"
                         :auto-upload="false"
                         :auto-upload="false"
@@ -34,7 +34,7 @@
                         width:'200px',
                         width:'200px',
                         height:'160px',
                         height:'160px',
                         }"
                         }"
-                        @select="uploadInformPic('member_idcard_image1',$event)" 
+                        @select="uploadInformPic('member_idcard_image1',$event)"
                         @delete="dropImage('member_idcard_image1')"
                         @delete="dropImage('member_idcard_image1')"
                       >
                       >
                       </uni-file-picker>
                       </uni-file-picker>
@@ -48,9 +48,9 @@
                     <view class="div user-avatar">
                     <view class="div user-avatar">
                       <uni-file-picker
                       <uni-file-picker
                             class="common-avatar"
                             class="common-avatar"
-                            v-model="imageValue['member_idcard_image2']" 
-                            fileMediatype="image" 
-                            mode="grid" 
+                            v-model="imageValue['member_idcard_image2']"
+                            fileMediatype="image"
+                            mode="grid"
                             :readonly="user.member_auth_state==1 || user.member_auth_state==3"
                             :readonly="user.member_auth_state==1 || user.member_auth_state==3"
                             :limit="1"
                             :limit="1"
                             :auto-upload="false"
                             :auto-upload="false"
@@ -58,7 +58,7 @@
                             width:'200px',
                             width:'200px',
                             height:'160px',
                             height:'160px',
                             }"
                             }"
-                            @select="uploadInformPic('member_idcard_image2',$event)" 
+                            @select="uploadInformPic('member_idcard_image2',$event)"
                             @delete="dropImage('member_idcard_image2')"
                             @delete="dropImage('member_idcard_image2')"
                           >
                           >
                           </uni-file-picker>
                           </uni-file-picker>
@@ -72,9 +72,9 @@
                     <view class="div user-avatar">
                     <view class="div user-avatar">
                       <uni-file-picker
                       <uni-file-picker
                             class="common-avatar"
                             class="common-avatar"
-                            v-model="imageValue['member_idcard_image3']" 
-                            fileMediatype="image" 
-                            mode="grid" 
+                            v-model="imageValue['member_idcard_image3']"
+                            fileMediatype="image"
+                            mode="grid"
                             :readonly="user.member_auth_state==1 || user.member_auth_state==3"
                             :readonly="user.member_auth_state==1 || user.member_auth_state==3"
                             :limit="1"
                             :limit="1"
                             :auto-upload="false"
                             :auto-upload="false"
@@ -82,7 +82,7 @@
                             width:'200px',
                             width:'200px',
                             height:'160px',
                             height:'160px',
                             }"
                             }"
-                            @select="uploadInformPic('member_idcard_image3',$event)" 
+                            @select="uploadInformPic('member_idcard_image3',$event)"
                             @delete="dropImage('member_idcard_image3')"
                             @delete="dropImage('member_idcard_image3')"
                           >
                           >
                           </uni-file-picker>
                           </uni-file-picker>
@@ -141,7 +141,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     const res = uni.getSystemInfoSync()
     const res = uni.getSystemInfoSync()
     this.screenWidth = res.windowWidth
     this.screenWidth = res.windowWidth
@@ -263,7 +263,7 @@ export default {
           name:index,
           name:index,
           id:index
           id:index
         }
         }
-        
+
         uploadAuth(formdata).then(res => {
         uploadAuth(formdata).then(res => {
           this.user[index + '_url'] = res.result.file_path
           this.user[index + '_url'] = res.result.file_path
           this.imageValue[index]=[{
           this.imageValue[index]=[{

+ 1 - 1
pages/member/bank/BankForm.vue

@@ -68,7 +68,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 1 - 1
pages/member/bank/BankList.vue

@@ -63,7 +63,7 @@ export default {
   name:'MemberBankList',
   name:'MemberBankList',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 1 - 1
pages/member/bargain/Bargainlist.vue

@@ -60,7 +60,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 2 - 2
pages/member/bonusreceive/Bonusreceive.vue

@@ -70,9 +70,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   methods: {
   methods: {
     goBack () {
     goBack () {

+ 1 - 1
pages/member/browse/BrowseList.vue

@@ -50,7 +50,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 2 - 2
pages/member/buy/child/CheckoutStore.vue

@@ -182,7 +182,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.screenWidth=uni.getSystemInfoSync().screenWidth
   },
   },
@@ -242,7 +242,7 @@ export default {
           this.myVoucher.splice(store_id, 1, '不使用')
           this.myVoucher.splice(store_id, 1, '不使用')
         }
         }
       }
       }
-      
+
       if (this.chainInfo[store_id]) {
       if (this.chainInfo[store_id]) {
         price -= this.addressApi.content[store_id]
         price -= this.addressApi.content[store_id]
       }
       }

+ 8 - 8
pages/member/buy/pay.vue

@@ -94,7 +94,7 @@ import {getFontSize} from '@/util/common'
     name: 'pay',
     name: 'pay',
     mounted(){
     mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     var pages = getCurrentPages()
     var pages = getCurrentPages()
     var page = pages[pages.length - 2]
     var page = pages[pages.length - 2]
@@ -367,7 +367,7 @@ import {getFontSize} from '@/util/common'
                   title: error.message
                   title: error.message
                 })
                 })
               })
               })
-              
+
             },
             },
             fail: (err)=>{
             fail: (err)=>{
               uni.showToast({
               uni.showToast({
@@ -376,11 +376,11 @@ import {getFontSize} from '@/util/common'
               })
               })
             }
             }
           })
           })
-    
-        // #endif  
+
+        // #endif
         // #ifndef MP-WEIXIN
         // #ifndef MP-WEIXIN
         this.goPay()
         this.goPay()
-        // #endif  
+        // #endif
       },
       },
       goPay(){
       goPay(){
         pay(
         pay(
@@ -419,7 +419,7 @@ import {getFontSize} from '@/util/common'
                   _this.goNext()
                   _this.goNext()
                 }
                 }
               })
               })
-              // #endif  
+              // #endif
             } else {
             } else {
               uni.showToast({
               uni.showToast({
                 icon: 'none',
                 icon: 'none',
@@ -429,7 +429,7 @@ import {getFontSize} from '@/util/common'
           } else {
           } else {
             // #ifdef H5
             // #ifdef H5
             document.write(res)
             document.write(res)
-            // #endif  
+            // #endif
           }
           }
         }).catch((error)=> {
         }).catch((error)=> {
           this.payment_info.password=''
           this.payment_info.password=''
@@ -441,7 +441,7 @@ import {getFontSize} from '@/util/common'
           } else {
           } else {
             // #ifdef H5
             // #ifdef H5
             document.write(error)
             document.write(error)
-            // #endif  
+            // #endif
           }
           }
         })
         })
       }
       }

+ 13 - 13
pages/member/buy/step1.vue

@@ -234,15 +234,15 @@ export default {
     this.getBuyInfo()
     this.getBuyInfo()
   },
   },
   mounted(){
   mounted(){
-  
+
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-  
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
-  
+
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
+
     // #endif
     // #endif
-  
+
     this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.screenWidth=uni.getSystemInfoSync().screenWidth
-  
+
   },
   },
   methods:{
   methods:{
     radioChange(i,e){
     radioChange(i,e){
@@ -253,9 +253,9 @@ export default {
         case 2:
         case 2:
         this.presell_pay=e.detail.value
         this.presell_pay=e.detail.value
         break
         break
-        
+
       }
       }
-      
+
     },
     },
     closeDialog(){
     closeDialog(){
     },
     },
@@ -334,7 +334,7 @@ export default {
       } else {
       } else {
         this.addAddress=false
         this.addAddress=false
         uni.navigateTo({ url: '/pages/member/address/AddressForm'+'?'+urlencode( { action: 'add',isFromCheckout: true,goBackLevel: 2 })})
         uni.navigateTo({ url: '/pages/member/address/AddressForm'+'?'+urlencode( { action: 'add',isFromCheckout: true,goBackLevel: 2 })})
-        
+
       }
       }
     },
     },
     changeMessage (message, store_id) {
     changeMessage (message, store_id) {
@@ -370,21 +370,21 @@ export default {
         voucher_temp.push([this.store_final_total_list.store_cart_list[t].store_voucher_info.vouchertemplate_id + '|' + t + '|' + this.store_final_total_list.store_cart_list[t].store_voucher_info.voucher_price])
         voucher_temp.push([this.store_final_total_list.store_cart_list[t].store_voucher_info.vouchertemplate_id + '|' + t + '|' + this.store_final_total_list.store_cart_list[t].store_voucher_info.voucher_price])
       }
       }
       voucher = voucher_temp.join(',')
       voucher = voucher_temp.join(',')
-      
+
       mallvoucher = '|0.00'
       mallvoucher = '|0.00'
         if(this.mall_voucher_info != ''){
         if(this.mall_voucher_info != ''){
             mallvoucher = this.mall_voucher_info.mallvouchertemplate_id +'|'+this.mall_voucher_info.mallvoucheruser_price
             mallvoucher = this.mall_voucher_info.mallvouchertemplate_id +'|'+this.mall_voucher_info.mallvoucheruser_price
         }
         }
-        
+
       chaininfo = ''
       chaininfo = ''
         let chain_temp = []
         let chain_temp = []
         for (var t in this.store_final_total_list.store_cart_list) {
         for (var t in this.store_final_total_list.store_cart_list) {
             if(this.store_final_total_list.store_cart_list[t].chain_goods){
             if(this.store_final_total_list.store_cart_list[t].chain_goods){
-               chain_temp.push([t + '|' + this.store_final_total_list.store_cart_list[t].chain_goods.chain_id]) 
+               chain_temp.push([t + '|' + this.store_final_total_list.store_cart_list[t].chain_goods.chain_id])
             }
             }
         }
         }
         chaininfo = chain_temp.join(',')
         chaininfo = chain_temp.join(',')
-      
+
       let i
       let i
       for (i in this.store_final_total_list.store_cart_list) {
       for (i in this.store_final_total_list.store_cart_list) {
         let message = this.message[this.store_final_total_list.store_cart_list[i].store_id]
         let message = this.message[this.store_final_total_list.store_cart_list[i].store_id]

+ 1 - 1
pages/member/cart/child/CartHeader.vue

@@ -18,7 +18,7 @@ import { mapState, mapMutations } from 'vuex'
 export default {
 export default {
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 9 - 9
pages/member/cart/child/CartList.vue

@@ -29,7 +29,7 @@
                                 :disabled="!isCheckedAll && item.disabled"
                                 :disabled="!isCheckedAll && item.disabled"
                             />
                             />
                             <label class="label" :class="{'checked':item.checked}" :for="'store'+cartItem.store_id+'goods'+index"><text class="span iconfont">&#xe69b;</text></label>
                             <label class="label" :class="{'checked':item.checked}" :for="'store'+cartItem.store_id+'goods'+index"><text class="span iconfont">&#xe69b;</text></label>
-                        </view> 
+                        </view>
                         <view class="div list-item" @click="goDetail(item.goods_id)">
                         <view class="div list-item" @click="goDetail(item.goods_id)">
                         	<view class="div item">
                         	<view class="div item">
                         		<view class="div ui-image">
                         		<view class="div ui-image">
@@ -111,12 +111,12 @@
                         	</view>
                         	</view>
                         </view>
                         </view>
                     </view>
                     </view>
-                    
-                	
+
+
                 </checkbox-group>
                 </checkbox-group>
             </view>
             </view>
-            
-		
+
+
 	</checkbox-group>
 	</checkbox-group>
 	</view>
 	</view>
 </template>
 </template>
@@ -156,7 +156,7 @@ export default {
   },
   },
   mounted: function() {
   mounted: function() {
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
   },
   },
   methods: {
   methods: {
@@ -330,7 +330,7 @@ export default {
 		  let length = 0
 		  let length = 0
 		  let totalLength = 0
 		  let totalLength = 0
 		  let status = false
 		  let status = false
-          
+
           for(var j in data){
           for(var j in data){
             let list = data[j].goods
             let list = data[j].goods
             let k = 0
             let k = 0
@@ -343,9 +343,9 @@ export default {
                     list[i].checked = value.indexOf(data[j].store_id)>-1?true:false
                     list[i].checked = value.indexOf(data[j].store_id)>-1?true:false
                     data[j].checked = value.indexOf(data[j].store_id)>-1?true:false
                     data[j].checked = value.indexOf(data[j].store_id)>-1?true:false
                 }
                 }
-            }  
+            }
           }
           }
-		  
+
           for (var q in data) {
           for (var q in data) {
 			  if (value.indexOf(data[q].store_id)>-1) {
 			  if (value.indexOf(data[q].store_id)>-1) {
 				  length += data[q].goods.length
 				  length += data[q].goods.length

+ 2 - 2
pages/member/chat/ChatInfo.vue

@@ -15,7 +15,7 @@
             <view class="div" v-for="(item,index) in msg_list" :key="index" :id="'msg_'+index">
             <view class="div" v-for="(item,index) in msg_list" :key="index" :id="'msg_'+index">
                 <chat-message :item="getMessage(item,index,0)" :t_id="t_id"></chat-message>
                 <chat-message :item="getMessage(item,index,0)" :t_id="t_id"></chat-message>
             </view>
             </view>
-          </view>  
+          </view>
         </scroll-view>
         </scroll-view>
         <view class="div dstouch-chat-bottom">
         <view class="div dstouch-chat-bottom">
             <view class="div chat-input-layout"> <view class="span open-smile"><text class="a iconfont" @click="open_smile">&#xe6cd;</text></view>
             <view class="div chat-input-layout"> <view class="span open-smile"><text class="a iconfont" @click="open_smile">&#xe6cd;</text></view>
@@ -136,7 +136,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.contentHeight=uni.getSystemInfoSync().screenHeight-uni.getSystemInfoSync().statusBarHeight
     this.contentHeight=uni.getSystemInfoSync().screenHeight-uni.getSystemInfoSync().statusBarHeight

+ 1 - 1
pages/member/chat/ChatList.vue

@@ -40,7 +40,7 @@ import { getChatList } from '../../../api/memberInstantMessage'
 export default {
 export default {
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 2 - 2
pages/member/complaint/ComplaintForm.vue

@@ -241,12 +241,12 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     const res = uni.getSystemInfoSync()
     const res = uni.getSystemInfoSync()
     this.screenWidth = res.windowWidth
     this.screenWidth = res.windowWidth
     this.screenHeight = res.windowHeight
     this.screenHeight = res.windowHeight
-  
+
   },
   },
   methods:{
   methods:{
     radioChange(e){
     radioChange(e){

+ 2 - 2
pages/member/complaint/ComplaintList.vue

@@ -65,7 +65,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{
@@ -198,7 +198,7 @@ export default {
     			margin-left: .5rem;
     			margin-left: .5rem;
     			.goods_name{
     			.goods_name{
     				color: #333;
     				color: #333;
-    				font-size: .7rem; 
+    				font-size: .7rem;
     				line-height: .8rem;
     				line-height: .8rem;
     				height: 1.6rem;
     				height: 1.6rem;
     				margin-top: .4rem;
     				margin-top: .4rem;

+ 2 - 2
pages/member/consult/ConsultList.vue

@@ -75,7 +75,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   created () {
   created () {
@@ -166,7 +166,7 @@ export default {
 				margin-left: .5rem;
 				margin-left: .5rem;
 				.goods_name{
 				.goods_name{
 					color: #333;
 					color: #333;
-					font-size: .7rem; 
+					font-size: .7rem;
 					line-height: .8rem;
 					line-height: .8rem;
 					height: 1.6rem;
 					height: 1.6rem;
 					margin-top: .4rem;
 					margin-top: .4rem;

+ 2 - 2
pages/member/evaluate/EvaluateList.vue

@@ -21,7 +21,7 @@
                         <view class="div p-info">
                         <view class="div p-info">
                             <view class="div p-name">{{evaluate.geval_goodsname}}</view>
                             <view class="div p-name">{{evaluate.geval_goodsname}}</view>
                             <uni-rate :size="18" :readonly="true" :value="evaluate.geval_scores"/>
                             <uni-rate :size="18" :readonly="true" :value="evaluate.geval_scores"/>
-                            
+
                         </view>
                         </view>
                     </view>
                     </view>
                     <view class="div p-content">评价:{{evaluate.geval_content}}</view>
                     <view class="div p-content">评价:{{evaluate.geval_content}}</view>
@@ -50,7 +50,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/member/favorite/Favorite.vue

@@ -33,7 +33,7 @@ export default {
   name:'MemberFavorite',
   name:'MemberFavorite',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 2 - 2
pages/member/feedback/Feedback.vue

@@ -73,7 +73,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     // this.changePictureCode()
     // this.changePictureCode()
   },
   },
@@ -163,7 +163,7 @@ export default {
     .scroll-view-wrapper{display: flex;flex-direction: column;}
     .scroll-view-wrapper{display: flex;flex-direction: column;}
     .scroll-view{flex:1}
     .scroll-view{flex:1}
     .feedback-form{background: #fff;padding:0 $pageSpace;box-shadow: 0px 4px 4px #f7f7f7;position: relative;}
     .feedback-form{background: #fff;padding:0 $pageSpace;box-shadow: 0px 4px 4px #f7f7f7;position: relative;}
-	.feedback-message{background: #fbfbfb;margin: .5rem 0;font-size: .7rem;padding: .5rem;height: 4rem;border: 0;box-sizing: border-box;width: 100%;} 
+	.feedback-message{background: #fbfbfb;margin: .5rem 0;font-size: .7rem;padding: .5rem;height: 4rem;border: 0;box-sizing: border-box;width: 100%;}
     .feedback-list{background: #fff;padding:0 $pageSpace;}
     .feedback-list{background: #fff;padding:0 $pageSpace;}
     .feedback-item{background:#fff;border-bottom:1px dashed #eee;}
     .feedback-item{background:#fff;border-bottom:1px dashed #eee;}
     .feedback-info{padding:.5rem 0;display: flex}
     .feedback-info{padding:.5rem 0;display: flex}

+ 6 - 6
pages/member/friend/FriendList.vue

@@ -121,15 +121,15 @@ export default {
   },
   },
 
 
   mounted(){
   mounted(){
-  
+
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-  
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
-  
+
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
+
     // #endif
     // #endif
-  
+
     this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.screenWidth=uni.getSystemInfoSync().screenWidth
-  
+
   },
   },
   methods:{
   methods:{
     closeDialog(){
     closeDialog(){

+ 7 - 7
pages/member/inform/InformForm.vue

@@ -229,13 +229,13 @@ export default {
     }
     }
   },
   },
   mounted(){
   mounted(){
-  
+
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-  
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
-  
+
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
+
     // #endif
     // #endif
-  
+
     const res = uni.getSystemInfoSync()
     const res = uni.getSystemInfoSync()
     this.screenWidth = res.windowWidth
     this.screenWidth = res.windowWidth
     this.screenHeight = res.windowHeight
     this.screenHeight = res.windowHeight
@@ -250,7 +250,7 @@ export default {
       this.subject=e.detail.value
       this.subject=e.detail.value
       break
       break
       }
       }
-      
+
     },
     },
     showPopup(id){
     showPopup(id){
       this.$refs[id].open()
       this.$refs[id].open()
@@ -475,6 +475,6 @@ export default {
 			border-bottom: 1px dashed #f5f5f5;
 			border-bottom: 1px dashed #f5f5f5;
 		}
 		}
 	}
 	}
-	
+
 </style>
 </style>
 
 

+ 2 - 2
pages/member/inform/InformList.vue

@@ -63,7 +63,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{
@@ -185,7 +185,7 @@ export default {
     			margin-left: .5rem;
     			margin-left: .5rem;
     			.goods_name{
     			.goods_name{
     				color: #333;
     				color: #333;
-    				font-size: .7rem; 
+    				font-size: .7rem;
     				line-height: .8rem;
     				line-height: .8rem;
     				height: 1.6rem;
     				height: 1.6rem;
     				margin-top: .4rem;
     				margin-top: .4rem;

+ 7 - 7
pages/member/inviter/InviterManage.vue

@@ -58,7 +58,7 @@
 		  <view class="div nav-item" @click='goNavigate("/pages/member/inviter/InviterOrder")'>推广业绩</view>
 		  <view class="div nav-item" @click='goNavigate("/pages/member/inviter/InviterOrder")'>推广业绩</view>
 		</view>
 		</view>
 		<view class="btn" @click.stop="onShare">点击查看推广链接</view>
 		<view class="btn" @click.stop="onShare">点击查看推广链接</view>
-      
+
     </view>
     </view>
     <!--推广公众号-->
     <!--推广公众号-->
     <uni-popup background-color="#fff" ref="weixinVisible" type="right" >
     <uni-popup background-color="#fff" ref="weixinVisible" type="right" >
@@ -106,10 +106,10 @@
 	    <view class="div common-popup-content">
 	    <view class="div common-popup-content">
 	        <view class="div share-list">
 	        <view class="div share-list">
 	            <view class="div share-item copy" @click.stop="showLink">复制</view>
 	            <view class="div share-item copy" @click.stop="showLink">复制</view>
-			</view>	
+			</view>
 	    </view>
 	    </view>
 	</uni-popup>
 	</uni-popup>
-	    
+
 	<uni-popup background-color="#fff" ref="copyVisible">
 	<uni-popup background-color="#fff" ref="copyVisible">
 	  <view class="copy-wrapper">
 	  <view class="copy-wrapper">
 	    <view class="div title">您的浏览器不支持直接复制,请手动复制</view>
 	    <view class="div title">您的浏览器不支持直接复制,请手动复制</view>
@@ -167,7 +167,7 @@ export default {
 
 
   mounted(){
   mounted(){
       // #ifdef  MP-WEIXIN
       // #ifdef  MP-WEIXIN
-      this.navHeight = uni.getMenuButtonBoundingClientRect().height
+      this.navHeight = uni.getMenuButtonBoundingClientRect().top
       // #endif
       // #endif
       this.screenWidth=uni.getSystemInfoSync().screenWidth
       this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.wrapperWidth = uni.getSystemInfoSync().windowWidth - 20
     this.wrapperWidth = uni.getSystemInfoSync().windowWidth - 20
@@ -327,7 +327,7 @@ export default {
   				  }
   				  }
   			  }
   			  }
   		  }
   		  }
-  	  } 
+  	  }
   	  .nav-wrapper{
   	  .nav-wrapper{
   		  display: flex;
   		  display: flex;
   		  flex-wrap: wrap;
   		  flex-wrap: wrap;
@@ -340,7 +340,7 @@ export default {
   			  border-radius: .25rem;
   			  border-radius: .25rem;
   			  margin-bottom: .5rem;
   			  margin-bottom: .5rem;
   			  padding: 1rem 0;
   			  padding: 1rem 0;
-  			  
+
   		  }
   		  }
   		  .nav-item:nth-child(2n){
   		  .nav-item:nth-child(2n){
   			  margin-right: 0;
   			  margin-right: 0;
@@ -385,7 +385,7 @@ export default {
   		.share-item.copy:before{
   		.share-item.copy:before{
   			content:"\e64b";
   			content:"\e64b";
   			background:#228B22;
   			background:#228B22;
-  		} 
+  		}
   	}
   	}
     .copy-wrapper{
     .copy-wrapper{
   	  padding:1rem;
   	  padding:1rem;

+ 1 - 1
pages/member/inviter/InviterOrder.vue

@@ -66,7 +66,7 @@ export default {
 
 
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
 
 
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
 
 
   // #endif
   // #endif
 
 

+ 1 - 1
pages/member/inviter/InviterUser.vue

@@ -70,7 +70,7 @@ export default {
 
 
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
 
 
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
 
 
   // #endif
   // #endif
 
 

+ 1 - 1
pages/member/invoice/InvoiceForm.vue

@@ -51,7 +51,7 @@ export default {
   name: 'InvoiceForm',
   name: 'InvoiceForm',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 1 - 1
pages/member/invoice/InvoiceList.vue

@@ -69,7 +69,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 3 - 3
pages/member/live/LiveList.vue

@@ -91,7 +91,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){
@@ -208,8 +208,8 @@ export default {
         // #ifndef  MP-WEIXIN
         // #ifndef  MP-WEIXIN
           uni.showToast({icon:'none',title: '请在小程序中打开'})
           uni.showToast({icon:'none',title: '请在小程序中打开'})
           return
           return
-        // #endif  
-        
+        // #endif
+
           wx.navigateTo({ url: 'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.minipro_live_room_id })
           wx.navigateTo({ url: 'plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=' + item.minipro_live_room_id })
       } else {
       } else {
         uni.navigateTo({ url: '/pages/member/live/LiveDetail'+'?'+urlencode( { 'live_apply_id': item.live_apply_id } )})
         uni.navigateTo({ url: '/pages/member/live/LiveDetail'+'?'+urlencode( { 'live_apply_id': item.live_apply_id } )})

+ 8 - 8
pages/member/mallvoucher/MallVoucherList.vue

@@ -23,7 +23,7 @@
                     {{ item.name }}
                     {{ item.name }}
                 </view>
                 </view>
             </view>
             </view>
-        </view>  
+        </view>
 <view class="scroll-view div" style="position:relative">
 <view class="scroll-view div" style="position:relative">
         <scroll-view style="position: absolute;top:0;right:0;left:0;bottom:0" class="div" @scrolltolower="loadMore" scroll-y="true">
         <scroll-view style="position: absolute;top:0;right:0;left:0;bottom:0" class="div" @scrolltolower="loadMore" scroll-y="true">
             <view
             <view
@@ -68,7 +68,7 @@ export default {
     return {
     return {
       navHeight: 0,
       navHeight: 0,
       mallvoucherNav: [
       mallvoucherNav: [
-        
+
         {
         {
           'name': '未使用',
           'name': '未使用',
           'id': '1'
           'id': '1'
@@ -81,7 +81,7 @@ export default {
           'name': '已过期',
           'name': '已过期',
           'id': '3'
           'id': '3'
         },
         },
-      ],  
+      ],
       params: { 'page': 0, 'per_page': 10 },
       params: { 'page': 0, 'per_page': 10 },
       stateType: '',
       stateType: '',
       loading: false, // 是否加载更多
       loading: false, // 是否加载更多
@@ -96,9 +96,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   methods:{
   methods:{
     goNavigate(path,query=false){
     goNavigate(path,query=false){
@@ -135,7 +135,7 @@ export default {
         } else {
         } else {
           this.isMore = false
           this.isMore = false
         }
         }
-        
+
         let mallvoucher_list = res.result.mallvoucher_list
         let mallvoucher_list = res.result.mallvoucher_list
         if (mallvoucher_list) {
         if (mallvoucher_list) {
           if (ifReplace || !this.mallvoucher_list) {
           if (ifReplace || !this.mallvoucher_list) {
@@ -255,7 +255,7 @@ export default {
                     z-index: 2;
                     z-index: 2;
                 }
                 }
                 .mallvoucher-info::before{
                 .mallvoucher-info::before{
-                    right: -6px;     
+                    right: -6px;
                 }
                 }
                 .mallvoucher-info::after{
                 .mallvoucher-info::after{
                     left: -6px;
                     left: -6px;
@@ -292,7 +292,7 @@ export default {
                 ,#a2adbe,#c1cdd8);
                 ,#a2adbe,#c1cdd8);
                 color: #5e6679;
                 color: #5e6679;
             }
             }
-        }    
+        }
 }
 }
 .common-voucher{margin:0.5rem auto}
 .common-voucher{margin:0.5rem auto}
 </style>
 </style>

+ 2 - 2
pages/member/marketmanagelog/Marketmanagelog.vue

@@ -71,9 +71,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   methods: {
   methods: {
     goBack () {
     goBack () {

+ 2 - 2
pages/member/notice/NoticeList.vue

@@ -76,9 +76,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   methods: {
   methods: {
     goBack () {
     goBack () {

+ 1 - 1
pages/member/order/OrderDeliver.vue

@@ -33,7 +33,7 @@ export default {
   name:'MemberOrderDeliver',
   name:'MemberOrderDeliver',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/member/order/OrderDetail.vue

@@ -197,7 +197,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     this.screenWidth=uni.getSystemInfoSync().screenWidth
     this.screenWidth=uni.getSystemInfoSync().screenWidth
   },
   },

+ 2 - 2
pages/member/order/OrderEvaluate.vue

@@ -56,7 +56,7 @@
 			</view>
 			</view>
 			<view class="div common-btn ds-button-large" @click="submit">提交</view>
 			<view class="div common-btn ds-button-large" @click="submit">提交</view>
 		</view>
 		</view>
-		
+
 	</view></member-base>
 	</view></member-base>
 </template>
 </template>
 
 
@@ -70,7 +70,7 @@ import { getOrderEvaluateInfo, saveOrderEvaluate } from '../../../api/memberOrde
 export default {
 export default {
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 2 - 2
pages/member/order/OrderList.vue

@@ -161,9 +161,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 140
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 180
   },
   },
   computed:{
   computed:{
     fontSize(){
     fontSize(){

+ 1 - 1
pages/member/orderreturn/Orderreturn.vue

@@ -46,7 +46,7 @@ export default {
 
 
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
 
 
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
 
 
   // #endif
   // #endif
 
 

+ 3 - 3
pages/member/point/PointList.vue

@@ -31,7 +31,7 @@
         <empty-record v-else-if="point_list && !point_list.length"></empty-record>
         <empty-record v-else-if="point_list && !point_list.length"></empty-record>
       </scroll-view>
       </scroll-view>
     </view>
     </view>
-    
+
   </view></member-base>
   </view></member-base>
 </template>
 </template>
 
 
@@ -72,9 +72,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   methods: {
   methods: {
     goBack () {
     goBack () {

+ 1 - 1
pages/member/point/PointSignin.vue

@@ -86,7 +86,7 @@ export default {
 
 
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
 
 
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
 
 
   // #endif
   // #endif
 
 

+ 1 - 1
pages/member/pointsbuy/step1.vue

@@ -44,7 +44,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 1 - 1
pages/member/pointscart/child/CartHeader.vue

@@ -18,7 +18,7 @@ import { mapState, mapMutations } from 'vuex'
 export default {
 export default {
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   data(){
   data(){

+ 1 - 1
pages/member/pointscart/child/CartList.vue

@@ -116,7 +116,7 @@ export default {
   },
   },
   mounted: function() {
   mounted: function() {
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
   },
   },
   methods: {
   methods: {

+ 1 - 1
pages/member/pointsorder/OrderDetail.vue

@@ -89,7 +89,7 @@ export default {
   name:'MemberOrderDetail',
   name:'MemberOrderDetail',
   mounted(){
   mounted(){
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
   // #endif
   // #endif
   },
   },
   computed:{
   computed:{

+ 2 - 2
pages/member/pointsorder/OrderList.vue

@@ -127,9 +127,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 140
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 180
   },
   },
   computed:{
   computed:{
     fontSize(){
     fontSize(){

+ 2 - 2
pages/member/predeposit/PredepositList.vue

@@ -61,9 +61,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   methods: {
   methods: {
     loadMore () {
     loadMore () {

+ 2 - 2
pages/member/predeposit/RechargeCardList.vue

@@ -80,9 +80,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   methods:{
   methods:{
     closeDialog(){
     closeDialog(){

+ 2 - 2
pages/member/profile/ProfileSet.vue

@@ -80,7 +80,7 @@ export default {
 
 
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
 
 
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
 
 
     // #endif
     // #endif
 
 
@@ -194,7 +194,7 @@ export default {
       position: relative;
       position: relative;
       margin: 2rem auto;
       margin: 2rem auto;
       text-align: center;
       text-align: center;
-    }  
+    }
     .menu-item {
     .menu-item {
     }
     }
 	.membername{
 	.membername{

+ 2 - 2
pages/member/recharge/RechargeList.vue

@@ -86,9 +86,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   methods:{
   methods:{
     closeDialog(){
     closeDialog(){

+ 2 - 2
pages/member/refund/RefundForm.vue

@@ -66,7 +66,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     const res = uni.getSystemInfoSync()
     const res = uni.getSystemInfoSync()
     this.screenWidth = res.windowWidth
     this.screenWidth = res.windowWidth
@@ -167,7 +167,7 @@ export default {
 		border: 0;
 		border: 0;
 		box-sizing: border-box;
 		box-sizing: border-box;
 		width: 100%;
 		width: 100%;
-	}  
+	}
   }
   }
 
 
 </style>
 </style>

+ 2 - 2
pages/member/refund/RefundList.vue

@@ -81,9 +81,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   computed:{
   computed:{
 
 

+ 1 - 1
pages/member/refund/RefundView.vue

@@ -90,7 +90,7 @@ export default {
 
 
   // #ifdef  MP-WEIXIN
   // #ifdef  MP-WEIXIN
 
 
-  this.navHeight = uni.getMenuButtonBoundingClientRect().height
+  this.navHeight = uni.getMenuButtonBoundingClientRect().top
 
 
   // #endif
   // #endif
 
 

+ 1 - 1
pages/member/return/ReturnForm.vue

@@ -104,7 +104,7 @@ export default {
   },
   },
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
     const res = uni.getSystemInfoSync()
     const res = uni.getSystemInfoSync()
     this.screenWidth = res.windowWidth
     this.screenWidth = res.windowWidth

+ 2 - 2
pages/member/return/ReturnList.vue

@@ -77,9 +77,9 @@ export default {
 
 
   mounted(){
   mounted(){
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
     // #endif
     // #endif
-    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 90
+    this.wrapperHeight = uni.getSystemInfoSync().windowHeight - 130
   },
   },
   computed:{
   computed:{
 
 

+ 1 - 1
pages/member/return/ReturnSend.vue

@@ -82,7 +82,7 @@ export default {
 
 
     // #ifdef  MP-WEIXIN
     // #ifdef  MP-WEIXIN
 
 
-    this.navHeight = uni.getMenuButtonBoundingClientRect().height
+    this.navHeight = uni.getMenuButtonBoundingClientRect().top
 
 
     // #endif
     // #endif
 
 

Some files were not shown because too many files changed in this diff