版本号写死，等服务端配合之后重新提1.0.8的版本

manifest.json

@@ -2,8 +2,8 @@
     "name" : "多典花",
     "appid" : "__UNI__DE04B13",
     "description" : "",
-    "versionName" : "1.0.7",
-    "versionCode" : 107,
+    "versionName" : "1.0.8",
+    "versionCode" : 108,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

utils/header.js

@@ -19,40 +19,45 @@ export const convertPromise = function (FnName, params = {}) {
 
 // 初始化请求头的device参数信息
 export const initHeaderDevice = function () {
-    let modelApp = '';
+    let modelApp = '', systemInfo = {};
 
     // 手机型号
-    if (uni.getStorageSync('m-agreement')) {
+    if (uni.getStorageSync('m-agreement') || plus.runtime.isAgreePrivacy) {
         uni.getSystemInfo({
             success: function (res) {
                 modelApp = res.deviceBrand
+                systemInfo = res
             }
         })
     }
 
     let channel = plus && plus.runtime.channel && plus.runtime.channel;
-
+	const {system='',screenHeight='',screenWidth='',platform='',osVersion='',osName='',deviceBrand=''} = systemInfo
     // 获取版本号
-    let AppVersion = uni.getStorageSync('m-header-version'); 
-    // AppVersion = AppVersion === '1.0.7' ? AppVersion : '1.0.7';
+    let AppVersion = uni.getStorageSync('m-header-version');
+    AppVersion = AppVersion === '1.0.8' ? AppVersion : '1.0.8';
     const common = {
         appName: 'DDH',
         appSourceId: modelApp,
-        token: "", // 设备令牌（device_token）  设备udid
-        idfa: "", // IOS设备则为：IDFA 广告标识
-        imei: "", //安卓设备为：imei
-        mac: "", // mac
-        wifiMac: "", // wifimac
-        clientIp: "",
-        carrierOperator: '', //运营商
+        // mac: "", // mac
+        // wifiMac: "", // wifimac
+        // clientIp: "",
+        // carrierOperator: '', //运营商
         pushType: "1", //设备push接入类型(1. 小米PUSH，2. 极光PUSH)
-        electricQuantity: "", //电量
-        totalStorage: "", //存储总空间
-        availableStorage: "", //可用存储空间
+        // electricQuantity: "", //电量
+        // totalStorage: "", //存储总空间
+        // availableStorage: "", //可用存储空间
         channel: channel ? channel : '',
         token: new Date().getTime(),
         device: plus.os.name,
         appVersion: AppVersion,
+		system,
+        screenHeight,
+        screenWidth,
+        platform,
+        osName,
+        osVersion,
+        deviceBrand
     };
 
     const deviceInfo = uni.getStorageSync('m-device-info')
@@ -60,7 +65,7 @@ export const initHeaderDevice = function () {
     const locationInfo = uni.getStorageSync('m-location-info')
     const loadUuid = uni.getStorageSync('m-load-udid')
 
-    let device = { ...common };
+    let device = {...common}
     if (deviceInfo) {
 
         device = Object.assign(device, common, JSON.parse(deviceInfo))
@@ -93,5 +98,7 @@ export const initHeaderDevice = function () {
         return headerDeviceInfo
     }
 
+    console.log(device,'请求头信息')
+
     return device
 }

utils/request.js

@@ -8,9 +8,10 @@ const request = async (url, type, data) => {
 	if (headerDevice) {
 		// 获取版本号
 		let AppVersion = uni.getStorageSync('m-header-version');
-		// AppVersion = AppVersion === '1.0.7' ? AppVersion : '1.0.7';
+		AppVersion = AppVersion === '1.0.8' ? AppVersion : '1.0.8';
 		const device = Object.assign({},JSON.parse(headerDevice))
 		device.appVersion = AppVersion
+		console.log(device,'设备头信息')
 		rd = encodeURIComponent(headerDevice)
 	} else {
 		rd = JSON.stringify(initHeaderDevice())
@@ -41,7 +42,7 @@ const request = async (url, type, data) => {
 				console.log('------------')
 				console.log(`${baseUrl}${url}`, '接口地址')
 				console.log($data, '接口参数')
-				if (res.data.result) console.log(res.data.result, '返回内容')
+				if (res.data && res.data.result) console.log(res.data.result, '返回内容')
 				else console.log(res.data, '返回内容')