From 45369b4a9aae117fa83655f31cc198dc8ee3bc5c Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Wed, 29 Mar 2023 13:39:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BagStation/pages/routePlain/routePlain.vue | 2 +- package-lock.json | 82 ++++++++++++++++++---- pages/tabbar/home/home.vue | 2 +- pages/tabbar/station/stationList.vue | 2 +- 4 files changed, 71 insertions(+), 17 deletions(-) diff --git a/BagStation/pages/routePlain/routePlain.vue b/BagStation/pages/routePlain/routePlain.vue index c8fbafe..d911f1b 100644 --- a/BagStation/pages/routePlain/routePlain.vue +++ b/BagStation/pages/routePlain/routePlain.vue @@ -332,7 +332,7 @@ } else { uni.showModal({ title:'请您登录', - content:"登录小星加油才可以加油 |˛˙꒳​˙)♡", + content:"登录佰川加油才可以加油 |˛˙꒳​˙)♡", confirmText:'去登陆', success: (res) => { if(res.confirm){ diff --git a/package-lock.json b/package-lock.json index 14853a8..af0d480 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,40 +1,94 @@ { "name": "wechat-oil", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "wechat-oil", + "version": "1.0.0", + "license": "ISC", + "devDependencies": { + "axios": "^0.21.3", + "crypto-js": "^4.0.0", + "js-cookie": "^2.2.1", + "js-md5": "^0.7.3" + } + }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmmirror.com/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dev": true, + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==", + "dev": true + }, + "node_modules/follow-redirects": { + "version": "1.15.2", + "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "dev": true, + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/js-cookie": { + "version": "2.2.1", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-2.2.1.tgz", + "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==", + "dev": true + }, + "node_modules/js-md5": { + "version": "0.7.3", + "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==", + "dev": true + } + }, "dependencies": { "axios": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz", - "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==", + "version": "0.21.4", + "resolved": "https://registry.npmmirror.com/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "dev": true, "requires": { "follow-redirects": "^1.14.0" } }, "crypto-js": { - "version": "4.0.0", - "resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-4.0.0.tgz", - "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw=", + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==", "dev": true }, "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==", + "version": "1.15.2", + "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", "dev": true }, "js-cookie": { "version": "2.2.1", - "resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz", - "integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg=", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-2.2.1.tgz", + "integrity": "sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==", "dev": true }, "js-md5": { "version": "0.7.3", - "resolved": "https://registry.npm.taobao.org/js-md5/download/js-md5-0.7.3.tgz", - "integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I=", + "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz", + "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==", "dev": true } } diff --git a/pages/tabbar/home/home.vue b/pages/tabbar/home/home.vue index e0ba313..9d6d011 100644 --- a/pages/tabbar/home/home.vue +++ b/pages/tabbar/home/home.vue @@ -607,7 +607,7 @@ } else { uni.showModal({ title:'请您登录', - content:"登录小星加油才可以加油 |˛˙꒳​˙)♡", + content:"登录佰川加油才可以加油 |˛˙꒳​˙)♡", confirmText:'去登陆', success: (res) => { if(res.confirm){ diff --git a/pages/tabbar/station/stationList.vue b/pages/tabbar/station/stationList.vue index e9f856b..268af44 100644 --- a/pages/tabbar/station/stationList.vue +++ b/pages/tabbar/station/stationList.vue @@ -440,7 +440,7 @@ } else { uni.showModal({ title: '请您登录', - content: "登录小星加油才可以加油 |˛˙꒳​˙)♡", + content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡", confirmText: '去登陆', success: (res) => { if (res.confirm) { From 5b4c84fc62de2a85356f4286b59c61c308faac4e Mon Sep 17 00:00:00 2001 From: xiaozhiyong Date: Wed, 29 Mar 2023 13:41:02 +0800 Subject: [PATCH 2/2] update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index be41b08..61412e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .DS_Store +.package-lock.json + node_modules/ /dist/ /unpackage/