合并修改

小程序详情
Merge branch 'hcb' of SH-Arbitrate/miniapp into dev
2024-05-24 14:55:38 +08:00 · 2024-05-24 14:52:26 +08:00 · 2024-05-17 14:19:05 +08:00 · 2024-05-17 14:17:55 +08:00 · 2024-05-16 16:15:32 +08:00 · 2024-05-16 16:13:28 +08:00
32 changed files with 2320 additions and 1068 deletions
@@ -10,7 +10,7 @@
 	export default {
 		globalData: {
 			// requestUrl: 'https://api.xayunmei.com/zhongcaiapi',
-			requestUrl: 'http://121.40.189.20:9001',
+			requestUrl: 'https://api.xayunmei.com/zhongcaiapitest',
 		},
 		onLaunch: function() {
 			this.initApp();
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询被申请人案件列表
 export function respondentList(data) {
 	return request({
-		'url': '/evidence/all',
+		'url': '/caseApplication/list',
 		method: 'get',
 		params: data
 	})
@@ -184,4 +184,28 @@ export function msCaseSign(data) {
 		method: "post",
 		data: data,
 	})
-}
+}
+//证件类型
+export function idType(data) {
+	return request({
+		url: '/system/dict/data/type/id_type',
+		method: 'get',
+		params: data
+	})
+}
+//删除上传按钮
+export function deleteFile(data) {
+	return request({
+		url: "/evidence/deleteFile",
+		method: "post",
+		data: data,
+	})
+}
+// 仲裁案件详情
+export function selectCaseApplication(data) {
+	return request({
+		url: "/caseApplication/selectCaseApplication",
+		method: "post",
+		data: data,
+	})
+}
@@ -93,4 +93,12 @@ export function wxregister(data) {
 		method: 'post',
 		data: data
 	})
+}
+// 获取证件类型
+export function idType(data){
+	return request({
+		url: '/system/dict/data/type/id_type',
+		method: 'get',
+		params: data
+	})
 }
@@ -2,11 +2,11 @@
 module.exports = {
 	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
 	// baseUrl: 'https://api.xayunmei.com/zhongcaiapitest',
-	// baseUrl: 'http://121.40.189.20:9001',
-	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
-	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
-	baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',
-	// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
+	// baseUrlZC: 'http://172.16.1.26:8001',
+	// baseUrlZC: 'https://api.xayunmei.com/zhongcaiapi',
+	baseUrlZC: 'https://api.xayunmei.com/zhongcaiapitest',
+	// baseUrlTJ: 'https://api.xayunmei.com/tiaojieapitest',
+	baseUrlTJ: 'https://api.xayunmei.com/tiaojieapi',
 	// baseUrlZC: 'http://121.40.189.20:8001',	
 	// baseUrlTJ: 'http://172.16.1.43:6001',
 	// baseUrl: 'http://172.16.1.24:8001',
@@ -49,7 +49,9 @@
 			"postcss": true
 		},
 		"optimization": {
-			"subPackages": true
+			"subPackages": {
+				"subPackages": true
+			}
 		},
 		"usingComponents": true,
 		"permission": {}
@@ -1,4 +1,5 @@
 {
+	"lazyCodeLoading":"requiredComponents",
 	"pages": [{
 			"path": "pages/switchSystem",
 			"style": {
@@ -98,6 +99,12 @@
 				"navigationBarTitleText": "案件信息"
 			}
 		},
+		{
+			"path": "pages/handlecase/component/caseDetails",
+			"style": {
+				"navigationBarTitleText": "案件详情"
+			}
+		},
 		{
 			"path": "pages/handlecase/component/confirmPayment",
 			"style": {
@@ -255,4 +262,5 @@
 		"navigationBarTitleText": "RuoYi",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
+	
 }
@@ -0,0 +1,385 @@
+<template>
+	<view class="">
+		<uni-section title="  ">
+			<!-- 选项卡 -->
+			<view>
+				<uni-segmented-control :current="current" :values="itemsT" :style-type="styleType"
+					:active-color="activeColor" @clickItem="onClickItem" />
+			</view>
+			<view class="" v-show="current === 0">
+				<view class="conent">
+					<view class="assignrbitrators">
+						<uni-forms ref="form" :modelValue="formData" :rules="rules">
+							<uni-section title="案件信息" type="line" padding></uni-section>
+							<uni-forms-item label="案件名称:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.caseName" placeholder="请输入案件名称"/>
+							</uni-forms-item>
+							<uni-forms-item label="案件标的:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.caseSubjectAmount" placeholder="请输入案件标的"/>
+							</uni-forms-item>
+							<uni-forms-item label="借款开始日期" label-width="100px">
+								<uni-datetime-picker :disabled='true' v-model="formData.loanStartDate" 
+									type="date" :clear-icon="false" />
+							</uni-forms-item>
+							<uni-forms-item label="借款结束日期" label-width="100px">
+								<uni-datetime-picker :disabled='true' v-model="formData.loanEndDate"
+									type="date" :clear-icon="false" />
+							</uni-forms-item>
+							<uni-forms-item label="合同编号:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.contractNumber" placeholder="请输入"/>
+							</uni-forms-item>
+							<uni-forms-item label="申请人主张欠本金:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.claimPrinciOwed" placeholder="请输入"/>
+							</uni-forms-item>
+							<uni-forms-item label="申请人主张欠利息:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.claimInterestOwed" placeholder="请输入"/>
+							</uni-forms-item>
+							<uni-forms-item label="申请人主张违约金:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.claimLiquidDamag" placeholder="请输入"/>
+							</uni-forms-item>
+							<uni-forms-item label="申请人请求仲裁庭裁决:" label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.requestRule" type="textarea" placeholder="请输入申请人请求仲裁庭裁决" :maxlength='3000' />
+							</uni-forms-item>
+							<uni-forms-item label="申请人仲裁请求:"  label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.arbitratClaims" type="textarea" placeholder="请输入申请人仲裁请求" :maxlength='3000' />
+							</uni-forms-item>
+							<uni-forms-item label="事实和理由:" name="arbitratClaims" label-width="100px" required>
+								<uni-easyinput :disabled='true' v-model="formData.arbitratClaims" type="textarea" placeholder="请输入事实和理由" :maxlength='3000' />
+							</uni-forms-item>
+							<uni-forms-item label="是否财产保全申请" label-width="100px">
+								<uni-data-checkbox :disabled='true' v-model="formData.properPreser"
+									:localdata="isPropertyPreservation"></uni-data-checkbox>
+							</uni-forms-item>
+							<uni-forms-item label="是否书面审理" label-width="100px">
+								<uni-data-checkbox :disabled='true' v-model="formData.applicantIsWrittenHear"
+									:localdata="isAdjudicate"></uni-data-checkbox>
+							</uni-forms-item>
+							<uni-forms-item label="裁决书模板" label-width="100px">
+								<uni-data-select :disabled='true' v-model="formData.templateId"
+									:localdata="rulingTemplate"></uni-data-select>
+							</uni-forms-item>
+							<uni-section title="申请人的主体信息" type="line" padding></uni-section>
+							<!-- 申请人信息 -->
+							<view class="" v-for="(item,index) in formData.affiliate.applicant">
+								<uni-forms-item label="选择机构或自然人" label-width="100px">
+									<uni-data-checkbox :disabled='true' v-model="item.applicant.organizeFlag" class='checkbox' :localdata="objectiJurisArr"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="是否操作人" label-width="100px">
+									<uni-data-checkbox :disabled='true'  v-model="item.applicant.operatorFlag"
+										:localdata="isProxyApplicant"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item :label="item.applicant.organizeFlag==0 ? '申请人':'申请机构'"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.name" placeholder="请输入"/>
+								</uni-forms-item>
+								<uni-forms-item label="证件类型" label-width="100px" v-if="item.applicant.organizeFlag==0">
+									<uni-data-select :disabled='true' v-model="item.applicant.idType" :localdata="certificate"></uni-data-select>
+								</uni-forms-item>
+								<uni-forms-item label="国籍" label-width="100px">
+									<uni-data-select :disabled='true' v-model="item.applicant.nationality"
+										:localdata="nationality"></uni-data-select>
+								</uni-forms-item>
+								<uni-forms-item label="统一社会信用代码:"  v-if="item.applicant.organizeFlag==1"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.code" placeholder="请输入代码"/>
+								</uni-forms-item>
+								<uni-forms-item label="身份证号码:"  v-if="item.applicant.organizeFlag==0" label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.idCard" placeholder="请输入身份证号码"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系电话:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.phone" placeholder="请输入联系电话"/>
+								</uni-forms-item>
+								<uni-forms-item label="邮箱:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.email" placeholder="请输入邮箱"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系地址:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.address" placeholder="请输入联系地址"/>
+								</uni-forms-item>
+								<uni-forms-item label="申请人住所:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.home" placeholder="请输入申请人住所"/>
+								</uni-forms-item>
+								<uni-forms-item label="法人代表:"  v-if="item.applicant.organizeFlag==1" label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicant.compLegalPerson" placeholder="请输入法人代表"/>
+								</uni-forms-item>
+								<uni-forms-item label="申请人性别"  v-if="item.applicant.organizeFlag==0" label-width="100px" required>
+									<uni-data-checkbox class='checkbox'v-model="item.applicant.sex"
+										:localdata="respondentSexy"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="出生年月日"  v-if="item.applicant.organizeFlag==0" label-width="100px">
+									<uni-datetime-picker :disabled='true' v-model="item.applicant.birth" type="date" :clear-icon="false" />
+								</uni-forms-item>
+								<uni-section title="代理人信息" type="line" padding></uni-section>
+								<uni-forms-item label="是否操作人" label-width="100px">
+									<uni-data-checkbox :disabled='true'  v-model="item.applicantAgent.operatorFlag"
+										:localdata="isProxyApplicant"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="姓名:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicantAgent.name" placeholder="请输入姓名"/>
+								</uni-forms-item>
+								<uni-forms-item label="邮箱:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicantAgent.email" placeholder="请输入邮箱"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系电话:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.applicantAgent.phone" placeholder="请输入联系电话"/>
+								</uni-forms-item>
+							</view>
+							<!-- 被申请人信息 -->
+							<uni-section title="被申请人主题信息" type="line" padding></uni-section>
+							<view class="" v-for="(item,index) in formData.affiliate.res">
+								<uni-forms-item label="选择机构或自然人" label-width="100px">
+									<uni-data-checkbox :disabled='true' v-model="item.res.organizeFlag" class='checkbox' :localdata="objectiJurisArr"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="是否操作人" label-width="100px">
+									<uni-data-checkbox :disabled='true' v-model="item.res.operatorFlag"
+										:localdata="isProxyApplicant"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item :label="item.res.organizeFlag==0 ? '被申请人':'申请机构'"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.name" placeholder="请输入姓名"/>
+								</uni-forms-item>
+								<uni-forms-item label="证件类型"  v-if="item.res.organizeFlag==0" label-width="100px" required>
+									<uni-data-select :disabled='true' v-model="item.res.idType" :localdata="certificate"></uni-data-select>
+								</uni-forms-item>
+								<uni-forms-item label="国籍" label-width="100px" required>
+									<uni-data-select :disabled='true' v-model="item.res.nationality"
+										:localdata="nationality"></uni-data-select>
+								</uni-forms-item>
+								<uni-forms-item label="身份证号:" v-if="item.res.organizeFlag==0" label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.idCard" placeholder="请输入身份证号"/>
+								</uni-forms-item>
+								<uni-forms-item label="统一社会信用代码:" v-if="item.res.organizeFlag==1" label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.code" placeholder="请输入统一社会信用代码"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系电话:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.phone" placeholder="请输入联系电话"/>
+								</uni-forms-item>
+								<uni-forms-item label="邮箱:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.email" placeholder="请输入邮箱"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系地址:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.address" placeholder="请输入联系地址"/>
+								</uni-forms-item>
+								<uni-forms-item label="被申请人住所:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.res.home" placeholder="请输入被申请人住所"/>
+								</uni-forms-item>
+								<uni-forms-item label="被申请人性别"label-width="100px" required v-if="item.res.organizeFlag==0">
+									<uni-data-checkbox :disabled='true' class='checkbox'v-model="item.res.sex"
+										:localdata="respondentSexy"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="出生年月日" label-width="100px" v-if="item.res.organizeFlag==0">
+									<uni-datetime-picker :disabled='true' v-model="item.res.birth" type="date" :clear-icon="false" />
+								</uni-forms-item>
+								<uni-section title="代理信息" type="line" padding></uni-section>
+								<uni-forms-item label="是否操作人" label-width="100px">
+									<uni-data-checkbox  v-model="item.resAgent.operatorFlag"
+										:localdata="isProxyApplicant"></uni-data-checkbox>
+								</uni-forms-item>
+								<uni-forms-item label="姓名:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.resAgent.name" placeholder="请输入姓名"/>
+								</uni-forms-item>
+								<uni-forms-item label="邮箱:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.resAgent.email" placeholder="请输入邮箱"/>
+								</uni-forms-item>
+								<uni-forms-item label="联系电话:"  label-width="100px" required>
+									<uni-easyinput :disabled='true' v-model="item.resAgent.phone" placeholder="请输入联系电话"/>
+								</uni-forms-item>
+							</view>	
+						</uni-forms>
+					</view>
+				</view>
+			</view>
+			<view class="" v-show="current === 1">
+				<view class="" style="margin-top: 50rpx;">
+					<view>申请人</view>
+					<view v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==2" :href="item.annexPath" color="#007BFF"
+							:text="item.fileName"></uni-link>
+					</view>
+					<view>被申请人</view>
+					<view v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==6" :href="item.annexPath" color="#007BFF"
+							:text="item.fileName"></uni-link>
+					</view>
+				</view>
+				<view class="" style="margin-top: 40rpx;">
+					<view>仲裁申请书</view>
+					<view v-for="item in formData.caseAttachList">
+						<uni-link v-if="item.annexType==1" :href="item.annexPath" color="#007BFF"
+							:text="item.fileName"></uni-link>
+					</view>
+				</view>
+			</view>
+		</uni-section>
+		
+	</view>
+	
+</template>
+
+<script>
+	import {getTemplate,idType,selectCaseApplication} from '../../../api/handlecase/index.js'
+	import config from '@/config'
+	const baseUrl = config.baseUrlZC
+	export default {
+		data(){
+			return{
+				formData:{
+					affiliate:[
+						
+					]
+				},
+				rules: {},
+				caseDetailId:null,
+				current: 0,
+				itemsT: ['案件详情', '案件资料'],
+				activeColor: '#007aff',
+				styleType: 'button',
+				isPropertyPreservation: [{
+						value: 1,
+						text: "是"
+					},
+					{
+						value: 0,
+						text: "否"
+					},
+				],
+				isAdjudicate: [{
+						value: 1,
+						text: "是"
+					},
+					{
+						value: 0,
+						text: "否"
+					},
+				],
+				objectiJurisArr: [{
+					text: '自然人',
+					value: 0
+				}, {
+					text: '机构',
+					value: 1
+				}],
+				isProxyApplicant: [{
+						value: 1,
+						text: "是"
+					},
+					{
+						value: 0,
+						text: "否"
+					},
+				],
+				respondentSexy: [{
+					text: '女',
+					value: 1
+				}, {
+					text: '男',
+					value: 0
+				}],
+				rulingTemplate:[],
+				certificate: [],
+				nationality: [{
+						value: 0,
+						text: "境内"
+					},
+					{
+						value: 1,
+						text: "境外"
+					},
+				],
+			}
+		},
+		methods:{
+			/** 获取裁决书模板 */
+			getTemplateFn(data) {
+				getTemplate(data).then((res) => {
+					console.log(res)
+					res.rows.forEach(item => {
+						this.rulingTemplate.push({
+							value: item.id,
+							text: item.temName
+						})
+					})
+				});
+			},
+			// 获取证件类型
+			getIdType() {
+				idType().then(res => {
+					console.log(res)
+					res.data.forEach(item => {
+						this.certificate.push({
+							value: item.dictSort,
+							text: item.dictLabel
+						})
+					})
+				})
+			},
+			onClickItem(e) {
+				if (this.current !== e.currentIndex) {
+					this.current = e.currentIndex
+				}
+			},
+			// 获取案件详情
+			getSelectCaseApplication(ids){
+				selectCaseApplication({id:ids}).then(res=>{
+					console.log(res.data.affiliate.applicant)
+					let data = res.data
+					if (data.affiliate.applicant.length == 0) {
+						data.affiliate.applicant.push({
+							applicant: {},
+							applicantAgent: {}
+						})
+					} else {
+						data.affiliate.applicant.forEach((item, index) => {
+							if (!item.applicant) {
+								item.applicant = {}
+							} else {
+								data.affiliate.applicant[index].applicant.sex = Number(data.affiliate.applicant[index].applicant
+									.sex)
+							}
+							if (!item.applicantAgent) {
+								item.applicantAgent = {}
+							}
+						})
+					}
+					if (data.affiliate.res.length == 0) {
+						data.affiliate.res.push({
+							res: {},
+							resAgent: {}
+						})
+					} else {
+						data.affiliate.res.forEach((item, index) => {
+							if (!item.res) {
+								item.res = {}
+							} else {
+								data.affiliate.res[index].res.sex = Number(data.affiliate.res[index].res
+									.sex)
+							}
+							if (!item.resAgent) {
+								item.resAgent = {}
+							}
+						})
+					}
+					this.formData = data
+					if (res.data.caseAttachList.length > 0) {
+						res.data.caseAttachList.forEach(item => {
+							let names = item.annexPath.split('_')
+							item['fileName'] = names[names.length - 1]
+							item.annexPath = baseUrl + item.annexPath
+						})
+					}
+				})
+			}
+		},
+		onLoad(data){
+			this.getTemplateFn()
+			this.getIdType()
+			this.getSelectCaseApplication(data.id)
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #ffffff;
+	}
+	.assignrbitrators {
+		margin: 30rpx;
+	}
+	
+</style>
@@ -18,7 +18,7 @@
 					</view>
 				</uni-forms-item>
 				<uni-forms-item label="被申请人缴费:" name="feePayable" label-width="100px" v-if="annexTypeB">
-					<view v-for="item in formData.caseAttachList">
+					<view v-for="item in formData.resCaseAttachList">
 						<uni-link v-if="item.annexType==9" :href="item.annexPath" color="#007BFF"
 							:text="item.annexName"></uni-link>
 					</view>
@@ -132,7 +132,10 @@
 					this.formData.caseAttachList.forEach(res => {
 						if (res.annexType == 4) {
 							this.annexTypeS = true
-						} else if (res.annexType == 9) {
+						}
+					})
+					this.formData.resCaseAttachList.forEach(res => {
+						if (res.annexType == 9) {
 							this.annexTypeB = true
 						}
 					})
@@ -20,23 +20,27 @@
 			<view class="lable">
 				申请人：
 			</view>
-			<view class="main">
-				{{defalutVal.applicationName}}
-			</view>
+			<uni-tooltip :content="defalutVal.applicationName">
+				<view class="textHidden">
+					{{defalutVal.applicationName}}
+				</view>
+			</uni-tooltip>
 		</view>
 		<view class="listItem" style="margin-top:22rpx">
 			<view class="lable">
 				被申请人：
 			</view>
-			<view class="main">
-				{{defalutVal.respondentName}}
-			</view>
+			<uni-tooltip :content="defalutVal.respondentName">
+				<view class="textHidden">
+					{{defalutVal.respondentName}}
+				</view>
+			</uni-tooltip>
 		</view>
 		<view class="listItem">
 			<view class="lable">
 				案件状态：
 			</view>
-			<view class="main">
+			<view class="main" v-if="defalutVal.caseStatusName">
 				{{defalutVal.caseStatusName}}
 			</view>
 		</view>
@@ -49,14 +53,15 @@
 			<button class="btnItem" type="primary" size="mini" @tap="caseDetail">选择调解员</button> -->
 			<button class="btnItem" type="primary" @tap="clickType(item.id)" size="mini" v-for="(item) in buttonList"
 				:key="item.id"
-				v-if="item.id == defalutVal.caseFlowId && checkPermi([item.buttonAuthFlag])">{{ item.nodeName }}</button>
+				v-if="item.id == defalutVal.caseFlowId && checkPermi([item.buttonAuthFlag])&& (defalutVal.appOperatorFlag == 1 || defalutVal.resOperatorFlag == 1 || defalutVal.otherFlag == 1 || defalutVal.agentFlag == 1 || defalutVal.mediatorFlag == 1)">{{ item.nodeName }}</button>
 			<!-- <button class="btnItem" type="primary" size="mini" @tap="confirmationEvidence">确认证据</button>
 			<button class="btnItem" type="primary" size="mini" @tap="isAssignrbitrators">是否指派仲裁员</button>
 			<button class="btnItem" type="primary" size="mini" @tap="isAssignrbitrators">是否指派仲裁员</button>
 			<button class="btnItem" type="primary" size="mini" @tap="chooseMethod">选择仲裁方式</button> -->
 		</view>
 		<view class="btn" v-if="sysType == 1">
-			<button class="btnItem" type="primary" size="mini" @tap="caseCrossExamin">案件质证</button>
+			<button type="primary" class="btnItem" size="mini" @tap="caseDetails">案件详情</button>
+			<button v-if="defalutVal.caseStatus==4 && checkPermi(['caseManagement:list:examin'])" class="btnItem" type="primary" size="mini" @tap="caseCrossExamin">案件质证</button>
 		</view>
 	</view>
 </template>
@@ -137,9 +142,9 @@
 				}
 			},
 			// 案件质证
-			caseCrossExamin(){
+			caseCrossExamin() {
 				uni.navigateTo({
-					url:`/pages/handlecase/component/uploadEvidence?id=${this.defalutVal.id}`
+					url: `/pages/handlecase/component/uploadEvidence?id=${this.defalutVal.id}`
 				})
 			},
 			// 案件详情以及操作
@@ -148,6 +153,12 @@
 					url: `/pages/handlecase/component/uploadEvidence?id=${this.defalutVal.id}`
 				})
 			},
+			// 仲裁案件详情
+			caseDetails(){
+				uni.navigateTo({
+					url:`/pages/handlecase/component/caseDetails?id=${this.defalutVal.id}`
+				})
+			},
 			// 缴费
 			clickPay(type) {
 				uni.navigateTo({
@@ -277,7 +288,9 @@
 				});
 			},
 		},
-		created() {}
+		created() {
+			console.log(this.defalutVal)
+		}
 	}
 </script>

@@ -321,4 +334,11 @@
 			}
 		}
 	}
+
+	.textHidden {
+		width: 300rpx;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
 </style>
@@ -6,11 +6,11 @@
 					<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseNum" placeholder="" />
 				</uni-forms-item>
 				<uni-forms-item label="申请人：" name="applicantName" label-width="120px" required>
-					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate.applicationName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate"
 						placeholder="" />
 				</uni-forms-item>
 				<uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required>
-					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliate.respondentName"
+					<uni-easyinput :inputBorder="false" :disabled='true' v-model="affiliateRes"
 						placeholder="" />
 				</uni-forms-item>
 				<!-- <uni-forms-item label="案件标的：" name="caseSubjectAmount" label-width="120px" required>
@@ -63,7 +63,8 @@
 		data() {
 			return {
 				formData: {},
-				affiliate:{},
+				affiliate:"",
+				affiliateRes:"",
 				selectFlag: false,
 				rules: {},
 				payPlatforms: [{
@@ -100,8 +101,13 @@
 			getData(parms) {
 				selectById(parms).then(res => {
 					this.formData = res.data
-					this.affiliate = res.data.affiliate
-					console.log(this.formData)
+					this.affiliate = res.data.affiliate.applicant.map(item =>item.applicant.name).join(',')
+					this.affiliateRes = res.data.affiliate.res.map(item =>item.res.name).join(',')
+					res.data.affiliate.applicant.forEach((item,index) =>{
+						if(item.res!=null){
+							this.affiliateRes = {name:item.res.name}
+						}						
+					})
 					if(this.dataType.type==4){
 						this.formDataVal ={
 							annexType: 4,
@@ -160,7 +166,6 @@
 							annexId: data.annexId,
 							annexName: data.fileName
 						});
-						// console.log(this.submitForm, "OOOOOOOOOOOOOOOOOOOOOOOOO");
 						uni.showToast({
 							title: '上传成功',
 							icon: 'none',
@@ -56,10 +56,10 @@
 										<uni-easyinput :inputBorder="false" :disabled='true'
 											v-model="formData.claimLiquidDamag" placeholder="" />
 									</uni-forms-item>
-									<!-- <uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
+									<uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
 														:localdata="maintenancetypeArr" @change='uploadEvidenceChange'></uni-data-checkbox>
-												</uni-forms-item> -->
+												</uni-forms-item>
 									<!-- <uni-forms-item label="是否需要开庭审理" label-width="120px" name="openCourtHear" required>
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.openCourtHear"
 														:localdata="arbitrationmethodArr" @change='arbitrationmethod'></uni-data-checkbox>
@@ -77,9 +77,9 @@
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.adjudicaCounter"
 														:localdata="adjudicaCounterArr"></uni-data-checkbox>
 												</uni-forms-item> -->
-									<!-- <uni-forms-item label="上传证据" name="headImage" label-width="120px" v-if="caseFlag">
-													<uni-file-picker ref="files" :auto-upload="false" @select="select" :limit='1' />
-												</uni-forms-item> -->
+									<uni-forms-item label="上传证据" name="headImage" label-width="120px" v-if="caseFlag">
+													<uni-file-picker ref="files" :auto-upload="false" @select="select"   @delete="handleClose" :limit='1' />
+												</uni-forms-item>
 									<uni-forms-item label="是否书面审理" label-width="120px" name="respondentIsWrittenHear"
 										required>
 										<uni-data-checkbox class='checkbox' v-model="subnitForm.respondentIsWrittenHear"
@@ -97,11 +97,11 @@
 									</uni-forms-item>
 									<uni-forms-item label="申请人：" name="applicantName" label-width="120px" required>
 										<uni-easyinput :inputBorder="false" :disabled='true'
-											v-model="formData.affiliate.applicationName" placeholder="" />
+											v-model="affiliateApp" placeholder="" />
 									</uni-forms-item>
 									<uni-forms-item label="被申请人：" name="respondentName" label-width="120px" required>
 										<uni-easyinput :inputBorder="false" :disabled='true'
-											v-model="formData.affiliate.respondentName" placeholder="" />
+											v-model="affiliateRes" placeholder="" />
 									</uni-forms-item>
 									<!-- <uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
 													<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
@@ -207,19 +207,19 @@
 				<view class="" v-if="sysType == 1">
 					<view class="" style="margin-top: 50rpx;">
 						<view>申请人</view>
-						<view v-for="item in formData.evidenceMaterialList">
+						<view v-for="item in formData.caseAttachList">
 							<uni-link v-if="item.annexType==2" :href="item.annexPath" color="#007BFF"
 								:text="item.fileName"></uni-link>
 						</view>
 						<view>被申请人</view>
-						<view v-for="item in formData.evidenceMaterialList">
+						<view v-for="item in formData.caseAttachList">
 							<uni-link v-if="item.annexType==6" :href="item.annexPath" color="#007BFF"
 								:text="item.fileName"></uni-link>
 						</view>
 					</view>
 					<view class="" style="margin-top: 40rpx;">
 						<view>仲裁申请书</view>
-						<view v-for="item in formData.evidenceMaterialList">
+						<view v-for="item in formData.caseAttachList">
 							<uni-link v-if="item.annexType==1" :href="item.annexPath" color="#007BFF"
 								:text="item.fileName"></uni-link>
 						</view>
@@ -259,7 +259,9 @@
 		arbitratorList,
 		evidenceCrossexami,
 		selectById,
-		updateBooking
+		updateBooking,
+		deleteFile,
+		selectCaseApplication
 	} from '../../../api/handlecase/index.js'
 	import {
 		uploadImage
@@ -269,6 +271,7 @@
 	} from '@/utils/auth'
 	import moment from 'moment'
 	import config from '@/config'
+import constant from '../../../utils/constant.js'
 	const baseUrl = config.baseUrlZC
 	const app = getApp()
 	export default {
@@ -279,6 +282,8 @@
 				defaultSelected: [], //默认选中项
 				serviceList: ['1', '2'], //传递给子组件的数据
 				current: 0,
+				affiliateApp:"",
+				affiliateRes:"",
 				itemsT: ['案件详情', '案件资料'],
 				styleType: 'button',
 				activeColor: '#007aff',
@@ -393,6 +398,7 @@
 					this.subnitForm.adjudicaCounterReason = this.reasontFormData.reasont
 					this.$refs.popup.close()
 					this.reasontFormData.reasont = ''
+					
 				} else {
 					this.$modal.msgError("请输入反意理由")
 				}
@@ -447,32 +453,38 @@
 			},
 			getData(parms) {
 				if (this.sysType == 1) {
-					respondentDetail(parms).then(res => {
-						if (res.data.evidenceMaterialList.length > 0) {
-							res.data.evidenceMaterialList.forEach(item => {
-								let names = item.annexPath.split('_')
-								item['fileName'] = names[names.length - 1]
-								item.annexPath = baseUrl + item.annexPath
-							})
-						}
+					
+					selectCaseApplication({id:parms}).then(res => {
+						console.log(res)
 						this.formData = res.data
 						this.formData.loanEndDate = moment(this.formData.loanEndDate).format(
 							'YYYY-MM-DD HH:mm:ss');
 						this.formData.loanStartDate = moment(this.formData.loanStartDate).format(
 							'YYYY-MM-DD HH:mm:ss');
 						this.formData.id = this.formData.id + ''
+						if (res.data.caseAttachList.length > 0) {
+							res.data.caseAttachList.forEach(item => {
+								let names = item.annexPath.split('_')
+								item['fileName'] = names[names.length - 1]
+								item.annexPath = baseUrl + item.annexPath
+							})
+						}
+						
 					})
 				} else if (this.sysType == 2) {
 					selectById({
 						id: parms
 					}).then(res => {
 						this.formData = res.data
+						this.affiliateApp = res.data.affiliate.applicant.map(item =>item.applicant.name).join(',')
+						this.affiliateRes = res.data.affiliate.res.map(item =>item.res.name).join(',')
 						console.log(res, "KKKKKKKKKKKKKKKKKKKKK");
 					})
 				}
 			},
 			// 文件上传
 			select(e) {
+				console.log(e)
 				this.tempFilePaths = e.tempFilePaths;
 				// loading
 				uni.showLoading({
@@ -510,6 +522,14 @@
 					}
 				})
 			},
+			// 上传删除
+			handleClose(filelds){
+				console.log("关闭",filelds)
+				deleteFile({fileIds:[filelds.tempFile.uuid]}).then(res=>{
+					console.log(res)
+				})
+				
+			},
 			// 获取仲裁员列表
 			getArbitratorList(val) {
 				arbitratorList({caseAppliId: val}).then(res => {
@@ -551,6 +571,7 @@
 				}
 				if (this.sysType == 1) {
 					this.$refs.form.validate().then(res => {
+						console.log(this.subnitForm)
 						this.evidenceCrossexamiFn(this.subnitForm)
 					}).catch(err => {
 						console.log('表单错误信息：', err);
@@ -585,15 +606,19 @@
 			evidenceList() {
 				console.log(this.formData.evidenceMaterialList)
 				this.$tab.navigateTo(
-					`/pages/handlecase/component/evidenceList?title=证据清单&evidenceList=${encodeURIComponent(JSON.stringify(this.formData.evidenceMaterialList))}`
+					`/pages/handlecase/component/evidenceList?title=证据清单&evidenceList=${encodeURIComponent(JSON.stringify(this.formData.caseAttachList))}`
 				)
 			},
 		},
 		onLoad(data) {
 			this.sysType = uni.getStorageSync('sysType')
 			this.getData(data.id);
+			console.log(this.subnitForm)
 			this.subnitForm.caseId = Number(data.id);
-			this.getArbitratorList(data.id)
+			if(this.sysType==2){
+				this.getArbitratorList(data.id)
+			}
+			
 		}

 	}
@@ -29,7 +29,7 @@
 			return {
 				caseList: [],
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 50,
 				sysType: null,
 				total: null,
 				buttonList: []
@@ -55,67 +55,14 @@
 				if (this.sysType == 1) {
 					respondentList(parms).then(res => {
 						// this.caseList = res.rows;
-						if (res.data) {
-							this.caseList = [...this.caseList, ...res.data];
+						if (res.rows) {
+							this.caseList = [...this.caseList, ...res.rows];
 						} else {
 							this.caseList = []
 						}

-						this.caseList.forEach(item => {
-							switch (item.caseStatus) {
-								case 0:
-									item.caseStatusName = '立案申请'
-									break;
-								case 1:
-									item.caseStatusName = '待缴费'
-									break;
-								case 2:
-									item.caseStatusName = '待缴费确认'
-									break;
-								case 3:
-									item.caseStatusName = '待确认是否应诉'
-									break;
-								case 4:
-									item.caseStatusName = '待确认证据'
-									break;
-								case 5:
-									item.caseStatusName = '待确定是否指派仲裁员'
-									break;
-								case 6:
-									item.caseStatusName = '待组庭'
-									break;
-								case 7:
-									item.caseStatusName = '待组庭确定'
-									break;
-								case 8:
-									item.caseStatusName = '待组庭审核'
-									break;
-								case 9:
-									item.caseStatusName = '待选择仲裁方式'
-									break;
-								case 10:
-									item.caseStatusName = '待开庭'
-									break;
-								case 11:
-									item.caseStatusName = '待生成仲裁文书'
-									break;
-								case 12:
-									item.caseStatusName = '待确认仲裁文书'
-									break;
-								case 13:
-									item.caseStatusName = '待仲裁文书用印'
-									break;
-								case 14:
-									item.caseStatusName = '待仲裁文书用印审核'
-									break;
-								case 15:
-									item.caseStatusName = '待仲裁文书送达'
-									break;
-								case 16:
-									item.caseStatusName = '待案件归档'
-									break;
-							}
-						})
+						console.log(res.rows,this.caseList)
+						
 					})
 				} else if (this.sysType == 2) {
 					parms.miniProgressFlag = 1;
@@ -127,6 +74,7 @@
 							this.caseList = []
 						}
 					})
+					
 				}

 			},
@@ -161,7 +109,6 @@
 					obj = {
 						pageNum: this.pageNum,
 						pageSize: this.pageSize,
-						caseStatus: 4
 					}
 				} else if (this.sysType == 2) {
 					obj = {
@@ -170,7 +117,7 @@
 					}
 				}
 				this.getList(obj)
-			}
+			},
 		},
 		onShow() {
 			this.buttonList = []
@@ -180,7 +127,6 @@
 				obj = {
 					pageNum: this.pageNum,
 					pageSize: this.pageSize,
-					caseStatus: 4
 				}
 			} else if (this.sysType == 2) {
 				obj = {
@@ -201,8 +147,13 @@
 			// 	caseStatus:4
 			// }
 			// this.getList(obj)
+		},
+		onUnload(){
+				uni.reLaunch({
+					url: '/pages/work/index'
+				})
 		}
-
+		
 	}
 </script>

@@ -1,5 +1,5 @@
-<template>
-  <view class="content">
+<template>
+  <view class="content">
 	<view class="header">
 		<uni-section title="我的代办事项" type="line" padding></uni-section>
 	</view>
@@ -54,7 +54,7 @@
 		    <view class="badge">{{dataCount.caseApplyEvidence}}</view>
 		    <view class="cardMain">
 		    </view>
-		    <view class="cardMain">
+		    <view class="cardMain" style="margin-top: 75rpx;">
 		      <view class="imgTitle">待案件质证</view>
 		    </view>    
 		</view>
@@ -162,14 +162,14 @@
 		      <view class="imgTitle">待案件归档</view>
 		    </view>    
 		</view> -->
-	</view>
-  </view>
-</template>
-
+	</view>
+  </view>
+</template>
+
 <script>
 	import {todoCount,toDoCountReferee} from '@/api/homePage/index.js'
 	import LuanqingEmpty from "@/components/luanqing-empty.vue"
-	import config from '@/config'
+	import config from '@/config'
  export default {
 	components: {
 		'luanqing-empty': LuanqingEmpty,
@@ -211,16 +211,16 @@
 	},
 	onShow() {
 		this.getHomePage()
-	},
+	},
    onLoad: function() {
 		this.sysType = uni.getStorageSync('sysType');
 		console.log(this.sysType)
-		
-    }
-  }
-</script>
-
-<style lang="scss">
+		
+    }
+  }
+</script>
+
+<style lang="scss">
 	page {
 		background-color: #ffffff;
 	}
@@ -267,5 +267,5 @@
 	        }
 	      }
 	    }
-	  }
-</style>
+	  }
+</style>
@@ -1,246 +1,248 @@
-<template>
-	<view class="normal-login-container">
-		<view class="logo-content align-center justify-center flex" v-if="logSyste==1">
-			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
-			</image>
-			<text class="title">仲裁平台</text>
+<template>
+	<view class="normal-login-container">
+		<view class="logo-content align-center justify-center flex" v-if="logSyste==1">
+			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
+			</image>
+			<text class="title">仲裁平台</text>
 		</view>
 		<view class="logo-content align-center justify-center flex" v-if="logSyste==2">
-			<image style="width: 100rpx;height: 100rpx;" src="../static/refree.png" mode="widthFix">
+			<image style="width: 100rpx;height: 100rpx;" src="https://txroom.xayunmei.com/refree.png" mode="widthFix">
 			</image>
 			<text class="title">调解平台</text>
-		</view>
-		<view class="login-form-content">
-			<view class="input-item flex align-center">
-				<view class="iconfont icon-user icon"></view>
-				<input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
-			</view>
-			<view class="input-item flex align-center">
-				<view class="iconfont icon-password icon"></view>
-				<input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
-			</view>
-			<view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
-				<view class="iconfont icon-code icon"></view>
-				<input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
-				<view class="login-code">
-					<image :src="codeUrl" @click="getCode" class="login-code-img"></image>
-				</view>
+		</view>
+		<view class="login-form-content">
+			<view class="input-item flex align-center">
+				<view class="iconfont icon-user icon"></view>
+				<input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
+			</view>
+			<view class="input-item flex align-center">
+				<view class="iconfont icon-password icon"></view>
+				<input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
+			</view>
+			<view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
+				<view class="iconfont icon-code icon"></view>
+				<input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
+				<view class="login-code">
+					<image :src="codeUrl" @click="getCode" class="login-code-img"></image>
+				</view>
 			</view>
 			<view class="ageen-read">
 				<checkbox-group @change="handleAgreeChange">
-					<checkbox value="agree"/>
+					<checkbox value="agree" />
 					<text class="agreen-text">阅读并同意</text>
 					<text @click="equityNotice" class="text-blue">《权益告知书》</text>
 				</checkbox-group>
-				
-			</view>
-			<view class="action-btn">
-				<button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
-			</view>
-			<view class="reg text-center" v-if="register">
-				<text class="text-grey1">没有账号？</text>
-				<text @click="handleUserRegister" class="text-blue">立即注册</text>
-			</view>
-			<!-- <view class="reg text-center" v-if="register">
-	    <text class="text-grey1">使用其他方式登录：</text>
-	    <text @click="handleUserRegister" class="text-blue"></text>
-	  </view> -->
-			<!-- <view class="xieyi text-center">
-        <text class="text-grey1">登录即代表同意</text>
-        <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
-        <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
-      </view> -->
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import {
-		getCodeImg
-	} from '@/api/login'
-
-	export default {
-		data() {
-			return {
-				codeUrl: "",
+
+			</view>
+			<view class="action-btn">
+				<button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
+			</view>
+			<view class="reg text-center" v-if="register">
+				<text class="text-grey1">没有账号？</text>
+				<text @click="handleUserRegister" class="text-blue">立即注册</text>
+			</view>
+			<!-- <view class="reg text-center" v-if="register">
+	    <text class="text-grey1">使用其他方式登录：</text>
+	    <text @click="handleUserRegister" class="text-blue"></text>
+	  </view> -->
+			<!-- <view class="xieyi text-center">
+        <text class="text-grey1">登录即代表同意</text>
+        <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
+        <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
+      </view> -->
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getCodeImg
+	} from '@/api/login'
+
+	export default {
+		data() {
+			return {
+				codeUrl: "",
 				captchaEnabled: true,
-				logSyste:0,
-				// 用户注册开关
-				register: true,
-				globalConfig: getApp().globalData.config,
-				loginForm: {
-					username: "",
-					password: "",
-					code: "",
+				logSyste: 0,
+				// 用户注册开关
+				register: true,
+				globalConfig: getApp().globalData.config,
+				loginForm: {
+					username: "",
+					password: "",
+					code: "",
 					uuid: '',
-					
+
 				},
-				isSelectAgree:[]
-			}
-		},
-		created() {
-			this.getCode()
-		},
+				isSelectAgree: []
+			}
+		},
+		created() {
+			this.getCode()
+		},
 		methods: {
-			handleAgreeChange(e){
+			handleAgreeChange(e) {
 				this.isSelectAgree = e.detail.value
-			},
-			// 用户注册
-			handleUserRegister() {
-				this.$tab.redirectTo(`/pages/realName`)
+			},
+			// 用户注册
+			handleUserRegister() {
+				this.$tab.redirectTo(`/pages/realName`)
 			},
 			// 权益告知书
-			equityNotice(){
+			equityNotice() {
 				//this.$tab.redirectTo(`/pages/personalInfoCollection`)
 				this.$tab.navigateTo(`/pages/personalInfoCollection?title=权益告知书`)
-			},
-			// 隐私协议
-			handlePrivacy() {
-				let site = this.globalConfig.appInfo.agreements[0]
-				this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
-			},
-			// 用户协议
-			handleUserAgrement() {
-				let site = this.globalConfig.appInfo.agreements[1]
-				this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
-			},
-			// 获取图形验证码
-			getCode() {
-				getCodeImg().then(res => {
-					this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
-					if (this.captchaEnabled) {
-						this.codeUrl = 'data:image/gif;base64,' + res.img
-						this.loginForm.uuid = res.uuid
-					}
-				})
-			},
-			// 登录方法
-			async handleLogin() {
-				const sysType = uni.getStorageSync('sysType')
-				if (this.loginForm.username === "") {
-					this.$modal.msgError("请输入您的账号")
-				}else if(this.isSelectAgree.length < 1){
-					this.$modal.msgError("请先阅读个人信息收集条款并同意")
-				} else if (this.loginForm.password === "") {
-					this.$modal.msgError("请输入您的密码")
-				} else if (this.loginForm.code === "" && this.captchaEnabled) {
-					this.$modal.msgError("请输入验证码")
-				} else {
-					this.$modal.loading("登录中，请耐心等待...")
-					this.pwdLogin()
-				}
-			},
-			// 密码登录
-			async pwdLogin() {
-				this.$store.dispatch('Login', this.loginForm).then(() => {
-					this.$modal.closeLoading()
-					this.loginSuccess()
-				}).catch(() => {
-					if (this.captchaEnabled) {
-						this.getCode()
-					}
-				})
-			},
-			// 登录成功后，处理函数
-			loginSuccess(result) {
-				// 设置用户信息
-				this.$store.dispatch('GetInfo').then(res => {
-					this.$tab.reLaunch('/pages/work/index')
-				})
 			},
-			onLoad(options){
-				 let vals = decodeURIComponent(options.values);
-				 this.logSyste = vals
+			// 隐私协议
+			handlePrivacy() {
+				let site = this.globalConfig.appInfo.agreements[0]
+				this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
+			},
+			// 用户协议
+			handleUserAgrement() {
+				let site = this.globalConfig.appInfo.agreements[1]
+				this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
+			},
+			// 获取图形验证码
+			getCode() {
+				getCodeImg().then(res => {
+					this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
+					if (this.captchaEnabled) {
+						this.codeUrl = 'data:image/gif;base64,' + res.img
+						this.loginForm.uuid = res.uuid
+					}
+				})
+			},
+			// 登录方法
+			async handleLogin() {
+				const sysType = uni.getStorageSync('sysType')
+				if (this.loginForm.username === "") {
+					this.$modal.msgError("请输入您的账号")
+				} else if (this.isSelectAgree.length < 1) {
+					this.$modal.msgError("请先阅读个人信息收集条款并同意")
+				} else if (this.loginForm.password === "") {
+					this.$modal.msgError("请输入您的密码")
+				} else if (this.loginForm.code === "" && this.captchaEnabled) {
+					this.$modal.msgError("请输入验证码")
+				} else {
+					this.$modal.loading("登录中，请耐心等待...")
+					this.pwdLogin()
+				}
+			},
+			// 密码登录
+			async pwdLogin() {
+				this.$store.dispatch('Login', this.loginForm).then(() => {
+					this.$modal.closeLoading()
+					this.loginSuccess()
+				}).catch(() => {
+					if (this.captchaEnabled) {
+						this.getCode()
+					}
+				})
+			},
+			// 登录成功后，处理函数
+			loginSuccess(result) {
+				// 设置用户信息
+				this.$store.dispatch('GetInfo').then(res => {
+					this.$tab.reLaunch('/pages/work/index')
+				})
+			},
+			onLoad(options) {
+				let vals = decodeURIComponent(options.values);
+				this.logSyste = vals
 			}
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #ffffff;
-	}
-
-	.normal-login-container {
-		width: 100%;
-
-		.logo-content {
-			width: 100%;
-			font-size: 21px;
-			text-align: center;
-			padding-top: 15%;
-
-			image {
-				border-radius: 4px;
-			}
-
-			.title {
-				margin-left: 10px;
-			}
-		}
-
-		.login-form-content {
-			// text-align: center;
-			margin: 20px auto;
-			margin-top: 15%;
-			width: 80%;
-
-			.input-item {
-				margin: 20px auto;
-				background-color: #f5f6f7;
-				height: 45px;
-				border-radius: 20px;
-
-				.icon {
-					font-size: 38rpx;
-					margin-left: 10px;
-					color: #999;
-				}
-
-				.input {
-					width: 100%;
-					font-size: 14px;
-					line-height: 20px;
-					text-align: left;
-					padding-left: 15px;
-				}
-
-			}
-
-			.login-btn {
-				margin-top: 40px;
-				height: 45px;
-			}
-
-			.reg {
-				margin-top: 15px;
-			}
-
-			.xieyi {
-				color: #333;
-				margin-top: 20px;
-			}
-
-			.login-code {
-				height: 38px;
-				float: right;
-
-				.login-code-img {
-					height: 38px;
-					position: absolute;
-					margin-left: 10px;
-					width: 200rpx;
-				}
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #ffffff;
+	}
+
+	.normal-login-container {
+		width: 100%;
+
+		.logo-content {
+			width: 100%;
+			font-size: 21px;
+			text-align: center;
+			padding-top: 15%;
+
+			image {
+				border-radius: 4px;
 			}
-			.ageen-read{
-				margin-top:65rpx;
-				.agreen-text{
-					padding-left:20rpx;
+
+			.title {
+				margin-left: 10px;
+			}
+		}
+
+		.login-form-content {
+			// text-align: center;
+			margin: 20px auto;
+			margin-top: 15%;
+			width: 80%;
+
+			.input-item {
+				margin: 20px auto;
+				background-color: #f5f6f7;
+				height: 45px;
+				border-radius: 20px;
+
+				.icon {
+					font-size: 38rpx;
+					margin-left: 10px;
 					color: #999;
 				}
-			}
-		}
-	}
+
+				.input {
+					width: 100%;
+					font-size: 14px;
+					line-height: 20px;
+					text-align: left;
+					padding-left: 15px;
+				}
+
+			}
+
+			.login-btn {
+				margin-top: 40px;
+				height: 45px;
+			}
+
+			.reg {
+				margin-top: 15px;
+			}
+
+			.xieyi {
+				color: #333;
+				margin-top: 20px;
+			}
+
+			.login-code {
+				height: 38px;
+				float: right;
+
+				.login-code-img {
+					height: 38px;
+					position: absolute;
+					margin-left: 10px;
+					width: 200rpx;
+				}
+			}
+
+			.ageen-read {
+				margin-top: 65rpx;
+
+				.agreen-text {
+					padding-left: 20rpx;
+					color: #999;
+				}
+			}
+		}
+	}
 </style>
@@ -1,7 +1,10 @@
 <template>
 	<view class="page-body">
 		<view class="action-btn">
-		  <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">点击进行实名认证</button>
+		  <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">点击身份证实名认证</button>
+		</view>
+		<view class="action-btn">
+		  <button @click="handlePassport()" class="register-btn cu-btn block bg-blue lg round">点击护照实名注册</button>
 		</view>
 	</view>
 </template>
@@ -17,7 +20,8 @@
 	export default{
 		data(){
 			return{
-				eidToken: ""
+				eidToken: "",
+				vals:1
 			}
 		},
 		methods:{
@@ -58,6 +62,12 @@
 						})
 					},
 				});
+			},
+			// 点击护照注册
+			handlePassport(){
+				uni.navigateTo({
+					url: `/pages/register?valus=${this.vals}`
+				});
 			}
 		},
 		onLoad() {
@@ -3,7 +3,8 @@
 		<view class="logo-content align-center justify-center flex">
 			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
 			</image>
-			<text class="title">仲裁系统注册</text>
+			<text class="title" v-if="sysType==1">仲裁系统注册</text>
+			<text class="title" v-if="sysType==2">调解系统注册</text>
 		</view>
 		<view class="login-form-content">
 			<view class="input-item flex align-center" style="width: 60%;margin: 0px;">
@@ -18,10 +19,25 @@
 				<!-- <view class="iconfont icon-user icon"></view> -->
 				<input v-model="registerForm.verifyCode" class="input" type="number" placeholder="请输入手机验证码"
 					maxlength="30" />
+			</view>
+			<view class="input-item flex align-center">
+				<uni-data-select
+						style="text-align: left;width: 200px;"
+						v-model="registerForm.idType"
+				       :localdata="certificate"
+					   @change="certificateValue"
+				     ></uni-data-select>
+			</view>
+			<view class="input-item flex align-center">
+				<uni-data-select
+						style="text-align: left;width: 200px;d"
+						v-model="registerForm.nationality"
+				       :localdata="nationality"
+				     ></uni-data-select>
 			</view>
 			<view class="input-item flex align-center">
 				<!-- <view class="iconfont icon-user icon"></view> -->
-				<input v-model="registerForm.identityNo" class="input" type="text" placeholder="请输入身份证号"
+				<input v-model="registerForm.identityNo" class="input" type="text" placeholder="请输入证件号码"
 					maxlength="30" />
 			</view>
 			<view class="input-item flex align-center">
@@ -68,8 +84,10 @@
 		getCodeImg,
 		register,
 		sendCode,
-		wxregister
+		wxregister,
+		idType
 	} from '@/api/login'
+import constant from '../utils/constant'

 	export default {
 		data() {
@@ -87,23 +105,22 @@
 					uuid: '',
 					name: '',
 					identityNo: "",
-					id: ""
-				}
+					id: "",
+					idType:0,
+					nationality:0
+				},
+				sysType:null,
+				certificate: [],
+				nationality: [
+					{ value: 0, text: "境内" },
+					{ value: 1, text: "境外" },
+				],
+				passportVal:{}
 			}
 		},
 		created() {
 			this.getCode()
 		},
-		onLoad(option) {
-			let {
-				params
-			} = option
-			// this.improvedetail = JSON.parse(improvedetail)
-			let paramsObj = JSON.parse(params);
-			this.registerForm.name = paramsObj.nickName;
-			this.registerForm.identityNo = paramsObj.idCard
-			this.registerForm.id = paramsObj.id
-		},
 		methods: {
 			// 获取手机验证码
 			getCodeNumber(data) {
@@ -196,8 +213,39 @@
 				this.$store.dispatch('GetInfo').then(res => {
 					this.$tab.reLaunch('/pages/index')
 				})
+			},
+			certificateValue(e){
+				// this.registerForm.idType = e
+			},
+			// 获取证件类型
+			getIdType(){
+				idType().then(res=>{
+					res.data.forEach(item=>{
+						 this.certificate.push({value:item.dictSort,text:item.dictLabel})
+					})
+					console.log(this.certificate)
+				})
 			}
-		}
+		},
+		onLoad(option) {
+			this.sysType = uni.getStorageSync('sysType');
+			// this.passportVal = option;
+			console.log(option)
+			if(option.valus==1){
+				this.registerForm.idType =0
+				this.registerForm.nationality =0
+			}else{
+				let {
+					params
+				} = option
+				// this.improvedetail = JSON.parse(improvedetail)
+				let paramsObj = JSON.parse(params);
+				this.registerForm.name = paramsObj.nickName;
+				this.registerForm.identityNo = paramsObj.idCard
+				this.registerForm.id = paramsObj.id
+			}
+			this.getIdType()
+		},
 	}
 </script>

@@ -205,7 +253,19 @@
 	page {
 		background-color: #ffffff;
 	}
-
+	::v-deep .uni-select[data-v-6b64008e]{
+		border: none;
+	}
+	::v-deep .uni-icons[data-v-a2e81f6e]{
+		display: none;
+	}
+	.uni-icons{
+		display: none;
+	}
+	// ::v-deep .uni-select{
+	// 	border: none;
+	// 	width: 200%;
+	// }
 	.normal-login-container {
 		width: 100%;
 		background-color: #ffffff;
@@ -1,17 +1,18 @@
-<template>
-	<view class="work-container">
-		<!-- 仲裁轮播图 -->
-		<uni-swiper-dot v-if="sysType==1" class="uni-swiper-dot-box" :info="data" :current="current" field="content">
-			<swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
-				<swiper-item v-for="(item, index) in data" :key="index">
-					<view class="swiper-item" @click="clickBannerItem(item)">
-						<image :src="item.image" mode="aspectFill" :draggable="false" />
-					</view>
-				</swiper-item>
-			</swiper>
-		</uni-swiper-dot>
+<template>
+	<view class="work-container">
+		<!-- 仲裁轮播图 -->
+		<uni-swiper-dot v-if="sysType==1" class="uni-swiper-dot-box" :info="data" :current="current" field="content">
+			<swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
+				<swiper-item v-for="(item, index) in data" :key="index">
+					<view class="swiper-item" @click="clickBannerItem(item)">
+						<image :src="item.image" mode="aspectFill" :draggable="false" />
+					</view>
+				</swiper-item>
+			</swiper>
+		</uni-swiper-dot>
 		<!-- 调解轮播图 -->
-		<uni-swiper-dot v-if="sysType==2" class="uni-swiper-dot-box" :info="refreesVal" :current="current" field="content">
+		<uni-swiper-dot v-if="sysType==2" class="uni-swiper-dot-box" :info="refreesVal" :current="current"
+			field="content">
 			<swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
 				<swiper-item v-for="(item, index) in refreesVal" :key="index">
 					<view class="swiper-item" @click="clickBannerItem(item)">
@@ -19,310 +20,308 @@
 					</view>
 				</swiper-item>
 			</swiper>
-		</uni-swiper-dot>
-		<!-- 宫格组件 -->
-		<!-- <uni-section v-if="certificationStatus == '1'" class="uni-section" title="系统管理" type="line">
-			<template v-slot:right>
-				已认证
-			</template>
-		</uni-section>
-		<uni-section v-else class="uni-section" title="系统管理" type="line" @click="certification">
-			<template v-slot:right>
-				未认证
-			</template>
-		</uni-section> -->
-		<!-- <uni-section class="uni-section" title="系统管理" type="line"></uni-section> -->
-		<view class="grid-body">
-			<uni-grid :column="4" :showBorder="false">
-				<uni-grid-item>
-					<view class="grid-item-box" @tap="changeGrid(0)">
-						<uni-icons type="calendar-filled" size="30" color="#327DD7"></uni-icons>
+		</uni-swiper-dot>
+		<!-- 宫格组件 -->
+		<!-- <uni-section v-if="certificationStatus == '1'" class="uni-section" title="系统管理" type="line">
+			<template v-slot:right>
+				已认证
+			</template>
+		</uni-section>
+		<uni-section v-else class="uni-section" title="系统管理" type="line" @click="certification">
+			<template v-slot:right>
+				未认证
+			</template>
+		</uni-section> -->
+		<!-- <uni-section class="uni-section" title="系统管理" type="line"></uni-section> -->
+		<view class="grid-body">
+			<uni-grid :column="4" :showBorder="false">
+				<uni-grid-item>
+					<view class="grid-item-box" @tap="changeGrid(0)">
+						<uni-icons type="calendar-filled" size="30" color="#327DD7"></uni-icons>
 						<text class="text" v-if="sysType == 1">待办案件</text>
-						<text class="text" v-if="sysType == 2">我的申请</text>
-					</view>
-				</uni-grid-item>
-				<uni-grid-item v-if="sysType == 2 && checkPermi(['caseManagement:list:add'])">
-					<view class="grid-item-box" @tap="changeGrid(1)">
-						<uni-icons type="staff-filled" size="30" color="#327DD7"></uni-icons>
-						<text class="text">立案申请</text>
-					</view>
-				</uni-grid-item>
-				<!-- <uni-grid-item v-if="sysType == 2">
-					<view class="grid-item-box" @tap="changeGrid(2)">
-						<uni-icons type="color" size="30" color="#327DD7"></uni-icons>
-						<text class="text">线上调解</text>
-					</view>
-				</uni-grid-item>
-				<uni-grid-item v-if="sysType == 2">
-					<view class="grid-item-box" @tap="changeGrid(3)">
-						<uni-icons type="compose" size="30" color="#327DD7"></uni-icons>
-						<text class="text">我的申请</text>
-					</view>
-				</uni-grid-item> -->
-				<!-- <uni-grid-item>
-					<view class="grid-item-box" @tap="changeGrid(4)">
-						<uni-icons type="heart-filled" size="30" color="#327DD7"></uni-icons>
-						<text class="text">证据交换</text>
-					</view>
-				</uni-grid-item> -->
-				<uni-grid-item>
-					<view class="grid-item-box" @tap="changeGrid(5)">
-						<uni-icons type="bars" size="30" color="#327DD7"></uni-icons>
+						<text class="text" v-if="sysType == 2">我的申请</text>
+					</view>
+				</uni-grid-item>
+				<uni-grid-item v-if="sysType == 2 && checkPermi(['caseManagement:list:add'])">
+					<view class="grid-item-box" @tap="changeGrid(1)">
+						<uni-icons type="staff-filled" size="30" color="#327DD7"></uni-icons>
+						<text class="text">立案申请</text>
+					</view>
+				</uni-grid-item>
+				<!-- <uni-grid-item v-if="sysType == 2">
+					<view class="grid-item-box" @tap="changeGrid(2)">
+						<uni-icons type="color" size="30" color="#327DD7"></uni-icons>
+						<text class="text">线上调解</text>
+					</view>
+				</uni-grid-item>
+				<uni-grid-item v-if="sysType == 2">
+					<view class="grid-item-box" @tap="changeGrid(3)">
+						<uni-icons type="compose" size="30" color="#327DD7"></uni-icons>
+						<text class="text">我的申请</text>
+					</view>
+				</uni-grid-item> -->
+				<!-- <uni-grid-item>
+					<view class="grid-item-box" @tap="changeGrid(4)">
+						<uni-icons type="heart-filled" size="30" color="#327DD7"></uni-icons>
+						<text class="text">证据交换</text>
+					</view>
+				</uni-grid-item> -->
+				<uni-grid-item>
+					<view class="grid-item-box" @tap="changeGrid(5)">
+						<uni-icons type="bars" size="30" color="#327DD7"></uni-icons>
 						<text class="text" v-if="sysType == 1">视频审理</text>
-						<text class="text" v-if="sysType == 2">线上调解</text>
-					</view>
-				</uni-grid-item>
-				<!-- <uni-grid-item>
-					<view class="grid-item-box" @tap="changeGrid(6)">
-						<uni-icons type="email-filled" size="30" color="#327DD7"></uni-icons>
-						<text class="text">查询快递</text>
-					</view>
-				</uni-grid-item> -->
-				<!-- <uni-grid-item>
-					<view class="grid-item-box" @tap="changeGrid(7)">
-						<uni-icons type="compose" size="30" color="#327DD7"></uni-icons>
-						<text class="text">在线签字</text>
-					</view>
-				</uni-grid-item> -->
-				<!-- <uni-grid-item>
-					<view class="grid-item-box" @tap="changeGrid(8)">
-						<uni-icons type="wallet-filled" size="30" color="#327DD7"></uni-icons>
-						<text class="text">仲裁文书</text>
-					</view>
-				</uni-grid-item>
-				<uni-grid-item>
-					<view class="grid-item-box" @tap="changeGrid(9)">
-						<uni-icons type="wallet-filled" size="30" color="#327DD7"></uni-icons>
-						<text class="text">法规政策</text>
-					</view>
-				</uni-grid-item> -->
-			</uni-grid>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		startEid
-	} from '../../mp_ecard_sdk/main.js'
-	import {
-		getEidtoken,
-		sendEidtoken
-	} from "../../api/login.js"
-	export default {
-		data() {
-			return {
-				current: 0,
-				swiperDotIndex: 0,
-				data: [{
-						image: 'https://img.tukuppt.com/bg_grid/00/09/96/qWJxN1umma.jpg!/fh/350'
-					},
-					{
-						image: 'https://img.tukuppt.com/bg_grid/00/18/92/JBheZs7ZVK.jpg!/fh/350'
-					},
-					{
-						image: 'https://img.tukuppt.com/bg_grid/00/81/07/DGEl4suqeV.jpg!/fh/350'
-					}
-				],
-				refreesVal :[
+						<text class="text" v-if="sysType == 2">线上调解</text>
+					</view>
+				</uni-grid-item>
+				<!-- <uni-grid-item>
+					<view class="grid-item-box" @tap="changeGrid(6)">
+						<uni-icons type="email-filled" size="30" color="#327DD7"></uni-icons>
+						<text class="text">查询快递</text>
+					</view>
+				</uni-grid-item> -->
+				<!-- <uni-grid-item>
+					<view class="grid-item-box" @tap="changeGrid(7)">
+						<uni-icons type="compose" size="30" color="#327DD7"></uni-icons>
+						<text class="text">在线签字</text>
+					</view>
+				</uni-grid-item> -->
+				<!-- <uni-grid-item>
+					<view class="grid-item-box" @tap="changeGrid(8)">
+						<uni-icons type="wallet-filled" size="30" color="#327DD7"></uni-icons>
+						<text class="text">仲裁文书</text>
+					</view>
+				</uni-grid-item>
+				<uni-grid-item>
+					<view class="grid-item-box" @tap="changeGrid(9)">
+						<uni-icons type="wallet-filled" size="30" color="#327DD7"></uni-icons>
+						<text class="text">法规政策</text>
+					</view>
+				</uni-grid-item> -->
+			</uni-grid>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		startEid
+	} from '../../mp_ecard_sdk/main.js'
+	import {
+		getEidtoken,
+		sendEidtoken
+	} from "../../api/login.js"
+	export default {
+		data() {
+			return {
+				current: 0,
+				swiperDotIndex: 0,
+				data: [{
+						image: 'https://img.tukuppt.com/bg_grid/00/09/96/qWJxN1umma.jpg!/fh/350'
+					},
 					{
-					image:'../../static/tiaojie1.png'
-					},{
-						image:'../../static/tiaojie2.png'
-					},{
-						image:'../../static/tiaojie4.png'
+						image: 'https://img.tukuppt.com/bg_grid/00/18/92/JBheZs7ZVK.jpg!/fh/350'
+					},
+					{
+						image: 'https://img.tukuppt.com/bg_grid/00/81/07/DGEl4suqeV.jpg!/fh/350'
 					}
-				],
-				certificationStatus: "",
+				],
+				refreesVal: [{
+					image: 'https://txroom.xayunmei.com/tiaojie1.png'
+				}, {
+					image: 'https://txroom.xayunmei.com/tiaojie2.png'
+				}, {
+					image: 'https://txroom.xayunmei.com/tiaojie4.png'
+				}],
+				certificationStatus: "",
 				eidToken: "",
-				sysType:null
-			}
-		},
-		methods: {
-			clickBannerItem(item) {
-				console.info(item)
-			},
-			changeSwiper(e) {
-				this.current = e.detail.current
-			},
-			changeGrid(e) {
-				// this.$modal.showToast('模块建设中~')
-				// if (this.certificationStatus == "0") {
-				// 	uni.showToast({
-				// 		title: '请先完成实名认证',
-				// 		icon: 'none',
-				// 		duration: 1000
-				// 	})
-				// 	return
-				// }
-				switch (e) {
-					case 0:
-						uni.navigateTo({
-							url: ('/pages/handlecase/index')
-						})
-						break;
-					case 5:
-						uni.navigateTo({
-							url: ('/pages/im/index')
-						})
-						break;
-					case 6:
-						uni.navigateTo({
-							url: ('/pages/expressDelivery/index')
-						})
-						break;
-					case 7:
-						uni.navigateTo({
-							url: ('/pages/signature/index')
-						})
+				sysType: null
+			}
+		},
+		methods: {
+			clickBannerItem(item) {
+				console.info(item)
+			},
+			changeSwiper(e) {
+				this.current = e.detail.current
+			},
+			changeGrid(e) {
+				// this.$modal.showToast('模块建设中~')
+				// if (this.certificationStatus == "0") {
+				// 	uni.showToast({
+				// 		title: '请先完成实名认证',
+				// 		icon: 'none',
+				// 		duration: 1000
+				// 	})
+				// 	return
+				// }
+				switch (e) {
+					case 0:
+						uni.navigateTo({
+							url: ('/pages/handlecase/index')
+						})
+						break;
+					case 5:
+						uni.navigateTo({
+							url: ('/pages/im/index')
+						})
+						break;
+					case 6:
+						uni.navigateTo({
+							url: ('/pages/expressDelivery/index')
+						})
+						break;
+					case 7:
+						uni.navigateTo({
+							url: ('/pages/signature/index')
+						})
 						break;
 					case 1:
 						uni.navigateTo({
 							url: (`/pages/handlecase/component/newlyAddedCase?title=新增案件`)
 						})
-						break;
-					default:
-						break;
-				}
-			},
-			// 获取eidtoken
-			getEidtokenFn() {
-				getEidtoken({}).then(res => {
-					console.log(res.data.EidToken, "kkkkkkkkk");
-					this.eidToken = res.data.EidToken
-				})
-			},
-			// 点击实名认证
-			certification() {
-				let that = this
-				// uni.navigateTo({
-				// 	url: ('/mp_ecard_sdk/index/index')
-				// })
-				startEid({
-					data: {
-						token: this.eidToken,
-					},
-					verifyDoneCallback(res) {
-						const {
-							token,
-							verifyDone
-						} = res;
-						console.log('收到核身完成的res:', res);
-						console.log('核身的token是:', token);
-						console.log('是否完成核身:', verifyDone);
-						sendEidtoken({
-							"eidToken": token
-						}).then(res => {
-							that.certificationStatus = '1'
-						})
-					},
-				});
-			}
-		},
+						break;
+					default:
+						break;
+				}
+			},
+			// 获取eidtoken
+			getEidtokenFn() {
+				getEidtoken({}).then(res => {
+					console.log(res.data.EidToken, "kkkkkkkkk");
+					this.eidToken = res.data.EidToken
+				})
+			},
+			// 点击实名认证
+			certification() {
+				let that = this
+				// uni.navigateTo({
+				// 	url: ('/mp_ecard_sdk/index/index')
+				// })
+				startEid({
+					data: {
+						token: this.eidToken,
+					},
+					verifyDoneCallback(res) {
+						const {
+							token,
+							verifyDone
+						} = res;
+						console.log('收到核身完成的res:', res);
+						console.log('核身的token是:', token);
+						console.log('是否完成核身:', verifyDone);
+						sendEidtoken({
+							"eidToken": token
+						}).then(res => {
+							that.certificationStatus = '1'
+						})
+					},
+				});
+			}
+		},
 		onLoad() {
 			this.sysType = uni.getStorageSync('sysType');
-			console.log(this.sysType)
-			// sendEidtoken({
-			// 	"eidToken": 'C0339AE1-7B30-4DB9-B1E4-35A10F45249B'
-			// }).then(res => {
-			// 	// that.certificationStatus = '已认证'
-			// })
-			this.getEidtokenFn()
-			// this.certificationStatus = uni.getStorageSync('certificationStatus')
-		},
-	}
-</script>
-
-<style lang="scss">
-	/* #ifndef APP-NVUE */
-	page {
-		display: flex;
-		flex-direction: column;
-		box-sizing: border-box;
-		background-color: #fff;
-		min-height: 100%;
-		height: auto;
-	}
-
-	view {
-		font-size: 14px;
-		line-height: inherit;
-	}
-
-	/* #endif */
-
-	.text {
-		text-align: center;
-		font-size: 26rpx;
-		margin-top: 10rpx;
-	}
-
-	.grid-item-box {
-		flex: 1;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		padding: 15px 0;
-	}
-
-	.uni-margin-wrap {
-		width: 690rpx;
-		width: 100%;
-		;
-	}
-
-	.swiper {
-		height: 300rpx;
-	}
-
-	.swiper-box {
-		height: 150px;
-	}
-
-	.swiper-item {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		color: #fff;
-		height: 300rpx;
-		line-height: 300rpx;
-	}
-
-	.grid-body {
-		// background-image: url('https://img.tukuppt.com/bg_grid/00/18/52/aEicoC2qMI.jpg!/fh/350');
-		background-repeat: no-repeat;
-		background-size: cover;
-		height: 900rpx;
-		// color: #fff;
-		opacity: 0.9;
-	}
-
-	.uni-section {
-		background-color: #b90404 !important;
-		color: #fff;
-	}
-
-	/deep/ .uni-section__content-title {
-		color: #fff !important;
-	}
-
-	@media screen and (min-width: 500px) {
-		.uni-swiper-dot-box {
-			width: 400px;
-			/* #ifndef APP-NVUE */
-			margin: 0 auto;
-			/* #endif */
-			margin-top: 8px;
-		}
-
-		.image {
-			width: 100%;
-		}
-	}
+			console.log(this.sysType)
+			// sendEidtoken({
+			// 	"eidToken": 'C0339AE1-7B30-4DB9-B1E4-35A10F45249B'
+			// }).then(res => {
+			// 	// that.certificationStatus = '已认证'
+			// })
+			this.getEidtokenFn()
+			// this.certificationStatus = uni.getStorageSync('certificationStatus')
+		},
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	page {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		background-color: #fff;
+		min-height: 100%;
+		height: auto;
+	}
+
+	view {
+		font-size: 14px;
+		line-height: inherit;
+	}
+
+	/* #endif */
+
+	.text {
+		text-align: center;
+		font-size: 26rpx;
+		margin-top: 10rpx;
+	}
+
+	.grid-item-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 15px 0;
+	}
+
+	.uni-margin-wrap {
+		width: 690rpx;
+		width: 100%;
+		;
+	}
+
+	.swiper {
+		height: 300rpx;
+	}
+
+	.swiper-box {
+		height: 150px;
+	}
+
+	.swiper-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		color: #fff;
+		height: 300rpx;
+		line-height: 300rpx;
+	}
+
+	.grid-body {
+		// background-image: url('https://img.tukuppt.com/bg_grid/00/18/52/aEicoC2qMI.jpg!/fh/350');
+		background-repeat: no-repeat;
+		background-size: cover;
+		height: 900rpx;
+		// color: #fff;
+		opacity: 0.9;
+	}
+
+	.uni-section {
+		background-color: #b90404 !important;
+		color: #fff;
+	}
+
+	/deep/ .uni-section__content-title {
+		color: #fff !important;
+	}
+
+	@media screen and (min-width: 500px) {
+		.uni-swiper-dot-box {
+			width: 400px;
+			/* #ifndef APP-NVUE */
+			margin: 0 auto;
+			/* #endif */
+			margin-top: 8px;
+		}
+
+		.image {
+			width: 100%;
+		}
+	}
 </style>
@@ -1,30 +1,30 @@
-{
-  "description": "项目配置文件。",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": false,
-    "postcss": true,
-    "minified": true,
-    "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "condition": false
-  },
-  "compileType": "miniprogram",
-  "libVersion": "3.1.1",
-  "appid": "wx91cb8459dca561b4",
-  "projectname": "智慧仲裁",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
+{
+  "description": "项目配置文件。",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": false,
+    "postcss": true,
+    "minified": true,
+    "newFeature": true,
+    "bigPackageSizeSupport": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "condition": false
+  },
+  "compileType": "miniprogram",
+  "libVersion": "3.4.3",
+  "appid": "wx91cb8459dca561b4",
+  "projectname": "智慧仲裁",
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
 }
@@ -1,8 +1,8 @@
-{
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "miniapp",
-  "setting": {
-    "compileHotReLoad": true,
-    "urlCheck": false
-  }
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "miniapp",
+  "setting": {
+    "compileHotReLoad": true,
+    "urlCheck": true
+  }
 }
Author	SHA1	Message	Date
gyj	61219b5206	合并修改	2024-05-24 14:55:38 +08:00
gyj	9e008b4dae	小程序详情	2024-05-24 14:52:26 +08:00
hanchaoboandGitea	c65df955fd	Merge branch 'hcb' of SH-Arbitrate/miniapp into dev	2024-05-17 14:19:05 +08:00
hanchaobo	c49f5ab27d	按钮权限	2024-05-17 14:17:55 +08:00
gaogaoyujieandGitea	2151b8e929	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-05-16 16:15:32 +08:00
gyj	48d35a7d92	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-05-16 16:13:28 +08:00
gyj	6d6b6e6266	bug修改	2024-05-16 16:13:09 +08:00
gaogaoyujieandGitea	2bfee9568b	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-05-14 15:48:40 +08:00
gyj	875a33bcc3	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-05-14 15:47:40 +08:00
gyj	c4d1e1cf96	修改测试bug	2024-05-14 15:47:23 +08:00
gaogaoyujieandGitea	0d1a04da81	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-05-06 16:12:06 +08:00
gyj	513464cc74	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-05-06 16:10:47 +08:00
gyj	5664dfc7b6	修改新增bug	2024-05-06 16:10:27 +08:00
gaogaoyujieandGitea	e4feb9f9f0	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-04-30 11:32:01 +08:00
gyj	bc382a5533	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-04-30 11:30:00 +08:00
gyj	44935b095e	小程序新增修改	2024-04-30 11:29:45 +08:00
gaogaoyujieandGitea	5b8dccc61e	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-04-29 15:40:12 +08:00
gyj	5c85b93dd3	小程序测试bug	2024-04-29 15:38:27 +08:00
hanchaoboandGitea	a2558c0e29	Merge branch 'hcb' of SH-Arbitrate/miniapp into dev	2024-04-19 17:23:09 +08:00
hanchaobo	2cc23d70c4	新增页面的修改	2024-04-19 17:20:13 +08:00
gaogaoyujieandGitea	84ee84777d	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-04-07 14:35:50 +08:00
gyj	fe831c1549	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-04-07 14:33:17 +08:00
gyj	d74a057fe7	'小程序修改'	2024-04-07 14:33:07 +08:00
gaogaoyujieandGitea	52ae542c27	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-04-01 17:56:58 +08:00
gyj	38d8681f00	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-04-01 17:55:04 +08:00
gyj	2b4973d00a	修改测试bug	2024-04-01 17:54:48 +08:00
gaogaoyujieandGitea	f20d8160f0	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-03-29 11:05:27 +08:00
gyj	3932bce353	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-03-29 11:03:39 +08:00
gyj	9346ff344c	修改新增页面	2024-03-29 11:02:27 +08:00
gaogaoyujieandGitea	f9c89cf57a	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-03-27 10:28:34 +08:00
gyj	096457e28e	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-03-27 10:24:01 +08:00
gyj	31b4b33e59	小程序修改页面接口开发	2024-03-27 10:23:33 +08:00
gaogaoyujieandGitea	b4540c687b	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-03-25 18:19:42 +08:00
gyj	766a60a887	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-03-25 18:17:45 +08:00
gyj	a51a93a86c	小程序新增页面的修改	2024-03-25 18:17:27 +08:00
gaogaoyujieandGitea	78b4a8b717	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-03-18 16:14:27 +08:00
gyj	40780e403d	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-03-18 16:12:50 +08:00
gyj	e16107be27	小程序修改证件类型取动态数据	2024-03-18 16:12:31 +08:00
gaogaoyujieandGitea	3e7df4eae5	Merge branch 'gyj' of SH-Arbitrate/miniapp into dev	2024-03-13 17:22:26 +08:00
gyj	4a2a9ed7b3	小程序注册添加字段	2024-03-13 17:19:20 +08:00
gaogaoyujieandGitea	bd877defee	Merge branch 'dev' of SH-Arbitrate/miniapp into gyj	2024-03-12 16:27:56 +08:00
gyj	ba382fa291	修改前缀	2024-03-12 16:22:32 +08:00
gyj	3e8354dfdf	小程序新增添加国籍类型，修改页面跳转	2024-03-12 15:20:01 +08:00
gyj	8111c269ef	Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/miniapp into gyj	2024-03-08 10:59:11 +08:00
gyj	471323a6cf	修改页面的bug	2024-03-08 10:46:26 +08:00
hanchaoboandGitea	64718de258	Merge branch 'hcb' of SH-Arbitrate/miniapp into dev	2024-03-08 09:21:25 +08:00
hanchaobo	3588bed039	小程序静态文件过大	2024-03-08 09:20:02 +08:00
hhlxayunmeiandGitea	2341d73a42	Merge branch 'hhl' of SH-Arbitrate/miniapp into dev	2024-03-06 15:59:16 +08:00