fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit dba57b265558df5b3bf0a4a3e5bce4ff1872ea78 2 parents 12aa3547 1aa78b66

Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap

Inline Side-by-side
Showing 30 changed files with 178 additions and 189 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
... ... @@ -14,8 +14,8 @@
background: #fff;
color: #000;
cursor: pointer;
font-size: 14px;
height: 440px;
font-size: 14PX;
height: 440PX;
.classify {
width: 50%;
... ... @@ -23,8 +23,8 @@
background: #f8f8f8;
> li {
height: 60px;
line-height: 60px;
height: 60PX;
line-height: 60PX;
> * {
box-sizing: border-box;
... ... @@ -35,7 +35,7 @@
}
.shower {
padding-left: 20px;
padding-left: 20PX;
width: 100%;
overflow: hidden;
white-space: nowrap;
... ... @@ -63,17 +63,17 @@
position: absolute;
display: none;
width: 50%;
height: 440px;
height: 440PX;
left: 50%;
top: 0;
overflow: auto;
-webkit-overflow-scrolling: touch;
> li {
height: 60px;
line-height: 60px;
padding-left: 15px;
border-bottom: 1px solid #e6e6e6;
height: 60PX;
line-height: 60PX;
padding-left: 15PX;
border-bottom: 1PX solid #e6e6e6;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
... ...
... ... @@ -25,20 +25,20 @@
.loading {
position: absolute;
width: 60px;
height: 20px;
width: 60PX;
height: 20PX;
top: 50%;
left: 50%;
margin-top: -10px;
margin-left: -30px;
margin-top: -10PX;
margin-left: -30PX;
> div {
display: inline-block;
background: #fff;
width: 15px;
height: 15px;
width: 15PX;
height: 15PX;
border-radius: 100%;
margin: 2px;
margin: 2PX;
$init: 0.12;
@for $i from 1 to 3 {
... ...
... ... @@ -72,9 +72,9 @@
.triangle {
width: 0;
height: 0;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-bottom: 12px solid #000;
border-left: 8PX solid transparent;
border-right: 8PX solid transparent;
border-bottom: 12PX solid #000;
margin-left: 6rem;
}
... ... @@ -84,7 +84,7 @@
background: #000;
color: #fff;
font-size: 12px;
border-radius: 5px;
border-radius: 5PX;
text-align: center;
width: 7rem;
}
... ...
... ... @@ -114,7 +114,7 @@
padding: 5px 15px;
background: #f00;
color: #fff;
border-radius: 10px;
border-radius: 10PX;
margin-left: 20px;
}
... ... @@ -196,7 +196,7 @@
line-height: 1;
outline: 0;
border: 0;
border-radius: 4px;
border-radius: 4PX;
}
textarea {
padding: 12px;
... ... @@ -261,7 +261,7 @@
height: 88px;
line-height: 88px;
margin-bottom: 28px;
border-radius: 5px;
border-radius: 5PX;
font-size: 32px;
color: #fff;
text-align: center;
... ...
... ... @@ -55,7 +55,7 @@
font-size: 32px;
line-height: 2.5;
border: 1px solid #444;
border-radius: 4px;
border-radius: 4PX;
}
.not-avaliable-coupon-line {
... ...
... ... @@ -310,7 +310,7 @@
display: inline-block;
color: #000;
border: 1px solid;
border-radius: 2px;
border-radius: 2PX;
float: right;
padding: 0 5px;
line-height: 1.5;
... ...
... ... @@ -17,7 +17,6 @@
@import "hot-category";
@import "home-header";
@import "thumb-row";
@import "fresh-only";
.mobile-container{
width: 100%;
... ...
... ... @@ -6,7 +6,7 @@
display: inline-block;
width: 275px;
height: 160px;
border-radius: 4px;
border-radius: 4PX;
background-size: 100%;
background-repeat: no-repeat;
background-position: center;
... ...
... ... @@ -129,7 +129,7 @@ a {
font-style: normal;
text-decoration: none;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.2px;
-webkit-text-stroke-width: 0.2PX;
-moz-osx-font-smoothing: grayscale;
}
... ... @@ -138,17 +138,17 @@ a {
display: none;
text-align: center;
width: 70%;
padding: 34px 0;
padding: 34PX 0;
top: 50%;
left: 50%;
margin-left: -35%;
margin-top: -45px;
margin-top: -45PX;
background-color: rgba(0,0,0,.7);
color: #fff;
font-size: 18px;
font-size: 18PX;
border: none;
z-index:4;
border-radius: 10px;
border-radius: 10PX;
}
.tap-hightlight {
... ... @@ -162,7 +162,7 @@ a {
height: 70px;
line-height: 70px;
text-align: center;
font-size: 14px;
font-size: 14PX;
overflow: hidden;
.status {
... ...
.float-layer {
height: 88px;
height: 44PX;
background: rgba(68, 68, 68, 0.95);
position: fixed;
width: 100%;
bottom: 0;
left: 0;
z-index: 9999;
padding: 20px 0;
padding: 10PX 0;
.float-layer-left {
padding-left: 44px;
padding-left: 22PX;
overflow: hidden;
float: left;
img {
height: 88px;
height: 44PX;
float: left;
margin-right: 20px;
margin-right: 10PX;
}
p {
float: left;
font-size: 32px;
height: 88px;
line-height: 88px;
font-size: 16PX;
height: 44PX;
line-height: 44PX;
color: white;
}
.yoho-icon {
float: left;
margin-right: 20px;
font-size: 44px;
line-height: 88px;
width: 88px;
height: 88px;
margin-right: 10PX;
font-size: 22PX;
line-height: 44PX;
width: 44PX;
height: 44PX;
text-align: center;
color: #fff;
border-radius: 20px;
border-radius: 10PX;
background-image: linear-gradient(#323232, #0f0f0f);
}
}
... ... @@ -47,8 +47,8 @@
position: absolute;
left: 0;
top: 0;
width: 100px;
height: 100px;
width: 50PX;
height: 50PX;
.close-icon {
position: absolute;
... ... @@ -62,14 +62,14 @@
#float-layer-btn {
position: absolute;
top: 50%;
right: 30px;
font-size: 32px;
padding: 0 20px;
height: 54px;
line-height: 54px;
right: 15PX;
font-size: 16PX;
padding: 0 10PX;
height: 27PX;
line-height: 27PX;
background: white;
border-radius: 10px;
margin-top: -26px;
border-radius: 5PX;
margin-top: -13PX;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0.5);
&:link,
&:visited,
... ... @@ -82,9 +82,9 @@
.circle-rightbottom {
position: absolute;
width: 50px;
height: 0px;
width: 25PX;
height: 0PX;
border:0 solid #323232;
border-bottom:50px solid #323232;
border-radius:0 0 50px 0;
border-bottom:25PX solid #323232;
border-radius:0 0 25PX 0;
}
... ...
... ... @@ -10,7 +10,7 @@
background-position-x: 26%;
background-position-y: 36%;
border: none;
border-bottom: 4px solid #fff;
border-bottom: 4PX solid #fff;
}
#yohood:active {
... ... @@ -34,7 +34,7 @@
width: 216px;
height: 96px;
background: resolve("yohologo.png") left center no-repeat;
background-size: 208px 50px;
background-size: 104PX 25PX;
opacity: 1;
transition: all 400ms;
... ... @@ -163,7 +163,7 @@
line-height: 104px;
color: #fff;
background-color: #000;
border: 4px solid #fff;
border: 4PX solid #fff;
font-weight: bold;
&:last-child {
margin-bottom: 0;
... ...
... ... @@ -104,7 +104,7 @@
font-size: 30px;
color: #fff;
background: #444;
border-radius: 5px;
border-radius: 5PX;
}
}
}
... ...
... ... @@ -10,7 +10,7 @@
height: 48px;
line-height: 48px;
overflow: hidden;
border-right: 2px solid #e0e0e0;
border-right: 2PX solid #e0e0e0;
margin: 21px 0;
float: left;
text-align: center;
... ...
... ... @@ -114,7 +114,7 @@
width: 140px;
height: 60px;
line-height: 60px;
border-radius: 5px;
border-radius: 5PX;
font-size: 26px;
text-align: center;
border: 1px solid #000;
... ...
... ... @@ -53,7 +53,7 @@
font-size: 24px;
text-align: center;
border: 1px solid #000;
border-radius: 5px;
border-radius: 5PX;
}
.pay {
... ... @@ -98,7 +98,7 @@
font-size: 30px;
color: #fff;
background: #444;
border-radius: 5px;
border-radius: 5PX;
}
}
}
... ...
... ... @@ -53,7 +53,7 @@
width: 32px;
height: 32px;
font-weight: bold;
border: 2px solid #d0021b;
border: 2PX solid #d0021b;
border-radius: 50%;
}
}
... ...
.back-email-success-page {
.tip {
font-size: 40px;
font-size: 20PX;
color: #fff;
margin-top: 60px;
margin-top: 30PX;
}
.sub-tip, .resend {
color: #939393;
font-size: 32px;
font-size: 16PX;
}
.go-email {
margin: 40px 0 20px;
margin: 20PX 0 10PX;
}
.resend {
float: right;
}
}
}
\ No newline at end of file
... ...
.bind-page
.bind-tip {
color: #fff;
font-size: 30px;
font-size: 15PX;
}
#yohood {
... ... @@ -12,6 +12,6 @@
background-position-x: 10%;
background-position-y: 40%;
border: none;
border-bottom: 8px solid #fff;
border-bottom: 4PX solid #fff;
}
... ...
.reg-code-page, .back-code-page {
.captcha-tip {
position: absolute;
width: 298px;
width: 148PX;
text-align: center;
right: 30px;
top: 16px;
right: 15PX;
top: 8PX;
color: #36a74c;
padding: 10px 0;
padding: 5PX 0;
border: 1px solid #36a74c;
border-radius: 40px;
font-size: 32px;
border-radius: 20PX;
font-size: 16PX;
&.disable {
color: #8f8f8f;
... ... @@ -19,13 +19,13 @@
}
.input-container {
padding-right: 380px;
padding-right: 190PX;
}
.text-container {
color: #fff;
font-size: 32px;
margin-bottom: 40px;
font-size: 16PX;
margin-bottom: 20PX;
}
.phone {
... ... @@ -33,6 +33,6 @@
}
.clear-input {
right: 340px;
right: 170PX;
}
}
... ...
... ... @@ -13,29 +13,29 @@ body.passport-body {
.header {
position: relative;
height: 80px;
margin: 40px 0 60px;
height: 40PX;
margin: 20PX 0 30PX;
.go-back {
display: block;
position: absolute;
height: 60px;
width: 60px;
top: 10px;
height: 30PX;
width: 30PX;
top: 5PX;
left: 0;
background: resolve('passport/go-back.png') no-repeat;
background-size: 100% 100%;
}
.title {
font-size: 40px;
line-height: 80px;
font-size: 20PX;
line-height: 40PX;
color: #fff;
}
.img-header {
width: 136px;
height: 80px;
width: 68PX;
height: 40PX;
background: resolve('passport/yoho-family.png') no-repeat;
background-size: 100% 100%;
margin: 0 auto;
... ... @@ -45,11 +45,11 @@ body.passport-body {
.input-container, .select-container {
position: relative;
width: 100%;
height: 104px;
font-size: 40px;
height: 52PX;
font-size: 20PX;
background-color: #575757;
border: 1px solid #606060;
border-radius: 10px;
border-radius: 5PX;
text-align: left;
color: #fff;
}
... ... @@ -57,13 +57,13 @@ body.passport-body {
.select-container {
.select {
position: absolute;
height: 100px;
padding-right: 80px;
height: 50PX;
padding-right: 40PX;
right: 0;
color: #fff;
background-color: transparent;
border: 0;
border-radius: 10px;
border-radius: 5PX;
appearance: none;
direction: rtl;
... ... @@ -80,40 +80,40 @@ body.passport-body {
.select-title {
line-height: 2.5;
margin-left: 30px;
margin-left: 15PX;
}
.arrow-right {
position: absolute;
width: 26px;
height: 40px;
right: 30px;
top: 32px;
width: 13PX;
height: 20PX;
right: 15PX;
top: 16PX;
background: resolve('passport/arrow-right.png') no-repeat;
background-size: 100% 100%;
}
}
.has-eye, .has-clear {
padding-right: 60px;
padding-right: 30PX;
}
.area-code {
position: absolute;
left: 30px;
left: 15PX;
line-height: 2.5;
}
.phone-container {
padding-left: 110px;
padding-left: 55PX;
}
.input {
width: 100%;
line-height: 52px;
padding: 24px 0;
padding-left: 30px;
border-radius: 10px;
line-height: 26PX;
padding: 12PX 0;
padding-left: 15PX;
border-radius: 5PX;
color: #fff;
background-color: transparent;
border: none;
... ... @@ -122,10 +122,10 @@ body.passport-body {
.btn {
display: block;
width: 100%;
font-size: 40px;
font-size: 20PX;
line-height: 2.5;
background-color: #36a74c;
border-radius: 10px;
border-radius: 5PX;
color: #fff;
&.disable {
... ... @@ -134,26 +134,26 @@ body.passport-body {
}
.country-select.in-android-uc {
width: 180px;
width: 90PX;
}
.clear-input {
position: absolute;
display: none;
top: 36px;
right: 20px;
width: 32px;
height: 32px;
top: 18PX;
right: 10PX;
width: 16PX;
height: 16PX;
background: resolve('passport/clear-input.png') no-repeat;
background-size: 100% 100%;
}
.eye {
position: absolute;
top: 40px;
right: 20px;
width: 38px;
height: 24px;
top: 20PX;
right: 10PX;
width: 19PX;
height: 12PX;
background: resolve('passport/eye.png') no-repeat;
background-size: 100% 100%;
... ... @@ -163,6 +163,6 @@ body.passport-body {
}
.row {
margin-bottom: 10px;
margin-bottom: 10PX;
}
}
... ...
.login-page {
.yoho-logo {
position: absolute;
height: 62px;
width: 52px;
height: 31PX;
width: 26PX;
background: resolve('passport/yoho.png');
background-size: 100% 100%;
top: 20px;
left: 30px;
top: 10PX;
left: 15PX;
}
.acc-container {
padding-left: 90px;
padding-left: 45PX;
}
.op-container {
position: relative;
width: 100%;
margin: 40px 0;
margin: 20PX 0;
text-align: left;
font-size: 32px;
font-size: 16PX;
.go-register {
text-decoration: underline;
... ... @@ -37,19 +37,19 @@
text-align: left;
> span {
font-size: 32px;
font-size: 16PX;
color: #858585;
}
.tp-link {
text-align: center;
padding: 40px 0;
padding: 20PX 0;
> a {
display: inline-block;
width: 88px;
height: 88px;
margin: 0 14px;
width: 44PX;
height: 44PX;
margin: 0 7PX;
border-radius: 50%;
background-color: #333;
background-repeat: no-repeat;
... ... @@ -76,26 +76,26 @@
.international {
display: block;
width: 400px;
padding: 10px 20px;
width: 200PX;
padding: 5PX 10PX;
background-color: #333;
border: none;
border-radius: 40px;
border-radius: 20PX;
margin: 0 auto;
font-size: 32px;
font-size: 16PX;
color: #d8d8d8;
}
.login-tip {
font-size: 16px;
font-size: 16PX;
position: relative;
color: #d8d8d8;
margin: 30px 0;
margin: 15PX 0;
.info-icon {
display: inline-block;
height: 24px;
width: 24px;
height: 12PX;
width: 12PX;
background-image: resolve('passport/info.png');
background-size: 100% 100%;
}
... ... @@ -114,32 +114,32 @@
.retrive-pwd-ways {
position: fixed;
display: none;
bottom: 10px;
left: 20px;
right: 20px;
font-size: 32px;
bottom: 5PX;
left: 10PX;
right: 10PX;
font-size: 16PX;
li {
background-color: #fff;
width: 100%;
height: 80px;
line-height: 80px;
height: 40PX;
line-height: 40PX;
text-align: center;
&:nth-child(1) {
border-top-left-radius: 10px;
border-top-right-radius: 10px;
border-bottom: 1px solid #9f9f9f;
border-top-left-radius: 5PX;
border-top-right-radius: 5PX;
border-bottom: 1PX solid #9f9f9f;
}
&:nth-child(2) {
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 5PX;
border-bottom-right-radius: 5PX;
}
&:last-child {
margin-top: 10px;
border-radius: 10px;
margin-top: 10PX;
border-radius: 5PX;
}
}
}
... ...
.reg-page .register-tip {
color: #fff;
font-size: 30px;
font-size: 15PX;
}
... ...
... ... @@ -57,7 +57,7 @@
color:$subFontC;
.iconfont{
display: inline-block;
padding-right: 5px;
padding-right: 5PX;
font-size: inherit;
}
position: relative;
... ... @@ -356,12 +356,12 @@
height: 200px;
line-height: 200px;
color: #e0e0e0;
font-size: 16px;
font-size: 16PX;
text-align: center;
span{
display: inline-block;
font-size: 16px;
padding-right: 5px;
font-size: 16PX;
padding-right: 5PX;
}
}
}
... ...
... ... @@ -129,7 +129,7 @@ $basicBtnC:#eb0313;
margin-left: .5px;
font-size: 18px;
text-align: center;
padding:1px 5px;
padding:1px 5PX;
}
.new-tag {
background-color: #78dc7e;
... ... @@ -188,7 +188,7 @@ $basicBtnC:#eb0313;
background-color: #b0b0b0;
}
.swiper-pagination-bullet {
margin-right: 2px;
margin-right: 2PX;
}
.swiper-pagination-bullet-active {
background-color: #000;
... ... @@ -260,7 +260,7 @@ $basicBtnC:#eb0313;
right: 84px;
top: 24px;
color: #d0021b;
border: 2px solid #d0021b;
border: 2PX solid #d0021b;
background-color: #fff;
border-radius: 40px;
padding: 4px 20px;
... ...
... ... @@ -32,16 +32,16 @@
}
.list-nav {
border-top:2px solid #fff;
border-top:2PX solid #fff;
border-bottom:1px solid #e6e6e6;
> li {
float: left;
width: 25%;
height: 33px;
line-height: 33px;
height: 33PX;
line-height: 33PX;
text-align: center;
font-size: 14px;
font-size: 14PX;
}
.bytouch{
background:#eee;
... ... @@ -77,7 +77,7 @@
}
.filter .iconfont {
font-size: 12px;
font-size: 12PX;
transition: transform 0.1 ease-in;
}
... ... @@ -95,11 +95,11 @@
}
.up {
top: -11px;
top: -11PX;
}
.down {
top: -4px;
top: -4PX;
}
}
}
... ... @@ -109,12 +109,12 @@
vertical-align: middle;
color: #ccc;
font-size: 1.2em;
margin-top: 160px;
margin-top: 160PX;
}
.goods-container {
position: relative;
min-height: 440px;
min-height: 440PX;
padding-left: 0.375rem;
padding-top: 0.2rem;
}
... ...
... ... @@ -39,10 +39,6 @@
{{# goodsCategory}}
{{> home/goods_category}}
{{/ goodsCategory}}
{{! 新人专享}}
{{# freshOnly}}
{{> home/fresh_only}}
{{/ freshOnly}}
{{! 新入住品牌/品味生活/创意生活}}
{{# creativeLife}}
{{> home/creative_life}}
... ...
... ... @@ -341,9 +341,3 @@
</script>
{{/if}}
{{#if freshListPage}}
<script>
seajs.use('js/home/fresh-list');
</script>
{{/if}}
... ...
... ... @@ -9,8 +9,8 @@ use Plugin\Helpers;
*/
class XinshiliController extends HuodongAction
{
// const STATIC_FILE = 'http://localhost:2222/1.0.6';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.6';
// const STATIC_FILE = 'http://localhost:2222/1.0.7';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili/1.0.7';
/**
* 检测登录状态
... ... @@ -65,7 +65,7 @@ class XinshiliController extends HuodongAction
'getCouponUrl' => Helpers::url('/cuxiao/xinshili/sendCoupon', array('uid' => $this->getLoggedUid())),
'banner' => array(
'img' => 'http://img01.yohoboys.com/staticimg/2016/03/04/09/019c5b6a514adee6bd2e3af9d8c28cdecb.jpg',
'url' => 'http://feature.yoho.cn/0112/0112APPBRANDBOY/index.html?openby:yohobuy＝{"action":"go.h5","params":{"title":"YOHO!BUY有货【春潮新势力】","url":"http://feature.yoho.cn/0112/0112APPBRANDBOY/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"518"},"param":{"share_id":"518"}}'
'url' => 'http://feature.yoho.cn/0302/0302APPHOME/index.html?openby:yohobuy＝{"action":"go.h5","params":{"title":"YOHO!BUY有货【春潮新势力】","url":"http://feature.yoho.cn/0302/0302APPHOME/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"386"},"param":{"share_id":"386"}}}'
),
'weixinUrl' => 'http://mp.weixin.qq.com/s?__biz=MjM5ODI5MDA4MA==&mid=201849402&idx=1&sn=c0089812f9769d82e0075f69d771f6e1#rd', // 微信关注地址
'appUrl' => 'http://www.yohoshow.com/about/index/yohobuyqr', // APP 下载地址
... ...