Skip to content

C
CFFP-HB
Commit 76b09e8b by kyle
Options

Merge branch 'dev' of http://139.224.139.2:9091/chaosun/CFFP into dev

parents 3eec844f c0da905c
Showing with 78 additions and 113 deletions
pages/authentication-query/authentication-query.vue
...@@ -50,14 +50,9 @@ ...@@ -50,14 +50,9 @@
}, },
methods:{ methods:{
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
}, },
selectType(item){ selectType(item){
this.queryType = item.id; this.queryType = item.id;
......
pages/authentication-query/authentication-result.vue
...@@ -53,14 +53,9 @@ ...@@ -53,14 +53,9 @@
return dataHandling.dateFormat(val,'yyyy-MM-dd') return dataHandling.dateFormat(val,'yyyy-MM-dd')
}, },
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
}, },
getResult(){ getResult(){
const param = { const param = {
......
pages/courseDetail/courseDetail.vue
...@@ -40,17 +40,7 @@ ...@@ -40,17 +40,7 @@
<text>唤醒App</text> <text>唤醒App</text>
</view> --> </view> -->
<!-- v-if="isWeixin == true" --> <!-- v-if="isWeixin == true" -->
<view class="awakenApp" v-if="isWeixin == true">
<wx-open-launch-app id="launch-btn" appid="wxb591d0034cdcf0cd" extinfo="extinfo" v-if="isWeixin == true">
<view v-is="'script'" type="text/wxtag-template">
<!-- <view class="" style="width: 50rpx; height: 50rpx;">
<image style="width: 50rpx; height: 50rpx;" src="../../static/Slice117.png" mode=""></image>
</view> -->
<!-- <text>唤醒App</text> -->
<button class="btn" style="color: #FFFFFF;margin-left: 10rpx;">唤醒App</button>
</view>
</wx-open-launch-app>
</view>
<strong> <strong>
</strong> </strong>
...@@ -678,9 +668,9 @@ ...@@ -678,9 +668,9 @@
console.log('success'); console.log('success');
}); });
btn.addEventListener('error', function(e) { btn.addEventListener('error', function(e) {
uni.navigateTo({ // uni.navigateTo({
url:'/pages/downloadApp/downloadApp' // url:'/pages/downloadAppCommon/downloadAppCommon'
}) // })
// uni.showModal({ // uni.showModal({
// title: '系统消息', // title: '系统消息',
// content: '您的手机未找到当前应用，是否去下载？', // content: '您的手机未找到当前应用，是否去下载？',
......
pages/index/index.vue
...@@ -46,7 +46,12 @@ ...@@ -46,7 +46,12 @@
<h4>精品课程</h4> <h4>精品课程</h4>
<view @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view> <view @click="goToCourselist()">更多<text class="iconfont icon-youjiantou"></text></view>
</view> </view>
<courselist :tagIds="[1111]" :onlyShowList="0"></courselist> <!-- <courselist :onlyShowList="0"></courselist> -->
<view class="ulBox" v-if="cffpCourseInfos.length>0">
<view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" :summaryBox="item.fileSynopsis" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}"></course-item>
</view>
</view>
</view> </view>
<!-- <tabBar :currentPage="currentPage"></tabBar> --> <!-- <tabBar :currentPage="currentPage"></tabBar> -->
</view> </view>
...@@ -63,9 +68,11 @@ ...@@ -63,9 +68,11 @@
import tabBar from '../../components/tabBar/tabBar.vue'; import tabBar from '../../components/tabBar/tabBar.vue';
import carousel from '@/components/carousel/carousel.vue'; import carousel from '@/components/carousel/carousel.vue';
import search from '@/components/search/search.vue'; import search from '@/components/search/search.vue';
import courseItem from "@/components/courseItem/courseItem.vue";
export default { export default {
data() { data() {
return { return {
cffpCourseInfos:[],
x: 0, x: 0,
y: 0, y: 0,
old: { old: {
...@@ -145,14 +152,16 @@ ...@@ -145,14 +152,16 @@
userId: uni.getStorageSync('cffp_userId'), userId: uni.getStorageSync('cffp_userId'),
shareId: null, shareId: null,
kefu: '../../static/kefu.png', kefu: '../../static/kefu.png',
loginornot: true loginornot: true,
queryName:''
} }
}, },
components: { components: {
courselist, courselist,
tabBar, tabBar,
carousel, carousel,
search search,
courseItem
}, },
onLoad(options) { onLoad(options) {
if (uni.getStorageSync('isLogin')) { if (uni.getStorageSync('isLogin')) {
...@@ -163,6 +172,7 @@ ...@@ -163,6 +172,7 @@
url: '/components/login/login' url: '/components/login/login'
}) })
} }
this.courseList()
}, },
onShow() { onShow() {
let loginType = uni.getStorageSync('loginType') let loginType = uni.getStorageSync('loginType')
...@@ -171,6 +181,27 @@ ...@@ -171,6 +181,27 @@
}; };
}, },
methods: { methods: {
goDetail(item){
uni.navigateTo({
url: `/pages/courseDetail/courseDetail?fileId=${item.fileId}`
});
},
courseList(){
const param = {
queryName:this.queryName
}
api.courseList(param).then(res=>{
if(res['success']){
this.cffpCourseInfos = res['data']['data'];
}else{
uni.showToast({
title: res['message'],
duration: 2000,
icon: 'none'
})
}
})
},
tokefu() { tokefu() {
let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数 let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数
uni.navigateTo({ uni.navigateTo({
......
pages/inviteJoin/inviteJoin.vue
...@@ -171,17 +171,9 @@ ...@@ -171,17 +171,9 @@
}, },
methods: { methods: {
goBack(){ goBack(){
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}); })
// let back = getCurrentPages();
// if(back && back.length>1) {
// uni.navigateBack({
// delta: 1
// });
// }else{
// history.back();
// }
}, },
// 暂时废弃 // 暂时废弃
// blueInput(name) { // blueInput(name) {
......
pages/myCertify/myCertify.vue
...@@ -64,14 +64,9 @@ ...@@ -64,14 +64,9 @@
}, },
methods:{ methods:{
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
}, },
switchTab(type){ switchTab(type){
this.tabType = type; this.tabType = type;
......
pages/myLearning/myLearning.vue
...@@ -61,14 +61,6 @@ ...@@ -61,14 +61,6 @@
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}); });
// let back = getCurrentPages();
// if(back && back.length>1) {
// uni.navigateBack({
// delta: 1
// });
// }else{
// history.back();
// }
}, },
userStudyList(){ userStudyList(){
api.userStudyList({userId:this.userId}).then(res=>{ api.userStudyList({userId:this.userId}).then(res=>{
......
pages/myPoints/myPoints.vue
...@@ -165,14 +165,9 @@ ...@@ -165,14 +165,9 @@
} }
}, },
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
} }
} }
} }
......
pages/myPoints/pointsDetail.vue
<template> <template>
<view class="container"> <view class="container">
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: -20rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: -15rpx;"></text>
<picker @change="changeProductType" :value="dropOptionName" :range="productTypeList" <picker @change="changeProductType" :value="productTypeIdx" :range="productTypeList"
range-key="dropOptionName"> range-key="dropOptionName">
<view class="uni-input">{{productTypeList[productTypeIdx]['dropOptionName']}} <view class="uni-input">{{productTypeList[productTypeIdx]['dropOptionName']}}
<text class="iconfont icon-youjiantou"></text> <text class="iconfont icon-youjiantou"></text>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<text class="iconfont icon-youjiantou"></text> <text class="iconfont icon-youjiantou"></text>
</view> </view>
</picker> </picker>
<picker @change="changeCommissionType" :value="dropOptionName" :range="commissionTypeList" <picker @change="changeCommissionType" :value="commissionTypeIdx" :range="commissionTypeList"
range-key="dropOptionName"> range-key="dropOptionName">
<view class="uni-input">{{commissionTypeList[commissionTypeIdx]['dropOptionName']}} <view class="uni-input">{{commissionTypeList[commissionTypeIdx]['dropOptionName']}}
<text class="iconfont icon-youjiantou"></text> <text class="iconfont icon-youjiantou"></text>
...@@ -94,14 +94,9 @@ ...@@ -94,14 +94,9 @@
}, },
methods:{ methods:{
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
}, },
bindDateChange: function(e) { bindDateChange: function(e) {
this.fortuneDate = e.detail.value; this.fortuneDate = e.detail.value;
...@@ -186,6 +181,7 @@ ...@@ -186,6 +181,7 @@
align-items: center; align-items: center;
margin:40rpx auto 20rpx auto; margin:40rpx auto 20rpx auto;
background: #fff; background: #fff;
position: relative;
.icon-youjiantou{ .icon-youjiantou{
transform: rotate(90deg); transform: rotate(90deg);
width: 16px; width: 16px;
......
pages/personalCenter/myTeam.vue
...@@ -25,14 +25,9 @@ ...@@ -25,14 +25,9 @@
}, },
methods: { methods: {
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
}, },
goteam(item) { goteam(item) {
console.log(item) console.log(item)
......
pages/personalCenter/system/settings.vue
...@@ -20,6 +20,7 @@ import MenuList from "@/components/menuList/menuList.vue" ...@@ -20,6 +20,7 @@ import MenuList from "@/components/menuList/menuList.vue"
components:{ MenuList }, components:{ MenuList },
data() { data() {
return { return {
menuList:null,
minorMenuLists: [{ minorMenuLists: [{
title: '账号绑定设置', title: '账号绑定设置',
icon: 'shareEcode', icon: 'shareEcode',
......
pages/personalCenter/teamMembers/jurisdiction.vue
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
<text>成员数量</text> <text>成员数量</text>
</view> </view>
</view> </view>
<lazy-tree :datatitleList="datatitleList" :dataList="getList(item,dataList)" type="2"></lazy-tree> <lazy-tree :datatitleList="datatitleList" :dataList="item.memberList" type="2"></lazy-tree>
<!-- <lazy-tree :datatitleList="datatitleList" :dataList="getList(item,dataList)" type="2"></lazy-tree> -->
<!-- <myteam-table :datatitleList="datatitleList" :dataList="raiseList" type="2"></myteam-table> --> <!-- <myteam-table :datatitleList="datatitleList" :dataList="raiseList" type="2"></myteam-table> -->
<!-- <view class="table-content"> <!-- <view class="table-content">
<span>辖下组织/成员</span> <span>辖下组织/成员</span>
......
pages/personalCenter/teamMembers/teamMembers.vue
...@@ -63,14 +63,9 @@ ...@@ -63,14 +63,9 @@
}, },
methods:{ methods:{
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
}, },
getmyseatem() { getmyseatem() {
api.queryMyTeamInfo({ api.queryMyTeamInfo({
......
pages/pointsExchange/pointsExchange.vue
...@@ -69,14 +69,9 @@ ...@@ -69,14 +69,9 @@
}, },
methods:{ methods:{
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
}, },
queryByUserIdFortuneStatistic(){ queryByUserIdFortuneStatistic(){
api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{ api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
......
pages/saleCourseLists/saleCourseLists.vue
...@@ -100,14 +100,9 @@ ...@@ -100,14 +100,9 @@
}, },
methods: { methods: {
goBack(){ goBack(){
let back = getCurrentPages(); uni.navigateBack({
if(back && back.length>1) { delta: 1
uni.navigateBack({ });
delta: 1
});
}else{
history.back();
}
}, },
curriculumDetail(item){ curriculumDetail(item){
uni.navigateTo({ uni.navigateTo({
...@@ -180,9 +175,11 @@ ...@@ -180,9 +175,11 @@
onLoad() { onLoad() {
this.userCourseCount() this.userCourseCount()
this.userCourseList() this.userCourseList()
},
mounted() {
},
onShow() {
let app22 = getCurrentPages().length
console.log(app22)
} }
} }
</script> </script>
......
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