From 5a88324cabd1c79f8fa025def208981710aa1e44 Mon Sep 17 00:00:00 2001
From: luoye <397379429@qq.com>
Date: Thu, 14 Sep 2017 09:26:47 +0800
Subject: [PATCH] 13bug
---
littleApp_child/pages/CheckReport/CheckReport.js | 9 ++++++
littleApp_child/pages/CheckReport/CheckReport.wxml | 27 ++++++++++++----
littleApp_child/pages/CheckReport/CheckReport.wxss | 7 +++--
.../CompleteTouristInfo/CompleteTouristInfo.js | 30 ++++++++++++------
.../CompleteTouristInfo/CompleteTouristInfo.wxml | 4 +--
littleApp_child/pages/Register/Register.js | 16 ++++++++--
littleApp_child/pages/Register/Register.wxml | 6 ++--
littleApp_child/pages/home/css/AboutPage.wxss | 12 ++++---
littleApp_child/pages/home/css/login.wxss | 20 ++++++++----
littleApp_child/pages/home/home.js | 30 +++++++++++++++---
littleApp_child/pages/home/home.wxml | 35 +++++++++++----------
.../system_notifacations/system_notifacations.js | 9 ++++--
.../system_notifacations/system_notifacations.wxml | 2 +-
littleApp_child/source/test.png | Bin 74687 -> 0 bytes
littleApp_child/source/yuyueyiyuan.png | Bin 0 -> 3329 bytes
15 files changed, 145 insertions(+), 62 deletions(-)
delete mode 100644 littleApp_child/source/test.png
create mode 100644 littleApp_child/source/yuyueyiyuan.png
diff --git a/littleApp_child/pages/CheckReport/CheckReport.js b/littleApp_child/pages/CheckReport/CheckReport.js
index a923462..8d1f291 100644
--- a/littleApp_child/pages/CheckReport/CheckReport.js
+++ b/littleApp_child/pages/CheckReport/CheckReport.js
@@ -84,6 +84,15 @@ Page({
})
}
},
+ toDetailPage(e){
+ if (getApp().globalData.tourist) {
+ return
+ }
+ var index = e.currentTarget.dataset.index
+ wx.navigateTo({
+ url: '../checkTabList/checkTabList?current_index=' + index + '&checkTime=' + this.data.yearText + this.data.monthText + '&patientId=' + this.data.currentPID,
+ })
+ },
// 跳转上一条
toBefore(){
var index = this.data.dateIndex
diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxml b/littleApp_child/pages/CheckReport/CheckReport.wxml
index a11ed6f..93cc66c 100644
--- a/littleApp_child/pages/CheckReport/CheckReport.wxml
+++ b/littleApp_child/pages/CheckReport/CheckReport.wxml
@@ -43,28 +43,29 @@
-
+
-
+
+
-
+
-
+
@@ -79,7 +80,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/littleApp_child/pages/CheckReport/CheckReport.wxss b/littleApp_child/pages/CheckReport/CheckReport.wxss
index a9b19bd..93068a1 100644
--- a/littleApp_child/pages/CheckReport/CheckReport.wxss
+++ b/littleApp_child/pages/CheckReport/CheckReport.wxss
@@ -146,7 +146,7 @@ page {
color: #999;
line-height: 23px;
font-size: 12px;
- width: 100%;
+ width: calc(100% - 15px);
padding-left: 15px;
background: rgb(244, 244, 244);
}
@@ -275,7 +275,7 @@ page {
margin-right: 55px;
min-height: 25px;
margin-top: 5px;
- width: 100%;
+ width: 80%;
}
.check_diagnosis_content_1_line {
@@ -317,8 +317,9 @@ page {
margin-right: 10px;
height: 20px;
padding: 2px 4px 2px 4px;
- display: inline-block;
+ /* display: inline-block; */
margin-top: 2px;
+ float: right;
}
.visitorView {
diff --git a/littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.js b/littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.js
index 371eea0..b5b22a9 100644
--- a/littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.js
+++ b/littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.js
@@ -38,35 +38,45 @@ Page({
this.setData({ birth: e.detail.value})
},
formSubmit: function (e) {
- console.log(e)
+ var self = this
if (this.data.birth == '请选择出生日期') {
this.setData({ showErr: true })
return
}
- if (!e.detail.value.name || e.detail.value.name == ''){
- this.setData({ showErr:true})
- return
- }
+ // if (!e.detail.value.name || e.detail.value.name == ''){
+ // this.setData({ showErr:true})
+ // return
+ // }
this.setData({ showErr: false })
networkUtil.showLoading()
getApp().globalData.token = token
- var param = { 'username': e.detail.value.name, 'birth': this.data.birth}
+ var param = { 'birth': this.data.birth}
networkUtil._put(api.kTourisInfo + userId, param, function (res) {
console.log(res)
- getApp().globalData.token = ''
wx.showModal({
title: '提示',
content: '注册成功，立即登录',
success: function (res) {
if (res.confirm) {
- wx.navigateBack({
- delta: 5
- })
+ self.loginSuccess()
}
}
})
}, function (res) {
networkUtil.showErrorToast(res.errormsg)
})
+ },
+ loginSuccess() {
+ // 游客用户
+ data.patientIds = userId
+ getApp().globalData.tourist = true
+ wx.setStorageSync('tourist', true)
+ wx.setStorageSync('userToken',token)
+ wx.setStorageSync('userId', [userId])
+ getApp().globalData.userId = [userId]
+ getApp().globalData.currentId = userId
+ wx.navigateBack({
+ delta: 5
+ })
}
})
diff --git a/littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.wxml b/littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.wxml
index 651f0d9..5951f63 100644
--- a/littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.wxml
+++ b/littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.wxml
@@ -2,10 +2,10 @@