多典花

App.vue

@@ -14,9 +14,9 @@ export default {
 		plus.screen.lockOrientation("portrait-primary")
 
 		// 判断用户是否同意用户隐私协议，如果同意协议再获取设备信息等内容
-		const isAgreePrivacy = plus.runtime.isAgreePrivacy();
+		// const isAgreePrivacy = plus.runtime.isAgreePrivacy();
 		// 同意了协议
-		if (isAgreePrivacy) {
+		// if (isAgreePrivacy) {
 			const common = uni.getStorageSync("m-headers")
 			if (!common && plus.os.name == 'iOS') {
 				loadDevice();
@@ -24,7 +24,7 @@ export default {
 				loadLocation();
 				loadUuid()
 			}
-		}
+		// }
 
 		// 当前版本号
 

config/api.js

@@ -7,7 +7,7 @@ const BASE = {
   development: {
     common: "http://portal.cloudsmake.cn",
     event: 'http://118.31.124.88:21111',
-    h5: 'http://192.168.0.23:8080/index.html#/loan'
+    h5: 'http://192.168.0.23:8080/index.html#/'
   },
   stest: {
     common: "http://portal.cloudsmake.cn",
@@ -38,7 +38,7 @@ let env = process.env.VUE_APP_BASE_NODE_ENV
  */
 
 // #ifdef APP-PLUS
-env = "stest";
+env = "development";
 // #endif
 
 const api = {

manifest.json

@@ -53,7 +53,7 @@
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "targetSdkVersion" : 30,
+                "targetSdkVersion" : 28,
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "permissionExternalStorage" : {
                     "request" : "none",

mixin/index.js

@@ -31,7 +31,7 @@ export default {
     methods: {
         /** 埋点 */
         buryingPoint(des, val) {
-            const mobile = uni.getStorageSync('d-mobile')
+            const mobile = uni.getStorageSync('l-mobile')
             const BaseUrl = api.event
             try {
                 const data = {
@@ -47,10 +47,10 @@ export default {
                         ...data
                     },
                     success: (res) => {
-                        console.log(res, '埋点返回')
+                        // console.log(res, '埋点返回')
                     },
                     fail: (err) => {
-                        console.log(err, '埋点报错')
+                        // console.log(err, '埋点报错')
                     }
                 })
 

pages.json

@@ -121,7 +121,13 @@
         "enablePullDownRefresh": false
       }
     },
-
+    {
+      "path": "pages/web/contact",
+      "style": {
+        "navigationBarTitleText": "通讯录",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/webview/webview",
       "style": {
@@ -129,6 +135,13 @@
         "navigationBarTitleText": ""
       }
     },
+    {
+      "path": "pages/websrc/websrc",
+	      "style": {     
+	          "navigationBarTitleText": "454566",
+	          "enablePullDownRefresh": false    
+	      }
+    },
     {
       "path": "pages/web/web",
       "style": {

pages/index/index.vue

@@ -137,6 +137,8 @@ export default {
 		this.isFirstShow = uni.getStorageSync('isFirstShow')
 	},
 	async onLoad() {
+		
+		// console.log(storage.getUserInfo().mobile,'uuuuuu')
 		await this.initAjax();
 		await this.getAppVersion()
 	},
@@ -229,10 +231,11 @@ export default {
 			const self = this
 			self.$request('/pawn/index', 'GET').then(res => {
 				const { shortcutList, bannerList } = res.result
-				if (shortcutList) {
+				console.log(res,'999')
+				if (shortcutList && typeof(shortcutList)=='string') {
 					self.list = JSON.parse(shortcutList)
 				}
-				if (bannerList) {
+				if (bannerList && typeof(bannerList)=='string' ) {
 					self.bannerList = JSON.parse(bannerList)
 				}
 			}).catch(err => {

pages/login/login.vue

@@ -24,7 +24,7 @@
 				<text>我已阅读并同意</text>
 				<uni-link class="link" :href="protocolf.protocolUrl">《注册协议》</uni-link>
 				<text>和</text>
-				<uni-link class="link" :href="protocolf.protocolUrl">《隐私政策》</uni-link>
+				<uni-link class="link" :href="protocols.protocolUrl">《隐私政策》</uni-link>
 			</view>
 		</view>
 	</view>
@@ -175,7 +175,7 @@ export default {
 					uni.setStorageSync('deviceId', deviceId)
 				}
 				uni.setStorageSync('token', token)
-				uni.setStorageSync('d-mobile', self.mobile)
+				uni.setStorageSync('l-mobile', self.mobile)
 				self.loginNocheck()
 
 				// 设置

pages/web/authPermission.js

@@ -4,7 +4,7 @@ import { nativeCommon } from './nativeCommon'
 // 通讯录拒绝后弹框
 const onPermissionModal = function () {
   uni.showModal({
-    title: '"花花有米"想访问您的通讯录',
+    title: '"多典花"想访问您的通讯录',
     content: '通过访问您的通讯录信息，添加联系人，提高授信通过率。',
     cancelText: '取消',
     confirmText: '去设置',
@@ -92,7 +92,7 @@ export const CheckLocationPermission = function (callback) {
     function (err) {
       console.log(err, '走这里了？')
       uni.showModal({
-        title: '"花花有米"想要访问您的位置信息',
+        title: '"多典花"想要访问您的位置信息',
         content:
           '应用为您提供的服务，要访问您的位置信息，需要您提供权限，请允许。',
         success: function (res) {
@@ -130,7 +130,7 @@ export const SelectLocation = async function (callback) {
         console.log('未获得授权')
       } else if (rContacts === -1) {
         uni.showModal({
-          title: '"花花有米"想要访问您的位置信息',
+          title: '"多典花"想要访问您的位置信息',
           content:
             '应用为您提供的服务，要访问您的位置信息，需要您提供权限，请允许。',
           success: function (res) {

pages/web/index.vue

@@ -112,7 +112,7 @@ export default {
           subNVue.show('slide-in-bottom', 300, () => {
             // 向子窗体传递参数
             uni.$emit('loan-from-popup', {
-              appName: '花花有米',
+              appName: '多典花',
               mobile: storage.getUserInfo().mobile,
             })
           })

pages/web/tools.js

@@ -48,7 +48,7 @@ export const loadDeviceInfo = async (lat, lng, address) => {
 				} = result;
 				const deviceInfo = {
 					deviceId: deviceId, //设备指纹ID
-					appName: "MMYX", //APP实例
+					appName: "DDH", //APP实例
 					appSourceId: "1",
 					device: osName, // 设备类型
 					deviceName: platform, // 设备命名
@@ -132,7 +132,7 @@ export const loadNetwork = () => {
 				// 网络信息存储
 				uni.setStorage({
 					key: "m-network-info",
-					data: res.networkType,
+					data: JSON.stringify(res), 
 					success: function() {
 						console.log("m-network-info存储成功");
 					},
@@ -205,7 +205,7 @@ export const loadLocation = () => {
 
 					// 这里应该判断用户 拒绝之后 才弹框
 					uni.showModal({
-						title: '"花花有米"想要访问您的位置信息',
+						title: '"多典花"想要访问您的位置信息',
 						content: "您手机系统的定位处于关闭状态，会导致您后续的授信不通过，授信需要访问您的位置信息，需要您提供权限，请开启手机的定位服务。",
 						success: function(res) {
 							if (res.confirm) {

pages/web/web.vue

@@ -72,6 +72,7 @@ export default {
 	},
 	async onLoad(option) {
 		console.log(option,'参数')
+	
 		const that = this
 		if (option.src) {
 			that.src = option.src
@@ -185,11 +186,25 @@ export default {
 		},
 		// 获取用户手机号
 		GetUserMobile() {
+			const self=this
 			try {
-				this.GetWebView().evalJS(`receiveUserMobile('${storage.getUserInfo().mobile}')`)
+				uni.getStorage({
+					key: 'l-mobile',
+					success: function(res) {
+							console.log(res, '结果')
+							const mobile = res.data;
+						self.GetWebView().evalJS("receiveUserMobile('" + mobile + "')")
+					},
+					fail: function(err) {
+						console.log(err, '报错了')
+					}
+				})
+
+				// const mobileCell = uni.getStorageSync('d-mobile')
+				// this.GetWebView().evalJS(`receiveUserMobile('${mobileCell}')`)
 			} catch (err) {
 				console.log(err, '什么错')
-				this.toast('获取用户手机号报错')
+				self.toast('获取用户手机号报错')
 			}
 		},
 		// 拨打电话

pages/websrc/websrc.vue

+<template>
+	<view class="page-web">
+		 <web-view ref='webview' :webview-styles="webviewStyles"  :src="src"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "WEB",
+		data() {
+			return {
+				// src:'http://192.168.0.38:8081/index.html#/middle?type=mieye&',
+				src:null,
+				webviewStyles: {
+					progress: {
+						color: '#FF4050'
+				    }
+				},
+				timer:null,
+				titleVal:'',
+				urlWeb:'',
+				typePage:false,
+				deviceStatus:'',
+				viewerUrl:'/hybrid/html/web/viewer.html'
+			}
+		},
+		onLoad(options){
+			const that=this
+			that.src=decodeURIComponent(options.src)
+			let pages = getCurrentPages();
+			let page = pages[pages.length - 1];
+			let currentWebView = page.$getAppWebview();
+			
+		},	
+	
+		methods: {
+		},
+		onShow(){
+				const currentWebview = this.$scope.$getAppWebview().children()[0];
+				if(currentWebview){
+					uni.getStorage({
+						key:'scanType',
+						success:function(res){
+							console.log(res,'二维码，不刷新')
+							
+						},
+						fail:function(err){
+							console.log(err,'刷新')
+							currentWebview.reload(true);	
+						}
+					})
+				}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+  .page-web {
+    width: 100vw;
+    height: 100vh;
+
+    web-view {
+      width: 100%;
+      height: 100%;
+    }
+  }
+</style>

utils/device.js

@@ -8,7 +8,7 @@ export function setDevice() {
   const info = uni.getSystemInfoSync()
   const { appVersion, deviceId, brand, platform, system } = info
   let data = {
-    appKey: 'hhym',
+    appKey: 'DDH',
     appVersion, // app版本号
     deviceId, // 设备号
     deviceBrand: brand, // 品牌名称

utils/header.js

@@ -62,19 +62,24 @@ export const initHeaderDevice = function () {
     const loadUuid = uni.getStorageSync('m-load-udid')
     let device = {};
     if (deviceInfo) {
+		
         device = Object.assign(device, common, JSON.parse(deviceInfo))
     }
 
     if (networkInfo) {
+		
         device = Object.assign(device, common, JSON.parse(networkInfo))
     }
 
     if (locationInfo) {
+		console.log(locationInfo,'locationInfo')
         device = Object.assign(device, common, JSON.parse(locationInfo))
     }
     if (loadUuid) {
+		console.log(loadUuid,'loadUuid')
         device = Object.assign(device, common, JSON.parse(loadUuid))
     }
+	
     if (deviceInfo && networkInfo && loadUuid && locationInfo) {
         const headerDeviceInfo = {
             ...JSON.parse(deviceInfo),
@@ -95,7 +100,7 @@ export const initHeaderDevice = function () {
 
         return headerDeviceInfo
     }
-
+console.log(device,'device33333')
     return device
 
 }

utils/index.js

@@ -55,7 +55,7 @@ export const switchShowTabbar = async () => {
         })
     } else {
         try {
-            const { success } = await API.initTabBar()
+			const {success }= await API.initTabBar()
             if (success) {
                 uni.setTabBarItem({
                     index: 1,

utils/request.js

@@ -7,6 +7,7 @@ const request = async (url, type, data) => {
 	const deviceInfo = uni.getStorageSync('m-device-info')
 	const tokenF = uni.getStorageSync('tokenFinance')
 	let rd = null
+	 try{
 		 
 		 if (!deviceInfo || tokenF == '' && plus.os.name != 'iOS') {
 		 	rd = initHeaderInfo()
@@ -21,7 +22,12 @@ const request = async (url, type, data) => {
 		 		}
 		 	}
 		 }
+		 console.log(rd,'错误信息333')
+	 }catch(err){
+		console.log(err,'congzhelizou')
+	 }
 	
+	console.log(rd,'设备信息')
 	return new Promise((resolve, reject) => {
 		const token = uni.getStorageSync('token')
 		const tokenFinance = uni.getStorageSync('tokenFinance')