Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
3772b55d by 杨炀
Options

no message

1 parent 78423ea5
Inline Side-by-side
Showing 21 changed files with 1172 additions and 784 deletions
App.vue
...@@ -36,7 +36,27 @@ export default { ...@@ -36,7 +36,27 @@ export default {
36 } 36 }
37 }, 37 },
38 onShow: function() { 38 onShow: function() {
39 console.log('App Show'); 39 // if(firstload&&!this.globalData.isLogin){
40 // console.log('App Show');
41 // uni.redirectTo({
42 // url: '/login/login'
43 // })
44 // }
45
46 if(firstload){
47 getInfo().then(() => {
48 this.globalData.isLogin = true;
49 let firstLoadCallback = getApp().firstLoadCallback;
50 if (firstLoadCallback) {
51 firstLoadCallback();
52 }
53 }).catch(() => {
54 uni.redirectTo({
55 url: '/login/login'
56 })
57 })
58 }
59
40 }, 60 },
41 onHide: function() { 61 onHide: function() {
42 console.log('App Hide'); 62 console.log('App Hide');
......
common/api.js
1 import request from './request.js' 1 import request from './request.js'
2 import config from '@/config.js' 2 import config from '@/config.js'
3 import * as loginServer from '@/common/login.js'; 3 import * as loginServer from '@/common/login.js';
4 import _ from 'lodash' 4 import _ from 'lodash'
5 5
6 export function addMergeToRange(params) { 6 // 激活
7 return request({ 7 export function active(data) {
8 url: `/person/infoMerge/addMergeToRange/${params.perIds}?perId=${params.perIds}&rangeIdStr=${params.rangeIdStr}`, 8 return request({
9 method: 'post', 9 url: `/member/info/active/${data.memId}`,
10 params: params 10 method: 'post',
11 }) 11 params: data
12 } 12 })
13 export function mergerVipAudit(params) { 13 }
14 console.log(params) 14 export function editMyMemberCertifiedInfo(data) {
15 return request({ 15 return request({
16 url: `/person/infoMergeRange/audit/${params.ids}?flag=${params.flag}&reason=${params.reason}`, 16 url: '/system/dept/editMyMemberCertifiedInfo',
17 method: 'post', 17 method: 'post',
18 params: params 18 params: data
19 }) 19 })
20 } 20 }
21 export function infoMergeRangeList(params) { 21 export function addMergeToRange(params) {
22 return request({ 22 return request({
23 url: `/person/infoMergeRange/list`, 23 url: `/person/infoMerge/addMergeToRange/${params.perIds}?perId=${params.perIds}&rangeIdStr=${params.rangeIdStr}`,
24 method: 'get', 24 method: 'post',
25 params: params 25 params: params
26 }) 26 })
27 } 27 }
28 export function infoMergeMod(id) { 28 export function mergerVipAudit(params) {
29 return request({ 29 console.log(params)
30 url: `/person/infoMerge/${id}`, 30 return request({
31 method: 'delete' 31 url: `/person/infoMergeRange/audit/${params.ids}?flag=${params.flag}&reason=${params.reason}`,
32 }) 32 method: 'post',
33 } 33 params: params
34 export function commitMergeVip(ids) { 34 })
35 return request({ 35 }
36 url: `/person/infoMergeRange/commit/${ids}`, 36 export function infoMergeRangeList(params) {
37 method: 'post' 37 return request({
38 }) 38 url: `/person/infoMergeRange/list`,
39 } 39 method: 'get',
40 40 params: params
41 export function delPersonalMerge(ids) { 41 })
42 return request({ 42 }
43 url: `/person/infoMergeRange/${ids}`, 43 export function infoMergeMod(id) {
44 method: 'delete' 44 return request({
45 }) 45 url: `/person/infoMerge/${id}`,
46 } 46 method: 'delete'
47 47 })
48 export function infoMergeList(params) { 48 }
49 return request({ 49 export function commitMergeVip(ids) {
50 url: `/person/infoMerge/list`, 50 return request({
51 method: 'get', 51 url: `/person/infoMergeRange/commit/${ids}`,
52 params: params 52 method: 'post'
53 }) 53 })
54 } 54 }
55 export function editMergeByOldIdc(params) { 55
56 return request({ 56 export function delPersonalMerge(ids) {
57 url: `/person/infoMerge/editMergeByOldIdc/${params.mergeId}?mergeId=${params.mergeId}&idcCode=${params.idcCode}`, 57 return request({
58 method: 'post', 58 url: `/person/infoMergeRange/${ids}`,
59 params: params 59 method: 'delete'
60 }) 60 })
61 } 61 }
62 export function editMergeByFile(params) { 62
63 return request({ 63 export function infoMergeList(params) {
64 url: `/person/infoMerge/editMergeByFile/${params.mergeId}?mergeId=${params.mergeId}&fileUrl=${encodeURIComponent(params.fileUrl)}`, 64 return request({
65 method: 'post', 65 url: `/person/infoMerge/list`,
66 params: params 66 method: 'get',
67 }) 67 params: params
68 } 68 })
69 // 通知公告 69 }
70 export function notice(query) { 70 export function editMergeByOldIdc(params) {
71 return request({ 71 return request({
72 url: '/system/note/notice', 72 url: `/person/infoMerge/editMergeByOldIdc/${params.mergeId}?mergeId=${params.mergeId}&idcCode=${params.idcCode}`,
73 method: 'get', 73 method: 'post',
74 params: query 74 params: params
75 }) 75 })
76 } 76 }
77 export function getNewsById(noteId) { 77 export function editMergeByFile(params) {
78 return request({ 78 return request({
79 url: `/system/note/${noteId}`, 79 url: `/person/infoMerge/editMergeByFile/${params.mergeId}?mergeId=${params.mergeId}&fileUrl=${encodeURIComponent(params.fileUrl)}`,
80 method: 'get' 80 method: 'post',
81 }) 81 params: params
82 } 82 })
83 83 }
84 // 协会树 84 // 通知公告
85 export function certifiedDeptTree(params) { 85 export function notice(query) {
86 return request({ 86 return request({
87 url: '/system/user/certifiedDeptTreeWithNoDaoguan', 87 url: '/system/note/notice',
88 method: 'get', 88 method: 'get',
89 params:params 89 params: query
90 }) 90 })
91 } 91 }
92 // 查询部门下拉树结构 92 export function getNewsById(noteId) {
93 export function deptTreeSelect(params) { 93 return request({
94 return request({ 94 url: `/system/note/${noteId}`,
95 url: '/system/user/certifiedDeptTree', 95 method: 'get'
96 method: 'get', 96 })
97 params:params 97 }
98 }).then((res) => { 98
99 setIdToString(res.data) 99 // 协会树
100 return res 100 export function certifiedDeptTree(params) {
101 }) 101 return request({
102 } 102 url: '/system/user/certifiedDeptTreeWithNoDaoguan',
103 const setIdToString = (list) => { 103 method: 'get',
104 _.each(list, (l) => { 104 params: params
105 l.id += '' 105 })
106 l.parentId += '' 106 }
107 if (l.children && l.children.length > 0) { 107 // 查询部门下拉树结构
108 setIdToString(l.children) 108 export function deptTreeSelect(params) {
109 } 109 return request({
110 }) 110 url: '/system/user/certifiedDeptTree',
111 } 111 method: 'get',
112 112 params: params
113 // 会员认证 113 }).then((res) => {
114 export function centerCommit(data) { 114 setIdToString(res.data)
115 return request({ 115 return res
116 url: `/member/certified/commit`, 116 })
117 method: 'post', 117 }
118 params: data 118 const setIdToString = (list) => {
119 }) 119 _.each(list, (l) => {
120 } 120 l.id += ''
121 121 l.parentId += ''
122 export function updateUserProfile(data) { 122 if (l.children && l.children.length > 0) {
123 return request({ 123 setIdToString(l.children)
124 url: '/system/user/profile', 124 }
125 method: 'put', 125 })
126 params: data 126 }
127 }) 127
128 } 128 // 会员认证
129 export function createMyMember(data) { 129 export function centerCommit(data) {
130 return request({ 130 return request({
131 url: '/member/info/createMyMember', 131 url: `/member/certified/commit`,
132 method: 'post', 132 method: 'post',
133 params: data 133 params: data
134 }) 134 })
135 } 135 }
136 export function updateUserPwd(oldPassword, newPassword) { 136
137 const data = { 137 export function updateUserProfile(data) {
138 oldPassword, 138 return request({
139 newPassword 139 url: '/system/user/profile',
140 } 140 method: 'put',
141 return request({ 141 params: data
142 url: '/system/user/profile/updatePwd', 142 })
143 method: 'put', 143 }
144 params: data 144 export function createMyMember(data) {
145 }) 145 return request({
146 url: '/member/info/createMyMember',
147 method: 'post',
148 params: data
149 })
150 }
151 export function updateUserPwd(data) {
152 return request({
153 url: `/system/user/profile/updatePwd?oldPassword=${encodeURIComponent(data.oldPassword)}&newPassword=${encodeURIComponent(data.oldPassword)}`,
154 method: 'put',
155 params: data
156 })
146 } 157 }
147 export function getMessage(params) { 158 export function getMessage(params) {
148 return request({ 159 return request({
...@@ -172,14 +183,14 @@ export function carUrl(data, type) { ...@@ -172,14 +183,14 @@ export function carUrl(data, type) {
172 return uni.uploadFile({ 183 return uni.uploadFile({
173 url: `${config.baseUrl_api}/person/info/getPersonInfoFromCert/${type}`, 184 url: `${config.baseUrl_api}/person/info/getPersonInfoFromCert/${type}`,
174 header: { 185 header: {
175 'Authorization': uni.getStorageSync('token'), 186 'Authorization': uni.getStorageSync('token'),
176 'Content-Language': 'zh_CN', 187 'Content-Language': 'zh_CN',
177 'Accept-Language': 'zh-CN,zh', 188 'Accept-Language': 'zh-CN,zh',
178 }, 189 },
179 name: 'pic', 190 name: 'pic',
180 filePath: data 191 filePath: data
181 }).then(res => { 192 }).then(res => {
182 return JSON.parse(res.data) 193 return JSON.parse(res.data)
183 }) 194 })
184 // return request({ 195 // return request({
185 // url: `/person/info/getPersonInfoFromCert/${type}`, 196 // url: `/person/info/getPersonInfoFromCert/${type}`,
...@@ -218,6 +229,26 @@ export function uploadImg(e) { ...@@ -218,6 +229,26 @@ export function uploadImg(e) {
218 uni.hideLoading(); 229 uni.hideLoading();
219 }); 230 });
220 } 231 }
232 // corp
233 export function uploadImgCorp(tempFilePath) {
234 const imgUrl = tempFilePath
235 uni.showLoading({
236 title: '加载中'
237 });
238 return uni.uploadFile({
239 url: config.baseUrl_api + '/upload/uploadImgToLocalServer',
240 header: {
241 'Authorization': uni.getStorageSync('token'),
242 },
243 filePath: imgUrl,
244 name: 'image'
245 }).then(res => {
246 let data = JSON.parse(res.data);
247 return data
248 }).finally(() => {
249 uni.hideLoading();
250 });
251 }
221 252
222 export function getInfo(perId) { 253 export function getInfo(perId) {
223 return request({ 254 return request({
...@@ -236,7 +267,7 @@ export function selectPageList(query) { ...@@ -236,7 +267,7 @@ export function selectPageList(query) {
236 267
237 export function delInfo(perId) { 268 export function delInfo(perId) {
238 return request({ 269 return request({
239 // url: '/person/info/' + perId, 270 // url: '/person/info/' + perId,
240 url: '/person/info/clearOwner/' + perId, 271 url: '/person/info/clearOwner/' + perId,
241 method: 'POST' 272 method: 'POST'
242 }) 273 })
...@@ -373,11 +404,11 @@ export function addTransferToRange(data) { ...@@ -373,11 +404,11 @@ export function addTransferToRange(data) {
373 params: data 404 params: data
374 }) 405 })
375 } 406 }
376 export function deltransferRange(rids) { 407 export function deltransferRange(rids) {
377 return request({ 408 return request({
378 url: `/person/transfer/${rids}`, 409 url: `/person/transfer/${rids}`,
379 method: 'delete' 410 method: 'delete'
380 }) 411 })
381 } 412 }
382 export function commit(rangeIds) { 413 export function commit(rangeIds) {
383 return request({ 414 return request({
...@@ -392,14 +423,14 @@ export function mobilizeAudit(data) { ...@@ -392,14 +423,14 @@ export function mobilizeAudit(data) {
392 method: 'post', 423 method: 'post',
393 params: data 424 params: data
394 }) 425 })
395 } 426 }
396 export function delMobilize(rids) { 427 export function delMobilize(rids) {
397 return request({ 428 return request({
398 url: `/person/transferRange/${rids}`, 429 url: `/person/transferRange/${rids}`,
399 method: 'delete' 430 method: 'delete'
400 }) 431 })
401 } 432 }
402 433
403 434
404 //文件上传 435 //文件上传
405 export function uploadFile(e) { 436 export function uploadFile(e) {
...@@ -538,7 +569,7 @@ export function getVerityList(params) { ...@@ -538,7 +569,7 @@ export function getVerityList(params) {
538 method: 'get', 569 method: 'get',
539 params: params 570 params: params
540 }) 571 })
541 } 572 }
542 export function getPerVerityList(params) { 573 export function getPerVerityList(params) {
543 return request({ 574 return request({
544 url: '/person/paymentRange/verifyList', 575 url: '/person/paymentRange/verifyList',
...@@ -568,8 +599,8 @@ export function mergeRecords(data) { ...@@ -568,8 +599,8 @@ export function mergeRecords(data) {
568 method: 'post', 599 method: 'post',
569 params: data 600 params: data
570 }) 601 })
571 } 602 }
572 603
573 604
574 export function groupAudit(data) { 605 export function groupAudit(data) {
575 return request({ 606 return request({
...@@ -632,13 +663,13 @@ export function groupCommitPaymentVoucher(data) { ...@@ -632,13 +663,13 @@ export function groupCommitPaymentVoucher(data) {
632 params: data 663 params: data
633 }) 664 })
634 } 665 }
635 export function submitPayment(data) { 666 export function submitPayment(data) {
636 return request({ 667 return request({
637 url: '/exam/payment', 668 url: '/exam/payment',
638 method: 'put', 669 method: 'put',
639 params: data 670 params: data
640 }) 671 })
641 } 672 }
642 673
643 export function getFeeBillById(id) { 674 export function getFeeBillById(id) {
644 return request({ 675 return request({
...@@ -660,7 +691,7 @@ export function delPayment(payIds) { ...@@ -660,7 +691,7 @@ export function delPayment(payIds) {
660 url: `/person/payment/${payIds}`, 691 url: `/person/payment/${payIds}`,
661 method: 'DELETE' 692 method: 'DELETE'
662 }) 693 })
663 } 694 }
664 export function paymentDel(payIds) { 695 export function paymentDel(payIds) {
665 return request({ 696 return request({
666 url: `/person/paymentRange/${payIds}`, 697 url: `/person/paymentRange/${payIds}`,
...@@ -791,11 +822,11 @@ export function getMySonList(data) { ...@@ -791,11 +822,11 @@ export function getMySonList(data) {
791 params: data 822 params: data
792 }) 823 })
793 } 824 }
794 export function getGroupMemberInfoById(memId) { 825 export function getGroupMemberInfoById(memId) {
795 return request({ 826 return request({
796 url: '/member/info/' + memId, 827 url: '/member/info/' + memId,
797 method: 'get' 828 method: 'get'
798 }) 829 })
799 } 830 }
800 export function addGroupPaymentGroup(data) { 831 export function addGroupPaymentGroup(data) {
801 return request({ 832 return request({
...@@ -808,328 +839,328 @@ export function addGroupPaymentGroup(data) { ...@@ -808,328 +839,328 @@ export function addGroupPaymentGroup(data) {
808 export function getDetailPersonList(data) { 839 export function getDetailPersonList(data) {
809 return request({ 840 return request({
810 url: `/person/paymentRange/getDetailList`, 841 url: `/person/paymentRange/getDetailList`,
811 method: 'get', 842 method: 'get',
843 params: data
844 })
845 }
846
847 export function withDraw(data) {
848 return request({
849 url: `/person/paymentRange/withDraw`,
850 method: 'post',
851 params: data
852 })
853 }
854 export function groupWithDraw(data) {
855 return request({
856 url: `/member/paymentRange/withDraw`,
857 method: 'post',
858 params: data
859 })
860 }
861 export function certifiedwithDraw(data) {
862 return request({
863 url: `/member/certified/withDraw`,
864 method: 'post',
865 params: data
866 })
867 }
868 // 省合并缴费通知单
869 export function mergePayMentApi(data) {
870 return request({
871 url: `/person/paymentRange/merge`,
872 method: 'post',
873 params: data
874 })
875 }
876
877 export function getpaymentVerityMergeList(params) {
878 return request({
879 url: '/person/paymentRange/verifyList',
880 method: 'get',
881 params: params
882 })
883 }
884
885 export function doMergeFlowsPer(data) {
886 return request({
887 url: '/person/paymentRange/audit',
888 method: 'post',
889 params: data
890 })
891 }
892 // 省缴费单拆分
893 export function unMerge(recordId) {
894 return request({
895 url: `/person/paymentRange/unMerge/${recordId}`,
896 method: 'post'
897 })
898 }
899 export function certifiedunMerge(recordId) {
900 return request({
901 url: `/member/certified/unMerge/${recordId}`,
902 method: 'post'
903 })
904 }
905
906 export function dellevelPerson(examId) {
907 return request({
908 url: '/exam/person/' + examId,
909 method: 'delete'
910 })
911 }
912 export function getExamPersonNum(data) {
913 return request({
914 url: `/exam/person/getExamPersonNum`,
915 method: 'get',
916 params: data
917 })
918 }
919 export function doVerityBack(data) {
920 return request({
921 url: `/exam/info/verity/back`,
922 method: 'put',
923 params: data
924 })
925 }
926 export function delRange(ids) {
927 return request({
928 url: `/member/certifiedRange/${ids}`,
929 method: 'delete'
930 })
931 }
932 export function delLevel(examId) {
933 return request({
934 url: '/exam/info/' + examId,
935 method: 'delete'
936 })
937 }
938 export function cancelMerge(id) {
939 return request({
940 url: '/exam/info/cancelMerge/' + id,
941 method: 'post'
942 })
943 }
944 export function getInfoModRange(params) {
945 return request({
946 url: `/person/infoModRange/list`,
947 method: 'get',
948 params: params
949 })
950 }
951 export function addInfoModeList(data) {
952 return request({
953 url: `/person/infoMod/list`,
954 method: 'get',
955 params: data
956 })
957 }
958 export function infoMod(ids) {
959 return request({
960 url: `/person/infoMod/${ids}`,
961 method: 'delete'
962 })
963 }
964 export function commitPersonalChange(ids) {
965 return request({
966 url: `/person/infoModRange/commit/${ids}`,
967 method: 'post'
968 })
969 }
970 export function delPersonalChange(ids) {
971 return request({
972 url: `/person/infoModRange/${ids}`,
973 method: 'delete'
974 })
975 }
976 export function addInfoModeToRange(data) {
977 return request({
978 url: `/person/infoMod/addInfoModeToRange/${data.perIds}?rangeIdStr=${data.rangeIdStr}`,
979 method: 'post'
980 })
981 }
982 export function addGroupInfoModeToRange(data) {
983 return request({
984 url: `/member/infoMod/addInfoModeToRange/${data.memId}?rangeIdStr=${data.rangeIdStr}`,
985 method: 'post'
986 })
987 }
988 export function personChangeEditMod(data) {
989 return request({
990 url: `/person/infoMod/editMod`,
991 method: 'post',
992 params: data
993 })
994 }
995 export function groupChangeEditMod(data) {
996 return request({
997 url: `/member/infoMod/editMod`,
998 method: 'post',
999 params: data
1000 })
1001 }
1002 export function personChangeWithDraw(ids) {
1003 return request({
1004 url: `/person/infoModRange/withDraw/${ids}`,
1005 method: 'post'
1006 })
1007 }
1008 export function personChangeAudit(data) {
1009 return request({
1010 url: `/person/infoModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`,
1011 method: 'post'
1012 })
1013 }
1014 export function groupChangeAudit(data) {
1015 return request({
1016 url: `/member/infoModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`,
1017 method: 'post'
1018 })
1019 }
1020 export function pickUpByPersonInfo(form) {
1021 return request({
1022 url: `/person/technology/getPersonTecDetailsByIdc/${form.idcType}/${form.idcCode}`,
1023 method: 'get'
1024 })
1025 }
1026 export function getLevelChangeAddList(params) {
1027 return request({
1028 url: `/person/levelMod/list`,
1029 method: 'get',
1030 params: params
1031 })
1032 }
1033 export function getChangelevelList(params) {
1034 return request({
1035 url: `/person/levelModRange/list`,
1036 method: 'get',
1037 params: params
1038 })
1039 }
1040 export function addLevelList(data) {
1041 return request({
1042 url: `/person/levelMod/addLevelModToRange`,
1043 method: 'post',
1044 params: data
1045 })
1046 }
1047 export function addLevelModToRange(data) {
1048 return request({
1049 url: `/person/levelMod/editModInfo/${data.modId}?reason=${data.reason}&modId=${data.modId}`,
1050 method: 'post'
1051 })
1052 }
1053 export function addLevelModToRangeFile(data) {
1054 return request({
1055 url: `/person/levelMod/editModInfo/${data.modId}?modId=${data.modId}&fileUrl=${encodeURIComponent(data.fileUrl)}`,
1056 method: 'post'
1057 })
1058 }
1059 export function levelModRangeDelete(ids) {
1060 return request({
1061 url: `/person/levelModRange/${ids}`,
1062 method: 'delete'
1063 })
1064 }
1065 export function commitLevelChange(ids) {
1066 return request({
1067 url: `/person/levelModRange/commit/${ids}`,
1068 method: 'post'
1069 })
1070 }
1071 export function editNewJi(data) {
1072 return request({
1073 url: `/person/levelMod/editNewJi/${data.modId}?newJi=${data.NewJi}`,
1074 method: 'post'
1075 })
1076 }
1077 export function delLevelChangePer(data) {
1078 return request({
1079 url: `/person/levelMod/${data}`,
1080 method: 'delete'
1081 })
1082 }
1083 export function levelModCommit(ids) {
1084 return request({
1085 url: `/person/levelModRange/commit/${ids}`,
1086 method: 'post'
1087 })
1088 }
1089 export function changeLevelAudit(data) {
1090 return request({
1091 url: `/person/levelModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`,
1092 method: 'post'
1093 })
1094 }
1095 export function changeLevelWithDraw(data) {
1096 return request({
1097 url: `/person/levelModRange/withDraw/${data}`,
1098 method: 'post'
1099 })
1100 }
1101 export function getMemberInfoModRange(data) {
1102 return request({
1103 url: `/member/infoModRange/list`,
1104 method: 'get',
812 params: data 1105 params: data
813 }) 1106 })
814 } 1107 }
1108 export function commitGroupChange(ids) {
1109 return request({
1110 url: `/member/infoModRange/commit/${ids}`,
1111 method: 'post'
1112 })
1113 }
1114 export function delGroupChange(ids) {
1115 return request({
1116 url: `/member/infoModRange/${ids}`,
1117 method: 'delete'
1118 })
1119 }
1120 export function getChangeGroupByRangeId(data) {
1121 return request({
1122 url: `/member/infoMod/list`,
1123 method: 'get',
1124 params: data
1125 })
1126 }
1127 export function groupInfoMod(ids) {
1128 return request({
1129 url: `/member/infoMod/${ids}`,
1130 method: 'delete'
1131 })
1132 }
1133 export function extractInfoFromChinaIdCard(data) {
1134 return request({
1135 url: '/person/info/extractInfo',
1136 method: 'post',
1137 params: data
1138 })
1139 }
1140 export function getRemindCount(params) {
1141 return request({
1142 url: '/system/remindCount/getCounts',
1143 method: 'get',
1144 params: params
1145 })
1146 }
1147 export function jiDropDownBox(params) {
1148 return request({
1149 url: '/person/technology/jiDropDownBox',
1150 method: 'get',
1151 params: params
1152 })
1153 }
815 1154
816 export function withDraw(data) { 1155 export function getUserProfile() {
817 return request({ 1156 return request({
818 url: `/person/paymentRange/withDraw`, 1157 url: '/system/user/profile',
819 method: 'post', 1158 method: 'get'
820 params: data 1159 })
821 })
822 }
823 export function groupWithDraw(data) {
824 return request({
825 url: `/member/paymentRange/withDraw`,
826 method: 'post',
827 params: data
828 })
829 }
830 export function certifiedwithDraw(data) {
831 return request({
832 url: `/member/certified/withDraw`,
833 method: 'post',
834 params: data
835 })
836 }
837 // 省合并缴费通知单
838 export function mergePayMentApi(data) {
839 return request({
840 url: `/person/paymentRange/merge`,
841 method: 'post',
842 params: data
843 })
844 }
845
846 export function getpaymentVerityMergeList(params) {
847 return request({
848 url: '/person/paymentRange/verifyList',
849 method: 'get',
850 params: params
851 })
852 }
853
854 export function doMergeFlowsPer(data) {
855 return request({
856 url: '/person/paymentRange/audit',
857 method: 'post',
858 params:data
859 })
860 }
861 // 省缴费单拆分
862 export function unMerge(recordId) {
863 return request({
864 url: `/person/paymentRange/unMerge/${recordId}`,
865 method: 'post'
866 })
867 }
868 export function certifiedunMerge(recordId) {
869 return request({
870 url: `/member/certified/unMerge/${recordId}`,
871 method: 'post'
872 })
873 }
874
875 export function dellevelPerson(examId) {
876 return request({
877 url: '/exam/person/' + examId,
878 method: 'delete'
879 })
880 }
881 export function getExamPersonNum(data) {
882 return request({
883 url: `/exam/person/getExamPersonNum`,
884 method: 'get',
885 params: data
886 })
887 }
888 export function doVerityBack(data) {
889 return request({
890 url: `/exam/info/verity/back`,
891 method: 'put',
892 params: data
893 })
894 }
895 export function delRange(ids) {
896 return request({
897 url: `/member/certifiedRange/${ids}`,
898 method: 'delete'
899 })
900 }
901 export function delLevel(examId) {
902 return request({
903 url: '/exam/info/' + examId,
904 method: 'delete'
905 })
906 }
907 export function cancelMerge(id) {
908 return request({
909 url: '/exam/info/cancelMerge/' + id,
910 method: 'post'
911 })
912 }
913 export function getInfoModRange(params) {
914 return request({
915 url: `/person/infoModRange/list`,
916 method: 'get',
917 params:params
918 })
919 }
920 export function addInfoModeList(data) {
921 return request({
922 url: `/person/infoMod/list`,
923 method: 'get',
924 params: data
925 })
926 }
927 export function infoMod(ids) {
928 return request({
929 url: `/person/infoMod/${ids}`,
930 method: 'delete'
931 })
932 }
933 export function commitPersonalChange(ids) {
934 return request({
935 url: `/person/infoModRange/commit/${ids}`,
936 method: 'post'
937 })
938 }
939 export function delPersonalChange(ids) {
940 return request({
941 url: `/person/infoModRange/${ids}`,
942 method: 'delete'
943 })
944 }
945 export function addInfoModeToRange(data) {
946 return request({
947 url: `/person/infoMod/addInfoModeToRange/${data.perIds}?rangeIdStr=${data.rangeIdStr}`,
948 method: 'post'
949 })
950 }
951 export function addGroupInfoModeToRange(data) {
952 return request({
953 url: `/member/infoMod/addInfoModeToRange/${data.memId}?rangeIdStr=${data.rangeIdStr}`,
954 method: 'post'
955 })
956 }
957 export function personChangeEditMod(data) {
958 return request({
959 url: `/person/infoMod/editMod`,
960 method: 'post',
961 params: data
962 })
963 }
964 export function groupChangeEditMod(data) {
965 return request({
966 url: `/member/infoMod/editMod`,
967 method: 'post',
968 params: data
969 })
970 }
971 export function personChangeWithDraw(ids) {
972 return request({
973 url: `/person/infoModRange/withDraw/${ids}`,
974 method: 'post'
975 })
976 }
977 export function personChangeAudit(data) {
978 return request({
979 url: `/person/infoModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`,
980 method: 'post'
981 })
982 }
983 export function groupChangeAudit(data) {
984 return request({
985 url: `/member/infoModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`,
986 method: 'post'
987 })
988 }
989 export function pickUpByPersonInfo(form) {
990 return request({
991 url: `/person/technology/getPersonTecDetailsByIdc/${form.idcType}/${form.idcCode}`,
992 method: 'get'
993 })
994 }
995 export function getLevelChangeAddList(params) {
996 return request({
997 url: `/person/levelMod/list`,
998 method: 'get',
999 params: params
1000 })
1001 }
1002 export function getChangelevelList(params) {
1003 return request({
1004 url: `/person/levelModRange/list`,
1005 method: 'get',
1006 params: params
1007 })
1008 }
1009 export function addLevelList(data) {
1010 return request({
1011 url: `/person/levelMod/addLevelModToRange`,
1012 method: 'post',
1013 params:data
1014 })
1015 }
1016 export function addLevelModToRange(data) {
1017 return request({
1018 url: `/person/levelMod/editModInfo/${data.modId}?reason=${data.reason}&modId=${data.modId}`,
1019 method: 'post'
1020 })
1021 }
1022 export function addLevelModToRangeFile(data) {
1023 return request({
1024 url: `/person/levelMod/editModInfo/${data.modId}?modId=${data.modId}&fileUrl=${encodeURIComponent(data.fileUrl)}`,
1025 method: 'post'
1026 })
1027 }
1028 export function levelModRangeDelete(ids) {
1029 return request({
1030 url: `/person/levelModRange/${ids}`,
1031 method: 'delete'
1032 })
1033 }
1034 export function commitLevelChange(ids) {
1035 return request({
1036 url: `/person/levelModRange/commit/${ids}`,
1037 method: 'post'
1038 })
1039 }
1040 export function editNewJi(data) {
1041 return request({
1042 url: `/person/levelMod/editNewJi/${data.modId}?newJi=${data.NewJi}`,
1043 method: 'post'
1044 })
1045 }
1046 export function delLevelChangePer(data) {
1047 return request({
1048 url: `/person/levelMod/${data}`,
1049 method: 'delete'
1050 })
1051 }
1052 export function levelModCommit(ids) {
1053 return request({
1054 url: `/person/levelModRange/commit/${ids}`,
1055 method: 'post'
1056 })
1057 }
1058 export function changeLevelAudit(data) {
1059 return request({
1060 url: `/person/levelModRange/audit/${data.ids}?flag=${data.flag}&reason=${data.reason}`,
1061 method: 'post'
1062 })
1063 }
1064 export function changeLevelWithDraw(data) {
1065 return request({
1066 url: `/person/levelModRange/withDraw/${data}`,
1067 method: 'post'
1068 })
1069 }
1070 export function getMemberInfoModRange(data) {
1071 return request({
1072 url: `/member/infoModRange/list`,
1073 method: 'get',
1074 params: data
1075 })
1076 }
1077 export function commitGroupChange(ids) {
1078 return request({
1079 url: `/member/infoModRange/commit/${ids}`,
1080 method: 'post'
1081 })
1082 }
1083 export function delGroupChange(ids) {
1084 return request({
1085 url: `/member/infoModRange/${ids}`,
1086 method: 'delete'
1087 })
1088 }
1089 export function getChangeGroupByRangeId(data) {
1090 return request({
1091 url: `/member/infoMod/list`,
1092 method: 'get',
1093 params: data
1094 })
1095 }
1096 export function groupInfoMod(ids) {
1097 return request({
1098 url: `/member/infoMod/${ids}`,
1099 method: 'delete'
1100 })
1101 }
1102 export function extractInfoFromChinaIdCard(data) {
1103 return request({
1104 url: '/person/info/extractInfo',
1105 method: 'post',
1106 params: data
1107 })
1108 }
1109 export function getRemindCount(params) {
1110 return request({
1111 url: '/system/remindCount/getCounts',
1112 method: 'get',
1113 params: params
1114 })
1115 }
1116 export function jiDropDownBox(params) {
1117 return request({
1118 url: '/person/technology/jiDropDownBox',
1119 method: 'get',
1120 params: params
1121 })
1122 }
1123
1124 export function getUserProfile() {
1125 return request({
1126 url: '/system/user/profile',
1127 method: 'get'
1128 })
1129 }
1130 export function getMyCertStage() {
1131 return request({
1132 url: `/member/certified/getMyCertStage`,
1133 method: 'get'
1134 })
1135 } 1160 }
1161 export function getMyCertStage() {
1162 return request({
1163 url: `/member/certified/getMyCertStage`,
1164 method: 'get'
1165 })
1166 }
...\ No newline at end of file ...\ No newline at end of file
......
common/login.js
...@@ -54,7 +54,8 @@ function getCodeImg() { ...@@ -54,7 +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 method: 'post', 59 method: 'post',
59 params: data 60 params: data
60 }) 61 })
......
common/mystyle.scss
...@@ -55,7 +55,11 @@ page { ...@@ -55,7 +55,11 @@ page {
55 55
56 56
57 .nodata{padding:10vh 0; box-sizing: border-box; text-align: center; 57 .nodata{padding:10vh 0; box-sizing: border-box; text-align: center;
58 image{width: 300rpx;height: 300rpx;display: block; margin:0 auto;} 58 image{width: 300rpx;height: 300rpx;display: none; margin:0 auto;
59 border-radius: 100px;
60 opacity: 0.08;
61 filter: grayscale(1);
62 }
59 text{font-size: 24rpx; text-align: center; display: inline-block;color: #a8b3c7;} 63 text{font-size: 24rpx; text-align: center; display: inline-block;color: #a8b3c7;}
60 button{display: inline;border-radius: 35rpx;padding:10rpx 30rpx;box-sizing: border-box;font-size: 30rpx; 64 button{display: inline;border-radius: 35rpx;padding:10rpx 30rpx;box-sizing: border-box;font-size: 30rpx;
61 border: none!important;} 65 border: none!important;}
......
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.97:8787' 8 // const baseUrl_api = 'http://192.168.1.130: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://system.taekwondo.org.cn/stage-api'
13 export default { 13 export default {
14 baseUrl_api 14 baseUrl_api
15 } 15 }
......
group/apply/merge.vue
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 原有效期 33 原有效期
34 <view>{{item.content?.validityTime.slice(0,10)}}</view> 34 <view>{{item.content?.validityTime.slice(0,10)}}</view>
35 </view> 35 </view>
36 <view> 36 <view :class="item.content.validityTime?'':'w50'">
37 年限 37 年限
38 <view>{{item.content.renewYear}}</view> 38 <view>{{item.content.renewYear}}</view>
39 </view> 39 </view>
......
group/apply/mergeUp.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 <text v-if="item.status == 3" class="text-warning">审核撤回</text> 19 <text v-if="item.status == 3" class="text-warning">审核撤回</text>
20 </view> 20 </view>
21 <view class="date">提交日期：{{item.content.commitTime}}</view> 21 <view class="date">提交日期：{{item.content.commitTime}}</view>
22 <view class="date" v-if="item.content.validityTime">原有效期：{{item.content.validityTime}}</view> 22 <view class="date" v-if="item.content.validityTime">原有效期：{{item.content.validityTime?.slice(0,10)}}</view>
23 <view class="text-primary" v-if="item.content?.wfCode">{{item.content?.wfCode}}</view> 23 <view class="text-primary" v-if="item.content?.wfCode">{{item.content?.wfCode}}</view>
24 <view class="name mt0" style="width: 100%;" @click="goDetail(item)">{{item.content?.certName}}</view> 24 <view class="name mt0" style="width: 100%;" @click="goDetail(item)">{{item.content?.certName}}</view>
25 <view class="flexbox" @click="goDetail(item)"> 25 <view class="flexbox" @click="goDetail(item)">
......
group/changeGroupChoseList.vue
...@@ -15,15 +15,13 @@ ...@@ -15,15 +15,13 @@
15 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" /> 15 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
16 </view> 16 </view>
17 <view class="w100"> 17 <view class="w100">
18 <view class="name">{{n.name}} </view> 18 <view class="name">{{n.name}} <text v-if="n.memCode">({{n.memCode}})</text></view>
19 <view class="flexbox" style="padding: 0"> 19 <view class="flexbox" style="padding: 0">
20 <view v-if="n.memCode">会员号 20 <view class="date">到期时间
21 <text>{{n.memCode}}</text> 21 <text v-if="n.validityDate">{{n.validityDate?.slice(0,10)}}</text>
22 <text v-else>--</text>
22 </view> 23 </view>
23 <view class="date" v-if="n.validityDate">到期时间 24 <view class="date w50">团体类型
24 <text>{{n.validityDate?.slice(0,10)}}</text>
25 </view>
26 <view class="date">团体类型
27 <text v-if="n.deptType == 2">一级协会</text> 25 <text v-if="n.deptType == 2">一级协会</text>
28 <text v-if="n.deptType == 3">直属协会</text> 26 <text v-if="n.deptType == 3">直属协会</text>
29 <text v-if="n.deptType == 4">二级协会</text> 27 <text v-if="n.deptType == 4">二级协会</text>
......
group/feeBill.vue
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 </view> 14 </view>
15 <view class="date" @click="goDetail(item)" v-if="item.payTime"> 15 <view class="date" @click="goDetail(item)" v-if="item.payTime">
16 <uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons> 16 <uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons>
17 <text>{{item.payTime}} 缴费</text> 17 <text>{{item.payTime?.slice(0,10)}} 缴费</text>
18 </view> 18 </view>
19 <view class="text-primary" v-if="item.wfCode">{{item.wfCode}}</view> 19 <view class="text-primary" v-if="item.wfCode">{{item.wfCode}}</view>
20 <view class="name mt0" @click="goDetail(item)">{{item.finalDocName}}</view> 20 <view class="name mt0" @click="goDetail(item)">{{item.finalDocName}}</view>
......
group/groupInfo.vue
...@@ -4,19 +4,29 @@ ...@@ -4,19 +4,29 @@
4 <uni-list> 4 <uni-list>
5 <uni-list-item title="所属协会"> 5 <uni-list-item title="所属协会">
6 <template v-slot:footer> 6 <template v-slot:footer>
7 <view style="width: 60%;text-align: right;">{{form.firstName}} {{form.parentDeptName}}</view> 7 <!-- <view style="width: 60%;text-align: right;">{{form.firstName}} {{form.parentDeptName}}</view> -->
8 <view style="width: 500rpx;text-align: right;">
9 <uni-data-picker v-model="form.deptId" :localdata="tree"
10 readonly :clear-icon="false"
11 :map="{text:'label',value:'id'}">
12 </uni-data-picker>
13 </view>
8 </template> 14 </template>
9 </uni-list-item> 15 </uni-list-item>
10 <uni-list-item title="会员编号" v-if="form.menCode" :rightText="form.menCode" /> 16 <uni-list-item title="会员编号" v-if="form.menCode" :rightText="form.menCode" />
11 <uni-list-item title="机构名称" :rightText="form.name" /> 17 <uni-list-item title="机构名称" :rightText="form.name" />
12 <uni-list-item title="所属省份"> 18 <uni-list-item title="所属省份">
13 <template v-slot:footer>{{form.provinceStr}}</template> 19 <template v-slot:footer>
20 <uni-data-select :clear="false" disabled
21 v-model="form.belongProvinceId" :localdata="regionsList">
22 </uni-data-select>
23 </template>
14 </uni-list-item> 24 </uni-list-item>
15 <uni-list-item title="社会信用代码" :rightText="form.creditCode" /> 25 <uni-list-item title="社会信用代码" :rightText="form.creditCode" />
16 <uni-list-item v-if="form.siteContact" title="联系人" :rightText="form.siteContact" /> 26 <uni-list-item v-if="isR" title="联系人" :rightText="form.certSiteContact" />
17 <uni-list-item v-else title="联系人" :rightText="form.contact" /> 27 <uni-list-item v-else title="联系人" :rightText="form.siteContact" />
18 <uni-list-item v-if="form.siteTel" title="联系方式" :rightText="form.siteTel" /> 28 <uni-list-item v-if="isR" title="联系方式" :rightText="form.certSiteTel" />
19 <uni-list-item v-else title="联系方式" :rightText="form.phone" /> 29 <uni-list-item v-else title="联系方式" :rightText="form.siteTel" />
20 <uni-list-item v-if="form.validityDate" title="有效期" :rightText="form.validityDate?.slice(0,10)" /> 30 <uni-list-item v-if="form.validityDate" title="有效期" :rightText="form.validityDate?.slice(0,10)" />
21 <uni-list-item title="认证地址"> 31 <uni-list-item title="认证地址">
22 <template v-slot:footer> 32 <template v-slot:footer>
...@@ -24,10 +34,12 @@ ...@@ -24,10 +34,12 @@
24 </template> 34 </template>
25 </uni-list-item> 35 </uni-list-item>
26 <uni-list-item title="认证详细地址" :rightText="form.adress" /> 36 <uni-list-item title="认证详细地址" :rightText="form.adress" />
27 <uni-list-item title="法人姓名" :rightText="form.legal||'--'" /> 37 <uni-list-item title="法人姓名" v-if="isR" :rightText="form.certLegal||'--'" />
38 <uni-list-item title="法人姓名" v-else :rightText="form.legal||'--'" />
28 39
29 <uni-list-item v-if="form.deptType==6" title="是否为考点" :rightText="form.applyPoints==1?'是':'否'" /> 40 <uni-list-item v-if="form.deptType==6" title="是否为考点" :rightText="form.applyPoints==1?'是':'否'" />
30 <uni-list-item title="法人身份证" clickable> 41
42 <uni-list-item title="法人身份证" clickable v-if="isR">
31 <template v-slot:footer> 43 <template v-slot:footer>
32 <view v-if="form.legalIdcPhotoArr&&form.legalIdcPhotoArr?.length>0"> 44 <view v-if="form.legalIdcPhotoArr&&form.legalIdcPhotoArr?.length>0">
33 <image class="ylImage" mode="aspectFit" @click="showImage(form.legalIdcPhotoArr,index)" 45 <image class="ylImage" mode="aspectFit" @click="showImage(form.legalIdcPhotoArr,index)"
...@@ -35,16 +47,32 @@ ...@@ -35,16 +47,32 @@
35 </image> 47 </image>
36 </view> 48 </view>
37 </template> 49 </template>
50 </uni-list-item>
51 <uni-list-item title="法人身份证" clickable v-else>
52 <template v-slot:footer>
53 <view v-if="form.legalIdcPhotoArrR&&form.legalIdcPhotoArrR?.length>0">
54 <image class="ylImage" mode="aspectFit" @click="showImage(form.legalIdcPhotoArrR,index)"
55 v-for="(item,index) in form.legalIdcPhotoArrR" :key="item" :src="item">
56 </image>
57 </view>
58 </template>
38 </uni-list-item> 59 </uni-list-item>
39 60
40 <uni-list-item title="营业执照" clickable > 61 <uni-list-item title="营业执照" clickable v-if="isR">
62 <template v-slot:footer>
63 <view style="width: 50vw;word-break: break-all;" @click="download(form.businessLicenseArrR[0]?.url)" v-if="form.businessLicenseArrR&&form.businessLicenseArrR?.length>0">
64 <text class="text-primary">{{form.businessLicenseArrR[0]?.name}}</text>
65 </view>
66 </template>
67 </uni-list-item>
68 <uni-list-item title="营业执照" clickable v-else>
41 <template v-slot:footer> 69 <template v-slot:footer>
42 <view @click="download(form.businessLicenseArr[0]?.url)" v-if="form.businessLicenseArr&&form.businessLicenseArr?.length>0"> 70 <view style="width: 50vw;word-break: break-all;" @click="download(form.businessLicenseArr[0]?.url)" v-if="form.businessLicenseArr&&form.businessLicenseArr?.length>0">
43 <text class="text-primary">{{form.businessLicenseArr[0]?.name}}</text> 71 <text class="text-primary">{{form.businessLicenseArr[0]?.name}}</text>
44 </view> 72 </view>
45 </template> 73 </template>
46 </uni-list-item> 74 </uni-list-item>
47 <uni-list-item title="机构照片" clickable> 75 <uni-list-item title="机构照片" clickable v-if="isR">
48 <template v-slot:footer> 76 <template v-slot:footer>
49 <view v-if="form.picturesArr&&form.picturesArr?.length>0" class="photoBook" @click="showImage(form.picturesArr,0)"> 77 <view v-if="form.picturesArr&&form.picturesArr?.length>0" class="photoBook" @click="showImage(form.picturesArr,0)">
50 <image mode="aspectFit" class="ylImage" 78 <image mode="aspectFit" class="ylImage"
...@@ -54,6 +82,16 @@ ...@@ -54,6 +82,16 @@
54 </view> 82 </view>
55 </template> 83 </template>
56 </uni-list-item> 84 </uni-list-item>
85 <uni-list-item title="机构照片" clickable v-else>
86 <template v-slot:footer>
87 <view v-if="form.picturesArrR&&form.picturesArrR?.length>0" class="photoBook" @click="showImage(form.picturesArrR,0)">
88 <image mode="aspectFit" class="ylImage"
89 :src="form.picturesArrR[0]">
90 </image>
91 <text>共{{form.picturesArrR?.length}}张</text>
92 </view>
93 </template>
94 </uni-list-item>
57 </uni-list> 95 </uni-list>
58 </view> 96 </view>
59 <view class="height1"></view> 97 <view class="height1"></view>
...@@ -74,12 +112,21 @@ ...@@ -74,12 +112,21 @@
74 } from '@dcloudio/uni-app' 112 } from '@dcloudio/uni-app'
75 const app = getApp() 113 const app = getApp()
76 const form = ref({ 114 const form = ref({
77 legalIdcPhotoArr: [], 115 legalIdcPhotoArr: [],
116 legalIdcPhotoArrR: [],
78 picturesArr: [], 117 picturesArr: [],
79 businessLicenseArr:[] 118 picturesArrR: [],
80 }) 119 businessLicenseArr:[],
120 businessLicenseArrR:[]
121 })
122 const tree = ref([])
123 const regionsList = ref([])
124 const isR = ref(false)
81 onLoad(option => { 125 onLoad(option => {
82 console.log(option) 126 console.log(option)
127 if (option.isR){
128 isR.value = true
129 }
83 if (option.memId) { 130 if (option.memId) {
84 getForm(option.memId) 131 getForm(option.memId)
85 } 132 }
...@@ -95,7 +142,9 @@ ...@@ -95,7 +142,9 @@
95 init() 142 init()
96 } 143 }
97 } 144 }
98 function init() { 145 function init() {
146 getDeptTree()
147 getRegionsList()
99 console.log(form.value) 148 console.log(form.value)
100 if (form.value.businessLicense) { 149 if (form.value.businessLicense) {
101 form.value.businessLicenseArr = [] 150 form.value.businessLicenseArr = []
...@@ -106,6 +155,15 @@ ...@@ -106,6 +155,15 @@
106 } 155 }
107 console.log('营业执照',form.value.businessLicenseArr) 156 console.log('营业执照',form.value.businessLicenseArr)
108 } 157 }
158 if (form.value.certBusinessLicense) {
159 form.value.businessLicenseArrR = []
160 try{
161 form.value.businessLicenseArrR = JSON.parse(form.value.certBusinessLicense) || []
162 }catch(e){
163 form.value.businessLicenseArrR=[{url:form.value.certBusinessLicense,name:'营业执照'}]
164 }
165 console.log('营业执照',form.value.businessLicenseArrR)
166 }
109 if (form.value.certLegalIdcPhoto && form.value.certLegalIdcPhoto!=null) { 167 if (form.value.certLegalIdcPhoto && form.value.certLegalIdcPhoto!=null) {
110 form.value.legalIdcPhotoArr = [] 168 form.value.legalIdcPhotoArr = []
111 var arr = form.value.certLegalIdcPhoto?.split(',') || [] 169 var arr = form.value.certLegalIdcPhoto?.split(',') || []
...@@ -119,8 +177,22 @@ ...@@ -119,8 +177,22 @@
119 }) 177 })
120 form.value.legalIdcPhotoArr = arr 178 form.value.legalIdcPhotoArr = arr
121 } 179 }
122 console.log('法人身份证',form.value.legalIdcPhotoArr) 180 }
123 } 181 if(form.value.legalIdcPhoto && form.value.legalIdcPhoto!=null){
182 form.value.legalIdcPhotoArrR = []
183 var arr = form.value.legalIdcPhoto?.split(',') || []
184 if (arr.length > 0) {
185 arr = _.map(arr, (p) => {
186 if(p.indexOf('http')==-1){
187 console.log(p)
188 p = config.baseUrl_api + p
189 }
190 return p
191 })
192 form.value.legalIdcPhotoArrR = arr
193 }
194 }
195 console.log('法人身份证',form.value.legalIdcPhotoArr)
124 if (form.value.certPictures) { 196 if (form.value.certPictures) {
125 form.value.picturesArr = [] 197 form.value.picturesArr = []
126 var arr = form.value.certPictures.split(',') || [] 198 var arr = form.value.certPictures.split(',') || []
...@@ -134,9 +206,37 @@ ...@@ -134,9 +206,37 @@
134 form.value.picturesArr = arr 206 form.value.picturesArr = arr
135 } 207 }
136 console.log(form.value.picturesArr) 208 console.log(form.value.picturesArr)
209 }
210 if(form.value.pictures){
211 form.value.picturesArrR = []
212 var arr = form.value.pictures.split(',') || []
213 if (arr.length > 0) {
214 arr = _.map(arr, (p) => {
215 if(p.indexOf('http')==-1){
216 p = config.baseUrl_api + p
217 }
218 return p
219 })
220 form.value.picturesArrR = arr
221 }
222 console.log(form.value.picturesArrR)
137 } 223 }
224 }
225 function getRegionsList() {
226 api.regionsList().then(res => {
227 regionsList.value = res.data;
228 })
229 }
230 function getDeptTree(){
231 api.deptTreeSelect({ selfDeptId: '-1', showDirect: 1, showAll: 1 }).then(res=>{
232 tree.value = res.data
233 if (typeof tree.value?.[0]?.id == 'number') {
234 form.value.deptId = form.value.deptId * 1
235 } else {
236 form.value.deptId = form.value.deptId.toString()
237 }
238 })
138 } 239 }
139
140 function showImage(arr, index) { 240 function showImage(arr, index) {
141 uni.previewImage({ 241 uni.previewImage({
142 urls: arr, 242 urls: arr,
...@@ -154,13 +254,14 @@ ...@@ -154,13 +254,14 @@
154 uni.previewImage({ 254 uni.previewImage({
155 urls: [url], 255 urls: [url],
156 success: function(res) { 256 success: function(res) {
157 257 console.log(res,[url],'111')
158 } 258 }
159 }) 259 })
160 } else { 260 } else {
161 uni.previewImage({ 261 uni.previewImage({
162 urls: [config.baseUrl_api + url], 262 urls: [config.baseUrl_api + url],
163 success: function(res) { 263 success: function(res) {
264 console.log(url,'222')
164 } 265 }
165 }) 266 })
166 } 267 }
...@@ -205,7 +306,7 @@ ...@@ -205,7 +306,7 @@
205 fail: function(error) { 306 fail: function(error) {
206 uni.hideLoading(); 307 uni.hideLoading();
207 uni.showToast({ 308 uni.showToast({
208 title: `下载失败`, 309 title:`下载失败`,
209 icon: 'none', 310 icon: 'none',
210 duration: 2000 311 duration: 2000
211 }); 312 });
...@@ -214,7 +315,11 @@ ...@@ -214,7 +315,11 @@
214 } 315 }
215 </script> 316 </script>
216 317
217 <style scoped lang="scss"> 318 <style scoped lang="scss">
319 :deep(.input-value ){padding: 0!important;line-height: 1.4!important;}
320 :deep(.selected-list){display: block!important;
321 }
322 :deep(.selected-item){display:inline;white-space:normal!important;}
218 .height1 { 323 .height1 {
219 height: 1rpx 324 height: 1rpx
220 } 325 }
......
group/list.vue
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 150
151 function godetail(n) { 151 function godetail(n) {
152 uni.navigateTo({ 152 uni.navigateTo({
153 url: `/group/groupInfo?memId=${n.memId}` 153 url: `/group/groupInfo?memId=${n.memId}&isR=true`
154 }) 154 })
155 } 155 }
156 156
......
group/pay.vue
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
24 会员合计 24 会员合计
25 <view>{{item.allCount}}</view> 25 <view>{{item.allCount}}</view>
26 </view> 26 </view>
27 <view> 27 <view v-if="userType!='2'">
28 续费年限 28 续费年限
29 <view>{{item.content?.renewYear}}</view> 29 <view>{{item.content?.renewYear}}</view>
30 </view> 30 </view>
31 <view> 31 <view :class="userType=='2'?'w50':''">
32 年限合计 32 年限合计
33 <view>{{item.totalRenewYear}}</view> 33 <view>{{item.totalRenewYear}}</view>
34 </view> 34 </view>
......
login/login.vue
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
18 </view> 18 </view>
19 <view class="round-input-item"> 19 <view class="round-input-item">
20 <image class="icon" :src="config.baseUrl_api+'/fs/static/login/tag02@2x.png'"></image> 20 <image class="icon" :src="config.baseUrl_api+'/fs/static/login/tag02@2x.png'"></image>
21 <uni-easyinput :styles="inputstyle" placeholder="密码" v-model="form.password" 21 <uni-easyinput :styles="inputstyle" placeholder="初次登录请联系省级协会获取初始密码" v-model="form.password"
22 type="password" /> 22 type="password" />
23 </view> 23 </view>
24 <view class="round-input-item"> 24 <view class="round-input-item">
25 <image class="icon" :src="config.baseUrl_api+'/fs/static/login/tag03@2x.png'"></image> 25 <image class="icon" :src="config.baseUrl_api+'/fs/static/login/tag03@2x.png'"></image>
26 <uni-easyinput :styles="inputstyle" placeholder="图形验证码" v-model="form.code" /> 26 <uni-easyinput :styles="inputstyle" placeholder="请填入计算结果" v-model="form.code" />
27 <image :src="codeUrl" @click="getCode" /> 27 <image :src="codeUrl" @click="getCode" />
28 </view> 28 </view>
29 29
...@@ -62,13 +62,14 @@ ...@@ -62,13 +62,14 @@
62 </view> 62 </view>
63 <view class="wNumber"> 63 <view class="wNumber">
64 技术服务热线：<text @click="call('15606190026')">15606190026</text> / <text 64 技术服务热线：<text @click="call('15606190026')">15606190026</text> / <text
65 @click="call('15306299762')">15306299762</text> 65 @click="call('15305299762')">15305299762</text>
66 </view> 66 </view>
67 67
68 </view> 68 </view>
69 </view> 69 </view>
70 <image class="ren2" :src="config.baseUrl_api+'/fs/static/login/ren2.png'" /> 70 <image class="ren2" :src="config.baseUrl_api+'/fs/static/login/ren2.png'" />
71 <view class="fixedagree"> 71 <view class="fixedagree">
72 <text>仅供中国跆拳道协会会员单位登录使用</text>
72 <!-- <image @click="changeAgree(agree)" v-if="agree" src="@/static/login/xz_dwn@2x.png"></image> 73 <!-- <image @click="changeAgree(agree)" v-if="agree" src="@/static/login/xz_dwn@2x.png"></image>
73 <image v-else src="@/static/login/xz2@2x.png"></image> 74 <image v-else src="@/static/login/xz2@2x.png"></image>
74 <view>登录即代表您同意<text>《用户协议》</text><text>《隐私策略》</text></view> --> 75 <view>登录即代表您同意<text>《用户协议》</text><text>《隐私策略》</text></view> -->
...@@ -169,7 +170,7 @@ ...@@ -169,7 +170,7 @@
169 url: '/pages/index/index' 170 url: '/pages/index/index'
170 }) 171 })
171 }) 172 })
172 // .catch(getCode) 173 .catch(getCode)
173 } else if (isActive.value == 1) { 174 } else if (isActive.value == 1) {
174 if (!form2.value.telNo) { 175 if (!form2.value.telNo) {
175 uni.showToast({ 176 uni.showToast({
......
myCenter/auth.vue
1 <template> 1 <template>
2 <view> 2 <view>
3 <view v-if="showDirectly&&directUnderFlag==0">
3 <view class="flexbox"> 4 <view class="flexbox">
4 <view> 5 <view>
5 有效日期至 <text class="text-primary">{{form?.validityDate?.slice(0,10) }}</text> 6 有效日期至 <text class="text-primary">{{form?.validityDate?.slice(0,10) }}</text>
...@@ -18,14 +19,16 @@ ...@@ -18,14 +19,16 @@
18 </view> 19 </view>
19 </view> 20 </view>
20 <view class="flexbox" style="justify-content: end;padding: 0 30rpx 40rpx;"> 21 <view class="flexbox" style="justify-content: end;padding: 0 30rpx 40rpx;">
21 <!-- <button class="btn-red" style="margin: 0 20rpx 0 0;" size="mini" 22 <button class="btn-red" style="margin: 0 20rpx 0 0;" size="mini"
22 v-if="activeStatus==0&&authenticationStatusa" @click="payTheFees">激活</button> 23 v-if="activeStatus==0&&authenticationStatusa" @click="payTheFees">激活</button>
23 <button class="btn-red" style="margin: 0 20rpx 0 0;" size="mini" :disabled="btn" 24 <view v-else>
24 @click="payTheFees">去缴费</button> --> 25 <button class="btn-red" style="margin: 0 20rpx 0 0;" size="mini" :disabled="btn"
25 <button class="btn-red-kx" style="margin: 0 20rpx 0 0;" size="mini" v-if="form.deptType!=1" 26 @click="payTheFees">去缴费</button>
26 @click="auditEditFN">审核详情</button> 27 <button class="btn-red-kx" style="margin: 0 20rpx 0 0;" size="mini" v-if="form.deptType!=1"
28 @click="auditEditFN">审核详情</button>
29 </view>
27 </view> 30 </view>
28 31 </view>
29 <view class="mainbox"> 32 <view class="mainbox">
30 <uni-list> 33 <uni-list>
31 <uni-list-item v-if="authenticationStatusa != 1&&authenticationStatusa != 0&&authenticationStatusa != 3" 34 <uni-list-item v-if="authenticationStatusa != 1&&authenticationStatusa != 0&&authenticationStatusa != 3"
...@@ -38,7 +41,7 @@ ...@@ -38,7 +41,7 @@
38 <template v-slot:footer> 41 <template v-slot:footer>
39 <view class="frrr"> 42 <view class="frrr">
40 <uni-data-picker readonly :clear-icon="false" 43 <uni-data-picker readonly :clear-icon="false"
41 v-model="form.siteProvinceId" :localdata="options"> 44 v-model="form.belongProvinceId" :localdata="options">
42 </uni-data-picker> 45 </uni-data-picker>
43 46
44 </view> 47 </view>
...@@ -55,14 +58,14 @@ ...@@ -55,14 +58,14 @@
55 <uni-list-item title="认证地址"> 58 <uni-list-item title="认证地址">
56 <template v-slot:footer> 59 <template v-slot:footer>
57 <view class="frrr"> 60 <view class="frrr">
58 <uni-data-picker readonly :clear-icon="false" v-if="form.siteRegionId" 61 <uni-data-picker readonly :clear-icon="false" v-if="form.certRegionId"
59 v-model="form.siteRegionId" :localdata="options"> 62 v-model="form.certRegionId" :localdata="options">
60 </uni-data-picker> 63 </uni-data-picker>
61 <uni-data-picker readonly :clear-icon="false" v-else-if="form.siteCityId" 64 <uni-data-picker readonly :clear-icon="false" v-else-if="form.certCityId"
62 v-model="form.siteCityId" :localdata="options"> 65 v-model="form.certCityId" :localdata="options">
63 </uni-data-picker> 66 </uni-data-picker>
64 <uni-data-picker readonly :clear-icon="false" v-else-if="form.siteProvinceId" 67 <uni-data-picker readonly :clear-icon="false" v-else-if="form.certProvinceId"
65 v-model="form.siteProvinceId" :localdata="options"> 68 v-model="form.certProvinceId" :localdata="options">
66 </uni-data-picker> 69 </uni-data-picker>
67 </view> 70 </view>
68 </template> 71 </template>
...@@ -116,11 +119,10 @@ ...@@ -116,11 +119,10 @@
116 119
117 import _ from 'lodash' 120 import _ from 'lodash'
118 import { 121 import {
119 onMounted,
120 ref 122 ref
121 } from 'vue' 123 } from 'vue'
122 import { 124 import {
123 onLoad 125 onLoad,onShow
124 } from '@dcloudio/uni-app' 126 } from '@dcloudio/uni-app'
125 const app = getApp() 127 const app = getApp()
126 const form = ref({ 128 const form = ref({
...@@ -139,7 +141,7 @@ ...@@ -139,7 +141,7 @@
139 const pr = ref({}) 141 const pr = ref({})
140 const applicationForMembership1 = ref({}) 142 const applicationForMembership1 = ref({})
141 const options = ref([]) 143 const options = ref([])
142 onLoad(() => { 144 onShow(() => {
143 init() 145 init()
144 }) 146 })
145 147
......
myCenter/index.vue
...@@ -146,8 +146,8 @@ function goPath(url){ ...@@ -146,8 +146,8 @@ function goPath(url){
146 font-size: 36rpx;} 146 font-size: 36rpx;}
147 .imgbox{width: 120rpx; 147 .imgbox{width: 120rpx;
148 height: 120rpx;overflow: hidden; 148 height: 120rpx;overflow: hidden;
149 background: #C7C7CD; 149 // background: #C7C7CD;
150 border: 4rpx solid #FFFFFF; 150 // border: 4rpx solid #FFFFFF;
151 border-radius: 50%; 151 border-radius: 50%;
152 image{height: 120rpx;width: 120rpx;object-fit: cover;} 152 image{height: 120rpx;width: 120rpx;object-fit: cover;}
153 } 153 }
......
myCenter/perfect.vue
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
2 <view> 2 <view>
3 <view class="pd30" style="padding: 30rpx 30rpx 180rpx;"> 3 <view class="pd30" style="padding: 30rpx 30rpx 180rpx;">
4 <view class="wBox"> 4 <view class="wBox">
5 <uni-forms ref="baseForm" :modelValue="form" label-width="100"> 5 <uni-forms ref="baseForm" label-width="100">
6 <uni-forms-item label="所属协会" required> 6 <uni-forms-item label="所属协会" required>
7 <uni-data-picker style="width: 82%;" v-model="form.parentId" 7 <view style="width: 60vw;overflow:auto;">
8 :localdata="tree" 8 <uni-data-picker v-model="form.parentId" :localdata="tree"
9 :readonly="type&&parentId!=-1&&parentId!=0" 9 :readonly="type&&parentId!=-1&&parentId!=0" :clear-icon="false"
10 :clear-icon="false" :map="{text:'label',value:'id'}" 10 :map="{text:'label',value:'id'}" popup-title="请选择">
11 popup-title="请选择" @change="onchange" 11 </uni-data-picker>
12 @nodeclick="onnodeclick"></uni-data-picker> 12 </view>
13 </uni-forms-item> 13 </uni-forms-item>
14 <uni-forms-item v-if="form.memCode" label="会员编号" required> 14 <uni-forms-item v-if="form.memCode" label="会员编号" required>
15 <uni-easyinput v-model="form.memCode" disabled /> 15 <uni-easyinput v-model="form.memCode" disabled />
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 17
18 <uni-forms-item label="机构名称" required> 18 <uni-forms-item label="机构名称" required>
19 <uni-easyinput v-model="form.name" :disabled="type" placeholder="机构名称" /></uni-forms-item> 19 <uni-easyinput v-model="form.name" :disabled="type" placeholder="机构名称" /></uni-forms-item>
20 20
21 <uni-forms-item label="所属省份" required> 21 <uni-forms-item label="所属省份" required>
22 <uni-data-select :clear="false" :disabled="type&&(belongProvinceId||belongProvinceId==0)" 22 <uni-data-select :clear="false" :disabled="type&&(belongProvinceId||belongProvinceId==0)"
23 v-model="form.belongProvinceId" :localdata="regionsList"></uni-data-select> 23 v-model="form.belongProvinceId" :localdata="regionsList"></uni-data-select>
...@@ -32,8 +32,7 @@ ...@@ -32,8 +32,7 @@
32 <uni-easyinput v-model="form.siteTel" /> 32 <uni-easyinput v-model="form.siteTel" />
33 </uni-forms-item> 33 </uni-forms-item>
34 <uni-forms-item label="认证地址" required> 34 <uni-forms-item label="认证地址" required>
35 <uni-data-picker v-model="form.coordinates1" 35 <uni-data-picker v-model="form.coordinates1" @change="changeCoordinates1" :localdata="regionsList"></uni-data-picker>
36 :localdata="regionsList"></uni-data-picker>
37 </uni-forms-item> 36 </uni-forms-item>
38 <uni-forms-item label="详细地址" required> 37 <uni-forms-item label="详细地址" required>
39 <uni-easyinput v-model="form.adress" placeholder="请输入详细地址" type='textarea' /></uni-forms-item> 38 <uni-easyinput v-model="form.adress" placeholder="请输入详细地址" type='textarea' /></uni-forms-item>
...@@ -58,13 +57,13 @@ ...@@ -58,13 +57,13 @@
58 </view> 57 </view>
59 </uni-forms-item> 58 </uni-forms-item>
60 <uni-forms-item label="营业执照" required> 59 <uni-forms-item label="营业执照" required>
61 <uni-file-picker limit="1" v-model="form.businessLicense" file-extname="png,jpg,jpeg,pdf,zip" 60 <uni-file-picker limit="1" v-model="businessLicenseArr" file-extname="png,jpg,jpeg,pdf"
62 file-mediatype="all" @select="selectFile(form,$event)" 61 file-mediatype="all" @select="selectFile" @delete="delSupplementFile"></uni-file-picker>
63 @delete="delSupplementFile(form)"></uni-file-picker> 62
64
65 </uni-forms-item> 63 </uni-forms-item>
66 <uni-forms-item label="机构照片" required> 64 <uni-forms-item label="机构照片" required>
67 <uni-file-picker v-model="picArr" @delete="delpicArr" limit="3" @select="upPicArr"> 65 <uni-file-picker v-model="picArrR" limit="3" mode="grid" file-mediatype="image"
66 @select="upPicArr" @delete="delpicArr">
68 </uni-file-picker> 67 </uni-file-picker>
69 </uni-forms-item> 68 </uni-forms-item>
70 </uni-forms> 69 </uni-forms>
...@@ -78,16 +77,16 @@ ...@@ -78,16 +77,16 @@
78 77
79 <uni-popup ref="popup" type="bottom"> 78 <uni-popup ref="popup" type="bottom">
80 <view class="popBody"> 79 <view class="popBody">
81 <view class="tt">选择缴费年限</view> 80 <view class="tt">选择缴费年限</view>
82 <view class="pickitem" v-for="(item,index) in years" :key="index" @click="bindChange(item)"> 81 <view class="pickitem" v-for="(item,index) in years" :key="index" @click="bindChange(item)">
83 {{item}}年 82 {{item}}年
84 <uni-icons v-if="form.renewYear == item" type="checkmarkempty" size="20" 83 <uni-icons v-if="form.renewYear == item" type="checkmarkempty" size="20" color="green"></uni-icons>
85 color="green"></uni-icons> 84 <uni-icons v-else type="checkmarkempty" size="20" color="white"></uni-icons>
86 <uni-icons v-else type="checkmarkempty" size="20" 85 </view>
87 color="white"></uni-icons> 86
88 </view> 87 <view style="margin: 30rpx 0;">
89 88 <button class="btn-red" @click="submitForm">确定</button>
90 <button class="btn-red" @click="submitForm">确定</button> 89 </view>
91 </view> 90 </view>
92 91
93 </uni-popup> 92 </uni-popup>
...@@ -97,7 +96,8 @@ ...@@ -97,7 +96,8 @@
97 import { 96 import {
98 ref 97 ref
99 } from 'vue'; 98 } from 'vue';
100 import * as api from '@/common/api.js'; 99 import * as api from '@/common/api.js';
100 import _ from 'lodash'
101 import { 101 import {
102 onLoad, 102 onLoad,
103 onShow 103 onShow
...@@ -105,7 +105,8 @@ ...@@ -105,7 +105,8 @@
105 import config from '@/config.js' 105 import config from '@/config.js'
106 const app = getApp(); 106 const app = getApp();
107 const form = ref({ 107 const form = ref({
108 type: '1' 108 type: '1',
109 applyPoints: '0'
109 }); 110 });
110 const typeList = ref([{ 111 const typeList = ref([{
111 value: '1', 112 value: '1',
...@@ -151,8 +152,11 @@ ...@@ -151,8 +152,11 @@
151 const authenticationStatus = ref() 152 const authenticationStatus = ref()
152 const authenticationStatusa = ref() 153 const authenticationStatusa = ref()
153 const newResult = ref(false) 154 const newResult = ref(false)
154 const popup = ref(null) 155 const popup = ref(null)
155 const belongProvinceId = ref() 156 const belongProvinceId = ref()
157 const picArr = ref([])
158 const picArrR = ref([])
159 const businessLicenseArr = ref([])
156 const list1 = ref([{ 160 const list1 = ref([{
157 title: '完善信息' 161 title: '完善信息'
158 }, { 162 }, {
...@@ -161,9 +165,16 @@ ...@@ -161,9 +165,16 @@
161 const imageStylesZJ = ref({ 165 const imageStylesZJ = ref({
162 width: '400rpx', 166 width: '400rpx',
163 height: '253rpx' 167 height: '253rpx'
164 }); 168 });
165 const indicatorStyle=ref(`height: 50px;`) 169 const indicatorStyle = ref(`height: 50px;`)
166 onLoad(option => { 170 const imgfront = ref({})
171 const imgBack = ref({})
172 const creditCode = ref()
173 const parentId = ref()
174 const legalIdcPhoto1 = ref('')
175 const legalIdcPhoto2 = ref('')
176 onLoad(option => {
177
167 if (app.globalData.isLogin) { 178 if (app.globalData.isLogin) {
168 init() 179 init()
169 } else { 180 } else {
...@@ -175,7 +186,6 @@ ...@@ -175,7 +186,6 @@
175 186
176 function init() { 187 function init() {
177 getRegionsList() 188 getRegionsList()
178 getTree()
179 getForm() 189 getForm()
180 } 190 }
181 191
...@@ -206,9 +216,73 @@ ...@@ -206,9 +216,73 @@
206 form.value = { 216 form.value = {
207 ...res.data.dept, 217 ...res.data.dept,
208 ...res.data.memberInfo 218 ...res.data.memberInfo
209 } 219 }
210 form.value.parentId = form.value.parentId.toString() 220 getTree()
221 form.value.deptType = res.data.dept.deptType
222 form.value.parentId = form.value.parentId.toString()
223 creditCode.value = form.value.creditCode
211 belongProvinceId.value = form.value.belongProvinceId 224 belongProvinceId.value = form.value.belongProvinceId
225 parentId.value = form.value.parentId
226 if (form.value.regionId){
227 form.value.coordinates1 = form.value.regionId
228 } else if(form.value.cityId){
229 form.value.coordinates1 = form.value.cityId
230 } else if(form.value.provinceId){
231 form.value.coordinates1 = form.value.provinceId
232 } else {
233 form.value.coordinates1 = ''
234 }
235 if(form.value.businessLicense){
236 try{
237 businessLicenseArr.value = JSON.parse(form.value.businessLicense) || []
238 }catch(e){
239 businessLicenseArr.value=[{url:form.value.businessLicense,name:'营业执照'}]
240 }
241 }
242 if(form.value.legalIdcPhoto){
243 legalIdcPhoto1.value = form.value.legalIdcPhoto.split(',')?.[0] || ''
244 legalIdcPhoto2.value = form.value.legalIdcPhoto.split(',')?.[1] || ''
245 if(legalIdcPhoto1.value.indexOf('http')==-1){
246 legalIdcPhoto1.value = config.baseUrl_api + legalIdcPhoto1.value
247 }
248 if(legalIdcPhoto2.value.indexOf('http')==-1){
249 legalIdcPhoto2.value = config.baseUrl_api + legalIdcPhoto2.value
250 }
251 imgfront.value = {
252 url: legalIdcPhoto1.value,
253 name: '身份证正面',
254 extname: 'png'
255 }
256 imgBack.value = {
257 url:legalIdcPhoto2.value,
258 name: '身份证反面',
259 extname: 'png'
260 }
261 }
262 if(form.value.pictures){
263 picArrR.value = []
264 picArr.value = []
265 var arr = form.value.pictures.split(',') || []
266 if (arr.length > 0) {
267 arr = _.map(arr, (p) => {
268 if(p.indexOf('http')==-1){
269 p = config.baseUrl_api + p
270 }
271 var obj = {
272 url: p,
273 name: '图片',
274 extname: 'png'
275 }
276 picArrR.value.push(obj)
277 picArr.value.push(p)
278 })
279
280 }
281 }
282
283 if(!form.value.applyPoints||form.value.applyPoints==''){
284 form.value.applyPoints = '0'
285 }
212 }) 286 })
213 } 287 }
214 288
...@@ -250,62 +324,270 @@ ...@@ -250,62 +324,270 @@
250 icon: 'none' 324 icon: 'none'
251 }) 325 })
252 return 326 return
253 } 327 }
254 328 if (form.value.creditCode == '') {
255 // 329 uni.showToast({
256 popup.value.open() 330 title: '请填写社会信用代码',
257 } 331 icon: 'none'
258 function submitForm(){ 332 })
259 if(!form.value.renewYear){ 333 return
260 uni.showToast({ 334 }
261 title: '请选择缴费年限', 335 if (form.value.siteContact == '') {
262 icon: 'none' 336 uni.showToast({
263 }) 337 title: '请填写联系人',
264 return 338 icon: 'none'
265 } 339 })
266 api.centerCommit({ renewYear: form.value.renewYear }).then(res=>{ 340 return
267 uni.showModal({ 341 }
268 content:`缴费等待审核中！`, 342
269 success:function(res){ 343 if (form.value.siteContact == '') {
270 if(res.confirm){ 344 uni.showToast({
271 uni.navigateBack() 345 title: '请填写联系人',
272 } 346 icon: 'none'
273 } 347 })
274 }) 348 return
275 }) 349 }
350
351 if (form.value.siteTel == '') {
352 uni.showToast({
353 title: '请填写联系方式',
354 icon: 'none'
355 })
356 return
357 }
358
359 if (form.value.coordinates1 == '') {
360 uni.showToast({
361 title: '请选择认证地址',
362 icon: 'none'
363 })
364 return
365 }
366 if (form.value.adress == '') {
367 uni.showToast({
368 title: '请填写详细地址',
369 icon: 'none'
370 })
371 return
372 }
373 if (form.value.legal == '') {
374 uni.showToast({
375 title: '请填写法人姓名',
376 icon: 'none'
377 })
378 return
379 }
380 if (legalIdcPhoto1.value == '' || legalIdcPhoto2.value == '') {
381 uni.showToast({
382 title: '请上传法人身份证',
383 icon: 'none'
384 })
385 return
386 }
387 if (form.value.businessLicense == '') {
388 uni.showToast({
389 title: '请上传营业执照',
390 icon: 'none'
391 })
392 return
393 }
394 if (picArr.value.length == 0) {
395 uni.showToast({
396 title: '请上传机构照片',
397 icon: 'none'
398 })
399 return
400 }
401
402 form.value.duanPrice = undefined
403 form.value.jiPrice = undefined
404 if (form.value.parentId == -1 || form.value.parentId == 0) {
405 uni.showToast({
406 title: '请选择所属协会',
407 icon: 'none'
408 })
409 return
410 }
411 const dataInfo = {
412 parentId: form.value.parentId,
413 creditCode: form.value.creditCode,
414 legal: form.value.legal,
415 businessLicense:form.value.businessLicense,
416 pictures: picArr.value.toString(),
417 memId: form.value.memId,
418 id: form.value.deptId,
419 name: form.value.name,
420 regionId: form.value.coordinates1,
421 // cityId: form.value.cityId,
422 // provinceId: form.value.provinceId,
423 adress: form.value.adress,
424 belongProvinceId: form.value.belongProvinceId,
425 deptType: form.value.deptType,
426 legalIdcPhoto: [legalIdcPhoto1.value,legalIdcPhoto2.value]?.join(','),
427 applyPoints: form.value.applyPoints,
428 siteContact: form.value.siteContact,
429 siteTel: form.value.siteTel
430 }
431 console.log(dataInfo)
432 if (activeStatus.value == 0) {
433 api.active(dataInfo).then(res => {
434 uni.showModal({
435 content: '激活成功,返回首页',
436 success: function(resp) {
437 if (resp.confirm) {
438 uni.reLaunch({
439 url:`/pages/index/index`
440 })
441 } else {
442 uni.navigateBack()
443 }
444 }
445 })
446 })
447 } else {
448 api.editMyMemberCertifiedInfo(dataInfo).then(res => {
449 popup.value.open()
450 })
451 }
452 }
453 function changeCoordinates1(e){
454 console.log(e)
455 }
456 function submitForm() {
457 if (!form.value.renewYear) {
458 uni.showToast({
459 title: '请选择缴费年限',
460 icon: 'none'
461 })
462 return
463 }
464 api.centerCommit({
465 renewYear: form.value.renewYear
466 }).then(res => {
467 uni.showModal({
468 content: `缴费等待审核中！`,
469 success: function(res) {
470 if (res.confirm) {
471 uni.navigateBack()
472 }
473 }
474 })
475 })
276 } 476 }
277 477
278 function upIdCardImgFront(e) { 478 function upIdCardImgFront(e) {
479 const tempFilePaths = e.tempFilePaths;
480 const imgUrl = tempFilePaths[0]
481 if (!imgUrl) {
482 return
483 }
484 uni.showLoading({
485 title: '加载中'
486 })
487 api.uploadImg(e).then(data => {
488 legalIdcPhoto1.value = data.msg
489 })
490 }
491
492 function upIdCardImgBack(e) {
493 const tempFilePaths = e.tempFilePaths;
494 const imgUrl = tempFilePaths[0]
495 if (!imgUrl) {
496 return
497 }
498 uni.showLoading({
499 title: '加载中'
500 })
501 api.uploadImg(e).then(data => {
502 legalIdcPhoto2.value = data.msg
503 })
504 }
505
506 function delimgFont() {
507 imgfront.value = {}
508 legalIdcPhoto1.value = ''
509 }
510
511 function delimgBack() {
512 imgBack.value = {}
513 legalIdcPhoto2.value = ''
514 }
515
516 let selectFileValue = {}
517
518 function selectFile(e) {
519 console.log(e)
279 let file = e.tempFiles[0] 520 let file = e.tempFiles[0]
280 if (!file) { 521 if (!file) {
281 return 522 return
282 } 523 }
524 api.uploadFile(e).then(data => {
525 selectFileValue = {
526 url: data.msg,
527 name: file.name,
528 extname: file.extname
529 }
530 form.value.businessLicense = JSON.stringify([selectFileValue])
531 console.log(selectFileValue,form.value.businessLicense)
532 })
533 }
534
535 function delSupplementFile() {
536 selectFileValue = {}
537 }
538
539 function upPicArr(e) {
540 const tempFilePaths = e.tempFilePaths;
541 const imgUrl = tempFilePaths[0]
542 if (!imgUrl) {
543 return
544 }
283 uni.showLoading({ 545 uni.showLoading({
284 title: '加载中' 546 title: '加载中'
285 }); 547 })
286 } 548 api.uploadImg(e).then(data => {
287 function bindChange(e){ 549 picArr.value.push(data.msg)
288 console.log(e) 550 // form.value.pictures
289 form.value.renewYear = e 551 console.log(picArr.value)
552 })
553 }
554
555 function delpicArr(e) {
556 picArr.value.splice(e.index, 1)
557 console.log(picArr.value, picArrR.value)
558 }
559
560
561 function bindChange(e) {
562 console.log(e)
563 form.value.renewYear = e
290 } 564 }
291 </script> 565 </script>
292 566
293 <style lang="scss" scoped> 567 <style lang="scss" scoped>
294 .pickitem{height:40px;text-align: center; 568 :deep(.file-picker__progress){ opacity: 0; }
295 line-height: 40px;} 569 :deep(.input-value){padding: 0 5px;}
296 .picker-view { 570 .pickitem {
297 width: 750rpx; 571 height: 40px;
298 height: 600rpx; 572 text-align: center;
299 margin-top: 20rpx; 573 line-height: 40px;
300 } 574 }
301 .item { 575
302 line-height: 100rpx; 576 .picker-view {
303 text-align: center; 577 width: 750rpx;
304 } 578 height: 600rpx;
579 margin-top: 20rpx;
580 }
581
582 .item {
583 line-height: 100rpx;
584 text-align: center;
585 }
586
305 .popBody { 587 .popBody {
306 background: #fff; 588 background: #fff;
307 padding: 30rpx; 589 padding: 30rpx;
308 } 590 }
309 591
310 :deep(.uni-data-tree) { 592 :deep(.uni-data-tree) {
311 border: 1px solid #dcdfe6; 593 border: 1px solid #dcdfe6;
......
myCenter/safe.vue
...@@ -167,7 +167,7 @@ function handleClick() { ...@@ -167,7 +167,7 @@ function handleClick() {
167 }) 167 })
168 return 168 return
169 } 169 }
170 api.updateUserPwd(form.oldPassword, form.newPassword).then(res=>{ 170 api.updateUserPwd({oldPassword:form.value.oldPassword, newPassword:form.value.newPassword}).then(res=>{
171 uni.showModal({ 171 uni.showModal({
172 title:"提示", 172 title:"提示",
173 content:`修改成功，重新登录生效`, 173 content:`修改成功，重新登录生效`,
......
pages/index/index.vue
1 <template> 1 <template>
2 <view class="page"> 2 <view class="page" v-if="isInit">
3 <view class="bgbg"> 3 <view class="bgbg">
4 <view class="loginOutIcon" @click="loginOut"> 4 <view class="loginOutIcon" @click="loginOut">
5 <image src="@/static/switch.png"></image> 5 <image src="@/static/switch.png"></image>
...@@ -86,10 +86,10 @@ ...@@ -86,10 +86,10 @@
86 <image :src="config.baseUrl_api+'/fs/static/icon/25.png'" /> 86 <image :src="config.baseUrl_api+'/fs/static/icon/25.png'" />
87 会员变更 87 会员变更
88 </view> 88 </view>
89 <!-- <view @click="goPath('/personalVip/mergeVip')"> 89 <view @click="goPath('/personalVip/mergeVip')">
90 <image :src="config.baseUrl_api+'/fs/static/icon/25.png'" /> 90 <image :src="config.baseUrl_api+'/fs/static/icon/28.png'" />
91 信息合并 91 信息合并
92 </view> --> 92 </view>
93 </view> 93 </view>
94 <view class="ttt">团体会员</view> 94 <view class="ttt">团体会员</view>
95 <view class="girdBox"> 95 <view class="girdBox">
...@@ -169,12 +169,11 @@ ...@@ -169,12 +169,11 @@
169 <view @click="goPath('/personalVip/changeVipAudit')"> 169 <view @click="goPath('/personalVip/changeVipAudit')">
170 <image :src="config.baseUrl_api+'/fs/static/icon/25.png'" /> 170 <image :src="config.baseUrl_api+'/fs/static/icon/25.png'" />
171 变更审核 171 变更审核
172 </view> 172 </view>
173 173 <view @click="goPath('/personalVip/mergeVipAudit')">
174 <!-- <view @click="goPath('/personalVip/mergeVipAudit')"> 174 <image :src="config.baseUrl_api+'/fs/static/icon/28.png'" />
175 <image :src="config.baseUrl_api+'/fs/static/icon/25.png'" />
176 合并审核 175 合并审核
177 </view> --> 176 </view>
178 </view> 177 </view>
179 178
180 <view class="ttt">团体会员</view> 179 <view class="ttt">团体会员</view>
...@@ -288,8 +287,12 @@ ...@@ -288,8 +287,12 @@
288 const numData = ref({}); 287 const numData = ref({});
289 288
290 const messageList = ref([]) 289 const messageList = ref([])
291 const newsList = ref([]) 290 const newsList = ref([])
292 onShow(() => { 291 const isInit = ref(false)
292 onShow(() => {
293 uni.showLoading({
294 title:'加载中'
295 })
293 if (app.globalData.isLogin) { 296 if (app.globalData.isLogin) {
294 init() 297 init()
295 } else { 298 } else {
...@@ -309,19 +312,19 @@ ...@@ -309,19 +312,19 @@
309 withShareTicket: true, 312 withShareTicket: true,
310 menus: ['shareAppMessage', 'shareTimeline'] 313 menus: ['shareAppMessage', 'shareTimeline']
311 }); 314 });
312 } 315 }
313 const changePassFlag = app.globalData.user?.changePassFlag 316 const changePassFlag = app.globalData.user?.changePassFlag
314 if (changePassFlag === '1') { 317 if (changePassFlag === '1'&&memberInfo.value.activeStatus == '1'&&app.globalData.authenticationStatus==2) {
315 uni.showModal({ 318 uni.showModal({
316 content: "密码长期未更新，请及时更新", 319 content: "密码长期未更新，请及时更新",
317 success: function(res) { 320 success: function(res) {
318 if (res.confirm) { 321 if (res.confirm) {
319 uni.navigateTo({ 322 uni.navigateTo({
320 url: `/myCenter/safe?current=1` 323 url: `/myCenter/safe?current=1`
321 }); 324 });
322 } 325 }
323 } 326 }
324 }) 327 })
325 } 328 }
326 }); 329 });
327 330
...@@ -354,10 +357,12 @@ ...@@ -354,10 +357,12 @@
354 uni.showModal({ 357 uni.showModal({
355 title: '提示', 358 title: '提示',
356 content: '会员已过期，请及时续费', 359 content: '会员已过期，请及时续费',
357 success: function(res) { 360 success: function(res) {
358 // uni.navigateTo({ 361 if(res.confirm){
359 // url: '/pages/index/perfect' 362 uni.navigateTo({
360 // }); 363 url: '/myCenter/auth'
364 });
365 }
361 } 366 }
362 }) 367 })
363 } 368 }
...@@ -366,8 +371,14 @@ ...@@ -366,8 +371,14 @@
366 if (memberInfo.value.activeStatus == 0) { 371 if (memberInfo.value.activeStatus == 0) {
367 uni.showModal({ 372 uni.showModal({
368 title: '提示', 373 title: '提示',
369 content: '账号未激活，请前往【中国跆拳道会员管理系统】电脑端激活', 374 content: '账号未激活，请前去激活',
370 success: function(res) {} 375 success: function(res) {
376 if(res.confirm){
377 uni.navigateTo({
378 url: '/myCenter/auth'
379 });
380 }
381 }
371 }) 382 })
372 return 383 return
373 } 384 }
...@@ -378,9 +389,7 @@ ...@@ -378,9 +389,7 @@
378 } 389 }
379 390
380 function init() { 391 function init() {
381 uni.showLoading({ 392 isInit.value = true
382 title: '加载中'
383 });
384 loginServer.getMyOwnMemberInfo().then(res => { 393 loginServer.getMyOwnMemberInfo().then(res => {
385 userType.value = app.globalData.userType 394 userType.value = app.globalData.userType
386 memberInfo.value = app.globalData.memberInfo 395 memberInfo.value = app.globalData.memberInfo
...@@ -396,10 +405,12 @@ ...@@ -396,10 +405,12 @@
396 uni.showModal({ 405 uni.showModal({
397 title: '提示', 406 title: '提示',
398 content: '会员已过期，请及时续费', 407 content: '会员已过期，请及时续费',
399 success: function(res) { 408 success: function(res) {
400 // uni.navigateTo({ 409 if(res.confirm){
401 // url: '/pages/index/perfect' 410 uni.navigateTo({
402 // }); 411 url: '/myCenter/auth'
412 });
413 }
403 } 414 }
404 }) 415 })
405 } 416 }
...@@ -418,20 +429,22 @@ ...@@ -418,20 +429,22 @@
418 // uni.navigateTo({ 429 // uni.navigateTo({
419 // url: '/pages/index/perfect' 430 // url: '/pages/index/perfect'
420 // }); 431 // });
421 } else { 432 }
422 getMes() 433 if (memberInfo.value.activeStatus == 0) {
423 if (memberInfo.value.activeStatus == 0) { 434 uni.showModal({
424 uni.showModal({ 435 content: '账号未激活，请前去激活',
425 title: '提示', 436 success: function(res) {
426 content: '账号未激活，请前往【中国跆拳道会员管理系统】电脑端激活', 437 if(res.confirm){
427 success: function(res) { 438 uni.navigateTo({
428 // uni.navigateTo({ 439 url: '/myCenter/auth'
429 // url: '/pages/index/perfect' 440 });
430 // }); 441 }
431 } 442
432 }) 443 }
433 } 444 })
434 } 445 }
446
447
435 uni.hideLoading(); 448 uni.hideLoading();
436 }) 449 })
437 450
...@@ -450,75 +463,7 @@ ...@@ -450,75 +463,7 @@
450 newsList.value = res.rows 463 newsList.value = res.rows
451 }) 464 })
452 } 465 }
453 466
454 function getMes() {
455 uni.showLoading({
456 title: '加载中'
457 });
458 api.getMessage({
459 pageNum: 1,
460 pageSize: 10
461 }).then(res => {
462 if (res.rows && res.rows.length > 0)
463 for (var d of res.rows) {
464 switch (d.type) {
465 case 30001:
466 d.name = '你有一条会员缴费等待审批，点击去处理！'
467 d.path = '/personalVip/audit'
468 break
469 case 30002:
470 d.name = '你有一条级位考试等待审批，点击去处理！'
471 d.path = '/level/approval'
472 break
473 case 30003:
474 d.name = '你有一条段位考试等待审批，点击去处理！'
475 d.path = '/pages/rank/approval'
476 break
477 case 30004:
478 d.name = '你有一条会员调动等待审批，点击去处理！'
479 d.path = '/personalVip/mobillize'
480 break
481 case 30005:
482 d.name = '你有一条团体会员认证等待审批，点击去处理！'
483 d.path = '/group/apply/applyList'
484 break
485 case 30006:
486 d.name = '你有一条段位成绩等待审批，点击去处理！'
487 d.path = '/pages/rank/scoreApproval'
488 break
489 case 40001:
490 d.name = '你有一条级位申请待提交，点击去处理！'
491 d.path = `/level/apply?id=${d.eventId}`
492 break
493 case 40002:
494 d.name = '你有一条段位申请待提交，点击去处理！'
495 d.path = `/pages/rank/apply?id=${d.eventId}`
496 break
497 case 40003:
498 d.name = '你有一条成绩维护的数据待提交，点击去处理！'
499 d.path = `/pages/rank/score/modify?id=${d.eventId}`
500 break
501 case 50001:
502 d.name = '你有一条新的个人会员申请，点击去处理！'
503 d.path = '/personalVip/list'
504 break
505 }
506 }
507 messageList.value = res.rows
508 uni.hideLoading();
509 })
510 }
511
512 function readMessage(item) {
513 uni.navigateTo({
514 url: item.path
515 });
516 api.reader({
517 id: item.id
518 }).then(res => {
519 item.readFlag = '1'
520 })
521 }
522 function goNewsDetail(n){ 467 function goNewsDetail(n){
523 uni.navigateTo({ 468 uni.navigateTo({
524 url: `/pages/index/newsDetail?noteId=${n.noteId}` 469 url: `/pages/index/newsDetail?noteId=${n.noteId}`
......
personalVip/addVip.vue
...@@ -86,27 +86,20 @@ ...@@ -86,27 +86,20 @@
86 <uni-popup ref="popup" type="bottom" background-color="#fff" animation> 86 <uni-popup ref="popup" type="bottom" background-color="#fff" animation>
87 <view class="tt">入会须知</view> 87 <view class="tt">入会须知</view>
88 <view class="popBody"> 88 <view class="popBody">
89 ______欢迎您申请成为中国跆拳道协会（以下简称中国跆协）会员，请确保本次申请是经过您本人或监护人授权同意后的自愿行为，请您务必仔细阅读本入会须知。 89 _{{baseFormData.name}}_欢迎您申请成为中国跆拳道协会（以下简称中国跆协）会员，请确保本次申请是经过您本人或监护人授权同意后的自愿行为，请您务必仔细阅读本入会须知。
90 <br /> 90 <br />
91 一、中国跆协会员分为个人会员和单位会员。 91 一、中国跆协会员分为个人会员和单位会员。
92 <br /> 92 <br />
93 二、成为本协会会员条件：遵守中国跆协章程和协会各项规章制度及相关决议，按期交纳会费，积极支持和参与中国跆拳道事业发展的社会各届人士或地方跆拳道协会、俱乐部、培训机构等，均可自愿申请成为中国跆协会员。 93 二、成为本协会会员条件：遵守中国跆协章程和协会各项规章制度及相关决议，按期交纳会费，积极支持和参与中国跆拳道事业发展的社会各届人士或地方跆拳道协会、俱乐部、培训机构等，均可自愿申请成为中国跆协会员。<br />
94 <br /> 94 三、个人会员为在中国工作和生活的跆拳道爱好者，16 周岁以下应有监护人协助申请，会员须为中国公民。<br />
95 三、个人会员为在中国工作和生活的跆拳道爱好者，16 周岁以下应有监护人协助申请，会员须为中国公民。 95 四、会员入会需向所在区域内中国跆协单位会员提出入会申请，并按程序报中国跆协批准，按规定交纳会费。<br />
96 <br />
97 四、会员入会需向所在区域内中国跆协单位会员提出入会申请，并按程序报中国跆协批准，按规定交纳会费。
98 <br />
99 五、会员享有《中国跆拳道协会会员管理办法》规定的会员权利。 96 五、会员享有《中国跆拳道协会会员管理办法》规定的会员权利。
100 <br /> 97 <br />
101 六、会员应履行《中国跆拳道协会会员管理办法》规定的会员义务。 98 六、会员应履行《中国跆拳道协会会员管理办法》规定的会员义务。
102 <br /> 99 <br />
103 七、凡中国跆协会员，须按照《中国跆拳道协会会员会费标准（2021 版）》按时交纳年度会费。 100 七、凡中国跆协会员，须按照《中国跆拳道协会会员会费标准（2021 版）》按时交纳年度会费。<br />
104 <br /> 101 八、会员行为违反《中国跆拳道协会会员管理办法》中规定的，按照相关处罚规定进行处理。<br />
105 八、会员行为违反《中国跆拳道协会会员管理办法》中规定的，按照相关处罚规定进行处理。 102 九、其它会员相关内容请查看《中国跆拳道协会章程》《中国跆拳道协会会员管理办法》。<br />
106 <br />
107 九、会员有退会的自由。会员自愿退会应至少提前 3 个月以书面形式通知本协会，并在此之前，妥善解决与本协会及其他会员之间的财务等问题，方可退会。
108 <br />
109 十、其它会员相关内容请查看《中国跆拳道协会会员管理办法》。
110 103
111 <button @click="closepopup" class="btn-red">我已阅读</button> 104 <button @click="closepopup" class="btn-red">我已阅读</button>
112 </view> 105 </view>
...@@ -298,8 +291,13 @@ ...@@ -298,8 +291,13 @@
298 uni.showLoading({ 291 uni.showLoading({
299 title: '加载中' 292 title: '加载中'
300 }); 293 });
301 api.uploadImg(e).then(data => { 294 api.uploadImgCorp(resp.tempFilePath).then(data => {
302 baseFormData.value.photo = data.msg; 295 baseFormData.value.photo = data.msg;
296 photoArr.value = {
297 url: config.baseUrl_api+baseFormData.value.photo,
298 name: '头像',
299 extname: 'jpg'
300 }
303 }); 301 });
304 }, 302 },
305 fail: function(err) { 303 fail: function(err) {
...@@ -337,7 +335,6 @@ ...@@ -337,7 +335,6 @@
337 // idcCode: baseFormData.value.idcCode, 335 // idcCode: baseFormData.value.idcCode,
338 // perType: '1' 336 // perType: '1'
339 // }; 337 // };
340 //如果老会员
341 uni.showLoading({ 338 uni.showLoading({
342 title: '加载中' 339 title: '加载中'
343 }) 340 })
...@@ -348,7 +345,8 @@ ...@@ -348,7 +345,8 @@
348 // } 345 // }
349 perId.value = res.data.perId 346 perId.value = res.data.perId
350 baseFormData.value.sex = res.data.sex 347 baseFormData.value.sex = res.data.sex
351 baseFormData.value.birth = res.data.birth 348 baseFormData.value.birth = res.data.birth
349 baseFormData.value.name = res.data.name
352 baseFormData.value.phone = res.data.phone 350 baseFormData.value.phone = res.data.phone
353 baseFormData.value.cityId = res.data.cityId 351 baseFormData.value.cityId = res.data.cityId
354 baseFormData.value.address = res.data.address 352 baseFormData.value.address = res.data.address
...@@ -380,10 +378,10 @@ ...@@ -380,10 +378,10 @@
380 } else { 378 } else {
381 uni.hideLoading() 379 uni.hideLoading()
382 // 新会员 380 // 新会员
383 // if (res.data.sex) { 381 if (res.data.sex) {
384 // baseFormData.value.sex = res.data.sex 382 baseFormData.value.sex = res.data.sex
385 // baseFormData.value.birth = res.data.birth 383 baseFormData.value.birth = res.data.birth
386 // } 384 }
387 if (baseFormData.value.idcType != 3 && current.value == 1) { 385 if (baseFormData.value.idcType != 3 && current.value == 1) {
388 disabledName.value = true 386 disabledName.value = true
389 } else { 387 } else {
......
static/nodata.png
static/nodata.png

12 KB | W: | H:

static/nodata.png

104 KB | W: | H:

static/nodata.png
static/nodata.png
static/nodata.png
static/nodata.png
  • 2-up
  • Swipe
  • Onion skin
uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue
...@@ -524,7 +524,8 @@ ...@@ -524,7 +524,8 @@
524 delFile(index) { 524 delFile(index) {
525 this.$emit('delete', { 525 this.$emit('delete', {
526 tempFile: this.files[index], 526 tempFile: this.files[index],
527 tempFilePath: this.files[index].url 527 tempFilePath: this.files[index].url,
528 index
528 }) 529 })
529 this.files.splice(index, 1) 530 this.files.splice(index, 1)
530 this.$nextTick(() => { 531 this.$nextTick(() => {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!