fe / yohoblk-wap · Commits

Go to a project

Authored by 陈峰
Commit 489f9ae9d7c49b4ff001b9bfb0f7d90d68800798 1 parent 0c567280

home

Inline Side-by-side
Showing 3 changed files with 45 additions and 54 deletions
... ... @@ -18,9 +18,9 @@ module.exports = {
app_type: 1
},
domains: {
api: 'http://api-test2.yohops.com:9999/',
service: 'http://service-test2.yohops.com:9999/',
singleApi: 'http://api-test2.yohops.com:9999/'
// api: 'http://api-test2.yohops.com:9999/',
// service: 'http://service-test2.yohops.com:9999/',
// singleApi: 'http://api-test2.yohops.com:9999/'
// api: 'http://api-test2.yohops.com:9999/',
// service: 'http://service-test2.yohops.com:9999/',
... ... @@ -29,9 +29,9 @@ module.exports = {
// service: 'http://dev-service.yohops.com:9999/',
// singleApi: 'http://192.168.102.27:8092/'
// //
// api: 'http://api.yoho.cn/',
// service: 'http://service.yoho.cn/',
// singleApi: 'http://single.yoho.cn/'
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/',
singleApi: 'http://single.yoho.cn/'
},
subDomains: {
host: '.m.yohoblk.com',
... ... @@ -162,9 +162,9 @@ if (isProduction) {
// api: process.env.TEST_API || 'http://api-test1.yohops.com:9999/',
// service: process.env.TEST_SERVICE || 'http://service-test1.yohops.com:9999/',
// singleApi: process.env.TEST_SINGLE || 'http://api-test1.yohops.com:9999/'
api: 'http://api-test2.yohops.com:9999/',
service: 'http://service-test2.yohops.com:9999/',
singleApi: 'http://api-test2.yohops.com:9999/'
api: 'http://api-test1.yohops.com:9999/',
service: 'http://service-test1.yohops.com:9999/',
singleApi: 'http://api-test1.yohops.com:9999/'
},
memcache: {
master: ['192.168.104.15:12111', '192.168.104.29:12111', '192.168.104.32:12111'],
... ...
... ... @@ -6,12 +6,12 @@
<i class="icon icon-back go-back-btn" @click="goBack"></i>
</slot>
</div>
<div class="blk-header-right">
<slot name="right"></slot>
</div>
<div class="blk-header-main">
<span class="blk-header-title"><slot name="title">{{yoho.title}}</slot></span>
</div>
<div class="blk-header-right">
<slot name="right"></slot>
</div>
</div>
<div class="blk-header-gap"></div>
</div>
... ... @@ -106,11 +106,11 @@ export default {
.blk-header {
box-sizing: content-box;
position: fixed;
display: flex;
top: 0;
right: 0;
left: 0;
z-index: 210;
padding: 0 34px;
height: $header-height;
max-width: 750px;
margin-left: auto;
... ... @@ -127,17 +127,37 @@ export default {
vertical-align: middle;
}
.blk-header-left {
width: 100px;
text-align: center;
font-size: 64px;
}
.blk-header-right {
margin-right: -32px;
width: 100px;
text-align: center;
font-size: 45px;
.right-btn {
font-size: 17PX;
margin-right: 30px;
}
}
.blk-header-main {
flex: 1;
text-align: center;
font-size: $header-font-size;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.icon {
min-width: $header-height;
min-height: $header-height;
line-height: $header-height;
margin-left: -32px;
text-indent: 32px;
display: inline-block;
&.icon-search {
margin-top: -10px;
}
}
.go-back-btn {
... ... @@ -148,39 +168,6 @@ export default {
}
}
.blk-header-main {
display: block;
text-align: center;
margin-left: auto;
margin-right: auto;
font-size: $header-font-size;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
position: absolute;
left: 0;
right: 0;
z-index: -1;
}
.blk-header-left {
float: left;
font-size: 64px;
}
.blk-header-right {
float: right;
font-size: 45px;
span {
margin-left: 30px;
}
.right-btn {
font-size: 17PX;
margin-right: 30px;
}
}
.blk-header-gap {
height: $header-height + 2;
... ...
... ... @@ -2,8 +2,12 @@
<layout-body class="page-detail">
<header-box slot="header">
<span slot="left"></span>
<span slot="title">asd</span>
<span slot="right">right</span>
<span slot="title">
</span>
<span slot="right">
<i class="icon icon-search"></i>
</span>
</header-box>
</layout-body>
</template>
... ...