diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 3111610..d904f11 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -13,11 +13,12 @@
-
\ No newline at end of file
diff --git a/pages/my/my.vue b/pages/my/my.vue
index d7e04fa..db4e3af 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,14 +1,41 @@
-
-
+
+
+
+ ![]()
+ {{name}}
+ 勋章：2 挑战历史：3
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -22,9 +49,7 @@
-
-
@@ -34,7 +59,6 @@
-
@@ -47,7 +71,7 @@
-
+ -->
\ No newline at end of file
diff --git a/pages/scan/scan.vue b/pages/scan/scan.vue
index 2d32d7f..52794be 100644
--- a/pages/scan/scan.vue
+++ b/pages/scan/scan.vue
@@ -1,6 +1,8 @@
+
diff --git a/static/base_css.css b/static/base_css.css
new file mode 100644
index 0000000..5d667b8
--- /dev/null
+++ b/static/base_css.css
@@ -0,0 +1,673 @@
+html, body {
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ height: 100%;
+ min-height: 100%;
+ font-size: 0.9rem;
+}
+
+html {
+ overflow-y: scroll;
+}
+
+ul, ol, li {
+ margin: 0;
+ padding: 0;
+ list-style: outside none none;
+}
+
+a {
+ text-decoration: none;
+ outline: none;
+}
+
+a:focus, input:focus, textarea:focus {
+ border: none;
+ outline: medium;
+ box-shadow: none;
+}
+
+img {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ border-radius: 10px;
+}
+
+.wrap {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+}
+
+.stabar {
+ position: fixed;
+ top: 0;
+ z-index: 9999;
+ padding: 0 5%;
+ width: 100%;
+ height: 45px;
+ color: #fff;
+ line-height: 30px;
+ background-color: #bac6fc;
+}
+
+/*************** 首页 ************************/
+
+
+
+.mainwrap {
+ margin-top: 0px;
+ padding-bottom: 5%;
+ height: calc(100% - 100px);
+ width: 100%;
+ background-image: linear-gradient(to bottom, #bac6fc, transparent 50%);
+ box-sizing: content-box;
+ overflow: hidden;
+ overflow-y: auto;
+}
+
+.topcont {
+ position: relative;
+ top: 4%;
+ width: 100%;
+ height: 10.5%;
+ text-align: center;
+}
+
+.topcont img {
+ width: 80%;
+ height: auto;
+}
+
+.banbox {
+ position: relative;
+ top: 4%;
+ z-index: 1;
+ margin: 0 auto;
+ height: 60%;
+ width: 94%;
+ box-sizing: content-box;
+ border-radius: 10px;
+}
+
+.itembox {
+ display: flex;
+ position: relative;
+ top: 4%;
+ margin: 3.5% auto 0;
+ width: 94%;
+ height: 21%;
+}
+
+.itembox span {
+ display: block;
+ margin-right: 5%;
+ width: 50%;
+}
+
+.itembox span:last-child {
+ margin-right: 0;
+}
+
+.subtop, .sectop {
+ position: fixed;
+ top: 35px;
+ z-index: 1000;
+ width: 100%;
+ height: 50px;
+}
+
+.subtop {
+ height: 110px;
+ background: #fff none;
+}
+
+.pagetit {
+ text-align: center;
+ font-size: 1.25rem;
+}
+
+.subtop .pagetit, .sectop .pagetit {
+ margin-top: -20px;
+}
+
+h3.contit {
+ margin: 1% 0 2% 4%;
+ width: 96%;
+ height: 2rem;
+ line-height: 2;
+}
+
+h3.contit span {
+ display: inline-block;
+ float: left;
+ font-size: 1.15rem;
+ font-weight: 600;
+ color: #666;
+}
+
+.footbox {
+ position: fixed;
+ bottom: 0;
+ width: 100%;
+ height: 64px;
+ background-image: linear-gradient(to top, rgba(220,234,253,1), rgba(255,255,255,1));
+ border-top: 1px solid #eee;
+ box-shadow: 0 0 10px #eee;
+ text-align: center;
+}
+
+.footbox a {
+ position: relative;
+ display: inline-block;
+ margin: 10px 0;
+ padding-top: 28px;
+ width: 23%;
+ text-align: center;
+ background-size: 20%;
+ font-size: 1.0rem;
+ color: #999;
+ cursor: pointer;
+ background-size: 25%;
+}
+
+.footbox a:hover, .footbox a.curaf {
+ background-size: 25%;
+ color: #0b68f7;
+}
+
+.ahome {
+ background: url(/static/images/icon_home_2.png) no-repeat center top;
+}
+
+.ahome:hover, .ahome.curaf {
+ background: url(/static/images/icon_home.png) no-repeat center top;
+}
+
+.scannav {
+ background: url(/static/images/icon_scan_2.png) no-repeat center top;
+}
+
+.scannav:hover, .scannav.curaf {
+ background: url(/static/images/icon_scan.png) no-repeat center top;
+}
+
+.infonav {
+ background: url(/static/images/icon_info_2.png) no-repeat center top;
+}
+
+.infonav:hover, .infonav.curaf {
+ background: url(/static/images/icon_info.png) no-repeat center top;
+}
+
+.amine {
+ background: url(/static/images/icon_mine_2.png) no-repeat center top;
+}
+
+.amine:hover, .amine.curaf {
+ background: url(/static/images/icon_mine.png) no-repeat center top;
+}
+
+/*************** 场景 ************************/
+
+
+
+.secbar {
+ position: relative;
+ top: 35px;
+ height: 60px;
+ width: 100%;
+ background-color: #bac6fc;
+}
+
+.secbar span {
+ position: relative;
+ top: 10px;
+ display: inline-block;
+ width: 30px;
+ height: 30px;
+ line-height: 20em;
+ white-space: nowrap;
+ overflow: hidden;
+ opacity: 0.9;
+}
+
+.secbar .pagetit {
+ margin-top: -18px;
+}
+
+.secbar span.back {
+ padding-left: 1.25rem;
+ left: 4%;
+ width: auto;
+ font-size: 1.15rem;
+ line-height: 30px;
+ background: url(/static/images/icon_arb.png) no-repeat left center;
+ background-size: auto 60%;
+}
+
+.banbox_sec {
+ position: relative;
+ top: -10px;
+ z-index: 1;
+ margin: 0 auto;
+ height: 20%;
+ width: 94%;
+ box-sizing: content-box;
+ border-radius: 10px;
+}
+
+.subwrap {
+ position: relative;
+ top: -5%;
+ overflow: hidden;
+ overflow-y: auto;
+ padding: 1% 3%;
+ width: 94%;
+ height: 70%;
+}
+
+.mainwrap2, .mainwrap3, .tabwrap {
+ position: relative;
+ top: 35px;
+ padding: 10px 0;
+ width: 100%;
+ height: calc(100% - 100px);
+ background-image: linear-gradient(to bottom, #bac6fc, transparent 40%);
+ box-sizing: content-box;
+ overflow-x: hidden;
+ overflow-y: auto;
+}
+
+.mainwrap2 {
+ overflow-y: hidden;
+}
+
+.tabwrap {
+ position: fixed;
+ top: 110px;
+ height: calc(100% - 140px);
+}
+
+.subsearch {
+ position: relative;
+ top: -2%;
+ width: 100%;
+ height: 5.0rem;
+}
+
+.subtop .subsearch {
+ top: 60px;
+}
+
+.msearchbox {
+ position: relative;
+ margin: 10px 3%;
+ padding: 3px 45px 3px 15px;
+ width: 70%;
+ height: 36px;
+ line-height: 34px;
+ background-color: transparent;
+ background: #f6f7fe url(/static/images/icon_sou.png) no-repeat right 16px center;
+ background-size: auto 50%;
+ box-sizing: border-box;
+ border: 1px solid rgba(0,0,0,.05);
+ border-radius: 16px;
+ color: #999999;
+ outline: none;
+}
+
+.subsearch .msearchbox {
+ left: 2%;
+ padding: 3px 15px 3px 12%;
+ width: 90%;
+ background-position: left 16px center;
+}
+
+.msearchbtn {
+ position: absolute;
+ top: 24%;
+ right: 28%;
+ height: 28px;
+ width: 36px;
+ background: transparent;
+ color: transparent;
+ border: 0 none;
+}
+
+.scitem {
+ position: relative;
+ margin: 3% 0;
+ width: 100%;
+ height: 25%;
+ background: #000;
+ border-radius: 10px;
+}
+
+.scitem img {
+ opacity: .7;
+}
+
+.scdec {
+ position: absolute;
+ z-index: 1;
+ top: 15%;
+ left: 5%;
+ color: #fff;
+}
+
+.scdec h4 {
+ margin: 15% 0;
+ font-size: 1.5rem;
+ font-weight: 500;
+}
+
+.scdec span {
+ display: block;
+ margin: 5% 0;
+ font-size: 0.8rem;
+}
+
+/*************** 我的 ************************/
+
+
+
+
+.mitop {
+ margin-top: 0;
+ height: 40vw;
+}
+
+.topban h1 {
+ width: 100%;
+ color: #fff;
+ font-size: 1.2rem;
+ margin: 0 auto;
+ padding: 0;
+ text-align: center;
+ line-height: 8rem;
+}
+
+.perinfo {
+ position: relative;
+ margin: 3%;
+ height: 8.5rem;
+ width: 94%;
+}
+
+.perinfo .type-name {
+ float: left;
+ margin: 3% 3%;
+ display: inline-block;
+ width: 5rem;
+ height: 5rem;
+ overflow: hidden;
+ background: url(/static/images/hpic.jpg) no-repeat;
+ background-size: cover;
+ background-position: center top;
+ border: 1px solid #fff;
+ border-radius: 50%;
+}
+
+.perinfo .dycd {
+ float: left;
+ display: inline-block;
+ margin: 3.5% 5%;
+ width: calc(80% - 5rem);
+ color: #333;
+ font-size: 1.0rem;
+ line-height: 1.5;
+ text-align: left;
+}
+
+.myname {
+ display: block;
+ margin: 0 0 5%;
+ font-size: 1rem;
+}
+
+.myitem span {
+ position: relative;
+ margin: 1% 5% 0 0;
+ padding-right: 0.6rem;
+ font-size: 0.8rem;
+ color: #666;
+}
+
+.myitem span b {
+ color: #333;
+ font-size: 0.7rem;
+}
+
+.myitem span i {
+ position: absolute;
+ top: 0;
+ right: 0;
+ width: 8px;
+ height: 8px;
+ border-radius: 100%;
+ background-color: #fb3737;
+}
+
+.mset {
+ position: relative;
+ width: 94%;
+ min-height: 30%;
+ height: calc(90% - 17rem);
+ margin: 0 3%;
+ overflow: auto;
+}
+
+.mset ul {
+ width: 96%;
+ height: 96%;
+ margin: 2%;
+}
+
+.mset li {
+ width: 100%;
+ /*height: 20%;*/
+ background: url(/static/images/arrow-r.png) no-repeat right 2% center;
+ background-size: auto 30%;
+ display: table;
+}
+
+.version-number {
+ padding: 5% 2% !important;
+}
+
+.mset li span {
+ background-position: left 1% center;
+ background-repeat: no-repeat;
+ background-size: 6% auto;
+ padding: 3.5% 10%;
+ display: table-cell;
+ width: 30%;
+ height: 90%;
+ font-size: 1.15rem;
+}
+
+/***********************/
+
+
+
+.maintab {
+ position: relative;
+ top: 25px;
+ margin: 0;
+ align-items: center;
+ background: #fff;
+ border-bottom: 0.5rem solid #f3f4f5;
+}
+
+.titbox {
+ position: relative;
+ display: flex;
+ margin: 0 auto;
+ white-space: nowrap;
+}
+
+.titbox>span {
+ flex: 1;
+ margin: 0 3%;
+ width: auto;
+ text-align: center;
+ color: #999;
+ line-height: 2;
+}
+
+.titbox>span.actit {
+ color: #09F;
+}
+
+.titbox>span.actit:after {
+ display: block;
+ margin: -3px auto 0;
+ content: "";
+ width: 3rem;
+ height: 3px;
+ background-color: #09F;
+}
+
+.tab_item {
+ display: none;
+ position: relative;
+ height: 100%;
+ clear: both;
+}
+
+.list_tit {
+ margin: 0;
+ padding-left: 3%;
+ background: #f3f4f5;
+ height: 3rem;
+ line-height: 3.5;
+ color: #999;
+ font-weight: normal;
+ font-size: 0.9rem;
+}
+
+.listbox li {
+ position: relative;
+ display: flex;
+ padding: 2% 0;
+ width: 100%;
+ border-bottom: 1px solid #f5f5f5;
+ font-size: 1rem;
+}
+
+.listbox li:last-child {
+ border-bottom: 0;
+ margin-bottom: 3%;
+}
+
+.listbox li>span {
+ display: inline-flex;
+ margin: auto 2%;
+ padding-left: 7px;
+ color: #999;
+}
+
+.listbox input, .listbox select, .listbox textarea {
+ margin: 0;
+ height: 2.4rem;
+ color: #666;
+ border: 0 none;
+ font-size: 1rem;
+ font-family: Arial, Helvetica, sans-serif;
+ text-align: right;
+}
+
+.listbox li>div {
+ flex: 1;
+ margin: 0 1rem;
+ text-align: right;
+ color: #000;
+}
+
+.listbox li>div>input {
+ width: 100%;
+ padding: 0;
+}
+
+.listbox li span>b {
+ margin: 1% 2px 0 -7px;
+ color: #f00;
+}
+
+.listbox textarea, .textabox {
+ margin: -0.5rem 0 0 0;
+ padding: 0.5rem;
+ width: 96%;
+ min-height: 4.5rem;
+ background: #f5f5f5;
+ text-align: left;
+ line-height: 1.5;
+}
+
+.picbox>span {
+ display: inline-block;
+ margin: 0 0 2% 3%;
+ width: 20%;
+ height: 3rem;
+ overflow: hidden;
+}
+
+.picbox>span>img {
+ width: 100%;
+ height: auto;
+}
+
+span.rigadd {
+ float: right;
+ width: 1.25rem;
+ height: 1.25rem;
+ line-height: 20rem;
+ overflow: hidden;
+ background: url(/static/images/icon_60add.png) no-repeat top 28.5% center;
+ background-size: auto 75%;
+ border: 1px solid #ddd;
+ border-radius: 50%;
+}
+
+.footbtn_2 {
+ display: flex;
+ margin: 3% 0;
+ width: 100%;
+}
+
+.footbtn_2 a {
+ display: inline-block;
+ flex: 1;
+ margin: 3%;
+ width: 40%;
+ height: 3rem;
+ line-height: 3;
+ background: #199ffe;
+ border: 1px solid #199ffe;
+ border-radius: 30px;
+ color: #fff;
+ font-size: 1rem;
+ text-align: center;
+}
+
+.footbtn_2 a:last-child {
+ background: #fff;
+ border: 1px solid #b1b1b1;
+ color: #797979;
+}
+
+.onebtn {
+ position: relative;
+ top: 30vw;
+ background: #3a02a5;
+ width: 96%;
+ border-radius: 10px;
+ color: #fff;
+ text-align: center;
+ margin: 3% 2%;
+ line-height: 3.0;
+ letter-spacing: 2px;
+}
\ No newline at end of file
diff --git a/static/images/arrow-r.png b/static/images/arrow-r.png
new file mode 100755
index 0000000..f5c3f98
Binary files /dev/null and b/static/images/arrow-r.png differ
diff --git a/static/images/banner.jpg b/static/images/banner.jpg
new file mode 100755
index 0000000..2bd3a38
Binary files /dev/null and b/static/images/banner.jpg differ
diff --git a/static/images/banner_mine.jpg b/static/images/banner_mine.jpg
new file mode 100755
index 0000000..ea807d4
Binary files /dev/null and b/static/images/banner_mine.jpg differ
diff --git a/static/images/banner_sec.jpg b/static/images/banner_sec.jpg
new file mode 100755
index 0000000..86b979d
Binary files /dev/null and b/static/images/banner_sec.jpg differ
diff --git a/static/images/hpic.jpg b/static/images/hpic.jpg
new file mode 100755
index 0000000..0eeb6bb
Binary files /dev/null and b/static/images/hpic.jpg differ
diff --git a/static/images/icon_50about.png b/static/images/icon_50about.png
new file mode 100755
index 0000000..adfab61
Binary files /dev/null and b/static/images/icon_50about.png differ
diff --git a/static/images/icon_50adr.png b/static/images/icon_50adr.png
new file mode 100755
index 0000000..238f82a
Binary files /dev/null and b/static/images/icon_50adr.png differ
diff --git a/static/images/icon_50agr.png b/static/images/icon_50agr.png
new file mode 100755
index 0000000..668c22e
Binary files /dev/null and b/static/images/icon_50agr.png differ
diff --git a/static/images/icon_50help.png b/static/images/icon_50help.png
new file mode 100755
index 0000000..c1d1962
Binary files /dev/null and b/static/images/icon_50help.png differ
diff --git a/static/images/icon_50idea.png b/static/images/icon_50idea.png
new file mode 100755
index 0000000..71a4e0e
Binary files /dev/null and b/static/images/icon_50idea.png differ
diff --git a/static/images/icon_50msg.png b/static/images/icon_50msg.png
new file mode 100755
index 0000000..aa960b1
Binary files /dev/null and b/static/images/icon_50msg.png differ
diff --git a/static/images/icon_50priv.png b/static/images/icon_50priv.png
new file mode 100755
index 0000000..1fdeb2e
Binary files /dev/null and b/static/images/icon_50priv.png differ
diff --git a/static/images/icon_50set.png b/static/images/icon_50set.png
new file mode 100755
index 0000000..c1861d9
Binary files /dev/null and b/static/images/icon_50set.png differ
diff --git a/static/images/icon_50vip.png b/static/images/icon_50vip.png
new file mode 100755
index 0000000..67fe8ea
Binary files /dev/null and b/static/images/icon_50vip.png differ
diff --git a/static/images/icon_60add.png b/static/images/icon_60add.png
new file mode 100755
index 0000000..138e0c1
Binary files /dev/null and b/static/images/icon_60add.png differ
diff --git a/static/images/icon_arb.png b/static/images/icon_arb.png
new file mode 100755
index 0000000..61cd886
Binary files /dev/null and b/static/images/icon_arb.png differ
diff --git a/static/images/icon_base.png b/static/images/icon_base.png
new file mode 100755
index 0000000..c6b51f6
Binary files /dev/null and b/static/images/icon_base.png differ
diff --git a/static/images/icon_base_2.png b/static/images/icon_base_2.png
new file mode 100755
index 0000000..688c5d3
Binary files /dev/null and b/static/images/icon_base_2.png differ
diff --git a/static/images/icon_home.png b/static/images/icon_home.png
new file mode 100755
index 0000000..277e483
Binary files /dev/null and b/static/images/icon_home.png differ
diff --git a/static/images/icon_home_2.png b/static/images/icon_home_2.png
new file mode 100755
index 0000000..391a272
Binary files /dev/null and b/static/images/icon_home_2.png differ
diff --git a/static/images/icon_info.png b/static/images/icon_info.png
new file mode 100755
index 0000000..9f1a4ab
Binary files /dev/null and b/static/images/icon_info.png differ
diff --git a/static/images/icon_info_2.png b/static/images/icon_info_2.png
new file mode 100755
index 0000000..528d8de
Binary files /dev/null and b/static/images/icon_info_2.png differ
diff --git a/static/images/icon_mine.png b/static/images/icon_mine.png
new file mode 100755
index 0000000..0c5c825
Binary files /dev/null and b/static/images/icon_mine.png differ
diff --git a/static/images/icon_mine_2.png b/static/images/icon_mine_2.png
new file mode 100755
index 0000000..bcde1f9
Binary files /dev/null and b/static/images/icon_mine_2.png differ
diff --git a/static/images/icon_scan.png b/static/images/icon_scan.png
new file mode 100755
index 0000000..8b9ce91
Binary files /dev/null and b/static/images/icon_scan.png differ
diff --git a/static/images/icon_scan_2.png b/static/images/icon_scan_2.png
new file mode 100755
index 0000000..f650031
Binary files /dev/null and b/static/images/icon_scan_2.png differ
diff --git a/static/images/icon_sou.png b/static/images/icon_sou.png
new file mode 100755
index 0000000..798f592
Binary files /dev/null and b/static/images/icon_sou.png differ
diff --git a/static/images/item_1.jpg b/static/images/item_1.jpg
new file mode 100755
index 0000000..8bb3fb9
Binary files /dev/null and b/static/images/item_1.jpg differ
diff --git a/static/images/item_2.jpg b/static/images/item_2.jpg
new file mode 100755
index 0000000..21e2263
Binary files /dev/null and b/static/images/item_2.jpg differ
diff --git a/static/images/logo_header.png b/static/images/logo_header.png
new file mode 100755
index 0000000..d579abf
Binary files /dev/null and b/static/images/logo_header.png differ
diff --git a/static/images/scene_p1.jpg b/static/images/scene_p1.jpg
new file mode 100755
index 0000000..262ce2a
Binary files /dev/null and b/static/images/scene_p1.jpg differ
diff --git a/static/images/scene_p2.jpg b/static/images/scene_p2.jpg
new file mode 100755
index 0000000..229b198
Binary files /dev/null and b/static/images/scene_p2.jpg differ
diff --git a/static/images/scene_p3.jpg b/static/images/scene_p3.jpg
new file mode 100755
index 0000000..5d898fb
Binary files /dev/null and b/static/images/scene_p3.jpg differ
diff --git a/static/images/scene_p4.jpg b/static/images/scene_p4.jpg
new file mode 100755
index 0000000..4943a33
Binary files /dev/null and b/static/images/scene_p4.jpg differ
diff --git a/static/images/scene_p5.jpg b/static/images/scene_p5.jpg
new file mode 100755
index 0000000..d00861a
Binary files /dev/null and b/static/images/scene_p5.jpg differ