diff --git a/components/kz-page-index-color-1/kz-page-index-color-1.vue b/components/kz-page-index-color-1/kz-page-index-color-1.vue
index c0e044e..d20add8 100644
--- a/components/kz-page-index-color-1/kz-page-index-color-1.vue
+++ b/components/kz-page-index-color-1/kz-page-index-color-1.vue
@@ -18,7 +18,8 @@
-->
-
+
@@ -40,26 +41,66 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
- {{ item.name }}
-
+
+ 课程中心
-
+
+
+
+
+
+
+
+
+ 关于我们
+
+
+
+
+
+
+
+
+
+
+
+ 错题本
+
+
+
+
+
+
+
+
+
+
+ 题目收藏
+
+
+
@@ -199,393 +240,326 @@
\ No newline at end of file
diff --git a/components/kz-question/kz-question.vue b/components/kz-question/kz-question.vue
index 528495f..e343fef 100644
--- a/components/kz-question/kz-question.vue
+++ b/components/kz-question/kz-question.vue
@@ -2000,7 +2000,7 @@
flex-wrap: wrap;
flex: 1;
height: 100%;
- font-p: 32rpx;
+ font-size: 30rpx;
.image {
width: 50%;
@@ -2463,7 +2463,7 @@
}
.text-right-answer-val {
- font-size: 28rpx;
+ font-size: 30rpx;
color: #1A73E8;
padding: 8rpx 0rpx;
border-radius: 15rpx 15rpx 15rpx 0;
diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index a858c08..41284db 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -110,15 +110,15 @@
path: '/pages/index/index'
},
{
- name: '模拟考试',
+ name: '平台题库',
icon: 'tn-icon-edit-form',
- path: '/pages/paper/index',
- },
- {
- name: '关于我们',
- icon: 'tn-icon-inventory',
- path: '/pages/index/news-list',
+ path: '/pages/train/index',
},
+ // {
+ // name: '关于我们',
+ // icon: 'tn-icon-inventory',
+ // path: '/pages/index/news-list',
+ // },
{
name: '考试公示',
icon: 'tn-icon-menu-list',
diff --git a/components/tui-cascade-selection/tui-cascade-selection.vue b/components/tui-cascade-selection/tui-cascade-selection.vue
index 30eab01..e3541a4 100644
--- a/components/tui-cascade-selection/tui-cascade-selection.vue
+++ b/components/tui-cascade-selection/tui-cascade-selection.vue
@@ -111,7 +111,7 @@
//tabs 文字大小
size: {
type: Number,
- default: 28
+ default: 30
},
//tabs 文字颜色
color: {
@@ -180,7 +180,7 @@
//item text字体大小
textSize: {
type: Number,
- default: 28
+ default: 30
},
//text 是否不换行
nowrap: {
@@ -195,7 +195,7 @@
//item subText字体大小
subTextSize: {
type: Number,
- default: 24
+ default: 30
},
// item padding
padding: {
@@ -546,6 +546,7 @@
.tui-cell-title {
word-break: break-all;
+ font-size: 30rpx;
}
.tui-flex-shrink {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index abf2298..00f4a5a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,62 +1,32 @@
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+ /* #endif */
+ /*banner*/
+
\ No newline at end of file
diff --git a/pages/index/news-detail.vue b/pages/index/news-detail.vue
index 9caf490..5c5478c 100644
--- a/pages/index/news-detail.vue
+++ b/pages/index/news-detail.vue
@@ -2,19 +2,30 @@
-
- {{ newsData.name }}
-
-
- {{ newsData.create_time_text }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 我们的位置
+
+
+
+
+
-
+
diff --git a/pages/train/index.vue b/pages/train/index.vue
index 4c1366f..83601ae 100644
--- a/pages/train/index.vue
+++ b/pages/train/index.vue
@@ -37,6 +37,7 @@
:confirmCateContent="confirmCateContent" v-on:paySuccess="goTrain()" v-on:codeSuccess="goTrain()"
v-on:cancel="closeDialog">
+
diff --git a/store/index.js b/store/index.js
index 828212c..9f1ed49 100644
--- a/store/index.js
+++ b/store/index.js
@@ -33,7 +33,7 @@ const store = new Vuex.Store({
state: {
// 如果上面从本地获取的lifeData对象下有对应的属性,就赋值给state中对应的变量
// 加上vuex_前缀,是防止变量名冲突,也让人一目了然
- vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {name: '图鸟'},
+ vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {name: '灵睿'},
// 如果vuex_version无需保存到本地永久存储,无需lifeData.vuex_version方式
// app版本