Skip to content

C
CFFP-HB
Commit c3e515e5 by sunerhu
Options

1.添加引导页 

2.修改了一些Bug
parent 42234a3f
Showing with 203 additions and 59 deletions
components/bootpage/bootpage.vue 0 → 100644
<template>
<view class="content">
<view class="" style="display: flex;justify-content: space-between;">
<view class="" style="">
</view>
<view class="header">
<image style="width: 180rpx;
height: 120rpx;" src="../../static/Group132.png" mode=""></image>
</view>
<!-- <view class="">
<image src="../../static/bo" mode=""></image>
</view> -->
</view>
<view class="" style="text-align: center;">
<view class="" style="display: flex;justify-content: center;">
<span class="text">戳这里，点击
</span>
<view class="" style="width: 100rpx;height: 100rpx;padding: 0 20rpx;">
<image style="width: 100rpx;height: 100rpx;" src="../../static/Slice146.png" mode=""></image>
</view>
<span class="text">按钮，</span>
</view>
<span class="text" style="margin-top: 40rpx;"> 使用系统浏览器打开!</span>
</view>
<view class="footer" @click="closebootpage()">
<text style="line-height: 80rpx;">我知道了</text>
</view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods:{
closebootpage(){
this.$emit('close')
},
}
}
</script>
<style lang="scss">
.content {
position: fixed;
width: 100vw;
height: 100vh;
top: 50%;
left: 50%;
transform: translate3d(-50%, -50%, 0);
/* width: -webkit-fill-available;
height: -webkit-fill-available; */
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-webkit-transition: .2s;
transition: .2s;
background-color: rgba(36, 36, 36, 0.5);
z-index: 999;
.header {
// float:right;
width: 200rpx;
height: 120rpx;
}
}
.text {
padding-top: 40rpx;
font-weight: bold;
color: #FFFFFF;
font-size: 36rpx;
}
.footer{
width: 200rpx;
height: 80rpx;
border-radius: 66rpx 66rpx 66rpx 66rpx;
opacity: 1;
color: #FFFFFF;
border: 2rpx solid #FFFFFF;
text-align: center;
margin: auto;
margin-top: 60rpx;
}
</style>
components/myteam/time-picker.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<picker mode="date" :value="queryDate" :end="maxDate" :fields="fields" @change="bindDateChange"> <picker mode="date" :value="queryDate" :end="maxDate" :fields="fields" @change="bindDateChange">
<view class="uni-input">{{queryDate}}</view> <view class="uni-input">{{queryDate}}</view>
</picker> </picker>
<i v-if="icon == true" class="iconfont icon-youjiantou"></i> <i v-if="icon" class="iconfont icon-youjiantou"></i>
</view> </view>
</view> </view>
</template> </template>
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
}; };
}, },
mounted() { mounted() {
console.log(this.icon, 74741)
if(this.fields == "month"){ if(this.fields == "month"){
this.queryDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}` this.queryDate = `${new Date().getFullYear()}-${new Date().getMonth() + 1}`
}else if (this.fields == "year") { }else if (this.fields == "year") {
......
components/tabBar/tabBar.vue
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
}, },
methods: { methods: {
navTo(item) { navTo(item) {
console.log(item ,1154)
if (item.link != this.currentPage) { if (item.link != this.currentPage) {
// uni.navigateTo({ // uni.navigateTo({
// url:`/pages/${item.link}/${item.link}` // url:`/pages/${item.link}/${item.link}`
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
} }
}, },
mounted() { mounted() {
console.log(this.currentPage) console.log(this.currentPage,1114)
} }
} }
</script> </script>
......
pages/application-process/work-experience.vue
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
dataForm:{ dataForm:{
loginId: uni.getStorageSync('cffp_userId'), loginId: uni.getStorageSync('cffp_userId'),
targetType: "5", targetType: "5",
targetId: uni.getStorageSync('cffp_userId'), targetId: '',
targetNo: "1", targetNo: "1",
targetUseFor: "12", targetUseFor: "12",
targetSeq: "0" targetSeq: "0"
...@@ -149,6 +149,8 @@ ...@@ -149,6 +149,8 @@
}) })
}, },
upLoadPhoto(event){ upLoadPhoto(event){
console.log(this.applyParam, 1211)
this.dataForm.targetId = this.applyParam.id
if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){ if(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2){
CommonUpload(this.dataForm).then(res => { CommonUpload(this.dataForm).then(res => {
this.applyParam.certificate = res.data.filePath; this.applyParam.certificate = res.data.filePath;
...@@ -200,6 +202,7 @@ ...@@ -200,6 +202,7 @@
api.queryById({id:id,userId:userId}).then((res)=>{ api.queryById({id:id,userId:userId}).then((res)=>{
console.log(res) console.log(res)
if(res['success']){ if(res['success']){
console.log(res, 144)
this.applyParam = res['data']['data']; this.applyParam = res['data']['data'];
if(this.applyParam.certificate){ if(this.applyParam.certificate){
this.picList = this.applyParam.certificate.split(','); this.picList = this.applyParam.certificate.split(',');
......
pages/courseDetail/courseDetail.vue
...@@ -258,10 +258,9 @@ ...@@ -258,10 +258,9 @@
courseDetail() { courseDetail() {
api.courseDetail({ api.courseDetail({
fileId: this.fileId, fileId: this.fileId,
userId: 1, userId: this.userId,
packFileId: this.courseInfo.packFileId packFileId: this.courseInfo.packFileId
}).then(res => { }).then(res => {
console.log('课程详情', res);
if (res['success']) { if (res['success']) {
this.courseInfo = res['data']['data']; this.courseInfo = res['data']['data'];
this.lecturerId = res['data']['data']['fileLecturerId']; this.lecturerId = res['data']['data']['fileLecturerId'];
...@@ -397,6 +396,7 @@ ...@@ -397,6 +396,7 @@
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) { onLoad(option) {
this.fileId = option.fileId; this.fileId = option.fileId;
......
pages/learnCertify/learnCertify.vue
...@@ -9,8 +9,12 @@ ...@@ -9,8 +9,12 @@
</view> </view>
<view class="list_wrapper"> <view class="list_wrapper">
<view class="list_content" v-for="(certifyItem,idx) in certificates"> <view class="list_content" v-for="(certifyItem,idx) in certificates">
<view class="isAdopt" v-if="certifyItem.isAdopt=='2'"> <!-- <view class="isUnder" style="border: 2rpx solid #3671F4;" v-if="certifyItem.isAdopt=='1'">
通过认证 认证中
</view> -->
<view :class="certifyItem.isAdopt=='1' ? 'isUnder' : 'isAdopt'" >
<span v-if="certifyItem.isAdopt=='1'">认证中</span>
<span v-if="certifyItem.isAdopt=='3'">通过认证</span>
</view> </view>
<image :src="certifyItem.cerLogoUrl" mode="widthFix"></image> <image :src="certifyItem.cerLogoUrl" mode="widthFix"></image>
<text class="certify_name">{{certifyItem.cerName}}</text> <text class="certify_name">{{certifyItem.cerName}}</text>
...@@ -145,6 +149,16 @@ ...@@ -145,6 +149,16 @@
left: 0; left: 0;
font-size: 28rpx; font-size: 28rpx;
} }
.isUnder{
position: absolute;
border: 2rpx solid #3671F4;
text-align: center;
color: #3671F4;
transform: rotate(-45deg);
padding: 10rpx;
left: 0;
font-size: 28rpx;
}
image{ image{
width:80rpx!important; width:80rpx!important;
} }
......
pages/orderConfirm/orderConfirm.vue
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
<view><text>现价</text><text>￥{{courseInfoItem.coursePrice}}</text></view> <view><text>现价</text><text>￥{{courseInfoItem.coursePrice}}</text></view>
<view> <view>
<text @click="toggle(1,'bottom')">积分抵扣<i class="iconfont icon-31tishi"></i></text> <text @click="toggle(1,'bottom')">积分抵扣<i class="iconfont icon-31tishi"></i></text>
<text class="integralBox" @click="toggle(2,'bottom')">{{!isDeduction ? '未选' : '已选'}}积分，可抵扣{{deductionCore}}<i class="iconfont icon-youjiantou"></i></text> <text class="integralBox" @click="toggle(2,'bottom')" v-if="intergralInfo.preFortune">{{!isDeduction ? '未选' : '已选'}}积分，可抵扣{{deductionCore}}<i class="iconfont icon-youjiantou"></i></text>
<text style="color: #666666;font-size: 30rpx;" v-else>暂无积分</text>
</view> </view>
<view><text>合计</text><text>￥{{totalPrice}}</text></view> <view><text>合计</text><text>￥{{totalPrice}}</text></view>
</view> </view>
...@@ -43,7 +44,9 @@ ...@@ -43,7 +44,9 @@
<view class="totalContent"> <view class="totalContent">
<view class="priceInfoBox"> <view class="priceInfoBox">
<view>合计： <strong style="font-size: 36rpx;">￥{{totalPrice}}</strong></view> <view>合计： <strong style="font-size: 36rpx;">￥{{totalPrice}}</strong></view>
<view>共优惠：<strong style="color:#F15A1F">￥{{deductionCore * intergralInfo.preFortune }}</strong> </view> <view>共优惠：<strong style="color:#F15A1F" v-if="intergralInfo.preFortune">￥{{deductionCore * intergralInfo.preFortune }}</strong>
<text style="color:#F15A1F" v-else>0</text>
</view>
</view> </view>
<view class="confirmOrder" @click="pay()">提交订单</view> <view class="confirmOrder" @click="pay()">提交订单</view>
</view> </view>
...@@ -61,7 +64,7 @@ ...@@ -61,7 +64,7 @@
<view style="display: flex;"> <view style="display: flex;">
<text>可抵扣</text> <text>可抵扣</text>
<view class="integralInfoBox"> <view class="integralInfoBox">
<text class="deductionCount">￥{{deductionCore * intergralInfo.preFortune}}</text> <text class="deductionCount" >￥{{deductionCore * intergralInfo.preFortune || '0'}}</text>
<text>需{{deductionCore}}积分兑换</text> <text>需{{deductionCore}}积分兑换</text>
</view> </view>
</view> </view>
...@@ -167,7 +170,7 @@ ...@@ -167,7 +170,7 @@
} }
if(this.paymentMethod==1){ if(this.paymentMethod==1){
api.wxAppPay(param).then(res=>{ api.wxAppPay(param).then(res=>{
console.log(res) this.paymentBtnDisabled = false;
}) })
}else if(this.paymentMethod==2){ }else if(this.paymentMethod==2){
api.aliAppPay(param).then(res=>{ api.aliAppPay(param).then(res=>{
......
pages/personalCenter/personalCenter.vue
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
} }
}, },
components:{ components:{
tabBar tabBar,
}, },
onShow() { onShow() {
uni.$on("handClick", res => { uni.$on("handClick", res => {
...@@ -138,6 +138,9 @@ ...@@ -138,6 +138,9 @@
}) })
}, },
methods: { methods: {
close(){
this.bootpage = false
},
updateData(val){ updateData(val){
console.log('我来修改一些数据') console.log('我来修改一些数据')
}, },
......
pages/personalCenter/system/accontsetting.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
title: '手机号绑定', title: '手机号绑定',
icon: '', icon: '',
link: '', link: '',
contentType:uni.getStorageSync('user_mobile'), contentType: uni.getStorageSync('user_mobile'),
isOpen: true, isOpen: true,
isShow: true, isShow: true,
isTips: false, isTips: false,
......
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<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"> <view class="tabContent" v-if="levelName">
<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> </view>
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
<other-team v-if="otherList" :otherList="otherList"></other-team> <other-team v-if="otherList" :otherList="otherList"></other-team>
</view> </view>
</view> </view>
<view class="" style="margin-top: 40rpx;color: #666666;">
<text>暂无数据!</text>
</view>
</view> </view>
</template> </template>
...@@ -56,21 +59,28 @@ ...@@ -56,21 +59,28 @@
api.queryMyTeamInfo({ api.queryMyTeamInfo({
userId: this.userId userId: this.userId
}).then(res =>{ }).then(res =>{
console.log(res, 7744)
if(res['success']){ if(res['success']){
this.levelName = res.data.orgInfo.levelName; if(res.data.orgInfo) {
this.count = res.data.orgInfo.count; this.levelName =res.data.orgInfo.levelName;
this.directList = res['data']['directList']; this.count = res.data.orgInfo.count;
this.directList.forEach((x)=>{ }
this.$set(x, 'hasChildren' , true) if(this.directList){
this.$set(x, 'children' , []) this.directList = res['data']['directList'];
}) this.directList.forEach((x)=>{
this.raiseList = res['data']['raiseList']; this.$set(x, 'hasChildren' , true)
this.raiseList.forEach((x)=>{ this.$set(x, 'children' , [])
this.$set(x, 'hasChildren', true) })
this.$set(x, 'children' , []) }
}) if(this.raiseList) {
this.otherList = res['data']['other']; this.raiseList = res['data']['raiseList'];
this.raiseList.forEach((x)=>{
this.$set(x, 'hasChildren', true)
this.$set(x, 'children' , [])
})
}
if(this.otherList){
this.otherList = res['data']['other'];
}
} }
}) })
}, },
...@@ -119,7 +129,9 @@ ...@@ -119,7 +129,9 @@
} }
} }
} }
.text-ce{
margin: auto;
}
.tabContent { .tabContent {
display: flex; display: flex;
align-items: center; align-items: center;
......
pages/personalCenter/teamPerformance/teamPerformance.vue
<template> <template>
<view class="content"> <view class="content">
<view class="header"> <view class="header">
<view> <view class="header-time" style="">
<time-picker @change="change" fields="month" icon="false"> <time-picker @change="change" fields="month" icon="true">
</time-picker> </time-picker>
</view> </view>
<view class="timeSelectContent"> <view style="margin: 10rpx 20rpx;">
<text>至</text> <text>-</text>
</view> </view>
<view> <view class="header-time">
<time-picker @change="changetimeend" fields="month" icon="false"> <time-picker @change="changetimeend" fields="month" icon="true">
</time-picker> </time-picker>
</view> </view>
<!-- <view class="timeSelectContent"> <!-- <view class="timeSelectContent">
...@@ -57,6 +57,9 @@ ...@@ -57,6 +57,9 @@
</view> </view>
<view class="team-c" @click="sortswitch()"> <view class="team-c" @click="sortswitch()">
<view class="" style="width: 30rpx;height: 30rpx;">
<image style="width: 30rpx;height: 30rpx;" src="../../../static/sort.png" mode=""></image>
</view>
<text v-if="teListsort == true">按销售额收入排序</text> <text v-if="teListsort == true">按销售额收入排序</text>
<text v-else>按销售额排序</text> <text v-else>按销售额排序</text>
</view> </view>
...@@ -157,14 +160,14 @@ ...@@ -157,14 +160,14 @@
this.totalOrder = res.data.totalOrder this.totalOrder = res.data.totalOrder
this.totalCoursePrice = res.data.totalCoursePrice this.totalCoursePrice = res.data.totalCoursePrice
this.totalIncome = res.data.totalIncome this.totalIncome = res.data.totalIncome
var dataForm = { // var dataForm = {
courseIncome:'1040', // courseIncome:'1040',
coursePrice: '1040', // coursePrice: '1040',
areaCenterName:'区域二级服务中心', // areaCenterName:'区域二级服务中心',
orderNum: '200', // orderNum: '200',
name: '张柚子' // name: '张柚子'
} // }
this.dataList.push(dataForm) // this.dataList.push(dataForm)
} }
}) })
}, },
...@@ -209,13 +212,16 @@ ...@@ -209,13 +212,16 @@
.header { .header {
display: flex; display: flex;
// justify-content: space-between; justify-content: center;
margin: 0 40rpx; margin: 0 40rpx;
.timeSelectContent{ .timeSelectContent{
margin: 0 40rpx; margin: 0 40rpx;
} }
} }
.header-time{
border: 1px solid #EFEDED;
padding: 10rpx 15rpx;
}
.content-btn { .content-btn {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -223,10 +229,11 @@ ...@@ -223,10 +229,11 @@
} }
.content-btn_under-Check { .content-btn_under-Check {
width: 200rpx; width: 160rpx;
height: 80rpx; height: 80rpx;
background: #20279B; // background: #20279B;''
border-radius: 10rpx; border-bottom: 4rpx solid #20269B;
// border-radius: 10rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
...@@ -234,13 +241,12 @@ ...@@ -234,13 +241,12 @@
} }
.content-btn_under { .content-btn_under {
width: 200rpx; width: 160rpx;
height: 80rpx; height: 80rpx;
border-radius: 10rpx; color: #666666;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
border: 2rpx solid #20279B;
opacity: 1; opacity: 1;
} }
...@@ -249,8 +255,8 @@ ...@@ -249,8 +255,8 @@
width: 128rpx; width: 128rpx;
height: 48rpx; height: 48rpx;
font-size: 32rpx; font-size: 32rpx;
font-weight: 500; font-weight: 800;
color: #FFFFFF; color: #20279B;
line-height: 48rpx; line-height: 48rpx;
} }
...@@ -258,9 +264,9 @@ ...@@ -258,9 +264,9 @@
text-align: center; text-align: center;
width: 128rpx; width: 128rpx;
height: 48rpx; height: 48rpx;
font-weight: 800;
font-size: 32rpx; font-size: 32rpx;
font-weight: 500; color: #666666;
color: #20279B;
line-height: 48rpx; line-height: 48rpx;
} }
...@@ -311,6 +317,9 @@ ...@@ -311,6 +317,9 @@
} }
.team-c { .team-c {
display: flex;
align-items: center;
padding: 0 10rpx;
height: 40rpx; height: 40rpx;
font-size: 28rpx; font-size: 28rpx;
text-align: center; text-align: center;
......
pages/product/product.vue
...@@ -22,11 +22,12 @@ ...@@ -22,11 +22,12 @@
</view> </view>
</view> </view>
<tabBar :currentPage="currentPage"></tabBar> <tabBar :currentPage="currentPage" ></tabBar>
</view> </view>
</template> </template>
<script> <script>
import tabBar from '../../components/tabBar/tabBar.vue';
import courseItem from "@/components/courseItem/courseItem.vue"; import courseItem from "@/components/courseItem/courseItem.vue";
export default { export default {
data() { data() {
......
util/uploaderFile.ts
...@@ -2,7 +2,6 @@ import request from "./request"; ...@@ -2,7 +2,6 @@ import request from "./request";
import { baseURL, apiURL, cffpURL } from "../environments/environment"; import { baseURL, apiURL, cffpURL } from "../environments/environment";
// 上传图片事件 // 上传图片事件
export function CommonUpload(psrams) { export function CommonUpload(psrams) {
console.log(psrams, 784512)
let requestVO = psrams let requestVO = psrams
// @ts-ignore // @ts-ignore
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
...@@ -18,7 +17,9 @@ export function CommonUpload(psrams) { ...@@ -18,7 +17,9 @@ export function CommonUpload(psrams) {
mask: true mask: true
}); });
uni.uploadFile({ uni.uploadFile({
url: `/api/file/upload`, // 后端api接口 // /api/file/upload //pc上传代理
// https://mdev.zuihuibi.cn/api/file/upload
url: `https://mdev.zuihuibi.cn/api/file/upload`, // 后端api接口
filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲 filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
name: 'file', //后端通过'file'获取上传的文件对象 name: 'file', //后端通过'file'获取上传的文件对象
// formData: this.sendDate, // formData: this.sendDate,
...@@ -33,11 +34,19 @@ export function CommonUpload(psrams) { ...@@ -33,11 +34,19 @@ export function CommonUpload(psrams) {
}, },
success: (res) => { success: (res) => {
let data = JSON.parse(res.data) let data = JSON.parse(res.data)
console.log(data, '这是上传成功了吗?')
// // 抛出 // // 抛出
resolve(data) resolve(data)
uni.hideLoading(); uni.hideLoading();
},
fail:(err) =>{
uni.showModal({
content:'上传失败',
showCancel: false
})
uni.hideLoading();
// console.log(data, '发生错误,查看错误日志')
} }
}); });
// } // }
} }
......
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