Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
9a050e3a by 杨炀
Options

1.0.4 36库 修复12.18bug 及 修改意见

1 parent e17cf320
Inline Side-by-side
Showing 8 changed files with 364 additions and 225 deletions
common/api.js
...@@ -30,10 +30,14 @@ function carUrl(data, type) { ...@@ -30,10 +30,14 @@ function carUrl(data, type) {
30 return uni.uploadFile({ 30 return uni.uploadFile({
31 url: `${config.baseUrl_api}/person/info/getPersonInfoFromCert/${type}`, 31 url: `${config.baseUrl_api}/person/info/getPersonInfoFromCert/${type}`,
32 header: { 32 header: {
33 'Authorization': uni.getStorageSync('token'), 33 'Authorization': uni.getStorageSync('token'),
34 'Content-Language': 'zh_CN',
35 'Accept-Language': 'zh-CN,zh',
34 }, 36 },
35 name: 'pic', 37 name: 'pic',
36 filePath: data 38 filePath: data
39 }).then(res => {
40 return JSON.parse(res.data)
37 }) 41 })
38 // return request({ 42 // return request({
39 // url: `/person/info/getPersonInfoFromCert/${type}`, 43 // url: `/person/info/getPersonInfoFromCert/${type}`,
...@@ -226,7 +230,12 @@ function addTransferToRange(data) { ...@@ -226,7 +230,12 @@ function addTransferToRange(data) {
226 params: data 230 params: data
227 }) 231 })
228 } 232 }
229 233 function deltransferRange(rids) {
234 return request({
235 url: `/person/transfer/${rids}`,
236 method: 'delete'
237 })
238 }
230 function commit(rangeIds) { 239 function commit(rangeIds) {
231 return request({ 240 return request({
232 url: `/person/transferRange/commit/${rangeIds}`, 241 url: `/person/transferRange/commit/${rangeIds}`,
...@@ -240,7 +249,15 @@ function mobilizeAudit(data) { ...@@ -240,7 +249,15 @@ function mobilizeAudit(data) {
240 method: 'post', 249 method: 'post',
241 params: data 250 params: data
242 }) 251 })
243 } 252 }
253 function delMobilize(rids) {
254 return request({
255 url: `/person/transferRange/${rids}`,
256 method: 'delete'
257 })
258 }
259
260
244 //文件上传 261 //文件上传
245 function uploadFile(e) { 262 function uploadFile(e) {
246 const fileUrl = e.tempFilePaths[0] 263 const fileUrl = e.tempFilePaths[0]
...@@ -1058,5 +1075,6 @@ export { ...@@ -1058,5 +1075,6 @@ export {
1058 getMemberInfoModRange,commitGroupChange,delGroupChange, 1075 getMemberInfoModRange,commitGroupChange,delGroupChange,
1059 getChangeGroupByRangeId,groupInfoMod,addGroupInfoModeToRange, 1076 getChangeGroupByRangeId,groupInfoMod,addGroupInfoModeToRange,
1060 groupChangeEditMod,groupChangeAudit,extractInfoFromChinaIdCard 1077 groupChangeEditMod,groupChangeAudit,extractInfoFromChinaIdCard
1061 ,certifiedwithDraw,certifiedunMerge,getRemindCount,getGroupMemberInfoById 1078 ,certifiedwithDraw,certifiedunMerge,getRemindCount,getGroupMemberInfoById
1079 ,delMobilize,deltransferRange
1062 } 1080 }
...\ No newline at end of file ...\ No newline at end of file
......
common/login.js
...@@ -123,7 +123,7 @@ function getMyOwnMemberInfo() { ...@@ -123,7 +123,7 @@ function getMyOwnMemberInfo() {
123 const app = getApp() 123 const app = getApp()
124 app.globalData.authenticationStatus = res.data.authenticationStatus 124 app.globalData.authenticationStatus = res.data.authenticationStatus
125 app.globalData.memberInfo = res.data.memberInfo 125 app.globalData.memberInfo = res.data.memberInfo
126 app.globalData.isExam = res.data?.dept?.isExam 126 app.globalData.isExam = res.data?.memberInfo?.isPoints
127 }) 127 })
128 } 128 }
129 export { 129 export {
......
config.js
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
5 // staging 会员系统 5 // staging 会员系统
6 // const baseUrl_api = "http://22yidpjzjifv.ngrok.xiaomiqiu123.top/stage-api/"; 6 // const baseUrl_api = "http://22yidpjzjifv.ngrok.xiaomiqiu123.top/stage-api/";
7 // const baseUrl_api = "http://123.60.96.243/stage-api/"; 7 // const baseUrl_api = "http://123.60.96.243/stage-api/";
8 // const baseUrl_api = 'http://192.168.1.131:8787' 8 // const baseUrl_api = 'http://192.168.1.11:8787'
9 // const baseUrl_api = 'https://ztx.itechtop.cn/stage-api' 9 // const baseUrl_api = 'https://ztx.itechtop.cn/stage-api'
10 // const baseUrl_api = 'https://tkcn.19wk.cn:8443/stage-api' 10 const baseUrl_api = 'https://tkcn.19wk.cn:8443/stage-api'
11 11
12 const baseUrl_api = 'https://newsystem.taekwondo.org.cn/stage-api' 12 // const baseUrl_api = 'https://newsystem.taekwondo.org.cn/stage-api'
13 export default { 13 export default {
14 baseUrl_api 14 baseUrl_api
15 } 15 }
......
level/addApply.vue
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 </uni-forms-item> 26 </uni-forms-item>
27 <uni-forms-item @updateData="updateData" :label="`考官${ec}`" v-for="ec in examinerForChoose" 27 <uni-forms-item @updateData="updateData" :label="`考官${ec}`" v-for="ec in examinerForChoose"
28 :key="ec"> 28 :key="ec">
29 <view class="maskbox"> 29 <view class="maskbox">
30 <view class="mask" @click="selectFN(ec)"></view> 30 <view class="mask" @click="selectFN(ec)"></view>
31 <uni-easyinput v-model="form[`examiner_${ec}`]" clearable placeholder="点击选择考官" /> 31 <uni-easyinput v-model="form[`examiner_${ec}`]" clearable placeholder="点击选择考官" />
32 </view> 32 </view>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 <button class="btn-red-kx mini w100" @click="chooseOnline"> 41 <button class="btn-red-kx mini w100" @click="chooseOnline">
42 <uni-icons type="personadd" size="16" color="#AD181F"></uni-icons> 42 <uni-icons type="personadd" size="16" color="#AD181F"></uni-icons>
43 在线选择</button> 43 在线选择</button>
44 <!-- <button class="btn-red-kx mini w45" @click="handleUpdate"> 44 <!-- <button class="btn-red-kx mini w45" @click="handleUpdate">
45 <uni-icons type="upload" size="16" color="#AD181F"></uni-icons> 45 <uni-icons type="upload" size="16" color="#AD181F"></uni-icons>
46 上传成绩单</button> --> 46 上传成绩单</button> -->
47 </view> 47 </view>
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
52 </view> 52 </view>
53 </view> 53 </view>
54 <view class="userlist"> 54 <view class="userlist">
55 <view class="item" v-for="(n,index) in infoList" :key="index" style="background-color: #fffafa;"> 55 <view class="item" v-for="(n,index) in infoList" :key="index"
56 <view class="w100"> 56 style="background-color: #fffafa;">
57 <view class="w100">
57 <view class="del" @click="handleDelete(n)">删除</view> 58 <view class="del" @click="handleDelete(n)">删除</view>
58 <view style="display: flex;"> 59 <view style="display: flex;">
59 <view class="photobox"> 60 <view class="photobox">
60 <image class="photo" v-if="n.photo" :src="n.photo" 61 <image class="photo" v-if="n.photo" :src="n.photo" mode='aspectFill'></image>
61 mode='aspectFill'></image>
62 <view class="colorful" v-else>{{n.realName?.slice(0,1)}}</view> 62 <view class="colorful" v-else>{{n.realName?.slice(0,1)}}</view>
63 </view> 63 </view>
64 <view> 64 <view>
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
72 <text style="padding: 15rpx 0;">{{ szToHz(n.levelOld) }}级</text> 72 <text style="padding: 15rpx 0;">{{ szToHz(n.levelOld) }}级</text>
73 </view> 73 </view>
74 <view style="width: 40%;"> 74 <view style="width: 40%;">
75 考试级别 75 考试级别
76 <text style="padding: 15rpx 0;">{{ szToHz(n.levelNew) }}级</text> 76 <text style="padding: 15rpx 0;">{{ szToHz(n.levelNew) }}级</text>
77 <!-- <view @click="changeLevelfather(n)"> 77 <!-- <view @click="changeLevelfather(n)">
78 <uni-data-select v-model="n.levelNew" :localdata="levelArr" 78 <uni-data-select v-model="n.levelNew" :localdata="levelArr"
79 @change="changeLevel"></uni-data-select> 79 @change="changeLevel"></uni-data-select>
80 </view> --> 80 </view> -->
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <view style="width: 30%;"> 84 <view style="width: 30%;">
85 是否通过 85 是否通过
86 <view> 86 <view>
87 <uni-data-select v-model="n.isPass" :localdata="range"></uni-data-select> 87 <uni-data-select :clear="false" v-model="n.isPass" :localdata="range"></uni-data-select>
88 </view> 88 </view>
89 </view> 89 </view>
90 </view> 90 </view>
...@@ -111,12 +111,18 @@ ...@@ -111,12 +111,18 @@
111 111
112 112
113 <uni-popup ref="choseStudent" type="bottom" background-color="#fff" animation> 113 <uni-popup ref="choseStudent" type="bottom" background-color="#fff" animation>
114 <view class="popBody"> 114 <view class="popBody">
115 <view class="userlist" style="max-height:80vh;overflow: auto;"> 115 <view class="searchbar">
116 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search"
117 v-model="studentQuery.name" placeholder="搜索姓名" @blur="chooseOnline" @clear="chooseOnline">
118 </uni-easyinput>
119 </view>
120 <view class="userlist" style="height:80vh;overflow: auto;">
116 <view class="item" v-for=" (n,index) in studentList" :key="index"> 121 <view class="item" v-for=" (n,index) in studentList" :key="index">
117 <view @click="checkThis(n)"> 122 <view @click="checkThis(n)">
118 <image class="icon" v-if="n.checked" :src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" /> 123 <image class="icon" v-if="n.checked"
119 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" /> 124 :src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" />
125 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
120 </view> 126 </view>
121 <view class="photobox"> 127 <view class="photobox">
122 <image class="photo" v-if="n.photo" :src="n.photo" mode='aspectFill'> 128 <image class="photo" v-if="n.photo" :src="n.photo" mode='aspectFill'>
...@@ -135,7 +141,7 @@ ...@@ -135,7 +141,7 @@
135 <image mode="aspectFit" src="/static/nodata.png"></image> 141 <image mode="aspectFit" src="/static/nodata.png"></image>
136 <text>无可参加考试会员</text> 142 <text>无可参加考试会员</text>
137 </view> 143 </view>
138 </view> 144 </view>
139 <button class="btn-red-kx" v-if="studentList.length!=0" @click="submitStudents">确定</button> 145 <button class="btn-red-kx" v-if="studentList.length!=0" @click="submitStudents">确定</button>
140 </view> 146 </view>
141 </uni-popup> 147 </uni-popup>
...@@ -188,7 +194,10 @@ ...@@ -188,7 +194,10 @@
188 const infoList = ref([]) 194 const infoList = ref([])
189 const ids = ref([]) 195 const ids = ref([])
190 const tablePersonInfo = ref({}) 196 const tablePersonInfo = ref({})
191 const transcript = ref([]) 197 const transcript = ref([])
198 const studentQuery = ref({
199 name:''
200 })
192 const levelArr = ref([{ 201 const levelArr = ref([{
193 value: '10', 202 value: '10',
194 text: '十级' 203 text: '十级'
...@@ -365,13 +374,13 @@ ...@@ -365,13 +374,13 @@
365 save().then(() => { 374 save().then(() => {
366 // form.value.examId 下一步 375 // form.value.examId 下一步
367 active.value = 1 376 active.value = 1
368 getChosedStudentList() 377 getChosedStudentList()
369 if(form.value.examId){ 378 if (form.value.examId) {
370 api.getLevelApplyInfo(form.value.examId).then(res=>{ 379 api.getLevelApplyInfo(form.value.examId).then(res => {
371 if (res.data.transcript) { 380 if (res.data.transcript) {
372 transcript.value = JSON.parse(res.data.transcript) 381 transcript.value = JSON.parse(res.data.transcript)
373 } 382 }
374 }) 383 })
375 } 384 }
376 }) 385 })
377 } 386 }
...@@ -398,24 +407,25 @@ ...@@ -398,24 +407,25 @@
398 } 407 }
399 408
400 function chooseOnline() { 409 function chooseOnline() {
401 uni.showLoading({ 410 uni.showLoading({
402 title:'加载中', 411 title: '加载中',
403 icon:'none' 412 icon: 'none'
404 }) 413 })
405 var obj = { 414 var obj = {
406 memId: memberInfo.memId, 415 memId: memberInfo.memId,
407 examId: form.value.examId, 416 examId: form.value.examId,
408 examType: form.value.type 417 examType: form.value.type,
418 name:studentQuery.value.name
409 } 419 }
410 api.chooseStudentsList(obj).then(response => { 420 api.chooseStudentsList(obj).then(response => {
411 studentList.value = response.rows 421 studentList.value = response.rows
412 for (var s of studentList.value) { 422 for (var s of studentList.value) {
413 s.checked = false 423 s.checked = false
414 if(s.photo&&s.photo.indexOf('http')==-1){ 424 if (s.photo && s.photo.indexOf('http') == -1) {
415 s.photo = config.baseUrl_api + s.photo 425 s.photo = config.baseUrl_api + s.photo
416 } 426 }
417 427
418 } 428 }
419 uni.hideLoading() 429 uni.hideLoading()
420 choseStudent.value.open() 430 choseStudent.value.open()
421 }) 431 })
...@@ -473,9 +483,9 @@ ...@@ -473,9 +483,9 @@
473 483
474 if (!d.isPass) { 484 if (!d.isPass) {
475 d.isPass = '1' 485 d.isPass = '1'
476 } 486 }
477 if(d.photo&&d.photo.indexOf('http')==-1){ 487 if (d.photo && d.photo.indexOf('http') == -1) {
478 d.photo = config.baseUrl_api + d.photo 488 d.photo = config.baseUrl_api + d.photo
479 } 489 }
480 }) 490 })
481 491
...@@ -644,36 +654,40 @@ ...@@ -644,36 +654,40 @@
644 } 654 }
645 })) 655 }))
646 UpPop.value.close() 656 UpPop.value.close()
647 } 657 }
648 658
649 function handleDelete(row) { 659 function handleDelete(row) {
650 uni.showModal({ 660 uni.showModal({
651 title: '提示', 661 title: '提示',
652 content: `确定删除${row.realName}?`, 662 content: `确定删除${row.realName}?`,
653 success: function(res) { 663 success: function(res) {
654 if (res.confirm) { 664 if (res.confirm) {
655 api.dellevelPerson(row.id).then(res=>{ 665 api.dellevelPerson(row.id).then(res => {
656 uni.showToast({ 666 uni.showToast({
657 title:`操作成功` 667 title: `操作成功`
658 }) 668 })
659 getChosedStudentList() 669 getChosedStudentList()
660 }) 670 })
661 } 671 }
662 } 672 }
663 }) 673 })
664 } 674 }
665 </script> 675 </script>
666 676
667 <style lang="scss" scoped> 677 <style lang="scss" scoped>
668 :deep(.uni-progress-bar) { 678 :deep(.uni-progress-bar) {
669 display: none; 679 display: none;
670 }
671 .item{
672 .del{ color: #AD181F;
673 position: absolute;
674 right: 30rpx;
675 font-size: 28rpx;}
676 } 680 }
681
682 .item {
683 .del {
684 color: #AD181F;
685 position: absolute;
686 right: 30rpx;
687 font-size: 28rpx;
688 }
689 }
690
677 .wBox { 691 .wBox {
678 width: 700rpx; 692 width: 700rpx;
679 padding: 30rpx; 693 padding: 30rpx;
...@@ -689,11 +703,22 @@ ...@@ -689,11 +703,22 @@
689 703
690 .popBody { 704 .popBody {
691 padding: 40rpx 30rpx; 705 padding: 40rpx 30rpx;
692 } 706 }
693 .maskbox{position:relative; 707
694 .mask{position: absolute;width:calc(100% - 34px);height: 100%;z-index: 10; 708 .maskbox {
695 background-color: red;opacity: 0; 709 position: relative;
696 } 710
697 } 711 .mask {
698 :deep(.file-picker__progress){opacity:0;} 712 position: absolute;
713 width: calc(100% - 34px);
714 height: 100%;
715 z-index: 10;
716 background-color: red;
717 opacity: 0;
718 }
719 }
720
721 :deep(.file-picker__progress) {
722 opacity: 0;
723 }
699 </style> 724 </style>
...\ No newline at end of file ...\ No newline at end of file
......
personalVip/addMobilize.vue
...@@ -198,6 +198,27 @@ ...@@ -198,6 +198,27 @@
198 }) 198 })
199 uni.navigateBack() 199 uni.navigateBack()
200 }) 200 })
201 }
202 function handleDelete(row){
203 uni.showModal({
204 title: '提示',
205 content: `确定删除吗`,
206 success: function(res) {
207 if (res.confirm) {
208 api.deltransferRange([row.id]).then(Response=>{
209 uni.showToast({
210 icon:"none",
211 title:'删除成功！'
212 })
213 if (total.value == 1) {
214 baseFormData.value.rangeId = '-1'
215 queryParams.value.rangeId = '-1'
216 }
217 getList()
218 })
219 }
220 }
221 })
201 } 222 }
202 </script> 223 </script>
203 224
......
personalVip/addVip.vue
...@@ -13,15 +13,17 @@ ...@@ -13,15 +13,17 @@
13 v-model="baseFormData.name" placeholder="请输入姓名" /> 13 v-model="baseFormData.name" placeholder="请输入姓名" />
14 </uni-forms-item> 14 </uni-forms-item>
15 <uni-forms-item label="证件类型" required name="idcType"> 15 <uni-forms-item label="证件类型" required name="idcType">
16 <uni-data-select v-model="baseFormData.idcType" @change="changeIdcType" :clearable="false" :disabled="current === 0" :localdata="idcTypeList"></uni-data-select> 16 <uni-data-select v-model="baseFormData.idcType" @change="changeIdcType" :clearable="false"
17 :disabled="current === 0" :localdata="idcTypeList"></uni-data-select>
17 </uni-forms-item> 18 </uni-forms-item>
18 <uni-forms-item label="证件照" required name="card" v-show="current === 1"> 19 <uni-forms-item label="证件照" required v-show="current === 1">
19 <view class="upCard"> 20 <view class="upCard">
20 <uni-file-picker :class="baseFormData.card?'':'op0'" v-model="baseFormData.cardObj" 21 <uni-file-picker v-model="cardObj" @delete="delimgFont" return-type="object" limit="1"
21 @delete="delimgFont" return-type="object" limit="1" @select="upIdCardImgFront" 22 @select="upIdCardImgFront" :image-styles="imageStylesZJ">
22 :image-styles="imageStylesZJ"></uni-file-picker> 23 <image v-if="!baseFormData.card" class="sfz"
23 <!-- <image v-if="!baseFormData.card" class="sfz" src="@/static/login/sfz.png"> 24 :src="config.baseUrl_api+'/fs/static/login/sfz.png'">
24 </image> --> 25 </image>
26 </uni-file-picker>
25 </view> 27 </view>
26 </uni-forms-item> 28 </uni-forms-item>
27 <uni-forms-item label="姓名" required name="name" v-show="current === 1"> 29 <uni-forms-item label="姓名" required name="name" v-show="current === 1">
...@@ -54,7 +56,7 @@ ...@@ -54,7 +56,7 @@
54 56
55 <uni-forms-item label="头像" required> 57 <uni-forms-item label="头像" required>
56 <uni-file-picker v-model="photoArr" @delete="delPhoto" return-type="object" limit="1" 58 <uni-file-picker v-model="photoArr" @delete="delPhoto" return-type="object" limit="1"
57 @select="upPhoto" :del-ico="false" :image-styles="imageStylesTx"></uni-file-picker> 59 @select="upPhoto" :del-ico="false" :image-styles="imageStylesTx"></uni-file-picker>
58 </uni-forms-item> 60 </uni-forms-item>
59 </view> 61 </view>
60 62
...@@ -102,18 +104,18 @@ ...@@ -102,18 +104,18 @@
102 <button @click="closepopup" class="btn-red">我已阅读</button> 104 <button @click="closepopup" class="btn-red">我已阅读</button>
103 </view> 105 </view>
104 </uni-popup> 106 </uni-popup>
105 107
106 <uni-popup ref="infoConfirm" type="center"> 108 <uni-popup ref="infoConfirm" type="center">
107 <view class="tt">确认信息</view> 109 <view class="tt">确认信息</view>
108 <view class="popBody"> 110 <view class="popBody">
109 <view> 111 <view>
110 112
111 </view> 113 </view>
112 114
113 <button @click="closepopup" class="btn-red">已确认</button> 115 <button @click="closepopup" class="btn-red">已确认</button>
114 </view> 116 </view>
115 </uni-popup> 117 </uni-popup>
116 118
117 </view> 119 </view>
118 </template> 120 </template>
119 121
...@@ -127,12 +129,13 @@ ...@@ -127,12 +129,13 @@
127 } from '@dcloudio/uni-app' 129 } from '@dcloudio/uni-app'
128 import config from '@/config.js' 130 import config from '@/config.js'
129 const current = ref(0) 131 const current = ref(0)
130 const popup = ref(null) 132 const popup = ref(null)
131 const infoConfirm = ref(null) 133 const infoConfirm = ref(null)
132 const agree = ref(false) 134 const agree = ref(false)
133 const perId = ref() 135 const perId = ref()
134 const photoArr = ref({}) 136 const photoArr = ref({})
135 const regionsList = ref([]) 137 const regionsList = ref([])
138 const cardObj = ref({})
136 const baseFormData = ref({ 139 const baseFormData = ref({
137 photo: '', 140 photo: '',
138 sex: '0', 141 sex: '0',
...@@ -151,8 +154,8 @@ ...@@ -151,8 +154,8 @@
151 { 154 {
152 value: '3', 155 value: '3',
153 text: "外国护照" 156 text: "外国护照"
154 },{ 157 }, {
155 value: '5', 158 value: '5',
156 text: '户口本' 159 text: '户口本'
157 } 160 }
158 ]) 161 ])
...@@ -200,16 +203,24 @@ ...@@ -200,16 +203,24 @@
200 function onClickItem(e) { 203 function onClickItem(e) {
201 if (current.value != e.currentIndex) { 204 if (current.value != e.currentIndex) {
202 current.value = e.currentIndex 205 current.value = e.currentIndex
203 } 206 }
204 baseFormData.value = { 207
205 photo: '', 208 photoArr.value = {}
206 sex: '0', 209 if (current.value == 0) {
207 idcType: '0', 210 baseFormData.value = {
208 perType: '1' 211 photo: '',
209 } 212 sex: '0',
210 photoArr.value = {} 213 idcType: '0',
211 if(current.value==0){ 214 perType: '1'
212 baseFormData.value.idcType = '0' 215 }
216 } else {
217 baseFormData.value = {
218 photo: '',
219 sex: '0',
220 idcType: '0',
221 perType: '1',
222 sourceFlag: 1
223 }
213 } 224 }
214 } 225 }
215 226
...@@ -224,54 +235,63 @@ ...@@ -224,54 +235,63 @@
224 // const formData = new FormData() 235 // const formData = new FormData()
225 // formData.append('pic', e.tempFiles[0].file) 236 // formData.append('pic', e.tempFiles[0].file)
226 api.carUrl(e.tempFilePaths[0], baseFormData.value.idcType).then(res => { 237 api.carUrl(e.tempFilePaths[0], baseFormData.value.idcType).then(res => {
227 baseFormData.value.idcUrl = res.data.url 238 console.log(res)
228 baseFormData.value.sex = res.data.sex 239 if(res.data){
229 baseFormData.value.birth = res.data.birth 240 baseFormData.value.sex = res.data.sex
230 baseFormData.value.idcCode = res.data.code 241 baseFormData.value.birth = res.data.birth
231 baseFormData.value.cityId = res.data.cityId 242 baseFormData.value.idcCode = res.data.code
232 baseFormData.value.address = res.data.address 243 baseFormData.value.name = res.data.name
233 photoArr.value = {} 244 baseFormData.value.uuid = res.data.uuid
234 if(res.data.photo){ 245 baseFormData.value.cityId = res.data.cityId
235 baseFormData.value.photo = res.data.photo 246 baseFormData.value.address = res.data.address
236 let obj = { 247 photoArr.value = {}
237 url: config.baseUrl_api + res.data.photo, 248 getExtractInfo({
238 name:'头像', 249 idcCode: baseFormData.value.idcCode,
239 extname:'jpg' 250 idcType: baseFormData.value.idcType,
240 } 251 perType: baseFormData.value.perType
241 photoArr.value=obj 252 })
253
254 } else {
255 uni.showModal({
256 content: res.msg,
257 success: function(res) {
258
259 }
260 })
242 } 261 }
243 baseFormData.value.name = res.data.name 262
244 baseFormData.value.picUUid = res.data.picUUid
245 }) 263 })
246 // api.uploadImg(e).then(data => {
247 // baseFormData.value.card = data.data;
248 // });
249 } 264 }
250 265
251 function upPhoto(e) { 266 function upPhoto(e) {
252 const tempFilePaths = e.tempFilePaths; 267 const tempFilePaths = e.tempFilePaths;
253 const imgUrl = tempFilePaths[0] 268 const imgUrl = tempFilePaths[0]
254 wx.cropImage({ 269 wx.cropImage({
255 src: imgUrl, 270 src: imgUrl,
256 cropScale: '4:5', 271 cropScale: '4:5',
257 success: function(resp) { 272 success: function(resp) {
258 uni.showLoading({ 273 uni.showLoading({
259 title: '加载中' 274 title: '加载中'
260 }); 275 });
261 api.uploadImg(e).then(data => { 276 api.uploadImg(e).then(data => {
262 baseFormData.value.photo = data.msg; 277 baseFormData.value.photo = data.msg;
263 }); 278 });
264 }, 279 },
265 fail: function(err) { 280 fail: function(err) {
266 photoArr.value = {} 281 photoArr.value = {}
267 } 282 }
268 }) 283 })
269 284
270 285
271 } 286 }
272 287
273 function delimgFont(n) { 288 function delimgFont(n) {
274 baseFormData.value.card = ''; 289 baseFormData.value = {
290 photo: '',
291 sex: '0',
292 idcType: '0',
293 perType: '1',
294 };
275 } 295 }
276 296
277 function delPhoto(n) { 297 function delPhoto(n) {
...@@ -279,6 +299,47 @@ ...@@ -279,6 +299,47 @@
279 baseFormData.value.photo = ''; 299 baseFormData.value.photo = '';
280 } 300 }
281 301
302 function getExtractInfo(obj) {
303 //如果老会员
304 api.extractInfoFromChinaIdCard(obj).then(res => {
305 if (res.data.perCode) {
306 perId.value = res.data.perId
307 baseFormData.value.sex = res.data.sex
308 baseFormData.value.birth = res.data.birth
309 baseFormData.value.phone = res.data.phone
310 baseFormData.value.cityId = res.data.cityId
311 baseFormData.value.address = res.data.address
312 photoArr.value = {}
313 if (res.data.photo) {
314 console.log(res.data.photo)
315 if (res.data.photo.indexOf('http') == -1) {
316 baseFormData.value.photo = res.data.photo
317 let obj = {
318 url: config.baseUrl_api + res.data.photo,
319 name: '头像',
320 extname: 'jpg'
321 }
322 photoArr.value = obj
323 } else {
324 baseFormData.value.photo = res.data.photo
325 let obj = {
326 url: res.data.photo,
327 name: '头像',
328 extname: 'jpg'
329 }
330 photoArr.value = obj
331 }
332
333 }
334 baseFormData.value.name = res.data.name
335 baseFormData.value.perId = res.data.perId
336 console.log(res.data.photo, baseFormData.value.photo)
337 } else {
338 return
339 }
340 })
341 }
342
282 function giveBirthDay() { 343 function giveBirthDay() {
283 // 判断身份证正确性/赋值生日 344 // 判断身份证正确性/赋值生日
284 if (baseFormData.value.idcType == 0) { 345 if (baseFormData.value.idcType == 0) {
...@@ -311,50 +372,27 @@ ...@@ -311,50 +372,27 @@
311 // } else { 372 // } else {
312 // baseFormData.value.sex = '0' 373 // baseFormData.value.sex = '0'
313 // } 374 // }
314 // } 375 // }
315 376 getExtractInfo({
316 //如果老会员 377 idcCode: baseFormData.value.idcCode,
317 api.extractInfoFromChinaIdCard({ 378 idcType: baseFormData.value.idcType,
318 idcCode:baseFormData.value.idcCode, 379 perType: baseFormData.value.perType
319 idcType:baseFormData.value.idcType, 380 })
320 perType:baseFormData.value.perType, 381 }
321 }).then(res=>{ 382 }
322 perId.value = res.data.perId 383 if (baseFormData.value.idcType == 1 || baseFormData.value.idcType == 3 || baseFormData.value.idcType == 4) {
323 baseFormData.value.sex = res.data.sex 384 //转换为大写并判断位数12
324 baseFormData.value.birth = res.data.birth 385 baseFormData.value.idcCode = baseFormData.value.idcCode.toUpperCase()
325 baseFormData.value.phone = res.data.phone 386 // var regex = /^[a-zA-Z]/
326 baseFormData.value.cityId = res.data.cityId 387 if (baseFormData.value.idcCode.length > 12) {
327 baseFormData.value.address = res.data.address 388 uni.showToast({
328 photoArr.value = {} 389 icon: 'none',
329 if(res.data.photo){ 390 title: '请输入正确的证件号',
330 baseFormData.value.photo = res.data.photo 391 duration: 2000
331 let obj = { 392 })
332 url: config.baseUrl_api + res.data.photo, 393 return
333 name:'头像',
334 extname:'jpg'
335 }
336 photoArr.value=obj
337 }
338 baseFormData.value.name = res.data.name
339 baseFormData.value.perId = res.data.perId
340 console.log(res.data.photo,baseFormData.value.photo)
341 })
342
343 } 394 }
344 } 395 }
345 if (baseFormData.value.idcType == 1||baseFormData.value.idcType == 3||baseFormData.value.idcType == 4){
346 //转换为大写并判断位数12
347 baseFormData.value.idcCode = baseFormData.value.idcCode.toUpperCase()
348 // var regex = /^[a-zA-Z]/
349 if(baseFormData.value.idcCode.length>12){
350 uni.showToast({
351 icon: 'none',
352 title: '请输入正确的证件号',
353 duration: 2000
354 })
355 return
356 }
357 }
358 } 396 }
359 397
360 function changeSex(e) { 398 function changeSex(e) {
...@@ -369,16 +407,19 @@ ...@@ -369,16 +407,19 @@
369 agree.value = true 407 agree.value = true
370 popup.value.close() 408 popup.value.close()
371 } 409 }
372 function changeIdcType(e){ 410
373 console.log(e) 411 function changeIdcType(e) {
374 // 切换证件照类型把当前页面数据清空 412 console.log(e)
375 // baseFormData.value = { 413 // 切换证件照类型把当前页面数据清空
376 // photo: '', 414 baseFormData.value = {
377 // sex: '0', 415 photo: '',
378 // idcType: '0', 416 sex: '0',
379 // perType: '1', 417 idcType: e,
380 // } 418 perType: '1',
419 sourceFlag: 1
420 }
381 } 421 }
422
382 function goSubmit() { 423 function goSubmit() {
383 if (!agree.value) { 424 if (!agree.value) {
384 uni.showToast({ 425 uni.showToast({
...@@ -411,19 +452,19 @@ ...@@ -411,19 +452,19 @@
411 }) 452 })
412 return 453 return
413 } 454 }
414 if (baseFormData.value.idcType == 1||baseFormData.value.idcType == 3||baseFormData.value.idcType == 4){ 455 if (baseFormData.value.idcType == 1 || baseFormData.value.idcType == 3 || baseFormData.value.idcType == 4) {
415 //转换为大写并判断位数12 456 //转换为大写并判断位数12
416 baseFormData.value.idcCode = baseFormData.value.idcCode.toUpperCase() 457 baseFormData.value.idcCode = baseFormData.value.idcCode.toUpperCase()
417 // var regex = /^[a-zA-Z]/ 458 // var regex = /^[a-zA-Z]/
418 if(baseFormData.value.idcCode.length>12){ 459 if (baseFormData.value.idcCode.length > 12) {
419 uni.showToast({ 460 uni.showToast({
420 icon: 'none', 461 icon: 'none',
421 title: '请输入正确的证件号', 462 title: '请输入正确的证件号',
422 duration: 2000 463 duration: 2000
423 }) 464 })
424 return 465 return
425 } 466 }
426 } 467 }
427 //信息确认弹出 468 //信息确认弹出
428 uni.showModal({ 469 uni.showModal({
429 content: '请确认信息正确', 470 content: '请确认信息正确',
...@@ -437,10 +478,10 @@ ...@@ -437,10 +478,10 @@
437 } 478 }
438 if (res.data * 1 < 0) { 479 if (res.data * 1 < 0) {
439 // 会员调入弹出 480 // 会员调入弹出
440 uni.showModal({ 481 uni.showModal({
441 content:'该会员已存在其他道馆，如需添加，请发起会员调动', 482 content: '该会员已存在其他道馆，如需添加，请发起会员调动',
442 title:'提示', 483 title: '提示',
443 success: function(res) {} 484 success: function(res) {}
444 }) 485 })
445 return 486 return
446 } 487 }
...@@ -469,7 +510,8 @@ ...@@ -469,7 +510,8 @@
469 function getUserInfo() { 510 function getUserInfo() {
470 api.getInfo(perId.value).then(res => { 511 api.getInfo(perId.value).then(res => {
471 baseFormData.value = res.data 512 baseFormData.value = res.data
472 if (baseFormData.areaAssName) baseFormData.ancestorNameList = baseFormData.value.ancestorNameList.join(',').replaceAll(',', 513 if (baseFormData.areaAssName) baseFormData.ancestorNameList = baseFormData.value.ancestorNameList.join(
514 ',').replaceAll(',',
473 '/') 515 '/')
474 }) 516 })
475 } 517 }
...@@ -532,11 +574,11 @@ ...@@ -532,11 +574,11 @@
532 } 574 }
533 575
534 .sfz { 576 .sfz {
535 width: 500rpx; 577 width: 476rpx;
536 position: absolute; 578 position: absolute;
537 top: 0; 579 top: 0;
538 left: 0; 580 left: 0;
539 height: 316rpx; 581 height: 293rpx;
540 } 582 }
541 } 583 }
542 584
...@@ -548,5 +590,4 @@ ...@@ -548,5 +590,4 @@
548 :deep(.item-text-overflow) { 590 :deep(.item-text-overflow) {
549 text-align: left; 591 text-align: left;
550 } 592 }
551
552 </style> 593 </style>
...\ No newline at end of file ...\ No newline at end of file
......
personalVip/mobilize.vue
...@@ -65,8 +65,9 @@ ...@@ -65,8 +65,9 @@
65 <button @click="audit(item.id,'1')">同意</button> 65 <button @click="audit(item.id,'1')">同意</button>
66 </view> 66 </view>
67 <view class="func" v-if="(deptType == 6&&(item.status == 0 || item.status == 2))"> 67 <view class="func" v-if="(deptType == 6&&(item.status == 0 || item.status == 2))">
68 <button @click="del(item)">删除</button>
68 <button @click="editThis(item)">编辑</button> 69 <button @click="editThis(item)">编辑</button>
69 <button>提交审核</button> 70 <button v-if="item.status == 0 || item.status == 2" @click="handleSubmit(item)">提交审核</button>
70 </view> 71 </view>
71 </view> 72 </view>
72 </view> 73 </view>
...@@ -128,12 +129,12 @@ ...@@ -128,12 +129,12 @@
128 if (deptType.value == 1) { 129 if (deptType.value == 1) {
129 queryParams.value.dgId = -2 130 queryParams.value.dgId = -2
130 queryParams.value.ztxRes = '0' 131 queryParams.value.ztxRes = '0'
131 navs.value = ['审核中', '审核通过', '审核拒绝', '撤销申请'] 132 navs.value = ['审核中', '审核通过', '审核拒绝']
132 } 133 }
133 if (deptType.value == 6) { 134 if (deptType.value == 6) {
134 queryParams.value.dgId = 1 135 queryParams.value.dgId = 1
135 queryParams.value.status = '0' 136 queryParams.value.status = '0'
136 navs.value = ['未提交', '审核中', '审核拒绝', '审核通过', '已撤回'] 137 navs.value = ['未提交', '审核中', '审核拒绝', '审核通过']
137 } 138 }
138 getList() 139 getList()
139 } 140 }
...@@ -204,9 +205,42 @@ ...@@ -204,9 +205,42 @@
204 url: path 205 url: path
205 }); 206 });
206 } 207 }
207 208 function handleSubmit(row){
209 uni.showModal({
210 title: '提示',
211 content: `确定提交吗`,
212 success: function(res) {
213 if (res.confirm) {
214 api.commit([row.id]).then(Response=>{
215 uni.showToast({
216 icon:"none",
217 title:'提交成功！'
218 })
219 getList()
220 })
221 }
222 }
223 })
224 }
225 function del(row){
226 uni.showModal({
227 title: '提示',
228 content: `确定删除吗`,
229 success: function(res) {
230 if (res.confirm) {
231 api.delMobilize(row.id).then(Response=>{
232 uni.showToast({
233 icon:"none",
234 title:'删除成功！'
235 })
236 getList()
237 })
238 }
239 }
240 })
241 }
208 function audit(rangeId, flag) { 242 function audit(rangeId, flag) {
209 if (flag == '0') { 243 if (flag == '2') {
210 // 拒绝 244 // 拒绝
211 // 弹出框填写理由 245 // 弹出框填写理由
212 uni.showModal({ 246 uni.showModal({
......
personalVip/mobilizeDetail.vue
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 </view> 38 </view>
39 </view> 39 </view>
40 40
41 <view class="fixedBottom" v-if="(deptType == 1)&&form.ztxRes == 0"> 41 <!-- <view class="fixedBottom" v-if="(deptType == 1)&&form.ztxRes == 0">
42 <button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button> 42 <button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button>
43 <button class="btn-red" @click="audit(form.id,'1')">同意</button> 43 <button class="btn-red" @click="audit(form.id,'1')">同意</button>
44 </view> 44 </view>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 <view class="fixedBottom" v-if="(deptType == 2 || deptType == 3)&&form.shenRes == 0"> 46 <view class="fixedBottom" v-if="(deptType == 2 || deptType == 3)&&form.shenRes == 0">
47 <button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button> 47 <button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button>
48 <button class="btn-red" @click="audit(form.id,'1')">同意</button> 48 <button class="btn-red" @click="audit(form.id,'1')">同意</button>
49 </view> 49 </view> -->
50 50
51 </view> 51 </view>
52 </template> 52 </template>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!