Authored by hf

code review by hf: merge liangzhifeng and zhangzhen codes do fixes some bugs

... ... @@ -28,6 +28,17 @@ class UnionTrans
3017 => '多麦web',
3019 => '多麦wap',
3057 => '多麦优质',
1014 => '百度',
2744 => '360搜索',
2891 => 'M百度CPC',
3003 => 'M神马搜索',
3079 => 'm360cpc',
3187 => '360品专',
3191 => 'm搜狗品专',
3189 => '搜狗品专',
2949 => 'm搜狗cpc',
1026 => '搜狗',
);
/**
... ... @@ -120,7 +131,7 @@ class UnionTrans
'data' => json_encode(array(
'order_code' => $order_code,
'unionid' => $unionInfo['client_id'],
'union_name' => isset(self::$unionNames[$clientId]) ? self::$unionNames[$clientId] : '',
'union_name' => isset(self::$unionNames[$clientId]) ? self::$unionNames[$clientId] : $clientId,
))
));
if ($debug) {
... ...
@charset "utf-8";
@import "compass", "compass/reset";
$pxConvertRem: 40;
* {
-webkit-tap-highlight-color: rgba(0,0,0,0);
-moz-tap-highlight-color: rgba(0,0,0,0);
tap-highlight-color: rgba(0,0,0,0);
}
html, body {
font-family: helvetica,Arial,"黑体";
width: 100%;
font-size: 12px;
line-height: 1.4;
}
.clearfix:before,
.clearfix:after {
content: "";
display: table;
}
.clearfix:after {
clear: both;
}
.clearfix {
*zoom: 1;
}
button, input, select, textarea {
// font-family: inherit;
font-size: 100%;
margin: 0;
}
img {
max-width: 100%;
display: block;
border: 0;
margin: 0 auto;
}
a {
text-decoration: none;
outline: none;
color: #000;
&:link,
&:visited,
&:hover,
&:actived {
color: #000;
}
}
*:focus {
outline: none;
}
.hide {
display: none;
}
.overflow-hidden {
overflow: hidden;
}
@font-face {
font-family: "iconfont";
src: font-url('iconfont.eot'); /* IE9*/
src: font-url('iconfont.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
font-url('iconfont.woff') format('woff'), /* chromefirefox */
font-url('iconfont.ttf') format('truetype'), /* chromefirefoxoperaSafari, Android, iOS 4.2+*/
font-url('iconfont.svg#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
text-decoration: none;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-moz-osx-font-smoothing: grayscale;
}
.yoho-tip {
position: fixed;
display: none;
text-align: center;
width: 70%;
padding: 34px 0;
top: 50%;
left: 50%;
margin-left: -35%;
margin-top: -45px;
background-color: rgba(0,0,0,.7);
color: #fff;
font-size: 18px;
border: none;
z-index:4;
@include border-radius(10px);
}
.tap-hightlight {
&.highlight {
background: #eee!important;
}
}
.load-more-info {
width: 100%;
height: 70rem / $pxConvertRem;
line-height: 70rem / $pxConvertRem;
text-align: center;
font-size: 14px;
overflow: hidden;
.status {
&.hide {
display: none;
}
}
}
/*px转化rem*/
@function pxToRem($px) {
$pxConvertRem: 40px;
@if $px == 0 {
@return 0;
} @else {
@return $px / $pxConvertRem * 1rem;
}
}
@mixin rem-sprite ($map,$sprite) {
$offsetY: nth(sprite-position($map,$sprite),2);
background-image: sprite-url($map);
background-repeat: no-repeat;
background-position: 0 pxToRem($offsetY);
background-size: pxToRem(sprite-width($map)) pxToRem(sprite-height($map));
}
@import "layout/header";
@import "layout/footer";
@import "layout/footer_tab";
@import "good";
@import "lazy-failure";
@import "filter";
@import "loading";
@import "passport/index";
@import "guang/index";
@import "home/index";
@import "category/index";
@import "product/index";
@import "index/index";
@import "cart/index";
@import "me/index"; //个人中心
... ...