v2.0.2 (单位全局使用rpx)

v2.0.2 (单位全局使用rpx)

demo/pages/basics/home/home.js

@@ -13,6 +13,29 @@ Page({
       { title: '加载', name: 'loading', color: 'green', icon: 'loading2' },
     ],
   },
+  onLoad() {
+    let that = this;
+    // 获取用户信息
+    wx.getSetting({
+      success: res => {
+        if (!res.authSetting['scope.userInfo']) {
+          wx.redirectTo({
+            url: '/pages/auth/auth'
+          })
+        }
+      }
+    })
+  },
+  showModal(e) {
+    this.setData({
+      modalName: e.currentTarget.dataset.target
+    })
+  },
+  hideModal(e) {
+    this.setData({
+      modalName: null
+    })
+  },
   onShareAppMessage(){
     return {
       title: 'ColorUI-高颜值的小程序UI组件库',

demo/pages/component/form/form.wxml

@@ -97,8 +97,8 @@
     <switch class='red sm' checked/>
   </form-group>
   <form-group>
+    <switch class='switch-sex' checked/>
     <view class='title'>定义图标</view>
-    <switch class='switch-sex sm' checked/>
   </form-group>
   <form-group>
     <view class='title'>方形开关</view>

demo/pages/component/swiper/swiper.js

@@ -46,7 +46,6 @@ Page({
   // 初始化towerSwiper
   towerSwiper(name) {
     let list = this.data[name];
-
     for (let i = 0; i < list.length; i++) {
       list[i].zIndex = parseInt(list.length / 2) + 1 - Math.abs(i - parseInt(list.length / 2))
       list[i].mLeft = i - parseInt(list.length / 2)
@@ -99,6 +98,5 @@ Page({
         towerList: list
       })
     }
-    console.log(list);
   },
 });

demo/pages/include/custom/custom.js

@@ -1,23 +0,0 @@
-// pages/include/custom/custom.js
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
-  }
-})

demo/pages/include/custom/custom.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

demo/pages/include/custom/custom.wxss

@@ -1 +0,0 @@
-@import "../../../app.wxss";

demo/pages/plugin/home/home.wxss

@@ -1,41 +1,41 @@
 
 bar .content image{
-  height: 30px;
+  height: 60rpx;
-  width: 120px;
+  width: 240rpx;
 }
 
 .cardTitle{
   color: #fff;
-  padding: 45px 30px;
+  padding: 90rpx 60rpx;
-  font-size: 20px;
+  font-size: 40rpx;
   font-weight: 300;
   transform: skew(-10deg, 0deg);
   position: relative;
-  text-shadow: 0px 0px 3px rgba(0,0,0,0.3)
+  text-shadow: 0px 0px 6rpx rgba(0,0,0,0.3)
 }
 
 .cardTitle::before{
   content: "";
   position: absolute;
-  width: 30px;
+  width: 60rpx;
-  height: 3px;
+  height: 6rpx;
-  border-radius: 10px;
+  border-radius: 20rpx;
   background-color: #fff;
   display: block;
-  top: 30px;
+  top: 60rpx;
-  left: 25px;  
+  left: 50rpx;  
   transform: skew(10deg, 0deg);
 }
 .cardTitle::after{
   content: "";
   position: absolute;
-  width: 70px;
+  width: 140rpx;
-  border-radius: 3px;
+  border-radius: 6rpx;
-  height: 12px;
+  height: 24rpx;
   background-color: #fff;
   display: block;
-  bottom: 38px;
+  bottom: 76rpx;
-  left: 45px;  
+  left: 90rpx;  
   transform: skew(10deg, 0deg);
   opacity: 0.1;
 }

demo/pages/test.js

@@ -1,17 +0,0 @@
-const app = getApp();
-Page({
-  data: {
-    StatusBar: app.globalData.StatusBar,
-    CustomBar: app.globalData.CustomBar,
-    ColorList: app.globalData.ColorList,
-    scrollLeft: 0,
-    TabCur: 0,
-  },
-  tabSelect(e) {
-    console.log(e);
-    this.setData({
-      TabCur: e.currentTarget.dataset.id,
-      scrollLeft: (e.currentTarget.dataset.id - 1) * 60
-    })
-  },
-});

demo/pages/test.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

demo/pages/test.wxml

@@ -1,13 +0,0 @@
-<custom style="height:{{CustomBar}}px;">
-  <bar class="fixed gradual-green" style="height:{{CustomBar}}px;padding-top:{{StatusBar}}px;">
-    <navigator class='action' open-type="navigateBack" delta="1" hover-class="none">
-      <icon class='icon-back' /> 测试
-    </navigator>
-  </bar>
-</custom>
-
-
-<view class='padding margin'>
-  <view class="bg-red" style='animation: show 1s 1;-webkit-animation: show 1s 1;'>测试页</view>
-</view>
-

demo/pages/test.wxss

@@ -1,38 +0,0 @@
-.ABox {
-  color: #666;
-  padding: 15px;
-  border-radius: 6px;
-  width: 45%;
-  margin: 0 2.5% 20px;
-  background-image: url(https://image.weilanwl.com/color2.0/cardBg.png);
-  background-size: cover;
-  background-position: center;
-  position: relative;
-  z-index: 1;
-}
-
-.ABox::after {
-  content: "";
-  position: absolute;
-  z-index: -1;
-  background-color: inherit;
-  width: 100%;
-  height: 100%;
-  left: 0;
-  bottom: -10%;
-  border-radius: 5px;
-  opacity: 0.2;
-  transform: scale(0.9, 0.9);
-}
-.Box {
-  color: #666;
-  padding: 15px;
-  border-radius: 6px;
-  width: 45%;
-  margin: 0 2.5% 20px;
-  background-image: url(https://image.weilanwl.com/color2.0/cardBg.png);
-  background-size: cover;
-  background-position: center;
-  position: relative;
-  z-index: 1;
-}

template/app.wxss

@@ -1,2 +1,2 @@
 @import "icon.wxss";
-@import "colorui.wxss";
+@import "colorui-rpx.wxss";