diff --git a/view/molistar/activity/act-nameplate/css/index.css b/view/molistar/activity/act-nameplate/css/index.css index d84d73d..e760ffb 100644 --- a/view/molistar/activity/act-nameplate/css/index.css +++ b/view/molistar/activity/act-nameplate/css/index.css @@ -12,7 +12,7 @@ .max { width: 10rem; - height: 30.84rem; + height: 34.02667rem; background: url("../images/max.png?v=1.0") no-repeat; background-size: 100% 100%; font-family: 'pingfang-bold'; @@ -21,10 +21,10 @@ .max .record { position: absolute; position: absolute; - top: 5.9rem; + top: 6.61333rem; right: 0; - width: 1.5rem; - height: 1.4rem; + width: 1.64rem; + height: 0.57333rem; } .max .record img { @@ -34,23 +34,23 @@ .max .btn { position: absolute; - top: 15.8rem; - left: 1.68rem; - width: 2.53333rem; - height: 1.01333rem; + top: 16.1rem; + left: 1.61rem; + width: 2.94667rem; + height: 1.46667rem; } .max .btn.basics-receive { - left: 5.6rem; + left: 5rem; } .max .btn.advance-send { - top: 22.34667rem; + top: 23.34667rem; } .max .btn.advance-receive { - top: 22.34667rem; - left: 5.6rem; + top: 23.34667rem; + left: 5rem; } .max .btn img { @@ -257,8 +257,8 @@ .max .shade-mask-new .shade-content .apply-btn, .max .shade-mask-new .shade-content-delay .apply-btn, .max .shade-mask-new .shade-content-new .apply-btn { - width: 4.90667rem; - height: 1.2rem; + width: 6.37333rem; + height: 0.82667rem; background: url("../images/apply-new.png") no-repeat 0 0/100% 100%; margin: 0.64rem auto 0; } @@ -367,9 +367,9 @@ } .max .shade-mask-delay .shade-content-delay .apply-btn { - width: 4.90667rem; - height: 1.2rem; - background: url("../images/confirm.png") no-repeat 0 0/100% 100%; + width: 6.37333rem; + height: 0.82667rem; + background: url("../images/apply-new.png") no-repeat 0 0/100% 100%; margin: 0.85333rem auto 0; } @@ -484,9 +484,9 @@ } .max .shade-mask-new .shade-content-new .apply-btn { - width: 4.90667rem; - height: 1.2rem; - background: url("../images/confirm.png") no-repeat 0 0/100% 100%; + width: 6.37333rem; + height: 0.82667rem; + background: url("../images/apply-new.png") no-repeat 0 0/100% 100%; margin: 0.61333rem auto 0; } @@ -510,3 +510,7 @@ ::-webkit-scrollbar { display: none; } + +.english .max { + height: 35.76rem; +} diff --git a/view/molistar/activity/act-nameplate/css/index.scss b/view/molistar/activity/act-nameplate/css/index.scss index f1c702a..467da2f 100644 --- a/view/molistar/activity/act-nameplate/css/index.scss +++ b/view/molistar/activity/act-nameplate/css/index.scss @@ -21,7 +21,7 @@ // @import '../../../common/css/flex.scss'; .max { width: px2rem(750); - height: px2rem(2313); + height: px2rem(2552); background: url('../images/max.png?v=1.0') no-repeat; background-size: 100% 100%; font-family: 'pingfang-bold'; @@ -29,10 +29,10 @@ .record { position: absolute; position: absolute; - top: 5.9rem; + top: px2rem(496); right: 0; - width: 1.5rem; - height: 1.4rem; + width: px2rem(123); + height: px2rem(43); img { width: 100%; @@ -42,22 +42,22 @@ .btn { position: absolute; - top: 15.8rem; - left: px2rem(126); - width: px2rem(190); - height: px2rem(76); + top: 16.1rem; + left: 1.61rem; + width: px2rem(221); + height: px2rem(110); &.basics-receive { - left: 5.6rem; + left: 5rem; } &.advance-send { - top: 22.34667rem; + top: 23.34667rem; } &.advance-receive { - top: 22.34667rem; - left: 5.6rem; + top: 23.34667rem; + left: 5rem; } img { @@ -181,8 +181,8 @@ } .apply-btn { - width: px2rem(368); - height: px2rem(90); + width: px2rem(478); + height: px2rem(62); background: url('../images/apply-new.png') no-repeat 0 0/100% 100%; margin: px2rem(48) auto 0; } @@ -277,9 +277,9 @@ } .apply-btn { - width: px2rem(368); - height: px2rem(90); - background: url('../images/confirm.png') no-repeat 0 0/100% 100%; + width: px2rem(478); + height: px2rem(62); + background: url('../images/apply-new.png') no-repeat 0 0/100% 100%; margin: px2rem(64) auto 0; } } @@ -397,9 +397,9 @@ } .apply-btn { - width: px2rem(368); - height: px2rem(90); - background: url('../images/confirm.png') no-repeat 0 0/100% 100%; + width: px2rem(478); + height: px2rem(62); + background: url('../images/apply-new.png') no-repeat 0 0/100% 100%; margin: px2rem(46) auto 0; } } @@ -425,4 +425,10 @@ ::-webkit-scrollbar { display: none; +} + +.english{ + .max{ + height: px2rem(2682); + } } \ No newline at end of file diff --git a/view/molistar/activity/act-nameplate/images/apply-btn-basics-ar.png b/view/molistar/activity/act-nameplate/images/apply-btn-basics-ar.png new file mode 100644 index 0000000..def2091 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/apply-btn-basics-ar.png differ diff --git a/view/molistar/activity/act-nameplate/images/apply-btn-basics-en.png b/view/molistar/activity/act-nameplate/images/apply-btn-basics-en.png new file mode 100644 index 0000000..6951946 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/apply-btn-basics-en.png differ diff --git a/view/molistar/activity/act-nameplate/images/apply-btn-basics.png b/view/molistar/activity/act-nameplate/images/apply-btn-basics.png index 950f2b4..0182062 100644 Binary files a/view/molistar/activity/act-nameplate/images/apply-btn-basics.png and b/view/molistar/activity/act-nameplate/images/apply-btn-basics.png differ diff --git a/view/molistar/activity/act-nameplate/images/apply-new-ar.png b/view/molistar/activity/act-nameplate/images/apply-new-ar.png new file mode 100644 index 0000000..6e9210f Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/apply-new-ar.png differ diff --git a/view/molistar/activity/act-nameplate/images/apply-new-en.png b/view/molistar/activity/act-nameplate/images/apply-new-en.png new file mode 100644 index 0000000..4fd92f5 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/apply-new-en.png differ diff --git a/view/molistar/activity/act-nameplate/images/apply-new.png b/view/molistar/activity/act-nameplate/images/apply-new.png index 3d345e3..3eababb 100644 Binary files a/view/molistar/activity/act-nameplate/images/apply-new.png and b/view/molistar/activity/act-nameplate/images/apply-new.png differ diff --git a/view/molistar/activity/act-nameplate/images/disabled-btn-ar.png b/view/molistar/activity/act-nameplate/images/disabled-btn-ar.png new file mode 100644 index 0000000..c7e33ec Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/disabled-btn-ar.png differ diff --git a/view/molistar/activity/act-nameplate/images/disabled-btn-en.png b/view/molistar/activity/act-nameplate/images/disabled-btn-en.png new file mode 100644 index 0000000..146a121 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/disabled-btn-en.png differ diff --git a/view/molistar/activity/act-nameplate/images/disabled-btn.png b/view/molistar/activity/act-nameplate/images/disabled-btn.png index d0a367b..a45fc39 100644 Binary files a/view/molistar/activity/act-nameplate/images/disabled-btn.png and b/view/molistar/activity/act-nameplate/images/disabled-btn.png differ diff --git a/view/molistar/activity/act-nameplate/images/max-ar.png b/view/molistar/activity/act-nameplate/images/max-ar.png new file mode 100644 index 0000000..0452cb3 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/max-ar.png differ diff --git a/view/molistar/activity/act-nameplate/images/max-en.png b/view/molistar/activity/act-nameplate/images/max-en.png new file mode 100644 index 0000000..47145f3 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/max-en.png differ diff --git a/view/molistar/activity/act-nameplate/images/max.png b/view/molistar/activity/act-nameplate/images/max.png index 76ada91..2b02371 100644 Binary files a/view/molistar/activity/act-nameplate/images/max.png and b/view/molistar/activity/act-nameplate/images/max.png differ diff --git a/view/molistar/activity/act-nameplate/images/new-bg-ar.png b/view/molistar/activity/act-nameplate/images/new-bg-ar.png new file mode 100644 index 0000000..8f3218d Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/new-bg-ar.png differ diff --git a/view/molistar/activity/act-nameplate/images/new-bg-en.png b/view/molistar/activity/act-nameplate/images/new-bg-en.png new file mode 100644 index 0000000..5f25664 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/new-bg-en.png differ diff --git a/view/molistar/activity/act-nameplate/images/new-bg.png b/view/molistar/activity/act-nameplate/images/new-bg.png index 97d4888..7eb59e0 100644 Binary files a/view/molistar/activity/act-nameplate/images/new-bg.png and b/view/molistar/activity/act-nameplate/images/new-bg.png differ diff --git a/view/molistar/activity/act-nameplate/images/record-ar.png b/view/molistar/activity/act-nameplate/images/record-ar.png new file mode 100644 index 0000000..eb06550 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/record-ar.png differ diff --git a/view/molistar/activity/act-nameplate/images/record-en.png b/view/molistar/activity/act-nameplate/images/record-en.png new file mode 100644 index 0000000..588c09e Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/record-en.png differ diff --git a/view/molistar/activity/act-nameplate/images/record.png b/view/molistar/activity/act-nameplate/images/record.png new file mode 100644 index 0000000..9ca3d9e Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/record.png differ diff --git a/view/molistar/activity/act-nameplate/images/select-bg-ar.png b/view/molistar/activity/act-nameplate/images/select-bg-ar.png new file mode 100644 index 0000000..8e71000 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/select-bg-ar.png differ diff --git a/view/molistar/activity/act-nameplate/images/select-bg-en.png b/view/molistar/activity/act-nameplate/images/select-bg-en.png new file mode 100644 index 0000000..dff3e56 Binary files /dev/null and b/view/molistar/activity/act-nameplate/images/select-bg-en.png differ diff --git a/view/molistar/activity/act-nameplate/images/select-bg.png b/view/molistar/activity/act-nameplate/images/select-bg.png index 5feb284..ccc153f 100644 Binary files a/view/molistar/activity/act-nameplate/images/select-bg.png and b/view/molistar/activity/act-nameplate/images/select-bg.png differ diff --git a/view/molistar/activity/act-nameplate/index.html b/view/molistar/activity/act-nameplate/index.html index cb5690b..7758c7f 100644 --- a/view/molistar/activity/act-nameplate/index.html +++ b/view/molistar/activity/act-nameplate/index.html @@ -17,7 +17,8 @@ -
@@ -71,10 +72,10 @@
天
+天
天
+