diff --git a/src/pages-sub/components/messageBox/MessageBox.vue b/src/pages-sub/components/messageBox/MessageBox.vue
index ebbeef9..4950e26 100644
--- a/src/pages-sub/components/messageBox/MessageBox.vue
+++ b/src/pages-sub/components/messageBox/MessageBox.vue
@@ -1,7 +1,10 @@
-
-
+
+
{{ title }}
@@ -9,9 +12,13 @@
-
+
@@ -30,6 +37,18 @@ defineProps({
type: String,
default: '提示',
},
+ showClose: {
+ type: Boolean,
+ default: true,
+ },
+ defaultPadding: {
+ type: Boolean,
+ default: true,
+ },
+ defaultWidth: {
+ type: String,
+ default: '90%',
+ },
})
const emits = defineEmits(['update:show'])
diff --git a/src/pages-sub/home/college/components/Situation.vue b/src/pages-sub/home/college/components/Situation.vue
index 24fa29d..c64061a 100644
--- a/src/pages-sub/home/college/components/Situation.vue
+++ b/src/pages-sub/home/college/components/Situation.vue
@@ -1,13 +1,6 @@
-
- {{ year }}
-
-
-
-
-
-
-
-
-
-
+
+ 代码
+ 院校/专业名称
+ {{ year }}招生
+ {{ +year - 1 }}招生
+
+
+
+ {{ item.majorCode }}
+
+ {{ item.majorName }}
+
+ 定向生录取分数要求按我校招生章程执行,可在统招线下20分内优录取:{{ item.selectsubject }}
+
+
+ {{ item.newPlan }}
+ {{ item.oldPlan }}
+
@@ -38,7 +47,7 @@
v-show="pickType === 2"
@change="handleRegionChange"
@change-name="handleRegionChangeName"
- :defaultValue="[provinceCode]"
+ :defaultValue="provinceCode"
:max="1"
/>
@@ -51,9 +60,7 @@
diff --git a/src/pages-sub/home/expand/index.vue b/src/pages-sub/home/expand/index.vue
index 239d3f5..68555a9 100644
--- a/src/pages-sub/home/expand/index.vue
+++ b/src/pages-sub/home/expand/index.vue
@@ -7,70 +7,116 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
- 查询
+
- 分数范围:{{ betweenScores }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+ 查询
+
+
+
+
+
+
+ 院校
+ 招生专业
+ {{ tModel.year }}计划
+ 较{{ tModel.year - 1 }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.provinceName }}
+ 排名:{{ item.rank }}
+
+
+
+ {{ item.planCount }}
+ {{ item.newPlan }}人
+
+ 相同
+
+ {{ item.newPlan - item.oldPlan }}
+
+
+
+
+
+
+
+
diff --git a/src/pages.json b/src/pages.json
index e6d54e1..9795fc0 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -256,6 +256,13 @@
"navigationBarTitleText": "当前志愿表"
}
},
+ {
+ "path": "ucenter/active/activePage",
+ "type": "page",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "ucenter/appointment/appointment",
"type": "page",
diff --git a/src/pages/ucenter/index/index.vue b/src/pages/ucenter/index/index.vue
index e137c61..2e3f1c7 100644
--- a/src/pages/ucenter/index/index.vue
+++ b/src/pages/ucenter/index/index.vue
@@ -85,7 +85,7 @@
我的预约
-
+
激活记录
@@ -155,6 +155,12 @@ const goAppointment = () => {
url: '/pages-sub/ucenter/appointment/appointment',
})
}
+
+const goActive = () => {
+ uni.navigateTo({
+ url: '/pages-sub/ucenter/active/activePage',
+ })
+}