Commit c1997e4856c5bbb4487a4113313415cab1de3182

Authored by xianghenggang

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

Showing 22 changed files

littleApp_child/app.json View file @ c1997e4
1 1 {
2 2 "pages": [
3   -
4 3  
  4 +
5 5 "pages/home/home",
6 6 "pages/Setting/Setting",
7 7 "pages/PersonalInfo/PersonalInfo",
... ... @@ -13,7 +13,7 @@
13 13 "pages/SearchPage/SearchPage",
14 14 "pages/login/login",
15 15 "pages/inspectionReport/inspectionReport",
16   -
  16 + "pages/CompleteTouristInfo/CompleteTouristInfo",
17 17 "pages/doctor_detail/doctor_detail",
18 18 "pages/doctorList/doctorList",
19 19 "pages/hospital_detail/hospital_detail",
... ... @@ -23,7 +23,7 @@
23 23 "pages/system_notifacations/system_notifacations",
24 24 "pages/vipService/vipService",
25 25 "pages/childcare_knowledge/childcare_knowledge",
26   - "pages/CompleteTouristInfo/CompleteTouristInfo",
  26 +
27 27 "pages/Register/Register"
28 28  
29 29 ],
littleApp_child/pages/CheckReport/CheckReport.js View file @ c1997e4
... ... @@ -84,6 +84,15 @@
84 84 })
85 85 }
86 86 },
  87 + toDetailPage(e){
  88 + if (getApp().globalData.tourist) {
  89 + return
  90 + }
  91 + var index = e.currentTarget.dataset.index
  92 + wx.navigateTo({
  93 + url: '../checkTabList/checkTabList?current_index=' + index + '&checkTime=' + this.data.yearText + this.data.monthText + '&patientId=' + this.data.currentPID,
  94 + })
  95 + },
87 96 // 跳转上一条
88 97 toBefore(){
89 98 var index = this.data.dateIndex
littleApp_child/pages/CheckReport/CheckReport.wxml View file @ c1997e4
... ... @@ -43,28 +43,29 @@
43 43 <view class="report_list_bg">
44 44 <scroll-view class="report_list_scroll" scroll-x="true">
45 45 <view class="report_list_item_bg">
46   - <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=0{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
  46 + <navigator class="report_list_item" bindtap='toDetailPage' data-index='0'>
47 47 <image src="../../source/wenzhenjiancha.png"></image>
48 48 <!-- <view class="greenColor report_list_item_dot"></view> -->
49 49 <label>问诊检查</label>
50 50 </navigator>
51 51 </view>
52 52 <view class="report_list_item_bg">
53   - <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=1{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
  53 + <navigator class="report_list_item" bindtap='toDetailPage' data-index='1'>
  54 + <!-- url="../checkTabList/checkTabList?current_index=1{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}" -->
54 55 <image src="../../source/erkejiancha.png"></image>
55 56 <!-- <view class="greenColor report_list_item_dot"></view> -->
56 57 <label>儿科检查</label>
57 58 </navigator>
58 59 </view>
59 60 <view class="report_list_item_bg">
60   - <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=2{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
  61 + <navigator class="report_list_item" bindtap='toDetailPage' data-index='2'>
61 62 <image src="../../source/yibanjiancha.png"></image>
62 63 <!-- <view class="greenColor report_list_item_dot"></view> -->
63 64 <label>一般检查</label>
64 65 </navigator>
65 66 </view>
66 67 <view class="report_list_item_bg">
67   - <navigator class="report_list_item" url="../checkTabList/checkTabList?current_index=3{{'&checkTime=' + yearText + monthText + '&patientId=' + currentPID}}">
  68 + <navigator class="report_list_item" bindtap='toDetailPage' data-index='3'>
68 69 <image src="../../source/fuzhujiancha.png"></image>
69 70 <!-- <view class="greenColor report_list_item_dot"></view> -->
70 71 <label>辅助检查</label>
... ... @@ -79,7 +80,7 @@
79 80 <label class="docotr_name">{{todayInfo.doctorname ? todayInfo.doctorname : '-'}}</label>
80 81 </view>
81 82 </view>
82   - <view class="check_diagnosis" style="{{isShowOne==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
  83 + <!-- <view class="check_diagnosis" style="{{isShowOne==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
83 84 <view style="display:flex;width:100%" bindtap="isShowMore" data-index="1">
84 85 <label class="check_diagnosis_name">检查诊断</label>
85 86 <image class="icon_more" src="{{isShowOne==false ? '../../source/more_bottom.png': '../../source/more_top.png'}}"></image>
... ... @@ -100,7 +101,21 @@
100 101 <label class="check_diagnosis_content_lines">诊断:{{wzInfo.diagnose}}</label>
101 102 </view>
102 103 </view>
103   - </view>
  104 + </view> -->
  105 + <view class="check_diagnosis" style="{{isShowOne==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
  106 + <view style="display:flex;width:100%" bindtap="isShowMore" data-index="1">
  107 + <label class="check_diagnosis_name">检查诊断</label>
  108 + <image class="icon_more" src="{{isShowOne==false ? '../../source/more_bottom.png': '../../source/more_top.png'}}"></image>
  109 + </view>
  110 + <label wx:if="{{wzInfo.highRisk == 1}}" class="high_risk_bg">高危</label>
  111 + <view class="check_diagnosis_bg">
  112 + <label wx:if="{{!isShowOne}}" class="check_diagnosis_content_1_line">{{wzInfo.diagnose[0]}}</label>
  113 + <view wx:if="{{isShowOne}}" style="display:flex;width:100%">
  114 + <label class="check_diagnosis_content_lines">{{wzInfo.diagnose}}</label>
  115 + </view>
  116 + </view>
  117 + </view>
  118 +
104 119 <view class="check_diagnosis" style="{{isShowTwo==false ? 'background: #ffffff;border: 1px solid #E6E6E6;': 'background: #f9fffa;border: 1px solid #CEE2D5;'}}">
105 120 <view style="display:flex;width:100%" bindtap="isShowMore" data-index="2">
106 121 <label class="check_diagnosis_name">处理意见</label>
littleApp_child/pages/CheckReport/CheckReport.wxss View file @ c1997e4
... ... @@ -146,7 +146,7 @@
146 146 color: #999;
147 147 line-height: 23px;
148 148 font-size: 12px;
149   - width: 100%;
  149 + width: calc(100% - 15px);
150 150 padding-left: 15px;
151 151 background: rgb(244, 244, 244);
152 152 }
... ... @@ -275,7 +275,7 @@
275 275 margin-right: 55px;
276 276 min-height: 25px;
277 277 margin-top: 5px;
278   - width: 100%;
  278 + width: 80%;
279 279 }
280 280  
281 281 .check_diagnosis_content_1_line {
282 282  
... ... @@ -317,8 +317,9 @@
317 317 margin-right: 10px;
318 318 height: 20px;
319 319 padding: 2px 4px 2px 4px;
320   - display: inline-block;
  320 + /* display: inline-block; */
321 321 margin-top: 2px;
  322 + float: right;
322 323 }
323 324  
324 325 .visitorView {
littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.js View file @ c1997e4
... ... @@ -38,7 +38,7 @@
38 38 this.setData({ birth: e.detail.value})
39 39 },
40 40 formSubmit: function (e) {
41   - console.log(e)
  41 + var self = this
42 42 if (this.data.birth == '请选择出生日期') {
43 43 this.setData({ showErr: true })
44 44 return
45 45  
46 46  
47 47  
... ... @@ -50,23 +50,32 @@
50 50 this.setData({ showErr: false })
51 51 networkUtil.showLoading()
52 52 getApp().globalData.token = token
53   - var param = { 'username': e.detail.value.name, 'birth': this.data.birth}
  53 + var param = { 'birth': this.data.birth}
54 54 networkUtil._put(api.kTourisInfo + userId, param, function (res) {
55 55 console.log(res)
56   - getApp().globalData.token = ''
57 56 wx.showModal({
58 57 title: '提示',
59 58 content: '注册成功,立即登录',
60 59 success: function (res) {
61 60 if (res.confirm) {
62   - wx.navigateBack({
63   - delta: 5
64   - })
  61 + self.loginSuccess()
65 62 }
66 63 }
67 64 })
68 65 }, function (res) {
69 66 networkUtil.showErrorToast(res.errormsg)
  67 + })
  68 + },
  69 + loginSuccess() {
  70 + // 游客用户
  71 + getApp().globalData.tourist = true
  72 + wx.setStorageSync('tourist', true)
  73 + wx.setStorageSync('userToken',token)
  74 + wx.setStorageSync('userId', [userId])
  75 + getApp().globalData.userId = [userId]
  76 + getApp().globalData.currentId = userId
  77 + wx.navigateBack({
  78 + delta: 5
70 79 })
71 80 }
72 81 })
littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.wxml View file @ c1997e4
... ... @@ -2,10 +2,10 @@
2 2 <form catchsubmit="formSubmit">
3 3  
4 4 <view class="record-input-constainer whiteColor">
5   - <view class="record-input_bg whiteColor" style="border-color:{{inputFocus.nameInput ? '#48C17B' : '#e8eae5'}};margin-bottom:20px;">
  5 + <!-- <view class="record-input_bg whiteColor" style="border-color:{{inputFocus.nameInput ? '#48C17B' : '#e8eae5'}};margin-bottom:20px;">
6 6 <label class="record_input_title">姓名</label>
7 7 <input class="input" id="name" name="name" maxlength="12" placeholder="请输入建档姓名" value="" placeholder-class="input-placeholder" bindinput="blurNameInput"/>
8   - </view>
  8 + </view> -->
9 9  
10 10 <view class="record-input_bg" style="border-color:{{inputFocus.nameInput ? '#48C17B' : '#e8eae5'}};margin-bottom:20px;">
11 11 <picker class="picker" mode="date" value="{{date}}" start="2016-01-01" end="{{today}}" bindchange="chooseBirth">
littleApp_child/pages/Register/Register.js View file @ c1997e4
... ... @@ -13,7 +13,17 @@
13 13 data: {
14 14 inputFocus: { codeInput: false },
15 15 time: '0s',
  16 + name:'',
  17 + phone:''
16 18 },
  19 + onLoad: function (e) {
  20 + name = e.name
  21 + phone = e.phone
  22 + this.setData({
  23 + name: e.name,
  24 + phone: e.phone
  25 + })
  26 + },
17 27 // 获取验证码
18 28 getVerifyCode: function (e) {
19 29 console.log("name:" + name)
... ... @@ -23,7 +33,7 @@
23 33 }
24 34 if (numberUtil.IsTelPhoneNumber(phone) && name.length > 0) {
25 35 var that = this
26   - networkUtil._post(api.bindDoc, { username: name, phone: phone,'type':2 }, function (res) {
  36 + networkUtil._post(api.bindDoc, { username: name, phone: phone,'type':2}, function (res) {
27 37 console.log("getVerifyCode:", res)
28 38  
29 39 }, function (res) {
... ... @@ -81,7 +91,7 @@
81 91 return
82 92 }
83 93 networkUtil.showLoading()
84   - var param = { code: e.detail.value.code, phone: phone,'type':2 }
  94 + var param = { username: name,code: e.detail.value.code, phone: phone, 'type': 2}
85 95 if (getApp().globalData.openInfo.mpid) {
86 96 param.gzopenid = getApp().globalData.openInfo.mpid
87 97 console.log('绑定mpid', param)
... ... @@ -98,6 +108,8 @@
98 108 })
99 109 },
100 110 loginSuccess(data) {
  111 +
  112 +
101 113  
102 114 wx.navigateTo({
103 115 url: '../CompleteTouristInfo/CompleteTouristInfo?userId=' + data.id + '&token=' + data.token,
littleApp_child/pages/Register/Register.wxml View file @ c1997e4
... ... @@ -4,17 +4,17 @@
4 4 <view class="record-input-constainer whiteColor">
5 5 <view class="record-input_bg whiteColor" style="border-color:{{inputFocus.nameInput ? '#48C17B' : '#e8eae5'}}">
6 6 <label class="record-input_title">姓名</label>
7   - <input class="input" id="name" name="name" maxlength="12" placeholder="请输入建档姓名" value="" placeholder-class="input-placeholder" bindfocus="getNameFocus" bindblur="loseNameFocus" bindinput="blurNameInput"/>
  7 + <input class="input" id="name" name="name" maxlength="12" placeholder="请输入宝宝姓名" value="{{name}}" placeholder-class="input-placeholder" bindfocus="getNameFocus" bindblur="loseNameFocus" bindinput="blurNameInput"/>
8 8 </view>
9 9 <view class="record-input_bg" style="margin-top:15px;border-color:{{inputFocus.phoneInput ? '#48C17B' : '#e8eae5'}}">
10 10 <label class="record-input_title">手机号</label>
11   - <input class="input" id="phone" name="phone" type="number" placeholder="请输入建档手机号" maxlength="11" placeholder-class="input-placeholder" bindfocus="getPhoneFocus" value="" bindblur="losePhoneFocus" bindinput="blurInput" />
  11 + <input class="input" id="phone" name="phone" type="number" placeholder="请输入母亲手机号" maxlength="11" placeholder-class="input-placeholder" bindfocus="getPhoneFocus" value="{{phone}}" bindblur="losePhoneFocus" bindinput="blurInput" />
12 12 </view>
13 13  
14 14 <view class="code_view">
15 15 <view class="code-input_bg" style="margin-top:15px;border-color:{{inputFocus.codeInput ? '#48C17B' : '#e8eae5'}}">
16 16 <label class="record-input_title" >验证码</label>
17   - <input class="input" id="code" name="code" maxlength="12" placeholder="请输入验证码" value="" placeholder-class="input-placeholder" bindblur="loseCodeFocus" bindfocus="getCodeFocus" />
  17 + <input class="code_input" id="code" name="code" maxlength="12" placeholder="请输入验证码" value="" placeholder-class="input-placeholder" bindblur="loseCodeFocus" bindfocus="getCodeFocus" />
18 18 </view>
19 19 <label class="record-time-text" bindtap="getVerifyCode">{{time == '0s' ? '点击获取' : time}}</label>
20 20 </view>
littleApp_child/pages/home/css/AboutPage.wxss View file @ c1997e4
... ... @@ -48,16 +48,18 @@
48 48 background-color: #48C17B;
49 49  
50 50 text-align: center;
51   - position: fixed;
  51 + /* position: fixed; */
52 52 }
53 53  
54 54 .register {
55   - left: 20%;
56   - bottom: 20px;
  55 + margin-left: 20%;
  56 + margin-top: 20px;
  57 + /* bottom: 20px; */
57 58 }
58 59  
59 60 .login {
60   - left: 20%;
61   - bottom: 78px;
  61 + margin-left: 20%;
  62 + margin-top: 20px;
  63 + /* bottom: 78px; */
62 64 }
littleApp_child/pages/home/css/login.wxss View file @ c1997e4
... ... @@ -45,12 +45,20 @@
45 45 }
46 46  
47 47 .input {
48   - /*background-color: red;*/
49   - font-size: 15px;
50   - color: #999999;
51   - margin-left: 10px;
52   - width: 110px;
53   - margin-top: 3px;
  48 + /* background-color: red; */
  49 + font-size: 15px;
  50 + color: #999999;
  51 + margin-left: 10px;
  52 + width: 70%;
  53 + margin-top: 3px;
  54 +}
  55 +
  56 +.code_input {
  57 + font-size: 15px;
  58 + color: #999999;
  59 + margin-left: 10px;
  60 + width: 110px;
  61 + margin-top: 3px;
54 62 }
55 63  
56 64 .record-submit-btn {
littleApp_child/pages/home/home.js View file @ c1997e4
... ... @@ -72,6 +72,13 @@
72 72 })
73 73 }
74 74 },
  75 + onShow: function () {
  76 + // 生命周期函数--监听页面显示
  77 + if (app.globalData.token.length > 0 && this.data.pageType != 2) {
  78 + this.getUserInfo()
  79 + this.homePage()
  80 + }
  81 + },
75 82 onUnload: function () {
76 83 // 移除监听
77 84 event.remove('likeChanged', this);
... ... @@ -105,6 +112,18 @@
105 112 }
106 113 })
107 114 },
  115 + toHospital(){
  116 + if (this.data.userData.hospitalId && this.data.userData.hospitalId > 0){
  117 + wx.navigateTo({
  118 + url: '../hospital_detail/hospital_detail?id=' + this.data.userData.hospitalId,
  119 + })
  120 + } else {
  121 + wx.navigateTo({
  122 + url: '../hospitalList/hospitalList',
  123 + })
  124 + }
  125 +
  126 + },
108 127 getNameFocus:function(){
109 128 var self = this
110 129 var inputFocus = { nameInput: true, phoneInput: false, codeInput: false }
... ... @@ -167,6 +186,9 @@
167 186 },
168 187 toLogin() {
169 188 var that = this
  189 + wx.pageScrollTo({
  190 + scrollTop: 0,
  191 + })
170 192 that.setData({
171 193 pageType: 1
172 194 })
... ... @@ -293,7 +315,7 @@
293 315 }
294 316 if (numberUtil.IsTelPhoneNumber(phone) && name.length>0) {
295 317 var that = this
296   - networkUtil._post(api.bindDoc, { username: name, phone: phone }, function (res) {
  318 + networkUtil._post(api.bindDoc, { username: name, phone: phone}, function (res) {
297 319 console.log("getVerifyCode:", res)
298 320  
299 321 }, function (res) {
300 322  
... ... @@ -305,11 +327,11 @@
305 327 if (res.errorcode == 4003) {
306 328 wx.showModal({
307 329 title: '提示',
308   - content: '您还没有在医院建档,是否立即使用游客身份注册',
  330 + content: '暂未查询到您宝宝的建档信息,是否立即使用游客身份注册?',
309 331 success: function (res) {
310 332 if (res.confirm) {
311 333 wx.navigateTo({
312   - url: '../Register/Register',
  334 + url: '../Register/Register?name=' + name + '&phone=' + phone,
313 335 })
314 336 } else if (res.cancel) {
315 337 console.log('用户点击取消')
... ... @@ -367,7 +389,7 @@
367 389 return
368 390 }
369 391 networkUtil.showLoading()
370   - var param = { code: e.detail.value.code, phone: phone }
  392 + var param = { code: e.detail.value.code, phone: phone}
371 393 if (getApp().globalData.openInfo.mpid) {
372 394 param.gzopenid = getApp().globalData.openInfo.mpid
373 395 console.log('绑定mpid', param)
... ... @@ -395,8 +417,6 @@
395 417 }
396 418 wx.setStorageSync('userToken', data.token)
397 419 wx.setStorageSync('userId', data.patientIds)
398   - wx.setStorageSync('hxName', data.hxName)
399   - wx.setStorageSync('hxPassWord', data.hxPassWord)
400 420 getApp().globalData.token = data.token
401 421 getApp().globalData.userId = data.patientIds
402 422 getApp().globalData.currentId = data.patientIds[0]
littleApp_child/pages/home/home.wxml View file @ c1997e4
... ... @@ -11,12 +11,13 @@
11 11 <!--头像-->
12 12 <image class="avatar" bindtap="tapAvatar" src="{{userData.avatar.medium ? userData.avatar.medium : ''}}" background-size="cover"></image>
13 13 <!--用户名-->
14   - <view class="top_name" wx:if="{{babys.length > 1}}">
  14 + <!-- <view class="top_name" wx:if="{{babys.length > 1}}">
15 15 <view class="userName {{currentBabyIndex == 0 ? 'userName_selected' : ''}}" data-index="0" bindtap="changeBaby">{{userData.username}}</view>
16 16 <view class="top_name_line"></view>
17 17 <view class="userName {{currentBabyIndex == 1 ? 'userName_selected' : ''}}" data-index="1" bindtap="changeBaby">-</view>
18   - </view>
19   - <view class="top_name" wx:if="{{babys.length < 2}}">
  18 + </view> -->
  19 + <!-- wx:if="{{babys.length < 2}}" -->
  20 + <view class="top_name">
20 21 <view class="userName" data-index="0">{{userData.username}}</view>
21 22 </view>
22 23 <view class="tourist_age" wx:if="{{tourist == true}}">月龄:{{userData.monthage ? userData.monthage : '0'}}</view>
... ... @@ -43,6 +44,10 @@
43 44 <view class="hospitalName" wx:if="{{userData.checkhospital && tourist == false}}">{{userData.checkhospital}}</view>
44 45 <!--功能模块-->
45 46 <view class="foundation_BG" style="{{item_big_height}}">
  47 + <navigator class="foundation_item_small" bindtap='toHospital'>
  48 + <image src="../../source/yuyueyiyuan.png" style="{{item_small}}" class="foundation_item_small_image"></image>
  49 + <view class="foundation_item_small_text">妇幼医院</view>
  50 + </navigator>
46 51 <navigator class="foundation_item_small" url="../CheckReport/CheckReport">
47 52 <image src="../../source/jianchajilu.png" style="{{item_small}}" class="foundation_item_small_image"></image>
48 53 <view class="foundation_item_small_text">检查记录</view>
... ... @@ -55,10 +60,6 @@
55 60 <image src="../../source/xiaoxitongzhi.png" style="{{item_small}}" class="foundation_item_small_image"></image>
56 61 <view class="foundation_item_small_text">消息通知</view>
57 62 </navigator>
58   - <navigator class="foundation_item_small" url="../hospitalList/hospitalList">
59   - <image src="../../source/except.png" style="{{item_small}}" class="foundation_item_small_image"></image>
60   - <view class="foundation_item_small_text">妇幼医院</view>
61   - </navigator>
62 63 <!-- <navigator class="foundation_item_small" url="">
63 64 <image src="../../source/except.png" style="{{item_small}}" class="foundation_item_small_image"></image>
64 65 <view class="foundation_item_small_text">设置</view>
... ... @@ -139,8 +140,8 @@
139 140 <view class="we_content">根据儿童生长发育情况,每周提供针对性婴幼儿日常护理、营养饮食、疾病护理等相关信息。</view>
140 141 </view>
141 142 <view >
142   - <view style='height:10px;background-color: rgb(244, 244, 244);'></view>
143   - <block wx:for="{{vipList}}">
  143 + <!-- <view style='height:10px;background-color: rgb(244, 244, 244);'></view> -->
  144 + <!-- <block wx:for="{{vipList}}">
144 145 <view class="vip_intr_bg">
145 146 <view class="vip_intr_titleBar">
146 147 <image class="vip_intr_titleBar_icon" src='../../source/{{item.icon}}.png'></image>
147 148  
... ... @@ -150,12 +151,12 @@
150 151 <view class="vip_intr_content">{{item.content}}</view>
151 152 <view style='height:19px;'></view>
152 153 </view>
153   - </block>
154   - </view>
  154 + </block> -->
  155 + <button class="we_button login" bindtap="toLogin">登录</button>
  156 + <view class="we_button register" bindtap="toRegister">注册</view>
  157 + </view>
155 158  
156   - <button class="we_button login" bindtap="toLogin">登录</button>
157   - <view class="we_button register" bindtap="toRegister">注册</view>
158   - <view style='height:108px;'></view>
  159 + <!-- <view style='height:108px;'></view> -->
159 160 </view>
160 161  
161 162 <!-- 登录 -->
162 163  
163 164  
... ... @@ -166,17 +167,17 @@
166 167 <view class="record-input-constainer whiteColor">
167 168 <view class="record-input_bg whiteColor" style="border-color:{{inputFocus.nameInput ? '#48C17B' : '#e8eae5'}}">
168 169 <label class="record-input_title">姓名</label>
169   - <input class="input" id="name" name="name" maxlength="12" placeholder="请输入建档姓名" value="小向阳" placeholder-class="input-placeholder" bindfocus="getNameFocus" bindblur="loseNameFocus" bindinput="blurNameInput"/>
  170 + <input class="input" id="name" name="name" maxlength="12" placeholder="请输入建档姓名" value="" placeholder-class="input-placeholder" bindfocus="getNameFocus" bindblur="loseNameFocus" bindinput="blurNameInput"/>
170 171 </view>
171 172 <view class="record-input_bg" style="margin-top:15px;border-color:{{inputFocus.phoneInput ? '#48C17B' : '#e8eae5'}}">
172 173 <label class="record-input_title">手机号</label>
173   - <input class="input" id="phone" name="phone" type="number" placeholder="请输入建档手机号" maxlength="11" placeholder-class="input-placeholder" bindfocus="getPhoneFocus" value="18202810912" bindblur="losePhoneFocus" bindinput="blurInput" />
  174 + <input class="input" id="phone" name="phone" type="number" placeholder="请输入建档手机号" maxlength="11" placeholder-class="input-placeholder" bindfocus="getPhoneFocus" value="" bindblur="losePhoneFocus" bindinput="blurInput" />
174 175 </view>
175 176  
176 177 <view class="code_view">
177 178 <view class="code-input_bg" style="margin-top:15px;border-color:{{inputFocus.codeInput ? '#48C17B' : '#e8eae5'}}">
178 179 <label class="record-input_title" >验证码</label>
179   - <input class="input" id="code" name="code" maxlength="12" placeholder="请输入验证码" value="666666" placeholder-class="input-placeholder" bindblur="loseCodeFocus" bindfocus="getCodeFocus" />
  180 + <input class="code_input" id="code" name="code" maxlength="12" placeholder="请输入验证码" value="" placeholder-class="input-placeholder" bindblur="loseCodeFocus" bindfocus="getCodeFocus" />
180 181 </view>
181 182 <label class="record-time-text" bindtap="getVerifyCode">{{time == '0s' ? '点击获取' : time}}</label>
182 183 </view>
littleApp_child/pages/home/home.wxss View file @ c1997e4
... ... @@ -228,7 +228,7 @@
228 228 height: 14px;
229 229 position: absolute;
230 230 right: 15px;
231   - transform: translateY(8px);
  231 + transform: translateY(11px);
232 232 }
233 233 /* 文章ne内容背景 */
234 234 .article_content {
littleApp_child/pages/hospitalList/hospitalList.js View file @ c1997e4
... ... @@ -33,7 +33,11 @@
33 33 /*---------生命周期--------*/
34 34 onLoad: function (options) {
35 35 networkUtil.showLoading()
36   - this.getUserLocation()
  36 + var self = this
  37 + setTimeout(function(){
  38 + self.getUserLocation()
  39 + },1000)
  40 + // this.getUserLocation()
37 41 // this.requestData()
38 42 },
39 43  
littleApp_child/pages/hospital_detail/hospital_detail.wxml View file @ c1997e4
... ... @@ -8,8 +8,8 @@
8 8 <image class="icon_more" src="../../source/gengduo.png" bindtap='showOtherHospital'></image>
9 9 </view>
10 10 <view>
11   - <view class="hospital_introduce1" wx:if="{{!showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction}}</view>
12   - <view class="hospital_introduce_All" wx:if="{{showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction}}</view>
  11 + <view class="hospital_introduce1" wx:if="{{!showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction ? hospital.introduction : '暂无介绍信息'}}</view>
  12 + <view class="hospital_introduce_All" wx:if="{{showAllIntro}}" bindtap='showAllIntroduce'>{{hospital.introduction ? hospital.introduction : '暂无介绍信息'}}</view>
13 13 <!-- <view class="hospital_introduce1" style='position:absolute;bottom:0;right:0;background:#fff'>展开</view> -->
14 14 </view>
15 15  
littleApp_child/pages/login/login.js View file @ c1997e4
... ... @@ -103,8 +103,6 @@
103 103 loginSuccess(data) {
104 104 console.log(data)
105 105 wx.setStorageSync('userToken', data.token)
106   - wx.setStorageSync('hxName', data.hxName)
107   - wx.setStorageSync('hxPassWord', data.hxPassWord)
108 106 getApp().globalData.token = data.token
109 107 // wx.navigateTo({
110 108 // url: '../HasDocumentedVerifySuccess/HasDocumentedVerifySuccess?name=' + name
littleApp_child/pages/system_notifacations/system_notifacations.js View file @ c1997e4
... ... @@ -28,9 +28,7 @@
28 28 current_index: 0,
29 29 hasMore: '',
30 30 noData: true,
31   - isVisitor:true,
32   -
33   -
  31 + isVisitor:false,
34 32 },
35 33 onLoad: function (e) {
36 34 // 数据初始化
... ... @@ -38,6 +36,11 @@
38 36 hasMore = true
39 37 isRefresh = false
40 38 networkUtil.showLoading()
  39 + if (getApp().globalData.tourist) {
  40 + this.setData({
  41 + isVisitor: true,
  42 + })
  43 + }
41 44 this.getTitles();
42 45 },
43 46 onUnload: function () {
littleApp_child/pages/system_notifacations/system_notifacations.wxml View file @ c1997e4
... ... @@ -53,7 +53,7 @@
53 53 </view>
54 54 </view>
55 55  
56   -<view class="backgroundView" style="margin-top:40px" wx:if="{{isVisitor==false && noData == true}}">
  56 +<view class="backgroundView" style="margin-top:40px" wx:if="{{isVisitor == false && noData == true}}">
57 57 <image class="empty_icon" mode="aspectFit" src="../../source/empty.png"></image>
58 58 <view class="empty_text">暂时没有消息通知哦!</view>
59 59 </view>
littleApp_child/pages/vipService/vipService.json View file @ c1997e4
1 1 {
2 2 "navigationBarBackgroundColor": "#48C17B",
3   - "navigationBarTitleText": "VIP服务",
  3 + "navigationBarTitleText": "服务开通介绍",
4 4 "navigationBarTextStyle": "white",
5 5 "backgroundColor": "#d8dbd4"
6 6 }
littleApp_child/pages/vipService/vipService.wxml View file @ c1997e4
... ... @@ -46,5 +46,12 @@
46 46 <view style='height:19px;'></view>
47 47 </view>
48 48 </block>
  49 + <view class="vip_intr_bg" style='margin-top:10px;'>
  50 + <view class="vip_intr_titleBar">
  51 + <view class="vip_intr_titleBar_text" style='margin-left:0px'>服务开通介绍:</view>
  52 + </view>
  53 + <view class="vip_intr_content">在幼儿保健小程序首页中点击进入医院列表,选择距离便捷的医院并前往完成儿童建档后,相关人员可根据您的需求开通相应的幼儿保健服务。</view>
  54 + <view style='height:19px;'></view>
  55 + </view>
49 56 </view>
littleApp_child/source/test.png View file @ c1997e4

72.9 KB

littleApp_child/source/yuyueyiyuan.png View file @ c1997e4

3.25 KB