diff --git a/FrontCode2/sunshine_levy/.babelrc b/FrontCode2/sunshine_levy/.babelrc
index 7e2b0bb..b62b551 100644
--- a/FrontCode2/sunshine_levy/.babelrc
+++ b/FrontCode2/sunshine_levy/.babelrc
@@ -10,11 +10,11 @@
],
"plugins": [
"transform-vue-jsx",
- "transform-runtime",
- ["import", {
+ "transform-runtime"
+ /* ["import", {
"libraryName": "vant",
"libraryDirectory": "es",
"style": true
- }]
+ }] */
]
}
diff --git a/FrontCode2/sunshine_levy/package-lock.json b/FrontCode2/sunshine_levy/package-lock.json
index d89b632..bfd8872 100644
--- a/FrontCode2/sunshine_levy/package-lock.json
+++ b/FrontCode2/sunshine_levy/package-lock.json
@@ -2848,14 +2848,6 @@
"async-done": "^1.2.2"
}
},
- "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"
- }
- },
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -2896,18 +2888,11 @@
"integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
},
"axios": {
- "version": "0.24.0",
- "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz",
- "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+ "version": "0.21.4",
+ "resolved": "https://registry.npmmirror.com/axios/download/axios-0.21.4.tgz",
+ "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
"requires": {
- "follow-redirects": "^1.14.4"
- },
- "dependencies": {
- "follow-redirects": {
- "version": "1.14.6",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz",
- "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="
- }
+ "follow-redirects": "^1.14.0"
}
},
"babel-code-frame": {
@@ -3175,7 +3160,8 @@
"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=="
+ "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==",
+ "dev": true
},
"babel-helpers": {
"version": "6.24.1",
@@ -3852,6 +3838,7 @@
"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"
@@ -5747,7 +5734,8 @@
"core-js": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
- "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+ "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+ "dev": true
},
"core-js-compat": {
"version": "3.20.0",
@@ -7299,19 +7287,6 @@
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.830.tgz",
"integrity": "sha512-gBN7wNAxV5vl1430dG+XRcQhD4pIeYeak6p6rjdCtlz5wWNwDad8jwvphe5oi1chL5MV6RNRikfffBBiFuj+rQ=="
},
- "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",
@@ -8111,8 +8086,7 @@
"follow-redirects": {
"version": "1.14.3",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
- "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==",
- "dev": true
+ "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="
},
"for-in": {
"version": "1.0.2",
@@ -10349,6 +10323,14 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
},
+ "axios": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmmirror.com/axios/download/axios-0.24.0.tgz",
+ "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+ "requires": {
+ "follow-redirects": "^1.14.4"
+ }
+ },
"camelcase": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
@@ -10407,6 +10389,11 @@
"strip-final-newline": "^2.0.0"
}
},
+ "follow-redirects": {
+ "version": "1.14.6",
+ "resolved": "https://registry.npmmirror.com/follow-redirects/download/follow-redirects-1.14.6.tgz",
+ "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="
+ },
"fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -12564,11 +12551,6 @@
"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="
- },
"now-and-later": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
@@ -16884,6 +16866,14 @@
"miniapp-builder-shared": "^0.2.0"
},
"dependencies": {
+ "axios": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmmirror.com/axios/download/axios-0.24.0.tgz",
+ "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==",
+ "requires": {
+ "follow-redirects": "^1.14.4"
+ }
+ },
"cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -16920,6 +16910,11 @@
"strip-final-newline": "^2.0.0"
}
},
+ "follow-redirects": {
+ "version": "1.14.6",
+ "resolved": "https://registry.npmmirror.com/follow-redirects/download/follow-redirects-1.14.6.tgz",
+ "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="
+ },
"fs-extra": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@@ -17701,7 +17696,8 @@
"regenerator-runtime": {
"version": "0.11.1",
"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
- "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+ "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+ "dev": true
},
"regenerator-transform": {
"version": "0.10.1",
@@ -17978,11 +17974,6 @@
"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",
@@ -19354,11 +19345,6 @@
"thenify": ">= 3.1.0 < 4"
}
},
- "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=="
- },
"throttleit": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
diff --git a/FrontCode2/sunshine_levy/package.json b/FrontCode2/sunshine_levy/package.json
index 3c78faf..48f3582 100644
--- a/FrontCode2/sunshine_levy/package.json
+++ b/FrontCode2/sunshine_levy/package.json
@@ -12,7 +12,6 @@
"dependencies": {
"@aligov/jssdk-mgop": "^3.0.0",
"axios": "^0.21.4",
- "element-ui": "^2.15.6",
"es6-promise": "^4.2.8",
"html2canvas": "^1.3.2",
"js-md5": "^0.7.3",
diff --git a/FrontCode2/sunshine_levy/src/main.js b/FrontCode2/sunshine_levy/src/main.js
index 06074dc..2d74b31 100644
--- a/FrontCode2/sunshine_levy/src/main.js
+++ b/FrontCode2/sunshine_levy/src/main.js
@@ -4,70 +4,25 @@
import "lib-flexible/flexible";
// import "@/assets/rem.js";
-import "@/elementui";
+/* import "@/elementui";
import ElementUI from "element-ui";
import "element-ui/lib/theme-chalk/index.css";
+Vue.use(ElementUI);
+ */
+
import Vue from "vue";
import App from "./App";
import router from "./router";
import "@/assets/css/global.css";
-import {
- Button,
- NavBar,
- Cell,
- CellGroup,
- Notify,
- PullRefresh,
- Toast,
- Overlay,
- Collapse,
- CollapseItem
-} from "vant";
-Vue.use(Collapse);
-Vue.use(CollapseItem);
+import Vant from 'vant';
+import 'vant/lib/index.css';
-Vue.use(Button)
- .use(NavBar)
- .use(Cell)
- .use(CellGroup);
-Vue.use(PullRefresh);
-Vue.use(Toast);
-Vue.use(Overlay);
-
-Vue.use(ElementUI);
-
-Vue.use(Notify);
-
-import { Image as VanImage } from "vant";
-
-Vue.use(VanImage);
-
-import { Col, Row } from "vant";
-
-Vue.use(Col);
-Vue.use(Row);
-
-import { Grid, GridItem } from "vant";
-
-Vue.use(Grid);
-Vue.use(GridItem);
-
-import { Icon } from "vant";
-
-Vue.use(Icon);
-
-import { List } from "vant";
-
-Vue.use(List);
-
-import { Divider } from "vant";
-
-Vue.use(Divider);
+Vue.use(Vant);
Vue.config.productionTip = false;
-debugger
+
let mode;
if (sessionStorage.getItem("mode") == "older") {
mode = true;
diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue
index c39a491..a04887c 100644
--- a/FrontCode2/sunshine_levy/src/views/index.vue
+++ b/FrontCode2/sunshine_levy/src/views/index.vue
@@ -335,35 +335,48 @@ export default {
var errorCodes = [6001, 6501];
// 跳转到政务系统;
if (errorCodes.indexOf(data.data.bizCode) > -1) {
- this.$message({
+
+ this.$toast({
+ message: "登录超时，请重新登录",
+ duration: 3000,
+ type: "info",
+ })
+ /* this.$message({
message: "登录超时，请重新登录",
duration: 3000,
type: "info",
center: true,
- });
+ }); */
setTimeout(() => {
window.location.replace(
"https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs"
);
}, 3000);
} else {
- this.$message({
+ this.$toast({
+ message: "请求出错",
+ duration: 3000,
+ type: "info",
+ })
+
+ /* this.$message({
message: "请求出错",
duration: 3000,
type: "error",
center: true,
- });
+ }); */
}
}
},
onFail: (err) => {
this.loading = false;
- this.$notify({
+this.$notify({ type: 'warning', message: '请求失败',duration: 3000, });
+ /* this.$notify({
title: "错误",
message: "请求失败",
duration: 3000,
type: "error",
- });
+ }); */
},
});
},
@@ -485,12 +498,18 @@ export default {
if (data.text.indexOf("http") > -1) {
window.location.replace(data.text);
} else {
+ this.$toast({
+ message: data.text,
+ duration: 3000,
+ type: "info",
+ })
+/*
this.$message({
message: data.text,
duration: 3000,
type: "info",
center: true,
- });
+ }); */
}
})
.catch((error) => {
diff --git a/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue
index 8d86fa4..b8aff4c 100644
--- a/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue
+++ b/FrontCode2/sunshine_levy/src/views/pdf/evaluateResultPdf.vue
@@ -3,12 +3,20 @@
style="margin: 0 auto"
:class="'container' + (mode ? ' old_container' : '')"
>
- 下载到手机 -->
+ 下载到手机
{
window.location.replace(
"https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=fwzs"
);
}, 3000);
} else {
- this.$message({
+
+
+ this.$toast({
+ message: result.data.message,
+ duration: 3000,
+ type: "info",
+ })
+
+ /* this.$message({
message: result.data.message,
duration: 3000,
type: "error",
center: true,
- });
+ }); */
}
}
},
@@ -116,7 +138,7 @@ export default {