瀏覽代碼

测试修改

zouling 1 年之前
父節點
當前提交
75ca24f888

+ 1 - 1
api/common.js

@@ -55,7 +55,7 @@ export function getUsernoPageList(data) {
 	'data':data
   })
 }
-// 附件-新增 system:shareholderFj:add
+// 附件-新增 system:fj:add
 export function getFjAdd(data) {
   return request({
     'url': '/fj',

+ 1 - 1
components/wait/list.vue

@@ -3,7 +3,7 @@
 	<view v-if="datalist.length>0">
 	<!-- 代办提醒 -->
 		<block v-if="type=='dbtx'">
-			<view class="watlist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.remindId)">
+			<view class="watlist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.loanApplicationId)">
 				<view class="tit flex1 over">{{ite.remindTitle}}</view>
 				<view class="txt flex0">{{ite.remindTime}}</view>
 			</view>

+ 4 - 3
config.js

@@ -1,10 +1,11 @@
 // 应用全局配置
 module.exports = {
-  // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  // baseUrl: 'https://lyyy.qs163.cn/prod-api',
+  // baseUrl: 'https://rzdb.qs163.cn/prod-api',
+  baseUrl: 'http://47.99.82.249:6001/prod-api',
   // baseUrl: 'http://192.168.101.168:8056',
-  baseUrl: 'http://192.168.101.245:8056',
+  // baseUrl: 'http://192.168.101.245:8056',
   Clientid:'428a8310cd442757ae699df5d894f051',//
+  baseUrlimg: 'http://47.99.82.249:6001',
   baseName:'皖源融资担保',
  // https://xygl.cnzxy.cn h5链接地址
   confirmflag:false,//是否有弹窗

+ 3 - 2
pages/index/index.vue

@@ -108,7 +108,7 @@
 			<!-- 列表 -->
 			<view class="mt2 plr12" :style="'min-height: ' + minheight + 'px;'">
 				<wait-list type='dbtx' :datalist="list" :wtdt="wtdt"  @getDetail="getDetail"></wait-list>
-				<view class="shax" v-if="wtdt" @click="getMoreDataFn">{{wtdt}}</view>
+				<view class="shax" v-if="wtdt&&list&&list.length>0" @click="getMoreDataFn">{{wtdt}}</view>
 			</view>
 		</view>
 	<view class="bgbox" @click="getClose" v-if="mtype" style="z-index: 100;"></view>
@@ -425,7 +425,8 @@
 			this.$tab.navigateTo("/pages/index/noticedetail?type=xttz&id="+e)
 		},
 		getDetail(e){
-			this.$tab.navigateTo("/pages/index/noticedetail?type=dbtz&id="+e)
+			// this.$tab.navigateTo("/pages/index/noticedetail?type=dbtz&id="+e)
+			this.$tab.navigateTo("/work/pages/business/details?id="+e)
 		},
 		getTab(idx){
 			this.tabval=idx;

+ 1 - 0
static/index.html

@@ -10,6 +10,7 @@
 			var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
 			document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
 		</script>
+		<!-- <script src="web-office-sdk-v1.1.19-a4d86a2/web-office-sdk-v1.1.19.umd.js"></script> -->
 		<link rel="stylesheet" href="<%= BASE_URL %>static/index.<%= VUE_APP_INDEX_CSS_HASH %>.css" />
 	</head>
 	<body>

+ 71 - 0
utils/common.js

@@ -117,6 +117,77 @@ export function tansParams(params) {
   return result
 }
 // 上传
+//上传图片(本地地址识别一张)
+export function uploadIdentify(api, filePaths, successUp, failUp, i, length, files, callback) {
+	const isToken = (config.headers || {}).isToken === false
+	config.header = config.header || {}
+	if (getToken() && !isToken) {
+	  config.header['Authorization'] = 'Bearer ' + getToken()
+	}
+	// get请求映射params参数
+	if (config.params) {
+	  let url = config.url + '?' + tansParams(config.params)
+	  url = url.slice(0, -1)
+	  config.url = url
+	}
+	
+	uni.showLoading({
+		title: '上传中'
+	})
+	var failfile = [];
+	uni.uploadFile({
+		timeout: config.timeout || timeout,
+		url: baseUrl + api, //仅为示例,非真实的接口地址
+		filePath: filePaths[i],
+		name: 'file',
+		header: config.header,
+		formData: config.formData,
+		success: function(resp) {
+			uni.hideLoading();
+			let result = JSON.parse(resp.data)
+			const code = result.code || 200
+			const msg = errorCode[code] || result.msg || errorCode['default']
+			// console.log(result.fileName,8)
+			if (result.code == 200) {
+				successUp++;
+				files[i] = result;
+			} else if(result.code==401) {
+				showConfirm("登录状态已过期,您可以继续留在该页面,或者重新登录?").then(res => {
+				  if (res.confirm) {
+				    store.dispatch('LogOut').then(res => {
+				      uni.reLaunch({ url: '/pages/login/login' })
+				    })
+				  }
+				})
+				callback('无效的会话,或者会话已过期,请重新登录。');
+			}else{
+				failfile = failfile.concat(filePaths[i])
+				failUp++;
+			}
+		},
+		fail: function(res) {
+			uni.hideLoading();
+			failfile = failfile.concat(filePaths[i])
+			failUp++;
+		},
+		complete: function(rsp) {
+			// console.log(rsp, filePaths[i])
+			uni.hideLoading();
+			i++;
+			if (i == length) {
+				uni.showToast({
+					title: '总共' + successUp + '张上传成功,' + failUp + '张上传失败!',
+					icon: 'none',
+					duration: 2000
+				});
+				callback(files);
+			} else { //递归调用upload函数
+				uploadIdentify(api, filePaths, successUp, failUp, i, length, files, callback);
+			}
+		}
+	});
+
+}
 //上传图片
 export function uploadmore(api, filePaths, successUp, failUp, i, length, files, callback) {
 	const isToken = (config.headers || {}).isToken === false

+ 2 - 2
work/components/business/ewjcj.vue

@@ -4,7 +4,7 @@
 		<view class="txt">
 			<view class="flex1 flexc">{{ite.label}}
 			<!-- 有文件出具的权限 -->
-			<view class="editf" v-if="checkPermi(['system:shareholderFj:add'])&&datainfo.loanApplicationType!=4" @click="getfjEdit(ite.val)">
+			<view class="editf" v-if="checkPermi(['system:fj:add'])&&datainfo.loanApplicationType!=4" @click="getfjEdit(ite.val)">
 				<image :src="editf"></image>
 				<view>上传</view>
 			</view>
@@ -29,7 +29,7 @@
 					<image :src="edit"></image>
 					<view>在线签名</view>
 				</view>
-				<view class="delimg flex0" v-if="checkPermi(['system:fj:remove'])" @click.stop="getDelwjFj(fite.fjId)">
+				<view class="delimg flex0" v-if="checkPermi(['system:fj:remove'])&&datainfo.loanApplicationType!=4" @click.stop="getDelwjFj(fite.fjId)">
 					<image :src="fdelimg"></image>
 				</view>
 				<text class="txta" @click="getDown(fite.url)">预览</text>

+ 12 - 11
work/pages/business/add.vue

@@ -376,7 +376,7 @@
 					</uni-forms-item>
 					<!-- disabled -->
 					<uni-forms-item label="身份证号" name="corporationIdCard">
-						<uni-easyinput v-model="datainfo.corporationIdCard"  :inputBorder='false' placeholder="自动识别" />
+						<uni-easyinput v-model="datainfo.corporationIdCard" disabled :inputBorder='false' placeholder="自动识别" />
 					</uni-forms-item>
 					<uni-forms-item label="手机号码" name="corporationPhone">
 						<uni-easyinput v-model="datainfo.corporationPhone" type="number" :inputBorder='false' placeholder="请输入手机号码" />
@@ -1120,7 +1120,7 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
-	const baseUrlimg=config.baseUrl
+	const baseUrlimg=config.baseUrlimg
 	const baseName = config.baseName
 	import popUp from "@/work/components/popup/popup.vue"
 	import stepBar from "@/components/toptab/stepbar.vue"
@@ -1448,7 +1448,7 @@
 			getQylist(){
 				// 需要userid
 				var params={
-					userid:this.userId
+					userId:this.userId
 				}
 				getQyListNoPage(params).then(res=>{
 					if(res.code==200){
@@ -1973,19 +1973,20 @@
 				var newobj={}
 				var responseText=JSON.parse(item.responseText)
 				var url=responseText.fileName
+				var urlOnline=responseText.urlOnline
 				if(fileVal=='frsfzrmx'){
 					this.datainfo.corporationFront=url;
 					// 获取姓名 身份证号
-					this.getocrIdCard(url,fileVal)
+					this.getocrIdCard(urlOnline,fileVal)
 				}else if(fileVal=='frsfzghm'){
 					this.datainfo.corporationBack=url
 				}else if(fileVal=='frsfzpormx'){
 					this.datainfo.spouseFront=url
-					this.getocrIdCard(url,fileVal)
+					this.getocrIdCard(urlOnline,fileVal)
 				}else if(fileVal=='frsfzpoghm'){
 					this.datainfo.spouseBack=url
 				}else if(fileVal=='fdbrsfzrmx'){
-					this.getocrIdCard(url,fileVal)
+					this.getocrIdCard(urlOnline,fileVal)
 					this.datainfo.guaranteeFront=url
 				}else if(fileVal=='fdbrsfzghm'){
 					this.datainfo.guaranteeBack=url
@@ -2025,9 +2026,9 @@
 			},
 			getocrIdCard(url,type){
 				var that=this;
-				var burl=this.baseUrl+url;
+				var burl=url;
 				var params={
-					image:"D:\\idcard.png",
+					image:url,
 					idCardSide:'front'
 				}
 				getOcrIdCard(params).then(res=>{
@@ -2035,13 +2036,13 @@
 						var data=res.data;
 						if(type=='frsfzrmx'){
 							that.datainfo.corporationName=data.realName
-							// that.datainfo.corporationIdCard=data.idCard
+							that.datainfo.corporationIdCard=data.idCard
 						}else if(type=='frsfzpormx'){
 							that.datainfo.spouseName=data.realName
-							// that.datainfo.spouseIdCard=data.idCard
+							that.datainfo.spouseIdCard=data.idCard
 						}else if(type=='fdbrsfzrmx'){
 							that.datainfo.guaranteeName=data.realName
-							// that.datainfo.guaranteeIdCard=data.idCard
+							that.datainfo.guaranteeIdCard=data.idCard
 						}
 					}
 				})

+ 7 - 30
work/pages/prove/addqy.vue

@@ -72,7 +72,7 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
-	import {uploadmore} from '@/utils/common.js'
+	import {uploadIdentify} from '@/utils/common.js'
 	import { getToken } from '@/utils/auth'
 	import {getOcrBusinessLicense,getEnterpriseAdd,getEnterpriseDet,getEnterpriseEdit} from "@/api/mine/card.js"
 	import {checkPermi,checkRole} from "@/utils/permission"; // 权限判断函数
@@ -173,14 +173,6 @@
 			},
 			getaddImage(idx){
 				let that = this;
-				// var res=['D:\\zhizhao.jpg']
-				// var obj={
-				// 	url:res.join(','),
-				// 	urls:res.join(','),
-				// 	idx:idx
-				// }
-				// that.getOcrBusinessLicense(obj)
-				// return
 				let file =[],count=1;
 				uni.chooseImage({
 					count: 1,
@@ -195,11 +187,13 @@
 						}else{
 							let imglen = res.tempFilePaths.length;
 							var fuwufile = [];
-							uploadmore('/common/upload',img,0,0,0,imglen,fuwufile,function(rs){
+							uploadIdentify('/common/upload',img,0,0,0,imglen,fuwufile,function(rs){
 								if(rs&&rs.length>0){
+									var resurl=rs[0];
 									var obj={
-										url:rs.join(','),
-										idx:idx
+										url:resurl.fileName,
+										idx:idx,
+										urlOnline:resurl.urlOnline
 									}
 									that.getOcrBusinessLicense(obj)
 								}
@@ -211,25 +205,8 @@
 			getOcrBusinessLicense(obj){
 				var that=this;
 				var idx=obj.idx;
-				// var obj={
-				// 	'businessScope':"互联网数据服务;大数据服务;数据处理和存储支持服务;卫星遥感数据处理;",
-				// 	'businessTerm': "长期",
-				// 	'creditCode': "91340824MA2UGYLP60",
-				// 	'enterpriseAddress': "安徽省安庆市潜山市经济开发区朝阳路0008号",
-				// 	'enterpriseName': "安徽中新云计算有限公司",
-				// 	'enterpriseType': "有限责任公司(自然人投资或控股)",
-				// 	'establishData': "2020年02月24日",
-				// 	'legalName': "江瑾",
-				// 	'registeredCapital': "6000万元",
-				// 	"imageUrl":'123',
-				// 	"idCard":'123',
-				// 	"realName":'123',
-				// }
-				// that.qylist.splice(idx,1,obj)
-				// return
 				var params={
-					image:baseUrl+obj.url,
-					// image:obj.urls,
+					image:obj.urlOnline,
 					idCardSide:obj.type
 				}
 				getOcrBusinessLicense(params).then(res=>{

+ 6 - 19
work/pages/prove/index.vue

@@ -46,7 +46,7 @@
 <script>
 	import config from '@/config'
 	const baseUrl = config.baseUrl
-	import {uploadmore} from '@/utils/common.js'
+	import {uploadIdentify} from '@/utils/common.js'
 	import {getOcrIdCard,getOcrFn,getChangeFace,getIdCardAdd} from "@/api/mine/card.js"
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	const aliyunVerify = uni.requireNativePlugin('AP-FaceDetectModule');
@@ -166,16 +166,17 @@
 						}else{
 							let imglen = res.tempFilePaths.length;
 							var fuwufile = [];
-							uploadmore('/common/upload',img,0,0,0,imglen,fuwufile,function(rs){
+							uploadIdentify('/common/upload',img,0,0,0,imglen,fuwufile,function(rs){
+								var resurl=rs[0];
 								if(e=='front'){
-									that.user.front=rs[0];
+									that.user.front=resurl.fileName;
 								}else{
-									that.user.back=rs[0];
+									that.user.back=resurl.fileName;
 								}
 								if(rs&&rs.length>0){
 									var obj={
 										type:e,
-										url:baseUrl+rs.join(',')
+										url:resurl.urlOnline
 									}
 									that.getOcrIdCard(obj)
 								}
@@ -185,20 +186,6 @@
 				});
 			},
 			getOcrIdCard(obj){
-				// var user={
-				// 	realName:"林振宇",
-				// 	idCard:"34282419730618003X",
-				// 	address:"安徽省安庆市潜山市梅城镇",
-				// 	expirationDate:"2017.12.27 - 2037.12.27",
-				// };
-				// if(obj.type=='front'){
-				// 	this.user.realName=user.realName;
-				// 	this.user.idCard=user.idCard;
-				// 	this.user.address=user.address;
-				// }else{
-				// 	this.user.expirationDate=user.expirationDate
-				// }
-				// return
 				var params={
 					image:obj.url,
 					idCardSide:obj.type