04-25 更新

This commit is contained in:
Weilanwl
2019-04-25 22:53:29 +08:00
parent b253da90f8
commit efff75adb9
24 changed files with 183 additions and 313 deletions

View File

@@ -61,7 +61,7 @@
</view>
</view>
<view class="grid col-5 padding-sm">
<view class="margin-tb-sm text-center" v-for="(item,index) in ColorList" :key="index">
<view class="margin-tb-sm text-center" v-for="(item,index) in ColorList" :key="index" v-if="item.name!='white'">
<button class="cu-btn round" :class="[bordersize?'lines-' + item.name:'line-' + item.name, shadow?'shadow':'']">{{item.title}}</button>
</view>
</view>

View File

@@ -6,13 +6,12 @@
<button class="cu-btn" :class="[border?bordersize?'lines-' + color:'line-' + color:'bg-'+ color,round?'round':'',size,shadow?'shadow':'']">我是一个按钮</button>
</view>
<view class="padding text-center">
class="cu-btn <text v-if="color">{{' '}} {{border?bordersize?'lines-' + color:'line-' + color:'bg-'+ color}}
{{round?'round':''}} {{size}} {{shadow?'shadow':''}}</text>"
class="cu-btn <text v-if="color">{{' '}} {{border?bordersize?'lines-' + color:'line-' + color:'bg-'+ color}} {{round?'round':''}} {{size}} {{shadow?'shadow':''}}</text>"
</view>
</view>
<view class="cu-form-group margin-top" @tap="showModal" data-target="ColorModal">
<view class="title">选择颜色</view>
<view class="padding-sm solid radius shadow-blur" :class="'bg-'+color"></view>
<view class="padding solid radius shadow-blur" :class="'bg-'+color"></view>
</view>
<view class="cu-form-group">
<view class="title">是否圆角</view>
@@ -65,7 +64,7 @@
</view>
</view>
<view class="grid col-5 padding">
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index" @tap="SetColor" :data-color="item.name">
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index" @tap="SetColor" :data-color="item.name" v-if="item.name!='white'">
<view class="padding-tb radius" :class="'bg-' + item.name"> {{item.title}} </view>
</view>
</view>
@@ -82,7 +81,7 @@
modalName: '',
round: false,
size: '',
color: '',
color: 'red',
shadow: false,
border: false,
bordersize: ''

View File

@@ -18,6 +18,7 @@
<script>
export default {
name: "basics",
data() {
return {
elements: [{

View File

@@ -39,7 +39,7 @@
<text class="cuIcon-title text-blue"></text>进度条颜色
</view>
<view class="action">
<view class="padding-sm solid radius shadow-blur" :class="'bg-' + color"></view>
<view class="padding solid radius shadow-blur" :class="'bg-' + color"></view>
</view>
</view>
<view class="padding" :class="color=='white'?'bg-grey':'bg-white'">
@@ -104,8 +104,7 @@
</view>
</view>
<view class="grid col-5 padding">
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index" @tap="SetColor" :data-color="item.name"
v-if="item.name!='gray'">
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index" @tap="SetColor" :data-color="item.name" v-if="item.name!='gray' && item.name!='white'">
<view class="padding-tb radius" :class="'bg-' + item.name"> {{item.title}} </view>
</view>
</view>

View File

@@ -27,10 +27,10 @@
</view>
</view>
<view class='padding-sm flex flex-wrap'>
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index">
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index" v-if="item.name!='gray'">
<view class='cu-tag' :class="'bg-' + item.name">{{item.title}}</view>
</view>
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index" v-if="index<12">
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index" v-if="item.name!='gray' && item.name!='black' && item.name!='white'">
<view class='cu-tag light' :class="'bg-' + item.name">{{item.title}}</view>
</view>
</view>
@@ -40,7 +40,7 @@
</view>
</view>
<view class='padding-sm flex flex-wrap'>
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index">
<view class="padding-xs" v-for="(item,index) in ColorList" :key="index" v-if="item.name!='white'">
<view class='cu-tag' :class="'line-' + item.name">{{item.title}}</view>
</view>
</view>