diff --git a/yudao-ui-app/.editorconfig b/yudao-ui-app/.editorconfig new file mode 100644 index 0000000000..7034f9bf32 --- /dev/null +++ b/yudao-ui-app/.editorconfig @@ -0,0 +1,22 @@ +# 告诉EditorConfig插件,这是根文件,不用继续往上查找 +root = true + +# 匹配全部文件 +[*] +# 设置字符集 +charset = utf-8 +# 缩进风格,可选space、tab +indent_style = space +# 缩进的空格数 +indent_size = 2 +# 结尾换行符,可选lf、cr、crlf +end_of_line = lf +# 在文件结尾插入新行 +insert_final_newline = true +# 删除一行中的前后空格 +trim_trailing_whitespace = true + +# 匹配md结尾的文件 +[*.md] +insert_final_newline = false +trim_trailing_whitespace = false diff --git a/yudao-ui-app/components/custom-text-price/custom-text-price.vue b/yudao-ui-app/components/custom-text-price/custom-text-price.vue new file mode 100644 index 0000000000..15c5956d5b --- /dev/null +++ b/yudao-ui-app/components/custom-text-price/custom-text-price.vue @@ -0,0 +1,54 @@ + + + + diff --git a/yudao-ui-app/pages/cart/cart.vue b/yudao-ui-app/pages/cart/cart.vue index 793da35ccd..7826e199a7 100644 --- a/yudao-ui-app/pages/cart/cart.vue +++ b/yudao-ui-app/pages/cart/cart.vue @@ -1,24 +1,17 @@ - + diff --git a/yudao-ui-app/pages/category/category.vue b/yudao-ui-app/pages/category/category.vue index 3e92eb6a7f..bfd272a956 100644 --- a/yudao-ui-app/pages/category/category.vue +++ b/yudao-ui-app/pages/category/category.vue @@ -1,14 +1,14 @@ diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue index d20adb139a..adb60d2448 100644 --- a/yudao-ui-app/pages/index/index.vue +++ b/yudao-ui-app/pages/index/index.vue @@ -8,20 +8,20 @@ - + - - + - - - {{item.title}} - + + + {{ item.title }} + @@ -38,7 +38,7 @@ 查看更多 - + @@ -46,7 +46,7 @@ - + @@ -63,7 +63,7 @@ 更多 > - + @@ -72,7 +72,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -100,46 +100,40 @@ - + - - + diff --git a/yudao-ui-app/pages/login/login.vue b/yudao-ui-app/pages/login/login.vue index ad66efa4c4..99735df8e7 100644 --- a/yudao-ui-app/pages/login/login.vue +++ b/yudao-ui-app/pages/login/login.vue @@ -1,6 +1,5 @@ diff --git a/yudao-ui-app/pages/profile/profile.vue b/yudao-ui-app/pages/profile/profile.vue index f19c84d9e5..2fceddcafc 100644 --- a/yudao-ui-app/pages/profile/profile.vue +++ b/yudao-ui-app/pages/profile/profile.vue @@ -1,24 +1,17 @@ - + diff --git a/yudao-ui-app/pages/register/register.vue b/yudao-ui-app/pages/register/register.vue index 062ebbc78a..cda5964138 100644 --- a/yudao-ui-app/pages/register/register.vue +++ b/yudao-ui-app/pages/register/register.vue @@ -1,6 +1,5 @@ @@ -53,17 +43,17 @@ export default { inputType: 'password', formData: { username: '', - password: '', + password: '' }, rules: { - 'username': { + username: { type: 'string', max: 20, required: true, message: '请输入您的账号', trigger: ['blur', 'change'] }, - 'password': { + password: { type: 'string', max: 20, required: true, @@ -73,28 +63,27 @@ export default { } } }, - onLoad() { - - }, + onLoad() {}, methods: { - handleUsernameChange(e){ - let str = uni.$u.trim(e, 'all'); + handleUsernameChange(e) { + let str = uni.$u.trim(e, 'all') this.$nextTick(() => { this.formData.username = str }) }, - handlePasswordChange(e){ - let str = uni.$u.trim(e, 'all'); + handlePasswordChange(e) { + let str = uni.$u.trim(e, 'all') this.$nextTick(() => { this.formData.password = str }) }, handleSubmit() { - this.$refs.form.validate().then(res => { - uni.$u.toast('点击了注册账号') - }).catch(err => { - - }) + this.$refs.form + .validate() + .then(res => { + uni.$u.toast('点击了注册账号') + }) + .catch(err => {}) }, navigateBack() { uni.navigateBack() @@ -104,41 +93,28 @@ export default { diff --git a/yudao-ui-app/pages/user/user.vue b/yudao-ui-app/pages/user/user.vue index 7890161162..99e0961bbf 100644 --- a/yudao-ui-app/pages/user/user.vue +++ b/yudao-ui-app/pages/user/user.vue @@ -1,9 +1,9 @@ diff --git a/yudao-ui-app/uni.scss b/yudao-ui-app/uni.scss index 0ebf216e18..7b272df424 100644 --- a/yudao-ui-app/uni.scss +++ b/yudao-ui-app/uni.scss @@ -22,3 +22,39 @@ $custom-bg-color: #ffffff; /* 边框样式 */ $custom-border-style: 1rpx solid #f3f3f3; + + +@mixin flex-left($direction: row) { + display: flex; + flex-direction: $direction; + align-items: center; + justify-content: left; +} + +@mixin flex-right($direction: row) { + display: flex; + flex-direction: $direction; + align-items: center; + justify-content: right; +} + +@mixin flex-center($direction: row) { + display: flex; + flex-direction: $direction; + align-items: center; + justify-content: center; +} + +@mixin flex-space-between($direction: row) { + display: flex; + flex-direction: $direction; + align-items: center; + justify-content: space-between; +} + +@mixin flex-space-around($direction: row) { + display: flex; + flex-direction: $direction; + align-items: center; + justify-content: space-around; +} diff --git a/yudao-ui-app/uni_modules/uview-ui/components/u--text-price/u--text-price.vue b/yudao-ui-app/uni_modules/uview-ui/components/u--text-price/u--text-price.vue deleted file mode 100644 index 0911a3627d..0000000000 --- a/yudao-ui-app/uni_modules/uview-ui/components/u--text-price/u--text-price.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - \ No newline at end of file