Compare commits
6 Commits
8b7b95798e
...
6a1ea10ee6
| Author | SHA1 | Date | |
|---|---|---|---|
| 6a1ea10ee6 | |||
| 0432791b0c | |||
| 2763361356 | |||
| 7fccd2b942 | |||
| ddfe55e58c | |||
| 9d6a593e2e |
28
package-lock.json
generated
28
package-lock.json
generated
@ -2076,31 +2076,6 @@
|
||||
"webpack-chain": "^6.4.0",
|
||||
"webpack-dev-server": "^3.11.0",
|
||||
"webpack-merge": "^4.2.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"chalk": {
|
||||
"version": "4.1.2",
|
||||
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
|
||||
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"ansi-styles": "^4.1.0",
|
||||
"supports-color": "^7.1.0"
|
||||
}
|
||||
},
|
||||
"vue-loader-v16": {
|
||||
"version": "npm:vue-loader@16.8.3",
|
||||
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
|
||||
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"chalk": "^4.1.0",
|
||||
"hash-sum": "^2.0.0",
|
||||
"loader-utils": "^2.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"@vue/cli-shared-utils": {
|
||||
@ -15010,7 +14985,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"vue-loader-v16": {
|
||||
"version": "npm:vue-loader@16.8.3",
|
||||
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
|
||||
@ -15036,8 +15010,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
=======
|
||||
>>>>>>> ac9e27d045b841a3a3a2a3dca10cce199d7f3c77
|
||||
"vue-router": {
|
||||
"version": "4.5.1",
|
||||
"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.5.1.tgz",
|
||||
|
||||
@ -72,11 +72,11 @@
|
||||
</el-carousel>
|
||||
</enterprise-employment-card>
|
||||
<enterprise-employment-card
|
||||
style="margin-top: 0.625vw"
|
||||
:title="cardThreeInfo.title"
|
||||
:description="cardThreeInfo.description"
|
||||
:type1="cardThreeInfo.type1"
|
||||
:type2="cardThreeInfo.type2"
|
||||
style="margin-top: 0.625vw"
|
||||
>
|
||||
<ListView/>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user