分包配置

manifest.json

@@ -70,6 +70,9 @@
 				"desc": "需要获取附近位置"
 			}
 		},
+		"optimization": {
+			"subPackages": true
+		},
 		"uniStatistics": {
 			"enable": true
 		}

package-lock.json

@@ -12,11 +12,6 @@
 				"follow-redirects": "1.5.10"
 			}
 		},
-		"bcryptjs": {
-			"version": "2.4.3",
-			"resolved": "https://registry.npm.taobao.org/bcryptjs/download/bcryptjs-2.4.3.tgz",
-			"integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms="
-		},
 		"crypto-js": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-js%2Fdownload%2Fcrypto-js-4.0.0.tgz",
@@ -38,11 +33,6 @@
 				"debug": "=3.1.0"
 			}
 		},
-		"js-base64": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.1.tgz?cache=0&sync_timestamp=1592639177349&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.1.tgz",
-			"integrity": "sha1-wyg3QiXS5lVpeR3tc8JY4sWTNMc="
-		},
 		"js-cookie": {
 			"version": "2.2.1",
 			"resolved": "https://registry.npm.taobao.org/js-cookie/download/js-cookie-2.2.1.tgz",
@@ -63,11 +53,6 @@
 			"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
 			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
 		},
-		"react-native-bcrypt": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npm.taobao.org/react-native-bcrypt/download/react-native-bcrypt-2.4.0.tgz",
-			"integrity": "sha1-ld/y28hJwisl8Lk3mre/69IUC/0="
-		},
 		"tki-qrcode": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npm.taobao.org/tki-qrcode/download/tki-qrcode-0.1.6.tgz",

package.json

@@ -14,13 +14,10 @@
 	"license": "ISC",
 	"dependencies": {
 		"axios": "0.19.2",
-		"bcryptjs": "^2.4.3",
 		"crypto-js": "4.0.0",
-		"js-base64": "2.6.1",
 		"js-cookie": "2.2.1",
 		"js-md5": "0.7.3",
 		"jsencrypt": "^3.0.0-rc.1",
-		"react-native-bcrypt": "^2.4.0",
 		"tki-qrcode": "^0.1.6"
 	}
 }

pages.json

@@ -4,19 +4,22 @@
 		 	"path": "pages/startPage/startPage",
 		 	"style": {}
 		 },{
-			"path": "pages/login/login",
-			"style": {
-
-			}
-		},  {
-			"path": "pages/operation-analysis/operation-analysis",
+			"path": "pages/index/index",
 			"style": {
+				"navigationBarTitleText": "星油",
 				"enablePullDownRefresh": true
 			}
+		},
+		{
+			"path": "pages/staff/editStaff/editStaff",
+			"style": {}
 		}, {
-			"path": "pages/operation-analysis/analysis/daily",
+			"path": "pages/station-info/station-info",
+			"style": {}
+		}, {
+			"path": "pages/login/login",
 			"style": {
-				"enablePullDownRefresh": true
+
 			}
 		}, {
 			"path": "pages/login/posLogin/posLogin",
@@ -40,26 +43,12 @@
 		}, {
 			"path": "pages/stationDetail/stationDetail",
 			"style": {}
-		}, {
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "星油",
-				"enablePullDownRefresh": true
-			}
 		}, {
 			"path": "pages/staff/List/List",
 			"style": {
 				"enablePullDownRefresh": true
 			}
 		},
-		{
-			"path": "pages/staff/editStaff/editStaff",
-			"style": {}
-		},
-
-
-
-
 		{
 			"path": "pages/qrcode/QrCode_xy",
 			"style": {}
@@ -69,10 +58,7 @@
 			"style": {}
 		},
 
-		{
-			"path": "pages/station-info/station-info",
-			"style": {}
-		},
+
 		{
 			"path": "pages/Auth/Auth",
 			"style": {}
@@ -81,16 +67,33 @@
 			"style": {}
 		}
 
-		, {
-			"path": "pages/operation-analysis/analysis/analysis",
+
+	],
+	"subPackages": [{
+		"root": "packageChart",
+		"pages": [{
+				"path": "operation-analysis/analysis/analysis",
 				"style": {}
 			}, {
-			"path": "pages/operation-analysis/analysis/monthly",
+				"path": "operation-analysis/analysis/monthly",
 				"style": {
 					"enablePullDownRefresh": true
 				}
+			},
+			{
+				"path": "operation-analysis/operation-analysis",
+				"style": {
+					"enablePullDownRefresh": true
 				}
-	],
+			}, {
+				"path": "operation-analysis/analysis/daily",
+				"style": {
+					"enablePullDownRefresh": true
+				}
+			}
+		]
+	}],
+
 	"globalStyle": {
 		"mp-alipay": {
 			/* 支付宝小程序特有相关 */

pages/index/index.vue

@@ -13,9 +13,7 @@
 				</view>
 			</view>
 		</view>
-
 		<view class="bg-main-oil bg-main-color  main-money">
-
 		</view>
 		<view class="bg-white radius  margin-left margin-right to-top">
 			<view class=" flex ">
@@ -221,7 +219,21 @@
 								console.log('chengg', res)
 							}
 						})
-					}
+					},
+					// 方便测试
+					// complete: () => {
+					// 	uni.setStorageSync('qrCode', 'XM&1309328197641433088')
+					// 	uni.navigateTo({
+					// 		url: that.scanUrl,
+					// 		fail: (err) => {
+					// 			console.log(err)
+					// 		},
+					// 		success: (res) => {
+					// 			console.log('chengg', res)
+					// 		}
+					// 	})
+					// }
+
 				})
 			},
 			// 方便开发

utils/request.js

@@ -1,9 +1,9 @@
 import axios from 'axios'
 import utils from '@/utils/encode'
 const service = axios.create({
-	baseURL: 'http://192.168.0.104:48080', // 小杰
+	// baseURL: 'http://192.168.0.104:48080', // 小杰
 	// baseURL: 'http://192.168.0.112:48080', // 龙龙
-	// baseURL: 'https://www.51xingka.net/oilApp',
+	baseURL: 'https://www.51xingka.net/oilApp',
 	timeout: 5000
 })
 service.interceptors.request.use(