样式整改

This commit is contained in:
宋伟佳
2021-05-25 20:02:41 +08:00
parent 7e0cc4fd20
commit 4db7ae5888
51 changed files with 160 additions and 356 deletions
+143 -124
View File
@@ -3619,6 +3619,23 @@
"upath": "^1.1.1" "upath": "^1.1.1"
} }
}, },
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true,
"optional": true
},
"commander": { "commander": {
"version": "2.20.3", "version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
@@ -4564,6 +4581,94 @@
} }
} }
}, },
"vue-loader-v16": {
"version": "npm:vue-loader@16.2.0",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.2.0.tgz?cache=0&sync_timestamp=1620717743226&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.2.0.tgz",
"integrity": "sha1-BGpTMI3Ufljv4g3ewe3sAnzjtG4=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.nlark.com/big.js/download/big.js-5.2.2.tgz",
"integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
"dev": true,
"optional": true
},
"chalk": {
"version": "4.1.1",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz",
"integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"emojis-list": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz",
"integrity": "sha1-VXBmIEatKeLpFucariYKvf9Pang=",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1618847009337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
"integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
"dev": true,
"optional": true
},
"json5": {
"version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz",
"integrity": "sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM=",
"dev": true,
"optional": true,
"requires": {
"minimist": "^1.2.5"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1618561027869&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
"integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-style-loader": { "vue-style-loader": {
"version": "4.1.2", "version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
@@ -6513,12 +6618,12 @@
"dev": true "dev": true
}, },
"copy-anything": { "copy-anything": {
"version": "2.0.1", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz", "resolved": "https://registry.npm.taobao.org/copy-anything/download/copy-anything-2.0.3.tgz",
"integrity": "sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==", "integrity": "sha1-hCQHugJGaw34RIGbvjuuu+XUXYc=",
"dev": true, "dev": true,
"requires": { "requires": {
"is-what": "^3.7.1" "is-what": "^3.12.0"
} }
}, },
"copy-concurrently": { "copy-concurrently": {
@@ -9208,7 +9313,7 @@
}, },
"image-size": { "image-size": {
"version": "0.5.5", "version": "0.5.5",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", "resolved": "https://registry.nlark.com/image-size/download/image-size-0.5.5.tgz",
"integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
"dev": true, "dev": true,
"optional": true "optional": true
@@ -9586,9 +9691,9 @@
"dev": true "dev": true
}, },
"is-what": { "is-what": {
"version": "3.12.0", "version": "3.14.1",
"resolved": "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz", "resolved": "https://registry.npm.taobao.org/is-what/download/is-what-3.14.1.tgz?cache=0&sync_timestamp=1615169735707&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-what%2Fdownload%2Fis-what-3.14.1.tgz",
"integrity": "sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw==", "integrity": "sha1-4SIvRt3ahd6tD9HJ3xMXYOd3VcE=",
"dev": true "dev": true
}, },
"is-windows": { "is-windows": {
@@ -9784,8 +9889,8 @@
}, },
"less": { "less": {
"version": "3.13.1", "version": "3.13.1",
"resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz", "resolved": "https://registry.npm.taobao.org/less/download/less-3.13.1.tgz",
"integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", "integrity": "sha1-DryR0qDpwMZzW4PUlrCrBYMHeQk=",
"dev": true, "dev": true,
"requires": { "requires": {
"copy-anything": "^2.0.1", "copy-anything": "^2.0.1",
@@ -9799,42 +9904,24 @@
"tslib": "^1.10.0" "tslib": "^1.10.0"
}, },
"dependencies": { "dependencies": {
"make-dir": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
"dev": true,
"optional": true,
"requires": {
"pify": "^4.0.1",
"semver": "^5.6.0"
}
},
"mime": { "mime": {
"version": "1.6.0", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "resolved": "https://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz",
"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE=",
"dev": true,
"optional": true
},
"pify": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"tslib": { "tslib": {
"version": "1.14.1", "version": "1.14.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.14.1.tgz?cache=0&sync_timestamp=1617647281845&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.1.tgz",
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "integrity": "sha1-zy04vcNKE0vK8QkcQfZhni9nLQA=",
"dev": true "dev": true
} }
} }
@@ -9978,6 +10065,26 @@
"yallist": "^3.0.2" "yallist": "^3.0.2"
} }
}, },
"make-dir": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/make-dir/download/make-dir-2.1.0.tgz",
"integrity": "sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU=",
"dev": true,
"optional": true,
"requires": {
"pify": "^4.0.1",
"semver": "^5.6.0"
},
"dependencies": {
"pify": {
"version": "4.0.1",
"resolved": "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz",
"integrity": "sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE=",
"dev": true,
"optional": true
}
}
},
"map-cache": { "map-cache": {
"version": "0.2.2", "version": "0.2.2",
"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -10403,8 +10510,8 @@
}, },
"native-request": { "native-request": {
"version": "1.0.8", "version": "1.0.8",
"resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz", "resolved": "https://registry.nlark.com/native-request/download/native-request-1.0.8.tgz",
"integrity": "sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==", "integrity": "sha1-j2a/YG4PfqJ8DlmV6y9dA+M65vs=",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
@@ -13515,94 +13622,6 @@
"resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz", "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.22.4.tgz",
"integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q==" "integrity": "sha512-XLI5s0AdqMP2Lf4I4CmdmOq8kjb5DDFGR77wAuxCfpEuYSfhTRyyx6MetgZMiL6Lxa0DasjBOiOcciU3NkL3/Q=="
}, },
"vue-loader-v16": {
"version": "npm:vue-loader@16.1.2",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
"integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"hash-sum": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
"integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
"dev": true,
"optional": true
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-router": { "vue-router": {
"version": "3.4.0", "version": "3.4.0",
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.0.tgz",
+1 -1
View File
@@ -32,7 +32,7 @@
"@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-router": "~4.5.0",
"@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-plugin-vuex": "~4.5.0",
"@vue/cli-service": "~4.5.0", "@vue/cli-service": "~4.5.0",
"less": "^3.0.4", "less": "^3.13.1",
"less-loader": "^5.0.0", "less-loader": "^5.0.0",
"vue-template-compiler": "^2.6.11", "vue-template-compiler": "^2.6.11",
"webpack": "^4.27.1" "webpack": "^4.27.1"
Binary file not shown.

After

Width:  |  Height:  |  Size: 599 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

+2 -1
View File
@@ -49,7 +49,8 @@
} }
#app{ #app{
&.theme-one { &.theme-one {
background: url('~@/assets/images/shangqi/home/home-bg.png') no-repeat; //background: url('~@/assets/images/shangqi/home/home-bg.png') no-repeat;
background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
background-size: cover; background-size: cover;
} }
input:focus{ input:focus{
+1 -18
View File
@@ -369,7 +369,6 @@
input.el-input__inner{ input.el-input__inner{
display: inline-block; display: inline-block;
width: 165px; width: 165px;
border-radius: 20px;
color: #999; color: #999;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
@@ -385,7 +384,6 @@
font-family: MicrosoftYaHei,微软雅黑; font-family: MicrosoftYaHei,微软雅黑;
} }
.el-range-editor.el-date-editor--daterange { .el-range-editor.el-date-editor--daterange {
border-radius: 20px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
font-family: MicrosoftYaHei,微软雅黑; font-family: MicrosoftYaHei,微软雅黑;
@@ -405,7 +403,6 @@
input.el-input__inner{ input.el-input__inner{
display: inline-block; display: inline-block;
width: 100%; width: 100%;
border-radius: 20px;
color: #999; color: #999;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
@@ -414,7 +411,6 @@
textarea.el-textarea__inner{ textarea.el-textarea__inner{
display: inline-block; display: inline-block;
width: 425px; width: 425px;
border-radius: 5px;
color: #999; color: #999;
//height: 30px; //height: 30px;
//line-height: 30px; //line-height: 30px;
@@ -425,7 +421,6 @@
textarea.el-textarea__inner{ textarea.el-textarea__inner{
display: inline-block; display: inline-block;
width: 425px; width: 425px;
border-radius: 5px;
color: #999; color: #999;
//height: 30px; //height: 30px;
//line-height: 30px; //line-height: 30px;
@@ -441,7 +436,6 @@
input.el-input__inner{ input.el-input__inner{
display: inline-block; display: inline-block;
width: 400px; width: 400px;
border-radius: 20px;
color: #999; color: #999;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
@@ -575,7 +569,6 @@ tr.el-table__row{
input.el-input__inner{ input.el-input__inner{
display: inline-block; display: inline-block;
width: 180px; width: 180px;
border-radius: 20px;
colro: #999; colro: #999;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
@@ -687,7 +680,6 @@ tr.el-table__row{
font-size: 14px; font-size: 14px;
color: #409EFF; color: #409EFF;
border: 1px solid #409EFF; border: 1px solid #409EFF;
border-radius: 15px;
background: rgba(64, 158, 255, 0.1); background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
} }
@@ -697,7 +689,6 @@ tr.el-table__row{
right: 10px; right: 10px;
left: auto; left: auto;
background: #fff3f3; background: #fff3f3;
border-radius: 3px;
z-index: 9; z-index: 9;
} }
} }
@@ -828,12 +819,6 @@ tr.el-table__row{
.el-input__inner { .el-input__inner {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
border-radius: 15px;
}
}
.el-textarea{
.el-textarea__inner{
border-radius: 15px;
} }
} }
.form-upload-btn{ .form-upload-btn{
@@ -843,7 +828,6 @@ tr.el-table__row{
font-size: 14px; font-size: 14px;
color: #409EFF; color: #409EFF;
border: 1px solid #409EFF; border: 1px solid #409EFF;
border-radius: 15px;
background: rgba(64, 158, 255, 0.1); background: rgba(64, 158, 255, 0.1);
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
} }
@@ -854,7 +838,6 @@ tr.el-table__row{
.switch-wrap { .switch-wrap {
padding: 3px 7px; padding: 3px 7px;
border: 1px solid #409EFF; border: 1px solid #409EFF;
border-radius: 20px;
user-select: none; user-select: none;
.el-switch__label, .el-switch__label,
.el-switch__label.is-active { .el-switch__label.is-active {
@@ -918,4 +901,4 @@ tr.el-table__row{
.el-input__inner { .el-input__inner {
width: 100% !important; width: 100% !important;
} }
} }
@@ -501,7 +501,6 @@ export default {
margin-left: 5px; margin-left: 5px;
} }
/deep/.el-input--suffix .el-input__inner { /deep/.el-input--suffix .el-input__inner {
border-radius: 100px;
height: 35px; height: 35px;
line-height: 35px; line-height: 35px;
} }
-12
View File
@@ -1101,23 +1101,17 @@ export default {
color: #ffffff; color: #ffffff;
background: #409EFF; background: #409EFF;
border: none; border: none;
border-radius: 20px;
} }
.advancedSearch-btn-reduce{ .advancedSearch-btn-reduce{
padding: 12px 12px; padding: 12px 12px;
color: #999; color: #999;
background: #fff; background: #fff;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
border-radius: 20px;
} }
.advance-dialog { .advance-dialog {
.advance-dialog-form{ .advance-dialog-form{
/deep/input.el-input__inner{
border-radius: 20px;
}
.el-date-editor, .advanced-three{ .el-date-editor, .advanced-three{
width: 247px; width: 247px;
border-radius: 20px;
} }
.el-date-editor{ .el-date-editor{
/deep/& > span{ /deep/& > span{
@@ -1132,9 +1126,6 @@ button.el-button.advancedSearch-btn-reduce.el-button--default{
.query-box{ .query-box{
width: 850px; width: 850px;
.advance-dialog-form{ .advance-dialog-form{
/deep/input.el-input__inner{
border-radius: 20px;
}
.advanced-class{ .advanced-class{
visibility: hidden; visibility: hidden;
} }
@@ -1146,18 +1137,15 @@ button.el-button.advancedSearch-btn-reduce.el-button--default{
color: #ffffff; color: #ffffff;
background: #409EFF; background: #409EFF;
border: none; border: none;
border-radius: 20px;
} }
.advancedSearch-btn-reduce{ .advancedSearch-btn-reduce{
padding: 12px 12px; padding: 12px 12px;
color: #999; color: #999;
background: #fff; background: #fff;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
border-radius: 20px;
} }
.el-date-editor, .advanced-three{ .el-date-editor, .advanced-three{
width: 247px; width: 247px;
border-radius: 20px;
} }
.el-date-editor{ .el-date-editor{
/deep/& > span{ /deep/& > span{
+1 -3
View File
@@ -1484,9 +1484,7 @@ export default {
flex-direction: column; flex-direction: column;
.input-wrapper{ .input-wrapper{
padding: 10px 5px 0 5px; padding: 10px 5px 0 5px;
.empty {
border-radius: 50px;
}
input{ input{
display: inline-block; display: inline-block;
width: 100%; width: 100%;
+2 -2
View File
@@ -441,7 +441,7 @@ export default {
}, },
computed: { computed: {
logo () { logo () {
return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo.png') return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo2.png')
}, },
...mapGetters(['getDynamicTotal', 'isCollapse']) ...mapGetters(['getDynamicTotal', 'isCollapse'])
}, },
@@ -469,7 +469,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
&:not(.is-collapse) { &:not(.is-collapse) {
width: 212px; width: 212px;
background: url("~assets/images/shangqi/sideBar/side-bar-bg.png") no-repeat; background: url("~assets/images/shangqi/sideBar/side-bar-bg1.png") no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
.logo { .logo {
img { img {
@@ -1413,7 +1413,6 @@ export default {
height: 32px; height: 32px;
line-height: 1.5; line-height: 1.5;
padding: 4px 30px 4px 10px; padding: 4px 30px 4px 10px;
border-radius: 50px;
color: #515a6e; color: #515a6e;
background-color: #fff; background-color: #fff;
position: relative; position: relative;
-1
View File
@@ -375,6 +375,5 @@ export default {
} }
} }
.serch-form-item .el-form-item__content .el-input__inner{ .serch-form-item .el-form-item__content .el-input__inner{
border-radius: 4px !important;
} }
</style> </style>
+4 -2
View File
@@ -230,7 +230,8 @@ export default {
} }
.home_v3 { .home_v3 {
height: 100%; height: 100%;
background: url("~@/assets/images/shangqi/home/home-bg.png") no-repeat; //background: url("~@/assets/images/shangqi/home/home-bg.png") no-repeat;
background: url("~@/assets/images/shangqi/home/BG.png") no-repeat;
background-size: cover; background-size: cover;
padding: 6px 26px; padding: 6px 26px;
display: flex; display: flex;
@@ -246,7 +247,8 @@ export default {
display: inline-block; display: inline-block;
width: 160px; width: 160px;
height: 61px; height: 61px;
background: url("~@/assets/images/shangqi/home/logo-bg.png") no-repeat; //background: url("~@/assets/images/shangqi/home/logo-bg.png") no-repeat;
background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat;
background-size: cover; background-size: cover;
} }
} }
+2 -1
View File
@@ -1258,7 +1258,8 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.home_v3 { .home_v3 {
height: 100%; height: 100%;
background: url("~@/assets/images/shangqi/home/home-bg.png") no-repeat; //background: url("~@/assets/images/shangqi/home/home-bg.png") no-repeat;
background: url("~@/assets/images/shangqi/home/BG.png") no-repeat;
background-size: cover; background-size: cover;
overflow: auto; overflow: auto;
} }
@@ -1671,7 +1671,6 @@ export default {
} }
/deep/ .search-area .search-item .el-input-number { /deep/ .search-area .search-item .el-input-number {
overflow: hidden; overflow: hidden;
border-radius: 20px;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
.el-input__inner { .el-input__inner {
@@ -798,9 +798,4 @@ export default {
} }
} }
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px;
}
}
</style> </style>
+4 -3
View File
@@ -317,7 +317,8 @@ export default {
left: 9vw; left: 9vw;
width: 160px; width: 160px;
height: 61px; height: 61px;
background: url("~@/assets/images/shangqi/home/logo-bg.png") no-repeat center; //background: url("~@/assets/images/shangqi/home/logo-bg.png") no-repeat center;
background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat center;
background-position: center left; background-position: center left;
background-size: 100% 100%; background-size: 100% 100%;
} }
@@ -366,7 +367,6 @@ export default {
padding: 0 25px 0 50px; padding: 0 25px 0 50px;
height: inherit; height: inherit;
font-size: 16px; font-size: 16px;
border-radius: 70px;
background: #EEF8FA; background: #EEF8FA;
background-image: url("~@/assets/images/user.png"); background-image: url("~@/assets/images/user.png");
background-repeat: no-repeat; background-repeat: no-repeat;
@@ -449,7 +449,8 @@ export default {
left: 6.0vw; left: 6.0vw;
width: 160px; width: 160px;
height: 61px; height: 61px;
background: url("~@/assets/images/shangqi/home/logo-bg.png") no-repeat center; //background: url("~@/assets/images/shangqi/home/logo-bg.png") no-repeat center;
background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat center;
background-size:100% 100%; background-size:100% 100%;
} }
.login-form{ .login-form{
@@ -1054,12 +1054,6 @@ export default {
text-align: left; text-align: left;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
a { a {
color: #409EFF; color: #409EFF;
@@ -81,7 +81,6 @@ export default {
input.el-input__inner{ input.el-input__inner{
display: inline-block; display: inline-block;
width: 165px; width: 165px;
border-radius: 20px !important;
color: #999; color: #999;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
@@ -1006,11 +1006,6 @@
.detail-table-conent { .detail-table-conent {
flex: auto; flex: auto;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
} }
@@ -1019,7 +1014,6 @@
} }
.dialog-input { .dialog-input {
/deep/ .el-input__inner { /deep/ .el-input__inner {
border-radius: 20px;
width: 360px; width: 360px;
} }
} }
@@ -990,24 +990,12 @@
.detail-table-conent { .detail-table-conent {
flex: auto; flex: auto;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
} }
.demo-dialog-footer { .demo-dialog-footer {
float: right; float: right;
} }
.dialog-input {
/deep/ .el-input__inner {
border-radius: 20px;
width: 360px;
}
}
.btn { .btn {
margin-bottom: 10px; margin-bottom: 10px;
} }
@@ -846,24 +846,12 @@
.detail-table-conent { .detail-table-conent {
flex: auto; flex: auto;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
} }
.demo-dialog-footer { .demo-dialog-footer {
float: right; float: right;
} }
.dialog-input {
/deep/ .el-input__inner {
border-radius: 20px;
width: 360px;
}
}
.btn { .btn {
margin-bottom: 10px; margin-bottom: 10px;
} }
@@ -1004,23 +1004,12 @@ export default {
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
} }
.demo-dialog-footer { .demo-dialog-footer {
float: right; float: right;
} }
.dialog-input {
/deep/ .el-input__inner {
border-radius: 20px;
width: 360px;
}
}
.btn { .btn {
margin-bottom: 10px; margin-bottom: 10px;
@@ -365,11 +365,5 @@ export default {
} }
} }
} }
.bead {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
</style> </style>
@@ -358,11 +358,5 @@ export default {
} }
} }
} }
.bead {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
</style> </style>
@@ -356,11 +356,5 @@ export default {
} }
} }
} }
.bead {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
</style> </style>
@@ -1016,23 +1016,12 @@
.detail-table-conent { .detail-table-conent {
flex: auto; flex: auto;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
} }
.demo-dialog-footer { .demo-dialog-footer {
float: right; float: right;
} }
.dialog-input {
/deep/ .el-input__inner {
border-radius: 20px;
width: 360px;
}
}
.btn { .btn {
margin-bottom: 10px; margin-bottom: 10px;
@@ -979,11 +979,6 @@
.detail-table-conent { .detail-table-conent {
flex: auto; flex: auto;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
} }
@@ -992,7 +987,6 @@
} }
.dialog-input { .dialog-input {
/deep/ .el-input__inner { /deep/ .el-input__inner {
border-radius: 20px;
width: 360px; width: 360px;
} }
} }
@@ -831,11 +831,6 @@
.detail-table-conent { .detail-table-conent {
flex: auto; flex: auto;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
} }
@@ -844,7 +839,6 @@
} }
.dialog-input { .dialog-input {
/deep/ .el-input__inner { /deep/ .el-input__inner {
border-radius: 20px;
width: 360px; width: 360px;
} }
} }
@@ -973,24 +973,12 @@
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
} }
.demo-dialog-footer { .demo-dialog-footer {
float: right; float: right;
} }
.dialog-input {
/deep/ .el-input__inner {
border-radius: 20px;
width: 360px;
}
}
.btn { .btn {
margin-bottom: 10px; margin-bottom: 10px;
} }
@@ -365,11 +365,5 @@
} }
} }
} }
.bead {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
</style> </style>
@@ -359,10 +359,5 @@
} }
} }
.bead {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
</style> </style>
@@ -358,11 +358,5 @@
} }
} }
} }
.bead {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
} }
</style> </style>
@@ -1707,19 +1707,9 @@ export default {
} }
} }
} }
.bead {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
.skip { .skip {
margin: 10px; margin: 10px;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
::v-deep .el-drawer__header{ ::v-deep .el-drawer__header{
&>span:first-child{ &>span:first-child{
outline: none!important; outline: none!important;
@@ -853,19 +853,9 @@ export default {
} }
} }
} }
.bead {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
.skip { .skip {
margin: 10px; margin: 10px;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
.transition-box{ .transition-box{
padding: 0 10px; padding: 0 10px;
background: #ffffff; background: #ffffff;
@@ -1726,19 +1726,9 @@ export default {
} }
} }
} }
.bead {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
.skip { .skip {
margin: 10px; margin: 10px;
} }
.bead-input {
/deep/ .el-input__inner {
border-radius: 20px !important;
}
}
.transition-box{ .transition-box{
padding: 0 10px; padding: 0 10px;
background: #ffffff; background: #ffffff;
@@ -2415,9 +2415,6 @@ export default {
background: transparent; background: transparent;
margin-right: 10px; margin-right: 10px;
padding: 0; padding: 0;
/deep/.el-textarea__inner {
border-radius: 20px;
}
/deep/.el-input__inner { /deep/.el-input__inner {
width: 240px; width: 240px;
} }
@@ -3840,10 +3840,6 @@ export default {
} }
/deep/ .search-item { /deep/ .search-item {
.el-input__inner {
border-radius: 4px !important;
}
.el-input__icon { .el-input__icon {
line-height: 30px; line-height: 30px;
} }
@@ -2917,9 +2917,6 @@ export default {
} }
} }
/deep/ .search-item { /deep/ .search-item {
.el-input__inner {
border-radius: 4px !important;
}
.el-input__icon { .el-input__icon {
line-height: 30px; line-height: 30px;
} }
@@ -953,7 +953,6 @@ export default {
border: 1px solid #e5e5e5; border: 1px solid #e5e5e5;
/deep/.el-input__inner{ /deep/.el-input__inner{
margin: 5px 0; margin: 5px 0;
border-radius: 15px;
} }
/deep/.table-row-background{ /deep/.table-row-background{
background: #ecf7ff; background: #ecf7ff;
@@ -1272,7 +1272,6 @@ export default {
/deep/.el-input__inner{ /deep/.el-input__inner{
height: 30px !important; height: 30px !important;
line-height: 30px; line-height: 30px;
border-radius: 15px;
} }
/deep/.table-row-background{ /deep/.table-row-background{
background: #ecf7ff; background: #ecf7ff;
@@ -1341,7 +1341,6 @@ export default {
/deep/.el-input__inner{ /deep/.el-input__inner{
height: 30px !important; height: 30px !important;
line-height: 30px; line-height: 30px;
border-radius: 15px;
} }
/deep/.table-row-background{ /deep/.table-row-background{
background: #ecf7ff; background: #ecf7ff;
@@ -930,9 +930,6 @@ export default {
.bead-input { .bead-input {
width: 100%; width: 100%;
/deep/ .el-input__inner {
border-radius: 20px !important;
}
} }
.demo-table-expand { .demo-table-expand {
@@ -784,9 +784,6 @@ export default {
.bead-input { .bead-input {
width: 100%; width: 100%;
/deep/ .el-input__inner {
border-radius: 20px !important;
}
} }
.demo-table-expand { .demo-table-expand {
@@ -1018,9 +1018,6 @@ export default {
.bead-input { .bead-input {
width: 100%; width: 100%;
/deep/ .el-input__inner {
border-radius: 20px !important;
}
} }
.demo-table-expand { .demo-table-expand {
@@ -3750,23 +3750,18 @@ export default {
color: #ffffff; color: #ffffff;
background: #409EFF; background: #409EFF;
border: none; border: none;
border-radius: 20px;
} }
.advancedSearch-btn-reduce{ .advancedSearch-btn-reduce{
padding: 12px 12px; padding: 12px 12px;
color: #999; color: #999;
background: #fff; background: #fff;
border: 1px solid #DCDFE6; border: 1px solid #DCDFE6;
border-radius: 20px;
} }
button.el-button.advancedSearch-btn-reduce.el-button--default{ button.el-button.advancedSearch-btn-reduce.el-button--default{
margin-left: 0; margin-left: 0;
} }
.advance-dialog { .advance-dialog {
.advance-dialog-form{ .advance-dialog-form{
/deep/input.el-input__inner{
border-radius: 20px;
}
} }
} }
} }
@@ -2079,7 +2079,6 @@ export default {
padding-right: 30px; padding-right: 30px;
line-height: 30px; line-height: 30px;
height: 30px; height: 30px;
border-radius: 20px;
} }
/deep/.el-input__icon { /deep/.el-input__icon {
line-height: 30px; line-height: 30px;
@@ -2497,7 +2497,6 @@ export default {
.AllBox { .AllBox {
margin-top: 20px; margin-top: 20px;
background-color: #fff; background-color: #fff;
border-radius: 20px;
padding: 10px; padding: 10px;
&:last-child { &:last-child {
margin-bottom: 20px; margin-bottom: 20px;
@@ -3004,7 +3003,6 @@ export default {
} }
.el-input--suffix .el-input__inner { .el-input--suffix .el-input__inner {
padding-right: 30px; padding-right: 30px;
border-radius: 20px;
} }
.fixed-clean { .fixed-clean {
/deep/.el-input__inner { /deep/.el-input__inner {
@@ -3019,7 +3017,6 @@ export default {
} }
.search-content__wrap { .search-content__wrap {
background-color: hsla(0, 0%, 100%, .9); background-color: hsla(0, 0%, 100%, .9);
border-radius: 20px;
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
margin-top: 20px; margin-top: 20px;
@@ -74,7 +74,6 @@ export default {
input.el-input__inner{ input.el-input__inner{
display: inline-block; display: inline-block;
width: 165px; width: 165px;
border-radius: 20px !important;
color: #999; color: #999;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;