fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit ed75f66cf3bddac8e26d9c73adad47d345845c68 1 parent 93a529a3 master ... baidu_ocpcapi develop feature/canbuy feature/channelDataMap feature/company-profile feature/contact feature/detail-link feature/home-optimize feature/overseas-edition feature/payment feature/pcurl feature/reduce feature/refactor_alert feature/shoppingPay feature/virtualOrder hotfix/11 hotfix/cart hotfix/changeappversion hotfix/gift hotfix/im hotfix/link hotfix/ocpc hotfix/shop hotfix/upload hotfix/yohobi release/6.9.0 release/6.9.2 2019-12-5 all

add js css

Inline Side-by-side
Showing 9 changed files with 451 additions and 310 deletions
... ... @@ -43,7 +43,7 @@ const cancelArticle = (uid, id) => {
uid: uid,
article_id: id
});
}
};
const getFavoriteProductList = (uid, page, limit)=> {
let options = {
... ...
... ... @@ -139,19 +139,19 @@ const favoriteProductListAsync = (uid, page, limit, selectedSort, subscribe, red
let products = _.get(product, 'data.product_list', []);
if (reduction === 'Y' && promotion === 'Y') {
//参加活动的降价商品
// 参加活动的降价商品
return products.filter(pro => pro.is_price_down === 'Y' && pro.is_join_promotion === 'Y');
} else if (selectedSort) {
//商品分类过滤
// 商品分类过滤
return products.filter(pro => pro.category_id === selectedSort);
} else if (subscribe === 'Y') {
//订阅降价通知过滤
// 订阅降价通知过滤
return products.filter(pro => pro.is_subscribe_reduction === 'Y');
} else if (reduction === 'Y') {
//降价商品过滤
// 降价商品过滤
return products.filter(pro => pro.is_price_down === 'Y');
} else if (promotion === 'Y') {
//参加活动商品过滤
// 参加活动商品过滤
return products.filter(pro => pro.is_join_promotion === 'Y');
} else {
return products;
... ...
... ... @@ -37,8 +37,8 @@ const getClientData = (type, encryptedUid) => {
let records = [];
let hasHistory = false;
if(res[0] && res[0].code === 200) {
if(res[0].data.config) {
if (res[0] && res[0].code === 200) {
if (res[0].data.config) {
csSetting = res[0].data.config;
csSetting.qrCode = csSetting.qrCode.replace(regExp, qcSize);
csSetting.pcAdImg = csSetting.pcAdImg.replace(regExp, advSize);
... ... @@ -46,16 +46,16 @@ const getClientData = (type, encryptedUid) => {
}
}
if(res[1] && res[1].code === 200) {
if (res[1] && res[1].code === 200) {
records = res[1].data.records;
hasHistory = records.length > 0;
}
if(res[2] && res[2].code === 200) {
if (res[2] && res[2].code === 200) {
orderList = res[2].data;
}
if(res[3] && res[3].code === 200) {
if (res[3] && res[3].code === 200) {
qasList = res[3].data;
}
... ...
... ... @@ -4,8 +4,8 @@
* @date: 2016/2/17
*/
var $ = require('yoho-jquery');
var Handlebars = require('yoho-handlebars');
var $ = require('yoho.jquery');
var Handlebars = require('yoho.handlebars');
var dialog = require('../common/dialog');
... ... @@ -13,19 +13,26 @@ var Dialog = dialog.Dialog;
var Confirm = dialog.Confirm;
var $tpl = $('#cancel-dialog-tpl');
var deleteDialog = '<div class="order-delete-confirm">' +
'<div class="header">' +
'<p>删除订单</p>' +
'<a href="javascript:;" title="关闭"></a>' +
'</div>' +
'<div class="body">' +
'<p class="confirm-tip"><i class="icon-doubt"></i>{{deleteMessage}}</p>' +
'<p class="delete-tip">{{deleteTip}}</p>' +
'</div>' +
'</div>';
var html = $tpl.html();
var active;
var dialogMessage = '<p class="message-title"><i class="order-icon {{messageIcon}}"></i>{{messageTitle}}</p><p class="message-summary">{{messageSummary}}</p>';
var $dialogEdit = $('#edit-dialog-tpl');
var $addressManage, $province, $city, $county, $selectList, $name, $phone, $address, $telCode, $tel, isProvinceChecked = false;
function cancelFactory(id) {
var options = {
mask: true,
mask: false,
btns: [
{
id: 'cancel-sure',
... ... @@ -34,31 +41,23 @@ function cancelFactory(id) {
cb: function() {
var $checked = $('.cancel-dialog :checked');
var $tip = $('.cancel-dialog .cancel-tip');
var text = '';
if ($checked.val() === '10') {
text = $checked.parent().find('#reason_other').val();
} else {
text = $checked.siblings('label').text();
}
if ($checked.length === 0) {
$tip.html('请选择要取消订单的原因');
return;
}
$.ajax({
type: 'POST',
url: '/home/orders/cancelorder',
data: {
orderCode: id,
reasonId: $checked.val(),
reason: text
reason: $checked.val()
}
}).then(function(data) {
if (data.code === 200) {
active.close();
active = showMessgaeDialog('icon-success', '订单修改', '您已成功取消了该订单', function() {
location.reload(true);
});
active.show();
history.go(0);
} else {
$tip.html(data.message);
}
... ... @@ -67,7 +66,7 @@ function cancelFactory(id) {
},
{
id: 'cancel-no',
name: '暂不取消',
name: '取消',
btnClass: ['cancel-no'],
cb: function() {
active.close();
... ... @@ -80,7 +79,6 @@ function cancelFactory(id) {
return new Dialog(options);
}
function showMessgaeDialog(message_icon, message_title, message_summary, cb) {
var template = Handlebars.compile(dialogMessage);
var html = template({messageIcon: message_icon, messageTitle: message_title, messageSummary: message_summary});
... ... @@ -175,13 +173,84 @@ $('.me-orders, .order-detail').on('click', '.cancel-order', function(e) {
content: '您确定要确认收货吗？'
});
active.show();
}).on('click', '.order-delete', function() {
var id = $(this).closest('.order, .order-detail').data('id');
active = deleteOrder(id, this);
active.show();
}).on('click', '.edit-order', function() {
$(this).addClass('edit-order-active');
active = editOrder($(this).closest('.order, .order-detail').data('id'));
active.show();
newAddress(0);
}).on('click', '.rebuy', function() {
var id = $(this).closest('.order, .order-detail').data('id');
buyAgain(id);
});
// 再次购买
function buyAgain(id) {
$.ajax({
type: 'post',
url: '/home/orders/reAdd',
data: {orderCode: id}
}).then(function(d) {
if (d.code === 200) {
location.href = '/shopping/cart';
} else {
new dialog.Alert(d.message).show();
}
});
}
function deleteOrder(id, obj) {
// 是否为彻底删除
var isFullyDelete = true;
var $order = $(obj).parents('.order');
var deleteMessage = isFullyDelete ? '您确定要永久删除订单吗?' : '您确定要删除订单吗?';
var deleteTip = isFullyDelete ? '永久删除后,订单将无法恢复,您将无法对该订单的商品申请售后服务,请谨慎操作。' : '删除后,您可以在订单回收站找回该订单,也可以做永久删除。';
var insert = Handlebars.compile(deleteDialog);
var html = insert({deleteMessage: deleteMessage, deleteTip: deleteTip});
var options = {
mask: false,
btns: [
{
id: 'delete-sure',
name: '确定',
btnClass: ['delete-sure'],
cb: function() {
$.ajax({
type: 'POST',
url: '/home/orders/delOrder',
data: {
orderCode: id,
isFullyDelete: isFullyDelete
}
}).then(function(data) {
if (data.code === 200) {
active.close();
$order.remove();
location.reload();
} else {
active.close();
new dialog.Alert(data.message).show();
}
});
}
},
{
id: 'delete-no',
name: '取消',
btnClass: ['delete-no'],
cb: function() {
active.close();
}
}
],
content: html,
className: 'delete-dialog'
};
return new Dialog(options);
}
// 地址操作
function newAddress(id) {
var code, codeId;
... ...
... ... @@ -8,7 +8,7 @@ var $ = require('yoho.jquery');
require('./order-block');
//不同订单包裹提示
// 不同订单包裹提示
$('.why').click(function() {
$('#differentBag').show();
... ... @@ -23,7 +23,7 @@ $(document).click(function() {
});
//订单包裹左右切换
// 订单包裹左右切换
function lunBo($pre, $next, $ul, $iWidth) {
var i = 1,
j = 1;
... ... @@ -71,7 +71,7 @@ function lunBo($pre, $next, $ul, $iWidth) {
});
}
//订单分类
// 订单分类
$('.bag').find('ul').each(function() {
var $pre = $(this).parent().parent().find('.pre');
var $next = $(this).parent().parent().find('.next');
... ...
... ... @@ -6,6 +6,7 @@
}
.order-table-header {
.info {
width: 330px;
text-align: left;
... ... @@ -20,9 +21,7 @@
width: 60px;
}
.pay,
.order-status,
.operation {
.pay, .order-status, .operation {
width: 100px;
}
}
... ... @@ -33,6 +32,16 @@
background: #efefef;
padding: 0 5px;
border-bottom: 1px solid #e6e6e6;
.order-time{
margin-left: 25px;
}
.order-delete{
margin-right:15px;
color: #999;
&:hover{
text-decoration:underline;
}
}
}
.order {
... ... @@ -88,6 +97,17 @@
.color-size {
color: #999;
b{
display: inline-block;
vertical-align: bottom;
max-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
font-weight: 400;
}
}
.arrival-date {
... ... @@ -112,7 +132,7 @@
color: #468fa2;
max-width: 245px;
@mixin ellipsis ;
@mixin ellipsis;
}
.had-refund {
... ... @@ -147,9 +167,7 @@
width: 50px;
}
.pay,
.order-status,
.operation {
.pay, .order-status, .operation {
width: 90px;
border-left: 1px solid #e6e6e6;
padding: 5px;
... ... @@ -165,6 +183,14 @@
line-height: 18px;
color: #999;
}
.return-order{
display: inline-block;
padding: 3px 10px;
background: #FF7C48;
border-radius: 9px;
color: #fff;
text-align: center;
}
.op-item {
display: block;
... ... @@ -176,8 +202,7 @@
}
}
.no-pay,
.paid {
.no-pay, .paid {
color: #e8044f;
}
... ... @@ -234,7 +259,7 @@
margin-top: 1px;
border-top: 5px solid transparent;
border-bottom: 5px solid transparent;
border-left: 6px solid #fff;
border-left: 6px solid #FFF;
}
&.bottom {
... ... @@ -250,14 +275,37 @@
cursor: pointer;
}
.operation .pay-now {
.operation .pay-now,
.operation .confirm-received {
display: block;
color: #fff;
background: #353535;
height: 20px;
line-height: 20px;
text-align: center;
margin: 0 auto;
border-radius: 4px;
width: 68px;
}
.operation .rebuy{
display: inline-block;
box-sizing: border-box;
width: 68px;
height: 18px;
line-height: 18px;
border-radius: 5px;
text-align: center;
border: 1px solid #000;
}
.operation .comment-show-btn {
display: block;
color: #fff;
background: #de034a;
background: #349bba;
height: 20px;
line-height: 20px;
text-align: center;
margin: 0 auto;
margin-bottom: 2px;
border-radius: 4px;
width: 68px;
}
... ... @@ -289,7 +337,6 @@
width: 600px;
background: #fff;
padding: 20px 30px 35px 30px;
header {
font-size: 18px;
padding-bottom: 20px;
... ... @@ -297,16 +344,13 @@
color: #000;
text-align: left;
}
.close {
.close{
top: 15px;
right: 30px;
.iconfont {
.iconfont{
font-size: 30px;
}
}
.cancel-reason {
text-align: left;
... ... @@ -316,10 +360,11 @@
height: 28px;
line-height: 28px;
font-size: 14px;
white-space: nowrap;
}
label {
padding-left: 10px;
padding-left: 3px;
}
input[type="text"] {
... ... @@ -362,60 +407,107 @@
width: 126px;
}
}
.tip {
margin: 20px 0;
.tip{
margin: 20px 0 ;
font-size: 12px;
text-align: left;
color: #db3d50;
}
.reminder {
.reminder{
margin: 20px 0 10px;
}
.info-prompt {
ul {
.info-prompt{
ul{
margin-top: -10px;
}
li {
li{
margin: 10px 0;
font-size: 14px;
line-height: 16px;
text-align: left;
}
i {
color: #d70400;
i{
color: #d70400;
font-family: SimSun;
font-size: 16px;
margin-right: 10px;
vertical-align: -6px;
margin-right: 13px;
vertical-align: middle;
margin-left: 5px;
}
}
}
.message-dialog {
/* 删除订单对话框 */
.delete-dialog{
padding: 0 0 20px 0;
border:1px solid #000;
background:#fff;
.header{
padding:0 10px;
height:32px;
background: #444;
line-height:32px;
color:#fff;
text-align: left;
}
.close{
color:#fff;
.iconfont{
font-size: 20px;
font-weight:700;
}
}
.order-delete-confirm{
width:400px;
line-height:1.5;
}
.body{
padding:20px;
margin-top: 30px;
}
.confirm-tip{
font-size:18px;
word-wrap:break-word;
i{
display:inline-block;
width: 30px;
height:30px;
margin-right: 12px;
background: resolve(/home/doubt.png) no-repeat;
vertical-align:middle;
}
}
.delete-tip{
padding-left:20px;
margin:15px 0;
font-size:13px;
word-wrap:break-word;
}
.delete-sure{
background:#efefef;
}
.delete-no{
margin-left:60px;
border-color: #cdcdcd;
}
}
.message-dialog{
width: 350px;
background: #fff;
padding: 20px 30px 35px 30px;
.message-title {
.message-title{
margin-top: 40px;
margin-bottom: 27px;
font-size: 24px;
font-weight: 700;
}
.message-summary {
.message-summary{
width: 250px;
margin: 0 auto 22px;
font-size: 14px;
word-wrap: break-word;
line-height: 20px;
}
.btns {
padding: 15px 30px 0;
text-align: center;
... ... @@ -433,22 +525,18 @@
border: none;
}
}
.close {
.close{
top: 15px;
right: 15px;
.iconfont {
.iconfont{
font-size: 30px;
}
}
}
.edit-order-dialog {
width: 600px;
background: #fff;
padding: 20px 30px 35px 30px;
header {
font-size: 18px;
padding-bottom: 20px;
... ... @@ -456,89 +544,75 @@
color: #000;
text-align: left;
}
.close {
.close{
top: 15px;
right: 30px;
.iconfont {
.iconfont{
font-size: 30px;
}
}
.edit-order-info {
text-align: left;
li {
height: 26px;
margin: 20px 0;
margin:20px 0;
line-height: 26px;
font-size: 14px;
white-space: nowrap;
}
.form-required {
color: #d70400;
.form-required{
color: #d70400;
font-family: SimSun;
font-size: 16px;
margin-right: 10px;
vertical-align: -6px;
vertical-align: middle;
}
label {
display: inline-block;
width: 90px;
text-align: right;
display:inline-block;
width:90px;
text-align:right;
}
.inp {
width: 188px;
.inp{
width:188px;
height: 18px;
line-height: 18px;
padding: 3px 0;
border: 1px solid #e8e8e8;
line-height:18px;
padding:3px 0;
border:1px solid #e8e8e8;
margin-left: 10px;
text-indent: 5px;
box-sizing: content-box;
}
.w271 {
width: 271px;
.w271{
width:271px;
}
.w40 {
width: 40px;
.w40{
width:40px;
}
.inp[name='tel'] {
.inp[name='tel']{
margin-left: 0;
}
}
.ml10 {
margin-left: 10px;
.ml10{
margin-left:10px;
}
select {
select{
height: 25px;
line-height: 25px;
width: 100px;
padding: 0;
border: 1px solid #ccc;
}
.error {
.error{
display: none;
margin-left: 10px;
color: #db3d50;
font-size: 12px;
.icon-error {
margin-left:20px;
color:#db3d50;
font-size:12px;
.icon-error{
margin-right: 8px;
vertical-align: text-bottom;
vertical-align:text-bottom;
}
}
.btns {
padding: 15px 30px 0;
text-align: center;
... ... @@ -564,55 +638,42 @@
width: 126px;
}
}
.tip {
margin: 20px 0;
.tip{
margin: 20px 0 ;
font-size: 12px;
text-align: left;
color: #db3d50;
}
}
.order-icon {
.order-icon{
display: inline-block;
vertical-align: middle;
margin-right: 10px;
background: resolve(img/home/order-sprite.png);
background: resolve(/home/order-sprite.png);;
}
.icon-success {
.icon-success{
width: 30px;
height: 30px;
vertical-align: -6px;
background-position: 0 0;
}
.icon-waiting {
.icon-waiting{
width: 30px;
height: 30px;
vertical-align: -6px;
background-position: -32px 0;
background-position: -32px 0 ;
}
.icon-arrow {
.icon-arrow{
width: 11px;
height: 7px;
background-position: -36px -33px;
}
.icon-error {
.icon-error{
width: 15px;
height: 15px;
background-position: 0 -33px;
background-position:0 -33px;
}
.icon-right {
width: 15px;
height: 15px;
background-position: -50px -33px;
}
.icon-recycle {
.icon-recycle{
width: 15px;
height: 17px;
background-position: -18px -33px;
... ...
... ... @@ -2,7 +2,7 @@
font-size: 12px;
.order-detail > .title {
background-image: resolve(home/order-detail.png);
background-image: resolve(/home/order-detail.png);
}
.status {
... ... @@ -23,29 +23,25 @@
.complete-tip {
color: #999;
}
.cancel-order {
float: right;
.cancel-order{
float:right;
margin-right: 20px;
background: #ebebeb;
border: 1px solid #c1c1c1;
color: #000;
}
.edit-order {
float: right;
.edit-order{
float:right;
background: #ebebeb;
border: 1px solid #c1c1c1;
color: #000;
}
.edit-order-active {
.edit-order-active{
background: #444;
border: 1px solid #444;
color: #fff;
}
.go-pay {
.go-pay{
margin-left: 60px;
}
}
... ... @@ -65,7 +61,7 @@
display: inline-block;
height: 11px;
width: 11px;
background-image: resolve(home/complaint-icon.png);
background-image: resolve(/home/complaint-icon.png);
margin: 5px 5px 0;
}
}
... ... @@ -134,23 +130,23 @@
}
.outter-progress {
background: resolve(home/virtual-order-progress.png) no-repeat 0 0;
background: resolve(/home/virtual-order-progress.png) no-repeat 0 0;
}
.inner-progress {
background: resolve(home/virtual-order-progress.png) no-repeat 0 -12px;
background: resolve(/home/virtual-order-progress.png) no-repeat 0 -12px;
}
}
.outter-progress {
width: 552px;
height: 12px;
background: resolve(home/order-progress.png) no-repeat 0 0;
background: resolve(/home/order-progress.png) no-repeat 0 0;
}
.inner-progress {
height: 12px;
background: resolve(home/order-progress.png) no-repeat 0 -12px;
background: resolve(/home/order-progress.png) no-repeat 0 -12px;
}
.handle-time {
... ... @@ -170,152 +166,152 @@
line-height: 18px;
}
.differentOrder {
.invoice-type {
display: inline-block;
p {
display: inline-block;
}
}
.invoice-button {
display: inline-block;
margin-left: 20px;
color: #d93549;
border:1px solid #444444;
padding: 5px;
}
.differentOrder{
position: relative;
width: 100%;
margin-top: 10px;
.warn {
.warn{
text-align: center;
background: #fefbd5;
background: #FEFBD5;
font: initial;
height: 40px;
line-height: 40px;
font-size: 16px;
.red {
color: red;
.red{
color:red;
}
.why {
background: resolve(order/why.png) no-repeat;
.why{
background: url(/order/why.png) no-repeat;
width: 26px;
height: 20px;
display: inline-block;
vertical-align: middle;
}
.why:hover {
cursor: pointer;
}
}
.differentBag:before {
content: "";
position: absolute;
width: 0;
height: 0;
border-bottom: 10px solid #000000;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
top: -10px;
right: 113px;
}
.differentBag {
display: none;
position: absolute;
right: -10px;
top: 40px;
width: 510px;
padding: 0px 50px;
background: #ffffff;
z-index: 1;
border: solid 1px #000000;
font-size: 14px;
}
.bag {
position: relative;
border-bottom: solid 1px #e0e0e0;
margin-top: 10px;
padding: 20px 0px;
h3 {
height: 30px;
line-height: 30px;
font-weight: bold;
margin-left: 15px;
}
.pre {
position: absolute;
background: resolve(order/pre.png) no-repeat;
width: 30px;
height: 50px;
left: -30px;
top: 70px;
display: none;
}
.why:hover{
cursor: pointer;
}
}
.differentBag:before{
content: "";
position: absolute;
width: 0;
height: 0;
border-bottom:10px solid #000000;
border-left: 10px solid transparent;
border-right:10px solid transparent;
top:-10px;
right:113px ;
}
.differentBag{
display: none;
position: absolute;
right: -10px;
top:40px;
width: 510px;
padding:0px 50px;
background:#FFFFFF ;
z-index: 1;
border: solid 1px #000000;
font-size: 14px;
}
.bag{
position: relative;
border-bottom: solid 1px #E0E0E0;
margin-top: 10px;
padding: 20px 0px;
h3{
height: 30px;
line-height: 30px;
font-weight:bold ;
margin-left: 15px;
}
.pre{
position: absolute;
background: url(/order/pre.png) no-repeat;
width: 30px;
height: 50px;
left: -30px;
top:70px;
display: none;
cursor: pointer;
}
.next {
position: absolute;
background: resolve(order/next.png) no-repeat;
width: 30px;
height: 50px;
right: -30px;
top: 70px;
display: none;
}
.next{
position: absolute;
background: url(/order/next.png) no-repeat;
width: 30px;
height: 50px;
right:-30px;
top:70px;
display: none;
cursor: pointer;
}
p {
color: #767676;
margin-left: 15px;
}
}
.bagDetil {
position: relative;
height: 90px;
width: 510px;
overflow: hidden;
margin-bottom: 20px;
ul {
list-style: none;
position: absolute;
left: 0;
clear: both;
height: 90px;
li {
float: left;
width: 102px;
height: 90px;
line-height: 90px;
text-align: center;
position: relative;
img {
width: 90px;
height: 90px;
}
p {
position: absolute;
bottom: 0;
background: #9c3;
width: 90px;
height: 1rem;
line-height: 1rem;
color: #ffffff;
margin-left: 7px;
}
}
p{
color: #767676;
margin-left:15px;
}
}
.bagDetil{
position: relative;
height: 90px;
width: 510px;
overflow:hidden;
margin-bottom: 20px;
ul{
list-style: none;
position: absolute;
left: 0;
clear: both;
height: 90px;
li{
float: left;
width: 102px;
height: 90px;
line-height: 90px;
text-align: center;
position: relative;
img{
width: 90px;
height: 90px;
}
p{
position: absolute;
bottom:0;
background: #9c3;
width: 90px;
height: 1rem;
line-height:1rem;
color: #FFFFFF;
margin-left: 7px;
}
a {
cursor: default;
}
a:hover {
cursor: default;
}
}
}
}
}
}
}
.good-list {
table {
border-collapse: collapse;
... ... @@ -360,12 +356,13 @@
width: 100px;
a {
$img: img/home/coin-help.png;
$img: /home/coin-help.png;
display: inline-block;
width: width($img);
height: height($img);
background: resolve(home/coin-help.png);
background: url($img);
vertical-align: text-top;
}
}
... ... @@ -387,6 +384,17 @@
color: #999;
padding-top: 12px;
text-align: left;
b{
display: inline-block;
vertical-align: bottom;
max-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-style: normal;
font-weight: 400;
}
}
.name {
... ... @@ -396,7 +404,7 @@
text-align: left;
max-width: 230px;
@mixin ellipsis ;
@mixin ellipsis;
}
}
... ... @@ -413,7 +421,7 @@
width: 14px;
height: 14px;
display: inline-block;
background: resolve(cart/yoho-coin.png);
background: url(/cart/yoho-coin.png);
vertical-align: middle;
margin-top: -2px;
margin-right: 4px;
... ... @@ -456,11 +464,11 @@
}
.success-icon {
background: resolve(home/success-icon.png);
background: url(/home/success-icon.png);
}
.cancel-icon {
background: resolve(home/cancel-icon.png);
background: url(/home/cancel-icon.png);
}
.confirm-received {
... ... @@ -477,20 +485,16 @@
color: #000;
}
}
.freebie-tag {
background: #9c3;
.freebie-tag{
background:#9c3;
}
.advance-buy-tag {
background: #fc1264;
.advance-buy-tag{
background: #fc1264;
}
.virtual-good-tag {
background: red;
.virtual-good-tag{
background: red;
}
.presall-tag {
background: blue;
.presall-tag{
background: blue;
}
}
... ...
... ... @@ -2,7 +2,7 @@
font-size: 12px;
.order-ticket .title {
background-image: resolve(home/orders.png);
background-image: resolve(/home/orders.png);
}
.ticket-info {
... ... @@ -41,7 +41,7 @@
li {
float: left;
width: 232px;
height: 260px;
height: 290px;
margin: 10px;
border: 1px solid #e7e7e7;
word-break: break-all;
... ... @@ -50,8 +50,14 @@
}
.qr {
width: 230px;
height: 230px;
width: 232px;
height: 220px;
}
.qr-info {
font-size: 14px;
line-height: 20px;
}
}
... ... @@ -66,11 +72,11 @@
padding-left: 20px;
padding-bottom: 10px;
line-height: 20px;
background: resolve(home/qr-tip.png) no-repeat -27px 5px;
background: resolve(/home/qr-tip.png) no-repeat -27px 5px;
}
.warn {
background-position: 0 -23px;
}
}
}
}
\ No newline at end of file
... ...
.orders-me-page {
.orders .title {
padding-left: 130px;
line-height: 40px;
background-image: resolve(home/orders.png);
background-image: resolve(/home/orders.png);
font-size: 12px;
font-weight: bold;
}
... ... @@ -12,4 +13,4 @@
margin: 0 10px;
border: 1px #e6e6e6 solid;
}
}
}
\ No newline at end of file
... ...