Skip to content

C
CFFP-HB
Commit 4d3c1e29 by Sweet Zhang
Options

首页顶部菜单根据加盟状态判断，申请加盟成功增加暂不购买按钮

parent 5d2d57c0
Showing with 69 additions and 36 deletions
components/commonPopup/PartnerTipPopup.vue
...@@ -53,12 +53,12 @@ export default { ...@@ -53,12 +53,12 @@ export default {
// 加盟按钮文字 // 加盟按钮文字
joinText: { joinText: {
type: String, type: String,
default: '去加盟为合伙人' default: '我已知晓，继续分享'
}, },
// 继续按钮文字 // 继续按钮文字
continueText: { continueText: {
type: String, type: String,
default: '我已知晓，继续分享' default: '去加盟为合伙人'
}, },
// 是否展示icon // 是否展示icon
tipIcon: { tipIcon: {
...@@ -75,14 +75,14 @@ export default { ...@@ -75,14 +75,14 @@ export default {
close() { close() {
this.$refs.popup.close() this.$refs.popup.close()
}, },
// 点击加盟 // 点击继续
handleJoin() { handleJoin() {
this.$emit('join') this.$emit('continue')
this.close() this.close()
}, },
// 点击继续 // 点击加盟
handleContinue() { handleContinue() {
this.$emit('continue') this.$emit('join')
this.close() this.close()
} }
} }
......
components/commonPopup/everyJoinPopup.vue
...@@ -27,9 +27,12 @@ ...@@ -27,9 +27,12 @@
</view> </view>
</view> </view>
<view class="joinFotter"> <view class="joinFotter">
<view @click="handleContinue"> <view @click="handleCancel" style="background-color: #FAFAFA;color: #333333;">
{{ continueText }} {{ cancelText }}
</view> </view>
<view @click="handleContinue">
{{ continueText }}
</view>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
...@@ -60,6 +63,11 @@ export default { ...@@ -60,6 +63,11 @@ export default {
type: String, type: String,
default: '前往首页' default: '前往首页'
}, },
// 暂不操作按钮文字
cancelText: {
type: String,
default: '暂不操作，继续浏览'
},
// 文字颜色 // 文字颜色
fontColor: { fontColor: {
type: String, type: String,
...@@ -86,9 +94,14 @@ export default { ...@@ -86,9 +94,14 @@ export default {
}, },
// 点击继续 // 点击继续
handleContinue() { handleContinue() {
this.$emit('continue') this.$emit('continue',1)
this.close() this.close()
} },
// 继续浏览
handleCancel(){
this.$emit('continue',2)
this.close()
}
} }
} }
</script> </script>
......
myPackageA/applyFranchise/applyFranchise.vue
...@@ -96,10 +96,11 @@ ...@@ -96,10 +96,11 @@
<!-- 成功加盟为合伙人提示弹窗组件 --> <!-- 成功加盟为合伙人提示弹窗组件 -->
<everyJoinPopup <everyJoinPopup
ref="successJoinPopup" ref="successJoinPopup"
@continue="jumpPage()" @continue="jumpPage(e)"
content="您已加盟为银盾家办合伙人" content="您已加盟为银盾家办合伙人"
twoContent='购买一单"YD家庭财务法律卡"即可升级为新锐合伙人,享受组织利益' twoContent='购买一单"YD家庭财务法律卡"即可升级为新锐合伙人,享受组织利益'
continueText="前往购买" continueText="前往购买"
cancelText="暂不购买，继续浏览"
fontColor="#20279B" fontColor="#20279B"
:maskClick="false" :maskClick="false"
icon="icon-dianzan" icon="icon-dianzan"
...@@ -197,7 +198,8 @@ ...@@ -197,7 +198,8 @@
}) })
}, },
jumpPage(){ jumpPage(e){
// e===1时，前往购买；e===2暂不购买；目前全部跳转到首页，不进行判断
uni.switchTab({ uni.switchTab({
url:'/pages/index/index' url:'/pages/index/index'
}) })
......
myPackageA/login/login.vue
...@@ -390,7 +390,7 @@ ...@@ -390,7 +390,7 @@
} }
.iconBox{ .iconBox{
border-radius: 15rpx; border-radius: 15rpx;
width: 20% !important; width: 400rpx !important;
} }
} }
.content{ .content{
......
pages/index/index.vue
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<view class="bottom"> <view class="bottom">
<view class="content"> <view class="content">
<view class="featureContent"> <view class="featureContent">
<!-- 顶部快捷菜单 -->
<view class="nav_wrapper"> <view class="nav_wrapper">
<view class="nav_content" v-for="featureItem in featureLists" :key="featureItem.key" <view class="nav_content" v-for="featureItem in featureLists" :key="featureItem.key"
@click="featureSelect(featureItem)"> @click="featureSelect(featureItem)">
...@@ -66,6 +67,10 @@ ...@@ -66,6 +67,10 @@
<view class="productListBox"> <view class="productListBox">
<view class="productListItem" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)"> <view class="productListItem" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<view class="top"> <view class="top">
<!-- <view class="shareBtn" @click.stop="shareProduct"> -->
<!-- 分享按钮 -->
<!-- <text class="iconfont icon-zhuanfa"></text><text>分享赚钱</text>
</view> -->
<image class="productImg" :src="item.displayImage" alt="" mode="widthFix"></image> <image class="productImg" :src="item.displayImage" alt="" mode="widthFix"></image>
<view class="productDesBox"> <view class="productDesBox">
{{item.fileSynopsis}} {{item.fileSynopsis}}
...@@ -215,29 +220,21 @@ ...@@ -215,29 +220,21 @@
x: 0, x: 0,
y: 0 y: 0
}, },
featureLists: [{ featureLists: [
key: '00',
name: '成交订单',
icon:'icon-dingdan',
link: '/pages/saleCourseLists/saleCourseLists',
isOpen: true,
enName:'order'
},
{
key: '01',
name: '佣金',
icon: 'icon-yongjin',
link: '/pages/pointsExchange/pointsExchange',
isOpen: true,
isJoin: true
},
{ {
key: '02', key: '02',
name: '申请加盟', name: '申请加盟',
icon: 'icon-hezuo', icon: 'icon-hezuo',
link: '/myPackageA/applyFranchise/applyFranchise', link: '/myPackageA/applyFranchise/applyFranchise',
isOpen: true, isOpen: true,
isApply:true, isApply:true
},
{
key: '07',
name: '分享产品',
icon: 'icon-zhuanfa',
link: '/pages/courselist/courselist',
isOpen: true,
}, },
{ {
...@@ -325,7 +322,13 @@ ...@@ -325,7 +322,13 @@
partnerType:res['data']['partnerType'], partnerType:res['data']['partnerType'],
nickName:res['data']['nickName'], nickName:res['data']['nickName'],
} }
uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo)) uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo));
if(cffp_userInfo.partnerType){
this.featureLists = [{key: '00',name: '成交订单',icon:'icon-dingdan',link: '/pages/saleCourseLists/saleCourseLists',isOpen: true,enName:'order'},
{key: '01',name: '佣金',icon: 'icon-yongjin',link: '/pages/pointsExchange/pointsExchange',isOpen: true,isJoin: true},
{key: '07',name: '分享产品',icon: 'icon-zhuanfa',link: '/pages/courselist/courselist',isOpen: true},
{key: '04',name: '邀请加盟',icon: 'icon-yaoqing',link: '/pages/inviteJoin/inviteJoin',isOpen: true,isJoin: true}];
}
} }
}) })
...@@ -493,6 +496,7 @@ ...@@ -493,6 +496,7 @@
window.location.href = url; window.location.href = url;
// #endif // #endif
}, },
// 顶部菜单跳转
featureSelect(featureItem) { featureSelect(featureItem) {
if(uni.getStorageSync('cffp_userInfo')){ if(uni.getStorageSync('cffp_userInfo')){
this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo')) this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
...@@ -506,9 +510,8 @@ ...@@ -506,9 +510,8 @@
'首页', '首页',
'pages/index/index' 'pages/index/index'
) )
uni.navigateTo({ uni.navigateTo({url: `${featureItem.link}`});
url: `${featureItem.link}`
});
return return
} }
...@@ -813,7 +816,22 @@ ...@@ -813,7 +816,22 @@
object-fit: cover; object-fit: cover;
display: block; display: block;
} }
.shareBtn{
position: absolute;
right: 0;
top: 0;
height: 50rpx;
color: red;
z-index: 1;
background-color: #F43530;
border-radius: 6rpx;
padding: 0 10rpx;
color: #fff;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.productDesBox { .productDesBox {
box-sizing: border-box; box-sizing: border-box;
position: absolute; position: absolute;
......
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