Skip to content

杨炀 / ztx_wx_gzt

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

Merge commit '4037b935' 

# Conflicts:
#	level/addApply.vue
#	personalVip/addVip.vue
2 parents e4576d59 4037b935
Inline Side-by-side
Showing 20 changed files with 627 additions and 578 deletions
App.vue
1 <script> 1 <script>
2 import { 2 import {
3 h5Login 3 getInfo
4 } from '@/common/login.js'; 4 } from '@/common/login.js';
5 import * as api from '@/common/api.js'; 5 import * as api from '@/common/api.js';
6 import config from '@/config.js'; 6 import config from '@/config.js';
...@@ -13,19 +13,16 @@ export default { ...@@ -13,19 +13,16 @@ export default {
13 firstload = true 13 firstload = true
14 14
15 this.globalData.baseUrl_api = config.baseUrl_api; 15 this.globalData.baseUrl_api = config.baseUrl_api;
16 16 if(loginUrl.indexOf(options.path)==-1){
17 if(loginUrl.indexOf( options.path)==-1){
18 let userName = uni.getStorageSync('userName') 17 let userName = uni.getStorageSync('userName')
19 if (userName) { 18 if (userName) {
20 h5Login(userName) 19 getInfo().then(() => {
21 .then(() => {
22 this.globalData.isLogin = true; 20 this.globalData.isLogin = true;
23 let firstLoadCallback = getApp().firstLoadCallback; 21 let firstLoadCallback = getApp().firstLoadCallback;
24 if (firstLoadCallback) { 22 if (firstLoadCallback) {
25 firstLoadCallback(); 23 firstLoadCallback();
26 } 24 }
27 }) 25 }).catch(() => {
28 .catch(() => {
29 uni.redirectTo({ 26 uni.redirectTo({
30 url: '/login/login' 27 url: '/login/login'
31 }) 28 })
......
common/login.js
...@@ -87,6 +87,7 @@ function getInfo() { ...@@ -87,6 +87,7 @@ function getInfo() {
87 // uni.setStorageSync('perId', personInfo.perId||-1) 87 // uni.setStorageSync('perId', personInfo.perId||-1)
88 app.globalData.deptType = user.dept.deptType 88 app.globalData.deptType = user.dept.deptType
89 app.globalData.genFlag = user.dept.genFlag 89 app.globalData.genFlag = user.dept.genFlag
90 user.dept.deptType = '3'
90 switch (user.dept.deptType) { 91 switch (user.dept.deptType) {
91 case '1': // 中跆协 92 case '1': // 中跆协
92 app.globalData.userType = '1' 93 app.globalData.userType = '1'
...@@ -136,5 +137,6 @@ export { ...@@ -136,5 +137,6 @@ export {
136 loginByPhone, 137 loginByPhone,
137 groupMemberRegister, 138 groupMemberRegister,
138 getMyOwnMemberInfo, 139 getMyOwnMemberInfo,
139 logout 140 logout,
141 getInfo
140 } 142 }
......
common/request.js
1 import config from '@/config.js' 1 import config from '@/config.js'
2 import { 2 import _ from 'lodash'
3 h5LoginAuto
4 } from './login'
5 3
6 const excludeUrls = ['login/login', 'login/register'] 4 const excludeUrls = ['getMemberCountInfo', 'getInfo']
7 5
8 // 获取Token 6 // 获取Token
9 function getToken() { 7 function getToken() {
...@@ -68,7 +66,7 @@ const request = function(req) { ...@@ -68,7 +66,7 @@ const request = function(req) {
68 const data = res.data || {} 66 const data = res.data || {}
69 if (data.code === 0 || data.code === 200 || data.pageData?.code === 200) { 67 if (data.code === 0 || data.code === 200 || data.pageData?.code === 200) {
70 resolve(data) 68 resolve(data)
71 } else if (req.url.indexOf('getMemberCountInfo') > -1) { 69 } else if (_.some(excludeUrls, (url) => req.url.indexOf(url) > -1)) {
72 resolve(data) 70 resolve(data)
73 } else { 71 } else {
74 // if (!excludeUrls.includes(req.url)) { 72 // if (!excludeUrls.includes(req.url)) {
...@@ -90,26 +88,26 @@ const request = function(req) { ...@@ -90,26 +88,26 @@ const request = function(req) {
90 // } 88 // }
91 89
92 // 登录超时 90 // 登录超时
93 if (data.code === 60002 || data.code === 60001) { 91 // if (data.code === 60002 || data.code === 60001) {
94 uni.redirectTo({ 92 // uni.redirectTo({
95 url: '/login/login' 93 // url: '/login/login'
96 }) 94 // })
97 } else if (data.code === 401) { 95 // } else if (data.code === 401) {
98 h5LoginAuto() 96 // h5LoginAuto()
99 .then(() => { 97 // .then(() => {
100 uni.hideLoading() 98 // uni.hideLoading()
101 uni.redirectTo({ 99 // uni.redirectTo({
102 url: getCurrentPages()[getCurrentPages() 100 // url: getCurrentPages()[getCurrentPages()
103 .length - 1].$page.fullPath 101 // .length - 1].$page.fullPath
104 }) 102 // })
105 }) 103 // })
106 .catch(() => { 104 // .catch(() => {
107 uni.showToast({ 105 // uni.showToast({
108 title: '服务异常，请稍后重试', 106 // title: '服务异常，请稍后重试',
109 icon: 'none' 107 // icon: 'none'
110 }) 108 // })
111 }) 109 // })
112 } 110 // }
113 111
114 reject(res) 112 reject(res)
115 } 113 }
......
config.js
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
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.11:8787' 8 const baseUrl_api = 'http://192.168.1.98: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 {
......
group/apply/applyList.vue
...@@ -91,36 +91,36 @@ ...@@ -91,36 +91,36 @@
91 <image mode="aspectFit" src="/static/nodata.png"></image> 91 <image mode="aspectFit" src="/static/nodata.png"></image>
92 <text>暂无数据</text> 92 <text>暂无数据</text>
93 </view> 93 </view>
94 <!-- <view v-if="userType=='2'" class="block-btn-box"> 94 <!-- <view v-if="userType=='2'" class="block-btn-box">
95 <button @click="goMerge" class="btn-red-kx">前往合并 > </button> 95 <button @click="goMerge" class="btn-red-kx">前往合并 > </button>
96 </view> --> 96 </view> -->
97 </view> 97 </view>
98 </template> 98 </template>
99 99
100 <script setup> 100 <script setup>
101 import * as api from '@/common/api.js' 101 import * as api from '@/common/api.js'
102 import config from '@/config.js' 102 import config from '@/config.js'
103 import { 103 import {
104 onMounted, 104 onMounted,
105 ref 105 ref
106 } from 'vue' 106 } from 'vue'
107 import { 107 import {
108 onLoad 108 onLoad
109 } from '@dcloudio/uni-app' 109 } from '@dcloudio/uni-app'
110 const app = getApp(); 110 const app = getApp();
111 const queryParams = ref({ 111 const queryParams = ref({
112 // pageNum: 1, 112 // pageNum: 1,
113 // pageSize: 10 113 // pageSize: 10
114 auditStatus: '0' 114 auditStatus: '0'
115 }) 115 })
116 const navs = ref(['审核中', '审核通过', '审核拒绝', '撤回']) 116 const navs = ref(['审核中', '审核通过', '审核拒绝', '撤回'])
117 const current = ref() 117 const current = ref()
118 const list = ref([]) 118 const list = ref([])
119 const total = ref(0) 119 const total = ref(0)
120 const deptType = ref('') 120 const deptType = ref('')
121 const userType = ref('') 121 const userType = ref('')
122 const totalCost = ref(0) 122 const totalCost = ref(0)
123 onLoad(() => { 123 onLoad(() => {
124 if (app.globalData.isLogin) { 124 if (app.globalData.isLogin) {
125 init() 125 init()
126 } else { 126 } else {
...@@ -129,22 +129,22 @@ ...@@ -129,22 +129,22 @@
129 init() 129 init()
130 }; 130 };
131 } 131 }
132 }) 132 })
133 133
134 function init() { 134 function init() {
135 deptType.value = app.globalData.deptType 135 deptType.value = app.globalData.deptType
136 userType.value = app.globalData.userType 136 userType.value = app.globalData.userType
137 console.log(userType.value) 137 // console.log(userType.value)
138 getList() 138 getList()
139 } 139 }
140 140
141 function onClickItem(e) { 141 function onClickItem(e) {
142 console.log(e) 142 console.log(e)
143 queryParams.value.auditStatus = e.currentIndex 143 queryParams.value.auditStatus = e.currentIndex
144 getList() 144 getList()
145 } 145 }
146 146
147 function getList() { 147 function getList() {
148 uni.showLoading({ 148 uni.showLoading({
149 title: '加载中' 149 title: '加载中'
150 }) 150 })
...@@ -167,9 +167,9 @@ ...@@ -167,9 +167,9 @@
167 }) 167 })
168 total.value = res.total 168 total.value = res.total
169 }) 169 })
170 } 170 }
171 171
172 function audit(recordId, flag) { 172 function audit(recordId, flag) {
173 if (flag == '0') { 173 if (flag == '0') {
174 // 拒绝 174 // 拒绝
175 // 弹出框填写理由 175 // 弹出框填写理由
...@@ -201,9 +201,9 @@ ...@@ -201,9 +201,9 @@
201 } 201 }
202 }) 202 })
203 } 203 }
204 } 204 }
205 205
206 function doApproval(recordId, flag, reason) { 206 function doApproval(recordId, flag, reason) {
207 var obj = { 207 var obj = {
208 flag: flag, 208 flag: flag,
209 reason: reason || '', 209 reason: reason || '',
...@@ -218,9 +218,9 @@ ...@@ -218,9 +218,9 @@
218 }) 218 })
219 getList() 219 getList()
220 }) 220 })
221 } 221 }
222 222
223 function goDetail(item) { 223 function goDetail(item) {
224 const auditLog = encodeURIComponent(JSON.stringify(item.auditLog)) 224 const auditLog = encodeURIComponent(JSON.stringify(item.auditLog))
225 const form = encodeURIComponent(JSON.stringify(item)) 225 const form = encodeURIComponent(JSON.stringify(item))
226 226
...@@ -237,23 +237,23 @@ ...@@ -237,23 +237,23 @@
237 url: path 237 url: path
238 }); 238 });
239 } 239 }
240 } 240 }
241 241
242 function goMerge() { 242 function goMerge() {
243 let path = `/group/apply/merge` 243 let path = `/group/apply/merge`
244 uni.redirectTo({ 244 uni.redirectTo({
245 url: path 245 url: path
246 }); 246 });
247 } 247 }
248 248
249 function goMergeUp() { 249 function goMergeUp() {
250 let path = `/group/apply/mergeUp` 250 let path = `/group/apply/mergeUp`
251 uni.redirectTo({ 251 uni.redirectTo({
252 url: path 252 url: path
253 }); 253 });
254 } 254 }
255 255
256 function sendBack(row) { 256 function sendBack(row) {
257 uni.showModal({ 257 uni.showModal({
258 title: '提示', 258 title: '提示',
259 content: `确定撤回${row.content.certName}吗`, 259 content: `确定撤回${row.content.certName}吗`,
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
273 } 273 }
274 } 274 }
275 }) 275 })
276 } 276 }
277 </script> 277 </script>
278 278
279 <style scoped> 279 <style scoped>
......
group/apply/mergeUp.vue
...@@ -54,29 +54,29 @@ ...@@ -54,29 +54,29 @@
54 </template> 54 </template>
55 55
56 <script setup> 56 <script setup>
57 import * as api from '@/common/api.js' 57 import * as api from '@/common/api.js'
58 import config from '@/config.js' 58 import config from '@/config.js'
59 import { 59 import {
60 onMounted, 60 onMounted,
61 ref 61 ref
62 } from 'vue' 62 } from 'vue'
63 import { 63 import {
64 onLoad 64 onLoad
65 } from '@dcloudio/uni-app' 65 } from '@dcloudio/uni-app'
66 const app = getApp(); 66 const app = getApp();
67 const queryParams = ref({ 67 const queryParams = ref({
68 // pageNum: 1, 68 // pageNum: 1,
69 // pageSize: 10 69 // pageSize: 10
70 mergeFlag: 100, 70 mergeFlag: 100,
71 statusFlag: '101' 71 statusFlag: '101'
72 }) 72 })
73 const navs = ref(['待提交','审核中', '审核通过', '审核拒绝', '已撤回']) 73 const navs = ref(['待提交','审核中', '审核通过', '审核拒绝', '已撤回'])
74 const current = ref() 74 const current = ref()
75 const list = ref([]) 75 const list = ref([])
76 const total = ref(0) 76 const total = ref(0)
77 const deptType = ref('') 77 const deptType = ref('')
78 const userType = ref('') 78 const userType = ref('')
79 onLoad(() => { 79 onLoad(() => {
80 if (app.globalData.isLogin) { 80 if (app.globalData.isLogin) {
81 init() 81 init()
82 } else { 82 } else {
...@@ -85,16 +85,16 @@ ...@@ -85,16 +85,16 @@
85 init() 85 init()
86 }; 86 };
87 } 87 }
88 }) 88 })
89 89
90 function init() { 90 function init() {
91 deptType.value = app.globalData.deptType 91 deptType.value = app.globalData.deptType
92 userType.value = app.globalData.userType 92 userType.value = app.globalData.userType
93 console.log(userType.value) 93 // console.log(userType.value)
94 getList() 94 getList()
95 } 95 }
96 96
97 function onClickItem(e) { 97 function onClickItem(e) {
98 console.log(e) 98 console.log(e)
99 switch(e.currentIndex){ 99 switch(e.currentIndex){
100 case 0: 100 case 0:
...@@ -114,9 +114,9 @@ ...@@ -114,9 +114,9 @@
114 break; 114 break;
115 } 115 }
116 getList() 116 getList()
117 } 117 }
118 118
119 function getList() { 119 function getList() {
120 uni.showLoading({ 120 uni.showLoading({
121 title:'加载中' 121 title:'加载中'
122 }) 122 })
...@@ -153,9 +153,9 @@ ...@@ -153,9 +153,9 @@
153 }) 153 })
154 total.value = res.total 154 total.value = res.total
155 }) 155 })
156 } 156 }
157 157
158 function handleAudit(item){ 158 function handleAudit(item){
159 uni.showModal({ 159 uni.showModal({
160 title: '提示', 160 title: '提示',
161 content: `确定提交${item.content.certName}吗`, 161 content: `确定提交${item.content.certName}吗`,
...@@ -174,9 +174,9 @@ ...@@ -174,9 +174,9 @@
174 } 174 }
175 } 175 }
176 }) 176 })
177 } 177 }
178 178
179 function goDetail(item) { 179 function goDetail(item) {
180 const form = encodeURIComponent(JSON.stringify(item)) 180 const form = encodeURIComponent(JSON.stringify(item))
181 // 查看 181 // 查看
182 let path = `/group/apply/mergeUpDetail?&form=${form}` 182 let path = `/group/apply/mergeUpDetail?&form=${form}`
...@@ -184,20 +184,20 @@ ...@@ -184,20 +184,20 @@
184 url: path 184 url: path
185 }); 185 });
186 186
187 } 187 }
188 function goMerge(){ 188 function goMerge(){
189 let path = `/group/apply/merge` 189 let path = `/group/apply/merge`
190 uni.redirectTo({ 190 uni.redirectTo({
191 url: path 191 url: path
192 }); 192 });
193 } 193 }
194 function goApply(){ 194 function goApply(){
195 let path = `/group/apply/applyList` 195 let path = `/group/apply/applyList`
196 uni.redirectTo({ 196 uni.redirectTo({
197 url: path 197 url: path
198 }); 198 });
199 } 199 }
200 function sendBack(row){ 200 function sendBack(row){
201 uni.showModal({ 201 uni.showModal({
202 title: '提示', 202 title: '提示',
203 content: `确定撤回${row.content.certName}吗`, 203 content: `确定撤回${row.content.certName}吗`,
...@@ -217,8 +217,8 @@ ...@@ -217,8 +217,8 @@
217 } 217 }
218 } 218 }
219 }) 219 })
220 } 220 }
221 function resolution(row){ 221 function resolution(row){
222 uni.showModal({ 222 uni.showModal({
223 title: '提示', 223 title: '提示',
224 content: `确定拆分${row.content.certName}吗`, 224 content: `确定拆分${row.content.certName}吗`,
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
235 } 235 }
236 } 236 }
237 }) 237 })
238 } 238 }
239 </script> 239 </script>
240 240
241 <style scoped> 241 <style scoped>
......
group/feeBill.vue
...@@ -80,28 +80,28 @@ ...@@ -80,28 +80,28 @@
80 </template> 80 </template>
81 81
82 <script setup> 82 <script setup>
83 import * as api from '@/common/api.js' 83 import * as api from '@/common/api.js'
84 import config from '@/config.js' 84 import config from '@/config.js'
85 import { 85 import {
86 onMounted, 86 onMounted,
87 ref 87 ref
88 } from 'vue' 88 } from 'vue'
89 import { 89 import {
90 onLoad 90 onLoad
91 } from '@dcloudio/uni-app' 91 } from '@dcloudio/uni-app'
92 const app = getApp(); 92 const app = getApp();
93 const list = ref([]) 93 const list = ref([])
94 const queryParams = ref({}) 94 const queryParams = ref({})
95 const totalCost = ref(0) 95 const totalCost = ref(0)
96 const deptType = ref('') 96 const deptType = ref('')
97 const UpPop = ref(null) 97 const UpPop = ref(null)
98 const form = ref({ 98 const form = ref({
99 docId: '', 99 docId: '',
100 payTime: '', 100 payTime: '',
101 url: '', 101 url: '',
102 remark: '' 102 remark: ''
103 }) 103 })
104 onLoad(() => { 104 onLoad(() => {
105 if (app.globalData.isLogin) { 105 if (app.globalData.isLogin) {
106 init() 106 init()
107 } else { 107 } else {
...@@ -110,14 +110,14 @@ ...@@ -110,14 +110,14 @@
110 init() 110 init()
111 }; 111 };
112 } 112 }
113 }) 113 })
114 114
115 function init() { 115 function init() {
116 deptType.value = app.globalData.deptType 116 deptType.value = app.globalData.deptType
117 getList() 117 getList()
118 } 118 }
119 119
120 function getList() { 120 function getList() {
121 if (queryParams.value.settle == 1) { 121 if (queryParams.value.settle == 1) {
122 queryParams.value.settleFlag = undefined 122 queryParams.value.settleFlag = undefined
123 queryParams.value.payFlag = undefined 123 queryParams.value.payFlag = undefined
...@@ -131,19 +131,22 @@ ...@@ -131,19 +131,22 @@
131 totalCost.value = totalCost.value + (item.allPrice * 1) 131 totalCost.value = totalCost.value + (item.allPrice * 1)
132 }) 132 })
133 }) 133 })
134 } 134 }
135 135
136 function handleUpdate(item) { 136 function handleUpdate(item) {
137 form.value.docId = item.docId 137 form.value.docId = item.docId
138 if (item.payEvidence) { 138 if (item.payEvidence) {
139 form.value.url = item.payEvidence 139 form.value.url = item.payEvidence
140 } 140 }
141 UpPop.value.open() 141 UpPop.value.open()
142 } 142 }
143 let selectFileValue = {} 143 let selectFileValue = {}
144 144
145 function selectFile(e) { 145 function selectFile(e) {
146 let file = e.tempFiles[0] 146 let file = e.tempFiles[0]
147 if(!file){
148 return
149 }
147 api.uploadFile(e).then(data => { 150 api.uploadFile(e).then(data => {
148 selectFileValue = { 151 selectFileValue = {
149 url: data.msg, 152 url: data.msg,
...@@ -153,17 +156,17 @@ ...@@ -153,17 +156,17 @@
153 156
154 form.value.url = JSON.stringify([selectFileValue]) 157 form.value.url = JSON.stringify([selectFileValue])
155 }); 158 });
156 } 159 }
157 160
158 function fileProgress(e) { 161 function fileProgress(e) {
159 console.log('progress:' + e) 162 console.log('progress:' + e)
160 } 163 }
161 164
162 function delSupplementFile(index) { 165 function delSupplementFile(index) {
163 selectFileValue = {} 166 selectFileValue = {}
164 } 167 }
165 168
166 function uploadSure() { 169 function uploadSure() {
167 console.log(form.value) 170 console.log(form.value)
168 if(!form.value.payTime){ 171 if(!form.value.payTime){
169 uni.showToast({ 172 uni.showToast({
...@@ -188,16 +191,16 @@ ...@@ -188,16 +191,16 @@
188 }) 191 })
189 getList() 192 getList()
190 }) 193 })
191 } 194 }
192 195
193 function goDetail(item) { 196 function goDetail(item) {
194 //详情 197 //详情
195 console.log(item.docId) 198 console.log(item.docId)
196 let path = `/group/feeBillDetail?docId=${item.docId}` 199 let path = `/group/feeBillDetail?docId=${item.docId}`
197 uni.navigateTo({ 200 uni.navigateTo({
198 url: path 201 url: path
199 }); 202 });
200 } 203 }
201 </script> 204 </script>
202 205
203 <style scoped lang="scss"> 206 <style scoped lang="scss">
......
group/newChange.vue
...@@ -123,34 +123,34 @@ ...@@ -123,34 +123,34 @@
123 </template> 123 </template>
124 124
125 <script setup> 125 <script setup>
126 import { 126 import {
127 ref 127 ref
128 } from 'vue' 128 } from 'vue'
129 import { 129 import {
130 onLoad, 130 onLoad,
131 onShow 131 onShow
132 } from '@dcloudio/uni-app' 132 } from '@dcloudio/uni-app'
133 import * as api from '@/common/api.js' 133 import * as api from '@/common/api.js'
134 import config from '/config.js' 134 import config from '/config.js'
135 const queryParams = ref({}) 135 const queryParams = ref({})
136 const query = ref({}) 136 const query = ref({})
137 const total = ref(0) 137 const total = ref(0)
138 const list = ref([]) 138 const list = ref([])
139 const popup = ref(null) 139 const popup = ref(null)
140 const choseStudent = ref(null) 140 const choseStudent = ref(null)
141 const studentList = ref([]) 141 const studentList = ref([])
142 const type = ref('') 142 const type = ref('')
143 const form = ref({}) 143 const form = ref({})
144 144
145 onLoad((option) => { 145 onLoad((option) => {
146 if (option.rangeId) { 146 if (option.rangeId) {
147 queryParams.value.rangeId = option.rangeId 147 queryParams.value.rangeId = option.rangeId
148 getList() 148 getList()
149 } 149 }
150 }) 150 })
151 onShow(() => {}) 151 onShow(() => {})
152 152
153 function getList() { 153 function getList() {
154 uni.showLoading({ 154 uni.showLoading({
155 title: '加载中' 155 title: '加载中'
156 }) 156 })
...@@ -162,16 +162,16 @@ ...@@ -162,16 +162,16 @@
162 total.value = res.total 162 total.value = res.total
163 uni.hideLoading() 163 uni.hideLoading()
164 }) 164 })
165 } 165 }
166 166
167 function handleChange(a, b) { 167 function handleChange(a, b) {
168 type.value = b 168 type.value = b
169 form.value = a 169 form.value = a
170 console.log(form.value.newName) 170 console.log(form.value.newName)
171 popup.value.open() 171 popup.value.open()
172 } 172 }
173 173
174 function handleDelete(row) { 174 function handleDelete(row) {
175 uni.showModal({ 175 uni.showModal({
176 content: `确认删除${row.newName}`, 176 content: `确认删除${row.newName}`,
177 success: function(res) { 177 success: function(res) {
...@@ -185,9 +185,9 @@ ...@@ -185,9 +185,9 @@
185 } 185 }
186 } 186 }
187 }) 187 })
188 } 188 }
189 189
190 function chooseOnline() { 190 function chooseOnline() {
191 uni.showLoading({ 191 uni.showLoading({
192 title: '加载中', 192 title: '加载中',
193 icon: 'none' 193 icon: 'none'
...@@ -199,8 +199,8 @@ ...@@ -199,8 +199,8 @@
199 choseStudent.value.open() 199 choseStudent.value.open()
200 }) 200 })
201 201
202 } 202 }
203 function getSonList(){ 203 function getSonList(){
204 uni.showLoading({ 204 uni.showLoading({
205 title: '加载中', 205 title: '加载中',
206 icon: 'none' 206 icon: 'none'
...@@ -210,17 +210,17 @@ ...@@ -210,17 +210,17 @@
210 studentList.value = res.data.rows 210 studentList.value = res.data.rows
211 uni.hideLoading() 211 uni.hideLoading()
212 }) 212 })
213 } 213 }
214 214
215 function checkThis(n) { 215 function checkThis(n) {
216 if (n.checked) { 216 if (n.checked) {
217 n.checked = false 217 n.checked = false
218 } else { 218 } else {
219 n.checked = true 219 n.checked = true
220 } 220 }
221 } 221 }
222 222
223 function handleImport() { 223 function handleImport() {
224 var arr = [] 224 var arr = []
225 for (var n of studentList.value) { 225 for (var n of studentList.value) {
226 if (n.checked) { 226 if (n.checked) {
...@@ -235,9 +235,9 @@ ...@@ -235,9 +235,9 @@
235 choseStudent.value.close() 235 choseStudent.value.close()
236 getList() 236 getList()
237 }) 237 })
238 } 238 }
239 239
240 function submitForm(type) { 240 function submitForm(type) {
241 api.groupChangeEditMod({ 241 api.groupChangeEditMod({
242 id: form.value.id, 242 id: form.value.id,
243 newName: form.value.newName 243 newName: form.value.newName
...@@ -248,9 +248,9 @@ ...@@ -248,9 +248,9 @@
248 }) 248 })
249 getList() 249 getList()
250 }) 250 })
251 } 251 }
252 252
253 function commitFN() { 253 function commitFN() {
254 const flag = list.value.some(item => { 254 const flag = list.value.some(item => {
255 if (!item.fileUrl) { 255 if (!item.fileUrl) {
256 uni.showToast({ 256 uni.showToast({
...@@ -278,13 +278,15 @@ ...@@ -278,13 +278,15 @@
278 } 278 }
279 } 279 }
280 }) 280 })
281 } 281 }
282 let selectFileValue = {} 282 let selectFileValue = {}
283 283
284 function selectFile(row, e) { 284 function selectFile(row, e) {
285 console.log(row, e)
286 form.value = row 285 form.value = row
287 let file = e.tempFiles[0] 286 let file = e.tempFiles[0]
287 if(!file){
288 return
289 }
288 api.uploadFile(e).then(data => { 290 api.uploadFile(e).then(data => {
289 selectFileValue = { 291 selectFileValue = {
290 url: data.msg, 292 url: data.msg,
...@@ -304,12 +306,12 @@ ...@@ -304,12 +306,12 @@
304 getList() 306 getList()
305 }) 307 })
306 }); 308 });
307 } 309 }
308 310
309 function delSupplementFile(row) { 311 function delSupplementFile(row) {
310 selectFileValue = {} 312 selectFileValue = {}
311 row.fileUrl = [] 313 row.fileUrl = []
312 } 314 }
313 </script> 315 </script>
314 <style scoped lang="scss"> 316 <style scoped lang="scss">
315 .searchbar { 317 .searchbar {
......
level/addApply.vue
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
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
78 <uni-data-select v-model="n.levelNew" :localdata="levelArr" 79 <uni-data-select v-model="n.levelNew" :localdata="levelArr"
79 @change="changeLevel"></uni-data-select> 80 @change="changeLevel"></uni-data-select>
80 </view> 81 </view>
...@@ -84,7 +85,8 @@ ...@@ -84,7 +85,8 @@
84 <view style="width: 30%;"> 85 <view style="width: 30%;">
85 是否通过 86 是否通过
86 <view> 87 <view>
87 <uni-data-select :clear="false" v-model="n.isPass" :localdata="range"></uni-data-select> 88 <uni-data-select :clear="false" v-model="n.isPass"
89 :localdata="range"></uni-data-select>
88 </view> 90 </view>
89 </view> 91 </view>
90 </view> 92 </view>
...@@ -196,7 +198,7 @@ ...@@ -196,7 +198,7 @@
196 const tablePersonInfo = ref({}) 198 const tablePersonInfo = ref({})
197 const transcript = ref([]) 199 const transcript = ref([])
198 const studentQuery = ref({ 200 const studentQuery = ref({
199 name:'' 201 name: ''
200 }) 202 })
201 const levelArr = ref([{ 203 const levelArr = ref([{
202 value: '10', 204 value: '10',
...@@ -415,7 +417,7 @@ ...@@ -415,7 +417,7 @@
415 memId: memberInfo.memId, 417 memId: memberInfo.memId,
416 examId: form.value.examId, 418 examId: form.value.examId,
417 examType: form.value.type, 419 examType: form.value.type,
418 name:studentQuery.value.name 420 name: studentQuery.value.name
419 } 421 }
420 api.chooseStudentsList(obj).then(response => { 422 api.chooseStudentsList(obj).then(response => {
421 studentList.value = response.rows 423 studentList.value = response.rows
...@@ -528,9 +530,11 @@ ...@@ -528,9 +530,11 @@
528 530
529 function changeLevelfather(row) { 531 function changeLevelfather(row) {
530 nowRow = row 532 nowRow = row
531 api.jiDropDownBox({perId: row.perId}).then(res=>{ 533 api.jiDropDownBox({
534 perId: row.perId
535 }).then(res => {
532 console.log(res.data) 536 console.log(res.data)
533 for(var l of res.data){ 537 for (var l of res.data) {
534 l.text = l.name 538 l.text = l.name
535 l.disabled = l.status 539 l.disabled = l.status
536 } 540 }
...@@ -539,6 +543,7 @@ ...@@ -539,6 +543,7 @@
539 }) 543 })
540 } 544 }
541 545
546
542 function changeLevel(e) { 547 function changeLevel(e) {
543 console.log(e) 548 console.log(e)
544 if (e !== nowRow.levelRecommend) { 549 if (e !== nowRow.levelRecommend) {
...@@ -618,7 +623,10 @@ ...@@ -618,7 +623,10 @@
618 let selectFileValue = {} 623 let selectFileValue = {}
619 624
620 function selectFile(e) { 625 function selectFile(e) {
621 console.log(e) 626 let file = e.tempFiles[0]
627 if (!file) {
628 return
629 }
622 for (const n in e.tempFiles) { 630 for (const n in e.tempFiles) {
623 api.uploadFileList(e.tempFilePaths[n]).then(data => { 631 api.uploadFileList(e.tempFilePaths[n]).then(data => {
624 console.log(data) 632 console.log(data)
......
level/payment.vue
...@@ -66,26 +66,26 @@ ...@@ -66,26 +66,26 @@
66 </template> 66 </template>
67 67
68 <script setup> 68 <script setup>
69 import * as api from '@/common/api.js' 69 import * as api from '@/common/api.js'
70 import config from '@/config.js' 70 import config from '@/config.js'
71 import { 71 import {
72 onMounted, 72 onMounted,
73 ref 73 ref
74 } from 'vue' 74 } from 'vue'
75 import { 75 import {
76 onLoad 76 onLoad
77 } from '@dcloudio/uni-app' 77 } from '@dcloudio/uni-app'
78 const app = getApp(); 78 const app = getApp();
79 const list = ref([]) 79 const list = ref([])
80 const deptType = ref('') 80 const deptType = ref('')
81 const UpPop = ref(null) 81 const UpPop = ref(null)
82 const form = ref({ 82 const form = ref({
83 docId:'', 83 docId:'',
84 payTime:'', 84 payTime:'',
85 url:'', 85 url:'',
86 remark:'' 86 remark:''
87 }) 87 })
88 onLoad((option) => { 88 onLoad((option) => {
89 if (app.globalData.isLogin) { 89 if (app.globalData.isLogin) {
90 init() 90 init()
91 } else { 91 } else {
...@@ -94,26 +94,29 @@ ...@@ -94,26 +94,29 @@
94 init() 94 init()
95 }; 95 };
96 } 96 }
97 }) 97 })
98 98
99 function init() { 99 function init() {
100 deptType.value = app.globalData.deptType 100 deptType.value = app.globalData.deptType
101 getList() 101 getList()
102 } 102 }
103 103
104 function getList() { 104 function getList() {
105 api.getFeeBillList().then(res => { 105 api.getFeeBillList().then(res => {
106 list.value = res.rows 106 list.value = res.rows
107 }) 107 })
108 } 108 }
109 109
110 function handleUpdate(item) { 110 function handleUpdate(item) {
111 form.value.docId = item.docId 111 form.value.docId = item.docId
112 UpPop.value.open() 112 UpPop.value.open()
113 } 113 }
114 let selectFileValue = {} 114 let selectFileValue = {}
115 function selectFile(e) { 115 function selectFile(e) {
116 let file = e.tempFiles[0] 116 let file = e.tempFiles[0]
117 if(!file){
118 return
119 }
117 api.uploadFile(e).then(data => { 120 api.uploadFile(e).then(data => {
118 selectFileValue = { 121 selectFileValue = {
119 url: data.msg, 122 url: data.msg,
...@@ -123,14 +126,14 @@ ...@@ -123,14 +126,14 @@
123 126
124 form.value.url=JSON.stringify([selectFileValue]) 127 form.value.url=JSON.stringify([selectFileValue])
125 }); 128 });
126 } 129 }
127 function fileProgress(e) { 130 function fileProgress(e) {
128 console.log('progress:'+ e) 131 console.log('progress:'+ e)
129 } 132 }
130 function delSupplementFile(index) { 133 function delSupplementFile(index) {
131 selectFileValue = {} 134 selectFileValue = {}
132 } 135 }
133 function uploadSure(){ 136 function uploadSure(){
134 console.log(form.value) 137 console.log(form.value)
135 api.commitPaymentVoucher(form.value).then(res=>{ 138 api.commitPaymentVoucher(form.value).then(res=>{
136 UpPop.value.close() 139 UpPop.value.close()
...@@ -141,15 +144,15 @@ ...@@ -141,15 +144,15 @@
141 }) 144 })
142 getList() 145 getList()
143 }) 146 })
144 } 147 }
145 function goDetail(item) { 148 function goDetail(item) {
146 //详情 149 //详情
147 console.log(item.docId) 150 console.log(item.docId)
148 let path = `/personalVip/feeBillDetail?docId=${item.docId}` 151 let path = `/personalVip/feeBillDetail?docId=${item.docId}`
149 uni.navigateTo({ 152 uni.navigateTo({
150 url: path 153 url: path
151 }); 154 });
152 } 155 }
153 </script> 156 </script>
154 157
155 <style scoped lang="scss"> 158 <style scoped lang="scss">
......
login/login.vue
...@@ -72,65 +72,68 @@ ...@@ -72,65 +72,68 @@
72 </template> 72 </template>
73 73
74 <script setup> 74 <script setup>
75 import { 75 import {
76 onLoad 76 onLoad
77 } from '@dcloudio/uni-app'; 77 } from '@dcloudio/uni-app';
78 import { 78 import {
79 ref 79 ref
80 } from 'vue' 80 } from 'vue'
81 import config from '@/config.js' 81 import config from '@/config.js'
82 import { 82 import {
83 getCodeImg, 83 getCodeImg,
84 getSmsCode, 84 getSmsCode,
85 pcLogin, 85 pcLogin,
86 loginByPhone 86 loginByPhone
87 } from '@/common/login.js' 87 } from '@/common/login.js'
88 88
89 const isActive = ref(0) 89 const isActive = ref(0)
90 const agree = ref(false) 90 const agree = ref(false)
91 const isRember = ref(true) 91 const isRember = ref(true)
92 const codeUrl = ref(null) 92 const codeUrl = ref(null)
93 const inputstyle = ref({ 93 const inputstyle = ref({
94 borderColor: 'transparent', 94 borderColor: 'transparent',
95 fontSize: '30rpx' 95 fontSize: '30rpx'
96 }) 96 })
97 const form = ref({ 97 const form = ref({
98 username: null, 98 username: null,
99 password: null, 99 password: null,
100 code: null, 100 code: null,
101 uuid: null 101 uuid: null
102 }) 102 })
103 const form2 = ref({ 103 const form2 = ref({
104 telNo: null, 104 telNo: null,
105 captcha: null, 105 captcha: null,
106 code: null, 106 code: null,
107 uuid: null 107 uuid: null
108 }) 108 })
109 const countDown = ref({ 109 const countDown = ref({
110 start: false, 110 start: false,
111 second: 60 111 second: 60
112 }) 112 })
113 113
114 const app = getApp() 114 const app = getApp()
115 115
116 onLoad(() => { 116 onLoad(() => {
117 getCode() 117 getCode()
118
119 if(uni.showShareMenu){
118 uni.showShareMenu({ 120 uni.showShareMenu({
119 withShareTicket: true, 121 withShareTicket: true,
120 menus: ['shareAppMessage', 'shareTimeline'] 122 menus: ['shareAppMessage', 'shareTimeline']
121 }); 123 });
122 }) 124 }
125 })
123 126
124 function changeActive(n) { 127 function changeActive(n) {
125 isActive.value = n 128 isActive.value = n
126 } 129 }
127 130
128 131
129 function changeAgree(item) { 132 function changeAgree(item) {
130 item = !item 133 item = !item
131 } 134 }
132 135
133 function login() { 136 function login() {
134 if (isActive.value == 0) { 137 if (isActive.value == 0) {
135 if (!form.value.username) { 138 if (!form.value.username) {
136 uni.showToast({ 139 uni.showToast({
...@@ -156,7 +159,6 @@ ...@@ -156,7 +159,6 @@
156 159
157 pcLogin(form.value) 160 pcLogin(form.value)
158 .then((res) => { 161 .then((res) => {
159
160 app.globalData.isLogin = true 162 app.globalData.isLogin = true
161 uni.redirectTo({ 163 uni.redirectTo({
162 url: '/pages/index/index' 164 url: '/pages/index/index'
...@@ -187,25 +189,25 @@ ...@@ -187,25 +189,25 @@
187 }) 189 })
188 }) 190 })
189 } 191 }
190 } 192 }
191 193
192 function goRegister() { 194 function goRegister() {
193 const path = '/login/register' 195 const path = '/login/register'
194 uni.navigateTo({ 196 uni.navigateTo({
195 url: path 197 url: path
196 }) 198 })
197 } 199 }
198 200
199 function getCode() { 201 function getCode() {
200 getCodeImg().then((res) => { 202 getCodeImg().then((res) => {
201 codeUrl.value = 'data:image/gif;base64,' + res.data.img 203 codeUrl.value = 'data:image/gif;base64,' + res.data.img
202 form.value.uuid = res.data.uuid 204 form.value.uuid = res.data.uuid
203 form2.value.uuid = res.data.uuid 205 form2.value.uuid = res.data.uuid
204 }) 206 })
205 } 207 }
206 208
207 // 发送短信验证码 209 // 发送短信验证码
208 function getCaptchaSms() { 210 function getCaptchaSms() {
209 if (!form2.value.telNo) { 211 if (!form2.value.telNo) {
210 uni.showToast({ 212 uni.showToast({
211 title: '手机号不能为空', 213 title: '手机号不能为空',
...@@ -232,13 +234,13 @@ ...@@ -232,13 +234,13 @@
232 }) 234 })
233 countDown.value.start = true 235 countDown.value.start = true
234 }).catch(getCode) 236 }).catch(getCode)
235 } 237 }
236 238
237 function timeup() { 239 function timeup() {
238 countDown.value.start = false 240 countDown.value.start = false
239 countDown.value.second = 60 241 countDown.value.second = 60
240 getCode() 242 getCode()
241 } 243 }
242 </script> 244 </script>
243 245
244 <style scoped lang="scss"> 246 <style scoped lang="scss">
......
pages/exam/payment.vue
...@@ -75,32 +75,32 @@ ...@@ -75,32 +75,32 @@
75 </template> 75 </template>
76 76
77 <script setup> 77 <script setup>
78 import * as api from '@/common/api.js' 78 import * as api from '@/common/api.js'
79 import config from '@/config.js' 79 import config from '@/config.js'
80 import _ from 'lodash' 80 import _ from 'lodash'
81 import { 81 import {
82 onMounted, 82 onMounted,
83 ref 83 ref
84 } from 'vue' 84 } from 'vue'
85 import { 85 import {
86 onLoad 86 onLoad
87 } from '@dcloudio/uni-app' 87 } from '@dcloudio/uni-app'
88 const app = getApp(); 88 const app = getApp();
89 const list = ref([]) 89 const list = ref([])
90 const queryParams = ref({ 90 const queryParams = ref({
91 type: '1' 91 type: '1'
92 }) 92 })
93 const totalCost = ref(0) 93 const totalCost = ref(0)
94 const deptType = ref('') 94 const deptType = ref('')
95 const UpPop = ref(null) 95 const UpPop = ref(null)
96 const selectFileValue = ref({}) 96 const selectFileValue = ref({})
97 const form = ref({ 97 const form = ref({
98 docId: '', 98 docId: '',
99 payTime: '', 99 payTime: '',
100 payCert: '', 100 payCert: '',
101 remark: '' 101 remark: ''
102 }) 102 })
103 onLoad((option) => { 103 onLoad((option) => {
104 queryParams.value.type = option.type 104 queryParams.value.type = option.type
105 console.log(option.type) 105 console.log(option.type)
106 if (option.type == 2) { 106 if (option.type == 2) {
...@@ -121,14 +121,14 @@ ...@@ -121,14 +121,14 @@
121 init() 121 init()
122 }; 122 };
123 } 123 }
124 }) 124 })
125 125
126 function init() { 126 function init() {
127 deptType.value = app.globalData.deptType 127 deptType.value = app.globalData.deptType
128 getList() 128 getList()
129 } 129 }
130 130
131 function getList() { 131 function getList() {
132 uni.showLoading({ 132 uni.showLoading({
133 title: '加载中' 133 title: '加载中'
134 }) 134 })
...@@ -140,9 +140,9 @@ ...@@ -140,9 +140,9 @@
140 totalCost.value += (info.totalAmount * 1) 140 totalCost.value += (info.totalAmount * 1)
141 }) 141 })
142 }) 142 })
143 } 143 }
144 144
145 function handleUpdate(item) { 145 function handleUpdate(item) {
146 form.value.payId = item.payId 146 form.value.payId = item.payId
147 if (item.payCert) { 147 if (item.payCert) {
148 form.value.payCert = item.payCert 148 form.value.payCert = item.payCert
...@@ -155,10 +155,13 @@ ...@@ -155,10 +155,13 @@
155 form.value.remarks = item.remarks 155 form.value.remarks = item.remarks
156 } 156 }
157 UpPop.value.open() 157 UpPop.value.open()
158 } 158 }
159 159
160 function selectFile(e) { 160 function selectFile(e) {
161 let file = e.tempFiles[0] 161 let file = e.tempFiles[0]
162 if(!file){
163 return
164 }
162 api.uploadFile(e).then(data => { 165 api.uploadFile(e).then(data => {
163 selectFileValue.value = { 166 selectFileValue.value = {
164 url: data.msg, 167 url: data.msg,
...@@ -168,17 +171,17 @@ ...@@ -168,17 +171,17 @@
168 171
169 form.value.payCert = JSON.stringify([selectFileValue.value]) 172 form.value.payCert = JSON.stringify([selectFileValue.value])
170 }); 173 });
171 } 174 }
172 175
173 function fileProgress(e) { 176 function fileProgress(e) {
174 console.log('progress:' + e) 177 console.log('progress:' + e)
175 } 178 }
176 179
177 function delSupplementFile(index) { 180 function delSupplementFile(index) {
178 selectFileValue.value = {} 181 selectFileValue.value = {}
179 } 182 }
180 183
181 function uploadSure() { 184 function uploadSure() {
182 console.log(form.value) 185 console.log(form.value)
183 if (!form.value.payTime) { 186 if (!form.value.payTime) {
184 uni.showToast({ 187 uni.showToast({
...@@ -203,16 +206,16 @@ ...@@ -203,16 +206,16 @@
203 title: '操作成功' 206 title: '操作成功'
204 }) 207 })
205 }) 208 })
206 } 209 }
207 210
208 function goDetail(item) { 211 function goDetail(item) {
209 //详情 212 //详情
210 const form = encodeURIComponent(JSON.stringify(item)) 213 const form = encodeURIComponent(JSON.stringify(item))
211 let path = `/pages/exam/paymentDetail?form=${form}&type=${queryParams.value.type}` 214 let path = `/pages/exam/paymentDetail?form=${form}&type=${queryParams.value.type}`
212 uni.navigateTo({ 215 uni.navigateTo({
213 url: path 216 url: path
214 }); 217 });
215 } 218 }
216 </script> 219 </script>
217 220
218 <style scoped lang="scss"> 221 <style scoped lang="scss">
......
pages/index/index.vue
...@@ -253,34 +253,34 @@ ...@@ -253,34 +253,34 @@
253 </template> 253 </template>
254 254
255 <script setup> 255 <script setup>
256 import * as api from '@/common/api.js'; 256 import * as api from '@/common/api.js';
257 import * as loginServer from '@/common/login.js'; 257 import * as loginServer from '@/common/login.js';
258 import config from '@/config.js' 258 import config from '@/config.js'
259 import { 259 import {
260 onLoad, 260 onLoad,
261 onShow, 261 onShow,
262 onReady, 262 onReady,
263 onPullDownRefresh 263 onPullDownRefresh
264 } from '@dcloudio/uni-app'; 264 } from '@dcloudio/uni-app';
265 import { 265 import {
266 ref, 266 ref,
267 getCurrentInstance 267 getCurrentInstance
268 } from 'vue'; 268 } from 'vue';
269 269
270 270
271 const { 271 const {
272 proxy 272 proxy
273 } = getCurrentInstance() 273 } = getCurrentInstance()
274 const app = getApp(); 274 const app = getApp();
275 const userType = ref('1') 275 const userType = ref('1')
276 const memberInfo = ref({}) 276 const memberInfo = ref({})
277 277
278 let proId; 278 let proId;
279 const svId = ref(null); 279 const svId = ref(null);
280 const numData = ref({}); 280 const numData = ref({});
281 281
282 const messageList = ref([]) 282 const messageList = ref([])
283 onShow(() => { 283 onShow(() => {
284 if (app.globalData.isLogin) { 284 if (app.globalData.isLogin) {
285 init() 285 init()
286 } else { 286 } else {
...@@ -288,20 +288,22 @@ ...@@ -288,20 +288,22 @@
288 init() 288 init()
289 }; 289 };
290 } 290 }
291 }) 291 })
292 onLoad(option => { 292 onLoad(option => {
293 if (option.scene) { 293 if (option.scene) {
294 proId = decodeURIComponent(option.scene); 294 proId = decodeURIComponent(option.scene);
295 } else { 295 } else {
296 proId = option.proId; 296 proId = option.proId;
297 } 297 }
298 if(uni.showShareMenu){
298 uni.showShareMenu({ 299 uni.showShareMenu({
299 withShareTicket: true, 300 withShareTicket: true,
300 menus: ['shareAppMessage', 'shareTimeline'] 301 menus: ['shareAppMessage', 'shareTimeline']
301 }); 302 });
302 }); 303 }
304 });
303 305
304 function loginOut() { 306 function loginOut() {
305 uni.showModal({ 307 uni.showModal({
306 content: `确认退出吗？`, 308 content: `确认退出吗？`,
307 success: function(res) { 309 success: function(res) {
...@@ -315,9 +317,9 @@ ...@@ -315,9 +317,9 @@
315 } 317 }
316 } 318 }
317 }) 319 })
318 } 320 }
319 321
320 function goPath(path) { 322 function goPath(path) {
321 if (app.globalData.authenticationStatus == '5') { 323 if (app.globalData.authenticationStatus == '5') {
322 if (app.globalData.genFlag == 1) { 324 if (app.globalData.genFlag == 1) {
323 uni.showModal({ 325 uni.showModal({
...@@ -350,16 +352,16 @@ ...@@ -350,16 +352,16 @@
350 url: path 352 url: path
351 }); 353 });
352 354
353 } 355 }
354 356
355 function init() { 357 function init() {
356 uni.showLoading({ 358 uni.showLoading({
357 title: '加载中' 359 title: '加载中'
358 }); 360 });
359 loginServer.getMyOwnMemberInfo().then(res => { 361 loginServer.getMyOwnMemberInfo().then(res => {
360 userType.value = app.globalData.userType 362 userType.value = app.globalData.userType
361 memberInfo.value = app.globalData.memberInfo 363 memberInfo.value = app.globalData.memberInfo
362 console.log(userType.value, app.globalData.authenticationStatus) 364 // console.log(userType.value, app.globalData.authenticationStatus)
363 if (app.globalData.authenticationStatus == '5') { 365 if (app.globalData.authenticationStatus == '5') {
364 if (app.globalData.genFlag == 1) { 366 if (app.globalData.genFlag == 1) {
365 uni.showModal({ 367 uni.showModal({
...@@ -412,9 +414,9 @@ ...@@ -412,9 +414,9 @@
412 api.getRemindCount().then(res => { 414 api.getRemindCount().then(res => {
413 numData.value = res.data 415 numData.value = res.data
414 }) 416 })
415 } 417 }
416 418
417 function getMes() { 419 function getMes() {
418 uni.showLoading({ 420 uni.showLoading({
419 title: '加载中' 421 title: '加载中'
420 }); 422 });
...@@ -470,9 +472,9 @@ ...@@ -470,9 +472,9 @@
470 messageList.value = res.rows 472 messageList.value = res.rows
471 uni.hideLoading(); 473 uni.hideLoading();
472 }) 474 })
473 } 475 }
474 476
475 function readMessage(item) { 477 function readMessage(item) {
476 uni.navigateTo({ 478 uni.navigateTo({
477 url: item.path 479 url: item.path
478 }); 480 });
...@@ -481,7 +483,7 @@ ...@@ -481,7 +483,7 @@
481 }).then(res => { 483 }).then(res => {
482 item.readFlag = '1' 484 item.readFlag = '1'
483 }) 485 })
484 } 486 }
485 </script> 487 </script>
486 <style scope lang="scss"> 488 <style scope lang="scss">
487 .page { 489 .page {
......
personalVip/addChange.vue
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
54 <text class="text-danger">*需上传证件照等有效资料</text> 54 <text class="text-danger">*需上传证件照等有效资料</text>
55 </view> 55 </view>
56 </view> 56 </view>
57 <!-- <view> 57 <!-- <view>
58 <label>开始日期：</label> 58 <label>开始日期：</label>
59 {{ n.oldBeginTime?.slice(0,10) }} 59 {{ n.oldBeginTime?.slice(0,10) }}
60 <text class="text-primary" @click="handleChange(n,'newBeginTime')">变更 </text> 60 <text class="text-primary" @click="handleChange(n,'newBeginTime')">变更 </text>
...@@ -163,31 +163,31 @@ ...@@ -163,31 +163,31 @@
163 </template> 163 </template>
164 164
165 <script setup> 165 <script setup>
166 import { 166 import {
167 ref 167 ref
168 } from 'vue' 168 } from 'vue'
169 import { 169 import {
170 onLoad, 170 onLoad,
171 onShow 171 onShow
172 } from '@dcloudio/uni-app' 172 } from '@dcloudio/uni-app'
173 import * as api from '@/common/api.js' 173 import * as api from '@/common/api.js'
174 import config from '/config.js' 174 import config from '/config.js'
175 const queryParams = ref({}) 175 const queryParams = ref({})
176 const total = ref(0) 176 const total = ref(0)
177 const list = ref([]) 177 const list = ref([])
178 const popup = ref(null) 178 const popup = ref(null)
179 const choseStudent = ref(null) 179 const choseStudent = ref(null)
180 const studentList = ref([]) 180 const studentList = ref([])
181 const type = ref('') 181 const type = ref('')
182 const form = ref({}) 182 const form = ref({})
183 const sexs = ref([{ 183 const sexs = ref([{
184 text: '男', 184 text: '男',
185 value: '0' 185 value: '0'
186 }, { 186 }, {
187 text: '女', 187 text: '女',
188 value: '1' 188 value: '1'
189 }]) 189 }])
190 const cardType = ref([{ 190 const cardType = ref([{
191 text: '身份证', 191 text: '身份证',
192 value: '0' 192 value: '0'
193 }, 193 },
...@@ -211,8 +211,8 @@ ...@@ -211,8 +211,8 @@
211 text: '户口本', 211 text: '户口本',
212 value: '5' 212 value: '5'
213 } 213 }
214 ]) 214 ])
215 const cardType1 = ref([{ 215 const cardType1 = ref([{
216 text: '身份证', 216 text: '身份证',
217 value: '0' 217 value: '0'
218 }, 218 },
...@@ -228,16 +228,16 @@ ...@@ -228,16 +228,16 @@
228 text: '户口本', 228 text: '户口本',
229 value: '5' 229 value: '5'
230 } 230 }
231 ]) 231 ])
232 onLoad((option) => { 232 onLoad((option) => {
233 if (option.rangeId) { 233 if (option.rangeId) {
234 queryParams.value.rangeId = option.rangeId 234 queryParams.value.rangeId = option.rangeId
235 getList() 235 getList()
236 } 236 }
237 }) 237 })
238 onShow(() => {}) 238 onShow(() => {})
239 239
240 function getList() { 240 function getList() {
241 uni.showLoading({ 241 uni.showLoading({
242 title: '加载中' 242 title: '加载中'
243 }) 243 })
...@@ -249,16 +249,16 @@ ...@@ -249,16 +249,16 @@
249 total.value = res.total 249 total.value = res.total
250 uni.hideLoading() 250 uni.hideLoading()
251 }) 251 })
252 } 252 }
253 253
254 function handleChange(a, b) { 254 function handleChange(a, b) {
255 type.value = b 255 type.value = b
256 form.value = a 256 form.value = a
257 console.log(form.value.newName) 257 console.log(form.value.newName)
258 popup.value.open() 258 popup.value.open()
259 } 259 }
260 260
261 function handleDelete(row) { 261 function handleDelete(row) {
262 uni.showModal({ 262 uni.showModal({
263 content: `确认删除会员${row.newName}`, 263 content: `确认删除会员${row.newName}`,
264 success: function(res) { 264 success: function(res) {
...@@ -272,9 +272,9 @@ ...@@ -272,9 +272,9 @@
272 } 272 }
273 } 273 }
274 }) 274 })
275 } 275 }
276 276
277 function chooseOnline() { 277 function chooseOnline() {
278 uni.showLoading({ 278 uni.showLoading({
279 title: '加载中', 279 title: '加载中',
280 icon: 'none' 280 icon: 'none'
...@@ -289,17 +289,17 @@ ...@@ -289,17 +289,17 @@
289 uni.hideLoading() 289 uni.hideLoading()
290 choseStudent.value.open() 290 choseStudent.value.open()
291 }) 291 })
292 } 292 }
293 293
294 function checkThis(n) { 294 function checkThis(n) {
295 if (n.checked) { 295 if (n.checked) {
296 n.checked = false 296 n.checked = false
297 } else { 297 } else {
298 n.checked = true 298 n.checked = true
299 } 299 }
300 } 300 }
301 301
302 function handleImport() { 302 function handleImport() {
303 var arr = [] 303 var arr = []
304 for (var n of studentList.value) { 304 for (var n of studentList.value) {
305 if (n.checked) { 305 if (n.checked) {
...@@ -314,9 +314,9 @@ ...@@ -314,9 +314,9 @@
314 choseStudent.value.close() 314 choseStudent.value.close()
315 getList() 315 getList()
316 }) 316 })
317 } 317 }
318 318
319 function submitForm(type) { 319 function submitForm(type) {
320 if (type == 'newIdcCode' && form.value.newIdcType == 0) { 320 if (type == 'newIdcCode' && form.value.newIdcType == 0) {
321 // 验证身份证 321 // 验证身份证
322 const pattern = 322 const pattern =
...@@ -346,9 +346,9 @@ ...@@ -346,9 +346,9 @@
346 }) 346 })
347 getList() 347 getList()
348 }) 348 })
349 } 349 }
350 350
351 function commitFN() { 351 function commitFN() {
352 const flag = list.value.some(item => { 352 const flag = list.value.some(item => {
353 if (!item.fileUrl) { 353 if (!item.fileUrl) {
354 uni.showToast({ 354 uni.showToast({
...@@ -376,13 +376,15 @@ ...@@ -376,13 +376,15 @@
376 } 376 }
377 } 377 }
378 }) 378 })
379 } 379 }
380 let selectFileValue = {} 380 let selectFileValue = {}
381 381
382 function selectFile(row, e) { 382 function selectFile(row, e) {
383 console.log(row, e)
384 form.value = row 383 form.value = row
385 let file = e.tempFiles[0] 384 let file = e.tempFiles[0]
385 if(!file){
386 return
387 }
386 api.uploadFile(e).then(data => { 388 api.uploadFile(e).then(data => {
387 selectFileValue = { 389 selectFileValue = {
388 url: data.msg, 390 url: data.msg,
...@@ -408,12 +410,12 @@ ...@@ -408,12 +410,12 @@
408 getList() 410 getList()
409 }) 411 })
410 }); 412 });
411 } 413 }
412 414
413 function delSupplementFile(row) { 415 function delSupplementFile(row) {
414 selectFileValue = {} 416 selectFileValue = {}
415 row.fileUrl = [] 417 row.fileUrl = []
416 } 418 }
417 419
418 </script> 420 </script>
419 <style scoped lang="scss"> 421 <style scoped lang="scss">
......
personalVip/addChangeLevel.vue
...@@ -100,23 +100,23 @@ ...@@ -100,23 +100,23 @@
100 </template> 100 </template>
101 101
102 <script setup> 102 <script setup>
103 import { 103 import {
104 ref 104 ref
105 } from 'vue' 105 } from 'vue'
106 import { 106 import {
107 onLoad, 107 onLoad,
108 onShow 108 onShow
109 } from '@dcloudio/uni-app' 109 } from '@dcloudio/uni-app'
110 import { 110 import {
111 szToHz 111 szToHz
112 } from '@/common/utils.js' 112 } from '@/common/utils.js'
113 import * as api from '@/common/api.js' 113 import * as api from '@/common/api.js'
114 const inputstyle = ref({ 114 const inputstyle = ref({
115 borderColor: '#fff', 115 borderColor: '#fff',
116 fontSize: '30rpx' 116 fontSize: '30rpx'
117 }) 117 })
118 const placeholderStyle = ref('text-align: right;font-size:30rpx') 118 const placeholderStyle = ref('text-align: right;font-size:30rpx')
119 const levelArr = ref([{ 119 const levelArr = ref([{
120 text: '九级', 120 text: '九级',
121 value: '9' 121 value: '9'
122 }, 122 },
...@@ -152,8 +152,8 @@ ...@@ -152,8 +152,8 @@
152 text: '一级', 152 text: '一级',
153 value: '1' 153 value: '1'
154 } 154 }
155 ]) 155 ])
156 const reasonArr = ref([{ 156 const reasonArr = ref([{
157 text: '报错级位', 157 text: '报错级位',
158 value: '1' 158 value: '1'
159 }, 159 },
...@@ -165,9 +165,9 @@ ...@@ -165,9 +165,9 @@
165 text: '其它', 165 text: '其它',
166 value: '3' 166 value: '3'
167 } 167 }
168 ]) 168 ])
169 169
170 const idcTypeListno2 = ref([ 170 const idcTypeListno2 = ref([
171 { 171 {
172 value: '0', 172 value: '0',
173 text: "身份证" 173 text: "身份证"
...@@ -184,8 +184,8 @@ ...@@ -184,8 +184,8 @@
184 value: '5', 184 value: '5',
185 text: "户口本" 185 text: "户口本"
186 } 186 }
187 ]) 187 ])
188 const idcTypeList = ref([{ 188 const idcTypeList = ref([{
189 value: '0', 189 value: '0',
190 text: "身份证" 190 text: "身份证"
191 }, 191 },
...@@ -209,31 +209,31 @@ ...@@ -209,31 +209,31 @@
209 value: '5', 209 value: '5',
210 text: "户口本" 210 text: "户口本"
211 } 211 }
212 ]) 212 ])
213 const baseFormData = ref({ 213 const baseFormData = ref({
214 idcType: '0' 214 idcType: '0'
215 }) 215 })
216 const list = ref([]) 216 const list = ref([])
217 const levelList = ref([]) 217 const levelList = ref([])
218 const total = ref(0) 218 const total = ref(0)
219 const flag = ref(true) 219 const flag = ref(true)
220 const popup = ref(null) 220 const popup = ref(null)
221 const queryParams = ref({ 221 const queryParams = ref({
222 rangeId: '' 222 rangeId: ''
223 }) 223 })
224 onLoad((option) => { 224 onLoad((option) => {
225 if (option.rangeId) { 225 if (option.rangeId) {
226 baseFormData.value.rangeId = option.rangeId 226 baseFormData.value.rangeId = option.rangeId
227 queryParams.value.rangeId = option.rangeId 227 queryParams.value.rangeId = option.rangeId
228 } 228 }
229 }) 229 })
230 onShow(() => { 230 onShow(() => {
231 if (queryParams.value.rangeId != '') { 231 if (queryParams.value.rangeId != '') {
232 getList() 232 getList()
233 } 233 }
234 }) 234 })
235 // 查询会员 235 // 查询会员
236 function selectMember() { 236 function selectMember() {
237 if (!baseFormData.value.idcCode) { 237 if (!baseFormData.value.idcCode) {
238 uni.showToast({ 238 uni.showToast({
239 title: '请输入证件号', 239 title: '请输入证件号',
...@@ -255,9 +255,9 @@ ...@@ -255,9 +255,9 @@
255 levelList.value = res.data 255 levelList.value = res.data
256 popup.value.open() 256 popup.value.open()
257 }) 257 })
258 } 258 }
259 259
260 function submitForm() { 260 function submitForm() {
261 if (!baseFormData.value.name) { 261 if (!baseFormData.value.name) {
262 uni.showToast({ 262 uni.showToast({
263 title: '请输入姓名', 263 title: '请输入姓名',
...@@ -297,9 +297,9 @@ ...@@ -297,9 +297,9 @@
297 baseFormData.value.name = '' 297 baseFormData.value.name = ''
298 getList() 298 getList()
299 }) 299 })
300 } 300 }
301 301
302 function getList() { 302 function getList() {
303 uni.showLoading({ 303 uni.showLoading({
304 title: '加载中' 304 title: '加载中'
305 }) 305 })
...@@ -314,9 +314,9 @@ ...@@ -314,9 +314,9 @@
314 total.value = Response.total 314 total.value = Response.total
315 uni.hideLoading() 315 uni.hideLoading()
316 }) 316 })
317 } 317 }
318 318
319 function commitFN() { 319 function commitFN() {
320 const flag = list.value.some(item => { 320 const flag = list.value.some(item => {
321 if (!item.fileUrl && !item.reason) { 321 if (!item.fileUrl && !item.reason) {
322 uni.showToast({ 322 uni.showToast({
...@@ -334,9 +334,9 @@ ...@@ -334,9 +334,9 @@
334 }) 334 })
335 uni.navigateBack() 335 uni.navigateBack()
336 }) 336 })
337 } 337 }
338 338
339 function handleAdd(row) { 339 function handleAdd(row) {
340 api.addLevelList({ 340 api.addLevelList({
341 perId: row.perId, 341 perId: row.perId,
342 techId: row.techId, 342 techId: row.techId,
...@@ -346,12 +346,14 @@ ...@@ -346,12 +346,14 @@
346 getList() 346 getList()
347 popup.value.close() 347 popup.value.close()
348 }) 348 })
349 } 349 }
350 let selectFileValue = {} 350 let selectFileValue = {}
351 351
352 function selectFile(row, e) { 352 function selectFile(row, e) {
353 console.log(row, e)
354 let file = e.tempFiles[0] 353 let file = e.tempFiles[0]
354 if(!file){
355 return
356 }
355 api.uploadFile(e).then(data => { 357 api.uploadFile(e).then(data => {
356 selectFileValue = { 358 selectFileValue = {
357 url: data.msg, 359 url: data.msg,
...@@ -367,14 +369,14 @@ ...@@ -367,14 +369,14 @@
367 getList() 369 getList()
368 }) 370 })
369 }); 371 });
370 } 372 }
371 373
372 function delSupplementFile(row) { 374 function delSupplementFile(row) {
373 selectFileValue = {} 375 selectFileValue = {}
374 row.fileUrl = [] 376 row.fileUrl = []
375 } 377 }
376 378
377 function reasonFN(row, e) { 379 function reasonFN(row, e) {
378 console.log(row, e) 380 console.log(row, e)
379 api.addLevelModToRange({ 381 api.addLevelModToRange({
380 reason: e, 382 reason: e,
...@@ -382,18 +384,18 @@ ...@@ -382,18 +384,18 @@
382 }).then(res => { 384 }).then(res => {
383 getList() 385 getList()
384 }) 386 })
385 } 387 }
386 388
387 function editJIFN(row, e) { 389 function editJIFN(row, e) {
388 api.editNewJi({ 390 api.editNewJi({
389 modId: row.id, 391 modId: row.id,
390 NewJi: e 392 NewJi: e
391 }).then(res => { 393 }).then(res => {
392 getList() 394 getList()
393 }) 395 })
394 } 396 }
395 397
396 function handleDelete(row) { 398 function handleDelete(row) {
397 uni.showModal({ 399 uni.showModal({
398 title: '提示', 400 title: '提示',
399 content: `确定删除${row.perName}吗？`, 401 content: `确定删除${row.perName}吗？`,
...@@ -407,7 +409,7 @@ ...@@ -407,7 +409,7 @@
407 }) 409 })
408 } 410 }
409 }) 411 })
410 } 412 }
411 </script> 413 </script>
412 414
413 <style scoped lang="scss"> 415 <style scoped lang="scss">
......
personalVip/addVip.vue
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
12 </uni-forms-item> 12 </uni-forms-item>
13 <uni-forms-item label="证件类型" required name="idcType"> 13 <uni-forms-item label="证件类型" required name="idcType">
14 <uni-data-select v-model="baseFormData.idcType" style="width: 300rpx;" 14 <uni-data-select v-model="baseFormData.idcType" style="width: 300rpx;"
15 @change="changeIdcType" :clearable="false" 15 @change="changeIdcType" :clearable="false" :disabled="current === 0"
16 :disabled="current === 0" :localdata="idcTypeList"></uni-data-select> 16 :localdata="idcTypeList"></uni-data-select>
17 </uni-forms-item> 17 </uni-forms-item>
18 <uni-forms-item label="证件照" required v-show="current === 1"> 18 <uni-forms-item label="证件照" required v-show="current === 1">
19 <view class="upCard"> 19 <view class="upCard">
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 </uni-forms-item> 44 </uni-forms-item>
45 <uni-forms-item label="出生日期" required name="birth"> 45 <uni-forms-item label="出生日期" required name="birth">
46 {{baseFormData.birth?.slice(0,10)}} 46 {{baseFormData.birth?.slice(0,10)}}
47 <!-- <uni-datetime-picker type="date" placeholder="YYYY-MM-DD" :border='false' 47 <!-- <uni-datetime-picker type="date" placeholder="YYYY-MM-DD" :border='false'
48 :clear-icon="false" v-model="baseFormData.birth" /> --> 48 :clear-icon="false" v-model="baseFormData.birth" /> -->
49 </uni-forms-item> 49 </uni-forms-item>
50 <uni-forms-item label="联系方式" name="phone"> 50 <uni-forms-item label="联系方式" name="phone">
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
52 v-model="baseFormData.phone" placeholder="请输入联系方式" /> 52 v-model="baseFormData.phone" placeholder="请输入联系方式" />
53 </uni-forms-item> 53 </uni-forms-item>
54 54
55
55 <uni-forms-item label="所在地区"> 56 <uni-forms-item label="所在地区">
56 <uni-data-picker class="fixUniFormItemStyle" v-model="baseFormData.cityId" 57 <uni-data-picker class="fixUniFormItemStyle" v-model="baseFormData.cityId"
57 :localdata="regionsList" popup-title="请选择所在地区"></uni-data-picker> 58 :localdata="regionsList" popup-title="请选择所在地区"></uni-data-picker>
...@@ -198,7 +199,7 @@ ...@@ -198,7 +199,7 @@
198 current.value = 1 199 current.value = 1
199 baseFormData.value.sourceFlag = 1 200 baseFormData.value.sourceFlag = 1
200 baseFormData.value.idcType = option.idcType || 0 201 baseFormData.value.idcType = option.idcType || 0
201 if(baseFormData.value.idcType == '3'){ 202 if (baseFormData.value.idcType == '3') {
202 disabledName.value = false 203 disabledName.value = false
203 } else { 204 } else {
204 disabledName.value = true 205 disabledName.value = true
...@@ -218,7 +219,6 @@ ...@@ -218,7 +219,6 @@
218 if (current.value != e.currentIndex) { 219 if (current.value != e.currentIndex) {
219 current.value = e.currentIndex 220 current.value = e.currentIndex
220 } 221 }
221
222 cardObj.value = {} 222 cardObj.value = {}
223 photoArr.value = {} 223 photoArr.value = {}
224 if (current.value == 0) { 224 if (current.value == 0) {
...@@ -237,12 +237,17 @@ ...@@ -237,12 +237,17 @@
237 } 237 }
238 } 238 }
239 239
240
240 function changeAgree(item) { 241 function changeAgree(item) {
241 agree.value = !item 242 agree.value = !item
242 } 243 }
243 244
244 //身份证识别 245 //身份证识别
245 function upIdCardImgFront(e) { 246 function upIdCardImgFront(e) {
247 let file = e.tempFiles[0]
248 if (!file) {
249 return
250 }
246 uni.showLoading({ 251 uni.showLoading({
247 title: '加载中' 252 title: '加载中'
248 }); 253 });
...@@ -252,7 +257,7 @@ ...@@ -252,7 +257,7 @@
252 // formData.append('pic', e.tempFiles[0].file) 257 // formData.append('pic', e.tempFiles[0].file)
253 api.carUrl(e.tempFilePaths[0], baseFormData.value.idcType).then(res => { 258 api.carUrl(e.tempFilePaths[0], baseFormData.value.idcType).then(res => {
254 console.log(res) 259 console.log(res)
255 if(res.data){ 260 if (res.data) {
256 baseFormData.value.sex = res.data.sex 261 baseFormData.value.sex = res.data.sex
257 baseFormData.value.birth = res.data.birth 262 baseFormData.value.birth = res.data.birth
258 baseFormData.value.idcCode = res.data.code 263 baseFormData.value.idcCode = res.data.code
...@@ -283,6 +288,9 @@ ...@@ -283,6 +288,9 @@
283 function upPhoto(e) { 288 function upPhoto(e) {
284 const tempFilePaths = e.tempFilePaths; 289 const tempFilePaths = e.tempFilePaths;
285 const imgUrl = tempFilePaths[0] 290 const imgUrl = tempFilePaths[0]
291 if (!imgUrl) {
292 return
293 }
286 wx.cropImage({ 294 wx.cropImage({
287 src: imgUrl, 295 src: imgUrl,
288 cropScale: '4:5', 296 cropScale: '4:5',
...@@ -302,6 +310,7 @@ ...@@ -302,6 +310,7 @@
302 310
303 } 311 }
304 312
313
305 function delimgFont(n) { 314 function delimgFont(n) {
306 photoArr.value = {} 315 photoArr.value = {}
307 cardObj.value = {} 316 cardObj.value = {}
...@@ -313,11 +322,13 @@ ...@@ -313,11 +322,13 @@
313 }; 322 };
314 } 323 }
315 324
325
316 function delPhoto(n) { 326 function delPhoto(n) {
317 photoArr.value = {}; 327 photoArr.value = {};
318 baseFormData.value.photo = ''; 328 baseFormData.value.photo = '';
319 } 329 }
320 330
331
321 function getExtractInfo(obj) { 332 function getExtractInfo(obj) {
322 //如果老会员 333 //如果老会员
323 uni.showLoading({ 334 uni.showLoading({
...@@ -363,13 +374,13 @@ ...@@ -363,13 +374,13 @@
363 } else { 374 } else {
364 uni.hideLoading() 375 uni.hideLoading()
365 // 新会员 376 // 新会员
366 if(res.data.sex){ 377 if (res.data.sex) {
367 baseFormData.value.sex = res.data.sex 378 baseFormData.value.sex = res.data.sex
368 baseFormData.value.birth = res.data.birth 379 baseFormData.value.birth = res.data.birth
369 } 380 }
370 if(baseFormData.value.idcType != 3&&current.value==1){ 381 if (baseFormData.value.idcType != 3 && current.value == 1) {
371 disabledName.value = true 382 disabledName.value = true
372 }else{ 383 } else {
373 disabledName.value = false 384 disabledName.value = false
374 } 385 }
375 return 386 return
...@@ -377,6 +388,7 @@ ...@@ -377,6 +388,7 @@
377 }) 388 })
378 } 389 }
379 390
391
380 function giveBirthDay() { 392 function giveBirthDay() {
381 // 判断身份证正确性/赋值生日 393 // 判断身份证正确性/赋值生日
382 if (baseFormData.value.idcType == 0) { 394 if (baseFormData.value.idcType == 0) {
...@@ -432,15 +444,18 @@ ...@@ -432,15 +444,18 @@
432 } 444 }
433 } 445 }
434 446
447
435 function openpopup() { 448 function openpopup() {
436 popup.value.open() 449 popup.value.open()
437 } 450 }
438 451
452
439 function closepopup() { 453 function closepopup() {
440 agree.value = true 454 agree.value = true
441 popup.value.close() 455 popup.value.close()
442 } 456 }
443 457
458
444 function changeIdcType(e) { 459 function changeIdcType(e) {
445 console.log(e) 460 console.log(e)
446 // 切换证件照类型把当前页面数据清空 461 // 切换证件照类型把当前页面数据清空
...@@ -454,6 +469,7 @@ ...@@ -454,6 +469,7 @@
454 } 469 }
455 } 470 }
456 471
472
457 function goSubmit() { 473 function goSubmit() {
458 if (!agree.value) { 474 if (!agree.value) {
459 uni.showToast({ 475 uni.showToast({
...@@ -486,7 +502,7 @@ ...@@ -486,7 +502,7 @@
486 }) 502 })
487 return 503 return
488 } 504 }
489 if ( baseFormData.value.idcType == 3 ) { 505 if (baseFormData.value.idcType == 3) {
490 //转换为大写并判断位数12 506 //转换为大写并判断位数12
491 baseFormData.value.idcCode = baseFormData.value.idcCode.toUpperCase() 507 baseFormData.value.idcCode = baseFormData.value.idcCode.toUpperCase()
492 // var regex = /^[a-zA-Z]/ 508 // var regex = /^[a-zA-Z]/
...@@ -546,12 +562,13 @@ ...@@ -546,12 +562,13 @@
546 </script> 562 </script>
547 563
548 <style lang="scss" scoped> 564 <style lang="scss" scoped>
549 :deep(.uni-forms-item__content){ 565 :deep(.uni-forms-item__content) {
550 display: flex; 566 display: flex;
551 align-items: center; 567 align-items: center;
552 justify-content: flex-end; 568 justify-content: flex-end;
553 569
554 } 570 }
571
555 :deep(.segmented-control) { 572 :deep(.segmented-control) {
556 height: 100rpx; 573 height: 100rpx;
557 } 574 }
......
personalVip/audit.vue
...@@ -60,36 +60,36 @@ ...@@ -60,36 +60,36 @@
60 <image mode="aspectFit" src="/static/nodata.png"></image> 60 <image mode="aspectFit" src="/static/nodata.png"></image>
61 <text>暂无数据</text> 61 <text>暂无数据</text>
62 </view> 62 </view>
63 <!-- <view v-if="userType=='2'" class="block-btn-box"> 63 <!-- <view v-if="userType=='2'" class="block-btn-box">
64 <button @click="goMerge" class="btn-red-kx">前往合并 > </button> 64 <button @click="goMerge" class="btn-red-kx">前往合并 > </button>
65 </view> --> 65 </view> -->
66 </view> 66 </view>
67 </template> 67 </template>
68 68
69 <script setup> 69 <script setup>
70 import * as api from '@/common/api.js' 70 import * as api from '@/common/api.js'
71 import config from '@/config.js' 71 import config from '@/config.js'
72 import { 72 import {
73 onMounted, 73 onMounted,
74 ref 74 ref
75 } from 'vue' 75 } from 'vue'
76 import { 76 import {
77 onShow 77 onShow
78 } from '@dcloudio/uni-app' 78 } from '@dcloudio/uni-app'
79 const app = getApp(); 79 const app = getApp();
80 const queryParams = ref({ 80 const queryParams = ref({
81 // pageNum: 1, 81 // pageNum: 1,
82 // pageSize: 10 82 // pageSize: 10
83 auditStatus: '0' 83 auditStatus: '0'
84 }) 84 })
85 const navs = ref(['待审核', '审核通过', '审核拒绝', '撤回']) 85 const navs = ref(['待审核', '审核通过', '审核拒绝', '撤回'])
86 const current = ref(0) 86 const current = ref(0)
87 const list = ref([]) 87 const list = ref([])
88 const statistical = ref({}) 88 const statistical = ref({})
89 const total = ref(0) 89 const total = ref(0)
90 const deptType = ref('') 90 const deptType = ref('')
91 const userType = ref('') 91 const userType = ref('')
92 onShow(() => { 92 onShow(() => {
93 if (app.globalData.isLogin) { 93 if (app.globalData.isLogin) {
94 init() 94 init()
95 } else { 95 } else {
...@@ -97,21 +97,21 @@ ...@@ -97,21 +97,21 @@
97 init() 97 init()
98 }; 98 };
99 } 99 }
100 }) 100 })
101 101
102 function init() { 102 function init() {
103 userType.value = app.globalData.userType 103 userType.value = app.globalData.userType
104 deptType.value = app.globalData.deptType 104 deptType.value = app.globalData.deptType
105 getList() 105 getList()
106 } 106 }
107 107
108 function onClickItem(e) { 108 function onClickItem(e) {
109 console.log(e) 109 console.log(e)
110 queryParams.value.auditStatus = e.currentIndex 110 queryParams.value.auditStatus = e.currentIndex
111 getList() 111 getList()
112 } 112 }
113 113
114 function getList() { 114 function getList() {
115 uni.showLoading({ 115 uni.showLoading({
116 title: `加载中` 116 title: `加载中`
117 }) 117 })
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
137 total.value = res.total 137 total.value = res.total
138 uni.hideLoading() 138 uni.hideLoading()
139 }) 139 })
140 } 140 }
141 function handleDelete(row){ 141 function handleDelete(row){
142 uni.showModal({ 142 uni.showModal({
143 title: '提示', 143 title: '提示',
...@@ -154,7 +154,7 @@ function handleDelete(row){ ...@@ -154,7 +154,7 @@ function handleDelete(row){
154 } 154 }
155 }) 155 })
156 } 156 }
157 function audit(recordId, flag) { 157 function audit(recordId, flag) {
158 if (flag == '0') { 158 if (flag == '0') {
159 // 拒绝 159 // 拒绝
160 // 弹出框填写理由 160 // 弹出框填写理由
...@@ -186,9 +186,9 @@ function handleDelete(row){ ...@@ -186,9 +186,9 @@ function handleDelete(row){
186 } 186 }
187 }) 187 })
188 } 188 }
189 } 189 }
190 190
191 function doApproval(recordId, flag, reason) { 191 function doApproval(recordId, flag, reason) {
192 var obj = { 192 var obj = {
193 flag: flag, 193 flag: flag,
194 reason: reason || '', 194 reason: reason || '',
...@@ -203,11 +203,11 @@ function handleDelete(row){ ...@@ -203,11 +203,11 @@ function handleDelete(row){
203 }) 203 })
204 getList() 204 getList()
205 }) 205 })
206 } 206 }
207 207
208 function goDetail(item) { 208 function goDetail(item) {
209 const form = encodeURIComponent(JSON.stringify(item)) 209 const form = encodeURIComponent(JSON.stringify(item))
210 console.log(userType.value) 210 // console.log(userType.value)
211 211
212 let path = 212 let path =
213 `/personalVip/auditDetail?form=${form}` 213 `/personalVip/auditDetail?form=${form}`
...@@ -216,20 +216,20 @@ function handleDelete(row){ ...@@ -216,20 +216,20 @@ function handleDelete(row){
216 }); 216 });
217 217
218 218
219 } 219 }
220 220
221 function goMerge() { 221 function goMerge() {
222 let path = `/personalVip/sheng/merge` 222 let path = `/personalVip/sheng/merge`
223 uni.redirectTo({ 223 uni.redirectTo({
224 url: path 224 url: path
225 }); 225 });
226 } 226 }
227 function goMergeUp() { 227 function goMergeUp() {
228 let path = `/personalVip/sheng/mergeUp` 228 let path = `/personalVip/sheng/mergeUp`
229 uni.redirectTo({ 229 uni.redirectTo({
230 url: path 230 url: path
231 }); 231 });
232 } 232 }
233 </script> 233 </script>
234 234
235 <style> 235 <style>
......
personalVip/auditDetail.vue
...@@ -70,32 +70,32 @@ ...@@ -70,32 +70,32 @@
70 </template> 70 </template>
71 71
72 <script setup> 72 <script setup>
73 import * as api from '@/common/api.js' 73 import * as api from '@/common/api.js'
74 import config from '@/config.js' 74 import config from '@/config.js'
75 import { 75 import {
76 onMounted, 76 onMounted,
77 ref 77 ref
78 } from 'vue' 78 } from 'vue'
79 import { 79 import {
80 onLoad 80 onLoad
81 } from '@dcloudio/uni-app' 81 } from '@dcloudio/uni-app'
82 const app = getApp(); 82 const app = getApp();
83 const queryParams = ref({ 83 const queryParams = ref({
84 pageNum: 1, 84 pageNum: 1,
85 pageSize: 6 85 pageSize: 6
86 // mergeFlag: 0, 86 // mergeFlag: 0,
87 // auditStatus: '' 87 // auditStatus: ''
88 }) 88 })
89 const wfId = ref('') 89 const wfId = ref('')
90 const form = ref([]) 90 const form = ref([])
91 const list = ref([]) 91 const list = ref([])
92 const id = ref('') 92 const id = ref('')
93 const feelList = ref([]) 93 const feelList = ref([])
94 const total = ref(0) 94 const total = ref(0)
95 const totalYear = ref(0) 95 const totalYear = ref(0)
96 const userType = ref('') 96 const userType = ref('')
97 const statistical = ref({}) 97 const statistical = ref({})
98 onLoad((option) => { 98 onLoad((option) => {
99 console.log(option) 99 console.log(option)
100 if (app.globalData.isLogin) { 100 if (app.globalData.isLogin) {
101 init(option) 101 init(option)
...@@ -105,9 +105,9 @@ ...@@ -105,9 +105,9 @@
105 }; 105 };
106 } 106 }
107 107
108 }) 108 })
109 109
110 function init(option) { 110 function init(option) {
111 // wfId.value = option.wfId 111 // wfId.value = option.wfId
112 // queryParams.value.auditStatus = option.auditStatus 112 // queryParams.value.auditStatus = option.auditStatus
113 if ('form' in option) { 113 if ('form' in option) {
...@@ -117,13 +117,13 @@ ...@@ -117,13 +117,13 @@
117 console.log(form.value) 117 console.log(form.value)
118 userType.value = app.globalData.userType 118 userType.value = app.globalData.userType
119 getForm() 119 getForm()
120 } 120 }
121 121
122 function getForm() { 122 function getForm() {
123 uni.showLoading({ 123 uni.showLoading({
124 title: '加载中' 124 title: '加载中'
125 }) 125 })
126 console.log(userType.value) 126 // console.log(userType.value)
127 127
128 api.getDetailPersonList(queryParams.value).then(res => { 128 api.getDetailPersonList(queryParams.value).then(res => {
129 uni.hideLoading() 129 uni.hideLoading()
...@@ -132,17 +132,17 @@ ...@@ -132,17 +132,17 @@
132 getFillList(list.value[0]?.rangeId) 132 getFillList(list.value[0]?.rangeId)
133 }) 133 })
134 134
135 } 135 }
136 // 审核记录 136 // 审核记录
137 function getFillList(id) { 137 function getFillList(id) {
138 if (id) 138 if (id)
139 api.getHistoryByRelateId(id).then(res => { 139 api.getHistoryByRelateId(id).then(res => {
140 feelList.value = res.data 140 feelList.value = res.data
141 uni.hideLoading() 141 uni.hideLoading()
142 }) 142 })
143 } 143 }
144 144
145 function audit(recordId, flag) { 145 function audit(recordId, flag) {
146 if (flag == '0') { 146 if (flag == '0') {
147 // 拒绝 147 // 拒绝
148 // 弹出框填写理由 148 // 弹出框填写理由
...@@ -174,9 +174,9 @@ ...@@ -174,9 +174,9 @@
174 } 174 }
175 }) 175 })
176 } 176 }
177 } 177 }
178 178
179 function doApproval(recordId, flag, reason) { 179 function doApproval(recordId, flag, reason) {
180 var obj = { 180 var obj = {
181 flag: flag, 181 flag: flag,
182 reason: reason || '', 182 reason: reason || '',
...@@ -191,24 +191,24 @@ ...@@ -191,24 +191,24 @@
191 }) 191 })
192 uni.navigateBack() 192 uni.navigateBack()
193 }) 193 })
194 } 194 }
195 195
196 function changeList() { 196 function changeList() {
197 197
198 } 198 }
199 199
200 function goMoreList() { 200 function goMoreList() {
201 let path = `/personalVip/payPersonList?recordId=${queryParams.value.recordId}` 201 let path = `/personalVip/payPersonList?recordId=${queryParams.value.recordId}`
202 uni.navigateTo({ 202 uni.navigateTo({
203 url: path 203 url: path
204 }); 204 });
205 } 205 }
206 206
207 function handleInfo(n) { 207 function handleInfo(n) {
208 uni.navigateTo({ 208 uni.navigateTo({
209 url: `/personalVip/detail?perId=${n.perId}` 209 url: `/personalVip/detail?perId=${n.perId}`
210 }) 210 })
211 } 211 }
212 </script> 212 </script>
213 213
214 <style scoped lang="scss"> 214 <style scoped lang="scss">
......
personalVip/editVip.vue
...@@ -50,25 +50,25 @@ ...@@ -50,25 +50,25 @@
50 50
51 </view> 51 </view>
52 <view class="fixedBottom"><button class="btn-red" @click="goSubmit">确 定</button></view> 52 <view class="fixedBottom"><button class="btn-red" @click="goSubmit">确 定</button></view>
53 </view> 53 </view>
54 </template> 54 </template>
55 55
56 <script setup> 56 <script setup>
57 import { 57 import {
58 onMounted, 58 onMounted,
59 ref 59 ref
60 } from 'vue' 60 } from 'vue'
61 import { 61 import {
62 onLoad 62 onLoad
63 } from '@dcloudio/uni-app'; 63 } from '@dcloudio/uni-app';
64 import * as api from '@/common/api.js' 64 import * as api from '@/common/api.js'
65 const perId = ref() 65 const perId = ref()
66 const regionsList = ref([]) 66 const regionsList = ref([])
67 const baseFormData = ref({ 67 const baseFormData = ref({
68 sex: '0', 68 sex: '0',
69 idcType: '0' 69 idcType: '0'
70 }) 70 })
71 const idcTypeList = ref([{ 71 const idcTypeList = ref([{
72 value: '0', 72 value: '0',
73 text: "身份证" 73 text: "身份证"
74 }, 74 },
...@@ -80,20 +80,20 @@ ...@@ -80,20 +80,20 @@
80 value: '3', 80 value: '3',
81 text: "外国护照" 81 text: "外国护照"
82 } 82 }
83 ]) 83 ])
84 const sexs = ref([{ 84 const sexs = ref([{
85 text: '女', 85 text: '女',
86 value: '0' 86 value: '0'
87 }, { 87 }, {
88 text: '男', 88 text: '男',
89 value: '1' 89 value: '1'
90 }]) 90 }])
91 const placeholderStyle = ref('text-align: right;font-size:30rpx') 91 const placeholderStyle = ref('text-align: right;font-size:30rpx')
92 const inputstyle = ref({ 92 const inputstyle = ref({
93 borderColor: '#fff', 93 borderColor: '#fff',
94 fontSize: '30rpx' 94 fontSize: '30rpx'
95 }) 95 })
96 const imageStylesTx = ref({ 96 const imageStylesTx = ref({
97 width: '210rpx', 97 width: '210rpx',
98 height: '280rpx', 98 height: '280rpx',
99 background: { 99 background: {
...@@ -102,45 +102,50 @@ ...@@ -102,45 +102,50 @@
102 border: { 102 border: {
103 radius: '2px' 103 radius: '2px'
104 } 104 }
105 }); 105 });
106 onLoad((option)=>{ 106 onLoad((option)=>{
107 107
108 }) 108 })
109 onMounted(() => { 109 onMounted(() => {
110 getRegionsList() 110 getRegionsList()
111 }) 111 })
112 112
113 function getRegionsList() { 113 function getRegionsList() {
114 api.regionsList().then(res => { 114 api.regionsList().then(res => {
115 regionsList.value = res.data 115 regionsList.value = res.data
116 }) 116 })
117 }
118
119 function upPhoto(e) {
120 let file = e.tempFiles[0]
121 if(!file){
122 return
117 } 123 }
118 124
119 function upPhoto(e) {
120 // api.uploadImg(e).then(data => { 125 // api.uploadImg(e).then(data => {
121 // baseFormData.value.photo = data.data; 126 // baseFormData.value.photo = data.data;
122 // }); 127 // });
123 } 128 }
124 129
125 function delimgFont(n) { 130 function delimgFont(n) {
126 baseFormData.value.card = ''; 131 baseFormData.value.card = '';
127 } 132 }
128 133
129 function delPhoto(n) { 134 function delPhoto(n) {
130 baseFormData.value.photo = ''; 135 baseFormData.value.photo = '';
131 } 136 }
132 137
133 138
134 function goSubmit() { 139 function goSubmit() {
135 140
136 } 141 }
137 142
138 function getUserInfo() { 143 function getUserInfo() {
139 api.getInfo(perId.value).then(res=>{ 144 api.getInfo(perId.value).then(res=>{
140 forms.value = res.data 145 forms.value = res.data
141 if (forms.areaAssName)forms.ancestorNameList = forms.value.ancestorNameList.join(',').replaceAll(',', '/') 146 if (forms.areaAssName)forms.ancestorNameList = forms.value.ancestorNameList.join(',').replaceAll(',', '/')
142 }) 147 })
143 } 148 }
144 </script> 149 </script>
145 150
146 <style lang="scss" scoped> 151 <style lang="scss" scoped>
......
personalVip/feeBill.vue
...@@ -67,26 +67,26 @@ ...@@ -67,26 +67,26 @@
67 </template> 67 </template>
68 68
69 <script setup> 69 <script setup>
70 import * as api from '@/common/api.js' 70 import * as api from '@/common/api.js'
71 import config from '@/config.js' 71 import config from '@/config.js'
72 import { 72 import {
73 onMounted, 73 onMounted,
74 ref 74 ref
75 } from 'vue' 75 } from 'vue'
76 import { 76 import {
77 onShow 77 onShow
78 } from '@dcloudio/uni-app' 78 } from '@dcloudio/uni-app'
79 const app = getApp(); 79 const app = getApp();
80 const list = ref([]) 80 const list = ref([])
81 const deptType = ref('') 81 const deptType = ref('')
82 const UpPop = ref(null) 82 const UpPop = ref(null)
83 const form = ref({ 83 const form = ref({
84 docId:'', 84 docId:'',
85 payTime:'', 85 payTime:'',
86 url:'', 86 url:'',
87 remark:'' 87 remark:''
88 }) 88 })
89 onShow(() => { 89 onShow(() => {
90 if (app.globalData.isLogin) { 90 if (app.globalData.isLogin) {
91 init() 91 init()
92 } else { 92 } else {
...@@ -94,26 +94,29 @@ ...@@ -94,26 +94,29 @@
94 init() 94 init()
95 }; 95 };
96 } 96 }
97 }) 97 })
98 98
99 function init() { 99 function init() {
100 deptType.value = app.globalData.deptType 100 deptType.value = app.globalData.deptType
101 getList() 101 getList()
102 } 102 }
103 103
104 function getList() { 104 function getList() {
105 api.getFeeBillList().then(res => { 105 api.getFeeBillList().then(res => {
106 list.value = res.rows 106 list.value = res.rows
107 }) 107 })
108 } 108 }
109 109
110 function handleUpdate(item) { 110 function handleUpdate(item) {
111 form.value.docId = item.docId 111 form.value.docId = item.docId
112 UpPop.value.open() 112 UpPop.value.open()
113 } 113 }
114 let selectFileValue = {} 114 let selectFileValue = {}
115 function selectFile(e) { 115 function selectFile(e) {
116 let file = e.tempFiles[0] 116 let file = e.tempFiles[0]
117 if(!file){
118 return
119 }
117 api.uploadFile(e).then(data => { 120 api.uploadFile(e).then(data => {
118 selectFileValue = { 121 selectFileValue = {
119 url: data.msg, 122 url: data.msg,
...@@ -123,14 +126,14 @@ ...@@ -123,14 +126,14 @@
123 126
124 form.value.url=JSON.stringify([selectFileValue]) 127 form.value.url=JSON.stringify([selectFileValue])
125 }); 128 });
126 } 129 }
127 function fileProgress(e) { 130 function fileProgress(e) {
128 console.log('progress:'+ e) 131 console.log('progress:'+ e)
129 } 132 }
130 function delSupplementFile(index) { 133 function delSupplementFile(index) {
131 selectFileValue = {} 134 selectFileValue = {}
132 } 135 }
133 function uploadSure(){ 136 function uploadSure(){
134 console.log(form.value) 137 console.log(form.value)
135 api.commitPaymentVoucher(form.value).then(res=>{ 138 api.commitPaymentVoucher(form.value).then(res=>{
136 UpPop.value.close() 139 UpPop.value.close()
...@@ -141,15 +144,15 @@ ...@@ -141,15 +144,15 @@
141 }) 144 })
142 getList() 145 getList()
143 }) 146 })
144 } 147 }
145 function goDetail(item) { 148 function goDetail(item) {
146 //详情 149 //详情
147 console.log(item.docId) 150 console.log(item.docId)
148 let path = `/personalVip/feeBillDetail?docId=${item.docId}` 151 let path = `/personalVip/feeBillDetail?docId=${item.docId}`
149 uni.navigateTo({ 152 uni.navigateTo({
150 url: path 153 url: path
151 }); 154 });
152 } 155 }
153 </script> 156 </script>
154 157
155 <style scoped lang="scss"> 158 <style scoped lang="scss">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!