diff --git a/src/App.vue b/src/App.vue index 5f708da1c..a35f61126 100644 --- a/src/App.vue +++ b/src/App.vue @@ -219,6 +219,9 @@ export default { && this.$route.name !== 'AdvancedSearchExternal' && this.$route.name !== 'LoginVerifyNoEncryption' && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' && this.$route.name !== 'loginStandDetails' && this.$route.name !== 'error' + && this.$route.name !== 'phoneHome'&& this.$route.name !== 'databaseSearch' + && this.$route.name !== 'standDynamics' && this.$route.name !== 'domesticStand' + && this.$route.name !== 'domesticDetails' && this.$route.name !== 'OtherStandardExternalDetails' && this.$route.name !== 'OtherStandardExternalDetails') { this.isBoolean = true } else { diff --git a/src/assets/images/phone/domesticStand.png b/src/assets/images/phone/domesticStand.png new file mode 100644 index 000000000..e172fd429 Binary files /dev/null and b/src/assets/images/phone/domesticStand.png differ diff --git a/src/assets/images/phone/dynamicsStand.png b/src/assets/images/phone/dynamicsStand.png new file mode 100644 index 000000000..12d4b150a Binary files /dev/null and b/src/assets/images/phone/dynamicsStand.png differ diff --git a/src/assets/images/phone/homeTop.png b/src/assets/images/phone/homeTop.png new file mode 100644 index 000000000..bc5f75f9b Binary files /dev/null and b/src/assets/images/phone/homeTop.png differ diff --git a/src/assets/images/phone/overseasStand.png b/src/assets/images/phone/overseasStand.png new file mode 100644 index 000000000..4a5b1978e Binary files /dev/null and b/src/assets/images/phone/overseasStand.png differ diff --git a/src/assets/images/phone/phoneTitle.png b/src/assets/images/phone/phoneTitle.png new file mode 100644 index 000000000..51278fe28 Binary files /dev/null and b/src/assets/images/phone/phoneTitle.png differ diff --git a/src/assets/images/phone/policyStand.png b/src/assets/images/phone/policyStand.png new file mode 100644 index 000000000..4f1490149 Binary files /dev/null and b/src/assets/images/phone/policyStand.png differ diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 8f723900c..36144e893 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -471,11 +471,11 @@ // path: '/forward', // menuId: 'K45Y9TGKZV2K4XP4CETD' // }, - // { - // title: '我的问答', - // path: '/questions', - // menuId: '' - // }, + { + title: '我的问答', + path: '/questions', + menuId: '' + }, { title: '我的板块', path: '/plate', diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 32711a849..a17b81c72 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1,6 +1,28 @@ @@ -44,6 +83,11 @@ export default { }, data(){ return{ + questionSerach:{ + standNumber: '', + standName: '', + keyCode: '', + }, questionList: [{ title: '问题1', name: '1', @@ -69,15 +113,33 @@ export default { height: 100%; background: #F5F7FA; margin-bottom: 10px; - .type-tabs{ + .type-tabs { /deep/.el-tabs__header { margin-right: 0; } + /deep/.el-tabs__content { + padding: 0; + .el-tab-pane { + height: 100%; + } + } } - .question-tabs{ + .question-tabs { height: 100%; - /deep/.el-tabs__item{ - height: 100%; + border-top: none; + border-bottom: none; + /deep/.el-tabs__nav { + height: calc(~'100% - 50px'); + overflow: auto; + } + /deep/ &.el-tabs--border-card .el-tabs__item { + height: 65px; + border-color: #d1dbe5 transparent; + text-align: left; + border-top-color: transparent; + &.is-active { + border-top-color: #d1dbe5; + } } } /deep/.el-tabs__content{ @@ -87,5 +149,10 @@ export default { /deep/.el-tab-pane{ height: 100%; } + .com-box{ + /deep/.el-tabs__item .is-left{ + height: auto; + } + } } diff --git a/src/pages/phone/databaseSearch.vue b/src/pages/phone/databaseSearch.vue new file mode 100644 index 000000000..71bb66fae --- /dev/null +++ b/src/pages/phone/databaseSearch.vue @@ -0,0 +1,209 @@ + + + + + + diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue new file mode 100644 index 000000000..cfcf218d3 --- /dev/null +++ b/src/pages/phone/domesticDetails.vue @@ -0,0 +1,4211 @@ + + + + + diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue new file mode 100644 index 000000000..d06bfed97 --- /dev/null +++ b/src/pages/phone/domesticStand.vue @@ -0,0 +1,303 @@ + + + + + + diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue new file mode 100644 index 000000000..ce9f54a05 --- /dev/null +++ b/src/pages/phone/phoneHome.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/src/pages/phone/standDynamics.vue b/src/pages/phone/standDynamics.vue new file mode 100644 index 000000000..1536a3db2 --- /dev/null +++ b/src/pages/phone/standDynamics.vue @@ -0,0 +1,212 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index d875787a2..f3df8373f 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -200,7 +200,7 @@ {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} - {{ + {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }} {{ diff --git a/src/router/index.js b/src/router/index.js index c837743b3..3610e796e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -54,6 +54,36 @@ const routes = [ component: () => import('@/pages/login') }, + { + path: '/phoneHome', + name: 'phoneHome', + component: () => + import('@/pages/phone/phoneHome') + }, + { + path: '/databaseSearch', + name: 'databaseSearch', + component: () => + import('@/pages/phone/databaseSearch') + }, + { + path: '/standDynamics', + name: 'standDynamics', + component: () => + import('@/pages/phone/standDynamics') + }, + { + path: '/domesticStand', + name: 'domesticStand', + component: () => + import('@/pages/phone/domesticStand') + }, + { + path: '/domesticDetails', + name: 'domesticDetails', + component: () => + import('@/pages/phone/domesticDetails') + }, { path: '/loginVerify', name: 'LoginVerify', @@ -250,7 +280,7 @@ const routes = [ title: '我的问答', menuId: '' } - } + }, // { // path: '/questionsAndAnswers', // name: 'QuestionsAndAnswers',