Skip to content

Commit

Permalink
v2.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
wen-gang committed Apr 23, 2019
1 parent 17ff7fb commit ac2a320
Show file tree
Hide file tree
Showing 49 changed files with 6,529 additions and 4,915 deletions.
Binary file modified Colorui-UniApp/Colorui-UniApp214.zip
Binary file not shown.
5 changes: 5 additions & 0 deletions demo/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
//app.js
App({
onLaunch: function() {
if (wx.cloud) {
wx.cloud.init({
traceUser: true
})
}
wx.getSystemInfo({
success: e => {
this.globalData.StatusBar = e.statusBarHeight;
Expand Down
1 change: 0 additions & 1 deletion demo/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"pages/plugin/indexes/indexes",
"pages/plugin/gradual/gradual",
"pages/plugin/animation/animation",
"pages/auth/auth",
"pages/about/about/about",
"pages/about/log/log",
"pages/about/test/list",
Expand Down
6 changes: 3 additions & 3 deletions demo/colorui/components/cu-custom.wxml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<view class="cu-custom" style="height:{{CustomBar}}px">
<view class="cu-bar fixed {{bgImage!=''?'none-bg text-white bg-img':''}} {{bgColor}}" style="height:{{CustomBar}}px;padding-top:{{StatusBar}}px;{{bgImage?'background-image:url(' + bgImage+')':''}}">
<view class="action" bindtap="BackPage" wx:if="{{isBack}}">
<text class="icon-back"></text>
<text class="cuIcon-back"></text>
<slot name="backText"></slot>
</view>
<view class="action border-custom" wx:if="{{isCustom}}" style="width:{{Custom.width}}px;height:{{Custom.height}}px;margin-left:calc(750rpx - {{Custom.right}}px)">
<text class="icon-back" bindtap="BackPage"></text>
<text class="icon-homefill" bindtap="toHome"></text>
<text class="cuIcon-back" bindtap="BackPage"></text>
<text class="cuIcon-homefill" bindtap="toHome"></text>
</view>
<view class="content" style="top:{{StatusBar}}px">
<slot name="content"></slot>
Expand Down
1,242 changes: 918 additions & 324 deletions demo/colorui/icon.wxss

Large diffs are not rendered by default.

Loading

0 comments on commit ac2a320

Please sign in to comment.