Skip to content

C
CFFP-HB
Commit 365ca490 by yuzhenWang
Options

Merge branch 'feature-20250614-首页菜单优化' into 'dev' 

Feature 20250614 首页菜单优化

See merge request !44
parents beb93bee 2431cf9b
Showing with 103 additions and 31 deletions
App.vue
......@@ -291,7 +291,7 @@
} */
/* iPad横屏 */
@media (orientation: landscape) {
@media (orientation: landscape) {
.container {
max-width: 1024px;
display: flex;
......
components/commonPopup/everyJoinPopup.vue
......@@ -76,6 +76,10 @@ export default {
maskClick: {
type: Boolean,
default: true
},
showCanel: {
type: Boolean,
default: false
}
},
methods: {
......
components/eSignature/eSignature.vue
......@@ -450,7 +450,7 @@
};
</script>
<style lang="less" scoped>
<style lang="scss" scoped>
.signature-box {
display: flex;
flex-direction: column;
......
myPackageA/applyFranchise/applyFranchise.vue
......@@ -93,6 +93,7 @@
<everyJoinPopup
ref="everyJoinPopup"
@continue="jumpPage"
:showCanel="false"
/>
<!-- 成功加盟为合伙人提示弹窗组件 -->
<everyJoinPopup
......@@ -106,6 +107,7 @@
:maskClick="false"
icon="icon-dianzan"
iconSize='80rpx'
:showCanel="true"
/>
</view>
</template>
......
package-lock.json
......@@ -34,34 +34,25 @@
"node_modules/crypto-js": {
"version": "4.2.0",
"resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
"license": "MIT"
},
"node_modules/dayjs": {
"version": "1.11.13",
"resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.13.tgz",
"integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
"integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
"license": "MIT"
},
"node_modules/echarts": {
"version": "5.6.0",
"resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz",
"integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
"license": "Apache-2.0",
"dependencies": {
"tslib": "2.3.0",
"zrender": "5.6.1"
}
},
"node_modules/echarts/node_modules/tslib": {
"version": "2.3.0",
"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
},
"node_modules/echarts/node_modules/zrender": {
"version": "5.6.1",
"resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz",
"integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==",
"dependencies": {
"tslib": "2.3.0"
}
},
"node_modules/errno": {
"version": "0.1.8",
"resolved": "https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz",
......@@ -122,7 +113,8 @@
"node_modules/js-sha256": {
"version": "0.11.1",
"resolved": "https://registry.npmmirror.com/js-sha256/-/js-sha256-0.11.1.tgz",
"integrity": "sha512-o6WSo/LUvY2uC4j7mO50a2ms7E/EAdbP0swigLV+nzHKTTaYnaLIWJ02VdXrsJX0vGedDESQnLsOekr94ryfjg=="
"integrity": "sha512-o6WSo/LUvY2uC4j7mO50a2ms7E/EAdbP0swigLV+nzHKTTaYnaLIWJ02VdXrsJX0vGedDESQnLsOekr94ryfjg==",
"license": "MIT"
},
"node_modules/less": {
"version": "4.3.0",
......@@ -182,6 +174,7 @@
},
"node_modules/nanoid": {
"version": "4.0.2",
"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-4.0.2.tgz",
"integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==",
"funding": [
{
......@@ -189,6 +182,7 @@
"url": "https://github.com/sponsors/ai"
}
],
"license": "MIT",
"bin": {
"nanoid": "bin/nanoid.js"
},
......@@ -282,11 +276,19 @@
}
},
"node_modules/tslib": {
"version": "2.8.1",
"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"dev": true,
"version": "2.3.0",
"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==",
"license": "0BSD"
},
"node_modules/zrender": {
"version": "5.6.1",
"resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz",
"integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==",
"license": "BSD-3-Clause",
"dependencies": {
"tslib": "2.3.0"
}
}
}
}
pages/courselist/courselist.vue
<template>
<view class="container" :style="{paddingTop: showFlag ? '0' : '60rpx'}">
<!-- :style="{paddingTop: showFlag ? '0' : '60rpx'}" -->
<view class="container" >
<view class="homeHeader" v-if="showFlag">
<view class="one">
<text style="font-size: 80rpx;">01</text>
......@@ -25,7 +26,7 @@
</view>
<view class="productBox">
<view class="productList" :style="{marginTop}">
<view class="productItem" v-for="item in cffpCourseInfos" :key="item.fileId" >
<view class="productItem" v-for="item in localCourseInfos" :key="item.fileId" >
<view class="top" @click="goDetail(item)">
<view class="left">
<image class="productImg" :src="item.displayImage" alt="" mode="widthFix"></image>
......@@ -119,7 +120,11 @@
showFlag:{
type:Boolean,
default:true
}
},
cffpCourseInfos: {
type: Array,
default: () => []
}
},
components:{
courseItem,
......@@ -130,9 +135,18 @@
BootPage,
PartnerTipPopup
},
watch: {
// 监听 prop 变化，更新本地副本
cffpCourseInfos: {
immediate: true, // 立即执行一次
handler(newVal) {
this.localCourseInfos = [...newVal]; // 深拷贝（如果是简单数组，浅拷贝也行）
},
},
},
data(){
return{
cffpCourseInfos:[],
localCourseInfos: [], // 本地副本
currentPage:'courselist',
fileUploadItemCFFPList:[],
queryName:null,
......@@ -164,6 +178,8 @@
created(){
this.queryName = uni.getStorageSync('queryName') || '';
this.courseList();
// 初始化本地副本
this.localCourseInfos = [...this.cffpCourseInfos];
this.sourceType = uni.getStorageSync('addSystemType') || '1';
if(uni.getStorageSync('cffp_userInfo')){
this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
......@@ -371,7 +387,7 @@
}
api.courseList(param).then(res=>{
if(res['success']){
this.cffpCourseInfos = res['data']['data'];
this.localCourseInfos = res['data']['data']; // 修改本地副本
}
})
},
......@@ -471,7 +487,6 @@
.productList{
width: 100%;
box-sizing: border-box;
// margin-top: -2%;
background-color: #fff;
padding: 20rpx;
border-radius: 10rpx;
......@@ -557,6 +572,12 @@
border: none;
}
}
/* 电脑端 */
@media (min-width: 768px) {
.productList{
// padding-top: 60rpx;
}
}
}
.descriptionBox {
width: 510rpx;
......@@ -678,5 +699,46 @@
}
}
}
.container {
padding-top: 60rpx;
.homeHeader {
padding-bottom: 100rpx;
position: relative;
z-index: 1;
}
.productBox {
position: relative;
z-index: 2;
.productList {
padding-top: 30rpx; // 改用padding-top
margin-top: 0;
.productItem {
&:first-child {
margin-top: 0;
}
}
}
}
}
/* iPad横屏特定适配 */
@media only screen
and (min-device-width: 768px)
and (max-device-width: 1024px)
and (orientation: landscape) {
.container {
.homeHeader {
padding-bottom: 120rpx;
}
.productBox {
.productList {
padding-top: 50rpx;
}
}
}
}
</style>
\ No newline at end of file
pages/index/index.vue
......@@ -64,7 +64,7 @@
</view>
</view> -->
<view class="productList" v-if="cffpCourseInfos.length>0">
<courselist :showFlag="false"></courselist>
<courselist :showFlag="false" :cffpCourseInfos="cffpCourseInfos"></courselist>
<view class="productListBox">
<!-- <view class="productListItem" v-for="item in cffpCourseInfos" :key="item.fileId" @click="goDetail(item)"> -->
......
pages/inviteJoin/inviteJoin.vue
......@@ -535,9 +535,10 @@
.sendInvite {
position: absolute;
left: 20vw;
left: 0;
top: 80%;
width: 60vw;
width: 60%;
transform: translateX(30%);
border-radius: 80rpx;
background-color: #20269B;
color: #fff;
......
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