diff --git a/FrontCode2/sunshine_levy/package-lock.json b/FrontCode2/sunshine_levy/package-lock.json index 3e15ecb..fcc5809 100644 --- a/FrontCode2/sunshine_levy/package-lock.json +++ b/FrontCode2/sunshine_levy/package-lock.json @@ -334,6 +334,14 @@ "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", "dev": true }, + "async-validator": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "requires": { + "babel-runtime": "6.x" + } + }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -611,8 +619,7 @@ "babel-helper-vue-jsx-merge-props": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", - "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==", - "dev": true + "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==" }, "babel-helpers": { "version": "6.24.1", @@ -1150,7 +1157,6 @@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" @@ -2052,6 +2058,14 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, + "copy-anything": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.3.tgz", + "integrity": "sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ==", + "requires": { + "is-what": "^3.12.0" + } + }, "copy-concurrently": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", @@ -2091,8 +2105,7 @@ "core-js": { "version": "2.6.12", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", - "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==", - "dev": true + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, "core-util-is": { "version": "1.0.3", @@ -3244,6 +3257,11 @@ "regexp.prototype.flags": "^1.2.0" } }, + "deepmerge": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", + "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -3530,6 +3548,19 @@ "integrity": "sha512-gBN7wNAxV5vl1430dG+XRcQhD4pIeYeak6p6rjdCtlz5wWNwDad8jwvphe5oi1chL5MV6RNRikfffBBiFuj+rQ==", "dev": true }, + "element-ui": { + "version": "2.15.6", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.6.tgz", + "integrity": "sha512-rcYXEKd/j2G0AgficAOk1Zd1AsnHRkhmrK4yLHmNOiimU2JfsywgfKUjMoFuT6pQx0luhovj8lFjpE4Fnt58Iw==", + "requires": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + } + }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -3595,7 +3626,6 @@ "version": "0.1.8", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", - "dev": true, "requires": { "prr": "~1.0.1" } @@ -4788,7 +4818,6 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -4826,6 +4855,12 @@ "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", "dev": true }, + "image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", + "optional": true + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -5245,6 +5280,11 @@ "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "dev": true }, + "is-what": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz", + "integrity": "sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==" + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -5386,6 +5426,58 @@ "invert-kv": "^1.0.0" } }, + "less": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz", + "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==", + "requires": { + "copy-anything": "^2.0.1", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "needle": "^2.5.2", + "parse-node-version": "^1.0.1", + "source-map": "~0.6.0", + "tslib": "^1.10.0" + }, + "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==", + "optional": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "optional": true + } + } + }, + "less-loader": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz", + "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==", + "requires": { + "clone": "^2.1.1", + "loader-utils": "^1.1.0", + "pify": "^3.0.0" + }, + "dependencies": { + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=" + } + } + }, "lib-flexible": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/lib-flexible/-/lib-flexible-0.3.2.tgz", @@ -5866,8 +5958,7 @@ "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { "version": "1.49.0", @@ -6031,6 +6122,34 @@ "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz", "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==" }, + "needle": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz", + "integrity": "sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==", + "optional": true, + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + }, + "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "optional": true + } + } + }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -6158,6 +6277,11 @@ "sort-keys": "^1.0.0" } }, + "normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -6522,6 +6646,11 @@ "json-parse-better-errors": "^1.0.1" } }, + "parse-node-version": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", + "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==" + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -6613,8 +6742,7 @@ "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" }, "pinkie": { "version": "2.0.4", @@ -9032,8 +9160,7 @@ "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" }, "pseudomap": { "version": "1.0.2", @@ -9374,8 +9501,7 @@ "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "regenerator-transform": { "version": "0.10.1", @@ -9512,6 +9638,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "resolve": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz", @@ -9624,14 +9755,12 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "schema-utils": { "version": "0.3.0", @@ -9660,8 +9789,7 @@ "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "send": { "version": "0.17.1", @@ -10456,6 +10584,11 @@ "integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==", "dev": true }, + "throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", + "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==" + }, "through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", @@ -10566,6 +10699,11 @@ "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==", "dev": true }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "tty-browserify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", diff --git a/FrontCode2/sunshine_levy/package.json b/FrontCode2/sunshine_levy/package.json index cecce38..f625fff 100644 --- a/FrontCode2/sunshine_levy/package.json +++ b/FrontCode2/sunshine_levy/package.json @@ -11,7 +11,13 @@ }, "dependencies": { "axios": "^0.21.4", +<<<<<<< Updated upstream "js-md5": "^0.7.3", +======= + "element-ui": "^2.15.6", + "less": "^4.1.1", + "less-loader": "^4.1.0", +>>>>>>> Stashed changes "lib-flexible": "^0.3.2", "px2rem-loader": "^0.1.9", "vant": "^2.12.27", diff --git a/FrontCode2/sunshine_levy/src/assets/image/01zhushuju_hangzhengquyu@3x.png b/FrontCode2/sunshine_levy/src/assets/image/01zhushuju_hangzhengquyu@3x.png deleted file mode 100644 index 61fc575..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/01zhushuju_hangzhengquyu@3x.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/3.png b/FrontCode2/sunshine_levy/src/assets/image/3.png deleted file mode 100644 index 4edde3d..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/3.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/54491B3A-A61A-4083-9EE9-4B7543F136A6.png b/FrontCode2/sunshine_levy/src/assets/image/54491B3A-A61A-4083-9EE9-4B7543F136A6.png deleted file mode 100644 index ef15f25..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/54491B3A-A61A-4083-9EE9-4B7543F136A6.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/8349A763-A41E-484A-88E7-A8E046BB8909.png b/FrontCode2/sunshine_levy/src/assets/image/8349A763-A41E-484A-88E7-A8E046BB8909.png deleted file mode 100644 index 79e4613..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/8349A763-A41E-484A-88E7-A8E046BB8909.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/918caidan_wenjian@3x.png b/FrontCode2/sunshine_levy/src/assets/image/918caidan_wenjian@3x.png deleted file mode 100644 index bba6e89..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/918caidan_wenjian@3x.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/EC514755-E04E-4B06-90D7-8AE6F0216170.png b/FrontCode2/sunshine_levy/src/assets/image/EC514755-E04E-4B06-90D7-8AE6F0216170.png deleted file mode 100644 index 06e3b35..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/EC514755-E04E-4B06-90D7-8AE6F0216170.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/background.png b/FrontCode2/sunshine_levy/src/assets/image/background.png deleted file mode 100644 index 9bb90c1..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/background.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/bumenguanli-3@3x.png b/FrontCode2/sunshine_levy/src/assets/image/bumenguanli-3@3x.png deleted file mode 100644 index d609e93..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/bumenguanli-3@3x.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/jiantou.png b/FrontCode2/sunshine_levy/src/assets/image/jiantou.png deleted file mode 100644 index 60a0b9d..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/jiantou.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/logo.png b/FrontCode2/sunshine_levy/src/assets/image/logo.png deleted file mode 100644 index f3d2503..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/logo.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/middle1.png b/FrontCode2/sunshine_levy/src/assets/image/middle1.png deleted file mode 100644 index c76baee..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/middle1.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/middle2.png b/FrontCode2/sunshine_levy/src/assets/image/middle2.png deleted file mode 100644 index 8f2a22f..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/middle2.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/middle3.png b/FrontCode2/sunshine_levy/src/assets/image/middle3.png deleted file mode 100644 index e0f3848..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/middle3.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/person.png b/FrontCode2/sunshine_levy/src/assets/image/person.png deleted file mode 100644 index d2e2b37..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/person.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/pingu.png b/FrontCode2/sunshine_levy/src/assets/image/pingu.png deleted file mode 100644 index c3db1eb..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/pingu.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/shuxian0.png b/FrontCode2/sunshine_levy/src/assets/image/shuxian0.png deleted file mode 100644 index 03d2877..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/shuxian0.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/window.png b/FrontCode2/sunshine_levy/src/assets/image/window.png deleted file mode 100644 index f3f0f2a..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/window.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/xieyi.png b/FrontCode2/sunshine_levy/src/assets/image/xieyi.png deleted file mode 100644 index 28bad40..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/xieyi.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/xy.png b/FrontCode2/sunshine_levy/src/assets/image/xy.png deleted file mode 100644 index 9630972..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/xy.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/yanchurili@3x.png b/FrontCode2/sunshine_levy/src/assets/image/yanchurili@3x.png deleted file mode 100644 index 572a8f6..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/yanchurili@3x.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/zhengshou.png b/FrontCode2/sunshine_levy/src/assets/image/zhengshou.png deleted file mode 100644 index 09bf2fa..0000000 Binary files a/FrontCode2/sunshine_levy/src/assets/image/zhengshou.png and /dev/null differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/address.png b/FrontCode2/sunshine_levy/src/assets/img/address.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/address.png rename to FrontCode2/sunshine_levy/src/assets/img/address.png diff --git a/FrontCode2/sunshine_levy/src/assets/image/agreement.png b/FrontCode2/sunshine_levy/src/assets/img/agreement.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/agreement.png rename to FrontCode2/sunshine_levy/src/assets/img/agreement.png diff --git a/FrontCode2/sunshine_levy/src/assets/image/bianhao.png b/FrontCode2/sunshine_levy/src/assets/img/bianhao.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/bianhao.png rename to FrontCode2/sunshine_levy/src/assets/img/bianhao.png diff --git a/FrontCode2/sunshine_levy/src/assets/image/evalute.png b/FrontCode2/sunshine_levy/src/assets/img/evalute.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/evalute.png rename to FrontCode2/sunshine_levy/src/assets/img/evalute.png diff --git a/FrontCode2/sunshine_levy/src/assets/img/expropriated_person.png b/FrontCode2/sunshine_levy/src/assets/img/expropriated_person.png new file mode 100644 index 0000000..fd34ba0 Binary files /dev/null and b/FrontCode2/sunshine_levy/src/assets/img/expropriated_person.png differ diff --git a/FrontCode2/sunshine_levy/src/assets/img/expropriated_select.png b/FrontCode2/sunshine_levy/src/assets/img/expropriated_select.png new file mode 100644 index 0000000..8cff3c1 Binary files /dev/null and b/FrontCode2/sunshine_levy/src/assets/img/expropriated_select.png differ diff --git a/FrontCode2/sunshine_levy/src/assets/image/hengxian.png b/FrontCode2/sunshine_levy/src/assets/img/hengxian.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/hengxian.png rename to FrontCode2/sunshine_levy/src/assets/img/hengxian.png diff --git a/FrontCode2/sunshine_levy/src/assets/image/money.png b/FrontCode2/sunshine_levy/src/assets/img/money.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/money.png rename to FrontCode2/sunshine_levy/src/assets/img/money.png diff --git a/FrontCode2/sunshine_levy/src/assets/image/name.png b/FrontCode2/sunshine_levy/src/assets/img/name.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/name.png rename to FrontCode2/sunshine_levy/src/assets/img/name.png diff --git a/FrontCode2/sunshine_levy/src/assets/image/renyuan.png b/FrontCode2/sunshine_levy/src/assets/img/renyuan.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/renyuan.png rename to FrontCode2/sunshine_levy/src/assets/img/renyuan.png diff --git a/FrontCode2/sunshine_levy/src/assets/image/shijian.png b/FrontCode2/sunshine_levy/src/assets/img/shijian.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/shijian.png rename to FrontCode2/sunshine_levy/src/assets/img/shijian.png diff --git a/FrontCode2/sunshine_levy/src/assets/image/shuxian.png b/FrontCode2/sunshine_levy/src/assets/img/shuxian.png similarity index 100% rename from FrontCode2/sunshine_levy/src/assets/image/shuxian.png rename to FrontCode2/sunshine_levy/src/assets/img/shuxian.png diff --git a/FrontCode2/sunshine_levy/src/assets/img/zspg.jpg b/FrontCode2/sunshine_levy/src/assets/img/zspg.jpg new file mode 100644 index 0000000..a6153ae Binary files /dev/null and b/FrontCode2/sunshine_levy/src/assets/img/zspg.jpg differ diff --git a/FrontCode2/sunshine_levy/src/assets/img/zsxy.jpg b/FrontCode2/sunshine_levy/src/assets/img/zsxy.jpg new file mode 100644 index 0000000..a688d61 Binary files /dev/null and b/FrontCode2/sunshine_levy/src/assets/img/zsxy.jpg differ diff --git a/FrontCode2/sunshine_levy/src/main.js b/FrontCode2/sunshine_levy/src/main.js index 17d9358..cb190bf 100644 --- a/FrontCode2/sunshine_levy/src/main.js +++ b/FrontCode2/sunshine_levy/src/main.js @@ -3,6 +3,10 @@ import './assets/reset.css'; import 'lib-flexible/flexible'; +import '@/elementui' +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' + import Vue from 'vue' import App from './App' import router from './router' diff --git a/FrontCode2/sunshine_levy/src/router/index.js b/FrontCode2/sunshine_levy/src/router/index.js index e7ed458..0dd96ed 100644 --- a/FrontCode2/sunshine_levy/src/router/index.js +++ b/FrontCode2/sunshine_levy/src/router/index.js @@ -1,6 +1,5 @@ import Vue from 'vue' import Router from 'vue-router' -import index from '@/components/index' Vue.use(Router) @@ -9,7 +8,25 @@ export default new Router({ { path: '/index', name: 'index', - component: index - } + component: () => import('../views') + }, + // 选择项目页面 + { + path: '/project-select', + name: 'projectSelect', + component: () => import('../views/project') + }, + // 评估结果页面 + { + path: '/report/compensate', + name: 'reportCompensate', + component: () => import('../views/report/compensate') + }, + // 协议结果页面 + { + path: '/report/agreement', + name: 'reportAgreement', + component: () => import('../views/report/agreement') + }, ] }) diff --git a/FrontCode2/sunshine_levy/src/views/agreement.vue b/FrontCode2/sunshine_levy/src/views/agreement.vue deleted file mode 100644 index b8dbfa4..0000000 --- a/FrontCode2/sunshine_levy/src/views/agreement.vue +++ /dev/null @@ -1,103 +0,0 @@ - - - - diff --git a/FrontCode2/sunshine_levy/src/views/compensate.vue b/FrontCode2/sunshine_levy/src/views/compensate.vue deleted file mode 100644 index c333441..0000000 --- a/FrontCode2/sunshine_levy/src/views/compensate.vue +++ /dev/null @@ -1,96 +0,0 @@ - - - - diff --git a/FrontCode2/sunshine_levy/src/components/home.css b/FrontCode2/sunshine_levy/src/views/home.css similarity index 98% rename from FrontCode2/sunshine_levy/src/components/home.css rename to FrontCode2/sunshine_levy/src/views/home.css index 99dabda..640008d 100644 --- a/FrontCode2/sunshine_levy/src/components/home.css +++ b/FrontCode2/sunshine_levy/src/views/home.css @@ -76,6 +76,11 @@ width: 90px; height: 80px; margin: 12px 6px; + + opacity: .9; +} +.gridImg:hover { + opacity: 1; } .bigImg { width: 100%; diff --git a/FrontCode2/sunshine_levy/src/components/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue similarity index 88% rename from FrontCode2/sunshine_levy/src/components/index.vue rename to FrontCode2/sunshine_levy/src/views/index.vue index 1a66afd..8d28d9a 100644 --- a/FrontCode2/sunshine_levy/src/components/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -25,16 +25,27 @@
+<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue + >>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue class="gridImg" /> >>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue class="gridImg" />
@@ -116,6 +127,7 @@ /> 分户评估结果
+<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
+======= + +>>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
@@ -152,6 +169,7 @@ /> 补偿协议
+<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
+======= + +>>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
@@ -195,13 +218,20 @@ />
+<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue 征收政策
共{{ total }}条
+======= + 征收政策 +
+ 共{{total}}条 +
@@ -343,6 +373,9 @@ export default { var prjdata = apis.getprjdata({ ticket: this.$route.query.ticket }); console.log(prjdata); }, + gotoProject(type) { + this.$router.push({ name: 'projectSelect', params: { type: type } }); + }, onLogin() { // this.loading = true; let form = { account: "zgbqc", password: "111qqqqq" }; diff --git a/FrontCode2/sunshine_levy/src/views/project/index.vue b/FrontCode2/sunshine_levy/src/views/project/index.vue new file mode 100644 index 0000000..a666880 --- /dev/null +++ b/FrontCode2/sunshine_levy/src/views/project/index.vue @@ -0,0 +1,132 @@ + + + + + \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/views/project/project.css b/FrontCode2/sunshine_levy/src/views/project/project.css new file mode 100644 index 0000000..025acd9 --- /dev/null +++ b/FrontCode2/sunshine_levy/src/views/project/project.css @@ -0,0 +1,146 @@ +.proTopBox { + position: relative; + + margin: 15px 12px; +} +.proTopBoxpg { + position: absolute; + + overflow: hidden; + + width: 100%; + height: 90px; + + background: url(../../assets/img/zspg.jpg); + background-size: 100% 90px; +} +.proTopBoxxy { + position: absolute; + + overflow: hidden; + + width: 100%; + height: 90px; + + background: url(../../assets/img/zsxy.jpg); + background-size: 100% 90px; +} +.proCenterBox { + position: absolute; + top: 50%; + left: 50% ; + + width: 95%; + height: 140px; + + transform: translate(-50%, 50%); + +/* margin: 70px 0 15px 10px; */ + + border-radius: 6px; + background: rgba(248, 253, 255, 1); + box-shadow: 1px 1px 3px rgb(202, 201, 201); +} +.proCenterInfo { + display: flex; + + padding-top: 20px; +} +.proCenterImg { + width: 45px; + height: 45px; + padding-right: 10px; + padding-left: 15px; +} +.proCenterFont { + font-family: PingFangSC-Regular, + PingFang SC; + font-size: 14px; + font-weight: 500; + line-height: 25px; + + height: 25px; + + color: #09a4fa; +} +.proCenterFlex { + display: flex; + align-items: center; + flex-direction: column; + + padding-top: 15px; +} +.proCenterFlexImg { + width: 20px; + height: 12px; + padding-top: 3px; + padding-right: 10px; + padding-left: 15px; +} +.proCenterFlexFont { + font-family: PingFangSC-Regular, + PingFang SC; + font-size: 12px; + font-weight: 400; + line-height: 25px; + + height: 25px; + + color: #09a4fa; +} +.shadow { + -webkit-box-shadow: rgb(189, 189, 189) 0 0 3px; + -moz-box-shadow: rgb(189, 189, 189) 0 0 3px; + box-shadow: rgb(189, 189, 189) 0 0 3px; +} +.proListBox { + height: 127px; + margin: 15px 20px; + + border-radius: 3px; +} +.proAreaBox { + display: flex; + align-items: center; + justify-content: space-between; + + padding: 10px; +} +.proArea { + font-family: PingFangSC-Regular; + font-size: 16px; + font-weight: 500; + line-height: 25px; + + height: 25px; + padding: 3px 17px; + + color: #fff; + border-radius: 4px; + background: #09a4fa; +} +.proTitleBox { + font-family: PingFangSC-Regular, + PingFang SC; + font-size: 15px; + font-weight: 600; + line-height: 20px; + + overflow: hidden; + + height: 20px; + margin-left: 10px; + padding-left: 7px; + + white-space: nowrap; + text-overflow: ellipsis; + + color: #252525; + border-left: 3px solid #09a4fa; +} +.proDateBox { + display: flex; + flex-direction: row-reverse; + + padding-right: 10px; +} diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue new file mode 100644 index 0000000..855f792 --- /dev/null +++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue @@ -0,0 +1,125 @@ + + + + diff --git a/FrontCode2/sunshine_levy/src/views/report/compensate.vue b/FrontCode2/sunshine_levy/src/views/report/compensate.vue new file mode 100644 index 0000000..0a4c841 --- /dev/null +++ b/FrontCode2/sunshine_levy/src/views/report/compensate.vue @@ -0,0 +1,117 @@ + + + +