diff --git a/package-lock.json b/package-lock.json
index 1457118d..e4aec1b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,25 +5,20 @@
"requires": true,
"dependencies": {
"@babel/runtime": {
- "version": "7.13.9",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.9.tgz",
- "integrity": "sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==",
+ "version": "7.24.4",
+ "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.4.tgz",
+ "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==",
"requires": {
- "regenerator-runtime": "^0.13.4"
+ "regenerator-runtime": "^0.14.0"
},
"dependencies": {
"regenerator-runtime": {
- "version": "0.13.7",
- "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
- "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
+ "version": "0.14.1",
+ "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+ "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
}
}
},
- "@popperjs/core": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.0.tgz",
- "integrity": "sha512-wjtKehFAIARq2OxK8j3JrggNlEslJfNuSm2ArteIbKyRMts2g0a7KzTxfRVNUM+O0gnBJ2hNV8nWPOYBgI1sew=="
- },
"@types/json-schema": {
"version": "7.0.11",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
@@ -41,22 +36,19 @@
"integrity": "sha512-efv7Yl/OTHjyy0irhJJPtgZb5mJZmroEtVOa8vkGRNTLY93+NgEcVuIBaC35hYCMsTrPHDQRvQGnI9Hyhtto0Q=="
},
"@vant/icons": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.5.2.tgz",
- "integrity": "sha512-Gy2mFIgObvCh1azp6LklQYsNFrCjMLxf/mEzHD6WV0pZbMBNjsb7bWvAjPo3Wygo9IVtGqi/36wrtosv3PkyRg=="
+ "version": "3.0.2",
+ "resolved": "https://registry.npmmirror.com/@vant/icons/-/icons-3.0.2.tgz",
+ "integrity": "sha512-4OlRVMd0uiDtD9hgSISZW8hB95vU0fFtc41tQchRIyiXkR0tS+DydZOLb8/bQkithrNWhW7Uud38MbKjlJ9lJw=="
},
"@vant/popperjs": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.0.4.tgz",
- "integrity": "sha512-bqbmOoX0kYexGw65awNX9wxePR0ZIdTlVP+7JRahrbUjKW0+HxC2T27NE90cCDmqiFL/6+QYazhLvVa436jV0A==",
- "requires": {
- "@popperjs/core": "^2.5.4"
- }
+ "version": "1.3.0",
+ "resolved": "https://registry.npmmirror.com/@vant/popperjs/-/popperjs-1.3.0.tgz",
+ "integrity": "sha512-hB+czUG+aHtjhaEmCJDuXOep0YTZjdlRR+4MSmIFnkCQIxJaXLQdSsR90XWvAI2yvKUI7TCGqR8pQg2RtvkMHw=="
},
"@vue/babel-helper-vue-jsx-merge-props": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz",
- "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA=="
+ "version": "1.4.0",
+ "resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
+ "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA=="
},
"@zxing/library": {
"version": "0.18.6",
@@ -4286,7 +4278,7 @@
"fastclick": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz",
- "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=",
+ "integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==",
"dev": true
},
"fastparse": {
@@ -4441,7 +4433,7 @@
"font-awesome.css": {
"version": "4.7.2",
"resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz",
- "integrity": "sha1-B1pCARQo8gJyVO9phgx1ergWyVI="
+ "integrity": "sha512-FIyRbig4PDY15NGzejM3b8OQ/lWvId8PHnE4CnuDtc8/YYs07cvnqLCyfvIJPwJl5SA/Rq+9jAe9W+Fr1pv0DA=="
},
"for-in": {
"version": "1.0.2",
@@ -12277,13 +12269,13 @@
}
},
"vant": {
- "version": "2.12.8",
- "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.8.tgz",
- "integrity": "sha512-2Rs/LDGg+Dz2AbWRM88EmnH1OTDSB1vcWFZ8pIlHEUraLUM6SvwsqtMpLrnn15KZA1RToeKbrv0MZOVfzoEpSQ==",
+ "version": "2.13.2",
+ "resolved": "https://registry.npmmirror.com/vant/-/vant-2.13.2.tgz",
+ "integrity": "sha512-anZbbLqXCq+rUJk10D67mn+V/1/i9tfOTdoR+64B0e+0BzV3KFgpHBF76noLa+yX9i/L+8DeL560WMk0GEN38g==",
"requires": {
"@babel/runtime": "7.x",
- "@vant/icons": "1.5.2",
- "@vant/popperjs": "^1.0.0",
+ "@vant/icons": "^3.0.2",
+ "@vant/popperjs": "^1.1.0",
"@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
"vue-lazyload": "1.2.3"
}
@@ -12360,7 +12352,7 @@
"vue-html5-editor": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz",
- "integrity": "sha1-WRAhCoMNjI00eaHx/shHMZKqA7M=",
+ "integrity": "sha512-Ckmb8djta+XQMUQaxRcCUNBXEzjPF5p6c2nQ5ICcIuR8eYz4b0HAGzXlSDfL3ZxkrVHO2Hx0VrUORLu2Lwem4g==",
"dev": true
},
"vue-lazyload": {
diff --git a/package.json b/package.json
index de93cd5c..aa405f09 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,9 @@
"build": "node build/build.js"
},
"dependencies": {
- "bignumber.js": "^9.1.2",
"@vant/area-data": "^1.2.2",
"axios": "^0.21.1",
+ "bignumber.js": "^9.1.2",
"echarts": "^5.3.3",
"element-ui": "^2.15.6",
"font-awesome": "^4.7.0",
@@ -29,7 +29,7 @@
"quill": "^1.3.7",
"sass": "^1.32.8",
"sass-loader": "^6.0.6",
- "vant": "^2.12.8",
+ "vant": "^2.13.2",
"vue": "^2.5.2",
"vue-baidu-map": "^0.21.22",
"vue-cookies": "^1.7.4",
diff --git a/src/views/yinnong/doneCompleted/completedNew.vue b/src/views/yinnong/doneCompleted/completedNew.vue
index a7f74fbf..db6cafca 100644
--- a/src/views/yinnong/doneCompleted/completedNew.vue
+++ b/src/views/yinnong/doneCompleted/completedNew.vue
@@ -3,9 +3,9 @@
-
+
-
+
-
+
-
+
@@ -66,7 +66,7 @@ done.vue
pageSize: 5,
},
activityBusinessTypeOptions:[],
- images:['../../../../static/images/onlineHome/banner_02.png'],
+ images:['../../../../static/images/yinnong/banner_02.jpg'],
}
},
created() {
diff --git a/src/views/yinnong/my.vue b/src/views/yinnong/my.vue
index 7caa7ee2..01bce5ec 100644
--- a/src/views/yinnong/my.vue
+++ b/src/views/yinnong/my.vue
@@ -1,24 +1,35 @@
-
-
-
-
- {{nickName}}
-
-
- {{deptName}}
-
-
-
+
+
+
![]()
+
+
{{nickName}}
+
{{deptName}}
+
+
-
-
-
-
-
+
+
+
@@ -69,54 +80,54 @@
/>
-->
-
+
-
+
-
+
-
+
-
+
@@ -166,12 +177,55 @@
}
-
diff --git a/src/views/yinnong/workbench.vue b/src/views/yinnong/workbench.vue
index aecb6548..b9377b0e 100644
--- a/src/views/yinnong/workbench.vue
+++ b/src/views/yinnong/workbench.vue
@@ -35,9 +35,9 @@
-
+
-
+
@@ -179,7 +179,7 @@
data() {
return {
list1: [],
- images:['../../../static/images/onlineHome/banner_01.png'],
+ images:['../../../static/images/yinnong/banner_01.jpg'],
deptName:"",
queryParams: {
pageNum: 1,
diff --git a/src/views/yinnongLogin.vue b/src/views/yinnongLogin.vue
index dbf9e5b7..da4442e4 100644
--- a/src/views/yinnongLogin.vue
+++ b/src/views/yinnongLogin.vue
@@ -1,64 +1,69 @@
-

+
-
+
-
+
-
-
-
-
-
+
+
+
+
![]()
+
+
{{showMessage ? "记住手机号" : "记住密码"}}
忘记密码
-
-
登录
+
+ 登录
-
+
-
-
-
-
-
-
-
获取验证码
+
+
+
+
![]()
+
+
+
+ 获取验证码
@@ -141,54 +146,90 @@
-