Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
f6e7f935 by lttnew
Options

文案更改

1 parent c554bd67
Expand all
Inline Side-by-side
Showing 16 changed files with 306 additions and 306 deletions
common/api.js
...@@ -394,7 +394,7 @@ export function getHistoryByRelateId(rId) { ...@@ -394,7 +394,7 @@ export function getHistoryByRelateId(rId) {
394 method: 'get', 394 method: 'get',
395 }) 395 })
396 } 396 }
397 // 查询团体会员信息列表 397 // 查询单位会员信息列表
398 export function getGroupVipList(query) { 398 export function getGroupVipList(query) {
399 return request({ 399 return request({
400 url: '/member/info/selectPageList', 400 url: '/member/info/selectPageList',
...@@ -402,7 +402,7 @@ export function getGroupVipList(query) { ...@@ -402,7 +402,7 @@ export function getGroupVipList(query) {
402 params: query 402 params: query
403 }) 403 })
404 } 404 }
405 // 查询团体会员 全部会员数，有效会员数 405 // 查询单位会员 全部会员数，有效会员数
406 export function getMemberCountInfo(query) { 406 export function getMemberCountInfo(query) {
407 return request({ 407 return request({
408 url: '/member/info/getMemberCountInfo', 408 url: '/member/info/getMemberCountInfo',
...@@ -456,7 +456,7 @@ export function getTransferList(data) { ...@@ -456,7 +456,7 @@ export function getTransferList(data) {
456 params: data 456 params: data
457 }) 457 })
458 } 458 }
459 // 查询团体会员信息列表 459 // 查询单位会员信息列表
460 export function getGroupList(params) { 460 export function getGroupList(params) {
461 return request({ 461 return request({
462 url: `/member/certified/verifyList`, 462 url: `/member/certified/verifyList`,
...@@ -1296,7 +1296,7 @@ export function checkPersonByPersonId(perId) { ...@@ -1296,7 +1296,7 @@ export function checkPersonByPersonId(perId) {
1296 method: 'get' 1296 method: 'get'
1297 }) 1297 })
1298 } 1298 }
1299 // 获取团体会员优惠政策 1299 // 获取单位会员优惠政策
1300 export function canUseDiscount(params) { 1300 export function canUseDiscount(params) {
1301 return request({ 1301 return request({
1302 url: `/system/certifiedNew/canUseDiscount`, 1302 url: `/system/certifiedNew/canUseDiscount`,
...@@ -1304,7 +1304,7 @@ export function canUseDiscount(params) { ...@@ -1304,7 +1304,7 @@ export function canUseDiscount(params) {
1304 params 1304 params
1305 }) 1305 })
1306 } 1306 }
1307 // 获取团体会员一年缴费价格 1307 // 获取单位会员一年缴费价格
1308 export function getMyMemberCertUnitFee(params) { 1308 export function getMyMemberCertUnitFee(params) {
1309 return request({ 1309 return request({
1310 url: `/system/certifiedNew/getMyMemberCertUnitFee`, 1310 url: `/system/certifiedNew/getMyMemberCertUnitFee`,
...@@ -1320,7 +1320,7 @@ export function checkBusinessLicense(data) { ...@@ -1320,7 +1320,7 @@ export function checkBusinessLicense(data) {
1320 }) 1320 })
1321 } 1321 }
1322 1322
1323 // 生成团体订单renewYear 1323 // 生成单位订单renewYear
1324 export function certifiedNew(renewYear) { 1324 export function certifiedNew(renewYear) {
1325 return request({ 1325 return request({
1326 url: `/system/certifiedNew/commit?renewYear=${renewYear}`, 1326 url: `/system/certifiedNew/commit?renewYear=${renewYear}`,
......
group/addGroupMemberPay.vue
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
9 <view style="width: 70%;"> 9 <view style="width: 70%;">
10 <view>{{n.memberName}} 10 <view>{{n.memberName}}
11 <view class="date"> 11 <view class="date">
12 团体类型： 12 单位类型：
13 <text v-if="n.deptType == 2">一级协会</text> 13 <text v-if="n.deptType == 2">一级协会</text>
14 <text v-if="n.deptType == 3">直属协会</text> 14 <text v-if="n.deptType == 3">直属协会</text>
15 <text v-if="n.deptType == 4">二级协会</text> 15 <text v-if="n.deptType == 4">二级协会</text>
16 <text v-if="n.deptType == 5">三级协会</text> 16 <text v-if="n.deptType == 5">三级协会</text>
17 <text v-if="n.deptType == 6">职业性团体会员</text> 17 <text v-if="n.deptType == 6">职业性单位会员</text>
18 18
19 </view> 19 </view>
20 <view class="date">原有效期：<text>{{n.validityTime?.slice(0,10)}}</text></view> 20 <view class="date">原有效期：<text>{{n.validityTime?.slice(0,10)}}</text></view>
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
49 </uni-swipe-action> 49 </uni-swipe-action>
50 50
51 <view class="nodata" v-if="list.length==0"> 51 <view class="nodata" v-if="list.length==0">
52 <image mode="aspectFit" src="/static/nodata.png"></image> 52 <image mode="aspectFit" src="/static/nodata.png"></image>
53 <text>请选择团队</text> 53 <text>请选择团队</text>
54 <!-- <button class="btn-red" @click="gochose">+ 在线选择</button> --> 54 <!-- <button class="btn-red" @click="gochose">+ 在线选择</button> -->
55 </view> 55 </view>
...@@ -127,13 +127,13 @@ ...@@ -127,13 +127,13 @@
127 127
128 function getList() { 128 function getList() {
129 api.getPayList(queryParams.value).then(res => { 129 api.getPayList(queryParams.value).then(res => {
130 list.value = [] 130 list.value = []
131 for(var item of res.rows){ 131 for(var item of res.rows){
132 if (item.rangeId == queryParams.value.rangeId) { 132 if (item.rangeId == queryParams.value.rangeId) {
133 list.value = item.certList 133 list.value = item.certList
134 formData.value = item 134 formData.value = item
135 return 135 return
136 } 136 }
137 } 137 }
138 }) 138 })
139 } 139 }
...@@ -155,14 +155,14 @@ ...@@ -155,14 +155,14 @@
155 function bindyear(n) { 155 function bindyear(n) {
156 nowYear.value = n.value 156 nowYear.value = n.value
157 pickView.value.close() 157 pickView.value.close()
158 nowItem.value.renewYear = n.value 158 nowItem.value.renewYear = n.value
159 159
160 api.editGroupYear({certId:nowItem.value.certId, renewYear:nowItem.value.renewYear}).then(res => { 160 api.editGroupYear({certId:nowItem.value.certId, renewYear:nowItem.value.renewYear}).then(res => {
161 for (var nn of list.value) { 161 for (var nn of list.value) {
162 if (nn.perId == nowItem.value.perId) { 162 if (nn.perId == nowItem.value.perId) {
163 nn.renewYear = nowItem.value.renewYear 163 nn.renewYear = nowItem.value.renewYear
164 } 164 }
165 } 165 }
166 getList() 166 getList()
167 }) 167 })
168 } 168 }
......
group/apply/mergeUpDetail.vue
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 <text v-if="n.deptType==3">直属协会</text> 36 <text v-if="n.deptType==3">直属协会</text>
37 <text v-if="n.deptType==4">二级协会</text> 37 <text v-if="n.deptType==4">二级协会</text>
38 <text v-if="n.deptType==5">三级协会</text> 38 <text v-if="n.deptType==5">三级协会</text>
39 <text v-if="n.deptType==6">职业性团体会员</text> 39 <text v-if="n.deptType==6">职业性单位会员</text>
40 </view> 40 </view>
41 <view class="flexbox" style="background-color: rgba(244, 249, 253, 1);padding:10rpx;"> 41 <view class="flexbox" style="background-color: rgba(244, 249, 253, 1);padding:10rpx;">
42 <view> 42 <view>
......
group/changeGroupAudit.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
6 </uni-easyinput> 6 </uni-easyinput>
7 </view> 7 </view>
8 <view class="vipData"> 8 <view class="vipData">
9 <view>变更团体数合计: <text>{{statistical.personCount}}</text>个</view> 9 <view>变更单位数合计: <text>{{statistical.personCount}}</text>个</view>
10 </view> 10 </view>
11 <view class="appList"> 11 <view class="appList">
12 <view class="appItem" v-for="(item,index) in list" :key="index"> 12 <view class="appItem" v-for="(item,index) in list" :key="index">
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </view> 25 </view>
26 <view class="flexbox" @click="goDetail(item)"> 26 <view class="flexbox" @click="goDetail(item)">
27 <view> 27 <view>
28 变更团体数 28 变更单位数
29 <view> 29 <view>
30 <text class="text-danger">{{item.count}}个</text> 30 <text class="text-danger">{{item.count}}个</text>
31 </view> 31 </view>
...@@ -53,15 +53,15 @@ ...@@ -53,15 +53,15 @@
53 </template> 53 </template>
54 54
55 <script setup> 55 <script setup>
56 import * as api from '@/common/api.js' 56 import * as api from '@/common/api.js'
57 import config from '@/config.js' 57 import config from '@/config.js'
58 import { 58 import {
59 ref 59 ref
60 } from 'vue' 60 } from 'vue'
61 import { 61 import {
62 onLoad, 62 onLoad,
63 onShow 63 onShow
64 } from '@dcloudio/uni-app' 64 } from '@dcloudio/uni-app'
65 const app = getApp(); 65 const app = getApp();
66 const queryParams = ref({ 66 const queryParams = ref({
67 code:'', 67 code:'',
...@@ -112,86 +112,86 @@ ...@@ -112,86 +112,86 @@
112 } 112 }
113 }) 113 })
114 } 114 }
115 function audit(id, flag) { 115 function audit(id, flag) {
116 if (flag == 0) { 116 if (flag == 0) {
117 // 拒绝 117 // 拒绝
118 // 弹出框填写理由 118 // 弹出框填写理由
119 uni.showModal({ 119 uni.showModal({
120 title: '请输入拒绝理由', 120 title: '请输入拒绝理由',
121 editable: true, 121 editable: true,
122 success: function(res) { 122 success: function(res) {
123 if (res.confirm) { 123 if (res.confirm) {
124 if (!res.content) { 124 if (!res.content) {
125 uni.showToast({ 125 uni.showToast({
126 title: '请输入拒绝理由', 126 title: '请输入拒绝理由',
127 icon: 'none' 127 icon: 'none'
128 }) 128 })
129 } else { 129 } else {
130 doApproval(id, flag, res.content) 130 doApproval(id, flag, res.content)
131 } 131 }
132 } 132 }
133 } 133 }
134 }) 134 })
135 } else if (flag == 1) { 135 } else if (flag == 1) {
136 // 二次确认 136 // 二次确认
137 uni.showModal({ 137 uni.showModal({
138 title: '提示', 138 title: '提示',
139 content: `确定审批通过吗`, 139 content: `确定审批通过吗`,
140 success: function(res) { 140 success: function(res) {
141 if (res.confirm) { 141 if (res.confirm) {
142 doApproval(id, flag) 142 doApproval(id, flag)
143 } 143 }
144 } 144 }
145 }) 145 })
146 } 146 }
147 } 147 }
148 148
149 function doApproval(id, flag, reason) { 149 function doApproval(id, flag, reason) {
150 var obj = { 150 var obj = {
151 flag: flag, 151 flag: flag,
152 reason: reason || '', 152 reason: reason || '',
153 ids: [id] 153 ids: [id]
154 } 154 }
155 console.log(obj) 155 console.log(obj)
156 uni.showLoading({ 156 uni.showLoading({
157 title: '加载中' 157 title: '加载中'
158 }) 158 })
159 api.groupChangeAudit(obj).then((res) => { 159 api.groupChangeAudit(obj).then((res) => {
160 uni.hideLoading() 160 uni.hideLoading()
161 uni.showToast({ 161 uni.showToast({
162 title: '操作成功', 162 title: '操作成功',
163 icon: 'none' 163 icon: 'none'
164 }) 164 })
165 getList() 165 getList()
166 }) 166 })
167 } 167 }
168 168
169 </script> 169 </script>
170 170
171 <style lang='scss' scoped> 171 <style lang='scss' scoped>
172 .searchbar { 172 .searchbar {
173 display: flex; 173 display: flex;
174 align-items: center; 174 align-items: center;
175 padding: 25rpx; 175 padding: 25rpx;
176 box-sizing: border-box; 176 box-sizing: border-box;
177 177
178 :deep(.uni-easyinput .uni-easyinput__content) { 178 :deep(.uni-easyinput .uni-easyinput__content) {
179 border-radius: 35rpx; 179 border-radius: 35rpx;
180 border: none; 180 border: none;
181 height: 70rpx; 181 height: 70rpx;
182 } 182 }
183 183
184 :deep(.uni-easyinput__content-input) { 184 :deep(.uni-easyinput__content-input) {
185 font-size: 26rpx; 185 font-size: 26rpx;
186 } 186 }
187 187
188 .invertedbtn-red { 188 .invertedbtn-red {
189 border-radius: 50px; 189 border-radius: 50px;
190 background-color: #fff; 190 background-color: #fff;
191 191
192 font-size: 30rpx; 192 font-size: 30rpx;
193 padding: 10rpx 20rpx; 193 padding: 10rpx 20rpx;
194 } 194 }
195 } 195 }
196 196
197 </style> 197 </style>
......
group/changeGroupChoseList.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 3
4 <view class="searchbar"> 4 <view class="searchbar">
5 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search" 5 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search"
6 v-model="query.name" placeholder="搜索团体会员名称" @blur="getSonList" @clear="getSonList"> 6 v-model="query.name" placeholder="搜索单位会员名称" @blur="getSonList" @clear="getSonList">
7 </uni-easyinput> 7 </uni-easyinput>
8 <view class="invertedbtn-red" @click="getSonList">搜索</view> 8 <view class="invertedbtn-red" @click="getSonList">搜索</view>
9 </view> 9 </view>
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
20 <text v-if="n.validityDate">{{n.validityDate?.slice(0,10)}}</text> 20 <text v-if="n.validityDate">{{n.validityDate?.slice(0,10)}}</text>
21 <text v-else>--</text> 21 <text v-else>--</text>
22 </view> 22 </view>
23 <view class="date w50">团体类型 23 <view class="date w50">单位类型
24 <text v-if="n.deptType == 2">一级协会</text> 24 <text v-if="n.deptType == 2">一级协会</text>
25 <text v-if="n.deptType == 3">直属协会</text> 25 <text v-if="n.deptType == 3">直属协会</text>
26 <text v-if="n.deptType == 4">二级协会</text> 26 <text v-if="n.deptType == 4">二级协会</text>
27 <text v-if="n.deptType == 5">三级协会</text> 27 <text v-if="n.deptType == 5">三级协会</text>
28 <text v-if="n.deptType == 6">职业性团体会员</text> 28 <text v-if="n.deptType == 6">职业性单位会员</text>
29 </view> 29 </view>
30 </view> 30 </view>
31 </view> 31 </view>
......
group/changeGroupDetail.vue
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
2 <view> 2 <view>
3 <uni-collapse> 3 <uni-collapse>
4 <uni-collapse-item :title="n.newName" v-for="n in list" :key="n.id" open> 4 <uni-collapse-item :title="n.newName" v-for="n in list" :key="n.id" open>
5 <view class="collapseBody"> 5 <view class="collapseBody">
6 <view> 6 <view>
7 <label>会员编号：</label> 7 <label>会员编号：</label>
8 <text>{{n.memCode}}</text> 8 <text>{{n.memCode}}</text>
9 </view> 9 </view>
10 <view> 10 <view>
11 <label>团体会员名称：</label> 11 <label>单位会员名称：</label>
12 <view> 12 <view>
13 {{n.oldName}} 13 {{n.oldName}}
14 <text class="text-primary" v-if="n.oldName!=n.newName">变更为 </text> 14 <text class="text-primary" v-if="n.oldName!=n.newName">变更为 </text>
15 <text class="text-danger" v-if="n.oldName!=n.newName">{{ n.newName }}</text> 15 <text class="text-danger" v-if="n.oldName!=n.newName">{{ n.newName }}</text>
16 16
17 </view> 17 </view>
18 </view> 18 </view>
19 19
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
153 color: #999; 153 color: #999;
154 display: inline-block; 154 display: inline-block;
155 text-align: right;flex:0 0 auto; 155 text-align: right;flex:0 0 auto;
156 } 156 }
157 view{flex:1 1 auto;} 157 view{flex:1 1 auto;}
158 } 158 }
159 } 159 }
......
group/list.vue
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
64 dType: 4, 64 dType: 4,
65 status: 2 65 status: 2
66 }) 66 })
67 const navs = ref(['道馆', '二级协会', '一级协会']) 67 const navs = ref(['道馆', '二级协会', '一级协会'])
68 // const navs = ref(['道馆', '三级协会', '二级协会', '一级协会']) 68 // const navs = ref(['道馆', '三级协会', '二级协会', '一级协会'])
69 const list = ref([]) 69 const list = ref([])
70 const paging = ref(null) 70 const paging = ref(null)
...@@ -78,12 +78,12 @@ ...@@ -78,12 +78,12 @@
78 onLoad(() => { 78 onLoad(() => {
79 userType.value = app.globalData.userType 79 userType.value = app.globalData.userType
80 deptType.value = app.globalData.deptType 80 deptType.value = app.globalData.deptType
81 // 部门类型 1:中跆协 2:省 3:直属 4:市 5:区 6: 团体 81 // 部门类型 1:中跆协 2:省 3:直属 4:市 5:区 6: 单位
82 if (deptType.value == 2 || deptType.value == 3) { 82 if (deptType.value == 2 || deptType.value == 3) {
83 // navs.value = ['道馆', '三级协会', '二级协会'] 83 // navs.value = ['道馆', '三级协会', '二级协会']
84 navs.value = ['道馆', '二级协会'] 84 navs.value = ['道馆', '二级协会']
85 } else if (deptType.value == 4) { 85 } else if (deptType.value == 4) {
86 // navs.value = ['道馆', '三级协会'] 86 // navs.value = ['道馆', '三级协会']
87 navs.value = ['道馆'] 87 navs.value = ['道馆']
88 } 88 }
89 getList() 89 getList()
......
group/newChange.vue
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
11 <uni-swipe-action-item class="personitem" v-for="n in list" :key="n.id"> 11 <uni-swipe-action-item class="personitem" v-for="n in list" :key="n.id">
12 <uni-collapse> 12 <uni-collapse>
13 <uni-collapse-item :title="n.oldName" open> 13 <uni-collapse-item :title="n.oldName" open>
14 <view class="collapseBody"> 14 <view class="collapseBody">
15 <view v-if="n.memCode"> 15 <view v-if="n.memCode">
16 <label>会员编号：</label> 16 <label>会员编号：</label>
17 {{n.memCode}} 17 {{n.memCode}}
18 </view> 18 </view>
19 <view> 19 <view>
20 <label>团体会员名称：</label> 20 <label>单位会员名称：</label>
21 {{n.oldName}} 21 {{n.oldName}}
22 <text class="text-primary" @click="handleChange(n,'newName')">变更 </text> 22 <text class="text-primary" @click="handleChange(n,'newName')">变更 </text>
23 <text class="text-danger" v-if="n.oldName!=n.newName">{{ n.newName }}</text> 23 <text class="text-danger" v-if="n.oldName!=n.newName">{{ n.newName }}</text>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 <view class="h3 text-center mb30">信息变更</view> 63 <view class="h3 text-center mb30">信息变更</view>
64 <uni-forms class="mt30" label-width="100"> 64 <uni-forms class="mt30" label-width="100">
65 <view style="min-height: 30vh"> 65 <view style="min-height: 30vh">
66 <uni-forms-item label="团体会员名称:" v-show="type=='newName'"> 66 <uni-forms-item label="单位会员名称:" v-show="type=='newName'">
67 <uni-easyinput v-model="form.newName" placeholder="请输入" /> 67 <uni-easyinput v-model="form.newName" placeholder="请输入" />
68 </uni-forms-item> 68 </uni-forms-item>
69 </view> 69 </view>
...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
77 </uni-popup> 77 </uni-popup>
78 78
79 <uni-popup ref="choseStudent" type="bottom" background-color="#fff" animation> 79 <uni-popup ref="choseStudent" type="bottom" background-color="#fff" animation>
80 <view class="popBody"> 80 <view class="popBody">
81 <view class="searchbar"> 81 <view class="searchbar">
82 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search" 82 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search"
83 v-model="query.name" placeholder="搜索团体会员名称" @blur="getSonList" @clear="getSonList"> 83 v-model="query.name" placeholder="搜索单位会员名称" @blur="getSonList" @clear="getSonList">
84 </uni-easyinput> 84 </uni-easyinput>
85 <view class="invertedbtn-red" @click="getSonList">搜索</view> 85 <view class="invertedbtn-red" @click="getSonList">搜索</view>
86 </view> 86 </view>
87 <view class="userlist" style="height:70vh;overflow: auto;"> 87 <view class="userlist" style="height:70vh;overflow: auto;">
88 <view class="item" v-for=" (n,index) in studentList" :key="index"> 88 <view class="item" v-for=" (n,index) in studentList" :key="index">
...@@ -92,21 +92,21 @@ ...@@ -92,21 +92,21 @@
92 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" /> 92 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
93 </view> 93 </view>
94 <view class="w100"> 94 <view class="w100">
95 <view class="name">{{n.name}} </view> 95 <view class="name">{{n.name}} </view>
96 <view class="flexbox" style="padding: 0"> 96 <view class="flexbox" style="padding: 0">
97 <view v-if="n.memCode">会员号 97 <view v-if="n.memCode">会员号
98 <text>{{n.memCode}}</text> 98 <text>{{n.memCode}}</text>
99 </view> 99 </view>
100 <view class="date" v-if="n.validityDate">到期时间 100 <view class="date" v-if="n.validityDate">到期时间
101 <text>{{n.validityDate?.slice(0,10)}}</text> 101 <text>{{n.validityDate?.slice(0,10)}}</text>
102 </view> 102 </view>
103 <view class="date">团体类型 103 <view class="date">单位类型
104 <text v-if="n.deptType == 2">一级协会</text> 104 <text v-if="n.deptType == 2">一级协会</text>
105 <text v-if="n.deptType == 3">直属协会</text> 105 <text v-if="n.deptType == 3">直属协会</text>
106 <text v-if="n.deptType == 4">二级协会</text> 106 <text v-if="n.deptType == 4">二级协会</text>
107 <text v-if="n.deptType == 5">三级协会</text> 107 <text v-if="n.deptType == 5">三级协会</text>
108 <text v-if="n.deptType == 6">职业性团体会员</text> 108 <text v-if="n.deptType == 6">职业性单位会员</text>
109 </view> 109 </view>
110 </view> 110 </view>
111 </view> 111 </view>
112 </view> 112 </view>
...@@ -132,7 +132,7 @@ import { ...@@ -132,7 +132,7 @@ import {
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([])
...@@ -148,12 +148,12 @@ onLoad((option) => { ...@@ -148,12 +148,12 @@ onLoad((option) => {
148 getList() 148 getList()
149 } 149 }
150 }) 150 })
151 onShow((option) => { 151 onShow((option) => {
152 console.log(option) 152 console.log(option)
153 if(option){ 153 if(option){
154 queryParams.value.rangeId = option 154 queryParams.value.rangeId = option
155 getList() 155 getList()
156 } 156 }
157 }) 157 })
158 158
159 function getList() { 159 function getList() {
...@@ -198,26 +198,26 @@ function chooseOnline() { ...@@ -198,26 +198,26 @@ function chooseOnline() {
198 // title: '加载中', 198 // title: '加载中',
199 // icon: 'none' 199 // icon: 'none'
200 // }) 200 // })
201 // query.value.paymentRangeId = queryParams.value.rangeId || '-1' 201 // query.value.paymentRangeId = queryParams.value.rangeId || '-1'
202 // api.getMySonList(query.value).then(res => { 202 // api.getMySonList(query.value).then(res => {
203 // studentList.value = res.data.rows 203 // studentList.value = res.data.rows
204 // uni.hideLoading() 204 // uni.hideLoading()
205 // choseStudent.value.open() 205 // choseStudent.value.open()
206 // }) 206 // })
207 uni.navigateTo({ 207 uni.navigateTo({
208 url:`/group/changeGroupChoseList?rangeId=${queryParams.value.rangeId || '-1'}` 208 url:`/group/changeGroupChoseList?rangeId=${queryParams.value.rangeId || '-1'}`
209 }) 209 })
210 } 210 }
211 function getSonList(){ 211 function getSonList(){
212 uni.showLoading({ 212 uni.showLoading({
213 title: '加载中', 213 title: '加载中',
214 icon: 'none' 214 icon: 'none'
215 }) 215 })
216 query.value.paymentRangeId = queryParams.value.rangeId || '-1' 216 query.value.paymentRangeId = queryParams.value.rangeId || '-1'
217 api.getMySonList(query.value).then(res => { 217 api.getMySonList(query.value).then(res => {
218 studentList.value = res.data.rows 218 studentList.value = res.data.rows
219 uni.hideLoading() 219 uni.hideLoading()
220 }) 220 })
221 } 221 }
222 222
223 function checkThis(n) { 223 function checkThis(n) {
...@@ -291,9 +291,9 @@ let selectFileValue = {} ...@@ -291,9 +291,9 @@ let selectFileValue = {}
291 291
292 function selectFile(row, e) { 292 function selectFile(row, e) {
293 form.value = row 293 form.value = row
294 let file = e.tempFiles[0] 294 let file = e.tempFiles[0]
295 if(!file){ 295 if(!file){
296 return 296 return
297 } 297 }
298 api.uploadFile(e).then(data => { 298 api.uploadFile(e).then(data => {
299 selectFileValue = { 299 selectFileValue = {
...@@ -310,7 +310,7 @@ function selectFile(row, e) { ...@@ -310,7 +310,7 @@ function selectFile(row, e) {
310 newName: form.value.newName, 310 newName: form.value.newName,
311 fileUrl: JSON.stringify([selectFileValue]) 311 fileUrl: JSON.stringify([selectFileValue])
312 }).then(Response => { 312 }).then(Response => {
313 uni.hideLoading() 313 uni.hideLoading()
314 getList() 314 getList()
315 }) 315 })
316 }); 316 });
...@@ -321,30 +321,30 @@ function delSupplementFile(row) { ...@@ -321,30 +321,30 @@ function delSupplementFile(row) {
321 row.fileUrl = [] 321 row.fileUrl = []
322 } 322 }
323 </script> 323 </script>
324 <style scoped lang="scss"> 324 <style scoped lang="scss">
325 .searchbar { 325 .searchbar {
326 display: flex; 326 display: flex;
327 align-items: center; 327 align-items: center;
328 padding:0 0 25rpx; 328 padding:0 0 25rpx;
329 box-sizing: border-box; 329 box-sizing: border-box;
330 330
331 :deep(.uni-easyinput .uni-easyinput__content) { 331 :deep(.uni-easyinput .uni-easyinput__content) {
332 border-radius: 35rpx; 332 border-radius: 35rpx;
333 height: 66rpx; border: 1px solid #AD181F!important; 333 height: 66rpx; border: 1px solid #AD181F!important;
334 } 334 }
335 335
336 :deep(.uni-easyinput__content-input) { 336 :deep(.uni-easyinput__content-input) {
337 font-size: 26rpx; 337 font-size: 26rpx;
338 } 338 }
339 339
340 .invertedbtn-red { 340 .invertedbtn-red {
341 border-radius: 50px; margin-left: 20rpx; 341 border-radius: 50px; margin-left: 20rpx;
342 background-color: #fff; 342 background-color: #fff;
343 343
344 font-size: 30rpx; 344 font-size: 30rpx;
345 padding: 10rpx 20rpx; 345 padding: 10rpx 20rpx;
346 } 346 }
347 } 347 }
348 .userlist .item{background-color: #f4f4f4;} 348 .userlist .item{background-color: #f4f4f4;}
349 .flexbox { 349 .flexbox {
350 padding: 30rpx 30rpx 0 350 padding: 30rpx 30rpx 0
...@@ -382,6 +382,6 @@ function delSupplementFile(row) { ...@@ -382,6 +382,6 @@ function delSupplementFile(row) {
382 .text-center .btn-red-kx { 382 .text-center .btn-red-kx {
383 border-radius: 50px; 383 border-radius: 50px;
384 font-size: 28rpx; 384 font-size: 28rpx;
385 } 385 }
386 :deep(.file-picker__progress){opacity: 0;} 386 :deep(.file-picker__progress){opacity: 0;}
387 </style> 387 </style>
...\ No newline at end of file ...\ No newline at end of file
......
group/vipList.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <view class="hasfixedbottom"> 2 <view class="hasfixedbottom">
3 <view class="searchbar"> 3 <view class="searchbar">
4 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search" 4 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search"
5 v-model="queryParams.name" placeholder="团体会员名称" @blur="getList()" @clear="getList()"> 5 v-model="queryParams.name" placeholder="单位会员名称" @blur="getList()" @clear="getList()">
6 </uni-easyinput> 6 </uni-easyinput>
7 </view> 7 </view>
8 <view class="indexboxre"> 8 <view class="indexboxre">
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" /> 14 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
15 </view> 15 </view>
16 <view> 16 <view>
17 <view class="name"> 17 <view class="name">
18 {{n.name}} 18 {{n.name}}
19 </view> 19 </view>
20 <view class="name"> 20 <view class="name">
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <text v-if="n.deptType == 3">直属协会</text> 22 <text v-if="n.deptType == 3">直属协会</text>
23 <text v-if="n.deptType == 4">二级协会</text> 23 <text v-if="n.deptType == 4">二级协会</text>
24 <text v-if="n.deptType == 5">三级协会</text> 24 <text v-if="n.deptType == 5">三级协会</text>
25 <text v-if="n.deptType == 6">职业性团体会员</text> 25 <text v-if="n.deptType == 6">职业性单位会员</text>
26 </view> 26 </view>
27 <view class="date">到期时间：{{n.validityDate?.slice(0,10)}}</view> 27 <view class="date">到期时间：{{n.validityDate?.slice(0,10)}}</view>
28 </view> 28 </view>
...@@ -67,13 +67,13 @@ ...@@ -67,13 +67,13 @@
67 getList() 67 getList()
68 }) 68 })
69 69
70 function getList() { 70 function getList() {
71 uni.showLoading({ 71 uni.showLoading({
72 title:'加载中' 72 title:'加载中'
73 }) 73 })
74 api.getMySonList(queryParams.value).then(res => { 74 api.getMySonList(queryParams.value).then(res => {
75 list.value = res.data.rows 75 list.value = res.data.rows
76 total.value = res.data.total 76 total.value = res.data.total
77 uni.hideLoading() 77 uni.hideLoading()
78 }) 78 })
79 } 79 }
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
95 } 95 }
96 if (arr.length == 0) { 96 if (arr.length == 0) {
97 uni.showToast({ 97 uni.showToast({
98 title: "请选择团体", 98 title: "请选择单位",
99 icon: "none" 99 icon: "none"
100 }) 100 })
101 return 101 return
......
level/ztx/studentList.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 </view> 15 </view>
16 <view class="name">{{n.realName}}</view> 16 <view class="name">{{n.realName}}</view>
17 <view class="date"> 17 <view class="date">
18 所属团体: {{n.memName}} 18 所属单位: {{n.memName}}
19 </view> 19 </view>
20 20
21 <view class="flexbox mtb30"> 21 <view class="flexbox mtb30">
...@@ -82,17 +82,17 @@ ...@@ -82,17 +82,17 @@
82 uni.hideLoading() 82 uni.hideLoading()
83 }) 83 })
84 } 84 }
85 function checkCert(row){ 85 function checkCert(row){
86 return api.checkPersonByPersonId(row.perId).then(res => { 86 return api.checkPersonByPersonId(row.perId).then(res => {
87 if (!res.data) { 87 if (!res.data) {
88 uni.showModal({ 88 uni.showModal({
89 title: '提示', 89 title: '提示',
90 content:'该学员没有照片，无法生成证书！', 90 content:'该学员没有照片，无法生成证书！',
91 success: () => {} 91 success: () => {}
92 }) 92 })
93 return Promise.reject() 93 return Promise.reject()
94 } 94 }
95 }) 95 })
96 } 96 }
97 function sendCert(row) { 97 function sendCert(row) {
98 let msg 98 let msg
......
myCenter/auth.vue
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
409 function payTheFees() { 409 function payTheFees() {
410 if (!form.value.name) { 410 if (!form.value.name) {
411 uni.showToast({ 411 uni.showToast({
412 title: `请先完善团体信息`, 412 title: `请先完善单位信息`,
413 icon: 'none' 413 icon: 'none'
414 }); 414 });
415 return; // 新增：防止无名称时跳转 415 return; // 新增：防止无名称时跳转
......
myCenter/index.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 </view> 11 </view>
12 <view class="rMainBox"> 12 <view class="rMainBox">
13 <uni-list :border="false" class="myList"> 13 <uni-list :border="false" class="myList">
14 <uni-list-item thumb="/static/user_icon01.png" title="团体信息" showArrow clickable @click="goPath('/myCenter/teamInfo')"> 14 <uni-list-item thumb="/static/user_icon01.png" title="单位信息" showArrow clickable @click="goPath('/myCenter/teamInfo')">
15 </uni-list-item> 15 </uni-list-item>
16 16
17 <uni-list-item thumb="/static/user_icon02.png" title="会员认证" showArrow clickable @click="goPath('/myCenter/auth')"> 17 <uni-list-item thumb="/static/user_icon02.png" title="会员认证" showArrow clickable @click="goPath('/myCenter/auth')">
......
pages.json
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
530 }, { 530 }, {
531 "path": "apply/applyDetail", 531 "path": "apply/applyDetail",
532 "style": { 532 "style": {
533 "navigationBarTitleText": "团体会员审核详情", 533 "navigationBarTitleText": "单位会员审核详情",
534 "enablePullDownRefresh": false 534 "enablePullDownRefresh": false
535 } 535 }
536 536
...@@ -544,7 +544,7 @@ ...@@ -544,7 +544,7 @@
544 }, { 544 }, {
545 "path": "list", 545 "path": "list",
546 "style": { 546 "style": {
547 "navigationBarTitleText": "团体会员", 547 "navigationBarTitleText": "单位会员",
548 "enablePullDownRefresh": false 548 "enablePullDownRefresh": false
549 } 549 }
550 550
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
558 }, { 558 }, {
559 "path": "feeBill", 559 "path": "feeBill",
560 "style": { 560 "style": {
561 "navigationBarTitleText": "团体会员缴费单", 561 "navigationBarTitleText": "单位会员缴费单",
562 "enablePullDownRefresh": false 562 "enablePullDownRefresh": false
563 } 563 }
564 }, { 564 }, {
...@@ -571,7 +571,7 @@ ...@@ -571,7 +571,7 @@
571 }, { 571 }, {
572 "path": "apply/applyList", 572 "path": "apply/applyList",
573 "style": { 573 "style": {
574 "navigationBarTitleText": "团体会员审核", 574 "navigationBarTitleText": "单位会员审核",
575 "enablePullDownRefresh": false 575 "enablePullDownRefresh": false
576 } 576 }
577 577
...@@ -585,28 +585,28 @@ ...@@ -585,28 +585,28 @@
585 { 585 {
586 "path": "changeGroupInfo", 586 "path": "changeGroupInfo",
587 "style": { 587 "style": {
588 "navigationBarTitleText": "团体会员信息修改", 588 "navigationBarTitleText": "单位会员信息修改",
589 "enablePullDownRefresh": false 589 "enablePullDownRefresh": false
590 } 590 }
591 }, 591 },
592 { 592 {
593 "path": "changeGroupAudit", 593 "path": "changeGroupAudit",
594 "style": { 594 "style": {
595 "navigationBarTitleText": "团体信息变更审核", 595 "navigationBarTitleText": "单位信息变更审核",
596 "enablePullDownRefresh": false 596 "enablePullDownRefresh": false
597 } 597 }
598 }, 598 },
599 { 599 {
600 "path": "changeGroupDetail", 600 "path": "changeGroupDetail",
601 "style": { 601 "style": {
602 "navigationBarTitleText": "团体信息变更详情", 602 "navigationBarTitleText": "单位信息变更详情",
603 "enablePullDownRefresh": false 603 "enablePullDownRefresh": false
604 } 604 }
605 }, 605 },
606 { 606 {
607 "path": "newChange", 607 "path": "newChange",
608 "style": { 608 "style": {
609 "navigationBarTitleText": "新建团体信息变更", 609 "navigationBarTitleText": "新建单位信息变更",
610 "enablePullDownRefresh": false 610 "enablePullDownRefresh": false
611 } 611 }
612 }, 612 },
...@@ -757,7 +757,7 @@ ...@@ -757,7 +757,7 @@
757 { 757 {
758 "path": "teamInfo", 758 "path": "teamInfo",
759 "style": { 759 "style": {
760 "navigationBarTitleText": "团体信息", 760 "navigationBarTitleText": "单位信息",
761 "enablePullDownRefresh": false 761 "enablePullDownRefresh": false
762 } 762 }
763 }, 763 },
...@@ -799,7 +799,7 @@ ...@@ -799,7 +799,7 @@
799 { 799 {
800 "path": "perfect", 800 "path": "perfect",
801 "style": { 801 "style": {
802 "navigationBarTitleText": "团体会员缴费", 802 "navigationBarTitleText": "单位会员缴费",
803 "enablePullDownRefresh": false 803 "enablePullDownRefresh": false
804 } 804 }
805 }, 805 },
......
pages/index/more.vue
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 </view> 22 </view>
23 <view class="girdBox" v-if="userType=='2'"> 23 <view class="girdBox" v-if="userType=='2'">
24 <view @click="goPath('/group/feeBill')"> 24 <view @click="goPath('/group/feeBill')">
25 <image :src="config.baseUrl_api+'/fs/static/icon/17.png'" />团体会员缴费单 25 <image :src="config.baseUrl_api+'/fs/static/icon/17.png'" />单位会员缴费单
26 </view> 26 </view>
27 <view @click="goPath('/level/approval')"> 27 <view @click="goPath('/level/approval')">
28 <image :src="config.baseUrl_api+'/fs/static/icon/3.png'" />级位考试审核 28 <image :src="config.baseUrl_api+'/fs/static/icon/3.png'" />级位考试审核
......
personalVip/detail.vue
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
26 26
27 <!-- 会员证 --> 27 <!-- 会员证 -->
28 <view style="margin: 30rpx 0 0;" v-if="form.certStage!=0&&form.idcType!=3&&form.certStage!=2&&form.certStage!=1"> 28 <view style="margin: 30rpx 0 0;" v-if="form.certStage!=0&&form.idcType!=3&&form.certStage!=2&&form.certStage!=1">
29 <view class="zhengBox"> 29 <view class="zhengBox">
30 <image v-if="form.certStage == 4" style="width: 600rpx; height: 380rpx;position: relative" :src="config.baseUrl_api+'/fs/static/icon/memberCardU.png'" :fit="fit" /> 30 <image v-if="form.certStage == 4" style="width: 600rpx; height: 380rpx;position: relative" :src="config.baseUrl_api+'/fs/static/icon/memberCardU.png'" :fit="fit" />
31 <image v-else style="width: 600rpx; height: 380rpx;position: relative" :src="config.baseUrl_api+'/fs/static/icon/memberCard.png'" :fit="fit" /> 31 <image v-else style="width: 600rpx; height: 380rpx;position: relative" :src="config.baseUrl_api+'/fs/static/icon/memberCard.png'" :fit="fit" />
32 <view class="zhengbody" @contextmenu.prevent="youji"> 32 <view class="zhengbody" @contextmenu.prevent="youji">
33 <image mode="aspectFill" :src="(form.photo)" class="head"/> 33 <image mode="aspectFill" :src="(form.photo)" class="head"/>
34 <view class="memberNumber">{{ form.perCode }}</view> 34 <view class="memberNumber">{{ form.perCode }}</view>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 <uni-list-item title="会员编号" :rightText="form.perCode" /> 51 <uni-list-item title="会员编号" :rightText="form.perCode" />
52 <uni-list-item title="所属一级协会" :rightText="form.topAssName" /> 52 <uni-list-item title="所属一级协会" :rightText="form.topAssName" />
53 <uni-list-item title="所属地区协会" :rightText="form.areaAssName" /> 53 <uni-list-item title="所属地区协会" :rightText="form.areaAssName" />
54 <uni-list-item title="注册团体会员" :rightText="form.memName" /> 54 <uni-list-item title="注册单位会员" :rightText="form.memName" />
55 <uni-list-item title="缴费日期" :rightText="form.payDate||'--'" /> 55 <uni-list-item title="缴费日期" :rightText="form.payDate||'--'" />
56 <uni-list-item title="出生日期" :rightText="form.birth?.slice(0,10)" /> 56 <uni-list-item title="出生日期" :rightText="form.birth?.slice(0,10)" />
57 <uni-list-item title="手机号码" :rightText="form.phone" /> 57 <uni-list-item title="手机号码" :rightText="form.phone" />
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
99 value: '6' 99 value: '6'
100 } 100 }
101 ]) 101 ])
102 const form = ref({}) 102 const form = ref({})
103 const urlHref = ref() 103 const urlHref = ref()
104 onLoad((option) => { 104 onLoad((option) => {
105 console.log(option) 105 console.log(option)
...@@ -129,15 +129,15 @@ ...@@ -129,15 +129,15 @@
129 } 129 }
130 } 130 }
131 }) 131 })
132 } 132 }
133 function fileData(time) { 133 function fileData(time) {
134 if (!time) return 134 if (!time) return
135 const data = new Date(time.replace(/-/g, '/')) 135 const data = new Date(time.replace(/-/g, '/'))
136 const year = data.getFullYear() 136 const year = data.getFullYear()
137 const month = data.getMonth() + 1 137 const month = data.getMonth() + 1
138 const dates = data.getDate() 138 const dates = data.getDate()
139 return year + '年' + month + '月' + dates + '日' 139 return year + '年' + month + '月' + dates + '日'
140 } 140 }
141 141
142 </script> 142 </script>
143 143
...@@ -215,63 +215,63 @@ ...@@ -215,63 +215,63 @@
215 color: #fff; 215 color: #fff;
216 text-align: center; 216 text-align: center;
217 border-radius: 50%; 217 border-radius: 50%;
218 } 218 }
219 .zhengBox{ 219 .zhengBox{
220 position: relative;width: 600rpx; height: 380rpx;margin:0 auto 30rpx; 220 position: relative;width: 600rpx; height: 380rpx;margin:0 auto 30rpx;
221 .zhengbody{ 221 .zhengbody{
222 .head{width: 114rpx;height: 114rpx;border-radius: 50%;position: absolute;left: 65rpx;top: 132rpx;} 222 .head{width: 114rpx;height: 114rpx;border-radius: 50%;position: absolute;left: 65rpx;top: 132rpx;}
223 .birthday{ 223 .birthday{
224 position: absolute; top: 158rpx;left: 434rpx; 224 position: absolute; top: 158rpx;left: 434rpx;
225 font-size: 16rpx; 225 font-size: 16rpx;
226 color: #9f6a44; 226 color: #9f6a44;
227 } 227 }
228 .memberNumber{ 228 .memberNumber{
229 position: absolute;top: 182rpx;left: 290rpx; 229 position: absolute;top: 182rpx;left: 290rpx;
230 font-size: 19rpx; 230 font-size: 19rpx;
231 color: #9f6a44; 231 color: #9f6a44;
232 font-weight: 600; 232 font-weight: 600;
233 letter-spacing: 1px; 233 letter-spacing: 1px;
234 } 234 }
235 .phone{ 235 .phone{
236 position: absolute; top: 292rpx;left: 340rpx; 236 position: absolute; top: 292rpx;left: 340rpx;
237 font-size: 16rpx; 237 font-size: 16rpx;
238 color: #bc9060; 238 color: #bc9060;
239 } 239 }
240 .service{ 240 .service{
241 position: absolute; 241 position: absolute;
242 top: 313rpx; 242 top: 313rpx;
243 left: 340rpx; 243 left: 340rpx;
244 font-size: 16rpx; 244 font-size: 16rpx;
245 color: #bc9060; 245 color: #bc9060;
246 246
247 } 247 }
248 .validity{ 248 .validity{
249 position: absolute; 249 position: absolute;
250 top: 336rpx; 250 top: 336rpx;
251 left: 340rpx; 251 left: 340rpx;
252 font-size: 16rpx; 252 font-size: 16rpx;
253 color: #bc9060; 253 color: #bc9060;
254 254
255 } 255 }
256 .nameC{ 256 .nameC{
257 position: absolute; 257 position: absolute;
258 top: 146rpx; 258 top: 146rpx;
259 left: 240rpx; 259 left: 240rpx;
260 color: #9f6a44; 260 color: #9f6a44;
261 font-weight: 600; 261 font-weight: 600;
262 line-height: 1; 262 line-height: 1;
263 } 263 }
264 .content{ 264 .content{
265 width: 120rpx; 265 width: 120rpx;
266 box-sizing: border-box; 266 box-sizing: border-box;
267 display: flex; 267 display: flex;
268 align-items: center; 268 align-items: center;
269 //white-space: nowrap; 269 //white-space: nowrap;
270 overflow: hidden; 270 overflow: hidden;
271 overflow-x: auto; 271 overflow-x: auto;
272 transform-origin: 0 55%; 272 transform-origin: 0 55%;
273 white-space: nowrap; 273 white-space: nowrap;
274 } 274 }
275 } 275 }
276 } 276 }
277 </style> 277 </style>
...\ No newline at end of file ...\ No newline at end of file
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!