Commit 0dbf439f authored by 李晖's avatar 李晖

node-sass写法升级到sass写法

parent 9a4aaa0b
Pipeline #978 failed with stages
...@@ -3,3 +3,4 @@ ...@@ -3,3 +3,4 @@
/.idea/* /.idea/*
deploy.sh deploy.sh
.hbuilderx/ .hbuilderx/
/package-lock.json
...@@ -18,6 +18,6 @@ ...@@ -18,6 +18,6 @@
</script> </script>
<style lang="scss"> <style lang="scss">
@import "uview-ui/index.scss"; @use "uview-ui/index.scss" as *;
@import "common/demo.scss"; @use "common/demo.scss" as *;
</style> </style>
\ No newline at end of file
...@@ -92,14 +92,14 @@ Vue.use(uView); ...@@ -92,14 +92,14 @@ Vue.use(uView);
```css ```css
/* App.vue */ /* App.vue */
<style lang="scss"> <style lang="scss">
@import "uview-ui/index.scss"; @use "uview-ui/index.scss" as *;
</style> </style>
``` ```
3. `uni.scss`引入全局scss变量文件 3. `uni.scss`引入全局scss变量文件
```css ```css
/* uni.scss */ /* uni.scss */
@import "uview-ui/theme.scss"; @use "uview-ui/theme.scss" as *;
``` ```
4. `pages.json`配置easycom规则(按需引入) 4. `pages.json`配置easycom规则(按需引入)
......
@use "@/uview-ui/theme.scss" as *;
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
view, view,
text { text {
...@@ -43,7 +45,7 @@ text { ...@@ -43,7 +45,7 @@ text {
display: inline-block; display: inline-block;
/* #endif */ /* #endif */
text-align: left; text-align: left;
} }
.u-demo-title, .u-demo-title,
......
...@@ -50,7 +50,7 @@ export default { ...@@ -50,7 +50,7 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.nav-wrap { .nav-wrap {
padding: 15px; padding: 15px;
position: relative; position: relative;
......
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
"versionName" : "1.8.8", "versionName" : "1.8.8",
"versionCode" : "100", "versionCode" : "100",
"transformPx" : false, "transformPx" : false,
"sass": {
"prependData": "@use '@/uview-ui/libs/css/theme.scss' as *;",
"sassOptions": {
"includePaths": ["node_modules"]
}
},
"app-plus" : { "app-plus" : {
// APP-VUE分包,可提APP升启动速度,2.7.12开始支持,兼容微信小程序分包方案,默认关闭 // APP-VUE分包,可提APP升启动速度,2.7.12开始支持,兼容微信小程序分包方案,默认关闭
"optimization" : { "optimization" : {
......
{
"name": "uView",
"version": "1.0.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"vue-i18n": {
"version": "8.20.0",
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.20.0.tgz",
"integrity": "sha512-ZiAOoeR4d/JtKpbjipx3I80ey7cYG1ki5gQ7HwzWm4YFio9brA15BEYHjalEoBaEfzF5OBEZP+Y2MvAaWnyXXg=="
}
}
}
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
<view class="u-demo-wrap"> <view class="u-demo-wrap">
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-avatar <u-avatar
:mode="mode" :mode="mode"
:size="size" :size="size"
:src="src" :src="src"
:text="text" :text="text"
:showLevel="showLevel" :showLevel="showLevel"
:showSex="showSex" :showSex="showSex"
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<view class="u-config-item"> <view class="u-config-item">
<view class="u-item-title">尺寸</view> <view class="u-item-title">尺寸</view>
<u-subsection current="1" :list="['large', 'default', 'mini', 160]" @change="sizeChange"></u-subsection> <u-subsection current="1" :list="['large', 'default', 'mini', 160]" @change="sizeChange"></u-subsection>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
...@@ -85,6 +85,6 @@ ...@@ -85,6 +85,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;@use "@/uview-ui/theme.scss" as *;
</style> </style>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo { .u-demo {
height: 200vh; height: 200vh;
} }
......
...@@ -104,8 +104,8 @@ ...@@ -104,8 +104,8 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo { .u-demo {
} }
</style> </style>
...@@ -101,14 +101,14 @@ ...@@ -101,14 +101,14 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo-area { .u-demo-area {
height: 160px; height: 160px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.u-demo-area .u-empty { .u-demo-area .u-empty {
padding-top: 0; padding-top: 0;
} }
......
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo { .u-demo {
} }
</style> </style>
...@@ -437,6 +437,7 @@ export default { ...@@ -437,6 +437,7 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 30rpx; padding: 30rpx;
} }
......
...@@ -44,6 +44,6 @@ ...@@ -44,6 +44,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -621,6 +621,7 @@ ...@@ -621,6 +621,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.list-cell { .list-cell {
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
......
...@@ -7,15 +7,15 @@ ...@@ -7,15 +7,15 @@
<input class="input" disabled type="text" :value="input" placeholder="来自键盘的输入内容" /> <input class="input" disabled type="text" :value="input" placeholder="来自键盘的输入内容" />
<u-button :custom-style="{height: '32px'}" :hairLine="false" class="clear-btn" @tap="input = ''">清空</u-button> <u-button :custom-style="{height: '32px'}" :hairLine="false" class="clear-btn" @tap="input = ''">清空</u-button>
</view> </view>
<u-keyboard :mask="mask" ref="uKeyboard" safe-area-inset-bottom @confirm="confirm" <u-keyboard :mask="mask" ref="uKeyboard" safe-area-inset-bottom @confirm="confirm"
:random="random" :dotEnable="false" :mode="mode" :random="random" :dotEnable="false" :mode="mode"
:confirmBtn="true" :cancelBtn="true" :tooltip="tooltip" v-model="show" :confirmBtn="true" :cancelBtn="true" :tooltip="tooltip" v-model="show"
@change="change" @backspace="backspace"></u-keyboard> @change="change" @backspace="backspace"></u-keyboard>
</view> </view>
</view> </view>
<view class="u-config-wrap"> <view class="u-config-wrap">
<view class="u-config-title u-border-bottom"> <view class="u-config-title u-border-bottom">
参数配置 参数配置
</view> </view>
<view class="u-config-item"> <view class="u-config-item">
<view class="u-item-title">键盘开关</view> <view class="u-item-title">键盘开关</view>
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
data() { data() {
return { return {
show: false, show: false,
input: '', input: '',
mode: 'number', mode: 'number',
random: false, random: false,
tooltip: true, tooltip: true,
mask: true, mask: true,
} }
}, },
methods: { methods: {
...@@ -85,13 +85,14 @@ ...@@ -85,13 +85,14 @@
this.input += detail; this.input += detail;
}, },
confirm(e) { confirm(e) {
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
@use "@/uview-ui/theme.scss" as *;
.input { .input {
border: 1px solid $u-light-color; border: 1px solid $u-light-color;
border-radius: 4px; border-radius: 4px;
...@@ -101,11 +102,11 @@ ...@@ -101,11 +102,11 @@
flex: 1; flex: 1;
box-sizing: border-box; box-sizing: border-box;
} }
.input-wrap { .input-wrap {
display: flex; display: flex;
} }
.clear-btn { .clear-btn {
margin-left: 10px; margin-left: 10px;
font-size: 28rpx; font-size: 28rpx;
......
...@@ -227,22 +227,22 @@ ...@@ -227,22 +227,22 @@
}, 1500); }, 1500);
} }
}, },
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 30rpx; padding: 30rpx;
display: block; display: block;
} }
.item-warp { .item-warp {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
} }
.item-warp .item { .item-warp .item {
flex: 0 0 335rpx; flex: 0 0 335rpx;
height: 400rpx; height: 400rpx;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<view class="u-no-demo-here">请点击弹出弹窗查看效果</view> <view class="u-no-demo-here">请点击弹出弹窗查看效果</view>
<u-modal ref="uModal" v-model="show" :show-cancel-button="true" <u-modal ref="uModal" v-model="show" :show-cancel-button="true"
:show-title="showTitle" :async-close="asyncClose" :show-title="showTitle" :async-close="asyncClose"
@confirm="confirm" :content="content" @confirm="confirm" :content="content"
> >
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.logo { .logo {
height: auto; height: auto;
will-change: transform; will-change: transform;
......
<template> <template>
<view class=""> <view class="">
<u-navbar title-color="#fff" back-icon-color="#ffffff" <u-navbar title-color="#fff" back-icon-color="#ffffff"
:is-fixed="isFixed" :is-back="isBack" :is-fixed="isFixed" :is-back="isBack"
:background="background" :background="background"
:back-text-style="{color: '#fff'}" :title="title" :back-text-style="{color: '#fff'}" :title="title"
:back-icon-name="backIconName" :back-text="backText" :back-icon-name="backIconName" :back-text="backText"
> >
<view class="slot-wrap" v-if="useSlot"> <view class="slot-wrap" v-if="useSlot">
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<view class="u-no-demo-here">查看顶部导航栏效果</view> <view class="u-no-demo-here">查看顶部导航栏效果</view>
</view> </view>
</view> </view>
<view class="u-config-wrap"> <view class="u-config-wrap">
<view class="u-config-title u-border-bottom"> <view class="u-config-title u-border-bottom">
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
background: color background: color
} }
} }
}, },
rightChange(index) { rightChange(index) {
if(index == 0) { if(index == 0) {
...@@ -201,45 +201,45 @@ ...@@ -201,45 +201,45 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo { .u-demo {
//height: 200vh; //height: 200vh;
height: calc(100% - 44px); height: calc(100% - 44px);
height: calc(100% - 44px - constant(safe-area-inset-top)); height: calc(100% - 44px - constant(safe-area-inset-top));
height: calc(100% - 44px - env(safe-area-inset-top)); height: calc(100% - 44px - env(safe-area-inset-top));
} }
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
.navbar-right { .navbar-right {
margin-right: 24rpx; margin-right: 24rpx;
display: flex; display: flex;
} }
.search-wrap { .search-wrap {
margin: 0 20rpx; margin: 0 20rpx;
flex: 1; flex: 1;
} }
.right-item { .right-item {
margin: 0 12rpx; margin: 0 12rpx;
position: relative; position: relative;
color: #ffffff; color: #ffffff;
display: flex; display: flex;
} }
.message-box { .message-box {
} }
.slot-wrap { .slot-wrap {
display: flex; display: flex;
align-items: center; align-items: center;
flex: 1; flex: 1;
} }
.map-wrap { .map-wrap {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
border-radius: 100rpx; border-radius: 100rpx;
margin-left: 30rpx; margin-left: 30rpx;
} }
.map-wrap-text { .map-wrap-text {
padding: 0 6rpx; padding: 0 6rpx;
} }
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.no-net-tips { .no-net-tips {
color: $u-tips-color; color: $u-tips-color;
font-size: 26rpx; font-size: 26rpx;
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
detail: { detail: {
content: ` content: `
<div class="content_area" id="content_area" style="display: block;"> <div class="content_area" id="content_area" style="display: block;">
<!--repaste.body.begin--><p>  巴尼小镇是云南省怒江傈僳族自治州首个易地扶贫搬迁集中安置点。从山上的金满村搬迁到巴尼小镇,近3年的时间里,搬迁户们的生活发生了可喜的变化。</p> <!--repaste.body.begin--><p>  巴尼小镇是云南省怒江傈僳族自治州首个易地扶贫搬迁集中安置点。从山上的金满村搬迁到巴尼小镇,近3年的时间里,搬迁户们的生活发生了可喜的变化。</p>
<p class="photo_img_20190808" style="text-align: center;"><img src="//p2.img.cctvpic.com/photoworkspace/contentimg/2020/07/16/2020071613380766481.jpg" alt="泸水市巴尼小镇易地扶贫搬迁安置点全景 李韩金摄(人民视觉)" isflag="1"></p> <p class="photo_img_20190808" style="text-align: center;"><img src="//p2.img.cctvpic.com/photoworkspace/contentimg/2020/07/16/2020071613380766481.jpg" alt="泸水市巴尼小镇易地扶贫搬迁安置点全景 李韩金摄(人民视觉)" isflag="1"></p>
<p class="photo_alt_20190808" style="text-align: center;"><em></em>泸水市巴尼小镇易地扶贫搬迁安置点全景 李韩金摄(人民视觉)</p> <p class="photo_alt_20190808" style="text-align: center;"><em></em>泸水市巴尼小镇易地扶贫搬迁安置点全景 李韩金摄(人民视觉)</p>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<p>  麻继成说,乡里组织搬迁群众将原住地的土地林地出租、流转或退耕还林,采取“合作社+村党总支+农户+基地”模式,种植花椒、核桃、草果、香橼等经济作物。现在,1000多亩花椒、1000多亩核桃、600多亩草果和300多亩香橼已经成了山上的“绿色银行”。“村里今年准备再发展250亩香橼,香橼两年就能挂果,收益前景非常可观。”</p> <p>  麻继成说,乡里组织搬迁群众将原住地的土地林地出租、流转或退耕还林,采取“合作社+村党总支+农户+基地”模式,种植花椒、核桃、草果、香橼等经济作物。现在,1000多亩花椒、1000多亩核桃、600多亩草果和300多亩香橼已经成了山上的“绿色银行”。“村里今年准备再发展250亩香橼,香橼两年就能挂果,收益前景非常可观。”</p>
<p>  农产品“升了级”,收入也“开了源”。麻继成说,农民在企业承包的果园里务工,每天的工资有100元,如今每天都有二三十人在果园里干活。</p> <p>  农产品“升了级”,收入也“开了源”。麻继成说,农民在企业承包的果园里务工,每天的工资有100元,如今每天都有二三十人在果园里干活。</p>
<p>  “搬出去有盼头,留下来有干劲。”如今,乡里还在加紧研究制定金满村乡村旅游规划。“等客栈、农家乐、步行街都建好了,幸福一定来敲门。”洛本卓乡党委书记郝春荣说,巩固脱贫成果、走向乡村振兴,“好日子还在后头”。</p><!--repaste.body.end--> <p>  “搬出去有盼头,留下来有干劲。”如今,乡里还在加紧研究制定金满村乡村旅游规划。“等客栈、农家乐、步行街都建好了,幸福一定来敲门。”洛本卓乡党委书记郝春荣说,巩固脱贫成果、走向乡村振兴,“好日子还在后头”。</p><!--repaste.body.end-->
</div> </div>
` `
} }
...@@ -55,12 +55,12 @@ ...@@ -55,12 +55,12 @@
onLoad() { onLoad() {
}, },
methods: { methods: {
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-content { .u-content {
padding: 24rpx; padding: 24rpx;
font-size: 32rpx; font-size: 32rpx;
......
...@@ -200,6 +200,7 @@ export default { ...@@ -200,6 +200,7 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.badge-button { .badge-button {
padding: 4rpx 6rpx; padding: 4rpx 6rpx;
background-color: $u-type-error; background-color: $u-type-error;
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<u-slider :step="step" :height="height" :block-width="blockWidth" <u-slider :step="step" :height="height" :block-width="blockWidth"
:active-color="activeColor" :value="30" :active-color="activeColor" :value="30"
:use-slot="useSlot" v-model="value" :use-slot="useSlot" v-model="value"
:min="min" :max="max" :min="min" :max="max"
@end="end" @end="end"
@moving="moving" @moving="moving"
> >
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
}; };
}, },
onLoad() { onLoad() {
}, },
computed: { computed: {
current() { current() {
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.badge-button { .badge-button {
padding: 4rpx 6rpx; padding: 4rpx 6rpx;
background-color: $u-type-error; background-color: $u-type-error;
......
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-config-wrap { .u-config-wrap {
} }
......
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo { .u-demo {
} }
</style> </style>
...@@ -96,17 +96,17 @@ ...@@ -96,17 +96,17 @@
export default { export default {
data() { data() {
return { return {
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx 24rpx 24rpx 40rpx; padding: 24rpx 24rpx 24rpx 40rpx;
} }
.u-node { .u-node {
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
...@@ -116,28 +116,28 @@ ...@@ -116,28 +116,28 @@
align-items: center; align-items: center;
background: #d0d0d0; background: #d0d0d0;
} }
.u-order-title { .u-order-title {
color: #333333; color: #333333;
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
} }
.u-order-title.unacive { .u-order-title.unacive {
color: rgb(150, 150, 150); color: rgb(150, 150, 150);
} }
.u-order-desc { .u-order-desc {
color: rgb(150, 150, 150); color: rgb(150, 150, 150);
font-size: 28rpx; font-size: 28rpx;
margin-bottom: 6rpx; margin-bottom: 6rpx;
} }
.u-order-time { .u-order-time {
color: rgb(200, 200, 200); color: rgb(200, 200, 200);
font-size: 26rpx; font-size: 26rpx;
} }
.tel { .tel {
color: $u-type-primary; color: $u-type-primary;
} }
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.no-mode-here { .no-mode-here {
color: $u-tips-color; color: $u-tips-color;
font-size: 28rpx; font-size: 28rpx;
......
...@@ -52,6 +52,6 @@ ...@@ -52,6 +52,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
\ No newline at end of file
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<u-verification-code :keep-running="true" :seconds="seconds" @end="end" @start="start" ref="uCode" <u-verification-code :keep-running="true" :seconds="seconds" @end="end" @start="start" ref="uCode"
@change="codeChange" :startText="startText" :changeText="changeText" @change="codeChange" :startText="startText" :changeText="changeText"
:endText="endText"></u-verification-code> :endText="endText"></u-verification-code>
<u-button @click="getCode">{{tips}}</u-button> <u-button @click="getCode">{{tips}}</u-button>
<u-button :custom-style="{marginTop: '30rpx'}" @tap="reset" style="margin-top: 30rpx;">重置</u-button> <u-button :custom-style="{marginTop: '30rpx'}" @tap="reset" style="margin-top: 30rpx;">重置</u-button>
...@@ -93,6 +93,6 @@ ...@@ -93,6 +93,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class=""> <view class="">
<view class="u-card-wrap"> <view class="u-card-wrap">
<u-card @click="click" @head-click="headClick" :title="title" :sub-title="subTitle" :thumb="thumb" :padding="padding" :border="border"> <u-card @click="click" @head-click="headClick" :title="title" :sub-title="subTitle" :thumb="thumb" :padding="padding" :border="border">
<view class="" slot="body"> <view class="" slot="body">
<view class="u-body-item u-flex u-border-bottom u-col-between u-p-t-0"> <view class="u-body-item u-flex u-border-bottom u-col-between u-p-t-0">
<view class="u-body-item-title u-line-2"> <view class="u-body-item-title u-line-2">
瓶身描绘的牡丹一如你初妆,冉冉檀香透过窗心事我了然,宣纸上走笔至此搁一半 瓶身描绘的牡丹一如你初妆,冉冉檀香透过窗心事我了然,宣纸上走笔至此搁一半
...@@ -81,21 +81,22 @@ ...@@ -81,21 +81,22 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo { .u-demo {
padding-top: 0; padding-top: 0;
} }
.u-card-wrap { .u-card-wrap {
background-color: $u-bg-color; background-color: $u-bg-color;
padding: 1px; padding: 1px;
} }
.u-body-item { .u-body-item {
font-size: 32rpx; font-size: 32rpx;
color: #333; color: #333;
padding: 20rpx 10rpx; padding: 20rpx 10rpx;
} }
.u-body-item image { .u-body-item image {
width: 120rpx; width: 120rpx;
flex: 0 0 120rpx; flex: 0 0 120rpx;
......
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<view class=""> <view class="">
<u-checkbox-group :size="size" :width="width" <u-checkbox-group :size="size" :width="width"
:wrap="wrap" :max="max" :wrap="wrap" :max="max"
@change="checkboxGroupChange" @change="checkboxGroupChange"
:activeColor="activeColor" :activeColor="activeColor"
> >
<u-checkbox @change="checkboxChange" <u-checkbox @change="checkboxChange"
v-model="item.checked" v-for="(item, index) in list" v-model="item.checked" v-for="(item, index) in list"
:key="index" :name="item.name" :key="index" :name="item.name"
:shape="shape" :shape="shape"
:disabled="item.disabled" :disabled="item.disabled"
...@@ -157,5 +157,6 @@ ...@@ -157,5 +157,6 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -77,5 +77,6 @@ ...@@ -77,5 +77,6 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
<view class="u-config-item"> <view class="u-config-item">
<view class="u-item-title">遮罩是否可点击</view> <view class="u-item-title">遮罩是否可点击</view>
<u-subsection :list="['是', '否']" @change="maskChange"></u-subsection> <u-subsection :list="['是', '否']" @change="maskChange"></u-subsection>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
value1: '', value1: '',
value2: '2', value2: '2',
...@@ -136,20 +136,21 @@ ...@@ -136,20 +136,21 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-config-wrap { .u-config-wrap {
padding: 40rpx; padding: 40rpx;
} }
.slot-content { .slot-content {
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 24rpx; padding: 24rpx;
.item-box { .item-box {
margin-bottom: 50rpx; margin-bottom: 50rpx;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
.item { .item {
border: 1px solid $u-type-primary; border: 1px solid $u-type-primary;
color: $u-type-primary; color: $u-type-primary;
...@@ -157,7 +158,7 @@ ...@@ -157,7 +158,7 @@
border-radius: 100rpx; border-radius: 100rpx;
margin-top: 30rpx; margin-top: 30rpx;
} }
.active { .active {
color: #FFFFFF; color: #FFFFFF;
background-color: $u-type-primary; background-color: $u-type-primary;
......
...@@ -91,6 +91,7 @@ export default { ...@@ -91,6 +91,7 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo-area { .u-demo-area {
} }
</style> </style>
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo-area { .u-demo-area {
} }
</style> </style>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
return { return {
mode: 'circle', mode: 'circle',
color: '#c7c7c7', color: '#c7c7c7',
size: '34', size: '34',
show: true show: true
} }
}, },
...@@ -73,5 +73,6 @@ ...@@ -73,5 +73,6 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast :type="type" ref="uToast"></u-toast> <u-toast :type="type" ref="uToast"></u-toast>
<u-notice-bar :autoplay="autoplay" :playState="playState" :speed="speed" @getMore="getMore" <u-notice-bar :autoplay="autoplay" :playState="playState" :speed="speed" @getMore="getMore"
:mode="mode" @end="end" @close="close" @click="click" :show="show" :type="type" :list="list" :mode="mode" @end="end" @close="close" @click="click" :show="show" :type="type" :list="list"
:moreIcon="moreIcon" :volumeIcon="volumeIcon" :duration="duration" :isCircular="isCircular"></u-notice-bar> :moreIcon="moreIcon" :volumeIcon="volumeIcon" :duration="duration" :isCircular="isCircular"></u-notice-bar>
</view> </view>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
} }
}, },
onLoad() { onLoad() {
}, },
methods: { methods: {
typeChange(index) { typeChange(index) {
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
} else { } else {
this.toast(`点击了第${index + 1}条消息`); this.toast(`点击了第${index + 1}条消息`);
} }
}, },
getMore() { getMore() {
this.toast(`点击了更多图标`); this.toast(`点击了更多图标`);
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.item { .item {
margin-top: 30px; margin-top: 30px;
} }
......
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
let column = e.column, index = e.index; let column = e.column, index = e.index;
this.defaultSelector[column] = index; this.defaultSelector[column] = index;
switch (column) { switch (column) {
case 0: case 0:
switch (index) { switch (index) {
case 0: case 0:
this.range[1] = ['中国', '日本'] this.range[1] = ['中国', '日本']
...@@ -183,7 +183,8 @@ export default { ...@@ -183,7 +183,8 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
@use "@/uview-ui/theme.scss" as *;
.input { .input {
border: 1px solid $u-light-color; border: 1px solid $u-light-color;
border-radius: 4px; border-radius: 4px;
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
], ],
disabled: false, disabled: false,
result: '荔枝', result: '荔枝',
shape: 'circle', shape: 'circle',
value: '荔枝', value: '荔枝',
activeColor: '#2979ff', activeColor: '#2979ff',
size: 34, size: 34,
...@@ -138,5 +138,6 @@ ...@@ -138,5 +138,6 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -119,5 +119,6 @@ ...@@ -119,5 +119,6 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
...@@ -59,9 +59,9 @@ ...@@ -59,9 +59,9 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
// 通过/deep/样式穿透去控制组件的内容 // 通过::v-deep样式穿透去控制组件的内容
.wrap /deep/ .u-content { .wrap ::v-deep .u-content {
color: #666!important; color: #666!important;
} }
</style> </style>
\ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<u-search v-model="value" @change="change" @custom="custom" @search="search" :shape="shape" :clearabled="clearabled" <u-search v-model="value" @change="change" @custom="custom" @search="search" :shape="shape" :clearabled="clearabled"
:show-action="showAction" :input-align="inputAlign" @clear="clear"></u-search> :show-action="showAction" :input-align="inputAlign" @clear="clear"></u-search>
</view> </view>
</view> </view>
...@@ -91,6 +91,6 @@ ...@@ -91,6 +91,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</view> </view>
</view> </view>
<!--引用组件--> <!--引用组件-->
<u-skeleton bg-color="rgb(250, 250, 250)" :loading="loading" :animation="animation" <u-skeleton bg-color="rgb(250, 250, 250)" :loading="loading" :animation="animation"
:el-color="elColor" :border-radius="borderRadius"></u-skeleton> :el-color="elColor" :border-radius="borderRadius"></u-skeleton>
</view> </view>
</view> </view>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.container { .container {
text-align: left; text-align: left;
font-size: 28rpx; font-size: 28rpx;
......
...@@ -66,11 +66,11 @@ ...@@ -66,11 +66,11 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
.box { .box {
margin: 50rpx 0; margin: 50rpx 0;
} }
......
...@@ -62,19 +62,19 @@ ...@@ -62,19 +62,19 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo-area { .u-demo-area {
overflow: hidden; overflow: hidden;
} }
.u-config-wrap { .u-config-wrap {
height: 200vh; height: 200vh;
} }
.u-demo-title { .u-demo-title {
margin-bottom: 140rpx; margin-bottom: 140rpx;
} }
.sticky { .sticky {
background-color: $u-type-primary; background-color: $u-type-primary;
color: #fff; color: #fff;
......
...@@ -130,7 +130,7 @@ export default { ...@@ -130,7 +130,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.item { .item {
display: flex; display: flex;
padding: 20rpx; padding: 20rpx;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<u-swiper @change="change" :height="250" :list="list" :title="title" :effect3d="effect3d" <u-swiper @change="change" :height="250" :list="list" :title="title" :effect3d="effect3d"
:indicator-pos="indicatorPos" :mode="mode" :interval="3000" @click="click"></u-swiper> :indicator-pos="indicatorPos" :mode="mode" :interval="3000" @click="click"></u-swiper>
</view> </view>
</view> </view>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
mode: 'round', mode: 'round',
indicatorPos: 'bottomCenter', indicatorPos: 'bottomCenter',
effect3d: false, effect3d: false,
} }
}, },
methods: { methods: {
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.item { .item {
margin: 30rpx 0; margin: 30rpx 0;
} }
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<view class="u-demo-wrap"> <view class="u-demo-wrap">
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-switch v-model="checked" :loading="loading" <u-switch v-model="checked" :loading="loading"
:size="size" @change="change" :size="size" @change="change"
:active-color="activeColor" :active-color="activeColor"
:disabled="disabled" :disabled="disabled"
:activeValue="100" :activeValue="100"
...@@ -109,5 +109,6 @@ ...@@ -109,5 +109,6 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo-area { .u-demo-area {
margin: 0 -40rpx; margin: 0 -40rpx;
} }
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
参数配置 参数配置
</view> </view>
<view class="u-config-item"> <view class="u-config-item">
<view class="u-item-title">边框颜色</view> <view class="u-item-title">边框颜色</view>
<u-subsection :list="['gray', 'primary', 'warning']" @change="borderColorChange"></u-subsection> <u-subsection :list="['gray', 'primary', 'warning']" @change="borderColorChange"></u-subsection>
</view> </view>
<view class="u-config-item"> <view class="u-config-item">
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
} }
}, },
onLoad() { onLoad() {
}, },
methods: { methods: {
reUpload() { reUpload() {
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
if (index == 0) { if (index == 0) {
this.showUploadList = false; this.showUploadList = false;
this.customBtn = true; this.customBtn = true;
} else { } else {
this.showUploadList = true; this.showUploadList = true;
this.customBtn = false; this.customBtn = false;
...@@ -151,20 +151,21 @@ ...@@ -151,20 +151,21 @@
</script> </script>
<style lang="scss"> <style lang="scss">
@use "@/uview-ui/theme.scss" as *;
.u-demo-wrap { .u-demo-wrap {
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 40rpx 8rpx; padding: 40rpx 8rpx;
margin-left: -14rpx; margin-left: -14rpx;
margin-right: -14rpx; margin-right: -14rpx;
} }
.u-add-wrap { .u-add-wrap {
flex-direction: column; flex-direction: column;
color: $u-content-color; color: $u-content-color;
font-size: 28rpx; font-size: 28rpx;
} }
/deep/ .slot-btn { ::v-deep .slot-btn {
width: 329rpx; width: 329rpx;
height: 140rpx; height: 140rpx;
display: flex; display: flex;
......
...@@ -151,7 +151,7 @@ page { ...@@ -151,7 +151,7 @@ page {
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.demo-warter { .demo-warter {
border-radius: 8px; border-radius: 8px;
margin: 5px; margin: 5px;
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<u-button @click="showAction">唤起ActionSheet</u-button> <u-button @click="showAction">唤起ActionSheet</u-button>
<u-action-sheet :cancel-btn="cancel" :mask-close-able="maskClick" :tips="tips" <u-action-sheet :cancel-btn="cancel" :mask-close-able="maskClick" :tips="tips"
@click="click" :list="list" v-model="show" :safe-area-inset-bottom="true"></u-action-sheet> @click="click" :list="list" v-model="show" :safe-area-inset-bottom="true"></u-action-sheet>
</view> </view>
</view> </view>
<view class="u-config-wrap"> <view class="u-config-wrap">
<view class="u-config-title u-border-bottom"> <view class="u-config-title u-border-bottom">
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
......
...@@ -79,11 +79,11 @@ ...@@ -79,11 +79,11 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
.item { .item {
margin: 30rpx 0; margin: 30rpx 0;
} }
......
...@@ -71,7 +71,8 @@ export default { ...@@ -71,7 +71,8 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
@use "@/uview-ui/theme.scss" as *;
.u-badge-wrap { .u-badge-wrap {
width: 60px; width: 60px;
height: 60px; height: 60px;
......
...@@ -110,12 +110,12 @@ ...@@ -110,12 +110,12 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.box { .box {
padding: 30rpx; padding: 30rpx;
} }
.box /deep/ button { .box ::v-deep button {
margin-bottom: 40rpx; margin-bottom: 40rpx;
} }
</style> </style>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.gab { .gab {
background-color: rgb(245, 245, 245); background-color: rgb(245, 245, 245);
height: 20rpx; height: 20rpx;
......
...@@ -33,30 +33,30 @@ ...@@ -33,30 +33,30 @@
}, 1500); }, 1500);
}, },
methods: { methods: {
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
.u-progress-content { .u-progress-content {
position: absolute; position: absolute;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.u-progress-dot { .u-progress-dot {
width: 16rpx; width: 16rpx;
height: 16rpx; height: 16rpx;
border-radius: 50%; border-radius: 50%;
background-color: #fb9126; background-color: #fb9126;
} }
.u-progress-info { .u-progress-info {
font-size: 28rpx; font-size: 28rpx;
padding-left: 16rpx; padding-left: 16rpx;
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
// padding: 24rpx; // padding: 24rpx;
} }
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</view> </view>
</view> </view>
<view class="item"> <view class="item">
<view class="title"> <view class="title">
边框颜色 边框颜色
</view> </view>
<view class="color-box"> <view class="color-box">
...@@ -299,29 +299,29 @@ ...@@ -299,29 +299,29 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 18rpx; padding: 18rpx;
} }
.item { .item {
margin: 30rpx 0; margin: 30rpx 0;
margin-top: 44rpx; margin-top: 44rpx;
&:first-child { &:first-child {
margin-top: 0; margin-top: 0;
} }
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.title { .title {
font-size: 30rpx; font-size: 30rpx;
position: relative; position: relative;
line-height: 1; line-height: 1;
padding-left: 22rpx; padding-left: 22rpx;
&:before { &:before {
width: 4px; width: 4px;
height: 15px; height: 15px;
...@@ -333,7 +333,7 @@ ...@@ -333,7 +333,7 @@
top: -1px; top: -1px;
} }
} }
.color-box { .color-box {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
color: #fff; color: #fff;
text-align: center; text-align: center;
margin-top: 20rpx; margin-top: 20rpx;
.color-item { .color-item {
display: flex; display: flex;
flex: 1; flex: 1;
...@@ -350,12 +350,12 @@ ...@@ -350,12 +350,12 @@
border-radius: 6rpx; border-radius: 6rpx;
padding: 12rpx 0; padding: 12rpx 0;
} }
.color-title { .color-title {
font-size: 28rpx; font-size: 28rpx;
} }
.color-value { .color-value {
font-size: 24rpx; font-size: 24rpx;
} }
......
...@@ -94,6 +94,7 @@ export default { ...@@ -94,6 +94,7 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.count-down-demo { .count-down-demo {
justify-content: center; justify-content: center;
} }
......
...@@ -125,7 +125,7 @@ export default { ...@@ -125,7 +125,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.count-to-demo { .count-to-demo {
text-align: center; text-align: center;
} }
......
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
......
...@@ -143,6 +143,7 @@ ...@@ -143,6 +143,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.grid-text { .grid-text {
font-size: 28rpx; font-size: 28rpx;
margin-top: 4rpx; margin-top: 4rpx;
......
...@@ -116,6 +116,7 @@ ...@@ -116,6 +116,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.demo-layout { .demo-layout {
height: 70rpx; height: 70rpx;
border-radius: 8rpx; border-radius: 8rpx;
...@@ -137,7 +138,7 @@ ...@@ -137,7 +138,7 @@
// H5中,电脑端文档演示时,可能会导致演示块挤出边界,特别处理。 // H5中,电脑端文档演示时,可能会导致演示块挤出边界,特别处理。
// 真实使用环境不会产生此问题 // 真实使用环境不会产生此问题
/* #ifdef H5 */ /* #ifdef H5 */
.u-demo-area /deep/ .u-row { .u-demo-area ::v-deep .u-row {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
......
...@@ -49,6 +49,6 @@ ...@@ -49,6 +49,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -91,6 +91,6 @@ ...@@ -91,6 +91,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
\ No newline at end of file
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@use "@/uview-ui/theme.scss" as *;
.warp { .warp {
display: flex; display: flex;
align-items: center; align-items: center;
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
return { return {
mode: 'box', mode: 'box',
maxlength: 4, maxlength: 4,
value: '', value: '',
bold: true, bold: true,
breathe: true, breathe: true,
dotFill: false, dotFill: false,
...@@ -92,6 +92,6 @@ ...@@ -92,6 +92,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
color: '#323233', color: '#323233',
disabled: false, disabled: false,
step: 1, step: 1,
}; };
}, },
methods: { methods: {
...@@ -72,6 +72,6 @@ export default { ...@@ -72,6 +72,6 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<view class="u-demo-area"> <view class="u-demo-area">
<u-toast ref="uToast"></u-toast> <u-toast ref="uToast"></u-toast>
<u-button @click="btnClick">唤起弹窗</u-button> <u-button @click="btnClick">唤起弹窗</u-button>
<u-popup border-radius="10" v-model="show" <u-popup border-radius="10" v-model="show"
@close="close" @open="open" :mode="mode" @close="close" @open="open" :mode="mode"
length="50%" :mask="mask" length="50%" :mask="mask"
:closeable="closeable" :closeable="closeable"
:close-icon-pos="closeIconPos" :close-icon-pos="closeIconPos"
...@@ -89,11 +89,11 @@ ...@@ -89,11 +89,11 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
.close-btn { .close-btn {
height: 100%; height: 100%;
display: flex; display: flex;
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<view class="u-demo-wrap"> <view class="u-demo-wrap">
<view class="u-demo-title">演示效果</view> <view class="u-demo-title">演示效果</view>
<view class="u-demo-area"> <view class="u-demo-area">
<u-line-progress v-if="mode == 'line'" :percent="percent" :active-color="activeColor" <u-line-progress v-if="mode == 'line'" :percent="percent" :active-color="activeColor"
:striped="striped" :stripedActive="stripedActive"></u-line-progress> :striped="striped" :stripedActive="stripedActive"></u-line-progress>
<u-circle-progress v-else :percent="percent" :active-color="activeColor" <u-circle-progress v-else :percent="percent" :active-color="activeColor"
bg-color="rgb(250, 250, 250)"> bg-color="rgb(250, 250, 250)">
<view class="u-progress-content"> <view class="u-progress-content">
<view class="u-progress-dot"></view> <view class="u-progress-dot"></view>
...@@ -75,25 +75,25 @@ ...@@ -75,25 +75,25 @@
this.current = 0; this.current = 0;
} }
}, },
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-progress-content { .u-progress-content {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.u-progress-dot { .u-progress-dot {
width: 16rpx; width: 16rpx;
height: 16rpx; height: 16rpx;
border-radius: 50%; border-radius: 50%;
background-color: #fb9126; background-color: #fb9126;
} }
.u-progress-info { .u-progress-info {
font-size: 28rpx; font-size: 28rpx;
padding-left: 16rpx; padding-left: 16rpx;
......
...@@ -66,6 +66,6 @@ ...@@ -66,6 +66,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -83,6 +83,6 @@ ...@@ -83,6 +83,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
}); });
}, },
created() { created() {
}, },
methods: { methods: {
openPage(path) { openPage(path) {
this.$u.route({ this.$u.route({
url: path url: path
}) })
}, },
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
} */ } */
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-cell-icon { .u-cell-icon {
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
} */ } */
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-cell-icon { .u-cell-icon {
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
} */ } */
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-cell-icon { .u-cell-icon {
width: 36rpx; width: 36rpx;
height: 36rpx; height: 36rpx;
......
...@@ -49,6 +49,6 @@ ...@@ -49,6 +49,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
let color = index == 0 ? '#0edc8a' : index == 1 ? '#d0a73c' : '#3308dd'; let color = index == 0 ? '#0edc8a' : index == 1 ? '#d0a73c' : '#3308dd';
this.result = this.$u.hexToRgb(color) this.result = this.$u.hexToRgb(color)
}, },
colorGradientChange(index) { colorGradientChange(index) {
this.result = JSON.stringify(this.$u.colorGradient('rgb(21,21,21)', 'rgb(56,56,56)', 10)) this.result = JSON.stringify(this.$u.colorGradient('rgb(21,21,21)', 'rgb(56,56,56)', 10))
}, },
getResult() { getResult() {
...@@ -57,6 +57,6 @@ ...@@ -57,6 +57,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-button { .u-button {
margin-top: 50rpx; margin-top: 50rpx;
margin-bottom: 50rpx; margin-bottom: 50rpx;
...@@ -81,12 +81,12 @@ ...@@ -81,12 +81,12 @@
border: 1px solid $u-type-primary; border: 1px solid $u-type-primary;
color: $u-type-primary; color: $u-type-primary;
} }
.u-button--hover { .u-button--hover {
color: #fff; color: #fff;
background-color: $u-type-primary; background-color: $u-type-primary;
} }
.u-demo-result-line { .u-demo-result-line {
display: flex; display: flex;
justify-content: center; justify-content: center;
......
...@@ -32,6 +32,6 @@ ...@@ -32,6 +32,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<view class="u-no-demo-here"> <view class="u-no-demo-here">
源对象1为:"{info: {name: 'mary'}}" 源对象1为:"{info: {name: 'mary'}}"
<view class=""> <view class="">
</view> </view>
源对象2为:"{info: {age: '22'}}" 源对象2为:"{info: {age: '22'}}"
</view> </view>
...@@ -69,6 +69,6 @@ ...@@ -69,6 +69,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -75,10 +75,10 @@ export default { ...@@ -75,10 +75,10 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo { .u-demo {
min-height: 200vh; min-height: 200vh;
} }
.rect-block-1 { .rect-block-1 {
background-color: #a0cfff; background-color: #a0cfff;
......
...@@ -44,6 +44,6 @@ ...@@ -44,6 +44,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
methods: { methods: {
modeChange(index) { modeChange(index) {
let url = ''; let url = '';
if(index == 0) url = '/pages/library/globalVariable/globalData'; if(index == 0) url = '/pages/library/globalVariable/globalData';
if(index == 1) url = '/pages/library/globalVariable/prototype'; if(index == 1) url = '/pages/library/globalVariable/prototype';
if(index == 2) url = '/pages/library/globalVariable/vuex'; if(index == 2) url = '/pages/library/globalVariable/vuex';
this.$u.route(url); this.$u.route(url);
...@@ -70,11 +70,11 @@ ...@@ -70,11 +70,11 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo-area { .u-demo-area {
margin-top: 50rpx; margin-top: 50rpx;
} }
.btn-wrap { .btn-wrap {
margin-top: 40rpx; margin-top: 40rpx;
padding: 0 10%; padding: 0 10%;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
} }
}, },
onShow() { onShow() {
}, },
methods: { methods: {
vuePrototypeChange(index) { vuePrototypeChange(index) {
...@@ -43,6 +43,6 @@ ...@@ -43,6 +43,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -35,6 +35,6 @@ ...@@ -35,6 +35,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
\ No newline at end of file
...@@ -61,6 +61,6 @@ ...@@ -61,6 +61,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -55,6 +55,6 @@ ...@@ -55,6 +55,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -41,6 +41,6 @@ ...@@ -41,6 +41,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
<script> <script>
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -48,6 +48,6 @@ ...@@ -48,6 +48,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-btn-wrap { .u-btn-wrap {
margin-top: 50rpx; margin-top: 50rpx;
} }
......
...@@ -42,6 +42,6 @@ ...@@ -42,6 +42,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
params: {} params: {}
...@@ -40,11 +40,11 @@ ...@@ -40,11 +40,11 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.wrap { .wrap {
padding: 24rpx; padding: 24rpx;
} }
.u-btn-wrap { .u-btn-wrap {
margin-top: 50rpx; margin-top: 50rpx;
} }
......
...@@ -91,6 +91,6 @@ ...@@ -91,6 +91,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
...@@ -53,6 +53,6 @@ ...@@ -53,6 +53,6 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>@use "@/uview-ui/theme.scss" as *;
.u-demo {} .u-demo {}
</style> </style>
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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 to comment