kylin
/
zdxtDrillProgram
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

导航栏位置调整

h5_css
蟑螂恶霸 2 years ago
parent
dd0bcba312
commit
c15d4d4d1f
14 changed files with 96 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      components/navigation/navigation.vue
  2. 16
      pages/knowledge/knowledge.vue
  3. 9
      subpkg/about/about.vue
  4. 9
      subpkg/address/address.vue
  5. 9
      subpkg/agreement/agreement.vue
  6. 9
      subpkg/feedback/feedback.vue
  7. 8
      subpkg/knowledgeInfo/knowledgeInfo.vue
  8. 9
      subpkg/medal/medal.vue
  9. 9
      subpkg/message/message.vue
  10. 7
      subpkg/messageInfo/messageInfo.vue
  11. 9
      subpkg/privacy/privacy.vue
  12. 9
      subpkg/rechallenge/rechallenge.vue
  13. 9
      subpkg/review/review.vue
  14. 7
      subpkg/role/role.vue

18
components/navigation/navigation.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<view class="header" :style="{top: height}"> <view class="header" :style="{top: height}">
<label class="back" @click="back()"></label> <label v-if="isBack" class="back" @click="back()"></label>
<label v-else class="noback"></label>
<view class="title">{{title}}</view> <view class="title">{{title}}</view>
</view> </view>
</template> </template>
@ -17,6 +18,10 @@
title: { title: {
type: String, type: String,
default: '' default: ''
},
isBack: {
type: Boolean,
default: true
} }
}, },
created() { created() {
@ -67,6 +72,17 @@ label.back {
background-size: auto 60%; background-size: auto 60%;
} }
label.noback {
display: inline-block;
position: relative;
top: 16rpx;
left: 4%;
padding-left: 1.25rem;
width: 60rpx;
height: 60rpx;
background-size: auto 60%;
}
.title { .title {
margin: -54rpx 0 50rpx; margin: -54rpx 0 50rpx;
color: #333; color: #333;

16
pages/knowledge/knowledge.vue
View File

@ -1,9 +1,10 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"> <!-- <view class="secbar">
<view class="title">知识库</view> <view class="title">知识库</view>
</view> </view> -->
<navigation :is-back="false" title="知识库"></navigation>
<view class="mainwrap"> <view class="mainwrap">
<view class="subwrap"> <view class="subwrap">
<view class="message-list"> <view class="message-list">
@ -20,7 +21,9 @@
<script> <script>
import tabbar from "@/components/tabbar/tabbar.vue"; import tabbar from "@/components/tabbar/tabbar.vue";
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
page: "", page: "",
@ -77,12 +80,13 @@
.mainwrap { .mainwrap {
height: calc(100% - 330rpx); height: calc(100% - 330rpx);
top: 73rpx;
} }
.title { // .title {
margin-top: 0; // margin-top: 0;
padding-top: 16rpx; // padding-top: 16rpx;
} // }
.artlist { .artlist {
margin: 2% 0 3.5%; margin: 2% 0 3.5%;

9
subpkg/about/about.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"><label class="back" @click="back()"></label> <!-- <view class="secbar"><label class="back" @click="back()"></label>
<view class="title">关于我们</view> <view class="title">关于我们</view>
</view> </view> -->
<view class="mainwrap2"> <navigation title="关于我们"></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="subwrap"> <view class="subwrap">
<view v-html="content"></view> <view v-html="content"></view>
</view> </view>
@ -13,7 +14,9 @@
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
content:"" content:""

9
subpkg/address/address.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"><label class="back" @click="back()"></label> <!-- <view class="secbar"><label class="back" @click="back()"></label>
<view class="title">联系地址</view> <view class="title">联系地址</view>
</view> </view> -->
<view class="mainwrap2"> <navigation title="联系地址"></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="subwrap"> <view class="subwrap">
<!-- 循环渲染地址信息 --> <!-- 循环渲染地址信息 -->
@ -49,8 +50,10 @@
mapGetters mapGetters
} from 'vuex' } from 'vuex'
import addressVue from './address.vue'; import addressVue from './address.vue';
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
options: [{ options: [{

9
subpkg/agreement/agreement.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"><label class="back" @click="back()"></label> <!-- <view class="secbar"><label class="back" @click="back()"></label>
<view class="title">用户协议</view> <view class="title">用户协议</view>
</view> </view> -->
<view class="mainwrap2"> <navigation title="用户协议"></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="subwrap"> <view class="subwrap">
<view v-html="content"></view> <view v-html="content"></view>
</view> </view>
@ -13,7 +14,9 @@
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
content:"" content:""

9
subpkg/feedback/feedback.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"><label class="back" @click="back()"></label> <!-- <view class="secbar"><label class="back" @click="back()"></label>
<view class="title">建议与意见反馈</view> <view class="title">建议与意见反馈</view>
</view> </view> -->
<view class="mainwrap2"> <navigation title="建议与意见反馈"></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="table_index"> <view class="table_index">
<!-- <uni-section title="建议与反馈" type="line"></uni-section> --> <!-- <uni-section title="建议与反馈" type="line"></uni-section> -->
@ -23,8 +24,10 @@
</view> </view>
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
import { mapMutations, mapState } from 'vuex' import { mapMutations, mapState } from 'vuex'
export default { export default {
components: {navigation},
data() { data() {
return { return {
formData: { formData: {

8
subpkg/knowledgeInfo/knowledgeInfo.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"><label class="back" @click="back()"></label> <!-- <view class="secbar"><label class="back" @click="back()"></label></view> -->
</view> <navigation></navigation>
<view class="mainwrap2"> <view class="mainwrap2" style="top: 73rpx;">
<view class="title">{{title}}</view> <view class="title">{{title}}</view>
<view class="timetop">{{createTime}}</view> <view class="timetop">{{createTime}}</view>
<view class="subwrap"> <view class="subwrap">
@ -14,7 +14,9 @@
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
content:"", content:"",

9
subpkg/medal/medal.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"> <label class="back" @click="back()"></label> <!-- <view class="secbar"> <label class="back" @click="back()"></label>
<view class="title">我的勋章</view> <view class="title">我的勋章</view>
</view> </view> -->
<view class="mainwrap2"> <navigation title="我的勋章"></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="perinfo"> <span class="type-name"><img :src="avatarUrl"></img></span> <view class="perinfo"> <span class="type-name"><img :src="avatarUrl"></img></span>
<view class="dycd"> <span class="myname">{{name}}</span> <view class="dycd"> <span class="myname">{{name}}</span>
的勋章墙 的勋章墙
@ -92,7 +93,9 @@
mapMutations, mapMutations,
mapGetters mapGetters
} from 'vuex' } from 'vuex'
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
prefix:"", prefix:"",

9
subpkg/message/message.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"><label class="back" @click="back()"></label> <!-- <view class="secbar"><label class="back" @click="back()"></label>
<view class="title">消息</view> <view class="title">消息</view>
</view> </view> -->
<view class="mainwrap2"> <navigation title="消息"></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="subwrap"> <view class="subwrap">
<view class="message-list"> <view class="message-list">
<view class="artlist" v-for="(item, i) in messageList" :key="i" @click="navClickHandler(item)"> <view class="artlist" v-for="(item, i) in messageList" :key="i" @click="navClickHandler(item)">
@ -17,7 +18,9 @@
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
messageList:[], messageList:[],

7
subpkg/messageInfo/messageInfo.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"><label class="back" @click="back()"></label></view> <!-- <view class="secbar"><label class="back" @click="back()"></label></view> -->
<view class="mainwrap2"> <navigation></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="subwrap"> <view class="subwrap">
<view v-html="content"></view> <view v-html="content"></view>
</view> </view>
@ -11,7 +12,9 @@
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
content:"", content:"",

9
subpkg/privacy/privacy.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"><label class="back" @click="back()"></label> <!-- <view class="secbar"><label class="back" @click="back()"></label>
<view class="title">隐私政策</view> <view class="title">隐私政策</view>
</view> </view> -->
<view class="mainwrap2"> <navigation title="隐私政策"></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="subwrap"> <view class="subwrap">
<view v-html="content"></view> <view v-html="content"></view>
</view> </view>
@ -13,7 +14,9 @@
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
content:"" content:""

9
subpkg/rechallenge/rechallenge.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"> <label class="back" @click="back()"></label> <!-- <view class="secbar"> <label class="back" @click="back()"></label>
<view class="title">重新挑战</view> <view class="title">重新挑战</view>
</view> </view> -->
<view class="mainwrap2"> <navigation title="重新挑战"></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="background-info"> <view class="background-info">
您上次挑战的场景是“<font style="color:#fd6d1f;">{{sceneName}}</font>”，挑战角色是 “<font style="color:#fd6d1f;">{{roleName}}</font>”，共计{{total}}道题目。您可从第1题开始重新挑战，或者任意选择其中一道题重新挑战。 您上次挑战的场景是“<font style="color:#fd6d1f;">{{sceneName}}</font>”，挑战角色是 “<font style="color:#fd6d1f;">{{roleName}}</font>”，共计{{total}}道题目。您可从第1题开始重新挑战，或者任意选择其中一道题重新挑战。
</view> </view>
@ -26,7 +27,9 @@
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
"sceneName":"", "sceneName":"",

9
subpkg/review/review.vue
View File

@ -1,10 +1,11 @@
<template> <template>
<view class="wrap"> <view class="wrap">
<view class="stabar"></view> <view class="stabar"></view>
<view class="secbar"> <label class="back" @click="back()"></label> <!-- <view class="secbar"> <label class="back" @click="back()"></label>
<view class="title">演练回顾</view> <view class="title">演练回顾</view>
</view> </view> -->
<view class="mainwrap2"> <navigation title="重新挑战"></navigation>
<view class="mainwrap2" style="top: 73rpx;">
<view class="background-info"> <view class="background-info">
您已完成“<font style="color:#fd6d1f;">{{sceneName}}</font>”场景中 “<font style="color:#fd6d1f;">{{roleName}} 您已完成“<font style="color:#fd6d1f;">{{sceneName}}</font>”场景中 “<font style="color:#fd6d1f;">{{roleName}}
</font>”〞角色挑战的共计{{total}}道题目，，每道题目和您选择的答案详情如下： </font>”〞角色挑战的共计{{total}}道题目，，每道题目和您选择的答案详情如下：
@ -33,7 +34,9 @@
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
"sceneName": "", "sceneName": "",

7
subpkg/role/role.vue
View File

@ -1,7 +1,9 @@
<template> <template>
<view class="role-container"> <view class="role-container">
<view class="wrap"> <view class="wrap">
<view class="secbar"> <span class="back" @click="back()"></span></view> <view class="stabar"></view>
<!-- <view class="secbar"> <span class="back" @click="back()"></span></view> -->
<navigation></navigation>
<view class="mainwrap3"> <view class="mainwrap3">
<img src="/static/images/bg_role.jpg" alt=""/> <img src="/static/images/bg_role.jpg" alt=""/>
<view class="role_wrap"> <view class="role_wrap">
@ -42,8 +44,9 @@
</template> </template>
<script> <script>
import navigation from "@/components/navigation/navigation.vue";
export default { export default {
components: {navigation},
data() { data() {
return { return {
showButton: false, showButton: false,

Write Preview
Loading…
Cancel
Save