diff --git a/apis/request.js b/apis/request.js index f18e6cd..76f3ca5 100644 --- a/apis/request.js +++ b/apis/request.js @@ -12,7 +12,7 @@ const request = options => { }) } const header = Object.assign({}, config.headers, { - token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzMjcyMjMyLCJleHAiOjE2NTMzMTU0MzIsImFjY291bnRJZCI6IjEifQ.gf5myNnrLmVjUcIWfqfohWyvdPXXwr9butZo75CXk64' + token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzMzU5NTQwLCJleHAiOjE2NTM0MDI3NDAsImFjY291bnRJZCI6IjEifQ._dqfOSY8Gr6O0BFXxP17CI7zzJY9MHmfzj3876zc21s' }) return new Promise((resolve, reject)=>{ uni.request({ diff --git a/pages.json b/pages.json index c9df0d3..7c555dc 100644 --- a/pages.json +++ b/pages.json @@ -1,10 +1,16 @@ { "pages": [ + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "首页" + } + }, { - "path" : "pages/invite/invite", + "path" : "pages/login/login", "style" : { - "navigationBarTitleText": "加入团队", + "navigationBarTitleText": "登录", "enablePullDownRefresh": false } }, @@ -16,6 +22,14 @@ "enablePullDownRefresh": true } }, + { + "path" : "pages/invite/invite", + "style" : + { + "navigationBarTitleText": "加入团队", + "enablePullDownRefresh": false + } + }, { "path" : "pages/orderDetail/orderDetail", "style" : @@ -72,12 +86,6 @@ "enablePullDownRefresh": false } }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "首页" - } - }, { "path" : "pages/qrcode/qrcode", "style" : @@ -143,15 +151,6 @@ "enablePullDownRefresh": false } } - ,{ - "path" : "pages/login/login", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - - } ], "condition": { //模式配置,仅开发期间生效 "current": 0, //当前激活的模式(list 的索引项) diff --git a/pages/login/login.vue b/pages/login/login.vue index 3988183..36b8562 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,15 +1,21 @@ @@ -18,7 +24,11 @@ export default { data() { return { - + agree: [], + agreeData: [{ + text: '', + value: 0 + }], } }, methods: { @@ -29,9 +39,73 @@ diff --git a/static/image/login1.png b/static/image/login1.png new file mode 100644 index 0000000..49b9fe1 Binary files /dev/null and b/static/image/login1.png differ diff --git a/static/image/login2.png b/static/image/login2.png new file mode 100644 index 0000000..27adefd Binary files /dev/null and b/static/image/login2.png differ diff --git a/static/image/logo.png b/static/image/logo.png new file mode 100644 index 0000000..448fe04 Binary files /dev/null and b/static/image/logo.png differ diff --git a/static/phone.png b/static/image/phone.png similarity index 100% rename from static/phone.png rename to static/image/phone.png diff --git a/static/wechat.png b/static/image/wechat.png similarity index 100% rename from static/wechat.png rename to static/image/wechat.png diff --git a/static/login-bg.png b/static/login-bg.png deleted file mode 100644 index ec85238..0000000 Binary files a/static/login-bg.png and /dev/null differ diff --git a/styles/common.scss b/styles/common.scss index 59ef01c..1a497b9 100644 --- a/styles/common.scss +++ b/styles/common.scss @@ -1,6 +1,9 @@ button[type=primary] { background-color: #007eff; } +page { + height: 100%; +} .block { padding: 0 24rpx; margin: 20rpx 24rpx;