Skip to content

C
CFFP-HB
Commit 19641169 by yuzhenWang
Options

Merge branch 'feature-20250616wyz-页面翻新' into 'dev' 

Feature 20250616wyz 页面翻新

See merge request !24
parents 16b77b37 6b6bae6f
Showing with 67 additions and 67 deletions
components/clause/clause.vue
<template> <template>
<view class="container" > <view class="container" >
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;" v-if="isBack !=1"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 20rpx;" v-if="isBack !=1"></text>
<!-- #endif -->
<view class="content" v-if="type == 1" :style="{'margin-top': isBack!=1 ? '60rpx' : '0'}"> <view class="content" v-if="type == 1" :style="{'margin-top': isBack!=1 ? '60rpx' : '0'}">
<view class="agreement-container"> <view class="agreement-container">
<!-- <scroll-view scroll-y="true" class="scroll-content"> --> <!-- <scroll-view scroll-y="true" class="scroll-content"> -->
......
pages/courseDetail/courseDetail.vue
...@@ -54,25 +54,11 @@ ...@@ -54,25 +54,11 @@
<view class="" style="width: 100%;"> <view class="" style="width: 100%;">
<h4>{{courseInfo.fileTitle}}</h4> <h4>{{courseInfo.fileTitle}}</h4>
</view> </view>
<view class="shareF">
<!-- <view class="awakenApp" @click="jumpapp()" v-if="coursesharing == 1">
<view class="" style="width: 50rpx; height: 50rpx;">
<image style="width: 50rpx; height: 50rpx;" src="../../static/Slice117.png" mode=""></image>
</view>
<text>唤醒App</text>
</view> -->
<!-- v-if="isWeixin == true" -->
<strong>
</strong>
</view>
</view> </view>
<view class="dataBox"> <view class="dataBox">
<strong v-if="(courseInfo.status==1 || courseInfo.status==2 )&& courseInfo.coursePrice !== 0">￥{{Number(courseInfo.coursePrice).toFixed(2)}}</strong> <strong v-if="(courseInfo.status==1 || courseInfo.status==2 )&& courseInfo.coursePrice !== 0">￥{{Number(courseInfo.coursePrice).toFixed(2)}}</strong>
<!-- <strong v-if="(courseInfo.status==1 || courseInfo.status==2 )&& courseInfo.coursePrice == 0">免费</strong> -->
<!-- <text v-if="courseInfo.status==2" style="color: #F15A1F;margin-right: 20rpx;"><i
class="iconfont icon-yifukuan"></i>已购</text> -->
<text v-if="courseInfo.coursePrice != 0">{{courseInfo.salesNumber}}人{{showName}}</text> <text v-if="courseInfo.coursePrice != 0">{{courseInfo.salesNumber}}人{{showName}}</text>
</view> </view>
...@@ -127,7 +113,7 @@ ...@@ -127,7 +113,7 @@
<view> <view>
<p><text class="lecturerName">{{lecturerInfo.lecturerName}}</text></p> <p><text class="lecturerName">{{lecturerInfo.lecturerName}}</text></p>
<template v-if="lecturerInfo?.lecturerRankNames"> <template v-if="lecturerInfo?.lecturerRankNames">
<p v-for="item in lecturerInfo.lecturerRankNames.split(',')" class="lecturerTitle"> <p v-for="(item,index) in lecturerInfo.lecturerRankNames.split(',')" :key="index" class="lecturerTitle">
<text>{{item}}</text> <text>{{item}}</text>
</p> </p>
</template> </template>
...@@ -456,13 +442,14 @@ ...@@ -456,13 +442,14 @@
this.$refs.share.open() this.$refs.share.open()
}, },
sharechange(val) { sharechange(val) {
if(val.index != 3){ if(val.tabbar){
uni.switchTab({ uni.switchTab({
url: val.item.link url: val.link
}) })
return
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url: val.item.link url: val.link
}) })
} }
}, },
......
pages/courselist/courselist.vue
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
width: 100%; width: 100%;
left: 50%; left: 50%;
transform: translate(-50%); transform: translate(-50%);
bottom: 3%; bottom: -20%;
font-size: 28rpx; font-size: 28rpx;
color: #fff; color: #fff;
.icon-shuangyoujiantou{ .icon-shuangyoujiantou{
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
bottom: -15%; bottom: -40%;
line-height: 1.3; line-height: 1.3;
} }
} }
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
.productList{ .productList{
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
margin-top: -5%; margin-top: -7%;
background-color: #fff; background-color: #fff;
padding: 20rpx; padding: 20rpx;
border-radius: 10rpx; border-radius: 10rpx;
......
pages/index/index.vue
...@@ -210,7 +210,8 @@ ...@@ -210,7 +210,8 @@
name: '成交订单', name: '成交订单',
icon:'icon-dingdan', icon:'icon-dingdan',
link: '/pages/saleCourseLists/saleCourseLists', link: '/pages/saleCourseLists/saleCourseLists',
isOpen: true isOpen: true,
enName:'order'
}, },
{ {
key: '01', key: '01',
...@@ -468,11 +469,7 @@ ...@@ -468,11 +469,7 @@
} }
if (this.cffpUserInfo.partnerType == null && featureItem.isJoin) { if (this.cffpUserInfo.partnerType == null && featureItem.isJoin) {
this.$refs.joinPopup.open() this.$refs.joinPopup.open()
// uni.showToast({
// title: "您本人尚未加盟，您加盟后可邀请加盟",
// duration: 2000,
// icon: 'none'
// });
return false return false
} else if (featureItem.isOpen && featureItem.link) { } else if (featureItem.isOpen && featureItem.link) {
if (featureItem.key == '07') { if (featureItem.key == '07') {
...@@ -480,8 +477,10 @@ ...@@ -480,8 +477,10 @@
url: featureItem.link url: featureItem.link
}) })
} else { } else {
const urlObj = JSON.parse(JSON.stringify(featureItem))
urlObj.link =urlObj.enName=='order'? `${urlObj.link}?partnerType=${this.cffpUserInfo.partnerType}`:urlObj.link
uni.navigateTo({ uni.navigateTo({
url: featureItem.link url: urlObj.link
}) })
} }
} else { } else {
......
pages/myShare/myShare.vue
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
}, },
// 查看佣金 // 查看佣金
viewIntegral(){ viewIntegral(){
if(this.partnerType == 'undefined'){ if(this.partnerType == 'null'){
this.$refs.joinPopup.open() this.$refs.joinPopup.open()
return return
} }
...@@ -224,6 +224,10 @@ ...@@ -224,6 +224,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .uni-popup .uni-popup__wrapper{
margin: 0 !important;
border-radius: 30rpx;
}
.container { .container {
padding-bottom: 20rpx; padding-bottom: 20rpx;
display: flex; display: flex;
......
pages/personalCenter/accountoperation/aboutcffp.vue
<template> <template>
<view class="content"> <view class="content">
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 10rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 10rpx;"></text>
<!-- #endif -->
<view class="header"> <view class="header">
<view class="header-box"> <view class="header-box">
<view class="header-box-img" > <view class="header-box-img" >
......
pages/personalCenter/personalCenter.vue
...@@ -323,25 +323,21 @@ ...@@ -323,25 +323,21 @@
ckidentity(item){ ckidentity(item){
if(item.identity == true && this.customerBasicInfo.partnerType ==null){ if(item.identity == true && this.customerBasicInfo.partnerType ==null){
this.$refs.joinPopup.open() this.$refs.joinPopup.open()
// uni.showToast({
// title: "您本人尚未加盟，您加盟后可邀请加盟",
// duration: 2000,
// icon: 'none'
// });
return false return false
}else if(item.title == '邀请加盟'){ }else if(item.title == '邀请加盟'){
uni.navigateTo({ uni.navigateTo({
url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode url: `${item.link}?levelCode=` + this.customerBasicInfo.levelCode
}); });
}else{ }else{
item.link = `${item.link}?from=personalCenter&partnerType=${item.partnerType}` const urlObj = JSON.parse(JSON.stringify(item))
urlObj.link = `${urlObj.link}?from=personalCenter&partnerType=${this.customerBasicInfo.partnerType}`
if(item.isTab){ if(item.isTab){
uni.switchTab({ uni.switchTab({
url:`../../${item.link}` url:`../../${urlObj.link}`
}) })
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url: item.link url: urlObj.link
}); });
} }
......
pages/personalCenter/system/accontsetting.vue
<template> <template>
<view style="display: flex;flex-direction: column;"> <view style="display: flex;flex-direction: column;">
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 10rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 10rpx;"></text>
<!-- #endif -->
<view class=""> <view class="">
<menu-list :menuList="minorMenuLists"></menu-list> <menu-list :menuList="minorMenuLists"></menu-list>
</view> </view>
......
pages/personalCenter/system/cancellation.vue
<template> <template>
<view class="container"> <view class="container">
<!-- #ifdef APP -->
<view class="top"> <view class="top">
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
<text>注销账号</text> <text>注销账号</text>
</view> </view>
<view class="" style="text-align: center;font-size: 40rpx;"> <!-- #endif -->
<view class="mobileBox" >
<text>注销手机号：</text> <text>注销手机号：</text>
<text style="color: #20269B;">{{hideMoblie(mobile)}}</text> <text style="color: #20269B;">{{hideMoblie(mobile)}}</text>
</view> </view>
...@@ -87,7 +90,7 @@ ...@@ -87,7 +90,7 @@
align-items: center; align-items: center;
position: relative; position: relative;
width: 100%; width: 100%;
margin: 0 auto 60rpx auto; // margin: 0 auto 60rpx auto;
.zuojiantou{ .zuojiantou{
display: inline-block; display: inline-block;
transform: rotate(180deg); transform: rotate(180deg);
...@@ -101,6 +104,11 @@ ...@@ -101,6 +104,11 @@
position: absolute; position: absolute;
} }
} }
.mobileBox{
text-align: center;
font-size: 40rpx;
padding-top: 40rpx;
}
.tips{ .tips{
color: #666666; color: #666666;
li{ li{
......
pages/personalCenter/system/settings.vue
<template> <template>
<view style="display: flex;flex-direction: column;"> <view style="display: flex;flex-direction: column;">
<!-- #ifdef APP -->
<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 10rpx;"></text> <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top: 10rpx;"></text>
<!-- #endif -->
<view> <view>
<menu-list v-if="menuList != 'undefined '" :menuList="minorMenuLists"></menu-list> <menu-list v-if="menuList != 'undefined '" :menuList="minorMenuLists"></menu-list>
</view> </view>
......
pages/saleCourseLists/saleCourseLists.vue
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
// 查看佣金 // 查看佣金
viewIntegral(){ viewIntegral(){
if(this.partnerType == 'undefined'){ if(this.partnerType == 'null'){
this.$refs.joinPopup.open() this.$refs.joinPopup.open()
return return
} }
...@@ -238,6 +238,10 @@ ...@@ -238,6 +238,10 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .uni-popup .uni-popup__wrapper{
margin: 0 !important;
border-radius: 30rpx;
}
.container{ .container{
// padding-bottom: 50rpx; // padding-bottom: 50rpx;
display: flex; display: flex;
......
uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
...@@ -48,38 +48,31 @@ ...@@ -48,38 +48,31 @@
return { return {
bottomData: [{ bottomData: [{
text: '首页', text: '首页',
icon: 'iconfont icon-shouye', icon: 'iconfont icon-shouye16',
name: 'home', name: 'home',
link:'/pages/index/index' link:'/pages/index/index',
}, tabbar:true
{
text: '搜索',
icon: 'iconfont icon-sousuo',
name: 'searh',
link:'/pages/courselist/courselist'
}, },
// {
// icon: 'iconfont icon-sousuo',
// name: 'searh',
// link:'/pages/courselist/courselist'
// },
{ {
text: '我的', text: '我的',
icon: 'iconfont icon-wode', icon: 'iconfont icon-gerenzhongxin',
name: 'user', name: 'user',
link:'/pages/personalCenter/personalCenter' link:'/pages/personalCenter/personalCenter',
tabbar:true
}, },
{ {
text: '消息', text: '消息',
icon: 'iconfont icon-xiaoxi', icon: 'iconfont icon-xiaoxi',
name: 'news', name: 'news',
link:'/pages/systemMsg/system_msg' link:'/pages/systemMsg/system_msg',
tabbar:false
}, },
// {
// text: '百度',
// icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
// name: 'copy'
// },
// {
// text: '其他',
// icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
// name: 'more'
// }
] ]
} }
}, },
...@@ -97,10 +90,7 @@ ...@@ -97,10 +90,7 @@
* 选择内容 * 选择内容
*/ */
select(item, index) { select(item, index) {
this.$emit('select', { this.$emit('select',item )
item,
index
})
this.close() this.close()
}, },
......
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