Преглед изворни кода

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

hanchaobo пре 2 година
родитељ
комит
02dd304ded

+ 2
- 2
App.vue Прегледај датотеку

@@ -9,8 +9,8 @@
9 9
 	} from './mp_ecard_sdk/main';
10 10
 	export default {
11 11
 		globalData: {
12
-			requestUrl: 'https://api.xayunmei.com/zhongcaiapi',
13
-			// requestUrl: 'http://121.40.189.20:9001',
12
+			// requestUrl: 'https://api.xayunmei.com/zhongcaiapi',
13
+			requestUrl: 'http://121.40.189.20:9001',
14 14
 		},
15 15
 		onLaunch: function() {
16 16
 			this.initApp();

+ 20
- 0
api/login.js Прегледај датотеку

@@ -73,4 +73,24 @@ export function sendEidtoken(data) {
73 73
 		method: 'post',
74 74
 		data: data
75 75
 	})
76
+}
77
+
78
+// 获取手机验证码
79
+export function sendCode(data) {
80
+	return request({
81
+		'url': '/weChatUser/sendCode',
82
+		method: 'get',
83
+		params:data
84
+	})
85
+}
86
+// 注册方法
87
+export function wxregister(data) {
88
+	return request({
89
+		url: '/weChatUser/registerUser',
90
+		headers: {
91
+			isToken: false
92
+		},
93
+		method: 'post',
94
+		data: data
95
+	})
76 96
 }

+ 2
- 1
config.js Прегледај датотеку

@@ -1,7 +1,8 @@
1 1
 // 应用全局配置
2 2
 module.exports = {
3
-	baseUrl: 'https://api.xayunmei.com/zhongcaiapi',
3
+	// baseUrl: 'https://api.xayunmei.com/zhongcaiapi',
4 4
 	// baseUrl: 'http://121.40.189.20:9001',
5
+	baseUrl: 'http://121.40.189.20:8001',
5 6
 	// baseUrl: 'http://192.168.3.77:8080',
6 7
 	// baseUrl: 'http://localhost:8080',
7 8
 	// baseUrl: 'http://192.168.3.18:9001',

+ 90
- 79
pages.json Прегледај датотеку

@@ -9,68 +9,72 @@
9 9
 			"style": {
10 10
 				"navigationBarTitleText": "注册"
11 11
 			}
12
-		}, {
13
-			"path": "pages/index",
14
-			"style": {
15
-				"navigationBarTitleText": "首页",
16
-				"navigationStyle": "custom"
17
-			}
18
-		}, {
12
+		},
13
+		// {
14
+		// 	"path": "pages/index",
15
+		// 	"style": {
16
+		// 		"navigationBarTitleText": "首页",
17
+		// 		"navigationStyle": "custom"
18
+		// 	}
19
+		// }, 
20
+		{
19 21
 			"path": "pages/work/index",
20 22
 			"style": {
21 23
 				"navigationBarTitleText": "工作台"
22 24
 			}
23
-		}, {
24
-			"path": "pages/mine/index",
25
-			"style": {
26
-				"navigationBarTitleText": "我的"
27
-			}
28
-		}, {
29
-			"path": "pages/mine/avatar/index",
30
-			"style": {
31
-				"navigationBarTitleText": "修改头像"
32
-			}
33
-		}, {
34
-			"path": "pages/mine/info/index",
35
-			"style": {
36
-				"navigationBarTitleText": "个人信息"
37
-			}
38
-		}, {
39
-			"path": "pages/mine/info/edit",
40
-			"style": {
41
-				"navigationBarTitleText": "编辑资料"
42
-			}
43
-		}, {
44
-			"path": "pages/mine/pwd/index",
45
-			"style": {
46
-				"navigationBarTitleText": "修改密码"
47
-			}
48
-		}, {
49
-			"path": "pages/mine/setting/index",
50
-			"style": {
51
-				"navigationBarTitleText": "应用设置"
52
-			}
53
-		}, {
54
-			"path": "pages/mine/help/index",
55
-			"style": {
56
-				"navigationBarTitleText": "常见问题"
57
-			}
58
-		}, {
59
-			"path": "pages/mine/about/index",
60
-			"style": {
61
-				"navigationBarTitleText": "关于我们"
62
-			}
63
-		}, {
64
-			"path": "pages/common/webview/index",
65
-			"style": {
66
-				"navigationBarTitleText": "浏览网页"
67
-			}
68
-		}, {
69
-			"path": "pages/common/textview/index",
70
-			"style": {
71
-				"navigationBarTitleText": "浏览文本"
72
-			}
73 25
 		},
26
+		// {
27
+		// 	"path": "pages/mine/index",
28
+		// 	"style": {
29
+		// 		"navigationBarTitleText": "我的"
30
+		// 	}
31
+		// },
32
+		// {
33
+		// 	"path": "pages/mine/avatar/index",
34
+		// 	"style": {
35
+		// 		"navigationBarTitleText": "修改头像"
36
+		// 	}
37
+		// }, {
38
+		// 	"path": "pages/mine/info/index",
39
+		// 	"style": {
40
+		// 		"navigationBarTitleText": "个人信息"
41
+		// 	}
42
+		// }, {
43
+		// 	"path": "pages/mine/info/edit",
44
+		// 	"style": {
45
+		// 		"navigationBarTitleText": "编辑资料"
46
+		// 	}
47
+		// }, {
48
+		// 	"path": "pages/mine/pwd/index",
49
+		// 	"style": {
50
+		// 		"navigationBarTitleText": "修改密码"
51
+		// 	}
52
+		// }, {
53
+		// 	"path": "pages/mine/setting/index",
54
+		// 	"style": {
55
+		// 		"navigationBarTitleText": "应用设置"
56
+		// 	}
57
+		// }, {
58
+		// 	"path": "pages/mine/help/index",
59
+		// 	"style": {
60
+		// 		"navigationBarTitleText": "常见问题"
61
+		// 	}
62
+		// }, {
63
+		// 	"path": "pages/mine/about/index",
64
+		// 	"style": {
65
+		// 		"navigationBarTitleText": "关于我们"
66
+		// 	}
67
+		// }, {
68
+		// 	"path": "pages/common/webview/index",
69
+		// 	"style": {
70
+		// 		"navigationBarTitleText": "浏览网页"
71
+		// 	}
72
+		// }, {
73
+		// 	"path": "pages/common/textview/index",
74
+		// 	"style": {
75
+		// 		"navigationBarTitleText": "浏览文本"
76
+		// 	}
77
+		// },
74 78
 		{
75 79
 			"path": "pages/handlecase/index",
76 80
 			"style": {
@@ -165,30 +169,37 @@
165 169
 				"navigationBarTitleText": "在线开庭",
166 170
 				"enablePullDownRefresh": false
167 171
 			}
172
+		},
173
+		{
174
+			"path": "pages/realName",
175
+			"style": {
176
+				"navigationBarTitleText": "实名认证",
177
+				"enablePullDownRefresh": false
178
+			}
168 179
 		}
169 180
 	],
170
-	"tabBar": {
171
-		"color": "#000000",
172
-		"selectedColor": "#000000",
173
-		"borderStyle": "white",
174
-		"backgroundColor": "#ffffff",
175
-		"list": [{
176
-			"pagePath": "pages/index",
177
-			"iconPath": "static/images/tabbar/home.png",
178
-			"selectedIconPath": "static/images/tabbar/home_.png",
179
-			"text": "首页"
180
-		}, {
181
-			"pagePath": "pages/work/index",
182
-			"iconPath": "static/images/tabbar/work.png",
183
-			"selectedIconPath": "static/images/tabbar/work_.png",
184
-			"text": "工作台"
185
-		}, {
186
-			"pagePath": "pages/mine/index",
187
-			"iconPath": "static/images/tabbar/mine.png",
188
-			"selectedIconPath": "static/images/tabbar/mine_.png",
189
-			"text": "我的"
190
-		}]
191
-	},
181
+	// "tabBar": {
182
+	// 	"color": "#000000",
183
+	// 	"selectedColor": "#000000",
184
+	// 	"borderStyle": "white",
185
+	// 	"backgroundColor": "#ffffff",
186
+	// 	"list": [{
187
+	// 		"pagePath": "pages/index",
188
+	// 		"iconPath": "static/images/tabbar/home.png",
189
+	// 		"selectedIconPath": "static/images/tabbar/home_.png",
190
+	// 		"text": "首页"
191
+	// 	}, {
192
+	// 		"pagePath": "pages/work/index",
193
+	// 		"iconPath": "static/images/tabbar/work.png",
194
+	// 		"selectedIconPath": "static/images/tabbar/work_.png",
195
+	// 		"text": "工作台"
196
+	// 	}, {
197
+	// 		"pagePath": "pages/mine/index",
198
+	// 		"iconPath": "static/images/tabbar/mine.png",
199
+	// 		"selectedIconPath": "static/images/tabbar/mine_.png",
200
+	// 		"text": "我的"
201
+	// 	}]
202
+	// },
192 203
 	"globalStyle": {
193 204
 		"navigationBarTextStyle": "black",
194 205
 		"navigationBarTitleText": "RuoYi",

+ 54
- 23
pages/handlecase/component/uploadEvidence.vue Прегледај датотеку

@@ -44,41 +44,43 @@
44 44
 						<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
45 45
 							:localdata="maintenancetypeArr" @change='uploadEvidenceChange'></uni-data-checkbox>
46 46
 					</uni-forms-item>
47
-					<uni-forms-item label="是否需要开庭审理" label-width="120px" name="openCourtHear" required>
47
+					<!-- <uni-forms-item label="是否需要开庭审理" label-width="120px" name="openCourtHear" required>
48 48
 						<uni-data-checkbox class='checkbox' v-model="subnitForm.openCourtHear"
49 49
 							:localdata="arbitrationmethodArr" @change='arbitrationmethod'></uni-data-checkbox>
50
-					</uni-forms-item>
50
+					</uni-forms-item> -->
51 51
 					<uni-forms-item label="是否指派仲裁员" label-width="120px" name="pendingAppointArbotrar" required>
52 52
 						<uni-data-checkbox class='checkbox' v-model="subnitForm.pendingAppointArbotrar"
53 53
 							:localdata="uploadEvidence" @change='maintenancetypeChange'></uni-data-checkbox>
54 54
 					</uni-forms-item>
55
+					<uni-forms-item label="是否仲裁反请求" label-width="120px" name="objectiJuris" required>
56
+						<uni-data-checkbox class='checkbox' v-model="subnitForm.objectiJuris"
57
+							:localdata="objectiJurisArr"></uni-data-checkbox>
58
+					</uni-forms-item>
59
+					<uni-forms-item label="是否管辖异议申请" label-width="120px" name="adjudicaCounter" required>
60
+						<uni-data-checkbox class='checkbox' v-model="subnitForm.adjudicaCounter"
61
+							:localdata="adjudicaCounterArr"></uni-data-checkbox>
62
+					</uni-forms-item>
55 63
 					<uni-forms-item label="上传证据" name="headImage" label-width="120px" v-if="caseFlag">
56 64
 						<uni-file-picker ref="files" :auto-upload="false" @select="select" :limit='1' />
57 65
 					</uni-forms-item>
58 66
 				</view>
59 67
 			</uni-forms>
60 68
 			<view class="uni-list" v-if="selectFlag">
61
-				<checkbox-group @change="checkboxChange">
69
+				<radio-group @change="checkboxChange" style="width: 100%;">
62 70
 					<label class="uni-list-cell uni-list-cell-pd" v-for="item in items" :key="item.userId">
63 71
 						<view>
64
-							<checkbox :value="item.userId + ''" />
72
+							<radio :value="item.userId + ''" />
65 73
 						</view>
66 74
 						<view class="main">
67 75
 							<view class="">
68 76
 								仲裁员姓名:{{item.nickName}}
69 77
 							</view>
70
-						<!-- 	<view class="">
71
-								当前案件数量:{{item.currentCaseNum}}
72
-							</view>
73
-							<view class="">
74
-								已结案数量:{{item.closedCaseNum}}
75
-							</view> -->
76 78
 							<view class="">
77
-								介绍:{{item.remark}}
79
+								介绍:{{item.remark || ''}}
78 80
 							</view>
79 81
 						</view>
80 82
 					</label>
81
-				</checkbox-group>
83
+				</radio-group>
82 84
 			</view>
83 85
 			<button type="primary" @click="submitImg">确认提交</button>
84 86
 		</view>
@@ -104,7 +106,12 @@
104 106
 		data() {
105 107
 			return {
106 108
 				formData: {},
107
-				subnitForm: {},
109
+				subnitForm: {
110
+					objectionAddEviden:0,
111
+					pendingAppointArbotrar:0,
112
+					objectiJuris:0,
113
+					adjudicaCounter:0
114
+				},
108 115
 				selectFlag: false,
109 116
 				caseFlag: false,
110 117
 				tempFilePaths: null,
@@ -152,6 +159,20 @@
152 159
 					text: '否',
153 160
 					value: 0
154 161
 				}],
162
+				objectiJurisArr: [{
163
+					text: '是',
164
+					value: 1
165
+				}, {
166
+					text: '否',
167
+					value: 0
168
+				}],
169
+				adjudicaCounterArr: [{
170
+					text: '是',
171
+					value: 1
172
+				}, {
173
+					text: '否',
174
+					value: 0
175
+				}],
155 176
 				items: []
156 177
 			}
157 178
 		},
@@ -175,18 +196,28 @@
175 196
 				}
176 197
 			},
177 198
 			checkboxChange(e) {
178
-				let idArr = e.detail.value;
179
-				let numberArray = idArr.map(str => parseInt(str));
180
-				const result = this.items.filter(item => numberArray.includes(item.userId));
181
-				let arbitrators = []
182
-				result.forEach(item => {
183
-					arbitrators.push({
184
-						id: item.userId,
185
-						arbitratorName: item.nickName
186
-					})
199
+				let params =  parseInt(e.detail.value);
200
+				console.log(params,"LLLLLLLLLL");
201
+				let result = "";
202
+				this.items.forEach(item=>{
203
+					if(item.userId == params){
204
+						result = item.nickName
205
+					}
187 206
 				})
207
+				let arbitrators = [{id: params,arbitratorName: result}];
208
+				
209
+				console.log(result,"KKKKKKKKKKKKKKKK");
210
+				// let idArr = e.detail.value;
211
+				// let numberArray = idArr.map(str => parseInt(str));
212
+				// const result = this.items.filter(item => numberArray.includes(item.userId));
213
+				// result.forEach(item => {
214
+				// 	arbitrators.push({
215
+				// 		id: item.userId,
216
+				// 		arbitratorName: item.nickName
217
+				// 	})
218
+				// })
188 219
 				this.subnitForm.arbitrators = arbitrators;
189
-				console.log(this.subnitForm.arbitrators,"PPPPPPPPPPPPPP");
220
+				// console.log(this.subnitForm.arbitrators,"PPPPPPPPPPPPPP");
190 221
 			},
191 222
 			getData(parms) {
192 223
 				respondentDetail(parms).then(res => {

+ 1
- 1
pages/im/index.vue Прегледај датотеку

@@ -13,7 +13,7 @@
13 13
 		},
14 14
 		onLoad: function() {
15 15
 			this.name = this.$store.state.user.name;
16
-			this.sendImg = `https://txroom.xayunmei.com/#/?name=${this.name}`
16
+			this.sendImg = `https://txroom.xayunmei.com`
17 17
 			// this.sendImg = `http://localhost:8080/#/?name=${this.name}`
18 18
 		},
19 19
 

+ 1
- 1
pages/index.vue Прегледај датотеку

@@ -2,7 +2,7 @@
2 2
   <view class="content">
3 3
     <image class="logo" src="@/static/chuizi.png"></image>
4 4
     <view class="text-area">
5
-      <text class="title">法务系统</text>
5
+      <text class="title">仲裁系统</text>
6 6
     </view>
7 7
   </view>
8 8
 </template>

+ 5
- 5
pages/login.vue Прегледај датотеку

@@ -3,7 +3,7 @@
3 3
 		<view class="logo-content align-center justify-center flex">
4 4
 			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
5 5
 			</image>
6
-			<text class="title">法务平台</text>
6
+			<text class="title">仲裁平台</text>
7 7
 		</view>
8 8
 		<view class="login-form-content">
9 9
 			<view class="input-item flex align-center">
@@ -56,8 +56,8 @@
56 56
 				register: true,
57 57
 				globalConfig: getApp().globalData.config,
58 58
 				loginForm: {
59
-					username: "admin",
60
-					password: "admin123",
59
+					username: "",
60
+					password: "",
61 61
 					code: "",
62 62
 					uuid: ''
63 63
 				}
@@ -69,7 +69,7 @@
69 69
 		methods: {
70 70
 			// 用户注册
71 71
 			handleUserRegister() {
72
-				this.$tab.redirectTo(`/pages/register`)
72
+				this.$tab.redirectTo(`/pages/realName`)
73 73
 			},
74 74
 			// 隐私协议
75 75
 			handlePrivacy() {
@@ -119,7 +119,7 @@
119 119
 			loginSuccess(result) {
120 120
 				// 设置用户信息
121 121
 				this.$store.dispatch('GetInfo').then(res => {
122
-					this.$tab.reLaunch('/pages/index')
122
+					this.$tab.reLaunch('/pages/work/index')
123 123
 				})
124 124
 			}
125 125
 		}

+ 76
- 0
pages/realName.vue Прегледај датотеку

@@ -0,0 +1,76 @@
1
+<template>
2
+	<view class="page-body">
3
+		<view class="action-btn">
4
+		  <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">点击进行实名认证</button>
5
+		</view>
6
+	</view>
7
+</template>
8
+
9
+<script>
10
+	import {
11
+		startEid
12
+	} from '@/mp_ecard_sdk/main.js'
13
+	import {
14
+		getEidtoken,
15
+		sendEidtoken
16
+	} from "@/api/login.js"
17
+	export default{
18
+		data(){
19
+			return{
20
+				eidToken: ""
21
+			}
22
+		},
23
+		methods:{
24
+			// 获取eidtoken
25
+			getEidtokenFn() {
26
+				getEidtoken({}).then(res => {
27
+					this.eidToken = res.data.EidToken
28
+				})
29
+			},
30
+			// 点击实名认证
31
+			handleRegister() {
32
+				let that = this
33
+				startEid({
34
+					data: {
35
+						token: this.eidToken,
36
+					},
37
+					verifyDoneCallback(res) {
38
+						const {
39
+							token,
40
+							verifyDone
41
+						} = res;
42
+						console.log('收到核身完成的res:', res);
43
+						console.log('核身的token是:', token);
44
+						console.log('是否完成核身:', verifyDone);
45
+						sendEidtoken({
46
+							"eidToken": token
47
+						}).then(res => {
48
+							// that.certificationStatus = '1
49
+							let params = {}
50
+							params.nickName = res.data.name;
51
+							params.idCard = res.data.identityNo;
52
+							params.id = res.data.id;
53
+							console.log(params,"PPPPPPPPPPPPP");
54
+							uni.navigateTo({
55
+								url: '/pages/register?params=' + JSON.stringify(
56
+									params)
57
+							});
58
+						})
59
+					},
60
+				});
61
+			}
62
+		},
63
+		onLoad() {
64
+			this.getEidtokenFn()
65
+		},
66
+	}
67
+</script>
68
+
69
+<style lang="scss">
70
+	.page-body{
71
+		background-color: #ffffff;
72
+		.register-btn{
73
+			margin-top: 30rpx;
74
+		}
75
+	}
76
+</style>

+ 277
- 189
pages/register.vue Прегледај датотеку

@@ -1,196 +1,284 @@
1 1
 <template>
2
-  <view class="normal-login-container">
3
-    <view class="logo-content align-center justify-center flex">
4
-      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
5
-      </image>
6
-      <text class="title">法务系统注册</text>
7
-    </view>
8
-    <view class="login-form-content">
9
-      <view class="input-item flex align-center">
10
-        <view class="iconfont icon-user icon"></view>
11
-        <input v-model="registerForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
12
-      </view>
13
-      <view class="input-item flex align-center">
14
-        <view class="iconfont icon-password icon"></view>
15
-        <input v-model="registerForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
16
-      </view>
17
-      <view class="input-item flex align-center">
18
-        <view class="iconfont icon-password icon"></view>
19
-        <input v-model="registerForm.confirmPassword" type="password" class="input" placeholder="请输入重复密码" maxlength="20" />
20
-      </view>
21
-      <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
22
-        <view class="iconfont icon-code icon"></view>
23
-        <input v-model="registerForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
24
-        <view class="login-code"> 
25
-          <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
26
-        </view>
27
-      </view>
28
-      <view class="action-btn">
29
-        <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">注册</button>
30
-      </view>
31
-    </view>
32
-    <view class="xieyi text-center">
33
-      <text @click="handleUserLogin" class="text-blue">使用已有账号登录</text>
34
-    </view>
35
-  </view>
2
+	<view class="normal-login-container">
3
+		<view class="logo-content align-center justify-center flex">
4
+			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
5
+			</image>
6
+			<text class="title">仲裁系统注册</text>
7
+		</view>
8
+		<view class="login-form-content">
9
+			<view class="input-item flex align-center" style="width: 60%;margin: 0px;">
10
+				<!-- <view class="iconfont icon-user icon"></view> -->
11
+				<input v-model="registerForm.phone" class="input" type="number" placeholder="请输入手机号"
12
+					maxlength="30" />
13
+				<view class="login-code">
14
+					<button class="login-code-img" type="primary" :disabled="codeDisabled"
15
+						@tap="getCodeNumber(registerForm.phone)">{{codeText}}</button>
16
+				</view>
17
+			</view>
18
+			<view class="input-item flex align-center">
19
+				<!-- <view class="iconfont icon-user icon"></view> -->
20
+				<input v-model="registerForm.verifyCode" class="input" type="number" placeholder="请输入手机验证码"
21
+					maxlength="30" />
22
+			</view>
23
+			<view class="input-item flex align-center">
24
+				<!-- <view class="iconfont icon-user icon"></view> -->
25
+				<input v-model="registerForm.identityNo" class="input" type="text" placeholder="请输入身份证号" maxlength="30" />
26
+			</view>
27
+			<view class="input-item flex align-center">
28
+				<!-- <view class="iconfont icon-user icon"></view> -->
29
+				<input v-model="registerForm.email" class="input" type="text" placeholder="请输入邮箱" maxlength="30" />
30
+			</view>
31
+			<view class="input-item flex align-center">
32
+				<!-- <view class="iconfont icon-user icon"></view> -->
33
+				<input v-model="registerForm.name" class="input" type="text" placeholder="请输入用户名" maxlength="30" />
34
+			</view>
35
+			<view class="input-item flex align-center">
36
+				<!-- <view class="iconfont icon-user icon"></view> -->
37
+				<input v-model="registerForm.userName" class="input" type="text" placeholder="请输入账号" maxlength="30" />
38
+			</view>
39
+			<view class="input-item flex align-center">
40
+				<!-- <view class="iconfont icon-password icon"></view> -->
41
+				<input v-model="registerForm.passWord" type="password" class="input" placeholder="请输入密码"
42
+					maxlength="20" />
43
+			</view>
44
+			<view class="input-item flex align-center">
45
+				<!-- <view class="iconfont icon-password icon"></view> -->
46
+				<input v-model="registerForm.confirmPassword" type="password" class="input" placeholder="请输入重复密码"
47
+					maxlength="20" />
48
+			</view>
49
+			<view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
50
+				<!-- <view class="iconfont icon-code icon"></view> -->
51
+				<input v-model="registerForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
52
+				<view class="login-code">
53
+					<image :src="codeUrl" @click="getCode" class="login-code-img"></image>
54
+				</view>
55
+			</view>
56
+			<view class="action-btn">
57
+				<button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round">注册</button>
58
+			</view>
59
+		</view>
60
+		<view class="xieyi text-center">
61
+			<text @click="handleUserLogin" class="text-blue">使用已有账号登录</text>
62
+		</view>
63
+	</view>
36 64
 </template>
37 65
 
38 66
 <script>
39
-  import { getCodeImg, register } from '@/api/login'
40
-
41
-  export default {
42
-    data() {
43
-      return {
44
-        codeUrl: "",
45
-        captchaEnabled: true,
46
-        globalConfig: getApp().globalData.config,
47
-        registerForm: {
48
-          username: "",
49
-          password: "",
50
-          confirmPassword: "",
51
-          code: "",
52
-          uuid: ''
53
-        }
54
-      }
55
-    },
56
-    created() {
57
-      this.getCode()
58
-    },
59
-    methods: {
60
-      // 用户登录
61
-      handleUserLogin() {
62
-        this.$tab.navigateTo(`/pages/login`)
63
-      },
64
-      // 获取图形验证码
65
-      getCode() {
66
-        getCodeImg().then(res => {
67
-          this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
68
-          if (this.captchaEnabled) {
69
-            this.codeUrl = 'data:image/gif;base64,' + res.img
70
-            this.registerForm.uuid = res.uuid
71
-          }
72
-        })
73
-      },
74
-      // 注册方法
75
-      async handleRegister() {
76
-        if (this.registerForm.username === "") {
77
-          this.$modal.msgError("请输入您的账号")
78
-        } else if (this.registerForm.password === "") {
79
-          this.$modal.msgError("请输入您的密码")
80
-        } else if (this.registerForm.confirmPassword === "") {
81
-          this.$modal.msgError("请再次输入您的密码")
82
-        } else if (this.registerForm.password !== this.registerForm.confirmPassword) {
83
-          this.$modal.msgError("两次输入的密码不一致")
84
-        } else if (this.registerForm.code === "" && this.captchaEnabled) {
85
-          this.$modal.msgError("请输入验证码")
86
-        } else {
87
-          this.$modal.loading("注册中,请耐心等待...")
88
-          this.register()
89
-        }
90
-      },
91
-      // 用户注册
92
-      async register() {
93
-        register(this.registerForm).then(res => {
94
-          this.$modal.closeLoading()
95
-          uni.showModal({
96
-          	title: "系统提示",
97
-          	content: "恭喜你,您的账号 " + this.registerForm.username + " 注册成功!",
98
-          	success: function (res) {
99
-          		if (res.confirm) {
100
-                uni.redirectTo({ url: `/pages/login` });
101
-          		}
102
-          	}
103
-          })
104
-        }).catch(() => {
105
-          if (this.captchaEnabled) {
106
-            this.getCode()
107
-          }
108
-        })
109
-      },
110
-      // 注册成功后,处理函数
111
-      registerSuccess(result) {
112
-        // 设置用户信息
113
-        this.$store.dispatch('GetInfo').then(res => {
114
-          this.$tab.reLaunch('/pages/index')
115
-        })
116
-      }
117
-    }
118
-  }
67
+	import {
68
+		getCodeImg,
69
+		register,
70
+		sendCode,
71
+		wxregister
72
+	} from '@/api/login'
73
+
74
+	export default {
75
+		data() {
76
+			return {
77
+				codeUrl: "",
78
+				captchaEnabled: true,
79
+				globalConfig: getApp().globalData.config,
80
+				codeText: "发送验证码",
81
+				codeDisabled: false,
82
+				registerForm: {
83
+					userName: "",
84
+					passWord: "",
85
+					confirmPassword: "",
86
+					code: "",
87
+					uuid: '',
88
+					name: '',
89
+					identityNo: "",
90
+					id: ""
91
+				}
92
+			}
93
+		},
94
+		created() {
95
+			this.getCode()
96
+		},
97
+		onLoad(option) {
98
+			let {
99
+				params
100
+			} = option
101
+			// this.improvedetail = JSON.parse(improvedetail)
102
+			let paramsObj = JSON.parse(params);
103
+			this.registerForm.name = paramsObj.nickName;
104
+			this.registerForm.identityNo = paramsObj.idCard
105
+			this.registerForm.id = paramsObj.id
106
+		},
107
+		methods: {
108
+			// 获取手机验证码
109
+			getCodeNumber(data) {
110
+				sendCode({
111
+					phone: data
112
+				}).then(res => {
113
+					uni.showModal({
114
+						title: "系统提示",
115
+						content: res.msg,
116
+					})
117
+					if (res.code != 200) {
118
+						return
119
+					} else {
120
+						let time = 60;
121
+						let timer = setInterval(() => {
122
+							time--;
123
+							this.codeDisabled = true;
124
+							this.codeText = time + 's重试'
125
+							if (time == 0) {
126
+								clearInterval(timer)
127
+								this.codeText = '发送验证码'
128
+								this.codeDisabled = false;
129
+							}
130
+						}, 1000)
131
+					}
132
+
133
+				})
134
+			},
135
+			// 用户登录
136
+			handleUserLogin() {
137
+				this.$tab.navigateTo(`/pages/login`)
138
+			},
139
+			// 获取图形验证码
140
+			getCode() {
141
+				getCodeImg().then(res => {
142
+					this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
143
+					if (this.captchaEnabled) {
144
+						this.codeUrl = 'data:image/gif;base64,' + res.img
145
+						this.registerForm.uuid = res.uuid
146
+					}
147
+				})
148
+			},
149
+			// 注册方法
150
+			async handleRegister() {
151
+				if (this.registerForm.userName === "") {
152
+					this.$modal.msgError("请输入您的账号")
153
+				} else if (this.registerForm.passWord === "") {
154
+					this.$modal.msgError("请输入您的密码")
155
+				} else if (this.registerForm.confirmPassword === "") {
156
+					this.$modal.msgError("请再次输入您的密码")
157
+				} else if (this.registerForm.passWord !== this.registerForm.confirmPassword) {
158
+					this.$modal.msgError("两次输入的密码不一致")
159
+				} else if (this.registerForm.code === "" && this.captchaEnabled) {
160
+					this.$modal.msgError("请输入验证码")
161
+				} else if (this.registerForm.idCard === "") {
162
+					this.$modal.msgError("请输入身份证号码")
163
+				} else if (this.registerForm.phone === "") {
164
+					this.$modal.msgError("请输入手机号")
165
+				} else if (this.registerForm.email === "") {
166
+					this.$modal.msgError("请输入邮箱")
167
+				} else {
168
+					this.$modal.loading("注册中,请耐心等待...")
169
+					this.register()
170
+				}
171
+			},
172
+			// 用户注册
173
+			async register() {
174
+				wxregister(this.registerForm).then(res => {
175
+					this.$modal.closeLoading()
176
+					uni.showModal({
177
+						title: "系统提示",
178
+						content: "恭喜你,您的账号 " + this.registerForm.userName + " 注册成功!",
179
+						success: function(res) {
180
+							if (res.confirm) {
181
+								uni.redirectTo({
182
+									url: `/pages/login`
183
+								});
184
+							}
185
+						}
186
+					})
187
+				}).catch(() => {
188
+					if (this.captchaEnabled) {
189
+						this.getCode()
190
+					}
191
+				})
192
+			},
193
+			// 注册成功后,处理函数
194
+			registerSuccess(result) {
195
+				// 设置用户信息
196
+				this.$store.dispatch('GetInfo').then(res => {
197
+					this.$tab.reLaunch('/pages/index')
198
+				})
199
+			}
200
+		}
201
+	}
119 202
 </script>
120 203
 
121 204
 <style lang="scss">
122
-  page {
123
-    background-color: #ffffff;
124
-  }
125
-
126
-  .normal-login-container {
127
-    width: 100%;
128
-
129
-    .logo-content {
130
-      width: 100%;
131
-      font-size: 21px;
132
-      text-align: center;
133
-      padding-top: 15%;
134
-
135
-      image {
136
-        border-radius: 4px;
137
-      }
138
-
139
-      .title {
140
-        margin-left: 10px;
141
-      }
142
-    }
143
-
144
-    .login-form-content {
145
-      text-align: center;
146
-      margin: 20px auto;
147
-      margin-top: 15%;
148
-      width: 80%;
149
-
150
-      .input-item {
151
-        margin: 20px auto;
152
-        background-color: #f5f6f7;
153
-        height: 45px;
154
-        border-radius: 20px;
155
-
156
-        .icon {
157
-          font-size: 38rpx;
158
-          margin-left: 10px;
159
-          color: #999;
160
-        }
161
-
162
-        .input {
163
-          width: 100%;
164
-          font-size: 14px;
165
-          line-height: 20px;
166
-          text-align: left;
167
-          padding-left: 15px;
168
-        }
169
-
170
-      }
171
-
172
-      .register-btn {
173
-        margin-top: 40px;
174
-        height: 45px;
175
-      }
176
-
177
-      .xieyi {
178
-        color: #333;
179
-        margin-top: 20px;
180
-      }
181
-      
182
-      .login-code {
183
-        height: 38px;
184
-        float: right;
185
-      
186
-        .login-code-img {
187
-          height: 38px;
188
-          position: absolute;
189
-          margin-left: 10px;
190
-          width: 200rpx;
191
-        }
192
-      }
193
-    }
194
-  }
195
-
196
-</style>
205
+	page {
206
+		background-color: #ffffff;
207
+	}
208
+
209
+	.normal-login-container {
210
+		width: 100%;
211
+		background-color: #ffffff;
212
+
213
+		.logo-content {
214
+			width: 100%;
215
+			font-size: 21px;
216
+			text-align: center;
217
+			padding-top: 15%;
218
+
219
+			image {
220
+				border-radius: 4px;
221
+			}
222
+
223
+			.title {
224
+				margin-left: 10px;
225
+			}
226
+		}
227
+
228
+		.login-form-content {
229
+			text-align: center;
230
+			margin: 20px auto;
231
+			margin-top: 15%;
232
+			width: 80%;
233
+
234
+			.input-item {
235
+				margin: 20px auto;
236
+				background-color: #f5f6f7;
237
+				height: 45px;
238
+				border-radius: 20px;
239
+
240
+				.icon {
241
+					font-size: 38rpx;
242
+					margin-left: 10px;
243
+					color: #999;
244
+				}
245
+
246
+				.input {
247
+					width: 100%;
248
+					font-size: 14px;
249
+					line-height: 20px;
250
+					text-align: left;
251
+					padding-left: 15px;
252
+				}
253
+
254
+			}
255
+
256
+			.register-btn {
257
+				margin-top: 40px;
258
+				height: 45px;
259
+			}
260
+
261
+			.xieyi {
262
+				color: #333;
263
+				margin-top: 20px;
264
+			}
265
+
266
+			.login-code {
267
+				height: 38px;
268
+				float: right;
269
+
270
+				.login-code-img {
271
+					height: 38px;
272
+					position: absolute;
273
+					margin-left: 10px;
274
+					width: 200rpx;
275
+					font-size: 28rpx;
276
+				}
277
+			}
278
+
279
+			.mini-btn {
280
+				height: 38px;
281
+			}
282
+		}
283
+	}
284
+</style>

+ 13
- 13
pages/work/index.vue Прегледај датотеку

@@ -12,7 +12,7 @@
12 12
 		</uni-swiper-dot>
13 13
 
14 14
 		<!-- 宫格组件 -->
15
-		<uni-section v-if="certificationStatus == '1'" class="uni-section" title="系统管理" type="line">
15
+		<!-- <uni-section v-if="certificationStatus == '1'" class="uni-section" title="系统管理" type="line">
16 16
 			<template v-slot:right>
17 17
 				已认证
18 18
 			</template>
@@ -21,14 +21,14 @@
21 21
 			<template v-slot:right>
22 22
 				未认证
23 23
 			</template>
24
-		</uni-section>
24
+		</uni-section> -->
25 25
 		<!-- <uni-section class="uni-section" title="系统管理" type="line"></uni-section> -->
26 26
 		<view class="grid-body">
27 27
 			<uni-grid :column="4" :showBorder="false">
28 28
 				<uni-grid-item>
29 29
 					<view class="grid-item-box" @tap="changeGrid(0)">
30 30
 						<uni-icons type="calendar-filled" size="30" color="#327DD7"></uni-icons>
31
-						<text class="text">办案件</text>
31
+						<text class="text">办案件</text>
32 32
 					</view>
33 33
 				</uni-grid-item>
34 34
 				<!-- <uni-grid-item>
@@ -58,7 +58,7 @@
58 58
 				<uni-grid-item>
59 59
 					<view class="grid-item-box" @tap="changeGrid(5)">
60 60
 						<uni-icons type="bars" size="30" color="#327DD7"></uni-icons>
61
-						<text class="text">互联网庭</text>
61
+						<text class="text">视频审理</text>
62 62
 					</view>
63 63
 				</uni-grid-item>
64 64
 				<uni-grid-item>
@@ -126,14 +126,14 @@
126 126
 			},
127 127
 			changeGrid(e) {
128 128
 				// this.$modal.showToast('模块建设中~')
129
-				if (this.certificationStatus == "0") {
130
-					uni.showToast({
131
-						title: '请先完成实名认证',
132
-						icon: 'none',
133
-						duration: 1000
134
-					})
135
-					return
136
-				}
129
+				// if (this.certificationStatus == "0") {
130
+				// 	uni.showToast({
131
+				// 		title: '请先完成实名认证',
132
+				// 		icon: 'none',
133
+				// 		duration: 1000
134
+				// 	})
135
+				// 	return
136
+				// }
137 137
 				switch (e) {
138 138
 					case 0:
139 139
 						uni.navigateTo({
@@ -200,7 +200,7 @@
200 200
 			// 	// that.certificationStatus = '已认证'
201 201
 			// })
202 202
 			this.getEidtokenFn()
203
-			this.certificationStatus = uni.getStorageSync('certificationStatus')
203
+			// this.certificationStatus = uni.getStorageSync('certificationStatus')
204 204
 		},
205 205
 	}
206 206
 </script>

+ 1
- 1
permission.js Прегледај датотеку

@@ -5,7 +5,7 @@ const loginPage = "/pages/login"
5 5
   
6 6
 // 页面白名单
7 7
 const whiteList = [
8
-  '/pages/login', '/pages/register', '/pages/common/webview/index'
8
+  '/pages/login', '/pages/register', '/pages/common/webview/index','/pages/realName','/mp_ecard_sdk/index/index'
9 9
 ]
10 10
 
11 11
 // 检查地址白名单

+ 1
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 1
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 1
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 1
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 1
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 1
- 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 2
- 38
unpackage/dist/dev/mp-weixin/app.json Прегледај датотеку

@@ -2,18 +2,7 @@
2 2
   "pages": [
3 3
     "pages/login",
4 4
     "pages/register",
5
-    "pages/index",
6 5
     "pages/work/index",
7
-    "pages/mine/index",
8
-    "pages/mine/avatar/index",
9
-    "pages/mine/info/index",
10
-    "pages/mine/info/edit",
11
-    "pages/mine/pwd/index",
12
-    "pages/mine/setting/index",
13
-    "pages/mine/help/index",
14
-    "pages/mine/about/index",
15
-    "pages/common/webview/index",
16
-    "pages/common/textview/index",
17 6
     "pages/handlecase/index",
18 7
     "pages/handlecase/component/uploadEvidence",
19 8
     "pages/expressDelivery/index",
@@ -25,7 +14,8 @@
25 14
     "mp_ecard_sdk/protocol/privacy/privacy",
26 15
     "mp_ecard_sdk/protocol/service/service",
27 16
     "mp_ecard_sdk/protocol/userAccredit/userAccredit",
28
-    "pages/im/index"
17
+    "pages/im/index",
18
+    "pages/realName"
29 19
   ],
30 20
   "subPackages": [],
31 21
   "window": {
@@ -33,32 +23,6 @@
33 23
     "navigationBarTitleText": "RuoYi",
34 24
     "navigationBarBackgroundColor": "#FFFFFF"
35 25
   },
36
-  "tabBar": {
37
-    "color": "#000000",
38
-    "selectedColor": "#000000",
39
-    "borderStyle": "white",
40
-    "backgroundColor": "#ffffff",
41
-    "list": [
42
-      {
43
-        "pagePath": "pages/index",
44
-        "iconPath": "static/images/tabbar/home.png",
45
-        "selectedIconPath": "static/images/tabbar/home_.png",
46
-        "text": "首页"
47
-      },
48
-      {
49
-        "pagePath": "pages/work/index",
50
-        "iconPath": "static/images/tabbar/work.png",
51
-        "selectedIconPath": "static/images/tabbar/work_.png",
52
-        "text": "工作台"
53
-      },
54
-      {
55
-        "pagePath": "pages/mine/index",
56
-        "iconPath": "static/images/tabbar/mine.png",
57
-        "selectedIconPath": "static/images/tabbar/mine_.png",
58
-        "text": "我的"
59
-      }
60
-    ]
61
-  },
62 26
   "permission": {},
63 27
   "usingComponents": {}
64 28
 }

+ 20
- 13
unpackage/dist/dev/mp-weixin/project.config.json Прегледај датотеку

@@ -1,8 +1,7 @@
1 1
 {
2 2
   "description": "项目配置文件。",
3 3
   "packOptions": {
4
-    "ignore": [],
5
-    "include": []
4
+    "ignore": []
6 5
   },
7 6
   "setting": {
8 7
     "urlCheck": false,
@@ -10,20 +9,28 @@
10 9
     "postcss": true,
11 10
     "minified": true,
12 11
     "newFeature": true,
13
-    "bigPackageSizeSupport": true,
14
-    "babelSetting": {
15
-      "ignore": [],
16
-      "disablePlugins": [],
17
-      "outputPath": ""
18
-    }
12
+    "bigPackageSizeSupport": true
19 13
   },
20 14
   "compileType": "miniprogram",
21
-  "libVersion": "3.0.1",
15
+  "libVersion": "",
22 16
   "appid": "wx91cb8459dca561b4",
23 17
   "projectname": "智慧仲裁",
24
-  "condition": {},
25
-  "editorSetting": {
26
-    "tabIndent": "insertSpaces",
27
-    "tabSize": 2
18
+  "condition": {
19
+    "search": {
20
+      "current": -1,
21
+      "list": []
22
+    },
23
+    "conversation": {
24
+      "current": -1,
25
+      "list": []
26
+    },
27
+    "game": {
28
+      "current": -1,
29
+      "list": []
30
+    },
31
+    "miniprogram": {
32
+      "current": -1,
33
+      "list": []
34
+    }
28 35
   }
29 36
 }