diff --git a/App.vue b/App.vue index 8c2876b..56504de 100644 --- a/App.vue +++ b/App.vue @@ -76,6 +76,27 @@ export default { // "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9zaWQiOiIwOGRkNzFiZC01N2MxLTQ1YmMtODBiYS0xMjkzYjU4MTViMmEiLCJ1bmlxdWVfbmFtZSI6IuS_nea0gSIsInJvbGUiOiJVc2VyIiwiaHR0cDovL3NjaGVtYXMueG1sc29hcC5vcmcvd3MvMjAwNS8wNS9pZGVudGl0eS9jbGFpbXMvbW9iaWxlcGhvbmUiOiIxODE3NDAxMDU2MiIsImdyb3Vwc2lkIjoiNGIyZDk2NjItYTc2OC0wOGYyLWEwYzgtNzYyYjhjNzZkYTJhIiwibmJmIjoxNzQ0MjYzMTAyLCJleHAiOjE3NDQyNjY3MDIsImlhdCI6MTc0NDI2MzEwMn0.ZJTwC7rWCcywoM7ncysw-JRIiwXz4y_6hlmqctN-gMM" let token = data.token; uni.setStorageSync("token", "Bearer " + token); + const normalTabBar = [ + { + pagePath: "/pages/index/planList", + iconPath: "/static/tab/list.png", + selectedIconPath: "/static/tab/list_cur.png", + text: "计划", + }, + { + pagePath: "/pages/index/index", + iconPath: "/static/tab/home.png", + selectedIconPath: "/static/tab/home_cur.png", + text: "首页", + }, + { + pagePath: "/pages/user/index", + iconPath: "/static/tab/my.png", + selectedIconPath: "/static/tab/my_cur.png", + text: "设置", + }, + ]; + this.$u.vuex("vuex_tabbar", normalTabBar); uni.switchTab({ url: "/pages/index/index", success() { diff --git a/pages.json b/pages.json index 8628369..ea00ebc 100644 --- a/pages.json +++ b/pages.json @@ -20,7 +20,8 @@ { "path": "pages/adminNfc/index", "style": { - "navigationBarTitleText": "nfc卡写入" + "navigationBarTitleText": "nfc卡写入", + "navigationBarBackgroundColor": "#F6F8FC" } }, { @@ -262,8 +263,8 @@ }, { "pagePath": "pages/adminNfc/index", - "iconPath": "static/tab/my.png", - "selectedIconPath": "static/tab/my_cur.png", + "iconPath": "static/tab/nfc.png", + "selectedIconPath": "static/tab/nfc-active.png", "text": "nfc写入" }, { diff --git a/pages/adminHome/index.vue b/pages/adminHome/index.vue index 213b232..5b83227 100644 --- a/pages/adminHome/index.vue +++ b/pages/adminHome/index.vue @@ -1,25 +1,56 @@ @@ -23,30 +65,84 @@ import { loginApi } from "@/api/apiList"; export default { data() { return { - phone: "13800451500", - pwd: "123456", + keyword: "", + selectShow: false, + selectVal: "全部", + options: [ + { + text: "全部", + }, + { + text: "已绑定", + }, + { + text: "未绑定", + }, + ], + tabCurrent: 0, + tabsList: [ + { + name: "区域1", + }, + { + name: "区域2", + }, + { + name: "区域3", + }, + { + name: "区域4", + }, + { + name: "区域5", + }, + + { + name: "区域6", + }, + { + name: "区域7", + }, + { + name: "区域8", + }, + ], }; }, mounted() { uni.hideLoading(); // 关闭 Loading }, onLoad() {}, - methods: {}, + methods: { + selectFn() { + this.selectShow = true; + }, + changeFn(val) { + console.log(val, "val--"); + this.selectVal = this.options[val].text; + }, + tabChangeFn(val) { + console.log(val, "val--"); + this.tabCurrent = val; + }, + }, }; diff --git a/pages/login/login.vue b/pages/login/login.vue index 6fd8f9b..b6bc2fc 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -71,20 +71,20 @@ export default { const adminTabBar = [ { pagePath: "/pages/adminHome/index", - iconPath: "/static/tab/list.png", - selectedIconPath: "/static/tab/list_cur.png", + iconPath: "/static/tab/home.png", + selectedIconPath: "/static/tab/home_cur.png", text: "首页", }, { pagePath: "/pages/adminNfc/index", - iconPath: "/static/tab/list.png", - selectedIconPath: "/static/tab/list_cur.png", + iconPath: "/static/tab/nfc.png", + selectedIconPath: "/static/tab/nfc-active.png", text: "nfc写入", }, { pagePath: "/pages/adminMy/index", - iconPath: "/static/tab/list.png", - selectedIconPath: "/static/tab/list_cur.png", + iconPath: "/static/tab/my.png", + selectedIconPath: "/static/tab/my_cur.png", text: "我的", }, ]; diff --git a/static/adminImg/bg-logo.png b/static/adminImg/bg-logo.png new file mode 100644 index 0000000..1c20ef7 Binary files /dev/null and b/static/adminImg/bg-logo.png differ diff --git a/static/adminImg/card1.png b/static/adminImg/card1.png new file mode 100644 index 0000000..b27b7ec Binary files /dev/null and b/static/adminImg/card1.png differ diff --git a/static/adminImg/card2.png b/static/adminImg/card2.png new file mode 100644 index 0000000..d426185 Binary files /dev/null and b/static/adminImg/card2.png differ diff --git a/static/adminImg/card3.png b/static/adminImg/card3.png new file mode 100644 index 0000000..f8ace1c Binary files /dev/null and b/static/adminImg/card3.png differ diff --git a/static/adminImg/card4.png b/static/adminImg/card4.png new file mode 100644 index 0000000..e543177 Binary files /dev/null and b/static/adminImg/card4.png differ diff --git a/static/adminImg/item1.png b/static/adminImg/item1.png new file mode 100644 index 0000000..a379af4 Binary files /dev/null and b/static/adminImg/item1.png differ diff --git a/static/adminImg/item2.png b/static/adminImg/item2.png new file mode 100644 index 0000000..bcc2041 Binary files /dev/null and b/static/adminImg/item2.png differ diff --git a/static/adminImg/item3.png b/static/adminImg/item3.png new file mode 100644 index 0000000..49bc2ea Binary files /dev/null and b/static/adminImg/item3.png differ diff --git a/static/adminImg/item4.png b/static/adminImg/item4.png new file mode 100644 index 0000000..ed71773 Binary files /dev/null and b/static/adminImg/item4.png differ diff --git a/static/adminImg/item5.png b/static/adminImg/item5.png new file mode 100644 index 0000000..a8a1000 Binary files /dev/null and b/static/adminImg/item5.png differ diff --git a/static/adminImg/logo-hi.png b/static/adminImg/logo-hi.png new file mode 100644 index 0000000..1e9a9b1 Binary files /dev/null and b/static/adminImg/logo-hi.png differ diff --git a/static/adminImg/椭圆3@2x.png b/static/adminImg/椭圆3@2x.png new file mode 100644 index 0000000..4458446 Binary files /dev/null and b/static/adminImg/椭圆3@2x.png differ diff --git a/static/adminImg/矩形22拷贝@2x.png b/static/adminImg/矩形22拷贝@2x.png new file mode 100644 index 0000000..3db7104 Binary files /dev/null and b/static/adminImg/矩形22拷贝@2x.png differ diff --git a/static/adminImg/系统管理@2x.png b/static/adminImg/系统管理@2x.png new file mode 100644 index 0000000..ae12d17 Binary files /dev/null and b/static/adminImg/系统管理@2x.png differ diff --git a/static/svg/down.svg b/static/svg/down.svg new file mode 100644 index 0000000..2b65801 --- /dev/null +++ b/static/svg/down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/tab/nfc-active.png b/static/tab/nfc-active.png new file mode 100644 index 0000000..c5052f8 Binary files /dev/null and b/static/tab/nfc-active.png differ diff --git a/static/tab/nfc.png b/static/tab/nfc.png new file mode 100644 index 0000000..3ea25ea Binary files /dev/null and b/static/tab/nfc.png differ