Merge branch 'gyj' of SH-Arbitrate/miniapp into dev

api/handlecase/index.js

@@ -185,3 +185,11 @@ export function msCaseSign(data) {
 		data: data,
 	})
 }
+//证件类型
+export function idType(data) {
+	return request({
+		url: '/system/dict/data/type/id_type',
+		method: 'get',
+		params: data
+	})
+}

api/login.js

@@ -94,3 +94,11 @@ export function wxregister(data) {
 		data: data
 	})
 }
+// 获取证件类型
+export function idType(data){
+	return request({
+		url: '/system/dict/data/type/id_type',
+		method: 'get',
+		params: data
+	})
+}

config.js

@@ -5,8 +5,8 @@ module.exports = {
 	// 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',
+	// 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',

manifest.json

@@ -49,7 +49,9 @@
 			"postcss": true
 		},
 		"optimization": {
+			"subPackages": {
 				"subPackages": true
+			}
 		},
 		"usingComponents": true,
 		"permission": {}

pages.json

@@ -1,4 +1,5 @@
 {
+	"lazyCodeLoading":"requiredComponents",
 	"pages": [{
 			"path": "pages/switchSystem",
 			"style": {
@@ -255,4 +256,5 @@
 		"navigationBarTitleText": "RuoYi",
 		"navigationBarBackgroundColor": "#FFFFFF"
 	}
+	
 }

pages/handlecase/component/confirmPayment.vue

@@ -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
 						}
 					})

pages/handlecase/component/list.vue

@@ -20,17 +20,21 @@
 			<view class="lable">
 				申请人：
 			</view>
-			<view class="main">
+			<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">
+			<uni-tooltip :content="defalutVal.respondentName">
+			<view class="textHidden">
 				{{defalutVal.respondentName}}
 			</view>
+			</uni-tooltip>
 		</view>
 		<view class="listItem">
 			<view class="lable">
@@ -49,7 +53,7 @@
 			<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)">{{ 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>
@@ -321,4 +325,10 @@
 			}
 		}
 	}
+	.textHidden{	
+		width: 300rpx;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		white-space: nowrap;
+	}
 </style>

pages/handlecase/component/payList.vue

@@ -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',

pages/handlecase/component/uploadEvidence.vue

@@ -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"
@@ -279,6 +279,8 @@
 				defaultSelected: [], //默认选中项
 				serviceList: ['1', '2'], //传递给子组件的数据
 				current: 0,
+				affiliateApp:"",
+				affiliateRes:"",
 				itemsT: ['案件详情', '案件资料'],
 				styleType: 'button',
 				activeColor: '#007aff',
@@ -467,6 +469,8 @@
 						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");
 					})
 				}

pages/handlecase/index.vue

@@ -29,7 +29,7 @@
 			return {
 				caseList: [],
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 50,
 				sysType: null,
 				total: null,
 				buttonList: []
@@ -127,6 +127,7 @@
 							this.caseList = []
 						}
 					})
+					
 				}
 
 			},
@@ -170,7 +171,7 @@
 					}
 				}
 				this.getList(obj)
-			}
+			},
 		},
 		onShow() {
 			this.buttonList = []
@@ -201,6 +202,11 @@
 			// 	caseStatus:4
 			// }
 			// this.getList(obj)
+		},
+		onUnload(){
+				uni.reLaunch({
+					url: '/pages/work/index'
+				})
 		}
 		
 	}

pages/index.vue

@@ -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>

pages/login.vue

@@ -6,7 +6,7 @@
 			<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>
@@ -28,7 +28,7 @@
 			</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>
@@ -65,7 +65,7 @@
 			return {
 				codeUrl: "",
 				captchaEnabled: true,
-				logSyste:0,
+				logSyste: 0,
 				// 用户注册开关
 				register: true,
 				globalConfig: getApp().globalData.config,
@@ -76,14 +76,14 @@
 					uuid: '',
 
 				},
-				isSelectAgree:[]
+				isSelectAgree: []
 			}
 		},
 		created() {
 			this.getCode()
 		},
 		methods: {
-			handleAgreeChange(e){
+			handleAgreeChange(e) {
 				this.isSelectAgree = e.detail.value
 			},
 			// 用户注册
@@ -91,7 +91,7 @@
 				this.$tab.redirectTo(`/pages/realName`)
 			},
 			// 权益告知书
-			equityNotice(){
+			equityNotice() {
 				//this.$tab.redirectTo(`/pages/personalInfoCollection`)
 				this.$tab.navigateTo(`/pages/personalInfoCollection?title=权益告知书`)
 			},
@@ -120,7 +120,7 @@
 				const sysType = uni.getStorageSync('sysType')
 				if (this.loginForm.username === "") {
 					this.$modal.msgError("请输入您的账号")
-				}else if(this.isSelectAgree.length < 1){
+				} else if (this.isSelectAgree.length < 1) {
 					this.$modal.msgError("请先阅读个人信息收集条款并同意")
 				} else if (this.loginForm.password === "") {
 					this.$modal.msgError("请输入您的密码")
@@ -149,7 +149,7 @@
 					this.$tab.reLaunch('/pages/work/index')
 				})
 			},
-			onLoad(options){
+			onLoad(options) {
 				let vals = decodeURIComponent(options.values);
 				this.logSyste = vals
 			}
@@ -234,10 +234,12 @@
 					width: 200rpx;
 				}
 			}
-			.ageen-read{
-				margin-top:65rpx;
-				.agreen-text{
-					padding-left:20rpx;
+
+			.ageen-read {
+				margin-top: 65rpx;
+
+				.agreen-text {
+					padding-left: 20rpx;
 					color: #999;
 				}
 			}

pages/realName.vue

@@ -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() {

pages/register.vue

@@ -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;">
@@ -19,9 +20,24 @@
 				<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;

pages/work/index.vue

@@ -11,7 +11,8 @@
 			</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)">
@@ -124,18 +125,16 @@
 						image: 'https://img.tukuppt.com/bg_grid/00/81/07/DGEl4suqeV.jpg!/fh/350'
 					}
 				],
-				refreesVal :[
-					{
-					image:'../../static/tiaojie1.png'
-					},{
-						image:'../../static/tiaojie2.png'
-					},{
-						image:'../../static/tiaojie4.png'
-					}
-				],
+				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
+				sysType: null
 			}
 		},
 		methods: {