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

pages.json

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

pages/handlecase/component/newlyAddedCase.vue

@@ -46,17 +46,32 @@
 					<uni-data-checkbox class='checkbox' :disabled="ids?true:false" :localdata="objectiJurisArr"
 						v-model="formData.affiliate.organizeFlag" @change='clearValidate'></uni-data-checkbox>
 				</uni-forms-item>
+				<!-- <uni-section title="申请人" type="line" padding></uni-section> -->
 				<uni-forms-item :label="formData.affiliate.organizeFlag==0 ? '申请人':'申请机构'" :rules="rulesappName"
 					name="affiliate.applicationName" label-width="120px" required>
 					<uni-easyinput v-model="formData.affiliate.applicationName" :disabled="disabledApplicat" type="text"
 						:placeholder="formData.affiliate.organizeFlag==0 ? '请输入申请人姓名':'请输入申请机构名称'" />
 				</uni-forms-item>
-				<uni-forms-item :label="formData.affiliate.organizeFlag==0 ? '身份证号码':'机构代码'" name="affiliate.code"
+				<uni-forms-item label="证件类型" label-width="120px" v-if="formData.affiliate.organizeFlag==0">
+					 <uni-data-select
+							v-model="formData.affiliate.idType"
+					        :localdata="certificate"
+							@change="changeDocment"	
+							:disabled="true"
+					      ></uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item label="国籍" label-width="120px">
+					 <uni-data-select
+							v-model="formData.affiliate.nationality"
+					        :localdata="nationality"
+							:disabled="formData.affiliate.organizeFlag==0"
+					      ></uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item :label="formData.affiliate.organizeFlag==0 ? '证件号码':'机构代码'" name="affiliate.code"
 					label-width="120px" required :rules="rulesappNo">
 					<uni-easyinput v-model="formData.affiliate.code" :disabled="disabledApplicat" type="text"
-						:placeholder="formData.affiliate.organizeFlag==0 ? '请输入身份证号码':'请输入统一社会代码'" />
+						:placeholder="formData.affiliate.organizeFlag==0 ? '请输入证件号码':'请输入统一社会代码'" />
 				</uni-forms-item>
-
 				<uni-forms-item label="申请人邮箱:" v-if="formData.affiliate.organizeFlag==0"
 					name="affiliate.applicationEmail" label-width="120px" required>
 					<uni-easyinput v-model="formData.affiliate.applicationEmail" :disabled="disabledApplicat"
@@ -79,6 +94,7 @@
 					:rules="[{required: true,errorMessage: '申请人联系地址不能为空'}]">
 					<uni-easyinput v-model="formData.affiliate.applicantAddress" type="text" placeholder="请输入申请人联系地址" />
 				</uni-forms-item>
+				<uni-section title="代理人" type="line" padding></uni-section>
 				<uni-forms-item label="代理人联系电话:" label-width="120px">
 					<uni-easyinput v-model="formData.affiliate.contactTelphoneAgent" :disabled="disabledVal" type="text"
 						placeholder="请输入代理人联系电话" />
@@ -91,6 +107,7 @@
 					<uni-easyinput v-model="formData.affiliate.agentEmail" :disabled="disabledVal" type="text"
 						placeholder="请输入代理人邮箱" />
 				</uni-forms-item>
+				<uni-section title="被申请人" type="line" padding></uni-section>
 				<uni-forms-item label="被申请人姓名:" name="affiliate.respondentName" label-width="120px" required
 					:rules="[{required: true,errorMessage: '被申请人姓名不能为空'}]">
 					<uni-easyinput v-model="formData.affiliate.respondentName" type="text" placeholder="请输入被申请人姓名" />
@@ -156,11 +173,21 @@
 		data() {
 			return {
 				baseUrl: config.baseUrlTJ,
+				certificate: [
+				          { value: 0, text: "身份证" },
+				          { value: 1, text: "护照" },
+				        ],
+				nationality: [
+					{ value: 0, text: "国内" },
+					{ value: 1, text: "国外" },
+				],
 				formZipData: {},
 				formData: {
 					affiliate: {
 						organizeFlag: 0,
 						respondentSex: 0,
+						idType:0,
+						nationality:0
 					},
 					columnValueList: [],
 					caseAttachList: [],
@@ -251,11 +278,14 @@
 			getUserInfoNumber() {
 				getUserInfo().then(res => {
 					this.getUserInfoList = res.data
+					console.log(res.data)
 					if (this.formData.affiliate.organizeFlag == 0) {
 						this.$set(this.formData.affiliate, 'applicationName', res.data.nickName)
 						this.$set(this.formData.affiliate, 'code', res.data.idCard)
 						this.$set(this.formData.affiliate, 'applicationEmail', res.data.email)
 						this.$set(this.formData.affiliate, 'applicationPhone', res.data.phonenumber)
+						this.$set(this.formData.affiliate, 'idType', res.data.idType)
+						this.$set(this.formData.affiliate, 'nationality', res.data.nationality)
 						// this.$set(this.formData.affiliate, 'nameAgent', res.data.nickName)
 						this.disabledVal = false
 						this.disabledApplicat = true
@@ -264,6 +294,7 @@
 						this.$set(this.formData.affiliate, 'nameAgent', res.data.nickName)
 						this.$set(this.formData.affiliate, 'agentEmail', res.data.email)
 						this.$set(this.formData.affiliate, 'contactTelphoneAgent', res.data.phonenumber)
+						this.$set(this.formData.affiliate, 'nationality', res.data.nationality)
 						this.disabledVal = true
 						this.disabledApplicat = false
 					}
@@ -411,8 +442,8 @@
 						icon: 'none',
 						duration: 1000
 					})
-					uni.navigateTo({
-						url: '../index'
+					uni.navigateBack({
+						delta: 1 
 					})
 				});
 			},
@@ -565,6 +596,10 @@
 					delta: 1
 				})
 			},
+			// 改变证件类型
+			changeDocment(e){
+				console.log(e)
+			}
 		},
 		onLoad(data) {
 			this.ids = data.id
@@ -597,4 +632,7 @@
 	.assignrbitrators {
 		margin: 30rpx;
 	}
+	::v-deep .uni-icons[data-v-a2e81f6e]{
+		display: none;
+	}
 </style>

pages/handlecase/index.vue

@@ -170,7 +170,7 @@
 					}
 				}
 				this.getList(obj)
-			}
+			},
 		},
 		onShow() {
 			this.buttonList = []
@@ -201,8 +201,13 @@
 			// 	caseStatus:4
 			// }
 			// this.getList(obj)
+		},
+		onUnload(){
+				uni.reLaunch({
+					url: '/pages/work/index'
+				})
 		}
-
+		
 	}
 </script>
 

pages/index.vue

@@ -1,5 +1,5 @@
-<template>
-  <view class="content">
+<template>
+  <view class="content">
 	<view class="header">
 		<uni-section title="我的代办事项" type="line" padding></uni-section>
 	</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>

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;">
@@ -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;"
+						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;"
+						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="registerForm.idType==0?'请输入身份证号':'请输入护照'"
 					maxlength="30" />
 			</view>
 			<view class="input-item flex align-center">
@@ -70,6 +86,7 @@
 		sendCode,
 		wxregister
 	} from '@/api/login'
+import constant from '../utils/constant'
 
 	export default {
 		data() {
@@ -87,8 +104,19 @@
 					uuid: '',
 					name: '',
 					identityNo: "",
-					id: ""
-				}
+					id: "",
+					idType:0,
+					nationality:0
+				},
+				sysType:null,
+				certificate: [
+				          { value: 0, text: "身份证" },
+				          { value: 1, text: "护照" },
+				        ],
+				nationality: [
+					{ value: 0, text: "国内" },
+					{ value: 1, text: "国外" },
+				],
 			}
 		},
 		created() {
@@ -196,8 +224,14 @@
 				this.$store.dispatch('GetInfo').then(res => {
 					this.$tab.reLaunch('/pages/index')
 				})
+			},
+			certificateValue(e){
+				this.registerForm.idType = e
 			}
-		}
+		},
+		onLoad(){
+			this.sysType = uni.getStorageSync('sysType');
+		}
 	}
 </script>
 
@@ -205,7 +239,12 @@
 	page {
 		background-color: #ffffff;
 	}
-
+	::v-deep .uni-select[data-v-6b64008e]{
+		border: none;
+	}
+	::v-deep .uni-icons[data-v-a2e81f6e]{
+		display: none;
+	}
 	.normal-login-container {
 		width: 100%;
 		background-color: #ffffff;