2020821

pages/login/login.js

@@ -6,6 +6,8 @@ Page({
    */
   data: {
     height:'',
+    isphone:true,
+    islogin:true,
   },
 
   /**

pages/login/login.wxml

@@ -4,13 +4,19 @@
   
     <image class="bgClass" src="http://upload.miaomiao-bao.com/97b52202008201410189925.png"></image>
     <view class="imgContainer">
-       <image class="titleImg" src="/image/logo-w.png"></image>
+       <image class="titleImg" src="http://upload.miaomiao-bao.com/24614202008211016488542.png"></image>
       <image style="width:356rpx;height:40rpx;margin-bottom:138rpx;" src="./image/The blue island@2x.png"></image>
       <image class="font" src="./image/zq@2x.png" style="width:456rpx"></image>
       <image class="font" src="./image/tszr@2x.png" style="width:456rpx"></image>
       <image class="font" src="./image/xhslqj@2x.png" style="width:228rpx"></image>
       <image class="font" src="./image/syrs@2x.png" style="width:228rpx"></image>
-      <view class="loginBtn">微信一键登录</view>
+      <view class="btn-contanier">
+        <view class="loginBtn" hidden="{{islogin}}">微信授权登录</view>
+        <view class="isloginBtn loginBtn" hidden="{{!islogin}}"> <view style="margin-right:10rpx;">已授权</view> <l-icon name="success" color="rgba(255,255,255,1);" size="28" /></view>
+        <view class="loginBtn" hidden="{{isphone}}">绑定手机号</view>
+        <view class="isloginBtn loginBtn" hidden="{{!isphone}}"><view style="margin-right:10rpx;">已绑定手机号</view><l-icon name="success" color="rgba(255,255,255,1);" size="28"/></view>
+      </view>
+      
     </view>
  
  

pages/login/login.wxss

@@ -30,13 +30,23 @@
   height: 42rpx;
   margin-bottom: 32rpx;
 }
+.btn-contanier{
+  width:558rpx;
+  margin-top: 176rpx;
+}
 .loginBtn{
   width:558rpx;
   height:96rpx;
   background:rgba(134,197,225,1);
   border-radius:4px;
-  margin-top: 176rpx;
   line-height: 96rpx;
   text-align: center;
    color:rgba(255,255,255,1);
+   margin-bottom: 44rpx;
+}
+
+.isloginBtn{
+  background-color: rgb(200, 225, 236);
+  display: flex;
+  justify-content: center;
 }
\ No newline at end of file

pages/mine/mine.js

@@ -7,7 +7,7 @@ Page({
      */
     data: {
         mask:false,
-        type:0, //判断是否是认证的了
+        type:1, //判断是否是认证的了
         approveList:['园区门票优惠','餐厅价格优惠','SPA服务优惠','免费观看电影','无须预约入园','尽享多重特权']
     },
     //去认证
@@ -19,15 +19,20 @@ Page({
     close(){
         this.setData({
             mask:false
+        });
+        wx.showTabBar({
+          animation: true,
         })
     },
     maskShow(){
         this.setData({
             mask:true
+        });
+        wx.hideTabBar({
+            animation: true,
         })
     },
     myAppoinment(){
-        console.log('666')
         wx.navigateTo({
           url: '../../pages/home/home.wxml',
         })
@@ -36,7 +41,7 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-
+        
     },
     getUserInfo: function (funcEvent) {
         console.log(funcEvent)

pages/mine/mine.json

-{
+{   
     "navigationBarTextStyle": "black",
     "usingComponents": {}
 }
\ No newline at end of file

pages/myActivity/myActivity.js

@@ -11,6 +11,7 @@ Page({
       {content:'进行中',type:'2'},
       {content:'已结束',type:'3'},
     ],
+    height:0,
     data:[
       {time:'6月30日 10:00-12:00',type:'0',content:'云之亭广场外侧',title:'海滩夏日音乐节'},
       {time:'6月30日 10:00-12:00',type:'1',content:'云之亭广场外侧',title:'海滩夏日音乐节'}, 
@@ -32,7 +33,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.setData({
+      height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
+    })
   },
 
   /**

pages/myActivity/myActivity.wxml

 <navigation class="navigation" titleText="我的活动" backIcon="/image/back.png"></navigation>
-<view class="container all">
-  <view class="myActivity-container">
+<view class="container all" >
+  <view class="myActivity-container" style="min-height:{{height}}px;">
     <view class="activity-nav">
     <!-- 遍历头部导航 -->
       <view bindtap="chageNav" data-index="{{index}}" wx:for="{{navItem}}" wx:key="index" class="navItem {{index == active? 'active':''}}">{{item.content}}</view>
     </view>
-    <view class="activity-body">
+    <view class="activity-body" style="min-height:{{height}}rpx;">
        <view class="my-activities-item " data-type="{{item.type}}" wx:for="{{data}}" wx:key="index" bindtap="activityDetail">
                 <view class="my-activities-top {{item.type == 2?'timeendColor':''}}">
                     {{item.time}}

pages/myActivity/myActivity.wxss

 /* pages/myActivity/myActivity.wxss */
 .all{
-  height: 100%;
   background-color: rgba(243,244,246,1);
 }
 .myActivity-container{