diff --git a/App.vue b/App.vue
index 03963a6..fd7bdeb 100644
--- a/App.vue
+++ b/App.vue
@@ -1,23 +1,29 @@
-
-
-
diff --git a/apis/add-paper.js b/apis/add-paper.js
index 172a6fc..6fc62a1 100644
--- a/apis/add-paper.js
+++ b/apis/add-paper.js
@@ -62,3 +62,10 @@ export function getStoreList(data) {
data
})
}
+//获取店铺信息(供应商端)
+export function storeDetail(data) {
+ return http.get({
+ url: '/base-paper-trading/get/store-detail/for/supplier?supplierId='+data,
+ data
+ })
+}
diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue
index f231694..59e5694 100644
--- a/pages/client-detail/index.vue
+++ b/pages/client-detail/index.vue
@@ -1,29 +1,33 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/mall/index.vue b/pages/mall/index.vue
index e8e9a25..60071f8 100644
--- a/pages/mall/index.vue
+++ b/pages/mall/index.vue
@@ -1,417 +1,446 @@
-
-
- 纸商城
- 分享
-
-
-
-
- {{ storeInformation.name }}
- 全部商品 39 | 上新 9
-
-
-
- 切换商城
-
-
- 设置
-
-
-
-
-
-
-
-
-
-
- {{ item.brandName }}
-
-
-
-
- {{ item.categoryName }}/{{ item.name }}/{{ item.manufacturerName }}
-
- 克重(价格):
- {{ sku.weight }}({{ sku.listPrice }})
-
-
-
-
- {{ item.updateTime | timeFilter }}
-
- 编辑
-
- {{ item.status === 30111 ? '下架' : '上架' }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 纸商城
+ 分享
+
+
+
+
+ {{ storeInformation.name }}
+ 全部商品 {{ storeInformation.productNumber }} | 上新 {{ storeInformation.currentProductNumber }}
+
+
+
+ 切换商城
+
+
+ 设置
+
+
+
+
+
+
+
+
+
+
+ {{ item.brandName }}
+
+
+
+
+ {{ item.categoryName }}/{{ item.name }}/{{ item.manufacturerName }}
+
+ 克重(价格):
+ {{ sku.weight }}({{ sku.listPrice }})
+
+
+
+
+ {{ item.updateTime | timeFilter }}
+
+ 编辑
+
+ {{ item.status === 30111 ? '下架' : '上架' }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index c56ecd4..80a970b 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -35,7 +35,7 @@
出库
@@ -145,6 +145,31 @@
+
+
+
@@ -173,7 +198,12 @@ export default {
supplierOrderStatusEnum: Object.freeze(supplierOrderStatusEnum),
paymentMethodEnum: Object.freeze(paymentMethodEnum),
showList: ['send', 'receive'],
- steps: []
+ steps: [],
+ outInfo: {
+ quantity: 0,
+ max: 0,
+ index: 0
+ }
}
},
onLoad(option) {
@@ -194,6 +224,33 @@ export default {
methods: {
go2,
back,
+ showModal(order, index) {
+ // 计算已出库数
+ let quantity = 0
+ order.outboundProcessList.forEach((item) => {
+ if (item.status == '30302') {
+ quantity += item.quantity
+ }
+ })
+ this.outInfo.max = order.pieceQuantity - quantity
+ this.outInfo.index = index
+ this.$refs.popup.open('bottom')
+ },
+ closeModal() {
+ this.$refs.popup.close()
+ },
+ makeOut() {
+ // 校验
+ if (this.outInfo.quantity > this.outInfo.max) {
+ uni.showToast({
+ title: '出库数量不能大于上限',
+ icon: 'none'
+ })
+ return
+ }
+ this.operatePaper(this.outInfo.index, 'outbound', this.outInfo.quantity)
+ this.closeModal()
+ },
transformAddress(address) {
let res = ''
if (address.provinceName) {
@@ -634,4 +691,57 @@ export default {
z-index: 5;
}
}
+.popup_modal {
+ width: 750rpx;
+ height: 600rpx;
+ background-color: #fff;
+ border-radius: 10px 10px 0 0;
+ .popup_modal-title {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: center;
+ width: 750rpx;
+ height: 88rpx;
+ font-weight: 600;
+ border-bottom: 2rpx solid #d8d8d8;
+ }
+ .popup_modal-scroll {
+ width: 750rpx;
+ height: 600rpx;
+ .popup_modal-scroll-item {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: flex-start;
+ width: 750rpx;
+ height: 88rpx;
+ padding: 0rpx 32rpx;
+ border-bottom: 2rpx solid #d8d8d8;
+ }
+ }
+}
+.button {
+ flex-grow: 0;
+ flex-shrink: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 10rpx;
+ .text {
+ font-size: 30rpx;
+ font-weight: 500;
+ text-align: center;
+ }
+}
+.button__cancel {
+ width: 270rpx;
+ height: 88rpx;
+ border: 2rpx solid #979797;
+}
+.button__submit {
+ width: 400rpx;
+ height: 88rpx;
+ background: #007aff;
+}
diff --git a/pages/start-page/index.vue b/pages/start-page/index.vue
index 8183fd0..d4f8f04 100644
--- a/pages/start-page/index.vue
+++ b/pages/start-page/index.vue
@@ -1,22 +1,185 @@
-
-
+
+
+
+ 跳过
+
+
+
+
+
+
+ {{ swiper.text }}
+
+
+ {{ swiper.title }}
+
+
+ {{ swiper.subTitle }}
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/static/imgs/start-page/bkBottom.png b/static/imgs/start-page/bkBottom.png
new file mode 100644
index 0000000..96eb7be
Binary files /dev/null and b/static/imgs/start-page/bkBottom.png differ
diff --git a/static/imgs/start-page/bkTop.png b/static/imgs/start-page/bkTop.png
new file mode 100644
index 0000000..8cc8f80
Binary files /dev/null and b/static/imgs/start-page/bkTop.png differ
diff --git a/static/imgs/start-page/dzqy.png b/static/imgs/start-page/dzqy.png
new file mode 100644
index 0000000..a9d006f
Binary files /dev/null and b/static/imgs/start-page/dzqy.png differ
diff --git a/static/imgs/start-page/ht.png b/static/imgs/start-page/ht.png
new file mode 100644
index 0000000..7b01b90
Binary files /dev/null and b/static/imgs/start-page/ht.png differ
diff --git a/static/imgs/start-page/qd1.png b/static/imgs/start-page/qd1.png
new file mode 100644
index 0000000..455434d
Binary files /dev/null and b/static/imgs/start-page/qd1.png differ
diff --git a/static/imgs/start-page/rz.png b/static/imgs/start-page/rz.png
new file mode 100644
index 0000000..d804885
Binary files /dev/null and b/static/imgs/start-page/rz.png differ
diff --git a/static/imgs/start-page/zx.png b/static/imgs/start-page/zx.png
new file mode 100644
index 0000000..bdc2ae8
Binary files /dev/null and b/static/imgs/start-page/zx.png differ
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
index 7e3d755..b863bb0 100644
--- a/uni_modules/uni-scss/changelog.md
+++ b/uni_modules/uni-scss/changelog.md
@@ -1,6 +1,8 @@
+## 1.0.3(2022-01-21)
+- 优化 组件示例
## 1.0.2(2021-11-22)
- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
-## 1.0.1(2021-11-22)
-- 修复 vue3中scss语法兼容问题
-## 1.0.0(2021-11-18)
-- init
+## 1.0.1(2021-11-22)
+- 修复 vue3中scss语法兼容问题
+## 1.0.0(2021-11-18)
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
index 5d43f7f..1744a5f 100644
--- a/uni_modules/uni-scss/index.scss
+++ b/uni_modules/uni-scss/index.scss
@@ -1 +1 @@
-@import './styles/index.scss';
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
index ee71935..7cc0ccb 100644
--- a/uni_modules/uni-scss/package.json
+++ b/uni_modules/uni-scss/package.json
@@ -1,82 +1,82 @@
-{
- "id": "uni-scss",
- "displayName": "uni-scss 辅助样式",
- "version": "1.0.2",
- "description": "uni-sass是uni-ui提供的一套全局样式 ,通过一些简单的类名和sass变量,实现简单的页面布局操作,比如颜色、边距、圆角等。",
- "keywords": [
- "uni-scss",
- "uni-ui",
- "辅助样式"
-],
- "repository": "https://github.com/dcloudio/uni-ui",
- "engines": {
- "HBuilderX": "^3.1.0"
- },
- "dcloudext": {
- "category": [
- "uni-app前端模板",
- "前端页面模板"
- ],
- "sale": {
- "regular": {
- "price": "0.00"
- },
- "sourcecode": {
- "price": "0.00"
- }
- },
- "contact": {
- "qq": ""
- },
- "declaration": {
- "ads": "无",
- "data": "无",
- "permissions": "无"
- },
- "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
- },
- "uni_modules": {
- "dependencies": [],
- "encrypt": [],
- "platforms": {
- "cloud": {
- "tcb": "y",
- "aliyun": "y"
- },
- "client": {
- "App": {
- "app-vue": "y",
- "app-nvue": "u"
- },
- "H5-mobile": {
- "Safari": "y",
- "Android Browser": "y",
- "微信浏览器(Android)": "y",
- "QQ浏览器(Android)": "y"
- },
- "H5-pc": {
- "Chrome": "y",
- "IE": "y",
- "Edge": "y",
- "Firefox": "y",
- "Safari": "y"
- },
- "小程序": {
- "微信": "y",
- "阿里": "y",
- "百度": "y",
- "字节跳动": "y",
- "QQ": "y"
- },
- "快应用": {
- "华为": "n",
- "联盟": "n"
- },
- "Vue": {
- "vue2": "y",
- "vue3": "y"
- }
- }
- }
- }
-}
+{
+ "id": "uni-scss",
+ "displayName": "uni-scss 辅助样式",
+ "version": "1.0.3",
+ "description": "uni-sass是uni-ui提供的一套全局样式 ,通过一些简单的类名和sass变量,实现简单的页面布局操作,比如颜色、边距、圆角等。",
+ "keywords": [
+ "uni-scss",
+ "uni-ui",
+ "辅助样式"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ },
+ "dcloudext": {
+ "category": [
+ "JS SDK",
+ "通用 SDK"
+ ],
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+ },
+ "uni_modules": {
+ "dependencies": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "u"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y"
+ },
+ "快应用": {
+ "华为": "n",
+ "联盟": "n"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
index 2106dd1..ffac4fe 100644
--- a/uni_modules/uni-scss/styles/index.scss
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -1,7 +1,7 @@
-@import './setting/_variables.scss';
-@import './setting/_border.scss';
-@import './setting/_color.scss';
-@import './setting/_space.scss';
-@import './setting/_radius.scss';
-@import './setting/_text.scss';
-@import './setting/_styles.scss';
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
index 781df64..12a11c3 100644
--- a/uni_modules/uni-scss/styles/setting/_border.scss
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -1,3 +1,3 @@
-.uni-border {
- border: 1px $uni-border-1 solid;
+.uni-border {
+ border: 1px $uni-border-1 solid;
}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
index 595f5ed..1ededd9 100644
--- a/uni_modules/uni-scss/styles/setting/_color.scss
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -1,66 +1,66 @@
-
-// TODO 暂时不需要 class ,需要用户使用变量实现 ,如果使用类名其实并不推荐
-// @mixin get-styles($k,$c) {
-// @if $k == size or $k == weight{
-// font-#{$k}:#{$c}
-// }@else{
-// #{$k}:#{$c}
-// }
-// }
-$uni-ui-color:(
- // 主色
- primary: $uni-primary,
- primary-disable: $uni-primary-disable,
- primary-light: $uni-primary-light,
- // 辅助色
- success: $uni-success,
- success-disable: $uni-success-disable,
- success-light: $uni-success-light,
- warning: $uni-warning,
- warning-disable: $uni-warning-disable,
- warning-light: $uni-warning-light,
- error: $uni-error,
- error-disable: $uni-error-disable,
- error-light: $uni-error-light,
- info: $uni-info,
- info-disable: $uni-info-disable,
- info-light: $uni-info-light,
- // 中性色
- main-color: $uni-main-color,
- base-color: $uni-base-color,
- secondary-color: $uni-secondary-color,
- extra-color: $uni-extra-color,
- // 背景色
- bg-color: $uni-bg-color,
- // 边框颜色
- border-1: $uni-border-1,
- border-2: $uni-border-2,
- border-3: $uni-border-3,
- border-4: $uni-border-4,
- // 黑色
- black:$uni-black,
- // 白色
- white:$uni-white,
- // 透明
- transparent:$uni-transparent
-) !default;
-@each $key, $child in $uni-ui-color {
- .uni-#{"" + $key} {
- color: $child;
- }
- .uni-#{"" + $key}-bg {
- background-color: $child;
- }
-}
-.uni-shadow-sm {
- box-shadow: $uni-shadow-sm;
-}
-.uni-shadow-base {
- box-shadow: $uni-shadow-base;
-}
-.uni-shadow-lg {
- box-shadow: $uni-shadow-lg;
-}
-.uni-mask {
- background-color:$uni-mask;
-}
+
+// TODO 暂时不需要 class ,需要用户使用变量实现 ,如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// @if $k == size or $k == weight{
+// font-#{$k}:#{$c}
+// }@else{
+// #{$k}:#{$c}
+// }
+// }
+$uni-ui-color:(
+ // 主色
+ primary: $uni-primary,
+ primary-disable: $uni-primary-disable,
+ primary-light: $uni-primary-light,
+ // 辅助色
+ success: $uni-success,
+ success-disable: $uni-success-disable,
+ success-light: $uni-success-light,
+ warning: $uni-warning,
+ warning-disable: $uni-warning-disable,
+ warning-light: $uni-warning-light,
+ error: $uni-error,
+ error-disable: $uni-error-disable,
+ error-light: $uni-error-light,
+ info: $uni-info,
+ info-disable: $uni-info-disable,
+ info-light: $uni-info-light,
+ // 中性色
+ main-color: $uni-main-color,
+ base-color: $uni-base-color,
+ secondary-color: $uni-secondary-color,
+ extra-color: $uni-extra-color,
+ // 背景色
+ bg-color: $uni-bg-color,
+ // 边框颜色
+ border-1: $uni-border-1,
+ border-2: $uni-border-2,
+ border-3: $uni-border-3,
+ border-4: $uni-border-4,
+ // 黑色
+ black:$uni-black,
+ // 白色
+ white:$uni-white,
+ // 透明
+ transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+ .uni-#{"" + $key} {
+ color: $child;
+ }
+ .uni-#{"" + $key}-bg {
+ background-color: $child;
+ }
+}
+.uni-shadow-sm {
+ box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+ box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+ box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+ background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
index 8672a69..9a0428b 100644
--- a/uni_modules/uni-scss/styles/setting/_radius.scss
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -1,55 +1,55 @@
-@mixin radius($r,$d:null ,$important: false){
- $radius-value:map-get($uni-radius, $r) if($important, !important, null);
- // Key exists within the $uni-radius variable
- @if (map-has-key($uni-radius, $r) and $d){
- @if $d == t {
- border-top-left-radius:$radius-value;
- border-top-right-radius:$radius-value;
- }@else if $d == r {
- border-top-right-radius:$radius-value;
- border-bottom-right-radius:$radius-value;
- }@else if $d == b {
- border-bottom-left-radius:$radius-value;
- border-bottom-right-radius:$radius-value;
- }@else if $d == l {
- border-top-left-radius:$radius-value;
- border-bottom-left-radius:$radius-value;
- }@else if $d == tl {
- border-top-left-radius:$radius-value;
- }@else if $d == tr {
- border-top-right-radius:$radius-value;
- }@else if $d == br {
- border-bottom-right-radius:$radius-value;
- }@else if $d == bl {
- border-bottom-left-radius:$radius-value;
- }
- }@else{
- border-radius:$radius-value;
- }
-}
-
-@each $key, $child in $uni-radius {
- @if($key){
- .uni-radius-#{"" + $key} {
- @include radius($key)
- }
- }@else{
- .uni-radius {
- @include radius($key)
- }
- }
-}
-
-@each $direction in t, r, b, l,tl, tr, br, bl {
- @each $key, $child in $uni-radius {
- @if($key){
- .uni-radius-#{"" + $direction}-#{"" + $key} {
- @include radius($key,$direction,false)
- }
- }@else{
- .uni-radius-#{$direction} {
- @include radius($key,$direction,false)
- }
- }
- }
-}
+@mixin radius($r,$d:null ,$important: false){
+ $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+ // Key exists within the $uni-radius variable
+ @if (map-has-key($uni-radius, $r) and $d){
+ @if $d == t {
+ border-top-left-radius:$radius-value;
+ border-top-right-radius:$radius-value;
+ }@else if $d == r {
+ border-top-right-radius:$radius-value;
+ border-bottom-right-radius:$radius-value;
+ }@else if $d == b {
+ border-bottom-left-radius:$radius-value;
+ border-bottom-right-radius:$radius-value;
+ }@else if $d == l {
+ border-top-left-radius:$radius-value;
+ border-bottom-left-radius:$radius-value;
+ }@else if $d == tl {
+ border-top-left-radius:$radius-value;
+ }@else if $d == tr {
+ border-top-right-radius:$radius-value;
+ }@else if $d == br {
+ border-bottom-right-radius:$radius-value;
+ }@else if $d == bl {
+ border-bottom-left-radius:$radius-value;
+ }
+ }@else{
+ border-radius:$radius-value;
+ }
+}
+
+@each $key, $child in $uni-radius {
+ @if($key){
+ .uni-radius-#{"" + $key} {
+ @include radius($key)
+ }
+ }@else{
+ .uni-radius {
+ @include radius($key)
+ }
+ }
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+ @each $key, $child in $uni-radius {
+ @if($key){
+ .uni-radius-#{"" + $direction}-#{"" + $key} {
+ @include radius($key,$direction,false)
+ }
+ }@else{
+ .uni-radius-#{$direction} {
+ @include radius($key,$direction,false)
+ }
+ }
+ }
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
index 9c3b17b..3c89528 100644
--- a/uni_modules/uni-scss/styles/setting/_space.scss
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -1,56 +1,56 @@
-
-@mixin fn($space,$direction,$size,$n) {
- @if $n {
- #{$space}-#{$direction}: #{$size*$uni-space-root}px
- } @else {
- #{$space}-#{$direction}: #{-$size*$uni-space-root}px
- }
-}
-@mixin get-styles($direction,$i,$space,$n){
- @if $direction == t {
- @include fn($space, top,$i,$n);
- }
- @if $direction == r {
- @include fn($space, right,$i,$n);
- }
- @if $direction == b {
- @include fn($space, bottom,$i,$n);
- }
- @if $direction == l {
- @include fn($space, left,$i,$n);
- }
- @if $direction == x {
- @include fn($space, left,$i,$n);
- @include fn($space, right,$i,$n);
- }
- @if $direction == y {
- @include fn($space, top,$i,$n);
- @include fn($space, bottom,$i,$n);
- }
- @if $direction == a {
- @if $n {
- #{$space}:#{$i*$uni-space-root}px;
- } @else {
- #{$space}:#{-$i*$uni-space-root}px;
- }
- }
-}
-
-@each $orientation in m,p {
- $space: margin;
- @if $orientation == m {
- $space: margin;
- } @else {
- $space: padding;
- }
- @for $i from 0 through 16 {
- @each $direction in t, r, b, l, x, y, a {
- .uni-#{$orientation}#{$direction}-#{$i} {
- @include get-styles($direction,$i,$space,true);
- }
- .uni-#{$orientation}#{$direction}-n#{$i} {
- @include get-styles($direction,$i,$space,false);
- }
- }
- }
+
+@mixin fn($space,$direction,$size,$n) {
+ @if $n {
+ #{$space}-#{$direction}: #{$size*$uni-space-root}px
+ } @else {
+ #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+ }
+}
+@mixin get-styles($direction,$i,$space,$n){
+ @if $direction == t {
+ @include fn($space, top,$i,$n);
+ }
+ @if $direction == r {
+ @include fn($space, right,$i,$n);
+ }
+ @if $direction == b {
+ @include fn($space, bottom,$i,$n);
+ }
+ @if $direction == l {
+ @include fn($space, left,$i,$n);
+ }
+ @if $direction == x {
+ @include fn($space, left,$i,$n);
+ @include fn($space, right,$i,$n);
+ }
+ @if $direction == y {
+ @include fn($space, top,$i,$n);
+ @include fn($space, bottom,$i,$n);
+ }
+ @if $direction == a {
+ @if $n {
+ #{$space}:#{$i*$uni-space-root}px;
+ } @else {
+ #{$space}:#{-$i*$uni-space-root}px;
+ }
+ }
+}
+
+@each $orientation in m,p {
+ $space: margin;
+ @if $orientation == m {
+ $space: margin;
+ } @else {
+ $space: padding;
+ }
+ @for $i from 0 through 16 {
+ @each $direction in t, r, b, l, x, y, a {
+ .uni-#{$orientation}#{$direction}-#{$i} {
+ @include get-styles($direction,$i,$space,true);
+ }
+ .uni-#{$orientation}#{$direction}-n#{$i} {
+ @include get-styles($direction,$i,$space,false);
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
index 6f882c8..689afec 100644
--- a/uni_modules/uni-scss/styles/setting/_styles.scss
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -1,167 +1,167 @@
-/* #ifndef APP-NVUE */
-
-$-color-white:#fff;
-$-color-black:#000;
-@mixin base-style($color) {
- color: #fff;
- background-color: $color;
- border-color: mix($-color-black, $color, 8%);
- &:not([hover-class]):active {
- background: mix($-color-black, $color, 10%);
- border-color: mix($-color-black, $color, 20%);
- color: $-color-white;
- outline: none;
- }
-}
-@mixin is-color($color) {
- @include base-style($color);
- &[loading] {
- @include base-style($color);
- &::before {
- margin-right:5px;
- }
- }
- &[disabled] {
- &,
- &[loading],
- &:not([hover-class]):active {
- color: $-color-white;
- border-color: mix(darken($color,10%), $-color-white);
- background-color: mix($color, $-color-white);
- }
- }
-
-}
-@mixin base-plain-style($color) {
- color:$color;
- background-color: mix($-color-white, $color, 90%);
- border-color: mix($-color-white, $color, 70%);
- &:not([hover-class]):active {
- background: mix($-color-white, $color, 80%);
- color: $color;
- outline: none;
- border-color: mix($-color-white, $color, 50%);
- }
-}
-@mixin is-plain($color){
- &[plain] {
- @include base-plain-style($color);
- &[loading] {
- @include base-plain-style($color);
- &::before {
- margin-right:5px;
- }
- }
- &[disabled] {
- &,
- &:active {
- color: mix($-color-white, $color, 40%);
- background-color: mix($-color-white, $color, 90%);
- border-color: mix($-color-white, $color, 80%);
- }
- }
- }
-}
-
-
-.uni-btn {
- margin: 5px;
- color: #393939;
- border:1px solid #ccc;
- font-size: 16px;
- font-weight: 200;
- background-color: #F9F9F9;
- // TODO 暂时处理边框隐藏一边的问题
- overflow: visible;
- &::after{
- border: none;
- }
-
- &:not([type]),&[type=default] {
- color: #999;
- &[loading] {
- background: none;
- &::before {
- margin-right:5px;
- }
- }
-
-
-
- &[disabled]{
- color: mix($-color-white, #999, 60%);
- &,
- &[loading],
- &:active {
- color: mix($-color-white, #999, 60%);
- background-color: mix($-color-white,$-color-black , 98%);
- border-color: mix($-color-white, #999, 85%);
- }
- }
-
- &[plain] {
- color: #999;
- background: none;
- border-color: $uni-border-1;
- &:not([hover-class]):active {
- background: none;
- color: mix($-color-white, $-color-black, 80%);
- border-color: mix($-color-white, $-color-black, 90%);
- outline: none;
- }
- &[disabled]{
- &,
- &[loading],
- &:active {
- background: none;
- color: mix($-color-white, #999, 60%);
- border-color: mix($-color-white, #999, 85%);
- }
- }
- }
- }
-
- &:not([hover-class]):active {
- color: mix($-color-white, $-color-black, 50%);
- }
-
- &[size=mini] {
- font-size: 16px;
- font-weight: 200;
- border-radius: 8px;
- }
-
-
-
- &.uni-btn-small {
- font-size: 14px;
- }
- &.uni-btn-mini {
- font-size: 12px;
- }
-
- &.uni-btn-radius {
- border-radius: 999px;
- }
- &[type=primary] {
- @include is-color($uni-primary);
- @include is-plain($uni-primary)
- }
- &[type=success] {
- @include is-color($uni-success);
- @include is-plain($uni-success)
- }
- &[type=error] {
- @include is-color($uni-error);
- @include is-plain($uni-error)
- }
- &[type=warning] {
- @include is-color($uni-warning);
- @include is-plain($uni-warning)
- }
- &[type=info] {
- @include is-color($uni-info);
- @include is-plain($uni-info)
- }
-}
-/* #endif */
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+ color: #fff;
+ background-color: $color;
+ border-color: mix($-color-black, $color, 8%);
+ &:not([hover-class]):active {
+ background: mix($-color-black, $color, 10%);
+ border-color: mix($-color-black, $color, 20%);
+ color: $-color-white;
+ outline: none;
+ }
+}
+@mixin is-color($color) {
+ @include base-style($color);
+ &[loading] {
+ @include base-style($color);
+ &::before {
+ margin-right:5px;
+ }
+ }
+ &[disabled] {
+ &,
+ &[loading],
+ &:not([hover-class]):active {
+ color: $-color-white;
+ border-color: mix(darken($color,10%), $-color-white);
+ background-color: mix($color, $-color-white);
+ }
+ }
+
+}
+@mixin base-plain-style($color) {
+ color:$color;
+ background-color: mix($-color-white, $color, 90%);
+ border-color: mix($-color-white, $color, 70%);
+ &:not([hover-class]):active {
+ background: mix($-color-white, $color, 80%);
+ color: $color;
+ outline: none;
+ border-color: mix($-color-white, $color, 50%);
+ }
+}
+@mixin is-plain($color){
+ &[plain] {
+ @include base-plain-style($color);
+ &[loading] {
+ @include base-plain-style($color);
+ &::before {
+ margin-right:5px;
+ }
+ }
+ &[disabled] {
+ &,
+ &:active {
+ color: mix($-color-white, $color, 40%);
+ background-color: mix($-color-white, $color, 90%);
+ border-color: mix($-color-white, $color, 80%);
+ }
+ }
+ }
+}
+
+
+.uni-btn {
+ margin: 5px;
+ color: #393939;
+ border:1px solid #ccc;
+ font-size: 16px;
+ font-weight: 200;
+ background-color: #F9F9F9;
+ // TODO 暂时处理边框隐藏一边的问题
+ overflow: visible;
+ &::after{
+ border: none;
+ }
+
+ &:not([type]),&[type=default] {
+ color: #999;
+ &[loading] {
+ background: none;
+ &::before {
+ margin-right:5px;
+ }
+ }
+
+
+
+ &[disabled]{
+ color: mix($-color-white, #999, 60%);
+ &,
+ &[loading],
+ &:active {
+ color: mix($-color-white, #999, 60%);
+ background-color: mix($-color-white,$-color-black , 98%);
+ border-color: mix($-color-white, #999, 85%);
+ }
+ }
+
+ &[plain] {
+ color: #999;
+ background: none;
+ border-color: $uni-border-1;
+ &:not([hover-class]):active {
+ background: none;
+ color: mix($-color-white, $-color-black, 80%);
+ border-color: mix($-color-white, $-color-black, 90%);
+ outline: none;
+ }
+ &[disabled]{
+ &,
+ &[loading],
+ &:active {
+ background: none;
+ color: mix($-color-white, #999, 60%);
+ border-color: mix($-color-white, #999, 85%);
+ }
+ }
+ }
+ }
+
+ &:not([hover-class]):active {
+ color: mix($-color-white, $-color-black, 50%);
+ }
+
+ &[size=mini] {
+ font-size: 16px;
+ font-weight: 200;
+ border-radius: 8px;
+ }
+
+
+
+ &.uni-btn-small {
+ font-size: 14px;
+ }
+ &.uni-btn-mini {
+ font-size: 12px;
+ }
+
+ &.uni-btn-radius {
+ border-radius: 999px;
+ }
+ &[type=primary] {
+ @include is-color($uni-primary);
+ @include is-plain($uni-primary)
+ }
+ &[type=success] {
+ @include is-color($uni-success);
+ @include is-plain($uni-success)
+ }
+ &[type=error] {
+ @include is-color($uni-error);
+ @include is-plain($uni-error)
+ }
+ &[type=warning] {
+ @include is-color($uni-warning);
+ @include is-plain($uni-warning)
+ }
+ &[type=info] {
+ @include is-color($uni-info);
+ @include is-plain($uni-info)
+ }
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
index 0a89590..a34d08f 100644
--- a/uni_modules/uni-scss/styles/setting/_text.scss
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -1,24 +1,24 @@
-@mixin get-styles($k,$c) {
- @if $k == size or $k == weight{
- font-#{$k}:#{$c}
- }@else{
- #{$k}:#{$c}
- }
-}
-
-@each $key, $child in $uni-headings {
- /* #ifndef APP-NVUE */
- .uni-#{$key} {
- @each $k, $c in $child {
- @include get-styles($k,$c)
- }
- }
- /* #endif */
- /* #ifdef APP-NVUE */
- .container .uni-#{$key} {
- @each $k, $c in $child {
- @include get-styles($k,$c)
- }
- }
- /* #endif */
-}
+@mixin get-styles($k,$c) {
+ @if $k == size or $k == weight{
+ font-#{$k}:#{$c}
+ }@else{
+ #{$k}:#{$c}
+ }
+}
+
+@each $key, $child in $uni-headings {
+ /* #ifndef APP-NVUE */
+ .uni-#{$key} {
+ @each $k, $c in $child {
+ @include get-styles($k,$c)
+ }
+ }
+ /* #endif */
+ /* #ifdef APP-NVUE */
+ .container .uni-#{$key} {
+ @each $k, $c in $child {
+ @include get-styles($k,$c)
+ }
+ }
+ /* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
index 651e9be..557d3d7 100644
--- a/uni_modules/uni-scss/styles/setting/_variables.scss
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -1,146 +1,146 @@
-// @use "sass:math";
-@import '../tools/functions.scss';
-// 间距基础倍数
-$uni-space-root: 2 !default;
-// 边框半径默认值
-$uni-radius-root:5px !default;
-$uni-radius: () !default;
+// @use "sass:math";
+@import '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
// 边框半径断点
-$uni-radius: map-deep-merge(
- (
+$uni-radius: map-deep-merge(
+ (
0: 0,
- // TODO 当前版本暂时不支持 sm 属性
- // 'sm': math.div($uni-radius-root, 2),
- null: $uni-radius-root,
- 'lg': $uni-radius-root * 2,
- 'xl': $uni-radius-root * 6,
- 'pill': 9999px,
- 'circle': 50%
- ),
- $uni-radius
+ // TODO 当前版本暂时不支持 sm 属性
+ // 'sm': math.div($uni-radius-root, 2),
+ null: $uni-radius-root,
+ 'lg': $uni-radius-root * 2,
+ 'xl': $uni-radius-root * 6,
+ 'pill': 9999px,
+ 'circle': 50%
+ ),
+ $uni-radius
);
-// 字体家族
-$body-font-family: 'Roboto', sans-serif !default;
-// 文本
-$heading-font-family: $body-font-family !default;
-$uni-headings: () !default;
-$letterSpacing: -0.01562em;
-$uni-headings: map-deep-merge(
- (
- 'h1': (
- size: 32px,
- weight: 300,
- line-height: 50px,
- // letter-spacing:-0.01562em
- ),
- 'h2': (
- size: 28px,
- weight: 300,
- line-height: 40px,
- // letter-spacing: -0.00833em
- ),
- 'h3': (
- size: 24px,
- weight: 400,
- line-height: 32px,
- // letter-spacing: normal
- ),
- 'h4': (
- size: 20px,
- weight: 400,
- line-height: 30px,
- // letter-spacing: 0.00735em
- ),
- 'h5': (
- size: 16px,
- weight: 400,
- line-height: 24px,
- // letter-spacing: normal
- ),
- 'h6': (
- size: 14px,
- weight: 500,
- line-height: 18px,
- // letter-spacing: 0.0125em
- ),
- 'subtitle': (
- size: 12px,
- weight: 400,
- line-height: 20px,
- // letter-spacing: 0.00937em
- ),
- 'body': (
- font-size: 14px,
- font-weight: 400,
- line-height: 22px,
- // letter-spacing: 0.03125em
- ),
- 'caption': (
- 'size': 12px,
- 'weight': 400,
- 'line-height': 20px,
- // 'letter-spacing': 0.03333em,
- // 'text-transform': false
- )
- ),
- $uni-headings
-);
-
-
-
-// 主色
-$uni-primary: #2979ff !default;
-$uni-primary-disable:lighten($uni-primary,20%) !default;
-$uni-primary-light: lighten($uni-primary,25%) !default;
-
-// 辅助色
-// 除了主色外的场景色,需要在不同的场景中使用(例如危险色表示危险的操作)。
-$uni-success: #18bc37 !default;
-$uni-success-disable:lighten($uni-success,20%) !default;
-$uni-success-light: lighten($uni-success,25%) !default;
-
-$uni-warning: #f3a73f !default;
-$uni-warning-disable:lighten($uni-warning,20%) !default;
-$uni-warning-light: lighten($uni-warning,25%) !default;
-
-$uni-error: #e43d33 !default;
-$uni-error-disable:lighten($uni-error,20%) !default;
-$uni-error-light: lighten($uni-error,25%) !default;
-
-$uni-info: #8f939c !default;
-$uni-info-disable:lighten($uni-info,20%) !default;
-$uni-info-light: lighten($uni-info,25%) !default;
-
-// 中性色
-// 中性色用于文本、背景和边框颜色。通过运用不同的中性色,来表现层次结构。
-$uni-main-color: #3a3a3a !default; // 主要文字
-$uni-base-color: #6a6a6a !default; // 常规文字
-$uni-secondary-color: #909399 !default; // 次要文字
-$uni-extra-color: #c7c7c7 !default; // 辅助说明
-
-// 边框颜色
-$uni-border-1: #F0F0F0 !default;
-$uni-border-2: #EDEDED !default;
-$uni-border-3: #DCDCDC !default;
-$uni-border-4: #B9B9B9 !default;
-
-// 常规色
-$uni-black: #000000 !default;
-$uni-white: #ffffff !default;
-$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
-
-// 背景色
-$uni-bg-color: #f7f7f7 !default;
-
-/* 水平间距 */
-$uni-spacing-sm: 8px !default;
-$uni-spacing-base: 15px !default;
-$uni-spacing-lg: 30px !default;
-
-// 阴影
-$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
-$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
-$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
-
-// 蒙版
-$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+ (
+ 'h1': (
+ size: 32px,
+ weight: 300,
+ line-height: 50px,
+ // letter-spacing:-0.01562em
+ ),
+ 'h2': (
+ size: 28px,
+ weight: 300,
+ line-height: 40px,
+ // letter-spacing: -0.00833em
+ ),
+ 'h3': (
+ size: 24px,
+ weight: 400,
+ line-height: 32px,
+ // letter-spacing: normal
+ ),
+ 'h4': (
+ size: 20px,
+ weight: 400,
+ line-height: 30px,
+ // letter-spacing: 0.00735em
+ ),
+ 'h5': (
+ size: 16px,
+ weight: 400,
+ line-height: 24px,
+ // letter-spacing: normal
+ ),
+ 'h6': (
+ size: 14px,
+ weight: 500,
+ line-height: 18px,
+ // letter-spacing: 0.0125em
+ ),
+ 'subtitle': (
+ size: 12px,
+ weight: 400,
+ line-height: 20px,
+ // letter-spacing: 0.00937em
+ ),
+ 'body': (
+ font-size: 14px,
+ font-weight: 400,
+ line-height: 22px,
+ // letter-spacing: 0.03125em
+ ),
+ 'caption': (
+ 'size': 12px,
+ 'weight': 400,
+ 'line-height': 20px,
+ // 'letter-spacing': 0.03333em,
+ // 'text-transform': false
+ )
+ ),
+ $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色,需要在不同的场景中使用(例如危险色表示危险的操作)。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色,来表现层次结构。
+$uni-main-color: #3a3a3a !default; // 主要文字
+$uni-base-color: #6a6a6a !default; // 常规文字
+$uni-secondary-color: #909399 !default; // 次要文字
+$uni-extra-color: #c7c7c7 !default; // 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
index a71beeb..ac6f63e 100644
--- a/uni_modules/uni-scss/styles/tools/functions.scss
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -1,19 +1,19 @@
-// 合并 map
-@function map-deep-merge($parent-map, $child-map){
- $result: $parent-map;
- @each $key, $child in $child-map {
- $parent-has-key: map-has-key($result, $key);
- $parent-value: map-get($result, $key);
- $parent-type: type-of($parent-value);
- $child-type: type-of($child);
- $parent-is-map: $parent-type == map;
- $child-is-map: $child-type == map;
-
- @if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
- $result: map-merge($result, ( $key: $child ));
- }@else {
- $result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
- }
- }
- @return $result;
-};
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+ $result: $parent-map;
+ @each $key, $child in $child-map {
+ $parent-has-key: map-has-key($result, $key);
+ $parent-value: map-get($result, $key);
+ $parent-type: type-of($parent-value);
+ $child-type: type-of($child);
+ $parent-is-map: $parent-type == map;
+ $child-is-map: $child-type == map;
+
+ @if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+ $result: map-merge($result, ( $key: $child ));
+ }@else {
+ $result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+ }
+ }
+ @return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
index 20cdf5e..80ee62f 100644
--- a/uni_modules/uni-scss/theme.scss
+++ b/uni_modules/uni-scss/theme.scss
@@ -1,31 +1,31 @@
-// 间距基础倍数
-$uni-space-root: 2;
-// 边框半径默认值
-$uni-radius-root:5px;
-// 主色
-$uni-primary: #2979ff;
-// 辅助色
-$uni-success: #4cd964;
-// 警告色
-$uni-warning: #f0ad4e;
-// 错误色
-$uni-error: #dd524d;
-// 描述色
-$uni-info: #909399;
-// 中性色
-$uni-main-color: #303133;
-$uni-base-color: #606266;
-$uni-secondary-color: #909399;
-$uni-extra-color: #C0C4CC;
-// 背景色
-$uni-bg-color: #f5f5f5;
-// 边框颜色
-$uni-border-1: #DCDFE6;
-$uni-border-2: #E4E7ED;
-$uni-border-3: #EBEEF5;
-$uni-border-4: #F2F6FC;
-
-// 常规色
-$uni-black: #000000;
-$uni-white: #ffffff;
-$uni-transparent: rgba($color: #000000, $alpha: 0);
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
index 49a89b6..1c062d4 100644
--- a/uni_modules/uni-scss/variables.scss
+++ b/uni_modules/uni-scss/variables.scss
@@ -1,62 +1,62 @@
-@import './styles/setting/_variables.scss';
-// 间距基础倍数
-$uni-space-root: 2;
-// 边框半径默认值
-$uni-radius-root:5px;
-
-// 主色
-$uni-primary: #2979ff;
-$uni-primary-disable:mix(#fff,$uni-primary,50%);
-$uni-primary-light: mix(#fff,$uni-primary,80%);
-
-// 辅助色
-// 除了主色外的场景色,需要在不同的场景中使用(例如危险色表示危险的操作)。
-$uni-success: #18bc37;
-$uni-success-disable:mix(#fff,$uni-success,50%);
-$uni-success-light: mix(#fff,$uni-success,80%);
-
-$uni-warning: #f3a73f;
-$uni-warning-disable:mix(#fff,$uni-warning,50%);
-$uni-warning-light: mix(#fff,$uni-warning,80%);
-
-$uni-error: #e43d33;
-$uni-error-disable:mix(#fff,$uni-error,50%);
-$uni-error-light: mix(#fff,$uni-error,80%);
-
-$uni-info: #8f939c;
-$uni-info-disable:mix(#fff,$uni-info,50%);
-$uni-info-light: mix(#fff,$uni-info,80%);
-
-// 中性色
-// 中性色用于文本、背景和边框颜色。通过运用不同的中性色,来表现层次结构。
-$uni-main-color: #3a3a3a; // 主要文字
-$uni-base-color: #6a6a6a; // 常规文字
-$uni-secondary-color: #909399; // 次要文字
-$uni-extra-color: #c7c7c7; // 辅助说明
-
-// 边框颜色
-$uni-border-1: #F0F0F0;
-$uni-border-2: #EDEDED;
-$uni-border-3: #DCDCDC;
-$uni-border-4: #B9B9B9;
-
-// 常规色
-$uni-black: #000000;
-$uni-white: #ffffff;
-$uni-transparent: rgba($color: #000000, $alpha: 0);
-
-// 背景色
-$uni-bg-color: #f7f7f7;
-
-/* 水平间距 */
-$uni-spacing-sm: 8px;
-$uni-spacing-base: 15px;
-$uni-spacing-lg: 30px;
-
-// 阴影
-$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
-$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
-$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
-
-// 蒙版
-$uni-mask: rgba($color: #000000, $alpha: 0.4);
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色,需要在不同的场景中使用(例如危险色表示危险的操作)。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色,来表现层次结构。
+$uni-main-color: #3a3a3a; // 主要文字
+$uni-base-color: #6a6a6a; // 常规文字
+$uni-secondary-color: #909399; // 次要文字
+$uni-extra-color: #c7c7c7; // 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/uni-swiper-dot/changelog.md b/uni_modules/uni-swiper-dot/changelog.md
new file mode 100644
index 0000000..85cf54d
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/changelog.md
@@ -0,0 +1,12 @@
+## 1.2.0(2021-11-19)
+- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-swiper-dot](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+## 1.1.0(2021-07-30)
+- 组件兼容 vue3,如何创建vue3项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.6(2021-05-12)
+- 新增 示例地址
+- 修复 示例项目缺少组件的Bug
+## 1.0.5(2021-02-05)
+- 调整为uni_modules目录规范
+- 新增 clickItem 事件,支持指示点控制轮播
+- 新增 支持 pc 可用
diff --git a/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
new file mode 100644
index 0000000..e66b6c7
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/components/uni-swiper-dot/uni-swiper-dot.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (current+1)+"/"+info.length +' ' +info[current][field] }}
+
+
+ {{ index+1 }}
+
+
+
+
+
+
+
diff --git a/uni_modules/uni-swiper-dot/package.json b/uni_modules/uni-swiper-dot/package.json
new file mode 100644
index 0000000..f2dd8d2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/package.json
@@ -0,0 +1,87 @@
+{
+ "id": "uni-swiper-dot",
+ "displayName": "uni-swiper-dot 轮播图指示点",
+ "version": "1.2.0",
+ "description": "自定义轮播图指示点组件",
+ "keywords": [
+ "uni-ui",
+ "uniui",
+ "轮播图指示点",
+ "dot",
+ "swiper"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": ""
+ },
+ "directories": {
+ "example": "../../temps/example_temps"
+ },
+ "dcloudext": {
+ "category": [
+ "前端组件",
+ "通用组件"
+ ],
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+ },
+ "uni_modules": {
+ "dependencies": ["uni-scss"],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "y"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-swiper-dot/readme.md b/uni_modules/uni-swiper-dot/readme.md
new file mode 100644
index 0000000..7d397e2
--- /dev/null
+++ b/uni_modules/uni-swiper-dot/readme.md
@@ -0,0 +1,11 @@
+
+
+## SwiperDot 轮播图指示点
+> **组件名:uni-swiper-dot**
+> 代码块: `uSwiperDot`
+
+
+自定义轮播图指示点
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-swiper-dot)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839
\ No newline at end of file