diff --git a/api/user.js b/api/user.js index 6979ae8..088ddf5 100644 --- a/api/user.js +++ b/api/user.js @@ -12,7 +12,11 @@ return fetch.post(LOGIN, params).then(res => res); } -export function getUserType(code) { +/** + * 获取到用户类型 + * @param {*} + */ +export function getUserType() { useNetWork(); return fetch.get(UserType).then(res => res); } \ No newline at end of file diff --git a/api/user.js b/api/user.js index 6979ae8..088ddf5 100644 --- a/api/user.js +++ b/api/user.js @@ -12,7 +12,11 @@ return fetch.post(LOGIN, params).then(res => res); } -export function getUserType(code) { +/** + * 获取到用户类型 + * @param {*} + */ +export function getUserType() { useNetWork(); return fetch.get(UserType).then(res => res); } \ No newline at end of file diff --git a/pages.json b/pages.json index b97c7d7..b4cf49b 100644 --- a/pages.json +++ b/pages.json @@ -26,7 +26,8 @@ "style" : { "navigationBarTitleText": "注册", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { diff --git a/api/user.js b/api/user.js index 6979ae8..088ddf5 100644 --- a/api/user.js +++ b/api/user.js @@ -12,7 +12,11 @@ return fetch.post(LOGIN, params).then(res => res); } -export function getUserType(code) { +/** + * 获取到用户类型 + * @param {*} + */ +export function getUserType() { useNetWork(); return fetch.get(UserType).then(res => res); } \ No newline at end of file diff --git a/pages.json b/pages.json index b97c7d7..b4cf49b 100644 --- a/pages.json +++ b/pages.json @@ -26,7 +26,8 @@ "style" : { "navigationBarTitleText": "注册", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { diff --git a/pages/information/information.vue b/pages/information/information.vue index 9031fe3..4d8c265 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -56,6 +56,7 @@ :formatter="formatter" :minDate="minTime" @cancel="closeTime" + @change="change" @confirm="confirmTime" > @@ -118,8 +119,11 @@ this.callerInfo.endTime = this.shijianc(this.callerInfo.endTime) }, methods:{ + change(e){ + console.log(e) + }, //点击提交访客记录 - async submit(){ + submit(){ console.log(this.callerInfo) if(this.isForm){ this.isForm = false diff --git a/api/user.js b/api/user.js index 6979ae8..088ddf5 100644 --- a/api/user.js +++ b/api/user.js @@ -12,7 +12,11 @@ return fetch.post(LOGIN, params).then(res => res); } -export function getUserType(code) { +/** + * 获取到用户类型 + * @param {*} + */ +export function getUserType() { useNetWork(); return fetch.get(UserType).then(res => res); } \ No newline at end of file diff --git a/pages.json b/pages.json index b97c7d7..b4cf49b 100644 --- a/pages.json +++ b/pages.json @@ -26,7 +26,8 @@ "style" : { "navigationBarTitleText": "注册", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { diff --git a/pages/information/information.vue b/pages/information/information.vue index 9031fe3..4d8c265 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -56,6 +56,7 @@ :formatter="formatter" :minDate="minTime" @cancel="closeTime" + @change="change" @confirm="confirmTime" > @@ -118,8 +119,11 @@ this.callerInfo.endTime = this.shijianc(this.callerInfo.endTime) }, methods:{ + change(e){ + console.log(e) + }, //点击提交访客记录 - async submit(){ + submit(){ console.log(this.callerInfo) if(this.isForm){ this.isForm = false diff --git a/pages/register/register.vue b/pages/register/register.vue index a8640f1..e402705 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -1,300 +1,416 @@ -/** -* 注册页面 -*/ +/** * 注册页面 */ - .popup-buttom view { - width: 180rpx; - height: 56rpx; - text-align: center; - line-height: 56rpx; - border-radius: 6rpx; - border: 1px #000 solid; - } - - .popup-all-title { - text-align: center; - font-size: 42rpx; - margin-top: 142rpx; - } - } - } - /deep/.uicon-arrow-right{ - position: absolute !important; - right: 10rpx; - bottom: 0; - } + diff --git a/api/user.js b/api/user.js index 6979ae8..088ddf5 100644 --- a/api/user.js +++ b/api/user.js @@ -12,7 +12,11 @@ return fetch.post(LOGIN, params).then(res => res); } -export function getUserType(code) { +/** + * 获取到用户类型 + * @param {*} + */ +export function getUserType() { useNetWork(); return fetch.get(UserType).then(res => res); } \ No newline at end of file diff --git a/pages.json b/pages.json index b97c7d7..b4cf49b 100644 --- a/pages.json +++ b/pages.json @@ -26,7 +26,8 @@ "style" : { "navigationBarTitleText": "注册", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { diff --git a/pages/information/information.vue b/pages/information/information.vue index 9031fe3..4d8c265 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -56,6 +56,7 @@ :formatter="formatter" :minDate="minTime" @cancel="closeTime" + @change="change" @confirm="confirmTime" > @@ -118,8 +119,11 @@ this.callerInfo.endTime = this.shijianc(this.callerInfo.endTime) }, methods:{ + change(e){ + console.log(e) + }, //点击提交访客记录 - async submit(){ + submit(){ console.log(this.callerInfo) if(this.isForm){ this.isForm = false diff --git a/pages/register/register.vue b/pages/register/register.vue index a8640f1..e402705 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -1,300 +1,416 @@ -/** -* 注册页面 -*/ +/** * 注册页面 */ - .popup-buttom view { - width: 180rpx; - height: 56rpx; - text-align: center; - line-height: 56rpx; - border-radius: 6rpx; - border: 1px #000 solid; - } - - .popup-all-title { - text-align: center; - font-size: 42rpx; - margin-top: 142rpx; - } - } - } - /deep/.uicon-arrow-right{ - position: absolute !important; - right: 10rpx; - bottom: 0; - } + diff --git a/static/back.png b/static/back.png new file mode 100644 index 0000000..af33831 --- /dev/null +++ b/static/back.png Binary files differ diff --git a/api/user.js b/api/user.js index 6979ae8..088ddf5 100644 --- a/api/user.js +++ b/api/user.js @@ -12,7 +12,11 @@ return fetch.post(LOGIN, params).then(res => res); } -export function getUserType(code) { +/** + * 获取到用户类型 + * @param {*} + */ +export function getUserType() { useNetWork(); return fetch.get(UserType).then(res => res); } \ No newline at end of file diff --git a/pages.json b/pages.json index b97c7d7..b4cf49b 100644 --- a/pages.json +++ b/pages.json @@ -26,7 +26,8 @@ "style" : { "navigationBarTitleText": "注册", - "enablePullDownRefresh": false + "enablePullDownRefresh": false, + "navigationStyle": "custom" } }, { diff --git a/pages/information/information.vue b/pages/information/information.vue index 9031fe3..4d8c265 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -56,6 +56,7 @@ :formatter="formatter" :minDate="minTime" @cancel="closeTime" + @change="change" @confirm="confirmTime" > @@ -118,8 +119,11 @@ this.callerInfo.endTime = this.shijianc(this.callerInfo.endTime) }, methods:{ + change(e){ + console.log(e) + }, //点击提交访客记录 - async submit(){ + submit(){ console.log(this.callerInfo) if(this.isForm){ this.isForm = false diff --git a/pages/register/register.vue b/pages/register/register.vue index a8640f1..e402705 100644 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -1,300 +1,416 @@ -/** -* 注册页面 -*/ +/** * 注册页面 */ - .popup-buttom view { - width: 180rpx; - height: 56rpx; - text-align: center; - line-height: 56rpx; - border-radius: 6rpx; - border: 1px #000 solid; - } - - .popup-all-title { - text-align: center; - font-size: 42rpx; - margin-top: 142rpx; - } - } - } - /deep/.uicon-arrow-right{ - position: absolute !important; - right: 10rpx; - bottom: 0; - } + diff --git a/static/back.png b/static/back.png new file mode 100644 index 0000000..af33831 --- /dev/null +++ b/static/back.png Binary files differ diff --git a/static/logo.png b/static/logo.png deleted file mode 100644 index b5771e2..0000000 --- a/static/logo.png +++ /dev/null Binary files differ