diff --git a/pages.json b/pages.json index ed6b0b8..3fbb5ef 100644 --- a/pages.json +++ b/pages.json @@ -103,6 +103,14 @@ "navigationBarTitleText" : "", "enablePullDownRefresh" : false } + }, + { + "path" : "practice/practice", + "style" : + { + "navigationBarTitleText" : "", + "enablePullDownRefresh" : false + } }] }], "globalStyle": { diff --git a/pages/my/my.vue b/pages/my/my.vue index b7de2e9..e852ba9 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -4,7 +4,7 @@ {{name}} - 勋章：2 挑战历史：3 + 勋章：{{medalNum}} 挑战历史：3 diff --git a/static/images/arrow-b.png b/static/images/arrow-b.png new file mode 100644 index 0000000..c1de068 Binary files /dev/null and b/static/images/arrow-b.png differ diff --git a/static/images/arrow-r.png b/static/images/arrow-r.png old mode 100755 new mode 100644 diff --git a/static/images/banner.jpg b/static/images/banner.jpg old mode 100755 new mode 100644 diff --git a/static/images/banner_mine.jpg b/static/images/banner_mine.jpg old mode 100755 new mode 100644 diff --git a/static/images/banner_sec.jpg b/static/images/banner_sec.jpg old mode 100755 new mode 100644 diff --git a/static/images/bg_role.jpg b/static/images/bg_role.jpg new file mode 100644 index 0000000..eadfd39 Binary files /dev/null and b/static/images/bg_role.jpg differ diff --git a/static/images/btn_start.png b/static/images/btn_start.png new file mode 100644 index 0000000..27a4d9b Binary files /dev/null and b/static/images/btn_start.png differ diff --git a/static/images/hpic.jpg b/static/images/hpic.jpg old mode 100755 new mode 100644 diff --git a/static/images/icon_50about.png b/static/images/icon_50about.png old mode 100755 new mode 100644 diff --git a/static/images/icon_50adr.png b/static/images/icon_50adr.png old mode 100755 new mode 100644 diff --git a/static/images/icon_50agr.png b/static/images/icon_50agr.png old mode 100755 new mode 100644 diff --git a/static/images/icon_50help.png b/static/images/icon_50help.png old mode 100755 new mode 100644 diff --git a/static/images/icon_50idea.png b/static/images/icon_50idea.png old mode 100755 new mode 100644 diff --git a/static/images/icon_50msg.png b/static/images/icon_50msg.png old mode 100755 new mode 100644 diff --git a/static/images/icon_50priv.png b/static/images/icon_50priv.png old mode 100755 new mode 100644 diff --git a/static/images/icon_50set.png b/static/images/icon_50set.png old mode 100755 new mode 100644 diff --git a/static/images/icon_50vip.png b/static/images/icon_50vip.png old mode 100755 new mode 100644 diff --git a/static/images/icon_60add.png b/static/images/icon_60add.png old mode 100755 new mode 100644 diff --git a/static/images/icon_arb.png b/static/images/icon_arb.png old mode 100755 new mode 100644 diff --git a/static/images/icon_base.png b/static/images/icon_base.png old mode 100755 new mode 100644 diff --git a/static/images/icon_base_2.png b/static/images/icon_base_2.png old mode 100755 new mode 100644 diff --git a/static/images/icon_home.png b/static/images/icon_home.png old mode 100755 new mode 100644 diff --git a/static/images/icon_home_2.png b/static/images/icon_home_2.png old mode 100755 new mode 100644 diff --git a/static/images/icon_info.png b/static/images/icon_info.png old mode 100755 new mode 100644 diff --git a/static/images/icon_info_2.png b/static/images/icon_info_2.png old mode 100755 new mode 100644 diff --git a/static/images/icon_mine.png b/static/images/icon_mine.png old mode 100755 new mode 100644 diff --git a/static/images/icon_mine_2.png b/static/images/icon_mine_2.png old mode 100755 new mode 100644 diff --git a/static/images/icon_scan.png b/static/images/icon_scan.png old mode 100755 new mode 100644 diff --git a/static/images/icon_scan_2.png b/static/images/icon_scan_2.png old mode 100755 new mode 100644 diff --git a/static/images/icon_sou.png b/static/images/icon_sou.png old mode 100755 new mode 100644 diff --git a/static/images/item_1.jpg b/static/images/item_1.jpg old mode 100755 new mode 100644 diff --git a/static/images/item_2.jpg b/static/images/item_2.jpg old mode 100755 new mode 100644 diff --git a/static/images/logo_header.png b/static/images/logo_header.png old mode 100755 new mode 100644 diff --git a/static/images/scene_p1.jpg b/static/images/scene_p1.jpg old mode 100755 new mode 100644 diff --git a/static/images/scene_p2.jpg b/static/images/scene_p2.jpg old mode 100755 new mode 100644 diff --git a/static/images/scene_p3.jpg b/static/images/scene_p3.jpg old mode 100755 new mode 100644 diff --git a/static/images/scene_p4.jpg b/static/images/scene_p4.jpg old mode 100755 new mode 100644 diff --git a/static/images/scene_p5.jpg b/static/images/scene_p5.jpg old mode 100755 new mode 100644 diff --git a/subpkg/address/address.vue b/subpkg/address/address.vue index 0016a3e..121f34f 100644 --- a/subpkg/address/address.vue +++ b/subpkg/address/address.vue @@ -2,7 +2,7 @@ - + diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue index 5c353be..3773f98 100644 --- a/subpkg/list/list.vue +++ b/subpkg/list/list.vue @@ -22,7 +22,7 @@ - + @@ -68,7 +68,7 @@ this.sceneList = [] res.data.forEach(item=>{ item.uploadPath = uni.$http.baseUrl +item.uploadPath - this.sceneList.push(item.uploadPath) + this.sceneList.push(item) }) uni.$showMsg('数据请求成功！') @@ -83,7 +83,7 @@ navClickHandler(item) { if(item !== ""){ uni.navigateTo({ - url:'/subpkg/role/role' + url: '/subpkg/role/role?guid=' + item.guid+'&name='+item.name }) } }, diff --git a/subpkg/practice/practice.vue b/subpkg/practice/practice.vue new file mode 100644 index 0000000..9000a82 --- /dev/null +++ b/subpkg/practice/practice.vue @@ -0,0 +1,49 @@ + + + + + \ No newline at end of file diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue index 9000a82..744e061 100644 --- a/subpkg/role/role.vue +++ b/subpkg/role/role.vue @@ -1,49 +1,274 @@ \ No newline at end of file