Skip to content

C
CFFP-HB
Commit 0af9ae3c by sunerhu
Options

1.修改了一些Bug

parent cea0d5b3
Showing with 292 additions and 135 deletions
api/api.ts
...@@ -292,5 +292,9 @@ export default { ...@@ -292,5 +292,9 @@ export default {
//判断是否授权 //判断是否授权
isAuth(params){ isAuth(params){
return request(`${apiURL}/aliPay/isAuth`, "POST", params) return request(`${apiURL}/aliPay/isAuth`, "POST", params)
},
// 账号注销
cancellation(params){
return request(`${apiURL}/cffp/user/cancellation`, "POST", params)
} }
} }
pages.json
...@@ -455,6 +455,15 @@ ...@@ -455,6 +455,15 @@
} }
} }
,{
"path" : "pages/personalCenter/system/cancellation",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}
], ],
// "tabBar": { // "tabBar": {
// "color": "#7A7E83", // tab 上的文字默认颜色 // "color": "#7A7E83", // tab 上的文字默认颜色
......
pages/certifyDetail/certifyDetail.vue
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
}, },
uploadinfo(){ uploadinfo(){
uni.navigateTo({ uni.navigateTo({
url:`/pages/certifyDetail/uploadinformation?userSignupId=${this.userSignupId}` url:`/pages/certifyDetail/uploadinformation?userSignupId=${this.userSignupId}&status=${this.status}`
}) })
}, },
// 去立即报名页面 // 去立即报名页面
......
pages/certifyDetail/uploadinformation.vue
...@@ -51,9 +51,12 @@ ...@@ -51,9 +51,12 @@
</view> </view>
</view> </view>
</view> </view>
<view class="footer"> <view class="footer" v-if="status != 3">
<button class="user-button" @click="onsubmit()" :loading="loading" :disabled="loading">保存</button> <button class="user-button" @click="onsubmit()" :loading="loading" :disabled="loading">保存</button>
</view> </view>
<view class="footer" v-else>
<button class="user-button" @click="getBack()" :loading="loading" :disabled="loading">返回上一页</button>
</view>
</view> </view>
</template> </template>
...@@ -83,9 +86,12 @@ ...@@ -83,9 +86,12 @@
fileList: [], fileList: [],
fileForm: {}, fileForm: {},
erplizeList: null, erplizeList: null,
status:''
} }
}, },
onLoad(option) { onLoad(option) {
console.log(option, 124)
this.status = option.status
this.openForm.signupId = option.userSignupId this.openForm.signupId = option.userSignupId
this.getquerySignUpInfo() this.getquerySignUpInfo()
}, },
...@@ -105,6 +111,9 @@ ...@@ -105,6 +111,9 @@
console.log(this.openForm.userTel) console.log(this.openForm.userTel)
this.openForm.signupId = res.data.id this.openForm.signupId = res.data.id
}, },
getBack(){
uni.navigateBack(1)
},
exportTo(){ exportTo(){
console.log(this.openForm.planBookPdfUrl, 4451) console.log(this.openForm.planBookPdfUrl, 4451)
uni.navigateTo({ uni.navigateTo({
...@@ -145,6 +154,14 @@ ...@@ -145,6 +154,14 @@
}, },
// 上传文件方法 // 上传文件方法
uploadFile(event) { uploadFile(event) {
if(this.status == 3){
uni.showToast({
title: '不能进行上传操作',
duration: 2000,
icon: 'none'
});
return false
}
let that = this; let that = this;
uploadFilepdf(this.dataForm) uploadFilepdf(this.dataForm)
.then(res => { .then(res => {
......
pages/courseDetail/courseDetail.vue
...@@ -107,37 +107,18 @@ ...@@ -107,37 +107,18 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 分享信息 --> <uni-share-wx ref="sharewx"></uni-share-wx>>
<view>
<uni-popup ref="sharewx" type="bottom" backgroundColor="#fff">
<view class="popup-content">
<view class="shareBox">
<view class="shareOptionItem" @click="uniShare(1)">
<view class="imgBox">
<image src="../../static/app-plus/sharemenu/wechatfriend.png" mode="widthFix"></image>
</view>
<text>微信好友</text>
</view>
<view class="shareOptionItem" @click="uniShare(2)">
<view class="imgBox">
<image src="../../static/app-plus/sharemenu/wechatmoments.png" mode="widthFix"></image>
</view>
<text>分享朋友圈</text>
</view>
</view>
</view>
<view class="popup-footer" @click="closeShare()">
<view>取消</view>
</view>
</uni-popup>
</view>
</view> </view>
</template> </template>
<script> <script>
import api from "../../api/api"; import api from "../../api/api";
import UniShareWx from "@/uni_modules/uni-share-wx/index.vue";
import dataHandling from "@/util/dataHandling"; import dataHandling from "@/util/dataHandling";
export default { export default {
components:{
UniShareWx
},
data() { data() {
return { return {
fileId: null, fileId: null,
...@@ -167,13 +148,8 @@ ...@@ -167,13 +148,8 @@
realName: '' realName: ''
}; };
}, },
onLoad(){
let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName
},
methods: { methods: {
goBack() { goBack() {
console.log(12121232)
uni.navigateBack(1) uni.navigateBack(1)
}, },
// 监听空白关闭 // 监听空白关闭
...@@ -182,11 +158,13 @@ ...@@ -182,11 +158,13 @@
}, },
// 打开微信分享啊 // 打开微信分享啊
reinvite() { reinvite() {
this.$refs.sharewx.open() let dataWXform = {
}, href: "https://mdev.zuihuibi.cn/cffp/pages/courseDetail/courseDetail?fileId=" + this.fileId + '&userId=' + this.userId,
// 关闭微信分享啊 title: "CFFP课程分享",
closeShare() { summary: `立即开启学习之旅`,
this.$refs.sharewx.close() imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
}
this.$refs.sharewx.open(dataWXform)
}, },
shareToggle() { shareToggle() {
this.sliceshare = true this.sliceshare = true
...@@ -198,43 +176,7 @@ ...@@ -198,43 +176,7 @@
url:val.item.link url:val.item.link
}) })
}, },
uniShare(type) {
if (type === 1) {
uni.share({
provider: "weixin",
scene: "WXSceneSession",
type: 0,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId,
title: "CFFP家庭财务策划师联盟邀您加入",
summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
success: function(res) {
console.log("success:" + JSON.stringify(res));
},
fail: function(err) {
console.log("fail:" + JSON.stringify(err));
}
});
} else if (type === 2) {
uni.share({
provider: "weixin",
scene: "WXSceneTimeline",
type: 0,
href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId,
title: "CFFP家庭财务策划师联盟邀您加入",
summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
success: function(res) {
console.log("success:" + JSON.stringify(res));
},
fail: function(err) {
console.log("fail:" + JSON.stringify(err));
}
});
}
},
// 订单保存 // 订单保存
saveOrder() { saveOrder() {
if (this.loginType === 'visitor') { if (this.loginType === 'visitor') {
...@@ -436,14 +378,21 @@ ...@@ -436,14 +378,21 @@
} }
} }
}, },
onLoad(option) {
console.log(option, 2255)
this.fileId = option.fileId;
if(option.userId){
this.userId = option.userId
}
let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName
this.switchTab(1);
},
mounted() { mounted() {
this.switchTab(1); this.switchTab(1);
this.loginType = uni.getStorageSync('loginType') this.loginType = uni.getStorageSync('loginType')
console.log( uni.getStorageSync('loginType'), 555)
},
onLoad(option) {
this.fileId = option.fileId;
}, },
onReady() { onReady() {
this.videoContext = uni.createVideoContext('myVideo'); this.videoContext = uni.createVideoContext('myVideo');
}, },
...@@ -456,41 +405,9 @@ ...@@ -456,41 +405,9 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.popup-content {
font-size: 32rpx;
color: #666;
padding-bottom: 40rpx;
.shareBox {
display: flex;
justify-content: space-around;
align-items: center;
.shareOptionItem {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.imgBox {
width: 100rpx;
}
}
}
}
.popup-footer {
color: #666;
font-size: 36rpx;
border-top: 2rpx solid #f0f0f0;
display: flex;
justify-content: center;
align-items: center;
padding-top: 36rpx;
}
.courseBannerBox { .courseBannerBox {
height: 300rpx; height: 300rpx;
margin-top: 20rpx;
background-color: #ebebeb; background-color: #ebebeb;
display: flex; display: flex;
justify-content: center; justify-content: center;
......
pages/learnCertify/learnCertify.vue
...@@ -12,13 +12,18 @@ ...@@ -12,13 +12,18 @@
<!-- <view class="isUnder" style="border: 2rpx solid #3671F4;" v-if="certifyItem.isAdopt=='1'"> <!-- <view class="isUnder" style="border: 2rpx solid #3671F4;" v-if="certifyItem.isAdopt=='1'">
认证中 认证中
</view> --> </view> -->
<view :class="certifyItem.isAdopt=='1' ? 'isUnder' : certifyItem.isAdopt=='3' ? 'isAdopt' : ''" > <view :class="certifyItem.isAdopt=='1' ? 'isUnder' : certifyItem.isAdopt=='3' ? 'isAdopt' : ''" >
<span v-if="certifyItem.isAdopt=='1'">认证中</span> <span v-if="certifyItem.isAdopt=='1'">认证中</span>
<span v-if="certifyItem.isAdopt=='3'">通过认证</span> <span v-if="certifyItem.isAdopt=='3'">通过认证</span>
</view> </view>
<image :src="certifyItem.cerLogoUrl" mode="widthFix"></image> <view class="" >
<text class="certify_name">{{certifyItem.cerName}}</text> <image :src="certifyItem.cerLogoUrl" mode="widthFix"></image>
<view class="view_btn" @click="switchDetail(certifyItem)"> </view>
<view class="" style="flex: 1;text-align: center;">
<text class="certify_name">{{certifyItem.cerName}}</text>
</view>
<view class="view_btn" @click="switchDetail(certifyItem)" >
<span>{{certifyItem.isAdopt=='3'?'查看证书':'认证详情'}}</span> <span>{{certifyItem.isAdopt=='3'?'查看证书':'认证详情'}}</span>
</view> </view>
</view> </view>
...@@ -83,7 +88,7 @@ ...@@ -83,7 +88,7 @@
}, },
methods:{ methods:{
getLearnCertifyList(){ getLearnCertifyList(){
api.queryCertificateList({userId: 1}).then((res)=>{ api.queryCertificateList({userId: this.userId}).then((res)=>{
console.log(res) console.log(res)
if(res['success']){ if(res['success']){
this.certificates = res['data']['certificates']; this.certificates = res['data']['certificates'];
......
pages/myCertify/myCertify.vue
...@@ -71,8 +71,7 @@ ...@@ -71,8 +71,7 @@
} }
}, },
querySignupList(){ querySignupList(){
api.querySignupList({userId:1}).then(res=>{ api.querySignupList({userId:this.userId}).then(res=>{
console.log(res);
if(res['success']){ if(res['success']){
this.signupInfos = res['data']['signupInfos'] this.signupInfos = res['data']['signupInfos']
} }
......
pages/personalCenter/system/accontsetting.vue
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
{ {
title: '注销账号', title: '注销账号',
icon: '', icon: '',
link: '', link: '/pages/personalCenter/system/cancellation',
isOpen: true, isOpen: true,
isShow: true, isShow: true,
isTips: true, isTips: false,
isType: 'radio' isType: 'radio'
} }
] ]
......
pages/personalCenter/system/cancellation.vue 0 → 100644
<template>
<view>
<view class="" style="text-align: center;font-size: 40rpx;">
<text>注销手机号：</text>
<text style="color: #20269B;">{{mobile}}</text>
</view>
<view class="" style="margin: 40rpx;">
<text style="font-size: 28rpx;">注销账号后不可恢复，该账号绑定的所有权益、积分、记录等数据也将都被清空且无法恢复，包括：</text>
</view>
<view class="" style="margin: 20rpx 40rpx;color: #666666;">
<p>1.所有积分权益不可使用</p>
<p>2.已购买的课程无法观看</p>
<p>3.已获得认证的证书无法查看</p>
<p>4.学习数据将被清除</p>
</view>
<view class="footer" style="">
<view class="footer-cancelbtn" style="" @click="cancel()">
<text>取消</text>
</view>
<view class="footer-submitbtn" style="" @click="sunmit()">
<text>确认</text>
</view>
</view>
</view>
</template>
<script>
import api from "../../../api/api";
export default {
data() {
return {
mobile:'',
userId: uni.getStorageSync('cffp_userId')
}
},
onLoad() {
let dataForm = uni.getStorageSync('userinfodataForm')
this.mobile = dataForm.mobile
},
methods: {
cancel(){
uni.navigateBack(1)
},
sunmit(){
api.cancellation({userId: this.userId}).then(res =>{
if(res['success']){
uni.showToast({
title: '操作成功',
icon: 'none'
});
uni.reLaunch({
url:'/components/login/login'
})
}
})
}
}
}
</script>
<style lang="scss">
.footer{
display: flex;justify-content: center;position: fixed;bottom: 40rpx;width: 100vw;
.footer-submitbtn{
text-align: center;
line-height: 80rpx;
width: 300rpx;
height: 80rpx;
border-radius: 20rpx;
margin: 0 40rpx;
color: #FFFFFF;
background-color: #20269B;
opacity: 1;
border: 2rpx solid #20269B;
}
.footer-cancelbtn{
text-align: center;
line-height: 80rpx;
width: 300rpx;
height: 80rpx;
border-radius: 20rpx;
margin: 0 40rpx;
opacity: 1;
border: 2rpx solid #20269B;
}
}
</style>
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -7,20 +7,26 @@ ...@@ -7,20 +7,26 @@
<text :class="{'actived': tabType===3}" @click="switchTab(3)">其他</text> <text :class="{'actived': tabType===3}" @click="switchTab(3)">其他</text>
</view> </view>
<!-- tab内容 --> <!-- tab内容 -->
<view class="tabContent" v-if="levelName"> <view class="tabContent">
<view v-if="tabType===1"> <view v-if="tabType===1">
<members v-if="directList" :directList="directList" :levelName = "levelName" :count= "count"></members> <members v-if="directList" :directList="directList" :levelName = "levelName" :count= "count"></members>
<view v-else class="zdata" >
<text>暂无数据!</text>
</view>
</view> </view>
<view v-if="tabType===2"> <view v-if="tabType===2">
<jurisdiction v-if="raiseList" :raiseList="raiseList"></jurisdiction> <jurisdiction v-if="raiseList" :raiseList="raiseList"></jurisdiction>
<view v-else class="zdata" style="">
<text>暂无数据!</text>
</view>
</view> </view>
<view class="other" v-if="tabType===3"> <view class="other" v-if="tabType===3">
<other-team v-if="otherList" :otherList="otherList"></other-team> <other-team v-if="otherList" :otherList="otherList"></other-team>
<view v-else class="zdata" style="">
<text>暂无数据!</text>
</view>
</view> </view>
</view> </view>
<view class="" style="margin-top: 40rpx;color: #666666;">
<text>暂无数据!</text>
</view>
</view> </view>
</template> </template>
...@@ -60,26 +66,27 @@ ...@@ -60,26 +66,27 @@
userId: this.userId userId: this.userId
}).then(res =>{ }).then(res =>{
if(res['success']){ if(res['success']){
if(res.data.orgInfo) { let data = res.data
this.levelName =res.data.orgInfo.levelName; if(data.orgInfo) {
this.count = res.data.orgInfo.count; this.levelName =data.orgInfo.levelName;
this.count = data.orgInfo.count;
} }
if(this.directList){ if(data.directList.length != 0 && data.directList != null){
this.directList = res['data']['directList']; this.directList = data['directList'];
this.directList.forEach((x)=>{ this.directList.forEach((x)=>{
this.$set(x, 'hasChildren' , true) this.$set(x, 'hasChildren' , true)
this.$set(x, 'children' , []) this.$set(x, 'children' , [])
}) })
} }
if(this.raiseList) { if(data.raiseList.length != 0 && data.raiseList != null) {
this.raiseList = res['data']['raiseList']; this.raiseList = data['raiseList'];
this.raiseList.forEach((x)=>{ this.raiseList.forEach((x)=>{
this.$set(x, 'hasChildren', true) this.$set(x, 'hasChildren', true)
this.$set(x, 'children' , []) this.$set(x, 'children' , [])
}) })
} }
if(this.otherList){ if(data.other.length != 0 && data.other != null){
this.otherList = res['data']['other']; this.otherList = data['other'];
} }
} }
}) })
...@@ -132,6 +139,11 @@ ...@@ -132,6 +139,11 @@
.text-ce{ .text-ce{
margin: auto; margin: auto;
} }
.zdata{
width: 100vw;
text-align: center;
margin-top: 40rpx;color: #666666;
}
.tabContent { .tabContent {
display: flex; display: flex;
align-items: center; align-items: center;
......
pages/personalCenter/teamPerformance/teamPerformance.vue
...@@ -252,8 +252,8 @@ ...@@ -252,8 +252,8 @@
.content-btn_under-text-Check { .content-btn_under-text-Check {
text-align: center; text-align: center;
width: 128rpx; // width: 128rpx;
height: 48rpx; // height: 48rpx;
font-size: 32rpx; font-size: 32rpx;
font-weight: 800; font-weight: 800;
color: #20279B; color: #20279B;
......
uni_modules/uni-share-wx/index.vue 0 → 100644
<template>
<view class="">
<!-- 分享信息 -->
<view>
<uni-popup ref="sharewx" type="bottom" backgroundColor="#fff">
<view class="popup-content">
<view class="shareBox">
<view class="shareOptionItem" @click="uniShare(1)">
<view class="imgBox">
<image src="../../static/app-plus/sharemenu/wechatfriend.png" mode="widthFix"></image>
</view>
<text>微信好友</text>
</view>
<view class="shareOptionItem" @click="uniShare(2)">
<view class="imgBox">
<image src="../../static/app-plus/sharemenu/wechatmoments.png" mode="widthFix"></image>
</view>
<text>分享朋友圈</text>
</view>
</view>
</view>
<view class="popup-footer" @click="closeShare()">
<view>取消</view>
</view>
</uni-popup>
</view>
</view>
</template>
<script>
export default {
data() {
return {
WXdata:{}
}
},
methods:{
open(option) {
console.log(option, 155)
this.WXdata = option
this.$refs.sharewx.open()
},
// 关闭微信分享啊
closeShare() {
this.$refs.sharewx.close()
},
uniShare(type) {
// if (type === 1) {
uni.share({
provider: "weixin",
scene: type === 1? "WXSceneSession":"WXSceneTimeline",
type: 0,
href: this.WXdata.href,
title: this.WXdata.title,
summary: this.WXdata.summary,
imageUrl: this.WXdata.imageUrl,
success: function(res) {
console.log("success:" + JSON.stringify(res));
},
fail: function(err) {
console.log("fail:" + JSON.stringify(err));
}
});
},
}
}
</script>
<style lang="scss">
.popup-footer {
color: #666;
font-size: 36rpx;
border-top: 2rpx solid #f0f0f0;
display: flex;
justify-content: center;
align-items: center;
padding-top: 36rpx;
}
.popup-content {
font-size: 32rpx;
color: #666;
padding-bottom: 40rpx;
.shareBox {
display: flex;
justify-content: space-around;
align-items: center;
.shareOptionItem {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.imgBox {
width: 100rpx;
}
}
}
}
</style>
\ No newline at end of file
util/uploaderFile.ts
...@@ -8,7 +8,7 @@ export function CommonUpload(psrams) { ...@@ -8,7 +8,7 @@ export function CommonUpload(psrams) {
uni.chooseImage({ uni.chooseImage({
count: 1, //默认9 count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有 sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['album'], //从相册选择 sourceType: ['album','camera'], //从相册选择
success: function(res) { success: function(res) {
// res.tempFiles 数组 // res.tempFiles 数组
// for (var i = 0; i < res.tempFiles.length; i++) { // for (var i = 0; i < res.tempFiles.length; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment