fe / YOHOBUYWAP · Commits

Go to a project

Authored by uedxwg
Commit f095b70398a7e3fd9d346d31a3c163e35ae0839b 1 parent a16b7aba

消息页面样式修改

Inline Side-by-side
Showing 6 changed files with 118 additions and 59 deletions
... ... @@ -23,11 +23,11 @@ class Yohobuy
// const YOHOBUY_URL = 'http://www.yohobuy.com/';
//java API
const API_URL = 'http://apih5.yoho.cn/';
const API_URL2 = 'http://apih5.yoho.cn/';
const SERVICE_URL = 'http://serviceh5.yoho.cn/';
const YOHOBUY_URL = 'http://www.yohobuy.com/';
const API_OLD = 'http://api2.open.yohobuy.com/';
// const API_URL = 'http://apih5.yoho.cn/';
// const API_URL2 = 'http://apih5.yoho.cn/';
// const SERVICE_URL = 'http://serviceh5.yoho.cn/';
// const YOHOBUY_URL = 'http://www.yohobuy.com/';
// const API_OLD = 'http://api2.open.yohobuy.com/';
// const API_URL = 'http://api.yoho.cn/';
// const API_URL2 = 'http://api.yoho.cn/';
... ... @@ -43,14 +43,13 @@ class Yohobuy
// const API_OLD = 'http://api2.open.yohobuy.com/';
/* 测试环境 java API*/
// const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://devapi.yoho.cn:58078/';
// const API_URL = 'http://devapi.yoho.cn:58078/';
// const DEV_API_URL = 'http://devapi.yoho.cn:58078/';
// const SERVICE_URL = 'http://testservice.yoho.cn:28077/'; // 'http://devservice.yoho.cn:58077/';
// const DEV_SERVICE_URL = 'http://devservice.yoho.cn:58077/';
// const PRD_SERVICE_URL = 'http://serviceh5.yoho.cn/';
// const YOHOBUY_URL = 'http://www.yohobuy.com/';
// const API_OLD = 'http://test2.open.yohobuy.com/';
const API_URL = 'http://testapi.yoho.cn:28078/'; // 'http://devapi.yoho.cn:58078/';
const DEV_API_URL = 'http://devapi.yoho.cn:58078/';
const SERVICE_URL = 'http://testservice.yoho.cn:28077/'; // 'http://devservice.yoho.cn:58077/';
const DEV_SERVICE_URL = 'http://devservice.yoho.cn:58077/';
const PRD_SERVICE_URL = 'http://serviceh5.yoho.cn/';
const YOHOBUY_URL = 'http://www.yohobuy.com/';
const API_OLD = 'http://test2.open.yohobuy.com/';
/* 测试环境 php API*/
// const API_URL = 'http://test2.open.yohobuy.com/';
... ...
... ... @@ -2,18 +2,10 @@ var $ = require('jquery'),
loading = require('../plugin/loading'),
dialog = require('./dialog');
var $massagePage = $('.massage-page'),
$page = $('.massage-page'),
statu = 0,
var $page = $('.massage-page'),
page = 1,
stopLoading = false;
$massagePage.on('touchend', 'p', function() {
}).on('touchend', '.del', function() {
});
function massageAJAX(page) {
loading.showLoadingMask();
$.ajax({
... ...
.massage-page{
margin-top: .4rem;
padding-bottom:.6rem;
.massage-list{
padding: 1em 2em 1em 1em;
padding: 1em 2em 1em 1.4em;
border-bottom: 1px solid #F8F8F8;
position: relative;
overflow: hidden;
... ... @@ -19,17 +20,72 @@
top: .6rem;
color: #cccccc;
}
strong{
width: 8px;
height: 8px;
position: absolute;
left: .4rem;
top: 1rem;
background: #f00;
border-radius:50%;
}
}
.massage-main{
border-bottom: 1px solid #F8F8F8;
padding: 12px;
margin-left: 10px;
margin-bottom: 10px;
h3{
line-height: 1.4rem;
h6{
margin-bottom: .2rem;
}
span{
color: #656565;
}
}
.sale-btn{
background-color: #ea2622;
color: #fff;
padding: 5px 10px 5px 10px;
}
.coupon-item{
margin-left: 10px;
padding-bottom: 10px;
border-bottom: 1px solid #F8F8F8;
margin-top: 10px;
.coupon-img{
width: 3.2rem;
height: auto;
overflow: hidden;
float: left;
margin-right: .4rem;
img{
width: 100%;
height: auto;
}
}
.coupon-info{
font-size: .55rem;
span{
color: #f00;
}
}
.coupon-action{
width: 110px;
font-size: 12px;
letter-spacing: 2px;
margin: 3px 0 0 0;
height: 35px;
line-height: 35px;
background: #ed0010;
text-align: center;
margin-left: 3.6rem;
a{
display: block;
color: #fff;
width: 100%;
height:100%;
}
}
}
}
\ No newline at end of file
... ...
{{#list}}
<div class="massage-list" data-id="{{id}}">
{{#if isNotReaded}}
<strong></strong>
{{/if}}
<p><a href="{{url}}">{{title}}</a></p>
<span>{{time}}</span>
<i class="iconfont del">&#xe621;</i>
... ...
{{> layout/header}}
<div class="massage-page yoho-page">
<div class="massage-main">
<h3>{{title}}</h3>
<h6>{{title}}</h6>
<span>{{sender}} 发送于{{time}}</span>
</div>
{{#if text}}
<div class="massage-main">
{{# text}}
<!-- 文本消息 -->
<p>{{{content}}}</p>
{{/ text}}
{{# coupons}}
<!-- 优惠券消息 -->
<div class="coupon-item">
<div class="coupon-img">
<img src="http://static.yohobuy.com/images/v2/activity/default_coupon.jpg">
</div>
<div class="coupon-info">
<p>{{remark}}</p>
{{#if url}}
<p>面值：{{price}}</p>
<p>有效期：{{useTime}}</p>
{{^}}
<p>使用时间：{{useTime}}</p>
<p>领取时间：{{pickTime}}</p>
{{/if}}
</div>
<div class="coupon-action">
{{#if url}}
<a href="{{url}}" class="view-coupon-btn">立即查看</a>
{{^}}
<a{{#if canPick}} class="pick-coupon-btn" data-id="{{id}}"{{/if}}>立即领取</a>
{{/if}}
</div>
</div>
{{/if}}
{{#if coupons}}
{{# coupons}}
<!-- 优惠券消息 -->
<div class="coupon-item">
<div class="coupon-img">
<img src="http://static.yohobuy.com/images/v2/activity/default_coupon.jpg">
</div>
{{/ coupons}}
{{# sale}}
<!-- 促销消息 -->
<div class="sale-img">
<img src="{{image}}">
<div class="coupon-info">
<p>{{remark}}</p>
{{#if url}}
<p>面值：<span>{{price}}</span></p>
<p>有效期：{{useTime}}</p>
{{^}}
<p>使用时间：{{useTime}}</p>
<p>领取时间：{{pickTime}}</p>
{{/if}}
</div>
<p>{{{content}}}</p>
<a href="{{btnLink}}" class="sale-btn">{{btnName}}</a>
{{/ sale}}
<div class="coupon-action">
{{#if url}}
<a href="{{url}}" class="view-coupon-btn">立即查看</a>
{{^}}
<a{{#if canPick}} class="pick-coupon-btn" data-id="{{id}}"{{/if}}>立即领取</a>
{{/if}}
</div>
</div>
{{/ coupons}}
{{/if}}
{{#if sale}}
{{# sale}}
<!-- 促销消息 -->
<div class="sale-img">
<img src="{{image}}">
</div>
<br />
<br />
<p>{{{content}}}</p>
<br />
<br />
<a href="{{btnLink}}" class="sale-btn">{{btnName}}</a>
{{/ sale}}
{{/if}}
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -283,7 +283,6 @@ class HomeController extends AbstractAction
$messages['pageFooter'] = true;
$messages['messagePage'] = true;
$this->_view->display('message', $messages);
}
... ... @@ -335,7 +334,6 @@ class HomeController extends AbstractAction
$uid = $this->getUid(true);
$data = UserModel::getMessageDetail($uid, $id);
$data['pageFooter'] = true;
$this->_view->display('message-main', $data);
}
... ...