变更

package-lock.json

@@ -1036,11 +1036,6 @@
       "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=",
       "dev": true
     },
-    "@popperjs/core": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.6.0.tgz",
-      "integrity": "sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw=="
-    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.7.1",
       "resolved": "http://registry.npm.taobao.org/@soda/friendly-errors-webpack-plugin/download/@soda/friendly-errors-webpack-plugin-1.7.1.tgz",
@@ -1165,17 +1160,14 @@
       "dev": true
     },
     "@vant/icons": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.5.0.tgz",
-      "integrity": "sha512-qHQU3GiQ6AkpjhYni46xG+YOy36LNmbHFanyjvzi+fODu+pEKYwqfLWluv42Q9CM4hshNET8A+Vsr0pr2UVTnA=="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmmirror.com/@vant/icons/-/icons-1.8.0.tgz",
+      "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
     },
     "@vant/popperjs": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.0.2.tgz",
-      "integrity": "sha512-CA2BgoQwlfm5OEmIuTnYNWaeCAcEhFFyVDg+irunZAWff+jV5TkAuDPpCWrIGYoVs99hwBDiRzzEAFybhlml2A==",
-      "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.0.0-beta.3",
@@ -16417,26 +16409,21 @@
       }
     },
     "vant": {
-      "version": "2.12.2",
-      "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.2.tgz",
-      "integrity": "sha512-zBmWFmRN+/JFqpK8H8QwgotWjzY9yZkbxACUSZYdE2ja0yCcqQ/Xadbk6sk12kgxpDPN8mfazVY8I9lsRCB1Lg==",
+      "version": "2.12.54",
+      "resolved": "https://registry.npmmirror.com/vant/-/vant-2.12.54.tgz",
+      "integrity": "sha512-t7DCiLxNosDrg0Jm5EY9p0A5cAMo5OadmizbYtPEc0ru+OJKEa3kcfxtKIK5on7ZPqoOkyYJt8e6BQ1VDMPsrg==",
       "requires": {
         "@babel/runtime": "7.x",
-        "@vant/icons": "1.5.0",
-        "@vant/popperjs": "^1.0.0",
+        "@vant/icons": "^1.7.1",
+        "@vant/popperjs": "^1.1.0",
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "vue-lazyload": "1.2.3"
       },
       "dependencies": {
         "@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=="
-        },
-        "vue-lazyload": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
-          "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
+          "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=="
         }
       }
     },
@@ -16590,6 +16577,11 @@
         "vue-template-es2015-compiler": "^1.6.0"
       }
     },
+    "vue-lazyload": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmmirror.com/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
+      "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
+    },
     "vue-loader": {
       "version": "15.7.0",
       "resolved": "http://registry.npm.taobao.org/vue-loader/download/vue-loader-15.7.0.tgz",
@@ -17059,6 +17051,11 @@
       "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
       "dev": true
     },
+    "weixin-js-sdk": {
+      "version": "1.6.5",
+      "resolved": "https://registry.npmmirror.com/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz",
+      "integrity": "sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ=="
+    },
     "whatwg-encoding": {
       "version": "1.0.5",
       "resolved": "http://registry.npm.taobao.org/whatwg-encoding/download/whatwg-encoding-1.0.5.tgz",

src/pages/home-app/index.vue

@@ -165,7 +165,7 @@ import { findInfoByPortalType, parkTrain, parkActivity, policy, getMyPowerById }
 import auth from '@/service/auth'
 import { slider, slideritem } from 'vue-concise-slider'
 import Base from '@/pages/base/base.vue'
-import { Dialog, Toast } from '_vant@2.12.54@vant'
+import { Dialog, Toast } from 'vant'
 
 export default {
 	mixins: [Base],

src/pages/login-app.vue

@@ -30,7 +30,7 @@
 			</div>
 			<div v-if="userType == '1'">
 				<div class="form-input">
-					<input type="text" placeholder="请输入企业名称" v-model="account"/>
+					<input type="text" placeholder="请输入用户名" v-model="account"/>
 				</div>
 				<div class="form-input">
 					<input type="password" placeholder="请输入密码" v-model="password"/>
@@ -85,7 +85,7 @@ import auth from '@/service/auth'
 export default {
 	data() {
 		return {
-			checked: true,
+			checked: false,
 			showPicker: false,
 			userType: '2',
 			userTypeName: '个人用户',

src/pages/mine/index.vue

@@ -86,7 +86,7 @@ import { getById } from '@/service/api_user'
 import { getInfo } from '../../service/api_user.js'
 import auth from '../../service/auth'
 import { getMyPowerById } from '@/service/api_first-page'
-import { Dialog, Toast } from '_vant@2.12.54@vant'
+import { Dialog, Toast } from 'vant'
 
 export default {
 	name: 'Mine',

src/pages/parkActivities/detail.vue

@@ -95,7 +95,7 @@ import ApplyPopup from '@/components/apply-popup'
 import { getActivityById, clickCollect } from '../../service/api_activity.js'
 import auth from '../../service/auth'
 import { getMyPowerById } from '@/service/api_first-page'
-import { Dialog, Toast } from '_vant@2.12.54@vant'
+import { Dialog, Toast } from 'vant'
 import wxMap from "@/pages/weixin/wxMap";
 // import wx from '_weixin-js-sdk@1.6.0@weixin-js-sdk'
 import wx from 'weixin-js-sdk'