luoye / littleApp_child

Commit bbc9c360e581211fb7c8f9317e5821fa94200f8a

Authored by xianghenggang about 8 years ago

Exists in master and in 2 other branches

Merge branch 'master' of https://git.healthbaby.com.cn/luoye/littleapp_child

# Conflicts:
#	littleApp_child/pages/articleDetail/articleDetail.wxml

Showing 11 changed files

littleApp_child/app.json
littleApp_child/pages/articleDetail/articleDetail.wxml
littleApp_child/pages/articleDetail/articleDetail.wxss
littleApp_child/pages/home/home.wxml
littleApp_child/source/erkejiancha.png
littleApp_child/source/fuzhujiancha.png
littleApp_child/source/left.png
littleApp_child/source/more_date.png
littleApp_child/source/right.png
littleApp_child/source/wenzhenjiancha.png
littleApp_child/source/yibanjiancha.png

1	1	{
2	2	"pages": [
3		- "pages/articleDetail/articleDetail",
	3	+
4	4
	5	+ "pages/articleDetail/articleDetail",
5	6	"pages/home/home",
6	7
7	8	"pages/articleLists/articleLists",
8	9
...	...	@@ -16,8 +17,8 @@
16	17	"pages/doctorList/doctorList",
17	18	"pages/doctor/doctor",
18	19
19		-
20	20	"pages/hospitalDetail/hospitalDetail",
	21	+
21	22	"pages/chatroom/chatroom",
22	23	"pages/chat/chat",
23	24	"pages/childcare_knowledge_detail/childcare_knowledge_detail",

...	...	@@ -11,8 +11,12 @@
11	11	<text>7月1日</text>
12	12	<view class="circle_year">2017</view>
13	13	</view>
14		- <!--用户名-->
15		- <text class="userName">{{userData.username}}</text>
	14	+ <!--选择器-->
	15	+ <picker>
	16	+ <image class="circle_click" src="../../source/more_date.png"></image>
	17	+ </picker>
	18	+ <image class="icon_left" src="../../source/left.png"></image>
	19	+ <image class="icon_right" src="../../source/right.png"></image>
16	20	<!--下方黑色横条-->
17	21	<view class="infoBar">
18	22	<view class="infoView">
...	...	@@ -34,10 +38,14 @@
34	38	<!--医院名称横条-->
35	39	<view class="hospitalName" wx:if="{{userData.checkhospital}}">{{userData.checkhospital}}</view>
36	40
37		-
38		-
39		-
40		-
41		-
	41	+ <view class="title_banner">检查项目</view>
	42	+ <view class="report_list_bg">
	43	+ <scroll-view class="report_list_scroll" scroll-y="true" bindscrolltolower="myScroll">
	44	+ <view class="report_list_item">
	45	+ <image src="src"></image>
	46	+ </view>
	47	+ </scroll-view>
	48	+ </view>
	49	+ <view class="title_banner">检查结果</view>
42	50	</view>

...	...	@@ -18,17 +18,18 @@
18	18	width:118px;
19	19	height:118px;
20	20	border-radius: 50%;
21		- margin-top: 12px;
	21	+
22	22	margin-left: 50%;
23		- transform: translateX(-50%);
	23	+ transform: translateX(-50%) translateY(12px);
24	24	border: 1px solid #ededed;
25		- box-shadow: 0 2px 4px 0 rgba(186,70,70,0.5);
	25	+
26	26
27	27	display: flex;
28	28	flex-direction: column;
29	29	align-items: center;
30	30	justify-content: flex-start;
31	31	box-sizing: border-box;
	32	+ /* box-shadow: 0 2px 4px 0 rgba(186,70,70,0.5); */
32	33	}
33	34
34	35	.circle_bg image {
35	36
36	37
37	38
...	...	@@ -53,18 +54,31 @@
53	54	margin-top: 0px;
54	55	}
55	56
56		-.userName {
57		- font-size: 14px;
58		- font-weight: bold;
59		- display: block;
60		- top: 100px;
	57	+.circle_click {
	58	+ height: 27px;
	59	+ width: 27px;
	60	+ margin-left: 50%;
	61	+ transform: translateX(28px) translateY(-13px);
	62	+}
	63	+
	64	+.icon_left {
	65	+ height: 22px;
	66	+ width: 22px;
61	67	position: absolute;
62		- /居中/
	68	+ top: 59px;
63	69	left: 50%;
64		- transform: translateX(-50%);
65		- color: white;
	70	+ transform: translateX(-84px);
66	71	}
67	72
	73	+.icon_right {
	74	+ height: 22px;
	75	+ width: 22px;
	76	+ position: absolute;
	77	+ top: 59px;
	78	+ left: 50%;
	79	+ transform: translateX(59px);
	80	+}
	81	+
68	82	/上方信息条部分/
69	83	.lineView {
70	84	width: 100%;
...	...	@@ -84,6 +98,7 @@
84	98	display: flex;
85	99	justify-content: space-between;
86	100	background: rgba(255, 255, 255, 0.2);
	101	+ border-top: 0.5px solid #E5E5E5;
87	102	}
88	103
89	104	.infoView {
...	...	@@ -122,5 +137,32 @@
122	137	font: medium;
123	138	text-align: center;
124	139	line-height: 30px;
	140	+}
	141	+
	142	+.title_banner {
	143	+ height: 23px;
	144	+ width: 100%;
	145	+ color: #999;
	146	+ line-height: 23px;
	147	+ font-size: 12px;
	148	+ margin-left: 15px;
	149	+}
	150	+
	151	+.report_list_bg {
	152	+ height: 97px;
	153	+ width: 100%;
	154	+ background: white;
	155	+}
	156	+
	157	+.report_list_scroll {
	158	+ height: 100%;
	159	+ width: 100%;
	160	+ background: yellowgreen;
	161	+}
	162	+
	163	+.report_list_item {
	164	+ background: red;
	165	+ width: 25%;
	166	+ height: 100%;
125	167	}

...	...	@@ -130,11 +130,11 @@
130	130	<view class="record-input-constainer whiteColor">
131	131	<view class="record-input_bg whiteColor" style="border-color:{{inputFocus.nameInput ? '#f4879b' : '#e8eae5'}}">
132	132	<label class="record-input_title">姓名</label>
133		- <input class="input" id="name" name="name" maxlength="12" placeholder="请输入建档姓名" value="小向阳" placeholder-class="input-placeholder" bindfocus="getFocus" bindblur="blurNameInput"/>
	133	+ <input class="input" id="name" name="name" maxlength="12" placeholder="请输入建档姓名" value="" placeholder-class="input-placeholder" bindfocus="getFocus" bindblur="blurNameInput"/>
134	134	</view>
135	135	<view class="record-input_bg" style="margin-top:15px;border-color:{{inputFocus.phoneInput ? '#f4879b' : '#e8eae5'}}">
136	136	<label class="record-input_title">手机号</label>
137		- <input class="input" id="phone" name="phone" type="number" placeholder="请输入建档手机号" maxlength="11" placeholder-class="input-placeholder" bindfocus="getFocus" value="18202810912" bindblur="blurInput" />
	137	+ <input class="input" id="phone" name="phone" type="number" placeholder="请输入建档手机号" maxlength="11" placeholder-class="input-placeholder" bindfocus="getFocus" value="" bindblur="blurInput" />
138	138	</view>
139	139
140	140	<view class="code_view">

3.75 KB

3.26 KB

725 Bytes

1.35 KB

699 Bytes

3.02 KB

3.61 KB