Skip to content

Commit

Permalink
v2.0.7
Browse files Browse the repository at this point in the history
v2.0.7
  • Loading branch information
wen-gang committed Feb 25, 2019
1 parent e2e35a2 commit d59a310
Show file tree
Hide file tree
Showing 14 changed files with 268 additions and 178 deletions.
3 changes: 2 additions & 1 deletion demo/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"pages/about/test/filter",
"pages/about/home/home",
"custom-tab-bar/index",
"pages/plugin/drawer/drawer"
"pages/plugin/drawer/drawer",
"pages/plugin/verticalnav/verticalnav"
],
"window": {
"navigationBarBackgroundColor": "#39b54a",
Expand Down
6 changes: 4 additions & 2 deletions demo/pages/about/log/log.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
<view class="bg-gradual-green content shadow-blur">
<view class="cu-capsule radius">
<view class="cu-tag bg-white text-green">v2.0.7</view>
<view class="cu-tag line-white">2019/02/20</view>
<view class="cu-tag line-white">2019/02/25</view>
</view>
<view class='margin-top-sm text-content'>
<view>1.新增操作条胶囊样式,优化全屏操作条</view>
<view>2.新增操垂直导航</view>
<view>2.优化iPhone X的Tabbar样式</view>
<view>3.新增全屏抽屉插件</view>
<view>4.新增垂直导航插件</view>
</view>
</view>
</view>
Expand Down
75 changes: 0 additions & 75 deletions demo/pages/component/nav/nav.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -68,78 +68,3 @@
<text class='icon-clothesfill'></text> 皮肤
</view>
</scroll-view>

<view class="cu-bar bg-white margin-top solid-bottom">
<view class='action'>
<text class='icon-title text-orange'></text> 垂直导航
</view>
</view>
<view class="ScrollBox">
<scroll-view class="ScrollNav nav" scroll-y scroll-with-animation scroll-top="{{scrollNavTop}}" style="height:calc(100vh - 375rpx)">
<view class="cu-item {{index==TabCur?'text-green cur':''}}" wx:for="{{20}}" wx:key bindtap='tabSelect' data-id="{{index}}">
Tab{{index +1}}
</view>
</scroll-view>
<scroll-view class="ScrollMain" scroll-y scroll-with-animation style="height:calc(100vh - 375rpx)" scroll-into-view="main-id-{{TabCur}}" bindscroll="ScrollMain">
<view class="padding-top padding-lr" wx:for="{{20}}" wx:key id="main-id-{{index}}">
<view class='cu-bar solid-bottom bg-white'>
<view class='action'>
<text class='icon-title text-green'></text> Tab{{index +1}}</view>
</view>
<view class="cu-list menu menu-avatar">
<view class="cu-item">
<view class="cu-avatar round lg" style="background-image:url(https://image.weilanwl.com/img/square-1.jpg);"></view>
<view class='content'>
<view class='text-grey'>文晓港</view>
<view class='text-gray text-sm'>
<text class='icon-infofill text-red'></text> 消息未送达</view>
</view>
<view class='action'>
<view class='text-grey text-xs'>22:20</view>
<view class="cu-tag round bg-grey sm">5</view>
</view>
</view>
<view class="cu-item">
<view class="cu-avatar round lg" style="background-image:url(https://image.weilanwl.com/img/square-2.jpg);">
<view class="cu-tag badge">99+</view>
</view>
<view class='content'>
<view class='text-grey'>文晓港
<view class="cu-tag round bg-orange sm">SVIP</view>
</view>
<view class='text-gray text-sm'>
<text class='icon-redpacket_fill text-red'></text> 收到红包</view>
</view>
<view class='action'>
<view class='text-grey text-xs'>22:20</view>
<view class='icon-notice_forbid_fill text-gray'></view>
</view>
</view>
<view class="cu-item ">
<view class="cu-avatar radius lg" style="background-image:url(https://image.weilanwl.com/img/square-3.jpg);"></view>
<view class='content'>
<view>喵星人互动群</view>
<view class='text-gray text-sm'>
喵星酱:喵喵喵!</view>
</view>
<view class='action'>
<view class='text-grey text-xs'>22:20</view>
<view class="cu-tag round bg-red sm">5</view>
</view>
</view>
<view class="cu-item grayscale">
<view class="cu-avatar radius lg" style="background-image:url(https://image.weilanwl.com/img/square-3.jpg);"></view>
<view class='content'>
<view>喵星人互动群</view>
<view class='text-gray text-sm'>
喵星酱:喵喵喵!</view>
</view>
<view class='action'>
<view class='text-grey text-xs'>22:20</view>
<view class="cu-tag round bg-red sm">5</view>
</view>
</view>
</view>
</view>
</scroll-view>
</view>
37 changes: 0 additions & 37 deletions demo/pages/component/nav/nav.wxss
Original file line number Diff line number Diff line change
@@ -1,37 +0,0 @@
/* pages/component/nav/nav.wxss */
.ScrollNav.nav {
width: 200rpx;
white-space: initial;
}

.ScrollNav.nav .cu-item {
width: 100%;
text-align: center;
background-color: #fff;
margin: 0;
border: none;
height: 50px;
position: relative;
}

.ScrollNav.nav .cu-item.cur {
background-color: #f1f1f1;
}
.ScrollNav.nav .cu-item.cur::after {
content: "";
width: 8rpx;
height: 30rpx;
border-radius: 10rpx 0 0 10rpx;
position: absolute;
background-color: currentColor;
top: 0;
right: 0rpx;
bottom: 0;
margin: auto;
}
.ScrollBox{
display: flex;
}
.ScrollMain{
background-color: #f1f1f1;
}
46 changes: 26 additions & 20 deletions demo/pages/plugin/drawer/drawer.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,33 @@
</block>
</view>
<!-- 样式1 -->
<view class="action {{1==TabCur?'cur':''}}" bindtap='tabSelect' data-id="1">
<view class='icon-cu-image'>
<image src='/images/tabbar/component{{1==TabCur?"_cur":""}}.png'></image>
<block wx:if="{{1==TabCur?'cur':''}}">
<view class="action {{1==TabCur?'cur':''}}" bindtap='tabSelect' data-id="1">
<view class='icon-cu-image'>
<image src='/images/tabbar/component{{1==TabCur?"_cur":""}}.png'></image>
</view>
</view>
</view>
<view class="action {{2==TabCur?'cur':''}}" bindtap='tabSelect' data-id="2">
<view class='icon-cu-image'>
<image src='/images/tabbar/plugin{{2==TabCur?"_cur":""}}.png'></image>
<view class='cu-tag badge'>99</view>
<view class="action {{2==TabCur?'cur':''}}" bindtap='tabSelect' data-id="2">
<view class='icon-cu-image'>
<image src='/images/tabbar/plugin{{2==TabCur?"_cur":""}}.png'></image>
<view class='cu-tag badge'>99</view>
</view>
</view>
</view>
<view class="action {{3==TabCur?'cur':''}}" bindtap='tabSelect' data-id="3">
<view class='icon-cu-image'>
<image src='/images/tabbar/about{{3==TabCur?"_cur":""}}.png'></image>
<view class='cu-tag badge'></view>
<view class="action {{3==TabCur?'cur':''}}" bindtap='tabSelect' data-id="3">
<view class='icon-cu-image'>
<image src='/images/tabbar/about{{3==TabCur?"_cur":""}}.png'></image>
<view class='cu-tag badge'></view>
</view>
</view>
</view>
</block>
<!-- 样式2 -->
<!-- <scroll-view scroll-x class="nav" scroll-with-animation scroll-left="{{scrollLeft}}" style='width:calc(100% - 440rpx)'>
<view class="cu-item {{index==TabCur?'text-green cur':''}}" wx:for="{{10}}" wx:key bindtap='tabSelect' data-id="{{index}}">
Tab{{index}}
</view>
</scroll-view> -->
<block wx:if="{{1!=TabCur?'cur':''}}">
<scroll-view scroll-x class="nav" scroll-with-animation scroll-left="{{scrollLeft}}" style='width:calc(100% - 440rpx)'>
<view class="cu-item {{index==TabCur?'text-green cur':''}}" wx:for="{{10}}" wx:key bindtap='tabSelect' data-id="{{index}}">
Tab{{index}}
</view>
</scroll-view>
</block>
</view>
</view>
<view wx:for="{{10}}" wx:key wx:if="{{index==TabCur}}" class='padding margin text-center'>
Expand All @@ -41,7 +45,9 @@
</navigator>
</view>
</view>
<view class="DrawerClose {{modalName=='viewModal'?'show':''}}" bindtap='hideModal'><text class='icon-pullright'></text></view>
<view class="DrawerClose {{modalName=='viewModal'?'show':''}}" bindtap='hideModal'>
<text class='icon-pullright'></text>
</view>
<view class="DrawerWindow {{modalName=='viewModal'?'show':''}}">
<view class='padding-xl text-center text-white'>
<image src='/images/logo.png' class='response' mode='widthFix' style='width:200rpx;margin-top:100rpx'></image>
Expand Down
5 changes: 5 additions & 0 deletions demo/pages/plugin/home/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ Component({
title: '全屏抽屉',
img: 'https://image.weilanwl.com/color2.0/plugin/qpct2148.jpg',
url: '../drawer/drawer'
},
{
title: '垂直导航',
img: 'https://image.weilanwl.com/color2.0/plugin/qpczdh2307.jpg',
url: '../verticalnav/verticalnav'
}
]
},
Expand Down
19 changes: 19 additions & 0 deletions demo/pages/plugin/verticalnav/verticalnav.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
const app = getApp()
Page({
data: {
StatusBar: app.globalData.StatusBar,
CustomBar: app.globalData.CustomBar,
Custom: app.globalData.Custom,
TabCur: 0,
VerticalNavTop: 0
},
tabSelect(e) {
this.setData({
TabCur: e.currentTarget.dataset.id,
VerticalNavTop: (e.currentTarget.dataset.id - 1) * 50
})
},
VerticalMain(e) {
console.log(e.detail);
}
})
3 changes: 3 additions & 0 deletions demo/pages/plugin/verticalnav/verticalnav.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"usingComponents": {}
}
82 changes: 82 additions & 0 deletions demo/pages/plugin/verticalnav/verticalnav.wxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<view class='cu-custom'>
<view class="cu-bar fixed bg-shadeTop" style="height:{{CustomBar}}px;padding-top:{{StatusBar}}px;">
<navigator class='action' open-type="navigateBack" delta="1" hover-class="none">
<text class='icon-back'></text> 返回
</navigator>
<view class='content' style='top:{{StatusBar}}px;'>Tab索引</view>
</view>
</view>
<swiper class="screen-swiper round-dot" indicator-dots="true" circular="true" autoplay="true" interval="5000" duration="500">
<swiper-item wx:for="{{4}}" wx:key>
<image src="https://image.weilanwl.com/img/4x3-{{index+1}}.jpg" mode='aspectFill'></image>
</swiper-item>
</swiper>
<view class="VerticalBox">
<scroll-view class="VerticalNav nav" scroll-y scroll-with-animation scroll-top="{{VerticalNavTop}}" style="height:calc(100vh - 375rpx)">
<view class="cu-item {{index==TabCur?'text-green cur':''}}" wx:for="{{20}}" wx:key bindtap='tabSelect' data-id="{{index}}">
Tab{{index +1}}
</view>
</scroll-view>
<scroll-view class="VerticalMain" scroll-y scroll-with-animation style="height:calc(100vh - 375rpx)" scroll-into-view="main-id-{{TabCur}}" bindscroll="VerticalMain">
<view class="padding-top padding-lr" wx:for="{{20}}" wx:key id="main-id-{{index}}">
<view class='cu-bar solid-bottom bg-white'>
<view class='action'>
<text class='icon-title text-green'></text> Tab{{index +1}}</view>
</view>
<view class="cu-list menu menu-avatar">
<view class="cu-item">
<view class="cu-avatar round lg" style="background-image:url(https://image.weilanwl.com/img/square-1.jpg);"></view>
<view class='content'>
<view class='text-grey'>文晓港</view>
<view class='text-gray text-sm'>
<text class='icon-infofill text-red'></text> 消息未送达</view>
</view>
<view class='action'>
<view class='text-grey text-xs'>22:20</view>
<view class="cu-tag round bg-grey sm">5</view>
</view>
</view>
<view class="cu-item">
<view class="cu-avatar round lg" style="background-image:url(https://image.weilanwl.com/img/square-2.jpg);">
<view class="cu-tag badge">99+</view>
</view>
<view class='content'>
<view class='text-grey'>文晓港
<view class="cu-tag round bg-orange sm">SVIP</view>
</view>
<view class='text-gray text-sm'>
<text class='icon-redpacket_fill text-red'></text> 收到红包</view>
</view>
<view class='action'>
<view class='text-grey text-xs'>22:20</view>
<view class='icon-notice_forbid_fill text-gray'></view>
</view>
</view>
<view class="cu-item ">
<view class="cu-avatar radius lg" style="background-image:url(https://image.weilanwl.com/img/square-3.jpg);"></view>
<view class='content'>
<view>喵星人互动群</view>
<view class='text-gray text-sm'>
喵星酱:喵喵喵!</view>
</view>
<view class='action'>
<view class='text-grey text-xs'>22:20</view>
<view class="cu-tag round bg-red sm">5</view>
</view>
</view>
<view class="cu-item grayscale">
<view class="cu-avatar radius lg" style="background-image:url(https://image.weilanwl.com/img/square-3.jpg);"></view>
<view class='content'>
<view>喵星人互动群</view>
<view class='text-gray text-sm'>
喵星酱:喵喵喵!</view>
</view>
<view class='action'>
<view class='text-grey text-xs'>22:20</view>
<view class="cu-tag round bg-red sm">5</view>
</view>
</view>
</view>
</view>
</scroll-view>
</view>
37 changes: 37 additions & 0 deletions demo/pages/plugin/verticalnav/verticalnav.wxss
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/* pages/component/nav/nav.wxss */
.VerticalNav.nav {
width: 200rpx;
white-space: initial;
}

.VerticalNav.nav .cu-item {
width: 100%;
text-align: center;
background-color: #fff;
margin: 0;
border: none;
height: 50px;
position: relative;
}

.VerticalNav.nav .cu-item.cur {
background-color: #f1f1f1;
}
.VerticalNav.nav .cu-item.cur::after {
content: "";
width: 8rpx;
height: 30rpx;
border-radius: 10rpx 0 0 10rpx;
position: absolute;
background-color: currentColor;
top: 0;
right: 0rpx;
bottom: 0;
margin: auto;
}
.VerticalBox{
display: flex;
}
.VerticalMain{
background-color: #f1f1f1;
}
15 changes: 11 additions & 4 deletions demo/project.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"list": []
},
"miniprogram": {
"current": 31,
"current": 32,
"list": [
{
"id": 0,
Expand Down Expand Up @@ -194,10 +194,17 @@
"pathName": "pages/plugin/animation/animation",
"query": ""
},
{
"id": 31,
"name": "3.3 扩展-全屏抽屉",
"pathName": "pages/plugin/drawer/drawer",
"query": "",
"scene": null
},
{
"id": 31,
"name": "3.3 扩展-全屏抽屉",
"pathName": "pages/plugin/drawer/drawer",
"id": -1,
"name": "3.4 扩展-垂直导航",
"pathName": "pages/plugin/home/home",
"query": "",
"scene": null
},
Expand Down
Loading

0 comments on commit d59a310

Please sign in to comment.