Merge branch 'master' of http://121.196.213.68:3000/caoliancun/MP-XiaoXing into caolc

.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
+.package-lock.json
+
 node_modules/
 /dist/
 /unpackage/

BagStation/pages/routePlain/routePlain.vue

@@ -332,7 +332,7 @@
 				} else {
 					uni.showModal({
 						title:'请您登录',
-						content:"登录小星加油才可以加油 |˛˙꒳​˙)♡",
+						content:"登录佰川加油才可以加油 |˛˙꒳​˙)♡",
 						confirmText:'去登陆',
 						success: (res) => {
 							if(res.confirm){

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",
+      "version": "0.21.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.3.tgz",
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.21.4.tgz",
-      "integrity": "sha512-JtoZ3Ndke/+Iwt5n+BgSli/3idTvpt5OjKyoCmz4LX5+lPiY5l7C1colYezhlxThjNa/NhngCUWZSZFypIFuaA==",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
       "dev": true,
       "requires": {
         "follow-redirects": "^1.14.0"
       }
     },
     "crypto-js": {
-      "version": "4.0.0",
+      "version": "4.1.1",
-      "resolved": "https://registry.nlark.com/crypto-js/download/crypto-js-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
-      "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw=",
+      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==",
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.14.3",
+      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
+      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==",
+      "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",
+      "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-2.2.1.tgz",
-      "integrity": "sha1-aeEG3F1YBolFYpAqpbrsN0Tpsrg=",
+      "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",
+      "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz",
-      "integrity": "sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I=",
+      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==",
       "dev": true
     }
   }

pages/tabbar/home/home.vue

@@ -607,7 +607,7 @@
 				} else {
 					uni.showModal({
 						title:'请您登录',
-						content:"登录小星加油才可以加油 |˛˙꒳​˙)♡",
+						content:"登录佰川加油才可以加油 |˛˙꒳​˙)♡",
 						confirmText:'去登陆',
 						success: (res) => {
 							if(res.confirm){

pages/tabbar/station/stationList.vue

@@ -440,7 +440,7 @@
 				} else {
 					uni.showModal({
 						title: '请您登录',
-						content: "登录小星加油才可以加油 |˛˙꒳​˙)♡",
+						content: "登录佰川加油才可以加油 |˛˙꒳​˙)♡",
 						confirmText: '去登陆',
 						success: (res) => {
 							if (res.confirm) {