Commit c7d6cd9a by yuzhenWang

切换分支

parent de413fa6
<template> <template>
<view class="search"> <view class="search">
<text class="iconfont icon-sousuo" @click="searchBtn()"></text>
<input <input
class="searchInput" class="searchInput"
type="text" type="text"
...@@ -9,9 +10,6 @@ ...@@ -9,9 +10,6 @@
@confirm="searchBtn()" @confirm="searchBtn()"
@input="handleInput" @input="handleInput"
/> />
<text class="iconfont icon-sousuo" @click="searchBtn()"></text>
<!-- <text class="iconfont icon-xiaoxi"></text>
<text class="system_msg" @click="jumpToSystemMsg()">{{messageUnreadCount}}</text> -->
</view> </view>
</template> </template>
...@@ -105,23 +103,24 @@ ...@@ -105,23 +103,24 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.search{ .search{
display: flex; display: flex;
margin: 30rpx auto; margin: 30rpx auto;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
background: linear-gradient(to right,#E6F5FC,#FDE9F2); background-color: rgba(255, 255, 255, 0.5);
border-radius: 60rpx; border-radius: 15rpx;
padding: 0 15rpx;
.searchInput{ .searchInput{
margin-right: 20rpx; margin-left: 20rpx;
width: 85%; width: 85%;
padding: 15rpx; padding: 15rpx;
color: #fff;
} }
.icon-sousuo{ .icon-sousuo{
font-size: 50rpx; font-size: 50rpx;
margin-right: 10rpx; color: #fff;
opacity: .7;
} }
.icon-xiaoxi{ .icon-xiaoxi{
font-size: 50rpx; font-size: 50rpx;
......
...@@ -37,7 +37,7 @@ const config = { ...@@ -37,7 +37,7 @@ const config = {
stage, stage,
prod prod
} }
let env = 'prod'; let env = 'dev';
let baseURL = config[env].base_url; let baseURL = config[env].base_url;
let apiURL = config[env].api_url; let apiURL = config[env].api_url;
......
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
"vueVersion" : "3", "vueVersion" : "3",
"h5" : { "h5" : {
"router" : { "router" : {
"base" : "/appYdhomeoffice/", "base" : "/cffp/",
"mode" : "history" "mode" : "history"
}, },
"devServer" : { "devServer" : {
......
<template> <template>
<view class="container"> <view class="container">
<view class="homeHeader">
<view class="top">
<view class="one">
<search
ref="searchRef"
:isSearch="0"
:userId="userId"
:initialQuery.sync="searchQuery"
v-if="showSearch"
></search>
</view>
<view class="two">
<text class="iconfont icon-gongsi" @click="getIntroduce('center')"></text>
</view>
</view>
<view class="bottom">
<view class="content">
<view class="featureContent">
<view class="nav_wrapper">
<view class="nav_content" v-for="featureItem in featureLists" :key="featureItem.key"
@click="featureSelect(featureItem)">
<view class="imgbox">
<view class="iconfont iconSize" :class="`${featureItem.icon}`"></view>
</view>
<view style="font-size: 26rpx;color: #fff;">{{featureItem.name}}</view>
</view>
</view>
</view>
</view>
</view>
</view>
<view class="carouselBox">
<view class="swiperBox">
<swiper
style="height:250rpx;"
circular
:indicator-dots="true"
:autoplay="true"
:interval="3000"
:duration="1000"
>
<swiper-item v-for="(bannerItem,index) in cffpUserInfo.fileUploadItemList" :key="index">
<view class="swiperItemBox">
<view class="swiperBtn" @click="jumpUrl(bannerItem.destinationAddress)">
立即查看
</view>
<image class="swiperImg" :src="bannerItem.filePath" mode="widthFix" ></image>
</view>
</swiper-item>
</swiper>
</view>
</view>
<!-- 产品区域 -->
<view class="productBox">
<view class="productTitle">
<view class="titleTxt">
<text style="font-size: 30rpx;font-weight: 500;">推荐产品</text>
<text class="more">更多 <text class="iconfont icon-youjiantou"></text> </text>
</view>
</view>
<view class="productList" v-if="cffpCourseInfos.length>0">
<view class="productListBox">
<view class="productListItem" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<view class="top">
<image class="productImg" :src="item.displayImage" alt="" mode="widthFix"></image>
<view class="productDes">
</view>
</view>
<view class="bottom">
</view>
</view>
</view>
</view>
</view>
<!-- 以前的代码 -->
<view class="top"> <view class="top">
<view class="compony"> <!-- <view class="compony">
<image src="@/static/logo1.png" mode="widthFix" style="width: 120rpx !important;"></image> <image src="@/static/logo1.png" mode="widthFix" style="width: 120rpx !important;"></image>
<text class="name">{{cffpUserInfo.name}}</text> <text class="name">{{cffpUserInfo.name}}</text>
<text class="iconfont icon-31tishi" @click="getIntroduce('center')"></text> <text class="iconfont icon-31tishi" @click="getIntroduce('center')"></text>
</view> </view> -->
<!--搜索组件--> <!-- <search
<!-- <search
:isSearch="0"
:userId="userId"
></search> -->
<search
ref="searchRef" ref="searchRef"
:isSearch="0" :isSearch="0"
:userId="userId" :userId="userId"
:initialQuery.sync="searchQuery" :initialQuery.sync="searchQuery"
v-if="showSearch" v-if="showSearch"
></search> ></search> -->
<!--轮播组件--> <!--轮播组件-->
<view class="banner" style="overflow: none;"> <!-- <view class="banner" style="overflow: none;">
<view class="uni-margin-wrap"> <view class="uni-margin-wrap">
<carousel :carouselList="cffpUserInfo.fileUploadItemList" ></carousel> <carousel :carouselList="cffpUserInfo.fileUploadItemList" ></carousel>
</view> </view>
</view> </view> -->
</view> </view>
<view class="message" @click="jumpToAnnouncement()"> <!-- <view class="message" @click="jumpToAnnouncement()">
<view style="display: flex;align-items: center;"> <view style="display: flex;align-items: center;">
<text class="iconfont icon-gonggao"></text> <text class="iconfont icon-gonggao"></text>
<text style="font-size: 27rpx;">{{announcementInfo}}</text> <text style="font-size: 27rpx;">{{announcementInfo}}</text>
</view> </view>
<text class="iconfont icon-youjiantou iconStyle"></text> <text class="iconfont icon-youjiantou iconStyle"></text>
</view> </view> -->
<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)">
<!-- <view style="width: 120rpx;text-align: center;">
<image :src="'/static/moduleIcon/'+featureItem.icon + '.png'" alt="" srcset=""
mode="widthFix"></image>
</view> -->
<view class="imgbox"> <view class="imgbox">
<view class="iconfont iconSize" :class="`${featureItem.icon}`"></view> <view class="iconfont iconSize" :class="`${featureItem.icon}`"></view>
</view> </view>
...@@ -50,32 +119,39 @@ ...@@ -50,32 +119,39 @@
</view> </view>
</view> </view>
</view> </view>
</view> </view> -->
<view class="course_content"> <!-- <view class="course_content">
<view class="tag"> <view class="tag">
<h4>推荐产品</h4> <h4>推荐产品</h4>
<view @click="goToCourselist()" style="font-size: 30rpx;">更多<text class="iconfont icon-youjiantou iconStyle"></text></view> <view @click="goToCourselist()" style="font-size: 30rpx;">更多<text class="iconfont icon-youjiantou iconStyle"></text></view>
</view> </view>
<!-- <courselist :onlyShowList="0"></courselist> -->
<view class="ulBox" v-if="cffpCourseInfos.length>0"> <view class="ulBox" v-if="cffpCourseInfos.length>0">
<view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)"> <view class="liBox" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)">
<!-- :tagList="{v1:item.fileLecturerRanks,v2:item.fileLecturerName}" -->
<course-item :thumbnailPath="item.displayImage" :title="item.fileTitle" <course-item :thumbnailPath="item.displayImage" :title="item.fileTitle"
:summaryBox="item.fileSynopsis" :summaryBox="item.fileSynopsis"
:dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}" :dataList="{coursePrice:item.coursePrice,salesNumber:item.salesNumber}"
></course-item> ></course-item>
</view> </view>
</view> </view>
</view> </view> -->
<view class="" style="text-align: center;color: #666666;font-size: 24rpx;margin-top: 20rpx;"> <!-- <view class="" style="text-align: center;color: #666666;font-size: 24rpx;margin-top: 20rpx;">
{{companyFullName}}提供 {{companyFullName}}提供
</view> </view> -->
<!-- <tabBar :currentPage="currentPage"></tabBar> --> <!-- <tabBar :currentPage="currentPage"></tabBar> -->
</view> </view>
<uni-popup ref="popup" type="top" background-color="#fff"> <uni-popup ref="popup" type="top" background-color="#fff">
<view class="description"> <view class="descriptionBox">
{{cffpUserInfo.description}} <view class="popupClose">
<text class="iconfont icon-guanbi" @click="$refs.popup.close()"></text>
</view>
<view class="imageBox">
<image src="@/static/logo1.png" mode="widthFix" style="width: 120rpx !important;"></image>
</view>
<view class="description">
{{cffpUserInfo.description}}
</view>
</view> </view>
</uni-popup> </uni-popup>
</template> </template>
...@@ -215,7 +291,17 @@ ...@@ -215,7 +291,17 @@
uni.$off('loginUpdate', this.queryAreaCenterInfo); uni.$off('loginUpdate', this.queryAreaCenterInfo);
}, },
methods: { methods: {
jumpUrl(url) {
if (!url) {
return false
} else {
const match = url.match(/fileId=([^&]*)/);
const fileId = match ? match[1] : null;
uni.navigateTo({
url: `/pages/courseDetail/courseDetail?fileId=${fileId}`
})
}
},
init() { init() {
if (uni.getStorageSync('isLogin')) { if (uni.getStorageSync('isLogin')) {
let loginType = uni.getStorageSync('loginType') let loginType = uni.getStorageSync('loginType')
...@@ -403,41 +489,175 @@ ...@@ -403,41 +489,175 @@
</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: 30rpx 30rpx 20rpx;
height: auto; height: auto;
overflow-y: auto; /* 关键属性 */ overflow-y: auto; /* 关键属性 */
-webkit-overflow-scrolling: touch; /* 优化移动端滚动 */ -webkit-overflow-scrolling: touch; /* 优化移动端滚动 */
.top { background-color: rgba(238, 238, 238, 1);
.compony { .homeHeader{
box-sizing: border-box;
width: 100%;
background: linear-gradient(225deg, rgba(65, 69, 188, 1) 0%, rgba(29, 30, 125, 1) 100%);
padding: 15rpx 30rpx;
.top{
width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
// max-height: 150rpx; justify-content: space-between;
// overflow: hidden; .one{
width: 80%;
.name {
font-size: 36rpx;
} }
.two{
image { .icon-gongsi{
margin-right: 40rpx; font-size: 40rpx;
color: #fff;
}
}
}
.bottom{
.content {
overflow: hidden;
position: relative;
.featureContent {
box-sizing: border-box;
padding: 30rpx 0;
.nav_wrapper {
display: flex;
align-items: center;
justify-content: space-around;
flex-wrap: wrap;
width: 100%;
box-sizing: border-box;
.nav_content {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
flex: 0 0 20%;
font-size: 14px;
color: rgba(51, 51, 51, 1);
image {
max-width: 80%;
}
.imgbox{
margin-bottom: 10rpx;
.iconSize{
font-size: 40rpx;
color: #fff;
}
}
}
}
}
} }
}
.icon-31tishi { }
font-size: 40rpx; .carouselBox{
width: 100%;
background-color: #fff;
padding: 15rpx;
box-sizing: border-box;
overflow: hidden;
.swiperBox{
.swiperItemBox{
position: relative;
.swiperBtn{
position: absolute;
left: 10%;
bottom: 20%;
padding: 15rpx 30rpx;
border-radius: 50rpx;
z-index: 2;
color: #fff;
font-size: 26rpx;
background: linear-gradient(180deg, rgba(111, 156, 255, 1) 0%, rgba(34, 96, 251, 1) 100%);
}
.swiperImg{
width: 100%;
height: 100%;
border-radius: 50rpx;
}
} }
} }
}
.banner { .productBox{
border-radius: 20rpx; background-color: #fff;
overflow: hidden; margin-top: 15rpx;
margin-bottom: 30rpx; box-sizing: border-box;
.swiper{ .productTitle{
height:250rpx; border-bottom: 1rpx solid rgba(238, 238, 238, 1);
padding-bottom: 10rpx;
.titleTxt{
padding: 15rpx 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
}
.more{
font-size: 26rpx;
color: rgba(84, 84, 84, 1);
}
}
.productList{
.productListBox{
padding: 30rpx 40rpx;
display: flex;
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
.productListItem{
width: 48%;
margin-bottom: 20rpx;
display: flex;
align-items: center;
justify-content: center;
overflow: hidden;
.top{
width: 290rpx;
.productImg{
border-radius: 20rpx;
}
}
}
} }
} }
} }
// 之前的样式
// .top {
// .compony {
// display: flex;
// align-items: center;
// .name {
// font-size: 36rpx;
// }
// image {
// margin-right: 40rpx;
// }
// .icon-31tishi {
// font-size: 40rpx;
// }
// }
// .banner {
// border-radius: 20rpx;
// overflow: hidden;
// margin-bottom: 30rpx;
// .swiper{
// height:250rpx;
// }
// }
// }
.message { .message {
display: flex; display: flex;
...@@ -459,46 +679,46 @@ ...@@ -459,46 +679,46 @@
} }
} }
.content { // .content {
margin-bottom: 20rpx; // margin-bottom: 20rpx;
overflow: hidden; // overflow: hidden;
background: #fff; // background: #fff;
position: relative; // position: relative;
.featureContent { // .featureContent {
box-sizing: border-box; // box-sizing: border-box;
padding: 30rpx 0; // padding: 30rpx 0;
.nav_wrapper { // .nav_wrapper {
display: flex; // display: flex;
align-items: center; // align-items: center;
justify-content: space-around; // justify-content: space-around;
flex-wrap: wrap; // flex-wrap: wrap;
width: 100%; // width: 100%;
box-sizing: border-box; // box-sizing: border-box;
// padding: 10rpx; // // padding: 10rpx;
.nav_content { // .nav_content {
display: flex; // display: flex;
flex-direction: column; // flex-direction: column;
align-items: center; // align-items: center;
justify-content: center; // justify-content: center;
flex: 0 0 20%; // flex: 0 0 20%;
font-size: 14px; // font-size: 14px;
color: rgba(51, 51, 51, 1); // color: rgba(51, 51, 51, 1);
// margin: 10px 2%; // // margin: 10px 2%;
image { // image {
max-width: 80%; // max-width: 80%;
} // }
.imgbox{ // .imgbox{
margin-bottom: 10rpx; // margin-bottom: 10rpx;
.iconSize{ // .iconSize{
font-size: 40rpx; // font-size: 40rpx;
} // }
} // }
} // }
} // }
} // }
} // }
.course_content { .course_content {
position: relative; position: relative;
...@@ -533,12 +753,34 @@ ...@@ -533,12 +753,34 @@
} }
} }
} }
.descriptionBox {
width: 550rpx;
padding: 40rpx;
.popupClose{
display: flex;
align-items: center;
justify-content: flex-end;
.icon-guanbi{
font-size: 28rpx;
}
}
.imageBox{
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 20rpx;
}
.description{
color: rgba(56, 56, 56, 1);
font-size: 26rpx;
line-height: 1.5;
}
}
.ulBox { .ulBox {
flex-direction: column; flex-direction: column;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
// background-color: #20279b;
} }
.liBox { .liBox {
...@@ -550,7 +792,5 @@ ...@@ -550,7 +792,5 @@
width: 100%; width: 100%;
} }
.description {
padding: 40rpx;
}
</style> </style>
\ No newline at end of file
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
class="avatar" class="avatar"
:style="{backgroundImage: 'url(' + (customerBasicInfo.headPicture || companyLogo) + ')'}" :style="{backgroundImage: 'url(' + (customerBasicInfo.headPicture || companyLogo) + ')'}"
> >
<!-- <image :src="customerBasicInfo.headPicture?customerBasicInfo.headPicture:companyLogo" alt="" mode="widthFix" ></image> -->
</view> </view>
<view class="headerInfo"> <view class="headerInfo">
<view class="headerTop"> <view class="headerTop">
...@@ -18,16 +17,15 @@ ...@@ -18,16 +17,15 @@
{{customerBasicInfo.partnerType}} {{customerBasicInfo.partnerType}}
</view> </view>
</view> </view>
<view class="nickName"> <!-- <view class="nickName">
<!--昵称:{{loginornot == true ?customerBasicInfo.nickName :'游客'}} -->
<text v-if="loginornot && customerBasicInfo.nickName">昵称:{{customerBasicInfo.nickName}}</text> <text v-if="loginornot && customerBasicInfo.nickName">昵称:{{customerBasicInfo.nickName}}</text>
<text v-if="!loginornot">昵称:游客</text> <text v-if="!loginornot">昵称:游客</text>
</view> </view> -->
</view> </view>
</view> </view>
<view class="right" @click="goDetail(settingItem)"> <view class="right" @click="goDetail(settingItem)">
<view class="iconfont icon-shezhi iconColor" style="font-size: 40rpx;"></view> <view class="iconfont icon-shezhi " style="font-size: 40rpx;color: #fff;"></view>
</view> </view>
</view> </view>
<view class="myContent"> <view class="myContent">
...@@ -65,74 +63,24 @@ ...@@ -65,74 +63,24 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 头部信息 --> <uni-popup ref="joinPopup" type="center" background-color="#fff">
<!-- <view class="basicInfoBox"> <view class="joinContent">
<view class="avatar"> <view class="joinHeader">
<image :src="customerBasicInfo.headPicture?customerBasicInfo.headPicture:companyLogo" alt="" srcset="" ></image> <view class="iconfont icon-hezuo" style="font-size: 35rpx;color: #fff;"></view>
</view>
<view class="infoBox">
<view class="firstLineBox">
<view>
<strong>{{loginornot == true ?customerBasicInfo.realName :'游客'}}</strong>
<text class="csTag" v-if="customerBasicInfo.partnerType">{{customerBasicInfo.partnerType}}</text>
</view>
<view class="personalInfoBtn" @click="userinfo()">
<text>个人资料</text>
<i class="iconfont icon-bianji"></i>
</view>
</view> </view>
<view>昵称:{{loginornot == true ?customerBasicInfo.nickName :'游客'}}</view> <view class="joinCon">
<view>{{customerBasicInfo.userDescription}}</view> <view class="one">
</view> 您还未加盟为合伙人
</view -->
<!-- 主要菜单 -->
<!-- <view class="mainMenuBox">
<view class="item" v-for="mainMenu in mainMenuLists" :key="mainMenu.id">
<h4>{{mainMenu.categoryName}}</h4>
<view class="menuItemBox">
<view class="mainMenuItem" v-for="menuItem in mainMenu.children.filter(v=>v.isShow)" :key="menuItem.title" @click="goDetail(menuItem)">
<image :src="'/static/moduleIcon/'+menuItem.icon+'.png'" alt="" srcset="" mode="widthFix"></image>
<text>{{menuItem.title}}</text>
</view> </view>
</view> <view class="two">
</view> 成为合伙人后,分享商品,好友购物得收益
</view> -->
<!-- 个人信息 -->
<!-- <view class="personalInfo">
<view class="ulBox">
<view v-for="item in minorMenuLists.filter(v=>v.isShow)" :key="item.title" @click="goDetail(item)" class="liBox">
<view class="infoBox">
<image :src="'/static/moduleIcon/'+item.icon+'.png'" alt="" srcset="" mode="widthFix"></image>
<text>{{item.title}}</text>
</view>
<view class="iconBox">
<i class="iconfont icon-youjiantou"></i>
</view> </view>
</view> </view>
</view> <view class="joinFotter" @click="gotoApply">
</view> --> 去加盟拿收益
<!-- <tabBar :currentPage="currentPage"></tabBar> -->
<!-- 我的邀请码 -->
<!-- <view class="inviteQrcodeContainer">
<uni-popup ref="popup1" background-color="#fff">
<view class="popup1-content">
<view class="title">
<text></text>
<text>我的邀请码</text>
<i class="iconfont icon-guanbi" @click="closePopup()"></i>
</view>
<view class="content">
<view class="contentBox">
<h3>{{inviteEqrode}}</h3>
</view>
<view class="confirmBtn" @click="copy()">
一键复制
</view>
</view>
</view> </view>
</uni-popup> </view>
</view> --> </uni-popup>
</view> </view>
</template> </template>
...@@ -260,6 +208,13 @@ ...@@ -260,6 +208,13 @@
}, },
methods: { methods: {
gotoApply(){
uni.navigateTo({
url: '/pages/application-process/basic-info'
})
this.$refs.joinPopup.close()
},
querySystemMessage(){ querySystemMessage(){
if(this.userId){ if(this.userId){
api.querySystemMessage({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then((res)=>{ api.querySystemMessage({systemType:1,userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
...@@ -317,8 +272,6 @@ ...@@ -317,8 +272,6 @@
}, },
// 菜单跳转页面 // 菜单跳转页面
goDetail(item){ goDetail(item){
console.log('item',item);
if(!this.loginornot&& !item.islogin){ if(!this.loginornot&& !item.islogin){
this.isLogin() this.isLogin()
return return
...@@ -335,11 +288,12 @@ ...@@ -335,11 +288,12 @@
}, },
ckidentity(item){ ckidentity(item){
if(item.identity == true && this.customerBasicInfo.partnerType ==null){ if(item.identity == true && this.customerBasicInfo.partnerType ==null){
uni.showToast({ this.$refs.joinPopup.open()
title: "您本人尚未加盟,您加盟后可邀请加盟", // uni.showToast({
duration: 2000, // title: "您本人尚未加盟,您加盟后可邀请加盟",
icon: 'none' // duration: 2000,
}); // icon: 'none'
// });
return false return false
}else if(item.title == '邀请加盟'){ }else if(item.title == '邀请加盟'){
uni.navigateTo({ uni.navigateTo({
...@@ -425,6 +379,10 @@ ...@@ -425,6 +379,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{
box-sizing:border-box; box-sizing:border-box;
background-color: #f7f7f7; background-color: #f7f7f7;
...@@ -439,9 +397,7 @@ ...@@ -439,9 +397,7 @@
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
height: 250rpx; height: 250rpx;
background-image: url('/static/mySelfBg.png'); background: linear-gradient(225deg, rgba(65, 69, 188, 1) 0%, rgba(29, 30, 125, 1) 100%);
background-size: cover;
background-repeat: no-repeat;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
...@@ -452,8 +408,8 @@ ...@@ -452,8 +408,8 @@
align-items: center; align-items: center;
.avatar{ .avatar{
flex-grow: 0; flex-grow: 0;
width: 150rpx; width: 130rpx;
height: 150rpx; height: 130rpx;
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
/* 背景图设置 */ /* 背景图设置 */
...@@ -485,26 +441,14 @@ ...@@ -485,26 +441,14 @@
flex-direction: column; flex-direction: column;
justify-content: flex-start; justify-content: flex-start;
.headerTop{ .headerTop{
display: flex; color:#fff;
align-items: center;
justify-content: flex-start;
} }
// .myName{
// // width: 200rpx;
// min-width: 0;
// white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// font-size: 32rpx;
// }
.desBox{ .desBox{
border: 1px solid rgba(102, 102, 102, 1);
border-radius: 8rpx; border-radius: 8rpx;
padding: 0 2rpx; padding: 0 2rpx;
color: rgba(102, 102, 102, 1); font-size: 24rpx;
font-size: 23rpx;
font-weight: normal; font-weight: normal;
text-align: center;
} }
.nickName{ .nickName{
font-size: 27rpx; font-size: 27rpx;
...@@ -600,161 +544,54 @@ ...@@ -600,161 +544,54 @@
margin-bottom: 100rpx; margin-bottom: 100rpx;
} }
} }
} .joinContent{
.avatar { width: 500rpx;
width: 90rpx; // height: 300rpx;
height: 80rpx; border-radius: 30rpx;
/* border: 1rpx solid aqua; */ background-color: #ffff;
margin-right: 17rpx; padding: 30rpx;
border-radius: 50%; box-sizing: border-box;
}
.avatar image {
width: 100%;
height: 100%;
border-radius: 50%;
}
.loading{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.basicInfoBox{
display: flex;
padding: 67rpx 20rpx 60rpx 28rpx;
background:linear-gradient(26deg, #D8E2E5 0%, #F0E6DD 31%, #E7DBDF 100%);
// .avatar{
// width: 0;
// height: 80rpx;
// border-radius: 50%;
// margin-right: 17rpx;
// background-color: #fff;
// flex: 0 0 80rpx;
// }
.infoBox{
width:100%;
color: #666666;
strong{
color: #333;
}
view{
margin-bottom: 8rpx;
.csTag{
border-radius: 10rpx;
border:1rpx solid #666;
padding: 4rpx 10rpx;
margin-left: 10rpx;
font-size: 24rpx;
}
.personalInfoBtn{
border-radius: 10rpx;
background-color:#5359CD;
color: #fff;
text-align: center;
padding: 6rpx 7rpx;
font-size: 24rpx;
.iconfont{
font-size: 24rpx;
margin-left: 4rpx;
}
}
}
.firstLineBox{
display: flex;
justify-content: space-between;
align-items: center;
}
}
}
.mainMenuBox{
background-color: #fff;
width: 95%;
margin: -60rpx auto 30rpx;
border-radius: 10rpx;
padding: 12rpx 30rpx;
box-sizing: border-box;
h4{
font-size: 30rpx;
color: #333;
margin-bottom: 10rpx;
}
.item{
margin-bottom: 30rpx;
}
.menuItemBox{
display: flex; display: flex;
flex-wrap: wrap; align-items: center;
.mainMenuItem{ flex-direction: column;
.joinHeader{
width: 60rpx;
height: 60rpx;
border-radius: 50%;
background: rgba(54, 57, 169, 1);
display: flex; display: flex;
flex-direction: column;
align-items: center; align-items: center;
max-width: 20%; justify-content: center;
flex: 1; margin-bottom: 20rpx;
uni-image{
width: 100rpx!important;
}
text{
font-size: 28rpx;
color: #333;
}
} }
} .joinCon{
// padding: 20rpx 0;
} .one{
.personalInfo{ font-size: 30rpx;
background: #fff; color: rgba(38, 41, 44, 1);
width: 95%; font-weight: 600;
margin: 6rpx auto 0; text-align: center;
.ulBox{
padding: 0 30rpx;
.liBox{
display: flex;
align-items: center;
justify-content: space-between;
border-bottom: 1px solid #E6E6E6;
height: 92rpx;
.infoBox{
display: flex;
align-items: center;
image{
width: 52rpx !important;
height: 52rpx;
}
}
&:last-child{
border:none;
} }
} .two{
} color: rgba(145, 144, 148, 1);
} font-size: 26rpx;
.inviteQrcodeContainer{
.popup1-content{
.title{
display: flex;
justify-content: space-between;
align-items: center;
}
.content{
.contentBox{
text-align: center; text-align: center;
h3{ margin-top: 10rpx;
padding: 30rpx; margin-bottom: 20rpx;
}
} }
} }
.confirmBtn{ .joinFotter{
border-radius: 80rpx; width: 100%;
height: 80rpx;
width: 60%;
background-color: #20269B;
color: #fff; color: #fff;
margin: 64rpx auto 0;
display: flex; display: flex;
justify-content: center;
align-items: center; align-items: center;
justify-content: center;
box-sizing: border-box;
padding: 10rpx 0;
background: rgba(54, 57, 169, 1);
border-radius: 60rpx;
} }
} }
} }
</style> </style>
...@@ -55,6 +55,36 @@ ...@@ -55,6 +55,36 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont">&#xe641;</span>
<div class="name">雷电</div>
<div class="code-name">&amp;#xe641;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe610;</span>
<div class="name">信息</div>
<div class="code-name">&amp;#xe610;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe759;</span>
<div class="name">搜索</div>
<div class="code-name">&amp;#xe759;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe6be;</span>
<div class="name">使用教程</div>
<div class="code-name">&amp;#xe6be;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe65e;</span>
<div class="name">公司</div>
<div class="code-name">&amp;#xe65e;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe115;</span> <span class="icon iconfont">&#xe115;</span>
<div class="name">下箭头</div> <div class="name">下箭头</div>
<div class="code-name">&amp;#xe115;</div> <div class="code-name">&amp;#xe115;</div>
...@@ -228,9 +258,9 @@ ...@@ -228,9 +258,9 @@
<pre><code class="language-css" <pre><code class="language-css"
>@font-face { >@font-face {
font-family: 'iconfont'; font-family: 'iconfont';
src: url('iconfont.woff2?t=1749031328434') format('woff2'), src: url('iconfont.woff2?t=1750063346486') format('woff2'),
url('iconfont.woff?t=1749031328434') format('woff'), url('iconfont.woff?t=1750063346486') format('woff'),
url('iconfont.ttf?t=1749031328434') format('truetype'); url('iconfont.ttf?t=1750063346486') format('truetype');
} }
</code></pre> </code></pre>
<h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3> <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
...@@ -257,6 +287,51 @@ ...@@ -257,6 +287,51 @@
<ul class="icon_lists dib-box"> <ul class="icon_lists dib-box">
<li class="dib"> <li class="dib">
<span class="icon iconfont icon-leidian"></span>
<div class="name">
雷电
</div>
<div class="code-name">.icon-leidian
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xinxi"></span>
<div class="name">
信息
</div>
<div class="code-name">.icon-xinxi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-sousuo"></span>
<div class="name">
搜索
</div>
<div class="code-name">.icon-sousuo
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-shiyongjiaocheng"></span>
<div class="name">
使用教程
</div>
<div class="code-name">.icon-shiyongjiaocheng
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-gongsi"></span>
<div class="name">
公司
</div>
<div class="code-name">.icon-gongsi
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-xiajiantou"></span> <span class="icon iconfont icon-xiajiantou"></span>
<div class="name"> <div class="name">
下箭头 下箭头
...@@ -519,6 +594,46 @@ ...@@ -519,6 +594,46 @@
<li class="dib"> <li class="dib">
<svg class="icon svg-icon" aria-hidden="true"> <svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-leidian"></use>
</svg>
<div class="name">雷电</div>
<div class="code-name">#icon-leidian</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xinxi"></use>
</svg>
<div class="name">信息</div>
<div class="code-name">#icon-xinxi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-sousuo"></use>
</svg>
<div class="name">搜索</div>
<div class="code-name">#icon-sousuo</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-shiyongjiaocheng"></use>
</svg>
<div class="name">使用教程</div>
<div class="code-name">#icon-shiyongjiaocheng</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-gongsi"></use>
</svg>
<div class="name">公司</div>
<div class="code-name">#icon-gongsi</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-xiajiantou"></use> <use xlink:href="#icon-xiajiantou"></use>
</svg> </svg>
<div class="name">下箭头</div> <div class="name">下箭头</div>
......
@font-face { @font-face {
font-family: "iconfont"; /* Project id 4933433 */ font-family: "iconfont"; /* Project id 4933433 */
src: url('iconfont.woff2?t=1749031328434') format('woff2'), src: url('iconfont.woff2?t=1750063346486') format('woff2'),
url('iconfont.woff?t=1749031328434') format('woff'), url('iconfont.woff?t=1750063346486') format('woff'),
url('iconfont.ttf?t=1749031328434') format('truetype'); url('iconfont.ttf?t=1750063346486') format('truetype');
} }
.iconfont { .iconfont {
...@@ -13,6 +13,26 @@ ...@@ -13,6 +13,26 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-leidian:before {
content: "\e641";
}
.icon-xinxi:before {
content: "\e610";
}
.icon-sousuo:before {
content: "\e759";
}
.icon-shiyongjiaocheng:before {
content: "\e6be";
}
.icon-gongsi:before {
content: "\e65e";
}
.icon-xiajiantou:before { .icon-xiajiantou:before {
content: "\e115"; content: "\e115";
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -6,6 +6,41 @@ ...@@ -6,6 +6,41 @@
"description": "", "description": "",
"glyphs": [ "glyphs": [
{ {
"icon_id": "39934155",
"name": "雷电",
"font_class": "leidian",
"unicode": "e641",
"unicode_decimal": 58945
},
{
"icon_id": "4550364",
"name": "信息",
"font_class": "xinxi",
"unicode": "e610",
"unicode_decimal": 58896
},
{
"icon_id": "4933408",
"name": "搜索",
"font_class": "sousuo",
"unicode": "e759",
"unicode_decimal": 59225
},
{
"icon_id": "29085756",
"name": "使用教程",
"font_class": "shiyongjiaocheng",
"unicode": "e6be",
"unicode_decimal": 59070
},
{
"icon_id": "29941060",
"name": "公司",
"font_class": "gongsi",
"unicode": "e65e",
"unicode_decimal": 58974
},
{
"icon_id": "9021520", "icon_id": "9021520",
"name": "下箭头", "name": "下箭头",
"font_class": "xiajiantou", "font_class": "xiajiantou",
......
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