修改实名相关和webview

App.vue

@@ -11,12 +11,89 @@
 			        this.loadLocation();
 			        this.loadUuid()
 			}
-			
+			this.checkVersion() 
 			plus.screen.lockOrientation("portrait-primary")
 			console.log('App Launch')
 			
 		},
-		methods:{
+		methods:{
+			//版本检查
+			checkVersion(){
+						const self=this
+						// let realVersion = '109';//这里是热更新的版本号，依次累加，（后端要比这里的版本号大）
+						plus.runtime.getProperty(plus.runtime.appid,function(widgetInfo){
+							let currentVersion = widgetInfo.version.replace(/\./g, ""); //获取当前版本号	
+							self.$request('/app/v1/checkVersions','GET').then(res=>{
+								const { versionInfo }=res.result
+								const { version,updateUrl,updateMsg,update,forceUpdate}=versionInfo
+								if(update==true && currentVersion<version){
+									console.log(version,'checkversion')
+									if(forceUpdate==false){
+										console.log('更新1')
+										//可以关闭弹窗，更新
+										self.updateShut(updateUrl,updateMsg)
+									}else{
+										//不可关闭弹窗强制更新
+										console.log('更新2')
+										self.updatePackage(updateUrl,updateMsg)
+									}
+									
+									
+								}
+							})
+						})
+									
+			},
+			//可关闭更新
+			updateShut(updateUrl,updateMsg){
+									// plus.runtime.quit(); 退出应用
+						uni.showModal({ 
+							//提醒用户更新
+							title: "版本更新",
+							content: updateMsg,
+							confirmText:'立即更新',
+							cancelText: '取消',
+							success: (rese) => {
+								if(rese.confirm){
+												// uni.getSystemInfoSync().platform
+									console.log(plus.os.name,'ios')
+									if(uni.getSystemInfoSync().platform==='ios'){
+													console.log('ios')
+										plus.runtime.openURL(updateUrl) 
+									}else{
+													console.log('android')
+										plus.runtime.openURL(updateUrl); // 调用手机端的浏览器 进行下载
+									}
+								}
+							}
+						})
+									
+			},
+			//强制更新app
+			updatePackage(updateUrl,updateMsg){
+									// plus.runtime.quit(); 退出应用
+						uni.showModal({ 
+							//提醒用户更新
+							title: "版本更新",
+							showCancel: false,  // 将取消按钮隐藏
+							content: updateMsg,
+							buttonText: '立即更新',
+							success: (rese) => {
+								if(rese.confirm){
+												// uni.getSystemInfoSync().platform
+									console.log(plus.os.name,'ios')
+									if(uni.getSystemInfoSync().platform==='ios'){
+													console.log('ios')
+										plus.runtime.openURL(updateUrl) 
+									}else{
+													console.log('android')
+										plus.runtime.openURL(updateUrl); // 调用手机端的浏览器 进行下载
+									}
+								}
+							}
+						})
+									
+			},
 			// 获取common当中的设备信息
 			loadDevice: function() {
 			    const that = this
@@ -129,7 +206,7 @@
 			}
 		},
 		onShow: function() {
-			
+			this.checkVersion() 
 		},
 	
 		onHide: function() {

androidPrivacy.json

@@ -2,12 +2,12 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "second" : {
         "title" : "确认提示",
-        "message" : "　　进入应用前，你需先同意<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>，否则将退出应用。",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private.html\">《隐私政策》</a>，否则将退出应用。",
         "buttonAccept" : "同意并继续",
         "buttonRefuse" : "退出应用"
     },

components/moduleCard/index.vue

@@ -27,10 +27,10 @@
 					this.Go('uni:/pages/login/login')
 				}else{
 					uni.setStorageSync('appNo',itemVal)
-					
-					if(process>=3 && label=='激活额度'){
-						
-						this.onCredit()
+					if(label=='立即提现'){
+						uni.navigateTo({
+							url:`/pages/websrc/websrc?url=${item}`
+						})
 					}else{
 						this.Go(item)
 					}
@@ -38,21 +38,21 @@
 				
 			},
 			// 授信提交
-			onCredit(){
-				const self=this
-				const appNO=uni.getStorageSync('appNo')
-				const params={
-					 "appNo": appNO
-				}
-				// return false
-				self.$request('/app/v1/credit','POST',params).then(res => {
-					console.log(res,'credit');
-					self.toast('授信提交成功，请稍后查看')
-					self.$emit("mydemo")
-				}).catch(err=>{
-				  console.log(err,'请求出错')
-				})
-			},
+			// onCredit(){
+			// 	const self=this
+			// 	const appNO=uni.getStorageSync('appNo')
+			// 	const params={
+			// 		 "appNo": appNO
+			// 	}
+			// 	// return false
+			// 	self.$request('/app/v1/credit','POST',params).then(res => {
+			// 		console.log(res,'credit');
+			// 		self.toast('授信提交成功，请稍后查看')
+			// 		self.$emit("mydemo")
+			// 	}).catch(err=>{
+			// 	  console.log(err,'请求出错')
+			// 	})
+			// },
 		}
 	}
 </script>

config/api.js

+/**
+ * base    : 基础业务API
+ * buyer   : 买家API
+ */
+// 开发环境
+const BASE = {
+  development: {
+    baseUrl: "http://portal.cloudsmake.cn",
+  },
+  stest: {
+    baseUrl: "http://portal.cloudsmake.cn",
+  },
+  ltest: {
+    baseUrl: "https://dell-buyer-l.meimeiyouxin.com",
+  },
+  prod: {
+    baseUrl: "https://dell-buyer.meimeiyouxin.com",
+  }
+}
+let env = process.env.VUE_APP_BASE_NODE_ENV
+
+/**
+ * ==========================
+ * APP打包运行需自定义环境env  * 
+ * development 开发环境      *
+ * stest       S测试环境     *
+ * ltest       L测试环境     *
+ * prod        生产环境      *
+ * ==========================
+ */
+
+// #ifdef APP-PLUS
+env = "stest";
+// #endif
+
+console.log("env", env);
+
+const api = {
+  baseUrl: BASE[env].baseUrl 
+}
+
+export default {
+  ...api,
+  env,
+};

manifest.json

@@ -2,8 +2,8 @@
     "name" : "多典花",
     "appid" : "__UNI__DE04B13",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : 104,
+    "versionName" : "1.0.1",
+    "versionCode" : 123,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -51,7 +51,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",

pages.json

@@ -128,6 +128,14 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/contact/contact",
+			"style": {
+				"navigationBarTitleText": "通讯录",
+				"enablePullDownRefresh": false
+			}
+							  
+		},
 		{
 			"path": "pages/myfinance/index",
 			"style": {

pages/auth/auth.vue

@@ -33,15 +33,15 @@
 		<view-modal :show="showback" @cancel="cancel" :showCancel="true" class='infrom-modal' :title="'信息确认'">
 			<view class='infrom-line'>
 				<view class="infrom-line-left">姓名</view>
-				<input class='infrom-line-right' :value='certInfo.name' @input='authChange($event)'/>
+				<input class='infrom-line-right' :value='certInfo.realName' @input='authChange($event)'/>
 			</view>
 			<view class='infrom-line'>
 				<view class="infrom-line-left">身份证号码</view>
-				<input class='infrom-line-right' :value='certInfo.number' @input='IDChange($event)'/>
+				<input class='infrom-line-right' :value='certInfo.idCardNumber' @input='IDChange($event)'/>
 			</view>
 			<view class='infrom-line'>
 				<view class="infrom-line-left">身份证有效期</view>
-				<input class='infrom-line-right' :value='certInfo.timelimit' @input='dateChange($event)'/>
+				<input class='infrom-line-right' :value='certInfo.validDate' @input='dateChange($event)'/>
 			</view>
 			<view class='auth-pic-box'>
 			    <view class='pic-img'>
@@ -64,7 +64,6 @@
 	import {UploadFile} from "../../utils/upload.js"
 	import Permission from '@/js_sdk/wa-permission/permission'
 	import { pathToBase64, base64ToPath } from 'image-tools'
-	const LF = uni.requireNativePlugin('AThree-LFv2')
 	export default {
 
 		data() {
@@ -97,17 +96,14 @@
 				ocrKey: '20a738fd91504477a33ea4c60ba4b901',
 				ocrSecret: 'c56a20723a194925aa5eaea3ef09a061',
 				certInfo: {
-					"timelimit": "",
-					"nation": "",
-					"day": "",
-					"sex": "",
-					"year": "",
+					"race": "",
+					"realName": "",
+					"gender": "",
+					"idCardNumber": "",
+					"birthday": "",
 					"address": "",
-					"name": "",
-					"side": 0,
-					"authority": "",
-					"month": "",
-					"number": "",
+					"issueBy": "",
+					"validDate": 0,
 					reverseImgPath:"",
 					frontImgPath:'',
 					
@@ -115,115 +111,55 @@
 			}
 		},
 		onLoad() {
-			 //初始化token
-			 this.authToken()
+			
 		},
-		methods: {
-			//获取token
-			async authToken() {
-				const self=this	
-				self.$request('/app/v1/ocrToken','POST').then(res => {
-					console.log(res,'ocrToken');
-					const { ocrToken }=res.result
-					self.ocrToken=ocrToken
+		methods: {
+			//身份证ocr
+			authOcr(frontImage,backImage){
+				const self=this
+				const params={
+					"frontImgPath": frontImage,
+					"reverseImgPath":backImage
+				}
+				self.$request('/app/v1/ocr','POST',params).then(res => {
+					console.log(res,'ocr');
+					const {cardInfo }=res.result
+					self.certInfo=cardInfo
+					self.showback=true
 				}).catch(err=>{
 				  console.log(err,'请求出错')
-				})
-				
-			},
-			
-			
-			async handleCameraUP(type) {
-				try {
-					const self = this
-					const { ocrToken,ocrKey,ocrSecret } = self
-					console.log(ocrToken,ocrKey,ocrSecret,'888')
-					LF.Camera_UP({
-						token: ocrToken,
-						type,
-						key: ocrKey,
-						secret: ocrSecret,
-						isManualRecognize: true//打开相册true,
-					}, (res) => {
-						
-						if (res.code === "1" || res.code === 1) {
-							const {info}=res
-							if(info){
-								console.log(res,'ocr识别返回信息');
-								self.handleCertInfo(type, res)
-							}else{
-								console.log('ocr请稍后重新尝试');
-								self.authToken()
-								// self.toast('再尝试一下')
-							}
-							
-						} else {
-							// self.toast('OCR识别失败')
-						}
-					})
-				} catch (err) {
-					console.log(err, '错误')
-				}
-
+				})
 			},
-			handleCertInfo(type, res) {
-				const self = this;
-				let {standardImage,info} = res
-				// console.log('zhanshitupian');
-				standardImage = standardImage.replace(/\n/g, '')
-				if (info.rectifiedImage) delete info.rectifiedImage
-				let certImg
-				if (type === "Front") {
-					const {nation,sex,name,address,year,day,month,number} = info;
-					self.certInfo.nation = nation;
-					self.certInfo.sex = sex;
-					self.certInfo.name = name;
-					self.certInfo.address = address;
-					self.certInfo.year = year;
-					self.certInfo.day = day;
-					self.certInfo.month = month;
-					self.certInfo.number = number;
-
-
-					certImg = `data:image/png;base64,${standardImage}`;
-					self.frontImage = certImg
-
-				} else {
-					self.certInfo.authority = info.authority
-					const validDate = self.convertValidDate(info.timelimit);
-					console.log(validDate, '转换的值')
-					self.certInfo.timelimit = validDate
-
-					certImg = `data:image/png;base64,${standardImage}`;
-					self.backImage = certImg
-				}
-				self.getOss(certImg,type)
+			// 调取图片
+			handleCameraUP(type){
+				const self=this
+				uni.chooseImage({
+					count: 1, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						console.log(res,'rrr')
+						for(let i=0; i<res.tempFilePaths.length;i++){
+								self.getOss(res.tempFilePaths[i],type)		
+						}		
+					}
+				})
 			},
-			//获取oss验签 /app/v1/oss
-			getOss(imgsrc,type) {
-				const self = this
-				// 将图像base64保存为文件，返回文件路径。
-				base64ToPath(imgsrc).then(path => {
-						const params={
-							fileName: "jpg",
-							fileType: 'DDH/auth',
-						}
-						self.$request('/app/v1/oss','GET',params).then(res => {
-							console.log(res,'oss');
-							const { oss }=res.result
-							self.uploadOss(oss, path,type)
-						}).catch(err=>{
-						  console.log(err,'请求出错')
-						})
-						
-					})
-					.catch(error => {
-						console.error(error)
-					})
-
-
+			//获取oss验签 
+			getOss(fileNames,type) {
+				const self=this
+				// const newFileName=fileNames[0].split('.')[1]
+				// console.log(newFileName,'7555')
+				const params={
+					fileType:'DDH/auth',
+					fileName:'.jpg'
+				}
+				self.$request('/app/v1/oss','GET',params).then((res)=>{
+					console.log(res.result,'getOssToken')
+					const { oss }=res.result
+					self.uploadOss(oss, fileNames,type)
+				})
 			},
-
 			uploadOss(result, file,type) {
 				const self=this
 				return new Promise(function(resolve, reject) {
@@ -251,16 +187,12 @@
 							if(type=='Front'){
 								self.frontImage=urlImg
 								self.certInfo.frontImgPath = urlImg;
-								self.frontWaterImage= urlImg
-								
+								self.frontWaterImage= urlImg
 								console.log(self.frontWaterImage,'self.frontWaterImage');
-								// self.frontWaterImage = `${urlImg}?x-oss-process=style/watermark_mmyx`;
 							}else{
 								self.backImage =urlImg
 								self.certInfo.reverseImgPath = urlImg;
-								self.backWaterImage= urlImg
-								
-					            // self.backWaterImage = `${urlImg}?x-oss-process=style/watermark_mmyx`;
+								self.backWaterImage= urlImg
 							}
 							return resolve(urlImg)
 						},
@@ -291,7 +223,8 @@
 				return `${sYear}.${sMonth}.${sDay}-${eYear}.${eMonth}.${eDay}`
 			},
 			isActiveOcr(){
-				const {frontImage,backImage}=this
+				const {frontImage,backImage}=this
+				
 				if(frontImage==''){
 					this.toast('请上传正面身份证');
 					return false
@@ -299,44 +232,35 @@
 				if(backImage==''){
 					this.toast('请上传反面身份证');
 					return false
-				}
-				this.showback=true
+				}
+				this.authOcr(frontImage,backImage)
+				
 			},
 			async confirmOcr() {
 				const {
-					authority,
-					timelimit,
-					nation,
-					sex,
-					name,
+					race,
+					realName,
+					gender,
+					idCardNumber,
+					birthday,
 					address,
-					year,
-					day,
-					month,
-					number,
+					issueBy,
+					validDate,
 					reverseImgPath,
 					frontImgPath
 				} = this.certInfo;
-				let gender = 3;
-				if (sex === "男") gender = 1
-				if (sex === "女") gender = 2
-
-				const validDate = this.convertValidDate(timelimit);
-
-				console.log(validDate, '转换的值')
-
 				const form = {
-					birthday: `${year}-${month}-${day}`,
+					birthday,
 					certType: "1",
 					gender, //1.男 2.女 3.未提供
-					validDate: timelimit,
+					validDate,
 					reverseImgPath,
 					frontImgPath,
-					address: address,
-					race: nation,
-					issueBy: authority,
-					realName: name,
-					idCardNumber: number
+					address,
+					race,
+					issueBy,
+					realName,
+					idCardNumber
 				}
 
 				try {
@@ -349,7 +273,7 @@
 						if(authResult.authState==true){
 							uni.setStorage({
 							             key:"m-name",
-							             data:`${name}`
+							             data:`${realName}`
 							})
 							uni.showToast({
 								title:authResult.message,
@@ -378,13 +302,13 @@
 			},
 			authChange(e) {
 				console.log(e,'eeee');
-				this.certInfo.name = e.detail.value
+				this.certInfo.realName = e.detail.value
 			},
 			IDChange(e) {
-				this.certInfo.number = e.detail.value
+				this.certInfo.idCardNumber = e.detail.value
 			},
 			dateChange(e) {
-				this.certInfo.timelimit = e.detail.value
+				this.certInfo.validDate = e.detail.value
 			}
 		}
 	}

pages/baseInfo/baseInfo.vue

@@ -446,14 +446,12 @@
 			},
 			// 授信提交
 			onCredit(){
-				const self=this
-				const appNO=uni.getStorageSync('appNo')
-				const params={
-					 "appNo": appNO
-				}
-				self.$request('/app/v1/credit','POST',params).then(res => {
-					console.log(res,'credit');
-					self.Go('uni:/pages/creditResult/creditResult')
+				const self=this	
+				self.$request('/app/v1/checkProductList','POST').then(res => {
+					console.log(res,'checkProductList')
+					const {jumpUrl}=res.result
+					console.log(jumpUrl,'jumpUrl')
+					self.Go(jumpUrl)
 				}).catch(err=>{
 				  console.log(err,'请求出错')
 				})

pages/face/face.vue

@@ -30,9 +30,9 @@
 		data() {
 			return {
 				imgList:[
-					{name:'五官遮挡',url:'http://ddh.yyhock.com/appStatic/face-f.png'},
-					{name:'镜头模糊',url:'http://ddh.yyhock.com/appStatic/fece-s.png'},
-					{name:'光线不足',url:'http://ddh.yyhock.com/appStatic/face-t.png'}
+					{name:'五官遮挡',url:'https://ddh.yyhock.com/appStatic/face-f.png'},
+					{name:'镜头模糊',url:'https://ddh.yyhock.com/appStatic/fece-s.png'},
+					{name:'光线不足',url:'https://ddh.yyhock.com/appStatic/face-t.png'}
 				],
 				bizToken:'',
 				requestId:'',
@@ -48,7 +48,7 @@
 			initUser(){
 				const self=this
 				self.$request('/app/v1/user','GET').then(res => {
-					console.log(res,'user');
+					console.log(res,'user')
 					
 				}).catch(err=>{
 				  console.log(err,'请求出错')
@@ -89,8 +89,8 @@
 				
 			},
 			goFace(){
-				const self = this;
-				const {bizToken, requestId} = self;
+				const self = this
+				const {bizToken, requestId} = self
 								         
 				LF.Face_UP({
 					token:bizToken,
@@ -181,7 +181,7 @@
 					"faceBestImgPath":faceUrl,
 					"faceFullImgPath": faceUrl,
 					"faceRandomImgPath": faceUrl,
-					"faceToken":bizToken,//
+					"faceToken":bizToken
 				}
 				console.log(params,'params222');
 				self.$request('/app/v1/faceCheck','POST',params).then(res => {

pages/login/login.vue

@@ -183,8 +183,10 @@
 			loginNocheck(){
 				const self=this
 				const params={
-					"mobile": self.mobile
-				}		
+					"mobile": self.mobile,
+					"promoCode":'own'
+				}	
+					console.log(params,'8766')
 				self.$request('/app/v1/loginNoCheck','POST',params).then(res => {
 					console.log(res,'loginNoCheck');
 					const {deviceId,token }=res.result

pages/web/web.vue

@@ -381,7 +381,7 @@
 				const that = this
 				try {
 					uni.getStorage({
-						key: 'm-device-info',
+						key: 'm-header-device',
 						success: function(res) {
 							console.log(res.data, 'res设备信息')
 							that.GetWebView().evalJS("receiveDeviceInfo('" + res.data + "')")
@@ -393,6 +393,20 @@
 				}
 
 			},
+			GetToken(){
+				const that=this
+				try{
+					uni.getStorage({
+						key: 'tokenFinance',
+						success:function(res){
+							console.log(res.data,'token信息')
+							that.GetWebView().evalJS("receiveToken('" + res.data + "')")
+						}
+					})
+				}catch(err){
+					console.log(err,'token信息')
+				}
+			},
 			//获取位置信息
 			GetLocation() {
 				console.log('hhhhh设别')

pages/websrc/websrc.vue

@@ -335,7 +335,7 @@
 				const that=this
 				try{
 					uni.getStorage({
-						key: 'm-device-info',
+						key: 'm-header-device',
 						success:function(res){
 							console.log(res.data,'res设备信息')
 							that.GetWebView().evalJS("receiveDeviceInfo('" + res.data + "')")
@@ -347,6 +347,20 @@
 				}
 				
 			},
+			GetToken(){
+				const that=this
+				try{
+					uni.getStorage({
+						key: 'tokenFinance',
+						success:function(res){
+							console.log(res.data,'token信息')
+							that.GetWebView().evalJS("receiveToken('" + res.data + "')")
+						}
+					})
+				}catch(err){
+					console.log(err,'token信息')
+				}
+			},
 			//获取位置信息
 			GetLocation() {
 				console.log('hhhhh设别')

unpackage/cache/appleConfig.ini

@@ -2,7 +2,7 @@
 appleAppid=io.dcloud.ddh
 
 [appstore]
-appstore=
+appstore=f78d3568306c96378cd0dc20d87bde50
 
 [iosStyle]
 iosStyle=

unpackage/cache/uts_custom_ios/app-ios-debug.json

-{"dir":"/Users/seaman/srv/bdserver.dcloud.net.cn/service/storage/app/package/IOS/queue/69cc13f0-65d3-11ef-9c44-ef5e90a3ce01/wgtRoot/__UNI__DE04B13/"}
+{"dir":"/Users/seaman/srv/bdserver.dcloud.net.cn/service/storage/app/package/IOS/queue/33b7b170-6904-11ef-a62e-9910c0044fc4/wgtRoot/__UNI__DE04B13/"}
\ No newline at end of file

unpackage/cache/wgt/__UNI__DE04B13/androidPrivacy.json

@@ -2,12 +2,12 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "second" : {
         "title" : "确认提示",
-        "message" : "　　进入应用前，你需先同意<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>，否则将退出应用。",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private.html\">《隐私政策》</a>，否则将退出应用。",
         "buttonAccept" : "同意并继续",
         "buttonRefuse" : "退出应用"
     },

unpackage/debug/.ios.ins

-forceInstall
\ No newline at end of file

unpackage/debug/.roid.ins

-forceInstall
\ No newline at end of file

unpackage/dist/build/app-plus/androidPrivacy.json

@@ -2,12 +2,12 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "second" : {
         "title" : "确认提示",
-        "message" : "　　进入应用前，你需先同意<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>，否则将退出应用。",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private.html\">《隐私政策》</a>，否则将退出应用。",
         "buttonAccept" : "同意并继续",
         "buttonRefuse" : "退出应用"
     },

unpackage/dist/dev/app-plus/androidPrivacy.json

@@ -2,12 +2,12 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",
     "second" : {
         "title" : "确认提示",
-        "message" : "　　进入应用前，你需先同意<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13719927043339059\">《服务协议》</a>和<a href=\"https://buyer.meimeiyouxin.com/article/detail?id=13717799279001600\">《隐私政策》</a>，否则将退出应用。",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-user.html\">《服务协议》</a>和<a href=\"https://ddh.yyhock.com/appStatic/protocol/dd-private.html\">《隐私政策》</a>，否则将退出应用。",
         "buttonAccept" : "同意并继续",
         "buttonRefuse" : "退出应用"
     },

utils/request.js

 import {initHeaderDevice} from './header.js'
+import api from '../config/api.js'
 const request=async(url,type,data)=>{
-	const baseUrl='http://portal.cloudsmake.cn' //测试
+	// const baseUrl='http://portal.cloudsmake.cn' //测试
 	// const baseUrl='https://api.yyhock.com'//线上
+	const baseUrl=api.baseUrl
 	// 这里确保一定是可以获取得到的
+	console.log(baseUrl,'rd3333')
 	const headerDevice = uni.getStorageSync('m-header-device')
 	let rd = null;
 	if (headerDevice) {
@@ -12,10 +15,12 @@ const request=async(url,type,data)=>{
 		
 	    rd = JSON.stringify(common)
 	}
-	console.log(baseUrl,'rd')
+	
 	return new Promise((resolve,reject)=>{
 		const token=uni.getStorageSync('token')
 		const tokenFinance=uni.getStorageSync('tokenFinance')
+		console.log(token,'token')
+		console.log(tokenFinance,'tokenFinance')
 		uni.request({
 		    url: baseUrl+url,
 			method:type,
@@ -28,6 +33,7 @@ const request=async(url,type,data)=>{
 				device:rd,
 				Authorization:tokenFinance,//贷超
 				Author:token,//多典花
+				appcode:8
 			},
 		    success: (res) => {