gter.net/min-project
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
A1300399510 2025-02-26 18:57:52 +08:00
parent 58c62dc535
commit f18eeeaeb8
19 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
component/admission-box/admission-box.wxml
View File

@ -13,7 +13,7 @@
<view class="item flexcenter">{{ countDown.minutes }}</view>:
<view class="item flexcenter">{{ countDown.seconds }}</view>
</view>
<navigator wx:else target="miniProgram" app-id="wxa9296b07391c2bc7" url="/pages/admissionList/admissionList" hover-class="none" class="more flexacenter">
<navigator wx:else target="miniProgram" app-id="wxa9296b07391c2bc7" path="/pages/admissionList/admissionList" hover-class="none" class="more flexacenter">
more
<image class="icon" src="https://app.gter.net/image/miniApp/offer/arrows-circle-dark-blue.svg"></image>
</navigator>
@ -25,7 +25,7 @@
<image wx:if="{{ item.mold == 4 }}" class="quick-answer" src="https://app.gter.net/image/miniApp/offer/quick-answer.png" mode="heightFix" bind:tap="cutQuickAnswer"></image>
<block wx:else>
<navigator class="more" wx:if="{{ !countDownState }}" target="miniProgram" app-id="wxa9296b07391c2bc7" url="/pages/admissionList/admissionList" hover-class="none"></navigator>
<navigator class="more" wx:if="{{ !countDownState }}" target="miniProgram" app-id="wxa9296b07391c2bc7" path="/pages/admissionList/admissionList" hover-class="none"></navigator>
<view class="item flexacenter" bind:tap="goPage" data-url="/pages/webview/webview?url={{ item.url }}">
<view class="schoolimg-box flexcenter">
<image class="schoolimg" src="{{ item.logo }}" mode="heightFix"></image>

3
component/projectShowText/projectShowText.js
View File

@ -41,10 +41,9 @@ Component({
const height = lineHeight * 10
const query = wx.createSelectorQuery();
query.select(`.main >>> .hide.text.${ this.data.className }`).boundingClientRect(rect => {
if (!rect) return
const page = rect.height / height
// console.log("rect.height", rect.height);
let arr = []
for (let i = 0; i < Math.floor(page); i++) {
arr.push(height)
}

2
pages/projectComparison/projectComparison.js
View File

@ -37,6 +37,7 @@ Page({
loading: true,
isInitFinish: false,
user: {},
},
/**
@ -62,6 +63,7 @@ Page({
totalTopHeight: screen_data.totalTopHeight,
islogin: app.globalData.user.uid > 0 ? true : false,
isInitFinish: true,
user: app.globalData.user,
})
if (!this.indexSidebar) this.indexSidebar = this.selectComponent('#index-sidebar')

4
pages/projectComparison/projectComparison.less
View File

@ -43,11 +43,11 @@ navigator {
border-right: 1rpx solid rgba(241, 241, 241, 1);
}
&:nth-child(2) {
&:nth-of-type(2) {
background-color: rgba(245, 252, 253, 1);
}
&:nth-child(3) {
&:nth-of-type(3) {
background-color: rgba(251, 251, 243, 1);
}

39
pages/projectComparison/projectComparison.wxml
View File

@ -1,5 +1,5 @@
<!--pages/projectComparison/projectComparison.wxml-->
<header-nav>项目对比</header-nav>
<header-nav user="{{ user }}">项目对比</header-nav>
<view class="container" wx:if="{{ !loading }}">
<perfect-information wx:if="{{ informationState }}" bindrevampInformationState="revampInformationState"></perfect-information>
@ -52,13 +52,13 @@
<view class="lump">
<view class="title">学科领域</view>
<view class="block flexflex {{ showObj['disciplinename']['unfold'] ? 'unfold' : '' }} {{ showObj['disciplinename']['show'] ? 'show' : '' }}" data-type="disciplinename">
<view class="more flexcenter" bind:tap="cutShow" data-type="disciplinename">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
<view class="item flex1" wx:for="{{ list }}" wx:key="index">
<template wx:if="{{ item.disciplinename }}" is="mode2" data="{{ text: item.disciplinename }}"></template>
<template wx:else is="mode2" data="{{ text: '-'}}"></template>
</view>
<view class="more flexcenter" bind:tap="cutShow" data-type="disciplinename">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
</view>
</view>
@ -111,66 +111,65 @@
<view class="lump">
<view class="title">专业方向</view>
<view class="block flexflex {{ showObj['concentration']['unfold'] ? 'unfold' : '' }} {{ showObj['concentration']['show'] ? 'show' : '' }}" data-type="concentration">
<view class="more flexcenter" bind:tap="cutShow" data-type="concentration">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
<view class="item flex1" wx:for="{{ list }}" wx:key="index">
<template wx:if="{{ item.concentration }}" is="mode4" data="{{ text: item.concentration }}"></template>
<template wx:else is="mode2" data="{{ text: '-' }}"></template>
</view>
<view class="more flexcenter" bind:tap="cutShow" data-type="concentration">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
</view>
</view>
<view class="lump">
<view class="title">学术要求</view>
<view class="block flexflex {{ showObj['entrance_requirements']['unfold'] ? 'unfold' : '' }} {{ showObj['entrance_requirements']['show'] ? 'show' : '' }}" data-type="entrance_requirements">
<view class="more flexcenter" bind:tap="cutShow" data-type="entrance_requirements">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
<view class="item flex1" wx:for="{{ list }}" wx:key="index">
<template wx:if="{{ item.entrance_requirements }}" is="mode4" data="{{ text: item.entrance_requirements }}"></template>
<template wx:else is="mode2" data="{{ text: '-'}}"></template>
</view>
<view class="more flexcenter" bind:tap="cutShow" data-type="entrance_requirements">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
</view>
</view>
<view class="lump">
<view class="title">英语能力要求</view>
<view class="block flexflex {{ showObj['english_proficiency_text']['unfold'] ? 'unfold' : '' }} {{ showObj['english_proficiency_text']['show'] ? 'show' : '' }}" data-type="english_proficiency_text">
<view class="more flexcenter" bind:tap="cutShow" data-type="english_proficiency_text">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
<view class="item flex1" wx:for="{{ list }}" wx:key="index">
<template wx:if="{{ item.english_proficiency_text }}" is="mode4" data="{{ text: item.english_proficiency_text }}"></template>
<template wx:else is="mode2" data="{{ text: '-'}}"></template>
</view>
<view class="more flexcenter" bind:tap="cutShow" data-type="english_proficiency_text">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
</view>
</view>
<view class="lump">
<view class="title">必要文件</view>
<view class="block flexflex {{ showObj['documents_required']['unfold'] ? 'unfold' : '' }} {{ showObj['documents_required']['show'] ? 'show' : '' }}" data-type="documents_required">
<view class="more flexcenter" bind:tap="cutShow" data-type="documents_required">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
<view class="item flex1" wx:for="{{ list }}" wx:key="index">
<template wx:if="{{ item.documents_required }}" is="mode4" data="{{ text: item.documents_required }}"></template>
<template wx:else is="mode2" data="{{ text: '-'}}"></template>
</view>
<view class="more flexcenter" bind:tap="cutShow" data-type="documents_required">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
</view>
</view>
<view class="lump">
<view class="title">专业认证</view>
<view class="block flexflex {{ showObj['accreditation']['unfold'] ? 'unfold' : '' }} {{ showObj['accreditation']['show'] ? 'show' : '' }}" data-type="accreditation">
<view class="more flexcenter" bind:tap="cutShow" data-type="accreditation">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
<view class="item flex1" wx:for="{{ list }}" wx:key="index">
<template wx:if="{{ item.accreditation }}" is="mode4" data="{{ text: item.accreditation }}"></template>
<template wx:else is="mode2" data="{{ text: '-'}}"></template>
</view>
<view class="more flexcenter" bind:tap="cutShow" data-type="accreditation">
<image class="more-icon" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png" mode="widthFix"></image>
</view>
</view>
</view>

4
pages/projectComparison/projectComparison.wxss
View File

@ -27,10 +27,10 @@ navigator {
.block .item:not(:last-of-type) {
border-right: 1rpx solid #f1f1f1;
}
.block .item:nth-child(2) {
.block .item:nth-of-type(2) {
background-color: #f5fcfd;
}
.block .item:nth-child(3) {
.block .item:nth-of-type(3) {
background-color: #fbfbf3;
}
.block .item .mode1 {

2
pages/projectDetails/projectDetails.js
View File

@ -389,7 +389,7 @@ Page({
// 对键数组进行倒序排列
let closestValue = keys.reduce((acc, key) => {
const diff = sideHeight[key] - scrollTop;
if (diff <= this.data.totalTopHeight) return key
if (diff <= this.data.totalTopHeight + 5) return key
return acc;
}, null);

4
pages/projectDetails/projectDetails.wxml
View File

@ -408,7 +408,7 @@
<view wx:if="{{ offerList.length != 0 }}" class="side-item" data-type="consult">
<template is="item-header" data="{{ text: '寄托录取参考', type: 'consult' }}"></template>
<view class="consult-list">
<navigator class="consult-item" wx:for="{{ offerList }}" wx:key="index" target="miniProgram" app-id="wxa9296b07391c2bc7" url="/pages/victoryDetails/victoryDetails?id={{ item.id || item.uniqid }}" hover-class="none">
<navigator class="consult-item" wx:for="{{ offerList }}" wx:key="index" target="miniProgram" app-id="wxa9296b07391c2bc7" path="/pages/victoryDetails/victoryDetails?id={{ item.id || item.uniqid }}" hover-class="none">
<view class="school flexacenter">
<image class="img" src="{{ item.schoolimage }}" mode="widthFix"></image>
<view class="flex1">{{ item.schoolname }}</view>
@ -608,7 +608,7 @@
榜单
<image class="icon" mode="widthFix" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png"></image>
</view>
<navigator target="miniProgram" app-id="wxa9296b07391c2bc7" wx:if="{{ type == 'consult' }}" class="list-btn flexacenter" url="/pages/victoryList/victoryList">
<navigator target="miniProgram" app-id="wxa9296b07391c2bc7" wx:if="{{ type == 'consult' }}" class="list-btn flexacenter" path="/pages/victoryList/victoryList">
Offer榜
<image class="icon" mode="widthFix" src="https://app.gter.net/image/miniApp/offer/arrow-circle-gray.png"></image>
</navigator>

3
pages/projectList/projectList.js
View File

@ -43,7 +43,7 @@ Page({
university: [],
universityArr: [],
isInitFinish: false,
user: {},
},
/**
@ -66,6 +66,7 @@ Page({
this.setData({
university: data.university,
universityArr,
user: app.globalData.user,
})
if (options.type == 'subject') {

2
pages/projectList/projectList.wxml
View File

@ -1,6 +1,6 @@
<!--pages/projectList/projectList.wxml-->
<view class="container">
<header-nav class="header-nav" bgcolor="{{ isFirstPattern ? 'transparent' : '#f5f5f5' }}">榜单</header-nav>
<header-nav class="header-nav" bgcolor="{{ isFirstPattern ? 'transparent' : '#f5f5f5' }}" user="{{ user }}">榜单</header-nav>
<view class="header-box"></view>
<view class="classify flexflex">
<view class="classify-item flexflex flex1" bind:tap="cutClassify" data-type="school">

5
pages/projectMy/projectMy.js
View File

@ -49,7 +49,7 @@ Page({
// allQuickHeight: 0,
vsBottom: false, // 底部显示状态
user: {},
},
/**
@ -72,6 +72,7 @@ Page({
screen_data,
islogin,
manageHintState,
user: app.globalData.user,
})
this.windowHeight = screen_data.windowHeight || 812
@ -126,7 +127,6 @@ Page({
this.getList({
page: this.data.projectPage,
}).then(res => {
console.log("getUserProject");
this.handleProjectListData(res)
})
},
@ -174,7 +174,6 @@ Page({
page: this.data.page,
typeid: this.data.typeid
}).then(res => {
console.log("getUserProject");
this.handleUserProjectData(res)
})
},

2
pages/projectMy/projectMy.wxml
View File

@ -1,6 +1,6 @@
<!--pages/projectMy/projectMy.wxml-->
<view class="container {{ classify == '' ? 'no-data-bj' : '' }}">
<header-nav class="header-nav" bgcolor="transparent">我的项目</header-nav>
<header-nav class="header-nav" bgcolor="transparent" user="{{ user }}">我的项目</header-nav>
<view class="header-box"></view>
<view class="no-data flexcenter" wx:if="{{ classify == '' }}">
<image class="icon" src="https://app.gter.net/image/miniApp/offer/empty-icon.png" mode="widthFix"></image>

4
pages/projectSchoolHomepage/projectSchoolHomepage.js
View File

@ -56,6 +56,7 @@ Page({
sortIndex: 0, // 排名由高到低 0 学费由低到高 1 学费由高到低 2
isInitFinish: false,
user: {},
},
/**
@ -78,7 +79,8 @@ Page({
this.setData({
islogin: app.globalData.user.uid > 0 ? true : false,
id: options.id
id: options.id,
user: app.globalData.user,
})
common.xgBasicData(this, app).then(data => {

2
pages/projectSchoolHomepage/projectSchoolHomepage.wxml
View File

@ -1,5 +1,5 @@
<!--pages/projectSchoolHomepage/projectSchoolHomepage.wxml-->
<header-nav class="header-nav" bgcolor="#fbfbfb"></header-nav>
<header-nav class="header-nav" bgcolor="#fbfbfb" user="{{ user }}"></header-nav>
<view class="container">
<view class="header">
<view class="info flexflex">

2
pages/projectSubjectList/projectSubjectList.js
View File

@ -41,6 +41,7 @@ Page({
territoryState: false,
isInitFinish: false,
user: {},
},
/**
@ -62,6 +63,7 @@ Page({
bottomLift: screen_data.bottomLift,
contentHeight: totalTopHeight + util.rpxTopx(96),
id: options.id,
user: app.globalData.user,
})
if (!this.indexSidebar) this.indexSidebar = this.selectComponent('#index-sidebar')

1
pages/projectSubjectList/projectSubjectList.less
View File

@ -302,6 +302,7 @@ scroll-view {
margin: 36rpx 0rpx 0;
flex-direction: column;
height: 60vh;
padding-right: 36rpx;
.dot-box {
.dot {

2
pages/projectSubjectList/projectSubjectList.wxml
View File

@ -1,5 +1,5 @@
<view class="container">
<header-nav bgcolor="#f5f5f5">
<header-nav bgcolor="#f5f5f5" user="{{ user }}">
<view class="top-title flexacenter" bind:tap="openTerritory">
{{ discipline[id].label }}
<image class="icon" src="https://app.gter.net/image/miniApp/offer/triangle-red.svg"></image>

1
pages/projectSubjectList/projectSubjectList.wxss
View File

@ -250,6 +250,7 @@ scroll-view {
margin: 36rpx 0rpx 0;
flex-direction: column;
height: 60vh;
padding-right: 36rpx;
}
.empty .dot-box .dot {
width: 12rpx;

5
utils/miucms.js
View File

@ -173,6 +173,11 @@ function sendData(code) {
// const openAdTimer = wx.getStorageSync('openAdTimer');
// if (openAdTimer && isToday(openAdTimer)) app.globalData.offerkaipingadvertisementState = true
// }
app.globalData.offerkaipingadvertisement = data.offerkaipingadvertisement || {}
const openAdTimer = wx.getStorageSync("openAdTimer")
if (openAdTimer && isToday(openAdTimer)) app.globalData.offerkaipingadvertisementState = true
},
fail: function () {
// fail