Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev

* 'dev' of git.oa00.com:xiaowen/swsWecat:
  zx

pages/mine/pages/profile/profile.wxml

@@ -15,7 +15,7 @@
         <input disabled value="{{brandName}}" placeholder="请输入公司品牌" placeholder-class="placeholder-style"></input>
     </view>
   </view>
-  <view wx:if="{{status == 1}}">
+  <view>
     <view style="font-size:28rpx;font-weight:bolder;margin-top: 32rpx;margin-left: 32rpx">到期日期</view>
     <view>
         <input disabled value="{{expDate}}" placeholder="到期日期" placeholder-class="placeholder-style" ></input>

pages/varComm/pages/brand/index.js

@@ -23,12 +23,8 @@ Component({
       }
     },
     backTop: function () {
-      // wx.pageScrollTo({
+      wx.pageScrollTo({
-      //   duration: 0,
+        scrollTop: 0,
-      // })
-
-      this.setData({
-        top: true
       })
     },
     startCp() {

pages/varComm/pages/brand/index.wxml

@@ -1,6 +1,6 @@
 <van-dialog id="van-dialog" />
 <wxs src="./filter.wxs" module="filter"></wxs>
-<scroll-view style="height: 100vh;" scroll-y="true" bindscroll="srollViewTop" scroll-top="{{top}}">
+<!-- <scroll-view style="height: 100vh;" scroll-y="true" bindscroll="srollViewTop" scroll-top="{{top}}"> -->
 <view class="box" id="box">
   <!-- <van-sticky> -->
   <view class="add1">
@@ -49,6 +49,6 @@
   </view>
 
 </view>
-</scroll-view>
+<!-- </scroll-view> -->
 
-<view hidden="{{Top}}" class="back" bindtap="backTop"><van-icon name="back-top" />顶部</view>
+<view class="back" bindtap="backTop"><van-icon name="back-top" />顶部</view>

pages/varComm/pages/brand/index.wxss

@@ -149,7 +149,7 @@ page {
   text-align: center;
   position: fixed;
   font-size: 12px;
-  bottom: 150rpx;
+  bottom: 12%;
   background: #e6eef7;
   right: 30rpx;
   border-radius: 50%;

pages/varComm/pages/carModels/index.js

@@ -25,11 +25,8 @@ Component({
         }
       },
       backTop: function () {
-        // wx.pageScrollTo({
+        wx.pageScrollTo({
-        //   duration: 0,
+            scrollTop: 0,
-        // })
-        this.setData({
-          top: true
         })
       },
         onClose() {

pages/varComm/pages/carModels/index.wxml

@@ -1,6 +1,6 @@
 <van-dialog id="van-dialog" />
 <wxs src="./filter.wxs" module="filter"></wxs>
-<scroll-view style="height: 100vh;" scroll-y="true" bindscroll="srollViewTop" scroll-top="{{top}}">
+<!-- <scroll-view style="height: 100vh;" scroll-y="true" bindscroll="srollViewTop" scroll-top="{{top}}"> -->
 <view class="box">
     <view class="add1">
         <view style="display: inline-block;" wx:for="{{boxArr}}" wx:key="idx" wx:for-index="index">
@@ -54,6 +54,6 @@
         
     </van-popup>
 </view>
-</scroll-view>
+<!-- </scroll-view> -->
 
-<view hidden="{{Top}}" class="back" bindtap="backTop"><van-icon name="back-top" />顶部</view>
+<view class="back" bindtap="backTop"><van-icon name="back-top" />顶部</view>

pages/varComm/pages/carModels/index.wxss

@@ -153,7 +153,7 @@ page {
     text-align: center;
     position: fixed;
     font-size: 12px;
-    bottom: 150rpx;
+    bottom: 12%;
     background: #e6eef7;
     right: 30rpx;
     border-radius: 50%;