简柏林 / thingskit-app · Commits

Commit e8ff270cf0e9d8d3e1fa20a127d82a4a221b7191

Authored by 史婷婷
1 parent b7fe5601

feat: 为兼容mac,/deep/ 全局替换为 ::v-deep

Inline Side-by-side
Showing 16 changed files with 33 additions and 32 deletions
... ... @@ -3,4 +3,5 @@
3 3 unpackage/
4 4 .DS_Store
5 5 dist/
6   -node_modules/
\ No newline at end of file
  6 +node_modules/
  7 +.idea
\ No newline at end of file
... ...
... ... @@ -257,7 +257,7 @@ export default {
257 257 <style lang="scss" scoped>
258 258 @import './static/alarmDetail.scss';
259 259
260   -/deep/ .u-button--primary {
  260 +::v-deep .u-button--primary {
261 261 background-color: #377dff !important;
262 262 border-color: #377dff !important;
263 263 }
... ...
... ... @@ -38,21 +38,21 @@
38 38 </script>
39 39
40 40 <style lang="scss" scoped>
41   - /deep/ .u-button--primary {
  41 + ::v-deep .u-button--primary {
42 42 background-color: #377dff !important;
43 43 border-color: #377dff !important;
44 44 }
45 45
46   - /deep/ .u-button--info {
  46 + ::v-deep .u-button--info {
47 47 background-color: #e3e3e5 !important;
48 48 border-color: #e3e3e5 !important;
49 49 }
50 50
51   - /deep/ .u-cell__right-icon-wrap {
  51 + ::v-deep .u-cell__right-icon-wrap {
52 52 margin-top: -55rpx !important;
53 53 }
54 54
55   - /deep/ .uni-calendar--fixed {
  55 + ::v-deep .uni-calendar--fixed {
56 56 bottom: 172rpx !important;
57 57 }
58 58
... ...
... ... @@ -60,21 +60,21 @@
60 60 </script>
61 61
62 62 <style lang="scss" scoped>
63   - /deep/ .u-button--primary {
  63 + ::v-deep .u-button--primary {
64 64 background-color: #377dff !important;
65 65 border-color: #377dff !important;
66 66 }
67 67
68   - /deep/ .u-button--info {
  68 + ::v-deep .u-button--info {
69 69 background-color: #e3e3e5 !important;
70 70 border-color: #e3e3e5 !important;
71 71 }
72 72
73   - /deep/ .u-cell__right-icon-wrap {
  73 + ::v-deep .u-cell__right-icon-wrap {
74 74 margin-top: -55rpx !important;
75 75 }
76 76
77   - /deep/ .uni-calendar--fixed {
  77 + ::v-deep .uni-calendar--fixed {
78 78 bottom: 172rpx !important;
79 79 }
80 80
... ...
... ... @@ -389,7 +389,7 @@
389 389 }
390 390 }
391 391
392   - /deep/ .u-modal__content {
  392 + ::v-deep .u-modal__content {
393 393 padding: 30rpx 0 !important;
394 394 }
395 395 </style>
... ...
... ... @@ -36,19 +36,19 @@
36 36 .info-contain {
37 37 margin: 0rpx 27rpx;
38 38
39   - /deep/ .u-line {
  39 + ::v-deep .u-line {
40 40 display: none !important;
41 41 }
42 42
43   - /deep/ .u-form-item__body__left__content__label {
  43 + ::v-deep .u-form-item__body__left__content__label {
44 44 display: none !important;
45 45 }
46 46
47   - /deep/.u-form-item__body__right {
  47 + ::v-deep.u-form-item__body__right {
48 48 margin-left: -106rpx;
49 49 }
50 50
51   - /deep/.u-textarea--radius {
  51 + ::v-deep.u-textarea--radius {
52 52 border: none !important;
53 53 }
54 54 }
... ... @@ -58,7 +58,7 @@
58 58 }
59 59 }
60 60
61   - /deep/.u-button--primary {
  61 + ::v-deep.u-button--primary {
62 62 background-color: #377DFF !important;
63 63 border-color: #377DFF !important;
64 64 }
... ...
... ... @@ -391,21 +391,21 @@
391 391
392 392 @import './static/set.scss';
393 393
394   - /deep/ .u-line {
  394 + ::v-deep .u-line {
395 395 width: 662rpx !important;
396 396 }
397 397
398   - /deep/ .u-form-item {
  398 + ::v-deep .u-form-item {
399 399 height: 100rpx !important;
400 400 }
401 401
402   - /deep/ .u-form-item:nth-child(3) {
  402 + ::v-deep .u-form-item:nth-child(3) {
403 403 .u-form-item__body {
404 404 background: #f5f7fa !important;
405 405 width: 663rpx !important;
406 406 }
407 407 }
408   - /deep/ .u-form-item:nth-child(4) {
  408 + ::v-deep .u-form-item:nth-child(4) {
409 409 .u-form-item__body {
410 410 background: #f5f7fa !important;
411 411 width: 663rpx !important;
... ...
... ... @@ -217,7 +217,7 @@
217 217 <style lang="scss" scoped>
218 218 @import "./static/login.scss";
219 219
220   - /deep/ button {
  220 + ::v-deep button {
221 221 background: rgba(0, 0, 0, 0);
222 222 }
223 223 </style>
... ...
... ... @@ -249,21 +249,21 @@ import {mapActions } from 'vuex'
249 249 <style lang="scss" scoped>
250 250 @import './static/alarm.scss';
251 251
252   - /deep/ .u-button--primary {
  252 + ::v-deep .u-button--primary {
253 253 background-color: #377dff !important;
254 254 border-color: #377dff !important;
255 255 }
256 256
257   - /deep/ .u-button--info {
  257 + ::v-deep .u-button--info {
258 258 background-color: #e3e3e5 !important;
259 259 border-color: #e3e3e5 !important;
260 260 }
261 261
262   - /deep/ .u-cell__right-icon-wrap {
  262 + ::v-deep .u-cell__right-icon-wrap {
263 263 margin-top: -55rpx !important;
264 264 }
265 265
266   - /deep/ .uni-calendar--fixed {
  266 + ::v-deep .uni-calendar--fixed {
267 267 bottom: 172rpx !important;
268 268 }
269 269
... ...
... ... @@ -56,7 +56,7 @@ export default {
56 56
57 57 <style lang="scss" scoped>
58 58 @import './static/notifyDetail.scss';
59   -/deep/ .u-line {
  59 +::v-deep .u-line {
60 60 position: relative !important;
61 61 width: 640rpx !important;
62 62 left: 31rpx !important;
... ...
... ... @@ -18,7 +18,7 @@
18 18 top: 35rpx;
19 19 }
20 20 }
21   -/deep/.u-list-item {
  21 +::v-deep.u-list-item {
22 22 background: #ffffff;
23 23 width: 695rpx;
24 24 border-radius: 10px;
... ...
... ... @@ -140,7 +140,7 @@
140 140 <style lang="scss" scoped>
141 141 @import './static/systemNotify.scss';
142 142
143   - /deep/ .u-badge--error {
  143 + ::v-deep .u-badge--error {
144 144 position: relative;
145 145 right: 11rpx;
146 146 }
... ...
... ... @@ -50,7 +50,7 @@ export default {
50 50 type: String,
51 51 default: uni.$u.props.input.placeholder
52 52 },
53   - // 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/
  53 + // 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写::v-deep
54 54 placeholderClass: {
55 55 type: String,
56 56 default: uni.$u.props.input.placeholderClass
... ...
... ... @@ -59,7 +59,7 @@ import props from './props.js';
59 59 * @property {Boolean} password 是否密码类型 （ 默认 false ）
60 60 * @property {String | Number} maxlength 最大输入长度，设置为 -1 的时候不限制最大长度 （ 默认 -1 ）
61 61 * @property {String} placeholder 输入框为空时的占位符
62   - * @property {String} placeholderClass 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/ （ 默认 'input-placeholder' ）
  62 + * @property {String} placeholderClass 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写::v-deep （ 默认 'input-placeholder' ）
63 63 * @property {String | Object} placeholderStyle 指定placeholder的样式，字符串/对象形式，如"color: red;"
64 64 * @property {Boolean} showWordLimit 是否显示输入字数统计，只在 type ="text"或type ="textarea"时有效 （ 默认 false ）
65 65 * @property {String} confirmType 设置右下角按钮的文字，兼容性详见uni-app文档 （ 默认 'done' ）
... ...
... ... @@ -10,7 +10,7 @@ export default {
10 10 type: [String, Number],
11 11 default: uni.$u.props.textarea.placeholder
12 12 },
13   - // 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/
  13 + // 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写::v-deep
14 14 placeholderClass: {
15 15 type: String,
16 16 default: uni.$u.props.input.placeholderClass
... ...
... ... @@ -48,7 +48,7 @@ import props from "./props.js";
48 48 *
49 49 * @property {String | Number} value 输入框的内容
50 50 * @property {String | Number} placeholder 输入框为空时占位符
51   - * @property {String} placeholderClass 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/ （ 默认 'input-placeholder' ）
  51 + * @property {String} placeholderClass 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写::v-deep （ 默认 'input-placeholder' ）
52 52 * @property {String | Object} placeholderStyle 指定placeholder的样式，字符串/对象形式，如"color: red;"
53 53 * @property {String | Number} height 输入框高度（默认 70 ）
54 54 * @property {String} confirmType 设置键盘右下角按钮的文字，仅微信小程序，App-vue和H5有效（默认 'done' ）
... ...