1

pages/web/tools.js

@@ -129,6 +129,7 @@ export const loadNetwork = () => {
 	return new Promise((resolve, reject) => {
 		uni.getNetworkType({
 			success: (res) => {
+				console.log(res,'往222')
 				// 网络信息存储
 				uni.setStorage({
 					key: "m-network-info",

utils/deviceInfo.js

@@ -10,7 +10,7 @@ import Permission from '../js_sdk/wa-permission/permission.js'
 import { SelectLocation } from "../utils/authPerission.js";
 // import { getAppVersion } from "@/api/api.js";
 // 获取common当中的设备信息
-export const loadDevice=function() {
+export const loadDevice = function () {
 	const that = this
 	convertPromise('getSystemInfo').then(result => {
 		const deviceInfo = {
@@ -32,7 +32,7 @@ export const loadDevice=function() {
 		uni.setStorage({
 			key: 'm-device-info',
 			data: JSON.stringify(deviceInfo),
-						success: function() {
+			success: function () {
 				console.log('m-device-info存储成功');
 			}
 		});
@@ -43,7 +43,7 @@ export const loadDevice=function() {
 			content: '通过访问您的设备信息，提高您授信通过率。',
 			showCancel: false,
 			confirmText: '去设置',
-						success: function(res) {
+			success: function (res) {
 				if (res.confirm) {
 					Permission.gotoAppPermissionSetting()
 				}
@@ -52,7 +52,7 @@ export const loadDevice=function() {
 	})
 }
 // 获取common当中的网络信息
-export const loadNetwork=function() {
+export const loadNetwork = function () {
 	const that = this;
 	convertPromise('getNetworkType').then(result => {
 		const networkInfo = {
@@ -62,7 +62,7 @@ export const loadNetwork=function() {
 		uni.setStorage({
 			key: 'm-network-info',
 			data: JSON.stringify(networkInfo),
-						success: function() {
+			success: function () {
 				console.log('m-network-info存储成功');
 			}
 		});
@@ -71,27 +71,27 @@ export const loadNetwork=function() {
 	})
 }
 // 获取common当中的网络信息
-export const loadUuid=function() {
+export const loadUuid = function () {
 	plus.device.getInfo({
-						success: function(e) {
+		success: function (e) {
 			const deviceInfo = {
 				token: e.uuid,
 			};
 			uni.setStorage({
 				key: 'm-load-udid',
 				data: JSON.stringify(deviceInfo),
-							success: function() {
+				success: function () {
 					console.log('uuid存储成功');
 				}
 			})
 		},
-					fail: function(e) {
+		fail: function (e) {
 			console.log('getDeviceInfo failed: ' + JSON.stringify(e));
 		}
 	});
 }
 // 获取common当中的网络信息
-export const loadLocation=function() {
+export const loadLocation = function () {
 	const that = this;
 	// 苹果测试手机如果没有插入手机卡，获取定位之后会解析失败，报错
 	SelectLocation(() => {
@@ -107,7 +107,7 @@ export const loadLocation=function() {
 			uni.setStorage({
 				key: 'm-location-info',
 				data: JSON.stringify(locationInfo),
-				  success: function() {
+				success: function () {
 					console.log('m-location-info存储成功');
 				}
 			});

utils/header.js

@@ -60,6 +60,9 @@ export const initHeaderDevice = function () {
     const networkInfo = uni.getStorageSync('m-network-info')
     const locationInfo = uni.getStorageSync('m-location-info')
     const loadUuid = uni.getStorageSync('m-load-udid')
+	
+	console.log(networkInfo,loadUuid,'===================')
+	
     let device = {};
     if (deviceInfo) {
         device = Object.assign(device, common, JSON.parse(deviceInfo))
@@ -87,10 +90,7 @@ export const initHeaderDevice = function () {
         // 存储所有请求的头部信息
         uni.setStorage({
             key: 'm-header-device',
-            data: JSON.stringify(headerDeviceInfo),
-            success: function () {
-                // console.log('m-header-device存储成功4');
-            }
+            data: JSON.stringify(headerDeviceInfo)
         });
 
         return headerDeviceInfo

utils/index.js

@@ -113,6 +113,7 @@ export const loadNetwork = () => {
         const networkInfo = {
             networkStatus: result.networkType
         };
+        
         // 网络信息存储
         uni.setStorage({
             key: 'm-network-info',

utils/request.js

@@ -4,23 +4,11 @@ const request = async (url, type, data) => {
 	const baseUrl = api.common
 	// 这里确保一定是可以获取得到的
 	const headerDevice = uni.getStorageSync('m-header-device')
-	const deviceInfo = uni.getStorageSync('m-device-info')
-	const tokenF = uni.getStorageSync('tokenFinance')
-	let rd = null
 
-	if (!deviceInfo || tokenF == '' && plus.os.name != 'iOS') {
-		rd = initHeaderInfo()
-	} else {
-		if (headerDevice) {
-			rd = headerDevice
-		} else {
-			const common = initHeaderDevice()
-			console.log(common, '日===')
-			if (common) {
-				rd = JSON.stringify(common)
-			}
-		}
-	}
+	let rd = initHeaderInfo()
+	if (headerDevice) rd = headerDevice
+	else rd = initHeaderDevice()
+	rd = JSON.stringify(rd)
 
 	return new Promise((resolve, reject) => {
 		const token = uni.getStorageSync('token')

utils/tools.js

@@ -127,10 +127,11 @@ export const loadNetwork = () => {
 	return new Promise((resolve, reject) => {
 		uni.getNetworkType({
 			success: (res) => {
+				console.log(res,'哈哈====')
 				// 网络信息存储
 				uni.setStorage({
 					key: "m-network-info",
-					data: res.networkType,
+					data: JSON.stringify(res),
 					success: function() {
 						console.log("m-network-info存储成功");
 					},