diff --git a/pages/my/my.vue b/pages/my/my.vue index 1403108..34bc181 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -7,7 +7,7 @@ 勋章：{{medalNum}} 挑战历史：{{challengeNum}} - + diff --git a/static/base_css.css b/static/base_css.css index dfe2280..d466cd6 100644 --- a/static/base_css.css +++ b/static/base_css.css @@ -385,10 +385,10 @@ h3.contit span { } .perinfo { - position: relative; - margin: 3%; - height: 8.5rem; - width: 94%; + position: relative; + margin: 10% 3% 1%; + height: 7.5rem; + width: 94%; } .perinfo .type-name { @@ -407,7 +407,6 @@ h3.contit span { .perinfo .dycd { float: left; - display: inline-block; margin: 3.5% 5%; width: calc(80% - 5rem); color: #333; @@ -417,16 +416,18 @@ h3.contit span { } .myname { - display: block; - margin: 0 0 5%; - font-size: 1rem; + display: block; + margin: 0 0 7.5%; + color: #000; + font-size: 1.25rem; + font-weight: 600; } .myitem span { position: relative; margin: 1% 10% 0 0; padding-right: 0.6rem; - font-size: 0.8rem; + font-size: 0.9rem; color: #666; } diff --git a/static/images/bg_medal.jpg b/static/images/bg_medal.jpg new file mode 100644 index 0000000..b7d2cfe Binary files /dev/null and b/static/images/bg_medal.jpg differ diff --git a/static/images/medal_1.png b/static/images/medal_1.png index 05bf6f0..dbf4a0c 100644 Binary files a/static/images/medal_1.png and b/static/images/medal_1.png differ diff --git a/static/images/medal_1g.png b/static/images/medal_1g.png new file mode 100644 index 0000000..0bc7675 Binary files /dev/null and b/static/images/medal_1g.png differ diff --git a/static/images/medal_act1.png b/static/images/medal_act1.png new file mode 100644 index 0000000..e86ea70 Binary files /dev/null and b/static/images/medal_act1.png differ diff --git a/static/images/medal_act1g.png b/static/images/medal_act1g.png new file mode 100644 index 0000000..de5d2b3 Binary files /dev/null and b/static/images/medal_act1g.png differ diff --git a/static/images/medal_act2.png b/static/images/medal_act2.png new file mode 100644 index 0000000..650edf0 Binary files /dev/null and b/static/images/medal_act2.png differ diff --git a/static/images/medal_act2g.png b/static/images/medal_act2g.png new file mode 100644 index 0000000..91ee3ef Binary files /dev/null and b/static/images/medal_act2g.png differ diff --git a/static/images/medal_act3.png b/static/images/medal_act3.png new file mode 100644 index 0000000..69daffa Binary files /dev/null and b/static/images/medal_act3.png differ diff --git a/static/images/medal_act3g.png b/static/images/medal_act3g.png new file mode 100644 index 0000000..7aa1b4b Binary files /dev/null and b/static/images/medal_act3g.png differ diff --git a/static/images/medal_act4.png b/static/images/medal_act4.png new file mode 100644 index 0000000..ced6ad0 Binary files /dev/null and b/static/images/medal_act4.png differ diff --git a/static/images/medal_act4g.png b/static/images/medal_act4g.png new file mode 100644 index 0000000..a7450e7 Binary files /dev/null and b/static/images/medal_act4g.png differ diff --git a/static/images/medal_act5.png b/static/images/medal_act5.png new file mode 100644 index 0000000..7fe8f65 Binary files /dev/null and b/static/images/medal_act5.png differ diff --git a/static/images/medal_act5g.png b/static/images/medal_act5g.png new file mode 100644 index 0000000..0c8084f Binary files /dev/null and b/static/images/medal_act5g.png differ diff --git a/static/images/medal_act6.png b/static/images/medal_act6.png new file mode 100644 index 0000000..0157220 Binary files /dev/null and b/static/images/medal_act6.png differ diff --git a/static/images/medal_act6g.png b/static/images/medal_act6g.png new file mode 100644 index 0000000..13f5a36 Binary files /dev/null and b/static/images/medal_act6g.png differ diff --git a/static/images/medal_lv1.png b/static/images/medal_lv1.png new file mode 100644 index 0000000..7b69ed0 Binary files /dev/null and b/static/images/medal_lv1.png differ diff --git a/static/images/medal_lv1g.png b/static/images/medal_lv1g.png new file mode 100644 index 0000000..c66ae28 Binary files /dev/null and b/static/images/medal_lv1g.png differ diff --git a/static/images/medal_lv2.png b/static/images/medal_lv2.png new file mode 100644 index 0000000..723845f Binary files /dev/null and b/static/images/medal_lv2.png differ diff --git a/static/images/medal_lv2g.png b/static/images/medal_lv2g.png new file mode 100644 index 0000000..f849fd2 Binary files /dev/null and b/static/images/medal_lv2g.png differ diff --git a/static/images/medal_lv3.png b/static/images/medal_lv3.png new file mode 100644 index 0000000..6fe7f77 Binary files /dev/null and b/static/images/medal_lv3.png differ diff --git a/static/images/medal_lv3g.png b/static/images/medal_lv3g.png new file mode 100644 index 0000000..57dfcc0 Binary files /dev/null and b/static/images/medal_lv3g.png differ diff --git a/static/images/medal_lv4.png b/static/images/medal_lv4.png new file mode 100644 index 0000000..29543e1 Binary files /dev/null and b/static/images/medal_lv4.png differ diff --git a/static/images/medal_lv4g.png b/static/images/medal_lv4g.png new file mode 100644 index 0000000..87d1310 Binary files /dev/null and b/static/images/medal_lv4g.png differ diff --git a/static/images/medal_lv5.png b/static/images/medal_lv5.png new file mode 100644 index 0000000..c75173a Binary files /dev/null and b/static/images/medal_lv5.png differ diff --git a/static/images/medal_lv5g.png b/static/images/medal_lv5g.png new file mode 100644 index 0000000..421a1d1 Binary files /dev/null and b/static/images/medal_lv5g.png differ diff --git a/static/images/medal_lv6.png b/static/images/medal_lv6.png new file mode 100644 index 0000000..e7d9171 Binary files /dev/null and b/static/images/medal_lv6.png differ diff --git a/static/images/medal_lv6g.png b/static/images/medal_lv6g.png new file mode 100644 index 0000000..01ed539 Binary files /dev/null and b/static/images/medal_lv6g.png differ diff --git a/static/images/medal_lv7.png b/static/images/medal_lv7.png new file mode 100644 index 0000000..1f6e8ab Binary files /dev/null and b/static/images/medal_lv7.png differ diff --git a/static/images/medal_lv7g.png b/static/images/medal_lv7g.png new file mode 100644 index 0000000..c903d35 Binary files /dev/null and b/static/images/medal_lv7g.png differ diff --git a/static/images/medal_un1.png b/static/images/medal_un1.png new file mode 100644 index 0000000..e50c1f5 Binary files /dev/null and b/static/images/medal_un1.png differ diff --git a/static/images/medal_un1g.png b/static/images/medal_un1g.png new file mode 100644 index 0000000..a0529f4 Binary files /dev/null and b/static/images/medal_un1g.png differ diff --git a/static/images/medal_un2.png b/static/images/medal_un2.png new file mode 100644 index 0000000..f507856 Binary files /dev/null and b/static/images/medal_un2.png differ diff --git a/static/images/medal_un2g.png b/static/images/medal_un2g.png new file mode 100644 index 0000000..6907441 Binary files /dev/null and b/static/images/medal_un2g.png differ diff --git a/static/images/medal_un3.png b/static/images/medal_un3.png new file mode 100644 index 0000000..087ed23 Binary files /dev/null and b/static/images/medal_un3.png differ diff --git a/static/images/medal_un3g.png b/static/images/medal_un3g.png new file mode 100644 index 0000000..1c00d7d Binary files /dev/null and b/static/images/medal_un3g.png differ diff --git a/static/images/medal_un4.png b/static/images/medal_un4.png new file mode 100644 index 0000000..a07b84a Binary files /dev/null and b/static/images/medal_un4.png differ diff --git a/static/images/medal_un4g.png b/static/images/medal_un4g.png new file mode 100644 index 0000000..7c14b7b Binary files /dev/null and b/static/images/medal_un4g.png differ diff --git a/static/images/medal_un5.png b/static/images/medal_un5.png new file mode 100644 index 0000000..2453cea Binary files /dev/null and b/static/images/medal_un5.png differ diff --git a/static/images/medal_un5g.png b/static/images/medal_un5g.png new file mode 100644 index 0000000..e04767a Binary files /dev/null and b/static/images/medal_un5g.png differ diff --git a/static/images/medal_un6.png b/static/images/medal_un6.png new file mode 100644 index 0000000..f3a38dd Binary files /dev/null and b/static/images/medal_un6.png differ diff --git a/static/images/medal_un6g.png b/static/images/medal_un6g.png new file mode 100644 index 0000000..cc75303 Binary files /dev/null and b/static/images/medal_un6g.png differ diff --git a/static/images/medal_un7.png b/static/images/medal_un7.png new file mode 100644 index 0000000..839962f Binary files /dev/null and b/static/images/medal_un7.png differ diff --git a/static/images/medal_un7g.png b/static/images/medal_un7g.png new file mode 100644 index 0000000..d3ebaf5 Binary files /dev/null and b/static/images/medal_un7g.png differ diff --git a/static/images/medal_un8.png b/static/images/medal_un8.png new file mode 100644 index 0000000..2095087 Binary files /dev/null and b/static/images/medal_un8.png differ diff --git a/static/images/medal_un8g.png b/static/images/medal_un8g.png new file mode 100644 index 0000000..82162d6 Binary files /dev/null and b/static/images/medal_un8g.png differ diff --git a/static/images/medal_un9.png b/static/images/medal_un9.png new file mode 100644 index 0000000..d198cd2 Binary files /dev/null and b/static/images/medal_un9.png differ diff --git a/static/images/medal_un9g.png b/static/images/medal_un9g.png new file mode 100644 index 0000000..5d45220 Binary files /dev/null and b/static/images/medal_un9g.png differ diff --git a/subpkg/about/about.vue b/subpkg/about/about.vue index 068bc26..b1f00ce 100644 --- a/subpkg/about/about.vue +++ b/subpkg/about/about.vue @@ -1,9 +1,13 @@ @@ -43,7 +47,4 @@ diff --git a/subpkg/address/address.vue b/subpkg/address/address.vue index 622e7e4..77ec73d 100644 --- a/subpkg/address/address.vue +++ b/subpkg/address/address.vue @@ -2,7 +2,7 @@ - + 联系地址 diff --git a/subpkg/agreement/agreement.vue b/subpkg/agreement/agreement.vue index 584473f..0e035c3 100644 --- a/subpkg/agreement/agreement.vue +++ b/subpkg/agreement/agreement.vue @@ -1,9 +1,13 @@ @@ -43,7 +47,4 @@ diff --git a/subpkg/feedback/feedback.vue b/subpkg/feedback/feedback.vue index 8dc0e19..fb40a4d 100644 --- a/subpkg/feedback/feedback.vue +++ b/subpkg/feedback/feedback.vue @@ -1,7 +1,9 @@ +*/ + \ No newline at end of file diff --git a/subpkg/message/message.vue b/subpkg/message/message.vue index fbec6b5..ca004cb 100644 --- a/subpkg/message/message.vue +++ b/subpkg/message/message.vue @@ -1,7 +1,9 @@