diff --git a/pages.json b/pages.json index 4c6acb9..500a99a 100644 --- a/pages.json +++ b/pages.json @@ -149,22 +149,7 @@ "style": { "navigationBarTitleText": "能量钱包", "enablePullDownRefresh": false, - "navigationBarTextStyle": "white", - "app-plus": { - "titleNView": { - "backgroundColor": "#b11eff", - "type": "transparent", - "buttons": [{ - "float": "right", - "fontSize": "14", - "text": "管理", - "background": "rgba(255,255,255,0)" - }], - "backButton": { - "background": "rgba(255,255,255,0)" - } - } - } + "navigationBarTextStyle": "white" } }, { "path": "pages/wallet/extract", @@ -184,7 +169,56 @@ "navigationBarTextStyle": "white" }, "name": "ResetPassword" - } ], + },{ + "path": "pages/verification/index", + "name": "verificationIndex", + "auth": true, + "style": { + "navigationBarTitleText": "扫码核销" + } + },{ + "path": "pages/verification/history", + "name": "verificationHistory", + "auth": true, + "style": { + "navigationBarTitleText": "核销记录" + } + },{ + "path": "pages/shop/lists", + "name": "shopLists", + "auth": true, + "style": { + "navigationBarTitleText": "部门/门店" + } + },{ + "path": "pages/shop/create", + "name": "shopCreate", + "auth": true, + "style": { + "navigationBarTitleText": "创建部门/门店" + } + },{ + "path": "pages/employees/list", + "name": "employeesList", + "auth": true, + "style": { + "navigationBarTitleText": "员工管理" + } + },{ + "path": "pages/employees/add", + "name": "employeesAdd", + "auth": true, + "style": { + "navigationBarTitleText": "添加员工" + } + },{ + "path": "pages/instrument/Spread", + "name": "instrumentSpread", + "auth": true, + "style": { + "navigationBarTitleText": "营销推广码" + } + }], "globalStyle": { "navigationStyle": "custom", "backgroundColor": "#F5F5F5" diff --git a/pages/employees/add.vue b/pages/employees/add.vue new file mode 100644 index 0000000..ed32964 --- /dev/null +++ b/pages/employees/add.vue @@ -0,0 +1,311 @@ + + + + + diff --git a/pages/employees/list.vue b/pages/employees/list.vue new file mode 100644 index 0000000..5b39527 --- /dev/null +++ b/pages/employees/list.vue @@ -0,0 +1,260 @@ + + + + + diff --git a/pages/index/index.vue b/pages/index/index.vue index 3521461..0d35411 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -34,16 +34,243 @@ {{ item.title }} + + + + + 平台原石余量 + {{ occBalance }} + + + 昨日瓜分水晶 + {{ yesterdayCrystal }} + + + 区块链高度 + {{ blockHeight }} + + + 平台累计盈利额 + {{ gain }} + + + 已开通节点数 + {{ nodeNumber }} + + + + + + 轻节点 + {{occs.light || '-'}} + + + 合作节点 + {{occs.cooperation || '-'}} + + + 主节点 + {{occs.main || '-'}} + + + 超级节点 + {{occs.super || '-'}} + + + 运营节点 + {{occs.operating || '-'}} + + + 技术节点 + {{occs.technology || '-'}} + + + + + 平台累计营业额和原石价值走势图 + + + + + @@ -137,10 +364,83 @@ background: #1f1922; overflow: hidden; } + // 平台概况 + .situation{ + margin: 0 $margin; + background-image: linear-gradient(to bottom, $block-color, #1f1922); + border-radius: $radius; + padding: $padding $padding/2 $padding*2; + // 平台统计 + .header{ + display: flex; + flex-wrap: wrap; + margin-bottom: $margin*2; + .number{ + color: white; + font-size: $title-size; + padding-top: $padding/2; + font-weight: bold; + } + .title{ + color: rgba($color: white, $alpha: .4); + font-size: $title-size-sm; + } + .header-item{ + width: 50%; + padding: $padding / 2; + box-sizing: border-box; + &:first-child{ + width: 100%; + .number{ + font-size: $title-size; + } + } + } + } + // 节点信息 + .node-info{ + display: flex; + flex-wrap: wrap; + margin: 0 -$margin / 2; + .node-item{ + background: rgba($color: $block-color, $alpha: .8); + width: calc(50% - #{$margin}); + margin: $margin / 2; + padding: $padding; + box-sizing: border-box; + border-radius: $radius/2; + } + .number{ + font-size: $title-size + 4; + font-weight: bold; + color: white; + } + .title{ + font-size: $title-size-sm; + color: white; + } + } + // 图表 + .chart{ + background: rgba($color: $block-color, $alpha: .8); + padding: $padding; + border-radius: $radius/2; + margin-top: $margin; + .title{ + text-align: center; + line-height: 80rpx; + color: white; + font-size: $title-size-m; + } + .chart-f2{ + height: 200px; + } + } + } // 数据统计 .total { position: relative; - margin: $margin ($margin + $margin/2); + margin: $margin; background: #2b2449; padding: 0; display: flex; @@ -171,6 +471,12 @@ background: linear-gradient(to bottom, transparent, rgba(255, 255, 255, .7), transparent); } } + // 求助icon + .help-icon{ + vertical-align: middle; + margin-left: $margin/3; + opacity: .7; + } // 矿石 .ore { position: relative; diff --git a/pages/instrument/Spread.vue b/pages/instrument/Spread.vue new file mode 100644 index 0000000..48c53b6 --- /dev/null +++ b/pages/instrument/Spread.vue @@ -0,0 +1,249 @@ + + + + + diff --git a/pages/news/detail.vue b/pages/news/detail.vue index 8ffa1ac..7687a4e 100644 --- a/pages/news/detail.vue +++ b/pages/news/detail.vue @@ -1,6 +1,6 @@