Skip to content

严立 / mini-shimao

Go to a project
Commit c1ef5c61 by TengFengLian
Options

Merge branch 'master' of http://120.77.182.185/yanl/mini-shimao 

* 'master' of http://120.77.182.185/yanl/mini-shimao:
  2020821

# Conflicts:
#	pages/mine/mine.js
parents d0d85633 e6091634
Inline Side-by-side
Showing with 38 additions and 11 deletions
pages/login/login.js
...@@ -6,6 +6,8 @@ Page({ ...@@ -6,6 +6,8 @@ Page({
*/ */
data: { data: {
height:'', height:'',
isphone:true,
islogin:true,
}, },
/** /**
......
pages/login/login.wxml
...@@ -4,13 +4,19 @@ ...@@ -4,13 +4,19 @@
<image class="bgClass" src="http://upload.miaomiao-bao.com/97b52202008201410189925.png"></image> <image class="bgClass" src="http://upload.miaomiao-bao.com/97b52202008201410189925.png"></image>
<view class="imgContainer"> <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 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/zq@2x.png" style="width:456rpx"></image>
<image class="font" src="./image/tszr@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/xhslqj@2x.png" style="width:228rpx"></image>
<image class="font" src="./image/syrs@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> </view>
......
pages/login/login.wxss
...@@ -30,13 +30,23 @@ ...@@ -30,13 +30,23 @@
height: 42rpx; height: 42rpx;
margin-bottom: 32rpx; margin-bottom: 32rpx;
} }
.btn-contanier{
width:558rpx;
margin-top: 176rpx;
}
.loginBtn{ .loginBtn{
width:558rpx; width:558rpx;
height:96rpx; height:96rpx;
background:rgba(134,197,225,1); background:rgba(134,197,225,1);
border-radius:4px; border-radius:4px;
margin-top: 176rpx;
line-height: 96rpx; line-height: 96rpx;
text-align: center; text-align: center;
color:rgba(255,255,255,1); 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
...@@ -8,7 +8,7 @@ Page({ ...@@ -8,7 +8,7 @@ Page({
*/ */
data: { data: {
mask:false, mask:false,
type:0, //判断是否是认证的了 type:1, //判断是否是认证的了
approveList:['园区门票优惠','餐厅价格优惠','SPA服务优惠','免费观看电影','无须预约入园','尽享多重特权'] approveList:['园区门票优惠','餐厅价格优惠','SPA服务优惠','免费观看电影','无须预约入园','尽享多重特权']
}, },
//去认证 //去认证
...@@ -20,15 +20,20 @@ Page({ ...@@ -20,15 +20,20 @@ Page({
close(){ close(){
this.setData({ this.setData({
mask:false mask:false
});
wx.showTabBar({
animation: true,
}) })
}, },
maskShow(){ maskShow(){
this.setData({ this.setData({
mask:true mask:true
});
wx.hideTabBar({
animation: true,
}) })
}, },
myAppoinment(){ myAppoinment(){
console.log('666')
wx.navigateTo({ wx.navigateTo({
url: '../../pages/home/home.wxml', url: '../../pages/home/home.wxml',
}) })
......
pages/mine/mine.json
{ {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"usingComponents": {} "usingComponents": {}
} }
\ No newline at end of file
pages/myActivity/myActivity.js
...@@ -11,6 +11,7 @@ Page({ ...@@ -11,6 +11,7 @@ Page({
{content:'进行中',type:'2'}, {content:'进行中',type:'2'},
{content:'已结束',type:'3'}, {content:'已结束',type:'3'},
], ],
height:0,
data:[ data:[
{time:'6月30日 10:00-12:00',type:'0',content:'云之亭广场外侧',title:'海滩夏日音乐节'}, {time:'6月30日 10:00-12:00',type:'0',content:'云之亭广场外侧',title:'海滩夏日音乐节'},
{time:'6月30日 10:00-12:00',type:'1',content:'云之亭广场外侧',title:'海滩夏日音乐节'}, {time:'6月30日 10:00-12:00',type:'1',content:'云之亭广场外侧',title:'海滩夏日音乐节'},
...@@ -32,7 +33,9 @@ Page({ ...@@ -32,7 +33,9 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
this.setData({
height: wx.getSystemInfoSync().windowHeight, //获取屏幕的高度
})
}, },
/** /**
......
pages/myActivity/myActivity.wxml
<navigation class="navigation" titleText="我的活动" backIcon="/image/back.png"></navigation> <navigation class="navigation" titleText="我的活动" backIcon="/image/back.png"></navigation>
<view class="container all"> <view class="container all" >
<view class="myActivity-container"> <view class="myActivity-container" style="min-height:{{height}}px;">
<view class="activity-nav"> <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 bindtap="chageNav" data-index="{{index}}" wx:for="{{navItem}}" wx:key="index" class="navItem {{index == active? 'active':''}}">{{item.content}}</view>
</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-item " data-type="{{item.type}}" wx:for="{{data}}" wx:key="index" bindtap="activityDetail">
<view class="my-activities-top {{item.type == 2?'timeendColor':''}}"> <view class="my-activities-top {{item.type == 2?'timeendColor':''}}">
{{item.time}} {{item.time}}
......
pages/myActivity/myActivity.wxss
/* pages/myActivity/myActivity.wxss */ /* pages/myActivity/myActivity.wxss */
.all{ .all{
height: 100%;
background-color: rgba(243,244,246,1); background-color: rgba(243,244,246,1);
} }
.myActivity-container{ .myActivity-container{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment