修改提交

.gitignore

@@ -10,6 +10,9 @@ dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+unpackage/
+.history
+.hbuilderx
 
 # Editor directories and files
 .project
@@ -22,4 +25,3 @@ yarn-error.log*
 *.sw*
 .history
 .DS_Store
-/unpackage

App.vue

@@ -7,7 +7,6 @@
 		onLaunch: function() {
 			const common = uni.getStorageSync("m-headers")
 			if (!common && plus.os.name=='iOS') {					
-					console.log(plus.os.name,'9')
 					this.loadDevice();
 					this.loadNetwork();
 					this.loadLocation();
@@ -15,28 +14,26 @@
 			}
 			let versionNumber
 			plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo){							
-											
 				if(wgtinfo.version){
 					versionNumber = wgtinfo.version;
 				}else{
 					versionNumber = plus.runtime.version;
 				}								
-				console.log(versionNumber,'versionNumber')						
 				uni.setStorageSync('version',versionNumber)
 			})
 
+			// 强制竖屏
 			plus.screen.lockOrientation("portrait-primary")
 			
 			/*** tabbar*/
 			this.switchShowTabbar()
+			
 			//app更新版本
-			silentlyAppUpdate()
+			// silentlyAppUpdate()
 			const isAgree = uni.getStorageSync('m-agreement')
-			if (isAgree && plus.os.name=='iOS') {
+			if (isAgree && plus.os.name ==='iOS') {
 				silentlyAppUpdate()
 			}	
-			// this.getAppVersion()
-			console.log('App Launch')
 		},
 		methods:{
 			getAppVersion(){
@@ -75,7 +72,6 @@
 			switchShowTabbar(){
 				const token=uni.getStorageSync('token')	
 				if (!token) {					 
-					  console.log(token,'tokentab')
 					  uni.setTabBarItem({
 						index: 1,
 						visible: false
@@ -86,7 +82,6 @@
 						const {data}=res.result
 						if (res.code == 200 && data == true) {
 						    try {
-							  console.log(data,'显示')
 						      uni.setTabBarItem({
 						        index: 1,
 						        text: '贷款',
@@ -130,7 +125,7 @@
 						key: 'm-device-info',
 						data: JSON.stringify(deviceInfo),
 						success: function() {
-							console.log('m-device-info存储成功');
+							// console.log('m-device-info存储成功');
 						}
 					});
 				}).catch(err => {
@@ -160,7 +155,7 @@
 						key: 'm-network-info',
 						data: JSON.stringify(networkInfo),
 						success: function() {
-							console.log('m-network-info存储成功');
+							// console.log('m-network-info存储成功');
 						}
 					});
 				}).catch(err => {
@@ -179,7 +174,7 @@
 						key: 'm-load-udid',
 						data: JSON.stringify(deviceInfo),
 						success: function() {
-							console.log('uuid存储成功');
+							// console.log('uuid存储成功');
 						}
 					})
 				},
@@ -206,7 +201,7 @@
 							  key: 'm-location-info',
 							  data: JSON.stringify(locationInfo),
 							  success: function() {
-								console.log('m-location-info存储成功');
+								// console.log('m-location-info存储成功');
 							  }
 							});
 					}).catch(err => {
@@ -215,14 +210,6 @@
 						})
 					})
 			}
-		},
-		onShow: function() {
-			console.log(2,'App Show')
-
-		},
-	
-		onHide: function() {
-			console.log('App Hide')
 		}
 	}
 </script>

config/api.js

@@ -47,8 +47,6 @@ let env = process.env.VUE_APP_BASE_NODE_ENV
 env = "development";
 // #endif
 
-console.log("env", env);
-
 const api = {
   common: BASE[env].common,
   buyer: BASE[env].buyer,

js_sdk/wa-permission/permission.js

@@ -45,7 +45,7 @@ function judgeIosPermissionLocation() {
 	var cllocationManger = plus.ios.import("CLLocationManager");
 	var status = cllocationManger.authorizationStatus();
 	result = (status != 2)
-	console.log("定位权限开启：" + result);
+	// console.log("定位权限开启：" + result);
 	// 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
 	/* var enable = cllocationManger.locationServicesEnabled();
 	var status = cllocationManger.authorizationStatus();

pages/agreement/index.less

+page{
+  background: transparent; 
+}
 .page-agreement{
   position: relative;
   width: 100vw;

pages/agreement/index.vue

@@ -83,7 +83,6 @@ export default {
 			if(protocol){
 				const protocolList=JSON.parse(protocol)
 				protocolList.map((item)=>{				
-					console.log(item,'item9')
 					if(item.protocolName=='隐私协议'){
 						self.protocols=item
 					}else if(item.protocolName=='用户服务协议'){

pages/app-update/index.vue

 <template>
 	<view class="appUploadAlertBox">
-		<uni-popup ref="popup" mode="center" :maskCloseAble="false" @touchmove.stop.prevent zIndex="9999" width="590rpx" border-radius="10">
-			<view class="content_popup" :style="{backgroundColor: bgColor}">
+		<uni-popup ref="popup" mode="center" :maskCloseAble="false" @touchmove.stop.prevent zIndex="9999" width="590rpx"
+			border-radius="10">
+			<view class="content_popup" :style="{ backgroundColor: bgColor }">
 				<!-- 关闭app type="closeempty" size="32"
 					color="#ff0000"-->
 				<view v-if="!isForceUpdata" class="close" @click="closeUpdate">暂不更新</view>
 				<!-- 版本提示 -->
-				<view class="version" :style="{color: versionColor}">v{{version}}</view>
+				<view class="version" :style="{ color: versionColor }">v{{ version }}</view>
 				<!-- 背景 -->
 				<image class="backgroundImg" width="100%" height="100%" src="./img/appUploadAlertBoxBg.png"></image>
 				<!-- 更新详细信息 -->
 				<view class="info center">
-					<text class="title" :style="{color: titleColor}">{{title}}</text>
+					<text class="title" :style="{ color: titleColor }">{{ title }}</text>
 					<!-- 更新内容 -->
-					<scroll-view class="info_desc_scroll" :style="{color: contentColor}" scroll-y="true">
+					<scroll-view class="info_desc_scroll" :style="{ color: contentColor }" scroll-y="true">
 						<rich-text :nodes="content"></rich-text>
 					</scroll-view>
 				</view>
 				<view class="footer" v-if="platform">
 					<button v-if="downloadSuccess && !wgtInstalled" class="btn" :style="btnStyle"
 						@click="installPackage" :loading="wgtInstalling" :disabled="wgtInstalling">
-						{{wgtInstalling ? wgtInstallingText : downloadSuccessText}}
+						{{ wgtInstalling ? wgtInstallingText : downloadSuccessText }}
 					</button>
 					<button v-else-if="wgtInstalled && isWGT" class="btn" :style="btnStyle" @click="restart">
-						{{wgtInstalledText}}
+						{{ wgtInstalledText }}
 					</button>
 					<!-- 更新进度 -->
-					<view class="progress-box flex f-c f-y-c" :style="{color: progressTextColor}"
+					<view class="progress-box flex f-c f-y-c" :style="{ color: progressTextColor }"
 						v-else-if="downloading">
 						<progress class="progress" :percent="downLoadPercent" :activeColor="progressColor || themeColor"
 							show-info stroke-width="10" />
 						<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
-							<text>{{downLoadingText}}</text>
-							<text>({{downloadedSize}}M/{{packageFileSize || 0}}M)</text>
+							<text>{{ downLoadingText }}</text>
+							<text>({{ downloadedSize }}M/{{ packageFileSize || 0 }}M)</text>
 						</view>
 					</view>
 					<!-- 选项 -->
 					<view v-else class="btns flex f-x-b">
 						<!-- IOS -->
 						<view v-if="platform == 'ios'" class="btn confirm" :style="btnStyle" @click="jumpToAppStore">
-							{{downloadBtnTextIOS}}
+							{{ downloadBtnTextIOS }}
 						</view>
 						<!-- android -->
 						<view v-else class="btn confirm" :style="btnStyle" @click="updataApp">
-							{{downloadBtnTextAndroid}}
+							{{ downloadBtnTextAndroid }}
 						</view>
 					</view>
 					<!-- 短期内不在提醒 -->
@@ -63,7 +64,7 @@
 </template>
 
 <script>
-	/**
+/**
  * geek-appUpdata app更新提示框
  * @description app更新提示框，支持热更新，强制更新，普通更新，暂不更新，后台下载，更新内容展示，进度条显示，ios跳转appstore等功能。
  * @property {String} title 更新标题。
@@ -75,10 +76,10 @@
  * @example 
  */
 
-	import config from './config.js';
-	import checkVersion from './js-sdk/checkVersion.js';
-	import {loadDevice,loadNetwork,loadUuid,loadLocation} from '../../utils/deviceInfo.js'
-	export default {
+import config from './config.js';
+import checkVersion from './js-sdk/checkVersion.js';
+import { loadDevice, loadNetwork, loadUuid, loadLocation } from '../../utils/deviceInfo.js'
+export default {
 	name: 'geekAppUpdata',
 	props: config.props,
 	data() {
@@ -421,9 +422,9 @@
 			// loadLocation()
 			// loadUuid()
 			const headerDevice = uni.getStorageSync('m-header-device')
-				console.log(headerDevice,'headerDevice')
+			console.log(headerDevice, 'headerDevice')
 			if (this.downloading) {
-					console.log(1,'9')
+				console.log(1, '9')
 				uni.showModal({
 					title: '是否取消下载？',
 					cancelText: '否',
@@ -439,7 +440,7 @@
 					}
 				});
 			} else {
-					console.log(2,'9')
+				console.log(2, '9')
 				this.$refs.popup.close();
 				// 如果用户短期内不更新
 				if (this.userNotRemind) {
@@ -471,11 +472,15 @@
 			}
 		}
 	}
-	}
+}
 </script>
 
-<style lang="less" scoped>
-	.appUploadAlertBox {
+<style lang="less">
+page {
+	background: transparent;
+}
+
+.appUploadAlertBox {
 	.bg {
 		width: 100%;
 	}
@@ -490,8 +495,9 @@
 		background-color: #FFF;
 		padding-bottom: 40rpx;
 		position: relative;
+
 		.close {
-				position: absolute ;
+			position: absolute;
 			right: 15rpx;
 			top: 15rpx;
 			z-index: 10000001;
@@ -600,5 +606,5 @@
 		bottom: -120rpx;
 		left: calc(50% - 70rpx / 2);
 	}
-	}
+}
 </style>

pages/app-update/js-sdk/silentlyAppUpdate.js

@@ -45,9 +45,7 @@ export default function silentlyAppUpdate() {
 	// 	}
 	// });
 	checkVersion().then(res => {
-		
 		plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
-			
 			if (compare(res.versionName, wgtinfo.version) === 1) {
 				uni.redirectTo({
 					url: "/pages/app-update/index",

pages/index/index.vue

@@ -112,7 +112,6 @@
 			const systemInfo = uni.getSystemInfoSync();
 			if(systemInfo.platform === 'ios'){
 				const isAgree = uni.getStorageSync('m-agreement')			
-				console.log(isAgree,'isAgree1')
 				if (!isAgree) {
 					console.log(isAgree,'isAgree')
 					this.Go('uni:/pages/agreement/index')
@@ -247,30 +246,31 @@
 				const self=this
 				const { sort,pageSize,pageNum}=self
 				const params={					 
-					 
 					  "current":pageNum,
 					  "size":pageSize,
 					  "sort":sort
 				}
 				console.log(params,'查询商品')
+				try{
 					self.$request('/pawn/category/getGoodsPage','POST',params).then(res => {						
-					
 						const {current,total,size,records }=res.result
 						const hasNextPage=total-self.pageSize*self.pageNum>0?true:false //是否有下一页
 						if(self.loadFlag){
 							
 							self.IndexList=self.IndexList.concat(records)
 						}else{							
-						
 							self.IndexList=records
 						}
 						self.hasNextPage=hasNextPage
 						self.loadFlag=false
-				
-					
 					}).catch(err=>{
 					  console.log(err,'请求出错')
 					})
+					
+				}catch{
+					console.log(err,'错误信息')
+				}
+				
 			},
 			toupperTop:function(e){
 				console.log(e,'到顶了');

unpackage/dist/dev/app-plus/app-config-service.js

 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/sort/index","pages/my/index","pages/recruit/index","pages/recruitResult/index","pages/category/category","pages/application/application","pages/myneed/myneed","pages/Ineed/Ineed","pages/productDetails/productDetails","pages/detailResult/detailResult","pages/useFeed/useFeed","pages/lookGoods/lookGoods","pages/login/login","pages/prolist/prolist","pages/setting/setting","pages/contact/contact","pages/webview/webview","pages/web/web","pages/bill/indexs","pages/finance/index","pages/app-update/index","pages/agreement/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#FFFFFF","backgroundColor":"#F8F8F8","bounce":"none"},"tabBar":{"borderStyle":"white","color":"#BBBBBB","selectedColor":"#2263E6","iconWidth":"24px","height":"52px","fontSize":"12px","list":[{"pagePath":"pages/index/index","iconPath":"/static/tab/indexfh.png","selectedIconPath":"/static/tab/indexf.png","text":"首页"},{"pagePath":"pages/finance/index","iconPath":"/static/tab/index-h.png","selectedIconPath":"/static/tab/index.png","text":"贷款"},{"pagePath":"pages/bill/indexs","iconPath":"/static/tab/billh.png","selectedIconPath":"/static/tab/bill.png","text":"账单"},{"pagePath":"pages/my/index","iconPath":"/static/tab/my-h.png","selectedIconPath":"/static/tab/my.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"多典花","compilerVersion":"4.24","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/index/index","pages/sort/index","pages/my/index","pages/recruit/index","pages/recruitResult/index","pages/category/category","pages/application/application","pages/myneed/myneed","pages/Ineed/Ineed","pages/productDetails/productDetails","pages/detailResult/detailResult","pages/useFeed/useFeed","pages/lookGoods/lookGoods","pages/login/login","pages/prolist/prolist","pages/setting/setting","pages/contact/contact","pages/webview/webview","pages/web/web","pages/bill/indexs","pages/finance/index","pages/app-update/index","pages/agreement/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#FFFFFF","backgroundColor":"#F8F8F8","bounce":"none"},"tabBar":{"borderStyle":"white","color":"#BBBBBB","selectedColor":"#2263E6","iconWidth":"24px","height":"52px","fontSize":"12px","list":[{"pagePath":"pages/index/index","iconPath":"/static/tab/indexfh.png","selectedIconPath":"/static/tab/indexf.png","text":"首页"},{"pagePath":"pages/finance/index","iconPath":"/static/tab/index-h.png","selectedIconPath":"/static/tab/index.png","text":"贷款"},{"pagePath":"pages/bill/indexs","iconPath":"/static/tab/billh.png","selectedIconPath":"/static/tab/bill.png","text":"账单"},{"pagePath":"pages/my/index","iconPath":"/static/tab/my-h.png","selectedIconPath":"/static/tab/my.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"多典花","compilerVersion":"4.28","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
 var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom","bounce":"none"}},{"path":"/pages/sort/index","meta":{},"window":{"navigationBarTitleText":"款式"}},{"path":"/pages/my/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/recruit/index","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"鉴定师招聘"}},{"path":"/pages/recruitResult/index","meta":{},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/category/category","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"选择鉴定品类"}},{"path":"/pages/application/application","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我的鉴定申请"}},{"path":"/pages/myneed/myneed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我需要的"}},{"path":"/pages/Ineed/Ineed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"我需要"}},{"path":"/pages/productDetails/productDetails","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"商品详情"}},{"path":"/pages/detailResult/detailResult","meta":{},"window":{"enablePullDownRefresh":false,"navigationStyle":"custom"}},{"path":"/pages/useFeed/useFeed","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"用户反馈"}},{"path":"/pages/lookGoods/lookGoods","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/login/login","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"登录"}},{"path":"/pages/prolist/prolist","meta":{},"window":{"navigationBarTitleText":"相关协议"}},{"path":"/pages/setting/setting","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":"设置"}},{"path":"/pages/contact/contact","meta":{},"window":{"navigationBarTitleText":"通讯录","enablePullDownRefresh":false}},{"path":"/pages/webview/webview","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/web/web","meta":{},"window":{"enablePullDownRefresh":false,"navigationBarTitleText":""}},{"path":"/pages/bill/indexs","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"账单"}},{"path":"/pages/finance/index","meta":{"isQuit":true,"isTabBar":true},"window":{"enablePullDownRefresh":true,"navigationStyle":"custom"}},{"path":"/pages/app-update/index","meta":{},"window":{"disableScroll":true,"backgroundColorTop":"transparent","background":"transparent","titleNView":false,"scrollIndicator":false,"animationType":"fade-in","animationDuration":200,"disableSwipeBack":true}},{"path":"/pages/agreement/index","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"","enablePullDownRefresh":false,"bounce":"none","animationType":"fade-in","background":"transparent","backgroundColor":"rgba(0,0,0,0)","webviewBGTransparent":true,"mask":"none"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

utils/authPerission.js

@@ -107,7 +107,7 @@ export const SelectLocation = async function (callback) {
     const platform = uni.getSystemInfoSync();
     if (platform.osName === 'ios') {
         if (Permission.judgeIosPermission('location')) {
-            console.log('进入这里了')
+            // console.log('进入这里了')
             callback && callback()
         } else {
             CheckLocationPermission(callback)

utils/device.js

+import storage from './storage'
+import store from '@/store'
+import { device } from '@/api/other'
+/**
+ * 设置请求头信息
+ */
+export function setDevice() {
+  const info = uni.getSystemInfoSync()
+  const { appVersion, deviceId, brand, platform, system } = info
+  let data = {
+    appKey: 'hhym',
+    appVersion, // app版本号
+    deviceId, // 设备号
+    deviceBrand: brand, // 品牌名称
+    sourceChannel: store.state.channel,
+    deviceType: platform, // 设备类型
+    systemVersion: system, // 系统版本
+    deviceToken: '', // APP推送标识
+    iosDeviceToken: '', // iOS推送标识
+    idfa: '', // 广告标识，iOS必填
+    mac: '', // mac地址
+    appPackage: 'com.huahuayoumi.hhym', // APP包名
+  }
+  if (platform == 'ios') {
+    plus.device.getInfo({
+      //需要勾选IDFA
+      success: e => {
+        console.log('getInfo:' + JSON.stringify(e))
+        return data.idfa = e.idfa
+      },
+      fail: err => {
+        console.log('getDeviceInfo failed: ' + JSON.stringify(err))
+      },
+    })
+  }
+  // 上传 device系统信息
+  setTimeout(() => {
+    try {
+      device(data).then((res) => {
+        console.log('res', JSON.stringify(res.data))
+      })
+      storage.setDeviceData(data)
+    } catch (error) {
+      console.error(error);
+    }
+  }, 300)
+
+  
+}
+
+// Android mac地址
+function getDeviceMac() {
+  //获取本机Mac地址
+  let deviceMac = ''
+  let net = plus.android.importClass('java.net.NetworkInterface')
+  let wl0 = net.getByName('wlan0')
+  let macByte = wl0.getHardwareAddress()
+  deviceMac = ''
+  for (let i = 0; i < macByte.length; i++) {
+    let tmp = ''
+    let num = macByte[i]
+    if (num < 0) {
+      tmp = (255 + num + 1).toString(16)
+    } else {
+      tmp = num.toString(16)
+    }
+    if (tmp.length == 1) {
+      tmp = '0' + tmp
+    }
+    deviceMac += tmp
+  }
+  return deviceMac
+}

utils/header.js

@@ -16,26 +16,24 @@ export const convertPromise = function (FnName, params = {}) {
         })
     });
 }
-export const initHeaderInfo = function (){
+export const initHeaderInfo = function () {
 
-	const versionNew=uni.getStorageSync('m-header-version')
+    const versionNew = uni.getStorageSync('m-header-version')
     let deviceName
-	if(plus.os.name=='Android'){
-		deviceName='android'
-	}else{
-		deviceName='ios'
+    if (plus.os.name == 'Android') {
+        deviceName = 'android'
+    } else {
+        deviceName = 'ios'
     }
-	console.log(plus.os.name,'plus.os.name')
     // 根据当前时间戳生成一个随机整数
     var randomNum = new Date().getTime();
-	const commons={
-		"appName":"DDH",
-		"appSourceId":"1",
-		"token":randomNum,
-		"device":deviceName,
-		"appVersion":versionNew,
+    const commons = {
+        "appName": "DDH",
+        "appSourceId": "1",
+        "token": randomNum,
+        "device": deviceName,
+        "appVersion": versionNew,
     }
-	console.log(commons,'commons')
     return commons
 }
 // 初始化请求头的device参数信息
@@ -72,10 +70,10 @@ export const initHeaderDevice = function () {
     if (locationInfo) {
         device = Object.assign(device, common, JSON.parse(locationInfo))
     }
-	if(loadUuid){
+    if (loadUuid) {
         device = Object.assign(device, common, JSON.parse(loadUuid))
     }
-    if (deviceInfo && networkInfo  && loadUuid) {
+    if (deviceInfo && networkInfo && loadUuid && locationInfo) {
         const headerDeviceInfo = {
             ...JSON.parse(deviceInfo),
             ...JSON.parse(networkInfo),
@@ -89,7 +87,7 @@ export const initHeaderDevice = function () {
             key: 'm-header-device',
             data: JSON.stringify(headerDeviceInfo),
             success: function () {
-                console.log('m-header-device存储成功4');
+                // console.log('m-header-device存储成功4');
             }
         });
 

utils/request.js

-import {initHeaderDevice,initHeaderInfo} from './header.js'
+import { initHeaderDevice, initHeaderInfo} from './header.js'
 import api from '@/config/api.js'
-const request=async(url,type,data)=>{
-	const baseUrl=api.common
+const request = async (url, type, data) => {
+	const baseUrl = api.common
 	// 这里确保一定是可以获取得到的
 	const headerDevice = uni.getStorageSync('m-header-device')
 	const deviceInfo = uni.getStorageSync('m-device-info')
-	let rd=null
-	const tokenF=uni.getStorageSync('tokenFinance')
-	if(!deviceInfo || tokenF=='' && plus.os.name!='iOS'){
-		rd=initHeaderInfo()
-	}else{
+	const tokenF = uni.getStorageSync('tokenFinance')
+	let rd = null
+	
+	if (!deviceInfo || tokenF == '' && plus.os.name != 'iOS') {
+		rd = initHeaderInfo()
+	} else {
 		if (headerDevice) {
 			rd = headerDevice
-			console.log(rd,'rd1')
 		} else {
 			const common = initHeaderDevice()
-				
+			console.log(common,'日===')
+			if (common) {
 				rd = JSON.stringify(common)				
-			console.log(rd,'rd2')
+			}
+
 		}
 	}
 
-	console.log(rd,'rd3')
-	return new Promise((resolve,reject)=>{
-		const token=uni.getStorageSync('token')
-		const tokenFinance=uni.getStorageSync('tokenFinance')
+	return new Promise((resolve, reject) => {
+		const token = uni.getStorageSync('token')
+		const tokenFinance = uni.getStorageSync('tokenFinance')
 		uni.request({
-		    url: baseUrl+url,
-			method:type,
+			url: baseUrl + url,
+			method: type,
 			data: {
 				...data
 			},
 			header: {
 				Accept: "application/json;charset=UTF-8",
 				"Content-Type": "application/json;charset=UTF-8",
-				device:rd,
-				Authorization:tokenFinance,//贷超
-				Author:token,//多典花
+				device: rd,
+				Authorization: tokenFinance, //贷超
+				Author: token, //多典花
 			},
 			success: (res) => {
 
-		        const {data, statusCode} = res;
+				const {
+					data,
+					statusCode
+				} = res;
 				if (statusCode === 200) {
-		        	if (data.success==true) {
+					if (data.success == true) {
 						return resolve(data)
 					} else {
-		        	    if(data.code=='403'){
-							console.log(res,'402');   
+						if (data.code == '403') {
+							console.log(res, '402');
 							uni.showToast({
 								title: data.message,
 								icon: "none",
@@ -54,7 +58,7 @@ const request=async(url,type,data)=>{
 
 							})
 							uni.removeStorageSync('token')
-                        }else{
+						} else {
 							uni.showToast({
 								title: data.message,
 								icon: "none",
@@ -66,15 +70,15 @@ const request=async(url,type,data)=>{
 
 					}
 				} else {
-		        		console.log(res.errMsg,'!200');
+					console.log(res.errMsg, '!200');
 					return reject({
 						data,
 						message: res.errMsg
 					})
 				}
 			},
-			fail:(err)=> {
-				console.log(err,954)
+			fail: (err) => {
+				console.log(err, 954)
 				// return uni.showToast({
 				// 	icon:'loading',
 				// 	title:'请求失败'