Prechádzať zdrojové kódy

添加loading页面,清除开发打印信息

nanMing 1 rok pred
rodič
commit
159f2eb5ba

+ 3 - 9
App.vue

@@ -4,9 +4,7 @@
 		getToken
 	} from '@/common/auth.js'
 	export default {
-		onLoad(e) {
-			console.log("wwwww",e);
-		},
+		onLoad(e) {},
 		onLaunch: function() {
 			if (getToken()) {
 				// uni.reLaunch({
@@ -21,12 +19,8 @@
 			// routingIntercept()
 			console.log('App Launch')
 		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
+		onShow: function() {},
+		onHide: function() {	}
 	}
 </script>
 

+ 0 - 4
api/upload.js

@@ -24,12 +24,10 @@ export function UploadOne(file, formData = {}) {
 				formData: formData,
 				header: header,
 				success: (res) => {
-					console.log(res)
 					let r = JSON.parse(res.data)
 					resolve(r)
 				},
 				fail: (err) => {
-					console.log(err)
 					uni.showToast({
 						title: '服务器休息中,请稍后再试',
 						icon: "none",
@@ -71,12 +69,10 @@ export function UploadSomeFile(file, formData = {}) {
 				formData: formData,
 				header: header,
 				success: (res) => {
-					console.log(res)
 					let r = JSON.parse(res.data)
 					resolve(r)
 				},
 				fail: (err) => {
-					console.log(err)
 					uni.showToast({
 						title: '服务器休息中,请稍后再试',
 						icon: "none",

+ 0 - 4
common/baiduUtil.js

@@ -38,7 +38,6 @@ export function idcard(path, token, type, callback) {
 			'Content-Type': 'application/x-www-form-urlencoded'
 		},
 		success: (res) => {
-			// console.log("wwwwwww",res);
 			callback(res.data)
 		}
 	})
@@ -54,7 +53,6 @@ export function match(token, face1, face2, callback) {
 		image: face2,
 		image_type: 'BASE64'
 	}]
-	console.log("人脸对比:", data)
 	uni.request({
 		url: '/baiduApi/rest/2.0/face/v3/match?access_token=' + token,
 		data: data,
@@ -102,7 +100,6 @@ export function faceAdd(token, face, groupId, user_id, callback) {
 		user_id: user_id,
 		action_type: 'REPLACE', // 操作方式 APPEND: 当user_id在库中已经存在时,对此user_id重复注册时,新注册的图片默认会追加到该user_id下 REPLACE : 当对此user_id重复注册时,则会用新图替换库中该user_id下所有图片 默认使用APPEND
 	}
-	console.log("人脸注册:", data)
 	uni.request({
 		url: '/baiduApi/rest/2.0/face/v3/faceset/user/add?access_token=' + token,
 		data: data,
@@ -129,7 +126,6 @@ export function faceSearch(token, face, groupId, callback) {
 		match_threshold: config.score,
 		max_user_num: 50
 	}
-	console.log("人脸搜索:", data)
 	uni.request({
 		url: '/baiduApi/rest/2.0/face/v3/search?access_token=' + token,
 		data: data,

+ 1 - 7
common/image.js

@@ -9,7 +9,6 @@ export function translateapp(img, scale, callback) {
 
 	plus.io.resolveLocalFileSystemURL(img, (entry) => { //通过URL参数获取目录对象或文件对象
 		entry.file((file) => { // 可通过entry对象操作图片 
-			console.log('压缩前图片信息:' + JSON.stringify(file)); //压缩前图片信息
 			if (file.size > 504800) { //   如果大于500Kb进行压缩
 				plus.zip.compressImage({ // 5+ plus.zip.compressImage 了解一下,有详细的示例
 					src: img, //src: 压缩原始图片的路径    
@@ -22,7 +21,6 @@ export function translateapp(img, scale, callback) {
 					overwrite: true, //overwrite: (Boolean 类型 )覆盖生成新文件
 					// format:'jpg'   //format: (String 类型 )压缩转换后的图片格式
 				}, (event) => {
-					console.log('压缩后图片信息:' + JSON.stringify(event));
 					//返回压缩后的图片路径
 					callback(event.target);
 				}, function(err) {
@@ -54,7 +52,6 @@ export function translate(imgSrc, scale, type, callback) {
 		let yasuobi = 700 / that.width
 		let h = that.height * yasuobi;
 		let w = that.width * yasuobi;
-		console.log("宽高", w, h, yasuobi);
 		var canvas = document.createElement('canvas');
 		var ctx = canvas.getContext('2d');
 		var width = document.createAttribute("width");
@@ -93,7 +90,6 @@ export function translate1(imgSrc, scale, type, callback) {
 		let yasuobi = 700 / that.width
 		let h = that.height * yasuobi;
 		let w = that.width * yasuobi;
-		console.log("宽高", w, h, yasuobi);
 		var canvas = document.createElement('canvas');
 		var ctx = canvas.getContext('2d');
 		var width = document.createAttribute("width");
@@ -112,7 +108,6 @@ export function translate1(imgSrc, scale, type, callback) {
 			uni.getFileInfo({
 				filePath: blobUrl,
 				success: (res) => {
-					console.log(res);
 					let size = res.size
 					let scale = 1
 					if (size / 1024 / 1024 > 0.12) {
@@ -123,7 +118,7 @@ export function translate1(imgSrc, scale, type, callback) {
 					}
 				},
 				fail: (err) => {
-					console.log("err:", err);
+					console.log(err);
 				}
 			})
 
@@ -136,7 +131,6 @@ export function translate1(imgSrc, scale, type, callback) {
 			uni.getFileInfo({
 				filePath: blobUrl,
 				success: (res) => {
-					console.log(res);
 					let size = res.size
 					let scale = 1
 					if (size / 1024 / 1024 > 0.12) {

+ 67 - 71
common/request.js

@@ -1,9 +1,9 @@
 import {
-	getToken,
-	setToken
+  getToken,
+  setToken
 } from './auth.js'
 import {
-	toast
+  toast
 } from './common.js'
 import config from '../config.js'
 
@@ -11,78 +11,74 @@ import config from '../config.js'
 const BASE_URL = ''
 
 const request = config => {
-	config.header = config.header || {
-		'content-type': 'application/json',
-		'cache-control': 'no-cache',
-		'Access-Control-Allow-Headers': 'appId',
-		'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
-		'Access-Control-Max-Age': 86400,
-	}
-	let isRequest = true
-	if (getToken()) {
-		config.header['Authorization'] = 'Bearer ' + getToken()
-	}
-	uni.hideKeyboard()
-	console.log("入参:", config, BASE_URL + config.url)
-	if (isRequest) {
-		return new Promise((resolve, reject) => {
-			uni.request({
-				header: config.header,
-				method: config.method.toUpperCase() || 'GET',
-				dataType: 'json',
-				timeout: config.timeout || 30000,
-				url: BASE_URL + config.url,
-				data: config.data,
-			}).then((res) => {
-				console.log("请求返回:", res)
-				if (res.statusCode === 200) {
-					const {
-						code,
-						msg
-					} = res.data
+  config.header = config.header || {
+    'content-type': 'application/json',
+    'cache-control': 'no-cache',
+    'Access-Control-Allow-Headers': 'appId',
+    'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
+    'Access-Control-Max-Age': 86400,
+  }
+  let isRequest = true
+  if (getToken()) {
+    config.header['Authorization'] = 'Bearer ' + getToken()
+  }
+  uni.hideKeyboard()
+  if (isRequest) {
+    return new Promise((resolve, reject) => {
+      uni.request({
+        header: config.header,
+        method: config.method.toUpperCase() || 'GET',
+        dataType: 'json',
+        timeout: config.timeout || 30000,
+        url: BASE_URL + config.url,
+        data: config.data,
+      }).then((res) => {
+        if (res.statusCode === 200) {
+          const {
+            code,
+            msg
+          } = res.data
 
-					if (code === 401) {
-						uni.hideLoading()
-						uni.showModal({
-							title: '系统提示',
-							content: '登录状态已过期,请重新登录',
-							showCancel: false,
-							success: function(res) {
-								if (res.confirm) {
-									uni.reLaunch({
-										url: '/pages/login/index'
-									})
-								}
-							}
-						});
-					} else if (code !== 200) {
-						toast(msg)
-						reject(code)
-					}
+          if (code === 401) {
+            uni.hideLoading()
+            uni.showModal({
+              title: '系统提示',
+              content: '登录状态已过期,请重新登录',
+              showCancel: false,
+              success: function(res) {
+                if (res.confirm) {
+                  uni.reLaunch({
+                    url: '/pages/login/index'
+                  })
+                }
+              }
+            });
+          } else if (code !== 200) {
+            toast(msg)
+            reject(code)
+          }
 
-					resolve(res.data)
-				} else {
-					toast('未知错误,请反馈给管理员')
-				}
-			}).catch(error => {
-				console.log("error", error)
-				let {
-					message
-				} = error
-				if (message === 'Network Error') {
-					message = '后端接口连接异常'
-				} else if (message.includes('timeout')) {
-					message = '系统接口请求超时'
-				} else if (message.includes('Request failed with status code')) {
-					message = '系统接口' + message.substr(message.length - 3) + '异常'
-				}
+          resolve(res.data)
+        } else {
+          toast('未知错误,请反馈给管理员')
+        }
+      }).catch(error => {
+        console.log(error)
+        let { message } = error
+        if (message === 'Network Error') {
+          message = '后端接口连接异常'
+        } else if (message.includes('timeout')) {
+          message = '系统接口请求超时'
+        } else if (message.includes('Request failed with status code')) {
+          message = '系统接口' + message.substr(message.length - 3) + '异常'
+        }
 
-				toast(message)
-				reject(error)
-			})
-		})
+        toast(message)
+        reject(error)
+      })
+    })
 
-	}
+  }
 
 
 }

+ 1 - 3
components/lzc-OCR/lzc-OCR.vue

@@ -60,7 +60,6 @@
 				uni.getFileInfo({
 					filePath: blobUrl,
 					success: (res) => {
-						console.log("身份证压缩:", res, res.size / 1024);
 						this.size = res.size / 1024 / 1024
 						let size = res.size
 						let scale = 1
@@ -73,7 +72,7 @@
 						}
 					},
 					fail: (err) => {
-						console.log("err:", err);
+						console.log(err);
 					}
 				})
 			},
@@ -118,7 +117,6 @@
 					},
 					success: (res) => {
 						uni.hideLoading()
-						console.log(res,res.data, this.bSrc)
 						this.$emit('end', res.data, this.bSrc)
 					}
 				})

+ 0 - 1
components/my-file/my-file.vue

@@ -32,7 +32,6 @@
 			'zczmList': {
 				immediate: true,
 				handler(newItems, oldItems) {
-					console.log('数组发生变化', newItems, oldItems);
 					this.zczm = []
 					newItems.forEach(e => {
 						this.zczm.push({

+ 1 - 1
config.js

@@ -4,7 +4,7 @@ const build = {
 	// "service" : "http://10.16.4.5/dev-api",
 	// "baseUrl": "http://121.36.73.159:810",
 	"baseUrl": "",
-	"redirectUrl": "https://www.ccsckj.com/#/pages/lr/list?id=",
+	"redirectUrl": "https://www.ccsckj.com/h5/#/pages/loading/loading?id=",
 	"head": "/uploadPath/2024/01/16/profile.png",
 	"appid": "wxeb15ff6b40432045",
 	"score": 70,

+ 13 - 28
pages/index/index.vue

@@ -39,6 +39,8 @@
               </template>
             </uni-list-item>
           </uni-list>
+
+          <button @click="loading()">loading</button>
         </uni-section>
       </uni-card>
     </view>
@@ -47,28 +49,17 @@
 </template>
 
 <script>
-  import {
-    getToken,
-    getUser
-  } from '@/common/auth.js'
-  import {
-    decryptRowData_ECB,
-    decryptData_ECB
-  } from '@/common/sm4.js'
-  import {
-    updateKhjbxx,
-    infoKhjbxx,
-    ListKhjbxx,
-    ListKhShxx
-  } from '@/api/kh.js'
+  import { getToken, getUser } from '@/common/auth.js'
+  import { decryptRowData_ECB, decryptData_ECB } from '@/common/sm4.js'
+  import { updateKhjbxx, infoKhjbxx, ListKhjbxx, ListKhShxx } from '@/api/kh.js'
 
   export default {
     data() {
       return {
         interval: 3000,
-        bannerList: [{
-          image: '../../static/image/banner2.png'
-				}],
+        bannerList: [
+          { image: '../../static/image/banner2.png' }
+        ],
         lrInfo: {},
         // 人员信息
         userInfo: {},
@@ -95,18 +86,12 @@
       this.getDaiBanList()
     },
     methods: {
+      loading(){
+        uni.navigateTo({
+        	url: '/pages/loading/loading?id=730771'
+        });
+      },
       getDaiBanList() {
-        // ListKhjbxx(this.form).then(res => {
-        // 	if (res.code == 200) {
-        // 		this.total = res.total
-        // 		let list = decryptRowData_ECB(res.rows, ["lrZjhm", "lrXm", "lrHjbcxx", "lrXjdzBcxx",
-        // 			"lrCydh", "lrPoxm", "lrPoZjmh", "jhrXm", "jhrSjhm", "zlrXm", "zlrDh", "cjzh",
-        // 			"yhzh", "khmc"
-        // 		], [2, 1, 4, 4, 3, 1, 2, 1, 2, 1, 3, 5, 5, 5])
-        // 		if (list) this.dataList.push(...list)
-        // 	}
-        // })
-
         ListKhShxx(this.form).then(res => {
           if (res.code == 200) {
             this.total = res.total

+ 2 - 5
pages/info/add-files.vue

@@ -132,7 +132,7 @@
   import { setToken, setOpenid, getOpenid, setUser } from '@/common/auth.js'
   import { getAccessToken, idcard, match } from '@/common/baiduUtil.js'
   import { updateKhjbxx, infoKhjbxx, GetLrByZjhm, SaveKhjbxx, YlhtUpdate, CheckReturn, GetUrl } from '@/api/kh.js'
-  
+
   export default {
     components: {
       myfile
@@ -618,9 +618,7 @@
           url: '/pages/info/card'
         })
       },
-      onchange(e) {
-        console.log("onchange", e);
-      },
+      onchange(e) { },
       onnodeclick(node) {
         this.groupId = node.code.substring(0, 6)
         this.baseFormData.lrHjdz = this.groupId + '000000'
@@ -784,7 +782,6 @@
                         }
                         GetUrl(param).then(res => {
                           if (res.code == 200) {
-                            console.log(res);
                             window.open(res.data.url, '_self');
                           } else {
                             toast('该功能暂未开放')

+ 1 - 5
pages/info/add.vue

@@ -388,7 +388,6 @@
 				if (!this.cardType) {
 					this.cardType = uni.getStorageSync("cardType")
 				}
-				console.log(words, this.cardType);
 				if (this.cardType == 'front') {
 					if (!words) {
 						showConfirm('请上传正确的身份证人像面')
@@ -504,7 +503,6 @@
 					// 	GetLrByZjhm({
 					// 		lrJmzjhm: this.idcardMD5
 					// 	}).then(res => {
-					// 		console.log(res);
 					// 		if (res.data) {
 					// 			showConfirm('该信息已存在,请登录').then(res => {
 					// 				if (res.confirm == true) {
@@ -598,9 +596,7 @@
 					url: '/pages/info/card'
 				})
 			},
-			onchange(e) {
-				console.log("onchange", e);
-			},
+			onchange(e) {},
 			onnodeclick(node) {
 				this.groupId = node.code.substring(0, 6)
 				this.baseFormData.lrHjdz = this.groupId + '000000'

+ 0 - 1
pages/living/check.vue

@@ -34,7 +34,6 @@
 				}
 				GetUrl(param).then(res => {
 					if (res.code == 200) {
-						console.log("wwwwwwwwwwwww",res.data.url);
 						window.open(res.data.url, '_self');
 					} else {
 						toast('该功能暂未开放')

+ 30 - 8
pages/loading/loading.vue

@@ -1,7 +1,9 @@
 <template>
   <view>
-    <view class="count-down">
-      {{countDown}}
+    <view class="count-wrap">
+      <view class="count-down">
+        {{countDown}}
+      </view>
     </view>
   </view>
 </template>
@@ -11,17 +13,18 @@
     data() {
       return {
         timer: null,
-        countDown: 5,
+        countDown: 3,
       }
     },
-    created() {
+    onLoad(options) {
+      const { id } = options
       this.timer = setInterval(() => {
         if (this.countDown > 0) {
           this.countDown--
         } else {
           clearInterval(this.timer)
           uni.reLaunch({
-            url: '/pages/lr/list',
+            url: '/pages/lr/list?id=' + id,
           })
         }
       }, 1000)
@@ -33,19 +36,38 @@
 </script>
 
 <style lang="scss" scoped>
-  .count-down {
+  .count-wrap {
     position: absolute;
     top: 40%;
     left: 50%;
     transform: translateX(-50%);
+  }
+
+  .count-down {
+
     height: 150rpx;
     line-height: 150rpx;
     width: 150rpx;
-    border: 2px dashed orange;
+    border: 2px dashed #01c362;
     border-radius: 50%;
     text-align: center;
     font-size: 100rpx;
     font-weight: bold;
-    color: orange;
+    color: #01c362;
+    animation: zoom 1s linear infinite;
+  }
+
+  @keyframes zoom {
+    0% {
+      transform: scale(1.4);
+    }
+
+    50% {
+      transform: scale(1.2);
+    }
+
+    100% {
+      transform: scale(1);
+    }
   }
 </style>

+ 5 - 16
pages/login/index.vue

@@ -93,12 +93,12 @@
 				formData: {
 					// username: 'lrry220103000000',
 					// password: 'sckj12356',
-					username: '',
-					password: '',
+					// username: '',
+					// password: '',
 					// code: "081X2kll21UGPc4HRlml27WxeO3X2kl6",
 					code: "",
-					// username: '15143018068',
-					// password: 'sckj12356',
+					username: '15143018068',
+					password: 'sckj12356',
 					openid: "",
 				},
 				rules: {
@@ -149,7 +149,6 @@
 		},
 		methods: {
 			radioChange(e) {
-				console.log("123", e);
 				this.protocol = !this.protocol
 			},
 			openUsername() {
@@ -182,14 +181,11 @@
 			},
 			change(e) {
 				this.formData.password += e
-				console.log('change', e)
 			},
 			confirm(e) {
-				console.log('confirm', e)
 			},
 			backspace(e) {
 				this.formData.password = this.formData.password.substring(0, this.formData.password.length - 1)
-				console.log('backspace', e)
 			},
 			changeCarInputMode(e) {
 				this.title = e;
@@ -197,11 +193,8 @@
 			open() {
 				uni.hideKeyboard()
 				this.$refs.keyb._keyShow();
-				console.log("打开");
-			},
-			close() {
-				console.log("关闭");
 			},
+			close() {},
 			register() {
 				if (!this.protocol) {
 					let ele = document.getElementById('protocol')
@@ -220,7 +213,6 @@
 			},
 			getCode(appid) { // 非静默授权,第一次有弹框
 				let local = window.location.href; // 获取页面url
-				console.log("local:", local, appid)
 				let code = this.getUrlCode().code; // 截取code
 				if (code && code !== '') { // 如果有code
 					// 拿到code去请求openId并存在本地 ?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code
@@ -238,17 +230,14 @@
 			},
 			getUrlCode() { // 截取url中的code方法
 				let url = location.search;
-				console.log("utl:", url)
 				let theRequest = {};
 				if (url.indexOf("?") !== -1) {
-					console.log("utl1:", url)
 					let str = url.substr(1);
 					let strs = str.split("&");
 					for (let i = 0; i < strs.length; i++) {
 						theRequest[strs[i].split("=")[0]] = (strs[i].split("=")[1])
 					}
 				}
-				console.log("theRequest:", theRequest)
 				return theRequest
 			},
 			to() {

+ 1 - 16
pages/lr/base.vue

@@ -227,7 +227,6 @@
 					image: idcardFace,
 					image_type: 'BASE64'
 				}]
-				console.log("人脸对比:", data)
 				uni.request({
 					url: '/baiduApi/rest/2.0/face/v3/match?access_token=' + this.token,
 					data: data,
@@ -236,7 +235,6 @@
 						'Content-Type': 'application/json'
 					},
 					success: (res) => {
-						console.log('对比', res);
 						if (res.data.error_msg == 'SUCCESS') {
 							this.score = res.data.result.score;
 
@@ -274,7 +272,6 @@
 
 					},
 					error: (err) => {
-						console.log("对比失败,", err);
 						uni.hideLoading()
 					}
 				})
@@ -310,7 +307,6 @@
 					user_id: this.idcardMD5,
 					action_type: 'REPLACE', // 操作方式 APPEND: 当user_id在库中已经存在时,对此user_id重复注册时,新注册的图片默认会追加到该user_id下 REPLACE : 当对此user_id重复注册时,则会用新图替换库中该user_id下所有图片 默认使用APPEND
 				}
-				console.log("人脸注册:", data)
 				uni.request({
 					url: '/baiduApi/rest/2.0/face/v3/faceset/user/add?access_token=' + this.token,
 					data: data,
@@ -319,7 +315,6 @@
 						'Content-Type': 'application/json'
 					},
 					success: (res) => {
-						console.log("人脸注册:", res);
 						uni.hideLoading()
 						if (res.data.error_msg != 'SUCCESS') {
 							showConfirm(res.data.error_msg)
@@ -340,7 +335,6 @@
 					match_threshold: config.score,
 					max_user_num: 50
 				}
-				console.log("人脸搜索:", data)
 				uni.request({
 					url: '/baiduApi/rest/2.0/face/v3/search?access_token=' + this.token,
 					data: data,
@@ -349,11 +343,9 @@
 						'Content-Type': 'application/json'
 					},
 					success: (res) => {
-						console.log("人脸搜索:", res)
 						if (res.data.error_msg == 'SUCCESS') {
 							// this.isSearch = true
 							if (res.data.result.user_list.length < 1) {
-								console.log("人脸不存在");
 								this.createGroup()
 							} else {
 								if (res.data.result.user_list[0].score >= config.score) {
@@ -409,17 +401,14 @@
 						})
 						this.$refs['baseForm'].validate().then(res => {
 							UploadOne(this.baseFormData.prelrZjz, {}).then(re => {
-								console.log("re", re)
 								this.baseFormData.lrZjz = re.data.url
 								UploadOne(this.src, {}).then(re => {
-									console.log("re", re)
 									this.baseFormData.lrTx = re.data.url
 									if (this.userInfo.userType == '07') this.baseFormData.id = this
 										.userInfo.userId
 
 									if (this.updateFlag) {
 										updateKhjbxx(this.baseFormData).then(r => {
-											console.log("r:", r)
 											uni.hideLoading()
 											if (r.code == 200) {
 												toast('保存成功')
@@ -432,7 +421,6 @@
 										})
 									} else {
 										SaveKhjbxx(this.baseFormData).then(r => {
-											console.log("r:", r)
 											uni.hideLoading()
 											if (r.code == 200) {
 												toast('保存成功')
@@ -452,7 +440,6 @@
 							})
 						}).catch(err => {
 							uni.hideLoading()
-							console.log(err);
 						})
 					} else {
 						showConfirm('请重新采集人像')
@@ -489,7 +476,6 @@
 				uni.getFileInfo({
 					filePath: blobUrl,
 					success: (res) => {
-						console.log(res);
 						let size = res.size
 						let scale = 1
 						if (size / 1024 / 1024 > 0.9) {
@@ -502,7 +488,7 @@
 						}
 					},
 					fail: (err) => {
-						console.log("err:", err);
+						console.log(err);
 					}
 				})
 			},
@@ -561,7 +547,6 @@
 					GetLrByZjhm({
 						lrJmzjhm: this.idcardMD5
 					}).then(res => {
-						console.log(res);
 						if (res.data) this.baseFormData = decryptData_ECB(res.data, ["lrZjhm", "lrXm", "lrHjbcxx",
 							"lrXjdzBcxx",
 							"lrCydh", "lrPoxm", "lrPoZjmh", "jhrXm", "jhrSjhm", "zlrXm", "zlrDh", "cjzh",

+ 4 - 15
pages/lr/eat.vue

@@ -166,10 +166,7 @@
 				}
 				this.formData.yhje = this.formData.ycje - this.formData.zhj
 				this.formData.ssqh = this.userInfo.dept.locationCode
-				SaveYcxx(this.formData).then(res => {
-					console.log(res);
-
-				})
+				SaveYcxx(this.formData).then(res => {})
 			},
 			jg(e) {
 				// 0套餐 1现金
@@ -179,13 +176,12 @@
 				} else {
 					this.formData.jg = this.formData.ycje
 				}
-				console.log(e);
+
 				uni.showLoading({
 					title: '计算价格中...'
 				})
 				GetJg(this.formData).then(res => {
 					uni.hideLoading()
-					console.log(res);
 					this.formData.zhj = res.data.jg
 				})
 			},
@@ -259,7 +255,6 @@
 							dj: e.dj,
 						})
 					})
-					console.log(this.tcOptions);
 				})
 			},
 			takePhoto() {
@@ -280,10 +275,7 @@
 						translate(res.tempFilePaths[0], scale, 'blob', this.setSrc)
 					},
 					fail: (err) => {
-						console.log("err", err);
-					},
-					complete: (e) => {
-						console.log("wancheng1", e);
+						console.log(err);
 					}
 				})
 			},
@@ -292,7 +284,6 @@
 				uni.getFileInfo({
 					filePath: blobUrl,
 					success: (res) => {
-						console.log(res);
 						let size = res.size
 						let scale = 1
 						if (size / 1024 / 1024 > 0.4) {
@@ -305,7 +296,7 @@
 						}
 					},
 					fail: (err) => {
-						console.log("err:", err);
+						console.log(err);
 					}
 				})
 			},
@@ -348,7 +339,6 @@
 					match_threshold: config.score,
 					max_user_num: 50
 				}
-				console.log("人脸搜索:", data)
 				uni.request({
 					url: '/baiduApi/rest/2.0/face/v3/search?access_token=' + this.token,
 					data: data,
@@ -357,7 +347,6 @@
 						'Content-Type': 'application/json'
 					},
 					success: (res) => {
-						console.log("人脸搜索:", res)
 						if (res.data.error_msg == 'SUCCESS') {
 							// this.isSearch = true
 							if (res.data.result.user_list.length < 1) {

+ 0 - 1
pages/lr/face.vue

@@ -16,7 +16,6 @@
 		},
 		onLoad(e) {
 			GetUrl(JSON.parse(e.url)).then(res => {
-				console.log("1111111", res);
 				if (res.code == 200) {
 					this.src = res.data.url
 				} else {

+ 2 - 17
pages/lr/info.vue

@@ -312,7 +312,6 @@
           url: 'https://www.ccsckj.com/'
         }
         GetUrl(param).then(res => {
-          console.log("1111111", res);
           if (res.code == 200) {
             window.open(res.data.url, '_self');
           } else {
@@ -341,16 +340,12 @@
                     if (ee.code == this.baseFormData.lrHjdz) {
                       this.shequValue = ee
                       this.jiedaoValue = e
-                      this.diqu = this.jiedaoValue
-                        .label +
-                        '/' + this.shequValue.label
-                      console.log("4444444444444");
+                      this.diqu = this.jiedaoValue.label + '/' + this.shequValue.label
                     }
                   } else {
                     if (e.code == this.baseFormData.lrHjdz) {
                       this.jiedaoValue = e
                       this.diqu = this.jiedaoValue.label
-                      console.log("333333333333");
                     }
                   }
 
@@ -393,7 +388,6 @@
               this.diqu = this.jiedaoValue.label
               this.baseFormData.lrHjdz = this.shequValue.code
             }
-            console.log("2222222222222");
             if (this.id) this.showInfo(this.id)
           }
         })
@@ -447,9 +441,7 @@
         this.$refs.popup.open(type)
       },
       bindChange(e) {
-        console.log(e.detail.value);
         if (e.detail.value.length == 1) {
-          console.log("11111111111111");
           this.jiedaoValue = this.jiedaoData[e.detail.value[0]]
           this.shequData = this.jiedaoData[e.detail.value[0]].children
           if (this.shequData.length > 0 && this.shequData[0] != null) {
@@ -469,11 +461,6 @@
           this.shequValue = this.shequData[e.detail.value[1]]
           this.diqu = this.jiedaoValue.label + '/' + this.shequValue.label
           this.baseFormData.lrHjdz = this.shequValue.code
-
-          console.log(index, e.detail.value[1], this.jiedaoValue, this.shequValue, this.diqu, this
-            .baseFormData.lrHjdz);
-
-          // this.diqu = "1111"
         }
 
       },
@@ -502,9 +489,7 @@
           url: '/pages/info/card'
         })
       },
-      onchange(e) {
-        console.log("onchange", e);
-      },
+      onchange(e) {},
       onnodeclick(node) {
         this.groupId = node.code.substring(0, 6)
         this.baseFormData.lrHjdz = this.groupId + '000000'

+ 13 - 22
pages/lr/list.vue

@@ -47,7 +47,7 @@
     getToken,
     getUser
   } from '@/common/auth.js'
-  import { ListKhjbxx, GetUrl,CheckReturn } from '@/api/kh.js'
+  import { ListKhjbxx, GetUrl, CheckReturn } from '@/api/kh.js'
   import {
     decryptRowData_ECB
   } from '@/common/sm4.js'
@@ -74,30 +74,23 @@
         total: 0,
       }
     },
-    mounted() {
-  
-    },
-    created() {},
     onLoad: function(options) {
-		console.log("老人",options);
-		if(options.id){
-			this.form.pageNum = 1
-			this.form.pageSize = 10
-			this.form.id = options.id
-			
-			// CheckReturn({ ylid: options.id })
-			
-		}
-		this.userInfo = getUser()
-		if (this.userInfo.userType != '07') {
-		  this.form.createUserId = this.userInfo.userId
-		}
-		this.getList()
+      if (options.id) {
+        this.form.pageNum = 1
+        this.form.pageSize = 10
+        this.form.id = options.id
+      }
+      this.userInfo = getUser()
+      if (this.userInfo.userType != '07') {
+        this.form.createUserId = this.userInfo.userId
+      }
+      this.getList()
     },
     onPullDownRefresh() {
       this.dataList = []
       this.form.pageNum = 1
       this.form.pageSize = 10
+      this.form.id = null
       this.getList()
     },
     onReachBottom() {
@@ -110,17 +103,15 @@
       swipeClick(id) {
         let param = {
           id: id,
-          url: this.config.redirectUrl,
+          url: this.config.redirectUrl + id,
         }
         GetUrl(param).then(res => {
-          console.log("1111111", res);
           if (res.code == 200) {
             window.open(res.data.url, '_self');
           } else {
             toast('该功能暂未开放')
             // uni.navigateBack()
           }
-
         })
       },
       search() {

+ 1 - 17
pages/lr/register.vue

@@ -216,10 +216,8 @@
 			},
 			onchange(e) {
 				const value = e.detail.value
-				console.log("onchange", value);
 			},
 			onnodeclick(node) {
-				console.log("fas", node);
 				this.groupId = node.value.substring(0, 6)
 				this.baseFormData.lrHjdz = this.groupId + '000000'
 			},
@@ -258,7 +256,6 @@
 					image: idcardFace,
 					image_type: 'BASE64'
 				}]
-				console.log("人脸对比:", data)
 				uni.request({
 					url: '/baiduApi/rest/2.0/face/v3/match?access_token=' + this.token,
 					data: data,
@@ -267,7 +264,6 @@
 						'Content-Type': 'application/json'
 					},
 					success: (res) => {
-						console.log('对比', res);
 						if (res.data.error_msg == 'SUCCESS') {
 							this.score = res.data.result.score;
 
@@ -305,7 +301,6 @@
 
 					},
 					error: (err) => {
-						console.log("对比失败,", err);
 						uni.hideLoading()
 					}
 				})
@@ -341,7 +336,6 @@
 					user_id: this.idcardMD5,
 					action_type: 'REPLACE', // 操作方式 APPEND: 当user_id在库中已经存在时,对此user_id重复注册时,新注册的图片默认会追加到该user_id下 REPLACE : 当对此user_id重复注册时,则会用新图替换库中该user_id下所有图片 默认使用APPEND
 				}
-				console.log("人脸注册:", data)
 				uni.request({
 					url: '/baiduApi/rest/2.0/face/v3/faceset/user/add?access_token=' + this.token,
 					data: data,
@@ -350,7 +344,6 @@
 						'Content-Type': 'application/json'
 					},
 					success: (res) => {
-						console.log("人脸注册:", res);
 						uni.hideLoading()
 						if (res.data.error_msg != 'SUCCESS') {
 							showConfirm(res.data.error_msg)
@@ -371,7 +364,6 @@
 					match_threshold: config.score,
 					max_user_num: 50
 				}
-				console.log("人脸搜索:", data)
 				uni.request({
 					url: '/baiduApi/rest/2.0/face/v3/search?access_token=' + this.token,
 					data: data,
@@ -380,10 +372,8 @@
 						'Content-Type': 'application/json'
 					},
 					success: (res) => {
-						console.log("人脸搜索:", res)
 						if (res.data.error_msg == 'SUCCESS') {
 							if (res.data.result.user_list.length < 1) {
-								console.log("人脸不存在");
 								this.createGroup()
 							} else {
 								if (res.data.result.user_list[0].score >= config.score) {
@@ -433,15 +423,12 @@
 						})
 						this.$refs['baseForm'].validate().then(res => {
 							UploadOne(this.baseFormData.prelrZjz, {}).then(re => {
-								console.log("re", re)
 								this.baseFormData.lrZjz = re.data.url
 								UploadOne(this.src, {}).then(re => {
-									console.log("re", re)
 									this.baseFormData.lrTx = re.data.url
 									this.baseFormData.id = this.userInfo.userId
 
 									Register(this.baseFormData).then(r => {
-										console.log("r:", r)
 										uni.hideLoading()
 										if (r.code == 200) {
 											toast('注册成功')
@@ -459,7 +446,6 @@
 							})
 						}).catch(err => {
 							uni.hideLoading()
-							console.log(err);
 						})
 					} else {
 						showConfirm('请重新上传人像')
@@ -500,7 +486,6 @@
 				uni.getFileInfo({
 					filePath: blobUrl,
 					success: (res) => {
-						console.log(res);
 						let size = res.size
 						let scale = 1
 						if (size / 1024 / 1024 > 0.9) {
@@ -513,7 +498,7 @@
 						}
 					},
 					fail: (err) => {
-						console.log("err:", err);
+						console.log(err);
 					}
 				})
 			},
@@ -569,7 +554,6 @@
 					GetLrByZjhm({
 						lrJmzjhm: this.idcardMD5
 					}).then(res => {
-						console.log(res);
 						if (res.data) {
 							showConfirm('该信息已存在,请登录').then(res => {
 								if (res.confirm == true) {

+ 1 - 3
pages/my/updatePwd.vue

@@ -118,9 +118,7 @@
 				uni.hideKeyboard()
 				this.$refs.keyb._keyShow();
 			},
-			close() {
-				console.log("关闭");
-			},
+			close() {	},
 			save() {
 				if (this.keyShowStatus) this.$refs.keyb._keyHide()
 				this.$refs['baseForm'].validate().then(res => {

+ 0 - 19
pages/test/index.vue

@@ -44,19 +44,6 @@
 				let signature = uni.$lv.encrypt.base64Encode(uni.$lv.encrypt.hmacSha256(appId + timestamp + nonce + uni.$lv
 					.encrypt.sha256(content), appKey))
 
-
-				console.log("url:", url);
-				console.log("appKey:", appKey);
-				console.log("desKey:", desKey);
-				console.log("authorization:", authorization);
-				console.log("appId:", appId);
-				console.log("timestamp:", timestamp);
-				console.log("nonce:", nonce);
-				console.log("content:", content);
-				console.log("content111:", uni.$lv.encrypt.sha256(content));
-				console.log("signature:", signature);
-
-
 				uni.request({
 					url: url + '?authorization=' + authorization + "&appId=" + appId + "&timestamp=" + timestamp +
 						"&nonce=" + nonce + "&content=" + content + "&signature=" + signature,
@@ -72,16 +59,10 @@
 				// todo 3DES
 				let result = uni.$lv.encrypt.hmacSha256("abcdefg123456这是一条加密字符串7892345",
 					"u$DCc!tjdYn%wP!hE3Ya%qVCWKUX9p4N");
-
-				console.log("HmacSHA256:", result);
 				result = uni.$lv.encrypt.sha256("abcdefg123456这是一条加密字符串7892345");
-				console.log("SHA256_HEX:", result);
 				result = uni.$lv.encrypt.base64Encode("KNGT^$Sat#je5VX9Hdp3Y@kLUTegwg82这是一条加密字符串");
-				console.log("Base64_Encode:", result);
-
 				result = uni.$lv.validate.isWechat();
 				uni.$lv.func.toast(result);
-				console.log("微信:", result);
 			},
 			success() {
 				uni.navigateTo({