Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
be737fae by 杨炀
Options

+香港身份证识别 港澳xx 

信息变更 未修改信息不能提交
1 parent 89213734
Inline Side-by-side
Showing 10 changed files with 135 additions and 99 deletions
common/api.js
...@@ -150,7 +150,7 @@ export function createMyMember(data) { ...@@ -150,7 +150,7 @@ export function createMyMember(data) {
150 } 150 }
151 export function updateUserPwd(data) { 151 export function updateUserPwd(data) {
152 return request({ 152 return request({
153 url: `/system/user/profile/updatePwd?oldPassword=${encodeURIComponent(data.oldPassword)}&newPassword=${encodeURIComponent(data.oldPassword)}`, 153 url: `/system/user/profile/updatePwd?oldPassword=${encodeURIComponent(data.oldPassword)}&newPassword=${encodeURIComponent(data.newPassword)}`,
154 method: 'put', 154 method: 'put',
155 params: data 155 params: data
156 }) 156 })
......
common/login.js
...@@ -54,8 +54,8 @@ function getCodeImg() { ...@@ -54,8 +54,8 @@ function getCodeImg() {
54 // 代退图形认证的获取手机验证码 54 // 代退图形认证的获取手机验证码
55 function getSmsCode(data) { 55 function getSmsCode(data) {
56 return request({ 56 return request({
57 url: '/captchaSmsWithCaptchaImage', 57 // url: '/captchaSmsWithCaptchaImage',
58 // url: '/captchaSmsWithCaptchaImageForMiniApp', 58 url: '/captchaSmsWithCaptchaImageForMiniApp',
59 method: 'post', 59 method: 'post',
60 params: data 60 params: data
61 }) 61 })
......
group/apply/mergeUp.vue
...@@ -184,7 +184,6 @@ function goDetail(item) { ...@@ -184,7 +184,6 @@ function goDetail(item) {
184 uni.navigateTo({ 184 uni.navigateTo({
185 url: path 185 url: path
186 }); 186 });
187
188 } 187 }
189 function goMerge(){ 188 function goMerge(){
190 let path = `/group/apply/merge` 189 let path = `/group/apply/merge`
......
login/login.vue
...@@ -240,7 +240,10 @@ ...@@ -240,7 +240,10 @@
240 icon: 'none' 240 icon: 'none'
241 }) 241 })
242 countDown.value.start = true 242 countDown.value.start = true
243 }).catch(getCode) 243 }).catch(res=>{
244 console.log(res.data.msg)
245 getCode()
246 })
244 } 247 }
245 248
246 function timeup() { 249 function timeup() {
......
personalVip/addChange.vue
...@@ -163,36 +163,36 @@ ...@@ -163,36 +163,36 @@
163 </template> 163 </template>
164 164
165 <script setup> 165 <script setup>
166 import { 166 import {
167 ref 167 ref
168 } from 'vue' 168 } from 'vue'
169 import { 169 import {
170 onLoad, 170 onLoad,
171 onShow 171 onShow
172 } from '@dcloudio/uni-app' 172 } from '@dcloudio/uni-app'
173 import * as api from '@/common/api.js' 173 import * as api from '@/common/api.js'
174 import config from '/config.js' 174 import config from '/config.js'
175 const queryParams = ref({}) 175 const queryParams = ref({})
176 const total = ref(0) 176 const total = ref(0)
177 const list = ref([]) 177 const list = ref([])
178 const popup = ref(null) 178 const popup = ref(null)
179 const choseStudent = ref(null) 179 const choseStudent = ref(null)
180 const studentList = ref([]) 180 const studentList = ref([])
181 const type = ref('') 181 const type = ref('')
182 const form = ref({}) 182 const form = ref({})
183 const sexs = ref([{ 183 const sexs = ref([{
184 text: '男', 184 text: '男',
185 value: '0' 185 value: '0'
186 }, { 186 }, {
187 text: '女', 187 text: '女',
188 value: '1' 188 value: '1'
189 }]) 189 }])
190 const cardType = ref([{ 190 const cardType = ref([{
191 text: '身份证', 191 text: '身份证',
192 value: '0' 192 value: '0'
193 }, 193 },
194 { 194 {
195 text: '港澳台通行证 ', 195 text: '来往大陆(内地)通行证',
196 value: '1' 196 value: '1'
197 }, 197 },
198 { 198 {
...@@ -200,7 +200,7 @@ const cardType = ref([{ ...@@ -200,7 +200,7 @@ const cardType = ref([{
200 value: '2' 200 value: '2'
201 }, 201 },
202 { 202 {
203 text: '外国护照', 203 text: '护照',
204 value: '3' 204 value: '3'
205 }, 205 },
206 { 206 {
...@@ -208,42 +208,45 @@ const cardType = ref([{ ...@@ -208,42 +208,45 @@ const cardType = ref([{
208 value: '4' 208 value: '4'
209 }, 209 },
210 { 210 {
211 text: '户口本', 211 text: '香港身份证',
212 value: '5' 212 value: '5'
213 },
214 {
215 text: '往来港澳台通行证',
216 value: '6'
213 } 217 }
214 ]) 218 ])
215 const cardType1 = ref([{ 219 const cardType1 = ref([{
216 text: '身份证', 220 text: '身份证',
217 value: '0' 221 value: '0'
218 }, 222 },
219 { 223 {
220 text: '港澳台通行证 ', 224 text: '来往大陆(内地)通行证',
221 value: '1' 225 value: '1'
222 }, 226 }, {
223 { 227 text: '护照',
224 text: '外国护照',
225 value: '3' 228 value: '3'
226 }, 229 },
227 { 230 {
228 text: '户口本', 231 text: '香港身份证',
229 value: '5' 232 value: '5'
230 } 233 }
231 ]) 234 ])
232 onLoad((option) => { 235 onLoad((option) => {
233 if (option.rangeId) { 236 if (option.rangeId) {
234 queryParams.value.rangeId = option.rangeId 237 queryParams.value.rangeId = option.rangeId
235 getList() 238 getList()
236 } 239 }
237 }) 240 })
238 onShow((option) => { 241 onShow((option) => {
239 console.log(option) 242 console.log(option)
240 if(option){ 243 if (option) {
241 queryParams.value.rangeId = option 244 queryParams.value.rangeId = option
242 getList() 245 getList()
243 } 246 }
244 }) 247 })
245 248
246 function getList() { 249 function getList() {
247 uni.showLoading({ 250 uni.showLoading({
248 title: '加载中' 251 title: '加载中'
249 }) 252 })
...@@ -255,16 +258,16 @@ function getList() { ...@@ -255,16 +258,16 @@ function getList() {
255 total.value = res.total 258 total.value = res.total
256 uni.hideLoading() 259 uni.hideLoading()
257 }) 260 })
258 } 261 }
259 262
260 function handleChange(a, b) { 263 function handleChange(a, b) {
261 type.value = b 264 type.value = b
262 form.value = a 265 form.value = a
263 console.log(form.value.newName) 266 console.log(form.value.newName)
264 popup.value.open() 267 popup.value.open()
265 } 268 }
266 269
267 function handleDelete(row) { 270 function handleDelete(row) {
268 uni.showModal({ 271 uni.showModal({
269 content: `确认删除会员${row.newName}`, 272 content: `确认删除会员${row.newName}`,
270 success: function(res) { 273 success: function(res) {
...@@ -273,7 +276,7 @@ function handleDelete(row) { ...@@ -273,7 +276,7 @@ function handleDelete(row) {
273 uni.showToast({ 276 uni.showToast({
274 title: '操作成功' 277 title: '操作成功'
275 }) 278 })
276 if(list.value.length==1){ 279 if (list.value.length == 1) {
277 queryParams.value.rangeId = '' 280 queryParams.value.rangeId = ''
278 } 281 }
279 getList() 282 getList()
...@@ -281,38 +284,38 @@ function handleDelete(row) { ...@@ -281,38 +284,38 @@ function handleDelete(row) {
281 } 284 }
282 } 285 }
283 }) 286 })
284 } 287 }
285 288
286 function chooseOnline() { 289 function chooseOnline() {
287 // uni.showLoading({ 290 // uni.showLoading({
288 // title: '加载中', 291 // title: '加载中',
289 // icon: 'none' 292 // icon: 'none'
290 // }) 293 // })
291 // var obj = { 294 // var obj = {
292 // paymentRangeId: queryParams.value.rangeId || '-1', 295 // paymentRangeId: queryParams.value.rangeId || '-1',
293 // multiDeptFlag: 1, 296 // multiDeptFlag: 1,
294 // perType: 1 297 // perType: 1
295 // } 298 // }
296 // api.selectPageList(obj).then(res => { 299 // api.selectPageList(obj).then(res => {
297 // studentList.value = res.rows 300 // studentList.value = res.rows
298 // uni.hideLoading() 301 // uni.hideLoading()
299 // choseStudent.value.open() 302 // choseStudent.value.open()
300 // }) 303 // })
301 uni.navigateTo({ 304 uni.navigateTo({
302 url:`/personalVip/changeVipChoseList?rangeId=${queryParams.value.rangeId || '-1'}` 305 url: `/personalVip/changeVipChoseList?rangeId=${queryParams.value.rangeId || '-1'}`
303 }) 306 })
304 307
305 } 308 }
306 309
307 function checkThis(n) { 310 function checkThis(n) {
308 if (n.checked) { 311 if (n.checked) {
309 n.checked = false 312 n.checked = false
310 } else { 313 } else {
311 n.checked = true 314 n.checked = true
312 } 315 }
313 } 316 }
314 317
315 function handleImport() { 318 function handleImport() {
316 var arr = [] 319 var arr = []
317 for (var n of studentList.value) { 320 for (var n of studentList.value) {
318 if (n.checked) { 321 if (n.checked) {
...@@ -327,9 +330,9 @@ function handleImport() { ...@@ -327,9 +330,9 @@ function handleImport() {
327 choseStudent.value.close() 330 choseStudent.value.close()
328 getList() 331 getList()
329 }) 332 })
330 } 333 }
331 334
332 function submitForm(type) { 335 function submitForm(type) {
333 if (type == 'newIdcCode' && form.value.newIdcType == 0) { 336 if (type == 'newIdcCode' && form.value.newIdcType == 0) {
334 // 验证身份证 337 // 验证身份证
335 const pattern = 338 const pattern =
...@@ -359,17 +362,30 @@ function submitForm(type) { ...@@ -359,17 +362,30 @@ function submitForm(type) {
359 }) 362 })
360 getList() 363 getList()
361 }) 364 })
362 } 365 }
363 366
364 function commitFN() { 367 function commitFN() {
365 const flag = list.value.some(item => { 368 const flag = list.value.some(item => {
369 if ((item.newName == item.oldName) && (item.newSex == item.oldSex) &&
370 (item.oldIdcType == item.newIdcType) && (item.oldIdcCode == item.newIdcCode) &&
371 (item.newBirth == item.oldBirth)
372 ) {
373 uni.showToast({
374 title: `${item.newName}没有变更的信息`,
375 icon: 'none'
376 })
377 return true
378 }
379
366 if (!item.fileUrl) { 380 if (!item.fileUrl) {
367 uni.showToast({ 381 uni.showToast({
368 title:`请上传${item.newName}的附件`, 382 title: `请上传${item.newName}的附件`,
369 icon:'none' 383 icon: 'none'
370 }) 384 })
371 return !item.fileUrl 385 return !item.fileUrl
372 } 386 }
387
388
373 }) 389 })
374 if (flag) return 390 if (flag) return
375 if (form.value.rangeId == '') return 391 if (form.value.rangeId == '') return
...@@ -389,13 +405,13 @@ function commitFN() { ...@@ -389,13 +405,13 @@ function commitFN() {
389 } 405 }
390 } 406 }
391 }) 407 })
392 } 408 }
393 let selectFileValue = {} 409 let selectFileValue = {}
394 410
395 function selectFile(row, e) { 411 function selectFile(row, e) {
396 form.value = row 412 form.value = row
397 let file = e.tempFiles[0] 413 let file = e.tempFiles[0]
398 if(!file){ 414 if (!file) {
399 return 415 return
400 } 416 }
401 api.uploadFile(e).then(data => { 417 api.uploadFile(e).then(data => {
...@@ -404,9 +420,9 @@ function selectFile(row, e) { ...@@ -404,9 +420,9 @@ function selectFile(row, e) {
404 name: file.name, 420 name: file.name,
405 extname: file.extname 421 extname: file.extname
406 } 422 }
407 console.log(selectFileValue,row.fileUrl) 423 console.log(selectFileValue, row.fileUrl)
408 uni.showLoading({ 424 uni.showLoading({
409 title:'上传中' 425 title: '上传中'
410 }) 426 })
411 api.personChangeEditMod({ 427 api.personChangeEditMod({
412 id: form.value.id, 428 id: form.value.id,
...@@ -418,18 +434,17 @@ function selectFile(row, e) { ...@@ -418,18 +434,17 @@ function selectFile(row, e) {
418 newSex: form.value.newSex, 434 newSex: form.value.newSex,
419 newValiDate: form.value.newValiDate, 435 newValiDate: form.value.newValiDate,
420 fileUrl: JSON.stringify([selectFileValue]) 436 fileUrl: JSON.stringify([selectFileValue])
421 }).then(Response=>{ 437 }).then(Response => {
422 uni.hideLoading() 438 uni.hideLoading()
423 getList() 439 getList()
424 }) 440 })
425 }); 441 });
426 } 442 }
427 443
428 function delSupplementFile(row) { 444 function delSupplementFile(row) {
429 selectFileValue = {} 445 selectFileValue = {}
430 row.fileUrl = [] 446 row.fileUrl = []
431 } 447 }
432
433 </script> 448 </script>
434 <style scoped lang="scss"> 449 <style scoped lang="scss">
435 .flexbox { 450 .flexbox {
...@@ -469,7 +484,9 @@ function delSupplementFile(row) { ...@@ -469,7 +484,9 @@ function delSupplementFile(row) {
469 border-radius: 50px; 484 border-radius: 50px;
470 font-size: 28rpx; 485 font-size: 28rpx;
471 } 486 }
487
472 :deep(.file-picker__progress) { 488 :deep(.file-picker__progress) {
473 opacity: 0;background-color: transparent; 489 opacity: 0;
490 background-color: transparent;
474 } 491 }
475 </style> 492 </style>
...\ No newline at end of file ...\ No newline at end of file
......
personalVip/addVip.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 v-model="baseFormData.name" placeholder="请输入姓名" /> 11 v-model="baseFormData.name" placeholder="请输入姓名" />
12 </uni-forms-item> 12 </uni-forms-item>
13 <uni-forms-item label="证件类型" required name="idcType"> 13 <uni-forms-item label="证件类型" required name="idcType">
14 <uni-data-select v-model="baseFormData.idcType" style="width: 300rpx;" 14 <uni-data-select v-model="baseFormData.idcType" style="width: 360rpx;"
15 @change="changeIdcType" :clear="false" :disabled="current === 0" 15 @change="changeIdcType" :clear="false" :disabled="current === 0"
16 :localdata="idcTypeList"></uni-data-select> 16 :localdata="idcTypeList"></uni-data-select>
17 </uni-forms-item> 17 </uni-forms-item>
...@@ -150,14 +150,17 @@ ...@@ -150,14 +150,17 @@
150 }, 150 },
151 { 151 {
152 value: '1', 152 value: '1',
153 text: "港澳台通行证" 153 text: "来往大陆(内地)通行证"
154 }, 154 },
155 { 155 {
156 value: '3', 156 value: '3',
157 text: "外国护照" 157 text: "护照"
158 }, { 158 }, {
159 value: '4', 159 value: '4',
160 text: '户口本' 160 text: '户口本'
161 }, {
162 value: '5',
163 text: '香港身份证'
161 } 164 }
162 ]) 165 ])
163 const sexs = ref([{ 166 const sexs = ref([{
......
personalVip/changeVipChoseList.vue
...@@ -65,7 +65,7 @@ const cardType = ref([{ ...@@ -65,7 +65,7 @@ const cardType = ref([{
65 value: '0' 65 value: '0'
66 }, 66 },
67 { 67 {
68 text: '港澳台通行证 ', 68 text: '来往大陆(内地)通行证',
69 value: '1' 69 value: '1'
70 }, 70 },
71 { 71 {
...@@ -73,7 +73,7 @@ const cardType = ref([{ ...@@ -73,7 +73,7 @@ const cardType = ref([{
73 value: '2' 73 value: '2'
74 }, 74 },
75 { 75 {
76 text: '外国护照', 76 text: '护照',
77 value: '3' 77 value: '3'
78 }, 78 },
79 { 79 {
...@@ -81,8 +81,12 @@ const cardType = ref([{ ...@@ -81,8 +81,12 @@ const cardType = ref([{
81 value: '4' 81 value: '4'
82 }, 82 },
83 { 83 {
84 text: '户口本', 84 text: '香港身份证',
85 value: '5' 85 value: '5'
86 },
87 {
88 text: '往来港澳台通行证',
89 value: '6'
86 } 90 }
87 ]) 91 ])
88 onLoad((option) => { 92 onLoad((option) => {
......
personalVip/changeVipDetail.vue
...@@ -94,15 +94,15 @@ ...@@ -94,15 +94,15 @@
94 value: '2' 94 value: '2'
95 }, 95 },
96 { 96 {
97 label: '外国护照', 97 label: '护照',
98 value: '3' 98 value: '3'
99 }, 99 },
100 { 100 {
101 label: '其它', 101 label: '户口本',
102 value: '4' 102 value: '4'
103 }, 103 },
104 { 104 {
105 label: '户口本', 105 label: '香港身份证',
106 value: '5' 106 value: '5'
107 } 107 }
108 ]) 108 ])
......
personalVip/detail.vue
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
57 value: '0' 57 value: '0'
58 }, 58 },
59 { 59 {
60 label: '港澳台通行证 ', 60 label: '来往大陆(内地)通行证',
61 value: '1' 61 value: '1'
62 }, 62 },
63 { 63 {
...@@ -65,12 +65,18 @@ ...@@ -65,12 +65,18 @@
65 value: '2' 65 value: '2'
66 }, 66 },
67 { 67 {
68 label: '外国护照', 68 label: '护照',
69 value: '3' 69 value: '3'
70 }, 70 },
71 { 71 {
72 label: '其它', 72 label: '其它',
73 value: '4' 73 value: '4'
74 }, {
75 label: '香港身份证',
76 value: '5'
77 }, {
78 label: '往来港澳台通行证',
79 value: '6'
74 } 80 }
75 ]) 81 ])
76 const form = ref({}) 82 const form = ref({})
......
personalVip/mergeVipChoseList.vue
...@@ -65,7 +65,7 @@ const cardType = ref([{ ...@@ -65,7 +65,7 @@ const cardType = ref([{
65 value: '0' 65 value: '0'
66 }, 66 },
67 { 67 {
68 text: '港澳台通行证 ', 68 text: '来往大陆(内地)通行证',
69 value: '1' 69 value: '1'
70 }, 70 },
71 { 71 {
...@@ -73,7 +73,7 @@ const cardType = ref([{ ...@@ -73,7 +73,7 @@ const cardType = ref([{
73 value: '2' 73 value: '2'
74 }, 74 },
75 { 75 {
76 text: '外国护照', 76 text: '护照',
77 value: '3' 77 value: '3'
78 }, 78 },
79 { 79 {
...@@ -81,8 +81,12 @@ const cardType = ref([{ ...@@ -81,8 +81,12 @@ const cardType = ref([{
81 value: '4' 81 value: '4'
82 }, 82 },
83 { 83 {
84 text: '户口本', 84 text: '香港身份证',
85 value: '5' 85 value: '5'
86 },
87 {
88 text: '往来港澳台通行证',
89 value: '6'
86 } 90 }
87 ]) 91 ])
88 onLoad((option) => { 92 onLoad((option) => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!