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 = { ...@@ -164,7 +164,7 @@ module.exports = {
164 areaCode: "+86" 164 areaCode: "+86"
165 }], 165 }],
166 coutTips: "{second}秒後重新獲取", 166 coutTips: "{second}秒後重新獲取",
167 title: "歡迎註冊一賬通", 167 title: "歡迎註冊",
168 title2: "請設置新的密碼", 168 title2: "請設置新的密碼",
169 mobilePlaceholder: "请输入8位手机号码", 169 mobilePlaceholder: "请输入8位手机号码",
170 verifyCodePlaceholder: "請輸入驗證碼", 170 verifyCodePlaceholder: "請輸入驗證碼",
......
...@@ -161,7 +161,7 @@ module.exports = { ...@@ -161,7 +161,7 @@ module.exports = {
161 areaCode: "+86" 161 areaCode: "+86"
162 }], 162 }],
163 coutTips: "{second}秒後重新獲取", 163 coutTips: "{second}秒後重新獲取",
164 title: "歡迎註冊一賬通", 164 title: "歡迎註冊",
165 title2: "請設置新的密碼", 165 title2: "請設置新的密碼",
166 mobilePlaceholder: "請輸入8位手機號碼", 166 mobilePlaceholder: "請輸入8位手機號碼",
167 verifyCodePlaceholder: "請輸入驗證碼", 167 verifyCodePlaceholder: "請輸入驗證碼",
......
...@@ -164,7 +164,7 @@ module.exports = { ...@@ -164,7 +164,7 @@ module.exports = {
164 areaCode: "+86" 164 areaCode: "+86"
165 }], 165 }],
166 coutTips: "{second}秒后重新获取", 166 coutTips: "{second}秒后重新获取",
167 title: "欢迎注册一账通", 167 title: "欢迎注册",
168 title2: "请设置新的密码", 168 title2: "请设置新的密码",
169 mobilePlaceholder: "请输入8位手机号码", 169 mobilePlaceholder: "请输入8位手机号码",
170 verifyCodePlaceholder: "请输入验证码", 170 verifyCodePlaceholder: "请输入验证码",
......
...@@ -31,10 +31,11 @@ ...@@ -31,10 +31,11 @@
31 flex-wrap: wrap; 31 flex-wrap: wrap;
32 32
33 &-item { 33 &-item {
34 display: flex; 34 background-color: #ffffff;
35 justify-content: center; 35 // display: flex;
36 align-content: center; 36 // justify-content: center;
37 align-items: center; 37 // align-content: center;
38 // align-items: center;
38 flex-wrap: wrap; 39 flex-wrap: wrap;
39 width: 12.5rem; 40 width: 12.5rem;
40 height: 12.5rem; 41 height: 12.5rem;
...@@ -44,17 +45,18 @@ ...@@ -44,17 +45,18 @@
44 cursor: pointer; 45 cursor: pointer;
45 46
46 .icon-wrap { 47 .icon-wrap {
48 height: 8.25rem;
49 @extend .fcc;
47 } 50 }
48 51
49 .t1 { 52 .t1 {
50 width: 100%; 53 width: 100%;
51 text-align: center; 54 text-align: center;
52 margin-top: 1rem;
53 font-size: 18px; 55 font-size: 18px;
54 line-height: 1.8rem; 56 // line-height: 1.8rem;
55 57
56 // background-color: wheat; 58 // background-color: wheat;
57 height: 2rem; 59
58 } 60 }
59 } 61 }
60 } 62 }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 </div> 24 </div>
25 <div class="t1">{{$t('customProduct.menu3')}}</div> 25 <div class="t1">{{$t('customProduct.menu3')}}</div>
26 </div> 26 </div>
27 <div @click="toPage('/custom/service?q=m4')" class="product-item"> 27 <div @click="toPage('/custom/service?q=m41')" class="product-item">
28 <div class="icon-wrap"> 28 <div class="icon-wrap">
29 <img src="@/assets/images/custom-product/icon-cp-4.png"> 29 <img src="@/assets/images/custom-product/icon-cp-4.png">
30 </div> 30 </div>
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
6 .border { 6 .border {
7 @extend .bb; 7 @extend .bb;
8 padding: 2.833333rem 4.0rem 0 3.5rem; 8 padding: 2.833333rem 4.0rem 0 3.5rem;
9 width: 770px; 9 width: 64.166667rem;
10 height: 387px; 10 height: 32.25rem;
11 border-radius: 8px; 11 border-radius: 8px;
12 border: solid 1px #f2f2f2; 12 border: solid 1px #f2f2f2;
13 background-color: #ffffff; 13 background-color: #ffffff;
......
...@@ -8,6 +8,9 @@ export default { ...@@ -8,6 +8,9 @@ export default {
8 data() { 8 data() {
9 return { 9 return {
10 key: 'value', 10 key: 'value',
11 checked1: false,
12 checked2: false,
13 checked3: false,
11 } 14 }
12 }, 15 },
13 components: {}, 16 components: {},
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
8 </div> 8 </div>
9 <div class="ipt-wrap"> 9 <div class="ipt-wrap">
10 <input placeholder="香港（852）2888 8888" class="ipt mail-ipt" type="text"> 10 <input placeholder="香港（852）2888 8888" class="ipt mail-ipt" type="text">
11 <img class="check-icon" src="@/assets/images/reservation/un-check.png"> 11 <img @click="checked1 = !checked1" v-if="!checked1" class="check-icon pointer" src="@/assets/images/reservation/un-check.png">
12 <img @click="checked1 = !checked1" v-else class="check-icon pointer" src="@/assets/images/reservation/check.png">
12 <span>{{$t("policyChangeContact.checkTips")}}</span> 13 <span>{{$t("policyChangeContact.checkTips")}}</span>
13 </div> 14 </div>
14 </div> 15 </div>
...@@ -18,7 +19,8 @@ ...@@ -18,7 +19,8 @@
18 </div> 19 </div>
19 <div class="ipt-wrap"> 20 <div class="ipt-wrap">
20 <input placeholder="深圳市益田路5033號" class="ipt mail-ipt" type="text"> 21 <input placeholder="深圳市益田路5033號" class="ipt mail-ipt" type="text">
21 <img class="check-icon" src="@/assets/images/reservation/un-check.png"> 22 <img @click="checked2 = !checked2" v-if="!checked2" class="check-icon pointer" src="@/assets/images/reservation/un-check.png">
23 <img @click="checked2 = !checked2" v-else class="check-icon pointer" src="@/assets/images/reservation/check.png">
22 <span>{{$t("policyChangeContact.checkTips")}}</span> 24 <span>{{$t("policyChangeContact.checkTips")}}</span>
23 </div> 25 </div>
24 </div> 26 </div>
...@@ -28,7 +30,8 @@ ...@@ -28,7 +30,8 @@
28 </div> 30 </div>
29 <div class="ipt-wrap"> 31 <div class="ipt-wrap">
30 <input placeholder="123@ping.com.cn" class="ipt mail-ipt" type="text"> 32 <input placeholder="123@ping.com.cn" class="ipt mail-ipt" type="text">
31 <img class="check-icon" src="@/assets/images/reservation/un-check.png"> 33 <img @click="checked3 = !checked3" v-if="!checked3" class="check-icon pointer" src="@/assets/images/reservation/un-check.png">
34 <img @click="checked3 = !checked3" v-else class="check-icon pointer" src="@/assets/images/reservation/check.png">
32 <span>{{$t("policyChangeContact.checkTips")}}</span> 35 <span>{{$t("policyChangeContact.checkTips")}}</span>
33 </div> 36 </div>
34 </div> 37 </div>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 9
10 .left-panel { 10 .left-panel {
11 width: 12.833333rem; 11 width: 12.833333rem;
12 height: 42.333333rem; 12 // height: 42.333333rem;
13 margin-left: 3.166667rem; 13 margin-left: 3.166667rem;
14 14
15 .separator { 15 .separator {
......
...@@ -44,12 +44,29 @@ ...@@ -44,12 +44,29 @@
44 44
45 &-tit { 45 &-tit {
46 // font-family: MicrosoftYaHei; 46 // font-family: MicrosoftYaHei;
47 color: #f05a23; 47 color: $cOrange;
48 display: flex;
49 justify-content: center;
50
51
52 img {
53 height: 1.416667rem;
54 /* 17/12 */
55 }
56
57 .img-en {
58 height: 1.2rem;
59 }
60 }
61
62 &-tit2 {
63 color: $cOrange;
48 text-align: center; 64 text-align: center;
49 font-size: 18px; 65 font-size: 18px;
50 font-weight: bold; 66 font-weight: bold;
51 letter-spacing: .2rem; 67 letter-spacing: .2rem;
52 text-shadow: 3px 5.2px 9px rgba(236, 100, 41, 0.27); 68 text-shadow: 3px 5.2px 9px rgba(236, 100, 41, 0.27);
69 margin-top: .8rem;
53 } 70 }
54 71
55 72
...@@ -99,7 +116,7 @@ ...@@ -99,7 +116,7 @@
99 116
100 &-submit { 117 &-submit {
101 @include btc2(13.5rem, 4rem, 16px); 118 @include btc2(13.5rem, 4rem, 16px);
102 margin: 4.166667rem auto 0 ; 119 margin: 4.166667rem auto 0;
103 letter-spacing: 1.6px; 120 letter-spacing: 1.6px;
104 } 121 }
105 122
...@@ -124,6 +141,7 @@ ...@@ -124,6 +141,7 @@
124 background-color: transparent !important; 141 background-color: transparent !important;
125 padding: 0 !important; 142 padding: 0 !important;
126 overflow: hidden; 143 overflow: hidden;
144
127 img { 145 img {
128 width: 100%; 146 width: 100%;
129 height: 100%; 147 height: 100%;
...@@ -131,8 +149,10 @@ ...@@ -131,8 +149,10 @@
131 } 149 }
132 150
133 input { 151 input {
134 font-size: 1.166667rem; /* 14/12 */ 152 font-size: 1.166667rem;
135 letter-spacing: .1rem;/* 1.2/12 */ 153 /* 14/12 */
154 letter-spacing: .1rem;
155 /* 1.2/12 */
136 } 156 }
137 157
138 &-item { 158 &-item {
...@@ -212,14 +232,13 @@ ...@@ -212,14 +232,13 @@
212 padding-right: 1.75rem; 232 padding-right: 1.75rem;
213 } 233 }
214 234
215 .region-tel{ 235 .region-tel {}
216
217 }
218 236
219 .veri-btn { 237 .veri-btn {
220 color: #f05a23; 238 color: #f05a23;
221 text-decoration: underline; 239 text-decoration: underline;
222 } 240 }
241
223 .veri-btn-default { 242 .veri-btn-default {
224 color: #aaaaaa; 243 color: #aaaaaa;
225 } 244 }
......
...@@ -13,7 +13,13 @@ ...@@ -13,7 +13,13 @@
13 <div class="box"> 13 <div class="box">
14 <!-- 手机验证 --> 14 <!-- 手机验证 -->
15 <div v-if="type == 1" class="login"> 15 <div v-if="type == 1" class="login">
16 <div class="login-tit">{{$t('register.title')}}</div> 16
17 <div class="login-tit">
18 <img v-if="locale == 'zh'" src="@/assets/images/login/login-tit-zh.png">
19 <img v-if="locale == 'tc'" src="@/assets/images/login/login-tit-tc.png">
20 <img v-if="locale == 'en'" class="img-en" src="@/assets/images/login/login-tit-en.png">
21 </div>
22 <div class="login-tit2">{{$t('register.title')}}</div>
17 <div class="gird-g form"> 23 <div class="gird-g form">
18 <div class="pure-u-1 form-item"> 24 <div class="pure-u-1 form-item">
19 <div class="ipt-wrap"> 25 <div class="ipt-wrap">
...@@ -69,6 +75,12 @@ ...@@ -69,6 +75,12 @@
69 </div> 75 </div>
70 <!-- 输入密码 --> 76 <!-- 输入密码 -->
71 <div v-if="type == 2" class="login"> 77 <div v-if="type == 2" class="login">
78
79 <div class="login-tit">
80 <img v-if="locale == 'zh'" src="@/assets/images/login/login-tit-zh.png">
81 <img v-if="locale == 'tc'" src="@/assets/images/login/login-tit-tc.png">
82 <img v-if="locale == 'en'" class="img-en" src="@/assets/images/login/login-tit-en.png">
83 </div>
72 <div class="login-tit">{{$t('register.title2')}}</div> 84 <div class="login-tit">{{$t('register.title2')}}</div>
73 <div class="gird-g form"> 85 <div class="gird-g form">
74 <div class="pure-u-1 form-item"> 86 <div class="pure-u-1 form-item">
......