Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
25fbaef8 by joe
Options

Merge branch 'master' of http://120.27.44.69/dev/pingan-life-index-pro

2 parents bdf81816 807fb352
Inline Side-by-side
Showing 20 changed files with 64 additions and 25 deletions

2.2 KB | W: | H:

1.47 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.16 KB | W: | H:

893 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.41 KB | W: | H:

994 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.19 KB | W: | H:

936 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.16 KB | W: | H:

1.16 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.41 KB | W: | H:

1.08 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.28 KB | W: | H:

1.46 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.19 KB | W: | H:

921 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

580 Bytes | W: | H:

512 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -164,7 +164,7 @@ module.exports = {
areaCode: "+86"
}],
coutTips: "{second}秒後重新獲取",
title: "歡迎註冊一賬通",
title: "歡迎註冊",
title2: "請設置新的密碼",
mobilePlaceholder: "请输入8位手机号码",
verifyCodePlaceholder: "請輸入驗證碼",
......
......@@ -161,7 +161,7 @@ module.exports = {
areaCode: "+86"
}],
coutTips: "{second}秒後重新獲取",
title: "歡迎註冊一賬通",
title: "歡迎註冊",
title2: "請設置新的密碼",
mobilePlaceholder: "請輸入8位手機號碼",
verifyCodePlaceholder: "請輸入驗證碼",
......
......@@ -164,7 +164,7 @@ module.exports = {
areaCode: "+86"
}],
coutTips: "{second}秒后重新获取",
title: "欢迎注册一账通",
title: "欢迎注册",
title2: "请设置新的密码",
mobilePlaceholder: "请输入8位手机号码",
verifyCodePlaceholder: "请输入验证码",
......
......@@ -31,10 +31,11 @@
flex-wrap: wrap;
&-item {
display: flex;
justify-content: center;
align-content: center;
align-items: center;
background-color: #ffffff;
// display: flex;
// justify-content: center;
// align-content: center;
// align-items: center;
flex-wrap: wrap;
width: 12.5rem;
height: 12.5rem;
......@@ -44,17 +45,18 @@
cursor: pointer;
.icon-wrap {
height: 8.25rem;
@extend .fcc;
}
.t1 {
width: 100%;
text-align: center;
margin-top: 1rem;
font-size: 18px;
line-height: 1.8rem;
// line-height: 1.8rem;
// background-color: wheat;
height: 2rem;
}
}
}
......
......@@ -24,7 +24,7 @@
</div>
<div class="t1">{{$t('customProduct.menu3')}}</div>
</div>
<div @click="toPage('/custom/service?q=m4')" class="product-item">
<div @click="toPage('/custom/service?q=m41')" class="product-item">
<div class="icon-wrap">
<img src="@/assets/images/custom-product/icon-cp-4.png">
</div>
......
......@@ -6,8 +6,8 @@
.border {
@extend .bb;
padding: 2.833333rem 4.0rem 0 3.5rem;
width: 770px;
height: 387px;
width: 64.166667rem;
height: 32.25rem;
border-radius: 8px;
border: solid 1px #f2f2f2;
background-color: #ffffff;
......
......@@ -8,6 +8,9 @@ export default {
data() {
return {
key: 'value',
checked1: false,
checked2: false,
checked3: false,
}
},
components: {},
......
......@@ -8,7 +8,8 @@
</div>
<div class="ipt-wrap">
<input placeholder="香港（852）2888 8888" class="ipt mail-ipt" type="text">
<img class="check-icon" src="@/assets/images/reservation/un-check.png">
<img @click="checked1 = !checked1" v-if="!checked1" class="check-icon pointer" src="@/assets/images/reservation/un-check.png">
<img @click="checked1 = !checked1" v-else class="check-icon pointer" src="@/assets/images/reservation/check.png">
<span>{{$t("policyChangeContact.checkTips")}}</span>
</div>
</div>
......@@ -18,7 +19,8 @@
</div>
<div class="ipt-wrap">
<input placeholder="深圳市益田路5033號" class="ipt mail-ipt" type="text">
<img class="check-icon" src="@/assets/images/reservation/un-check.png">
<img @click="checked2 = !checked2" v-if="!checked2" class="check-icon pointer" src="@/assets/images/reservation/un-check.png">
<img @click="checked2 = !checked2" v-else class="check-icon pointer" src="@/assets/images/reservation/check.png">
<span>{{$t("policyChangeContact.checkTips")}}</span>
</div>
</div>
......@@ -28,7 +30,8 @@
</div>
<div class="ipt-wrap">
<input placeholder="123@ping.com.cn" class="ipt mail-ipt" type="text">
<img class="check-icon" src="@/assets/images/reservation/un-check.png">
<img @click="checked3 = !checked3" v-if="!checked3" class="check-icon pointer" src="@/assets/images/reservation/un-check.png">
<img @click="checked3 = !checked3" v-else class="check-icon pointer" src="@/assets/images/reservation/check.png">
<span>{{$t("policyChangeContact.checkTips")}}</span>
</div>
</div>
......
......@@ -9,7 +9,7 @@
.left-panel {
width: 12.833333rem;
height: 42.333333rem;
// height: 42.333333rem;
margin-left: 3.166667rem;
.separator {
......
......@@ -44,12 +44,29 @@
&-tit {
// font-family: MicrosoftYaHei;
color: #f05a23;
color: $cOrange;
display: flex;
justify-content: center;
img {
height: 1.416667rem;
/* 17/12 */
}
.img-en {
height: 1.2rem;
}
}
&-tit2 {
color: $cOrange;
text-align: center;
font-size: 18px;
font-weight: bold;
letter-spacing: .2rem;
text-shadow: 3px 5.2px 9px rgba(236, 100, 41, 0.27);
margin-top: .8rem;
}
......@@ -99,7 +116,7 @@
&-submit {
@include btc2(13.5rem, 4rem, 16px);
margin: 4.166667rem auto 0 ;
margin: 4.166667rem auto 0;
letter-spacing: 1.6px;
}
......@@ -124,6 +141,7 @@
background-color: transparent !important;
padding: 0 !important;
overflow: hidden;
img {
width: 100%;
height: 100%;
......@@ -131,8 +149,10 @@
}
input {
font-size: 1.166667rem; /* 14/12 */
letter-spacing: .1rem;/* 1.2/12 */
font-size: 1.166667rem;
/* 14/12 */
letter-spacing: .1rem;
/* 1.2/12 */
}
&-item {
......@@ -212,14 +232,13 @@
padding-right: 1.75rem;
}
.region-tel{
}
.region-tel {}
.veri-btn {
color: #f05a23;
text-decoration: underline;
}
.veri-btn-default {
color: #aaaaaa;
}
......
......@@ -13,7 +13,13 @@
<div class="box">
<!-- 手机验证 -->
<div v-if="type == 1" class="login">
<div class="login-tit">{{$t('register.title')}}</div>
<div class="login-tit">
<img v-if="locale == 'zh'" src="@/assets/images/login/login-tit-zh.png">
<img v-if="locale == 'tc'" src="@/assets/images/login/login-tit-tc.png">
<img v-if="locale == 'en'" class="img-en" src="@/assets/images/login/login-tit-en.png">
</div>
<div class="login-tit2">{{$t('register.title')}}</div>
<div class="gird-g form">
<div class="pure-u-1 form-item">
<div class="ipt-wrap">
......@@ -69,6 +75,12 @@
</div>
<!-- 输入密码 -->
<div v-if="type == 2" class="login">
<div class="login-tit">
<img v-if="locale == 'zh'" src="@/assets/images/login/login-tit-zh.png">
<img v-if="locale == 'tc'" src="@/assets/images/login/login-tit-tc.png">
<img v-if="locale == 'en'" class="img-en" src="@/assets/images/login/login-tit-en.png">
</div>
<div class="login-tit">{{$t('register.title2')}}</div>
<div class="gird-g form">
<div class="pure-u-1 form-item">
......