Skip to content

杨炀 / ztx_wx_gzt

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

no message

1 parent 78423ea5
Inline Side-by-side
Showing 21 changed files with 601 additions and 213 deletions
App.vue
......@@ -36,7 +36,27 @@ export default {
}
},
onShow: function() {
console.log('App Show');
// if(firstload&&!this.globalData.isLogin){
// console.log('App Show');
// uni.redirectTo({
// url: '/login/login'
// })
// }
if(firstload){
getInfo().then(() => {
this.globalData.isLogin = true;
let firstLoadCallback = getApp().firstLoadCallback;
if (firstLoadCallback) {
firstLoadCallback();
}
}).catch(() => {
uni.redirectTo({
url: '/login/login'
})
})
}
},
onHide: function() {
console.log('App Hide');
......
common/api.js
......@@ -3,6 +3,21 @@ import config from '@/config.js'
import * as loginServer from '@/common/login.js';
import _ from 'lodash'
// 激活
export function active(data) {
return request({
url: `/member/info/active/${data.memId}`,
method: 'post',
params: data
})
}
export function editMyMemberCertifiedInfo(data) {
return request({
url: '/system/dept/editMyMemberCertifiedInfo',
method: 'post',
params: data
})
}
export function addMergeToRange(params) {
return request({
url: `/person/infoMerge/addMergeToRange/${params.perIds}?perId=${params.perIds}&rangeIdStr=${params.rangeIdStr}`,
......@@ -86,7 +101,7 @@ export function certifiedDeptTree(params) {
return request({
url: '/system/user/certifiedDeptTreeWithNoDaoguan',
method: 'get',
params:params
params: params
})
}
// 查询部门下拉树结构
......@@ -94,7 +109,7 @@ export function deptTreeSelect(params) {
return request({
url: '/system/user/certifiedDeptTree',
method: 'get',
params:params
params: params
}).then((res) => {
setIdToString(res.data)
return res
......@@ -133,13 +148,9 @@ export function createMyMember(data) {
params: data
})
}
export function updateUserPwd(oldPassword, newPassword) {
const data = {
oldPassword,
newPassword
}
export function updateUserPwd(data) {
return request({
url: '/system/user/profile/updatePwd',
url: `/system/user/profile/updatePwd?oldPassword=${encodeURIComponent(data.oldPassword)}&newPassword=${encodeURIComponent(data.oldPassword)}`,
method: 'put',
params: data
})
......@@ -218,6 +229,26 @@ export function uploadImg(e) {
uni.hideLoading();
});
}
// corp
export function uploadImgCorp(tempFilePath) {
const imgUrl = tempFilePath
uni.showLoading({
title: '加载中'
});
return uni.uploadFile({
url: config.baseUrl_api + '/upload/uploadImgToLocalServer',
header: {
'Authorization': uni.getStorageSync('token'),
},
filePath: imgUrl,
name: 'image'
}).then(res => {
let data = JSON.parse(res.data);
return data
}).finally(() => {
uni.hideLoading();
});
}
export function getInfo(perId) {
return request({
......@@ -855,7 +886,7 @@ export function doMergeFlowsPer(data) {
return request({
url: '/person/paymentRange/audit',
method: 'post',
params:data
params: data
})
}
// 省缴费单拆分
......@@ -914,7 +945,7 @@ export function getInfoModRange(params) {
return request({
url: `/person/infoModRange/list`,
method: 'get',
params:params
params: params
})
}
export function addInfoModeList(data) {
......@@ -1010,7 +1041,7 @@ export function addLevelList(data) {
return request({
url: `/person/levelMod/addLevelModToRange`,
method: 'post',
params:data
params: data
})
}
export function addLevelModToRange(data) {
......
common/login.js
......@@ -55,6 +55,7 @@ function getCodeImg() {
function getSmsCode(data) {
return request({
url: '/captchaSmsWithCaptchaImage',
// url: '/captchaSmsWithCaptchaImageForMiniApp',
method: 'post',
params: data
})
......
common/mystyle.scss
......@@ -55,7 +55,11 @@ page {
.nodata{padding:10vh 0; box-sizing: border-box; text-align: center;
image{width: 300rpx;height: 300rpx;display: block; margin:0 auto;}
image{width: 300rpx;height: 300rpx;display: none; margin:0 auto;
border-radius: 100px;
opacity: 0.08;
filter: grayscale(1);
}
text{font-size: 24rpx; text-align: center; display: inline-block;color: #a8b3c7;}
button{display: inline;border-radius: 35rpx;padding:10rpx 30rpx;box-sizing: border-box;font-size: 30rpx;
border: none!important;}
......
config.js
......@@ -5,11 +5,11 @@
// staging 会员系统
// const baseUrl_api = "http://22yidpjzjifv.ngrok.xiaomiqiu123.top/stage-api/";
// const baseUrl_api = "http://123.60.96.243/stage-api/";
// const baseUrl_api = 'http://192.168.1.97:8787'
// const baseUrl_api = 'http://192.168.1.130:8787'
// const baseUrl_api = 'https://ztx.itechtop.cn/stage-api'
const baseUrl_api = 'https://tkcn.19wk.cn:8443/stage-api'
// const baseUrl_api = 'https://tkcn.19wk.cn:8443/stage-api'
// const baseUrl_api = 'https://newsystem.taekwondo.org.cn/stage-api'
const baseUrl_api = 'https://system.taekwondo.org.cn/stage-api'
export default {
baseUrl_api
}
......
group/apply/merge.vue
......@@ -33,7 +33,7 @@
原有效期
<view>{{item.content?.validityTime.slice(0,10)}}</view>
</view>
<view>
<view :class="item.content.validityTime?'':'w50'">
年限
<view>{{item.content.renewYear}}</view>
</view>
......
group/apply/mergeUp.vue
......@@ -19,7 +19,7 @@
<text v-if="item.status == 3" class="text-warning">审核撤回</text>
</view>
<view class="date">提交日期：{{item.content.commitTime}}</view>
<view class="date" v-if="item.content.validityTime">原有效期：{{item.content.validityTime}}</view>
<view class="date" v-if="item.content.validityTime">原有效期：{{item.content.validityTime?.slice(0,10)}}</view>
<view class="text-primary" v-if="item.content?.wfCode">{{item.content?.wfCode}}</view>
<view class="name mt0" style="width: 100%;" @click="goDetail(item)">{{item.content?.certName}}</view>
<view class="flexbox" @click="goDetail(item)">
......
group/changeGroupChoseList.vue
......@@ -15,15 +15,13 @@
<image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
</view>
<view class="w100">
<view class="name">{{n.name}} </view>
<view class="name">{{n.name}} <text v-if="n.memCode">({{n.memCode}})</text></view>
<view class="flexbox" style="padding: 0">
<view v-if="n.memCode">会员号
<text>{{n.memCode}}</text>
<view class="date">到期时间
<text v-if="n.validityDate">{{n.validityDate?.slice(0,10)}}</text>
<text v-else>--</text>
</view>
<view class="date" v-if="n.validityDate">到期时间
<text>{{n.validityDate?.slice(0,10)}}</text>
</view>
<view class="date">团体类型
<view class="date w50">团体类型
<text v-if="n.deptType == 2">一级协会</text>
<text v-if="n.deptType == 3">直属协会</text>
<text v-if="n.deptType == 4">二级协会</text>
......
group/feeBill.vue
......@@ -14,7 +14,7 @@
</view>
<view class="date" @click="goDetail(item)" v-if="item.payTime">
<uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons>
<text>{{item.payTime}} 缴费</text>
<text>{{item.payTime?.slice(0,10)}} 缴费</text>
</view>
<view class="text-primary" v-if="item.wfCode">{{item.wfCode}}</view>
<view class="name mt0" @click="goDetail(item)">{{item.finalDocName}}</view>
......
group/groupInfo.vue
......@@ -4,19 +4,29 @@
<uni-list>
<uni-list-item title="所属协会">
<template v-slot:footer>
<view style="width: 60%;text-align: right;">{{form.firstName}} {{form.parentDeptName}}</view>
<!-- <view style="width: 60%;text-align: right;">{{form.firstName}} {{form.parentDeptName}}</view> -->
<view style="width: 500rpx;text-align: right;">
<uni-data-picker v-model="form.deptId" :localdata="tree"
readonly :clear-icon="false"
:map="{text:'label',value:'id'}">
</uni-data-picker>
</view>
</template>
</uni-list-item>
<uni-list-item title="会员编号" v-if="form.menCode" :rightText="form.menCode" />
<uni-list-item title="机构名称" :rightText="form.name" />
<uni-list-item title="所属省份">
<template v-slot:footer>{{form.provinceStr}}</template>
<template v-slot:footer>
<uni-data-select :clear="false" disabled
v-model="form.belongProvinceId" :localdata="regionsList">
</uni-data-select>
</template>
</uni-list-item>
<uni-list-item title="社会信用代码" :rightText="form.creditCode" />
<uni-list-item v-if="form.siteContact" title="联系人" :rightText="form.siteContact" />
<uni-list-item v-else title="联系人" :rightText="form.contact" />
<uni-list-item v-if="form.siteTel" title="联系方式" :rightText="form.siteTel" />
<uni-list-item v-else title="联系方式" :rightText="form.phone" />
<uni-list-item v-if="isR" title="联系人" :rightText="form.certSiteContact" />
<uni-list-item v-else title="联系人" :rightText="form.siteContact" />
<uni-list-item v-if="isR" title="联系方式" :rightText="form.certSiteTel" />
<uni-list-item v-else title="联系方式" :rightText="form.siteTel" />
<uni-list-item v-if="form.validityDate" title="有效期" :rightText="form.validityDate?.slice(0,10)" />
<uni-list-item title="认证地址">
<template v-slot:footer>
......@@ -24,10 +34,12 @@
</template>
</uni-list-item>
<uni-list-item title="认证详细地址" :rightText="form.adress" />
<uni-list-item title="法人姓名" :rightText="form.legal||'--'" />
<uni-list-item title="法人姓名" v-if="isR" :rightText="form.certLegal||'--'" />
<uni-list-item title="法人姓名" v-else :rightText="form.legal||'--'" />
<uni-list-item v-if="form.deptType==6" title="是否为考点" :rightText="form.applyPoints==1?'是':'否'" />
<uni-list-item title="法人身份证" clickable>
<uni-list-item title="法人身份证" clickable v-if="isR">
<template v-slot:footer>
<view v-if="form.legalIdcPhotoArr&&form.legalIdcPhotoArr?.length>0">
<image class="ylImage" mode="aspectFit" @click="showImage(form.legalIdcPhotoArr,index)"
......@@ -36,15 +48,31 @@
</view>
</template>
</uni-list-item>
<uni-list-item title="法人身份证" clickable v-else>
<template v-slot:footer>
<view v-if="form.legalIdcPhotoArrR&&form.legalIdcPhotoArrR?.length>0">
<image class="ylImage" mode="aspectFit" @click="showImage(form.legalIdcPhotoArrR,index)"
v-for="(item,index) in form.legalIdcPhotoArrR" :key="item" :src="item">
</image>
</view>
</template>
</uni-list-item>
<uni-list-item title="营业执照" clickable >
<uni-list-item title="营业执照" clickable v-if="isR">
<template v-slot:footer>
<view @click="download(form.businessLicenseArr[0]?.url)" v-if="form.businessLicenseArr&&form.businessLicenseArr?.length>0">
<view style="width: 50vw;word-break: break-all;" @click="download(form.businessLicenseArrR[0]?.url)" v-if="form.businessLicenseArrR&&form.businessLicenseArrR?.length>0">
<text class="text-primary">{{form.businessLicenseArrR[0]?.name}}</text>
</view>
</template>
</uni-list-item>
<uni-list-item title="营业执照" clickable v-else>
<template v-slot:footer>
<view style="width: 50vw;word-break: break-all;" @click="download(form.businessLicenseArr[0]?.url)" v-if="form.businessLicenseArr&&form.businessLicenseArr?.length>0">
<text class="text-primary">{{form.businessLicenseArr[0]?.name}}</text>
</view>
</template>
</uni-list-item>
<uni-list-item title="机构照片" clickable>
<uni-list-item title="机构照片" clickable v-if="isR">
<template v-slot:footer>
<view v-if="form.picturesArr&&form.picturesArr?.length>0" class="photoBook" @click="showImage(form.picturesArr,0)">
<image mode="aspectFit" class="ylImage"
......@@ -54,6 +82,16 @@
</view>
</template>
</uni-list-item>
<uni-list-item title="机构照片" clickable v-else>
<template v-slot:footer>
<view v-if="form.picturesArrR&&form.picturesArrR?.length>0" class="photoBook" @click="showImage(form.picturesArrR,0)">
<image mode="aspectFit" class="ylImage"
:src="form.picturesArrR[0]">
</image>
<text>共{{form.picturesArrR?.length}}张</text>
</view>
</template>
</uni-list-item>
</uni-list>
</view>
<view class="height1"></view>
......@@ -75,11 +113,20 @@
const app = getApp()
const form = ref({
legalIdcPhotoArr: [],
legalIdcPhotoArrR: [],
picturesArr: [],
businessLicenseArr:[]
picturesArrR: [],
businessLicenseArr:[],
businessLicenseArrR:[]
})
const tree = ref([])
const regionsList = ref([])
const isR = ref(false)
onLoad(option => {
console.log(option)
if (option.isR){
isR.value = true
}
if (option.memId) {
getForm(option.memId)
}
......@@ -96,6 +143,8 @@
}
}
function init() {
getDeptTree()
getRegionsList()
console.log(form.value)
if (form.value.businessLicense) {
form.value.businessLicenseArr = []
......@@ -106,6 +155,15 @@
}
console.log('营业执照',form.value.businessLicenseArr)
}
if (form.value.certBusinessLicense) {
form.value.businessLicenseArrR = []
try{
form.value.businessLicenseArrR = JSON.parse(form.value.certBusinessLicense) || []
}catch(e){
form.value.businessLicenseArrR=[{url:form.value.certBusinessLicense,name:'营业执照'}]
}
console.log('营业执照',form.value.businessLicenseArrR)
}
if (form.value.certLegalIdcPhoto && form.value.certLegalIdcPhoto!=null) {
form.value.legalIdcPhotoArr = []
var arr = form.value.certLegalIdcPhoto?.split(',') || []
......@@ -119,8 +177,22 @@
})
form.value.legalIdcPhotoArr = arr
}
console.log('法人身份证',form.value.legalIdcPhotoArr)
}
if(form.value.legalIdcPhoto && form.value.legalIdcPhoto!=null){
form.value.legalIdcPhotoArrR = []
var arr = form.value.legalIdcPhoto?.split(',') || []
if (arr.length > 0) {
arr = _.map(arr, (p) => {
if(p.indexOf('http')==-1){
console.log(p)
p = config.baseUrl_api + p
}
return p
})
form.value.legalIdcPhotoArrR = arr
}
}
console.log('法人身份证',form.value.legalIdcPhotoArr)
if (form.value.certPictures) {
form.value.picturesArr = []
var arr = form.value.certPictures.split(',') || []
......@@ -135,8 +207,36 @@
}
console.log(form.value.picturesArr)
}
if(form.value.pictures){
form.value.picturesArrR = []
var arr = form.value.pictures.split(',') || []
if (arr.length > 0) {
arr = _.map(arr, (p) => {
if(p.indexOf('http')==-1){
p = config.baseUrl_api + p
}
return p
})
form.value.picturesArrR = arr
}
console.log(form.value.picturesArrR)
}
}
function getRegionsList() {
api.regionsList().then(res => {
regionsList.value = res.data;
})
}
function getDeptTree(){
api.deptTreeSelect({ selfDeptId: '-1', showDirect: 1, showAll: 1 }).then(res=>{
tree.value = res.data
if (typeof tree.value?.[0]?.id == 'number') {
form.value.deptId = form.value.deptId * 1
} else {
form.value.deptId = form.value.deptId.toString()
}
})
}
function showImage(arr, index) {
uni.previewImage({
urls: arr,
......@@ -154,13 +254,14 @@
uni.previewImage({
urls: [url],
success: function(res) {
console.log(res,[url],'111')
}
})
} else {
uni.previewImage({
urls: [config.baseUrl_api + url],
success: function(res) {
console.log(url,'222')
}
})
}
......@@ -205,7 +306,7 @@
fail: function(error) {
uni.hideLoading();
uni.showToast({
title: `下载失败`,
title:`下载失败`,
icon: 'none',
duration: 2000
});
......@@ -215,6 +316,10 @@
</script>
<style scoped lang="scss">
:deep(.input-value ){padding: 0!important;line-height: 1.4!important;}
:deep(.selected-list){display: block!important;
}
:deep(.selected-item){display:inline;white-space:normal!important;}
.height1 {
height: 1rpx
}
......
group/list.vue
......@@ -150,7 +150,7 @@
function godetail(n) {
uni.navigateTo({
url: `/group/groupInfo?memId=${n.memId}`
url: `/group/groupInfo?memId=${n.memId}&isR=true`
})
}
......
group/pay.vue
......@@ -24,11 +24,11 @@
会员合计
<view>{{item.allCount}}</view>
</view>
<view>
<view v-if="userType!='2'">
续费年限
<view>{{item.content?.renewYear}}</view>
</view>
<view>
<view :class="userType=='2'?'w50':''">
年限合计
<view>{{item.totalRenewYear}}</view>
</view>
......
login/login.vue
......@@ -18,12 +18,12 @@
</view>
<view class="round-input-item">
<image class="icon" :src="config.baseUrl_api+'/fs/static/login/tag02@2x.png'"></image>
<uni-easyinput :styles="inputstyle" placeholder="密码" v-model="form.password"
<uni-easyinput :styles="inputstyle" placeholder="初次登录请联系省级协会获取初始密码" v-model="form.password"
type="password" />
</view>
<view class="round-input-item">
<image class="icon" :src="config.baseUrl_api+'/fs/static/login/tag03@2x.png'"></image>
<uni-easyinput :styles="inputstyle" placeholder="图形验证码" v-model="form.code" />
<uni-easyinput :styles="inputstyle" placeholder="请填入计算结果" v-model="form.code" />
<image :src="codeUrl" @click="getCode" />
</view>
......@@ -62,13 +62,14 @@
</view>
<view class="wNumber">
技术服务热线：<text @click="call('15606190026')">15606190026</text> / <text
@click="call('15306299762')">15306299762</text>
@click="call('15305299762')">15305299762</text>
</view>
</view>
</view>
<image class="ren2" :src="config.baseUrl_api+'/fs/static/login/ren2.png'" />
<view class="fixedagree">
<text>仅供中国跆拳道协会会员单位登录使用</text>
<!-- <image @click="changeAgree(agree)" v-if="agree" src="@/static/login/xz_dwn@2x.png"></image>
<image v-else src="@/static/login/xz2@2x.png"></image>
<view>登录即代表您同意<text>《用户协议》</text><text>《隐私策略》</text></view> -->
......@@ -169,7 +170,7 @@
url: '/pages/index/index'
})
})
// .catch(getCode)
.catch(getCode)
} else if (isActive.value == 1) {
if (!form2.value.telNo) {
uni.showToast({
......
myCenter/auth.vue
<template>
<view>
<view v-if="showDirectly&&directUnderFlag==0">
<view class="flexbox">
<view>
有效日期至 <text class="text-primary">{{form?.validityDate?.slice(0,10) }}</text>
......@@ -18,14 +19,16 @@
</view>
</view>
<view class="flexbox" style="justify-content: end;padding: 0 30rpx 40rpx;">
<!-- <button class="btn-red" style="margin: 0 20rpx 0 0;" size="mini"
<button class="btn-red" style="margin: 0 20rpx 0 0;" size="mini"
v-if="activeStatus==0&&authenticationStatusa" @click="payTheFees">激活</button>
<view v-else>
<button class="btn-red" style="margin: 0 20rpx 0 0;" size="mini" :disabled="btn"
@click="payTheFees">去缴费</button> -->
@click="payTheFees">去缴费</button>
<button class="btn-red-kx" style="margin: 0 20rpx 0 0;" size="mini" v-if="form.deptType!=1"
@click="auditEditFN">审核详情</button>
</view>
</view>
</view>
<view class="mainbox">
<uni-list>
<uni-list-item v-if="authenticationStatusa != 1&&authenticationStatusa != 0&&authenticationStatusa != 3"
......@@ -38,7 +41,7 @@
<template v-slot:footer>
<view class="frrr">
<uni-data-picker readonly :clear-icon="false"
v-model="form.siteProvinceId" :localdata="options">
v-model="form.belongProvinceId" :localdata="options">
</uni-data-picker>
</view>
......@@ -55,14 +58,14 @@
<uni-list-item title="认证地址">
<template v-slot:footer>
<view class="frrr">
<uni-data-picker readonly :clear-icon="false" v-if="form.siteRegionId"
v-model="form.siteRegionId" :localdata="options">
<uni-data-picker readonly :clear-icon="false" v-if="form.certRegionId"
v-model="form.certRegionId" :localdata="options">
</uni-data-picker>
<uni-data-picker readonly :clear-icon="false" v-else-if="form.siteCityId"
v-model="form.siteCityId" :localdata="options">
<uni-data-picker readonly :clear-icon="false" v-else-if="form.certCityId"
v-model="form.certCityId" :localdata="options">
</uni-data-picker>
<uni-data-picker readonly :clear-icon="false" v-else-if="form.siteProvinceId"
v-model="form.siteProvinceId" :localdata="options">
<uni-data-picker readonly :clear-icon="false" v-else-if="form.certProvinceId"
v-model="form.certProvinceId" :localdata="options">
</uni-data-picker>
</view>
</template>
......@@ -116,11 +119,10 @@
import _ from 'lodash'
import {
onMounted,
ref
} from 'vue'
import {
onLoad
onLoad,onShow
} from '@dcloudio/uni-app'
const app = getApp()
const form = ref({
......@@ -139,7 +141,7 @@
const pr = ref({})
const applicationForMembership1 = ref({})
const options = ref([])
onLoad(() => {
onShow(() => {
init()
})
......
myCenter/index.vue
......@@ -146,8 +146,8 @@ function goPath(url){
font-size: 36rpx;}
.imgbox{width: 120rpx;
height: 120rpx;overflow: hidden;
background: #C7C7CD;
border: 4rpx solid #FFFFFF;
// background: #C7C7CD;
// border: 4rpx solid #FFFFFF;
border-radius: 50%;
image{height: 120rpx;width: 120rpx;object-fit: cover;}
}
......
myCenter/perfect.vue
......@@ -2,14 +2,14 @@
<view>
<view class="pd30" style="padding: 30rpx 30rpx 180rpx;">
<view class="wBox">
<uni-forms ref="baseForm" :modelValue="form" label-width="100">
<uni-forms ref="baseForm" label-width="100">
<uni-forms-item label="所属协会" required>
<uni-data-picker style="width: 82%;" v-model="form.parentId"
:localdata="tree"
:readonly="type&&parentId!=-1&&parentId!=0"
:clear-icon="false" :map="{text:'label',value:'id'}"
popup-title="请选择" @change="onchange"
@nodeclick="onnodeclick"></uni-data-picker>
<view style="width: 60vw;overflow:auto;">
<uni-data-picker v-model="form.parentId" :localdata="tree"
:readonly="type&&parentId!=-1&&parentId!=0" :clear-icon="false"
:map="{text:'label',value:'id'}" popup-title="请选择">
</uni-data-picker>
</view>
</uni-forms-item>
<uni-forms-item v-if="form.memCode" label="会员编号" required>
<uni-easyinput v-model="form.memCode" disabled />
......@@ -32,8 +32,7 @@
<uni-easyinput v-model="form.siteTel" />
</uni-forms-item>
<uni-forms-item label="认证地址" required>
<uni-data-picker v-model="form.coordinates1"
:localdata="regionsList"></uni-data-picker>
<uni-data-picker v-model="form.coordinates1" @change="changeCoordinates1" :localdata="regionsList"></uni-data-picker>
</uni-forms-item>
<uni-forms-item label="详细地址" required>
<uni-easyinput v-model="form.adress" placeholder="请输入详细地址" type='textarea' /></uni-forms-item>
......@@ -58,13 +57,13 @@
</view>
</uni-forms-item>
<uni-forms-item label="营业执照" required>
<uni-file-picker limit="1" v-model="form.businessLicense" file-extname="png,jpg,jpeg,pdf,zip"
file-mediatype="all" @select="selectFile(form,$event)"
@delete="delSupplementFile(form)"></uni-file-picker>
<uni-file-picker limit="1" v-model="businessLicenseArr" file-extname="png,jpg,jpeg,pdf"
file-mediatype="all" @select="selectFile" @delete="delSupplementFile"></uni-file-picker>
</uni-forms-item>
<uni-forms-item label="机构照片" required>
<uni-file-picker v-model="picArr" @delete="delpicArr" limit="3" @select="upPicArr">
<uni-file-picker v-model="picArrR" limit="3" mode="grid" file-mediatype="image"
@select="upPicArr" @delete="delpicArr">
</uni-file-picker>
</uni-forms-item>
</uni-forms>
......@@ -81,14 +80,14 @@
<view class="tt">选择缴费年限</view>
<view class="pickitem" v-for="(item,index) in years" :key="index" @click="bindChange(item)">
{{item}}年
<uni-icons v-if="form.renewYear == item" type="checkmarkempty" size="20"
color="green"></uni-icons>
<uni-icons v-else type="checkmarkempty" size="20"
color="white"></uni-icons>
<uni-icons v-if="form.renewYear == item" type="checkmarkempty" size="20" color="green"></uni-icons>
<uni-icons v-else type="checkmarkempty" size="20" color="white"></uni-icons>
</view>
<view style="margin: 30rpx 0;">
<button class="btn-red" @click="submitForm">确定</button>
</view>
</view>
</uni-popup>
</template>
......@@ -98,6 +97,7 @@
ref
} from 'vue';
import * as api from '@/common/api.js';
import _ from 'lodash'
import {
onLoad,
onShow
......@@ -105,7 +105,8 @@
import config from '@/config.js'
const app = getApp();
const form = ref({
type: '1'
type: '1',
applyPoints: '0'
});
const typeList = ref([{
value: '1',
......@@ -153,6 +154,9 @@
const newResult = ref(false)
const popup = ref(null)
const belongProvinceId = ref()
const picArr = ref([])
const picArrR = ref([])
const businessLicenseArr = ref([])
const list1 = ref([{
title: '完善信息'
}, {
......@@ -162,8 +166,15 @@
width: '400rpx',
height: '253rpx'
});
const indicatorStyle=ref(`height: 50px;`)
const indicatorStyle = ref(`height: 50px;`)
const imgfront = ref({})
const imgBack = ref({})
const creditCode = ref()
const parentId = ref()
const legalIdcPhoto1 = ref('')
const legalIdcPhoto2 = ref('')
onLoad(option => {
if (app.globalData.isLogin) {
init()
} else {
......@@ -175,7 +186,6 @@
function init() {
getRegionsList()
getTree()
getForm()
}
......@@ -207,8 +217,72 @@
...res.data.dept,
...res.data.memberInfo
}
getTree()
form.value.deptType = res.data.dept.deptType
form.value.parentId = form.value.parentId.toString()
creditCode.value = form.value.creditCode
belongProvinceId.value = form.value.belongProvinceId
parentId.value = form.value.parentId
if (form.value.regionId){
form.value.coordinates1 = form.value.regionId
} else if(form.value.cityId){
form.value.coordinates1 = form.value.cityId
} else if(form.value.provinceId){
form.value.coordinates1 = form.value.provinceId
} else {
form.value.coordinates1 = ''
}
if(form.value.businessLicense){
try{
businessLicenseArr.value = JSON.parse(form.value.businessLicense) || []
}catch(e){
businessLicenseArr.value=[{url:form.value.businessLicense,name:'营业执照'}]
}
}
if(form.value.legalIdcPhoto){
legalIdcPhoto1.value = form.value.legalIdcPhoto.split(',')?.[0] || ''
legalIdcPhoto2.value = form.value.legalIdcPhoto.split(',')?.[1] || ''
if(legalIdcPhoto1.value.indexOf('http')==-1){
legalIdcPhoto1.value = config.baseUrl_api + legalIdcPhoto1.value
}
if(legalIdcPhoto2.value.indexOf('http')==-1){
legalIdcPhoto2.value = config.baseUrl_api + legalIdcPhoto2.value
}
imgfront.value = {
url: legalIdcPhoto1.value,
name: '身份证正面',
extname: 'png'
}
imgBack.value = {
url:legalIdcPhoto2.value,
name: '身份证反面',
extname: 'png'
}
}
if(form.value.pictures){
picArrR.value = []
picArr.value = []
var arr = form.value.pictures.split(',') || []
if (arr.length > 0) {
arr = _.map(arr, (p) => {
if(p.indexOf('http')==-1){
p = config.baseUrl_api + p
}
var obj = {
url: p,
name: '图片',
extname: 'png'
}
picArrR.value.push(obj)
picArr.value.push(p)
})
}
}
if(!form.value.applyPoints||form.value.applyPoints==''){
form.value.applyPoints = '0'
}
})
}
......@@ -251,23 +325,149 @@
})
return
}
if (form.value.creditCode == '') {
uni.showToast({
title: '请填写社会信用代码',
icon: 'none'
})
return
}
if (form.value.siteContact == '') {
uni.showToast({
title: '请填写联系人',
icon: 'none'
})
return
}
//
if (form.value.siteContact == '') {
uni.showToast({
title: '请填写联系人',
icon: 'none'
})
return
}
if (form.value.siteTel == '') {
uni.showToast({
title: '请填写联系方式',
icon: 'none'
})
return
}
if (form.value.coordinates1 == '') {
uni.showToast({
title: '请选择认证地址',
icon: 'none'
})
return
}
if (form.value.adress == '') {
uni.showToast({
title: '请填写详细地址',
icon: 'none'
})
return
}
if (form.value.legal == '') {
uni.showToast({
title: '请填写法人姓名',
icon: 'none'
})
return
}
if (legalIdcPhoto1.value == '' || legalIdcPhoto2.value == '') {
uni.showToast({
title: '请上传法人身份证',
icon: 'none'
})
return
}
if (form.value.businessLicense == '') {
uni.showToast({
title: '请上传营业执照',
icon: 'none'
})
return
}
if (picArr.value.length == 0) {
uni.showToast({
title: '请上传机构照片',
icon: 'none'
})
return
}
form.value.duanPrice = undefined
form.value.jiPrice = undefined
if (form.value.parentId == -1 || form.value.parentId == 0) {
uni.showToast({
title: '请选择所属协会',
icon: 'none'
})
return
}
const dataInfo = {
parentId: form.value.parentId,
creditCode: form.value.creditCode,
legal: form.value.legal,
businessLicense:form.value.businessLicense,
pictures: picArr.value.toString(),
memId: form.value.memId,
id: form.value.deptId,
name: form.value.name,
regionId: form.value.coordinates1,
// cityId: form.value.cityId,
// provinceId: form.value.provinceId,
adress: form.value.adress,
belongProvinceId: form.value.belongProvinceId,
deptType: form.value.deptType,
legalIdcPhoto: [legalIdcPhoto1.value,legalIdcPhoto2.value]?.join(','),
applyPoints: form.value.applyPoints,
siteContact: form.value.siteContact,
siteTel: form.value.siteTel
}
console.log(dataInfo)
if (activeStatus.value == 0) {
api.active(dataInfo).then(res => {
uni.showModal({
content: '激活成功,返回首页',
success: function(resp) {
if (resp.confirm) {
uni.reLaunch({
url:`/pages/index/index`
})
} else {
uni.navigateBack()
}
}
})
})
} else {
api.editMyMemberCertifiedInfo(dataInfo).then(res => {
popup.value.open()
})
}
}
function changeCoordinates1(e){
console.log(e)
}
function submitForm(){
if(!form.value.renewYear){
function submitForm() {
if (!form.value.renewYear) {
uni.showToast({
title: '请选择缴费年限',
icon: 'none'
})
return
}
api.centerCommit({ renewYear: form.value.renewYear }).then(res=>{
api.centerCommit({
renewYear: form.value.renewYear
}).then(res => {
uni.showModal({
content:`缴费等待审核中！`,
success:function(res){
if(res.confirm){
content: `缴费等待审核中！`,
success: function(res) {
if (res.confirm) {
uni.navigateBack()
}
}
......@@ -276,32 +476,114 @@
}
function upIdCardImgFront(e) {
const tempFilePaths = e.tempFilePaths;
const imgUrl = tempFilePaths[0]
if (!imgUrl) {
return
}
uni.showLoading({
title: '加载中'
})
api.uploadImg(e).then(data => {
legalIdcPhoto1.value = data.msg
})
}
function upIdCardImgBack(e) {
const tempFilePaths = e.tempFilePaths;
const imgUrl = tempFilePaths[0]
if (!imgUrl) {
return
}
uni.showLoading({
title: '加载中'
})
api.uploadImg(e).then(data => {
legalIdcPhoto2.value = data.msg
})
}
function delimgFont() {
imgfront.value = {}
legalIdcPhoto1.value = ''
}
function delimgBack() {
imgBack.value = {}
legalIdcPhoto2.value = ''
}
let selectFileValue = {}
function selectFile(e) {
console.log(e)
let file = e.tempFiles[0]
if (!file) {
return
}
api.uploadFile(e).then(data => {
selectFileValue = {
url: data.msg,
name: file.name,
extname: file.extname
}
form.value.businessLicense = JSON.stringify([selectFileValue])
console.log(selectFileValue,form.value.businessLicense)
})
}
function delSupplementFile() {
selectFileValue = {}
}
function upPicArr(e) {
const tempFilePaths = e.tempFilePaths;
const imgUrl = tempFilePaths[0]
if (!imgUrl) {
return
}
uni.showLoading({
title: '加载中'
});
})
api.uploadImg(e).then(data => {
picArr.value.push(data.msg)
// form.value.pictures
console.log(picArr.value)
})
}
function bindChange(e){
function delpicArr(e) {
picArr.value.splice(e.index, 1)
console.log(picArr.value, picArrR.value)
}
function bindChange(e) {
console.log(e)
form.value.renewYear = e
}
</script>
<style lang="scss" scoped>
.pickitem{height:40px;text-align: center;
line-height: 40px;}
:deep(.file-picker__progress){ opacity: 0; }
:deep(.input-value){padding: 0 5px;}
.pickitem {
height: 40px;
text-align: center;
line-height: 40px;
}
.picker-view {
width: 750rpx;
height: 600rpx;
margin-top: 20rpx;
}
.item {
line-height: 100rpx;
text-align: center;
}
.popBody {
background: #fff;
padding: 30rpx;
......
myCenter/safe.vue
......@@ -167,7 +167,7 @@ function handleClick() {
})
return
}
api.updateUserPwd(form.oldPassword, form.newPassword).then(res=>{
api.updateUserPwd({oldPassword:form.value.oldPassword, newPassword:form.value.newPassword}).then(res=>{
uni.showModal({
title:"提示",
content:`修改成功，重新登录生效`,
......
pages/index/index.vue
<template>
<view class="page">
<view class="page" v-if="isInit">
<view class="bgbg">
<view class="loginOutIcon" @click="loginOut">
<image src="@/static/switch.png"></image>
......@@ -86,10 +86,10 @@
<image :src="config.baseUrl_api+'/fs/static/icon/25.png'" />
会员变更
</view>
<!-- <view @click="goPath('/personalVip/mergeVip')">
<image :src="config.baseUrl_api+'/fs/static/icon/25.png'" />
<view @click="goPath('/personalVip/mergeVip')">
<image :src="config.baseUrl_api+'/fs/static/icon/28.png'" />
信息合并
</view> -->
</view>
</view>
<view class="ttt">团体会员</view>
<view class="girdBox">
......@@ -170,11 +170,10 @@
<image :src="config.baseUrl_api+'/fs/static/icon/25.png'" />
变更审核
</view>
<!-- <view @click="goPath('/personalVip/mergeVipAudit')">
<image :src="config.baseUrl_api+'/fs/static/icon/25.png'" />
<view @click="goPath('/personalVip/mergeVipAudit')">
<image :src="config.baseUrl_api+'/fs/static/icon/28.png'" />
合并审核
</view> -->
</view>
</view>
<view class="ttt">团体会员</view>
......@@ -289,7 +288,11 @@
const messageList = ref([])
const newsList = ref([])
const isInit = ref(false)
onShow(() => {
uni.showLoading({
title:'加载中'
})
if (app.globalData.isLogin) {
init()
} else {
......@@ -311,7 +314,7 @@
});
}
const changePassFlag = app.globalData.user?.changePassFlag
if (changePassFlag === '1') {
if (changePassFlag === '1'&&memberInfo.value.activeStatus == '1'&&app.globalData.authenticationStatus==2) {
uni.showModal({
content: "密码长期未更新，请及时更新",
success: function(res) {
......@@ -355,9 +358,11 @@
title: '提示',
content: '会员已过期，请及时续费',
success: function(res) {
// uni.navigateTo({
// url: '/pages/index/perfect'
// });
if(res.confirm){
uni.navigateTo({
url: '/myCenter/auth'
});
}
}
})
}
......@@ -366,8 +371,14 @@
if (memberInfo.value.activeStatus == 0) {
uni.showModal({
title: '提示',
content: '账号未激活，请前往【中国跆拳道会员管理系统】电脑端激活',
success: function(res) {}
content: '账号未激活，请前去激活',
success: function(res) {
if(res.confirm){
uni.navigateTo({
url: '/myCenter/auth'
});
}
}
})
return
}
......@@ -378,9 +389,7 @@
}
function init() {
uni.showLoading({
title: '加载中'
});
isInit.value = true
loginServer.getMyOwnMemberInfo().then(res => {
userType.value = app.globalData.userType
memberInfo.value = app.globalData.memberInfo
......@@ -397,9 +406,11 @@
title: '提示',
content: '会员已过期，请及时续费',
success: function(res) {
// uni.navigateTo({
// url: '/pages/index/perfect'
// });
if(res.confirm){
uni.navigateTo({
url: '/myCenter/auth'
});
}
}
})
}
......@@ -418,20 +429,22 @@
// uni.navigateTo({
// url: '/pages/index/perfect'
// });
} else {
getMes()
}
if (memberInfo.value.activeStatus == 0) {
uni.showModal({
title: '提示',
content: '账号未激活，请前往【中国跆拳道会员管理系统】电脑端激活',
content: '账号未激活，请前去激活',
success: function(res) {
// uni.navigateTo({
// url: '/pages/index/perfect'
// });
if(res.confirm){
uni.navigateTo({
url: '/myCenter/auth'
});
}
})
}
})
}
uni.hideLoading();
})
......@@ -451,74 +464,6 @@
})
}
function getMes() {
uni.showLoading({
title: '加载中'
});
api.getMessage({
pageNum: 1,
pageSize: 10
}).then(res => {
if (res.rows && res.rows.length > 0)
for (var d of res.rows) {
switch (d.type) {
case 30001:
d.name = '你有一条会员缴费等待审批，点击去处理！'
d.path = '/personalVip/audit'
break
case 30002:
d.name = '你有一条级位考试等待审批，点击去处理！'
d.path = '/level/approval'
break
case 30003:
d.name = '你有一条段位考试等待审批，点击去处理！'
d.path = '/pages/rank/approval'
break
case 30004:
d.name = '你有一条会员调动等待审批，点击去处理！'
d.path = '/personalVip/mobillize'
break
case 30005:
d.name = '你有一条团体会员认证等待审批，点击去处理！'
d.path = '/group/apply/applyList'
break
case 30006:
d.name = '你有一条段位成绩等待审批，点击去处理！'
d.path = '/pages/rank/scoreApproval'
break
case 40001:
d.name = '你有一条级位申请待提交，点击去处理！'
d.path = `/level/apply?id=${d.eventId}`
break
case 40002:
d.name = '你有一条段位申请待提交，点击去处理！'
d.path = `/pages/rank/apply?id=${d.eventId}`
break
case 40003:
d.name = '你有一条成绩维护的数据待提交，点击去处理！'
d.path = `/pages/rank/score/modify?id=${d.eventId}`
break
case 50001:
d.name = '你有一条新的个人会员申请，点击去处理！'
d.path = '/personalVip/list'
break
}
}
messageList.value = res.rows
uni.hideLoading();
})
}
function readMessage(item) {
uni.navigateTo({
url: item.path
});
api.reader({
id: item.id
}).then(res => {
item.readFlag = '1'
})
}
function goNewsDetail(n){
uni.navigateTo({
url: `/pages/index/newsDetail?noteId=${n.noteId}`
......
personalVip/addVip.vue
......@@ -86,27 +86,20 @@
<uni-popup ref="popup" type="bottom" background-color="#fff" animation>
<view class="tt">入会须知</view>
<view class="popBody">
______欢迎您申请成为中国跆拳道协会（以下简称中国跆协）会员，请确保本次申请是经过您本人或监护人授权同意后的自愿行为，请您务必仔细阅读本入会须知。
_{{baseFormData.name}}_欢迎您申请成为中国跆拳道协会（以下简称中国跆协）会员，请确保本次申请是经过您本人或监护人授权同意后的自愿行为，请您务必仔细阅读本入会须知。
<br />
一、中国跆协会员分为个人会员和单位会员。
<br />
二、成为本协会会员条件：遵守中国跆协章程和协会各项规章制度及相关决议，按期交纳会费，积极支持和参与中国跆拳道事业发展的社会各届人士或地方跆拳道协会、俱乐部、培训机构等，均可自愿申请成为中国跆协会员。
<br />
三、个人会员为在中国工作和生活的跆拳道爱好者，16 周岁以下应有监护人协助申请，会员须为中国公民。
<br />
四、会员入会需向所在区域内中国跆协单位会员提出入会申请，并按程序报中国跆协批准，按规定交纳会费。
<br />
二、成为本协会会员条件：遵守中国跆协章程和协会各项规章制度及相关决议，按期交纳会费，积极支持和参与中国跆拳道事业发展的社会各届人士或地方跆拳道协会、俱乐部、培训机构等，均可自愿申请成为中国跆协会员。<br />
三、个人会员为在中国工作和生活的跆拳道爱好者，16 周岁以下应有监护人协助申请，会员须为中国公民。<br />
四、会员入会需向所在区域内中国跆协单位会员提出入会申请，并按程序报中国跆协批准，按规定交纳会费。<br />
五、会员享有《中国跆拳道协会会员管理办法》规定的会员权利。
<br />
六、会员应履行《中国跆拳道协会会员管理办法》规定的会员义务。
<br />
七、凡中国跆协会员，须按照《中国跆拳道协会会员会费标准（2021 版）》按时交纳年度会费。
<br />
八、会员行为违反《中国跆拳道协会会员管理办法》中规定的，按照相关处罚规定进行处理。
<br />
九、会员有退会的自由。会员自愿退会应至少提前 3 个月以书面形式通知本协会，并在此之前，妥善解决与本协会及其他会员之间的财务等问题，方可退会。
<br />
十、其它会员相关内容请查看《中国跆拳道协会会员管理办法》。
七、凡中国跆协会员，须按照《中国跆拳道协会会员会费标准（2021 版）》按时交纳年度会费。<br />
八、会员行为违反《中国跆拳道协会会员管理办法》中规定的，按照相关处罚规定进行处理。<br />
九、其它会员相关内容请查看《中国跆拳道协会章程》《中国跆拳道协会会员管理办法》。<br />
<button @click="closepopup" class="btn-red">我已阅读</button>
</view>
......@@ -298,8 +291,13 @@
uni.showLoading({
title: '加载中'
});
api.uploadImg(e).then(data => {
api.uploadImgCorp(resp.tempFilePath).then(data => {
baseFormData.value.photo = data.msg;
photoArr.value = {
url: config.baseUrl_api+baseFormData.value.photo,
name: '头像',
extname: 'jpg'
}
});
},
fail: function(err) {
......@@ -337,7 +335,6 @@
// idcCode: baseFormData.value.idcCode,
// perType: '1'
// };
//如果老会员
uni.showLoading({
title: '加载中'
})
......@@ -349,6 +346,7 @@
perId.value = res.data.perId
baseFormData.value.sex = res.data.sex
baseFormData.value.birth = res.data.birth
baseFormData.value.name = res.data.name
baseFormData.value.phone = res.data.phone
baseFormData.value.cityId = res.data.cityId
baseFormData.value.address = res.data.address
......@@ -380,10 +378,10 @@
} else {
uni.hideLoading()
// 新会员
// if (res.data.sex) {
// baseFormData.value.sex = res.data.sex
// baseFormData.value.birth = res.data.birth
// }
if (res.data.sex) {
baseFormData.value.sex = res.data.sex
baseFormData.value.birth = res.data.birth
}
if (baseFormData.value.idcType != 3 && current.value == 1) {
disabledName.value = true
} else {
......
static/nodata.png
static/nodata.png

12 KB | W: | H:

static/nodata.png

104 KB | W: | H:

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