Commit 911856e41ae959b44176f188a677a69384491959

Authored by wangjialin
1 parent aa32aa7cb5
Exists in dev_wjl and in 1 other branch dev-wrh

修改

Showing 11 changed files with 94 additions and 21 deletions

littleApp_child/app.json View file @ 911856e
... ... @@ -55,7 +55,8 @@
55 55 "pages/articleList/articleList",
56 56 "pages/article/article",
57 57 "pages/preDocumented/preDocumented",
58   - "pages/serviceNotice/serviceNotice"
  58 + "pages/serviceNotice/serviceNotice",
  59 + "pages/eatAddress/eatAddress"
59 60 ]
60 61 }
61 62 ],
littleApp_child/packageA/pages/eatAddress/eatAddress.js View file @ 911856e
  1 +// packageA/pages/eatAddress/eatAddress.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 +
  9 + },
  10 +
  11 + /**
  12 + * 生命周期函数--监听页面加载
  13 + */
  14 + onLoad(options) {
  15 +
  16 + },
  17 +
  18 + /**
  19 + * 生命周期函数--监听页面初次渲染完成
  20 + */
  21 + onReady() {
  22 +
  23 + },
  24 +
  25 + /**
  26 + * 生命周期函数--监听页面显示
  27 + */
  28 + onShow() {
  29 +
  30 + },
  31 +
  32 + /**
  33 + * 生命周期函数--监听页面隐藏
  34 + */
  35 + onHide() {
  36 +
  37 + },
  38 +
  39 + /**
  40 + * 生命周期函数--监听页面卸载
  41 + */
  42 + onUnload() {
  43 +
  44 + },
  45 +
  46 + /**
  47 + * 页面相关事件处理函数--监听用户下拉动作
  48 + */
  49 + onPullDownRefresh() {
  50 +
  51 + },
  52 +
  53 + /**
  54 + * 页面上拉触底事件的处理函数
  55 + */
  56 + onReachBottom() {
  57 +
  58 + },
  59 +
  60 + /**
  61 + * 用户点击右上角分享
  62 + */
  63 + onShareAppMessage() {
  64 +
  65 + }
  66 +})
littleApp_child/packageA/pages/eatAddress/eatAddress.json View file @ 911856e
  1 +{
  2 + "navigationBarTitleText": "膳食通知",
  3 + "navigationBarBackgroundColor": "#48C17B",
  4 + "navigationBarTextStyle": "white",
  5 + "backgroundColor": "#d8dbd4",
  6 + "pageOrientation": "auto",
  7 + "usingComponents": {}
  8 +}
littleApp_child/packageA/pages/eatAddress/eatAddress.wxml View file @ 911856e
  1 +<!--packageA/pages/eatAddress/eatAddress.wxml-->
  2 +<text>packageA/pages/eatAddress/eatAddress.wxml</text>
littleApp_child/packageA/pages/eatAddress/eatAddress.wxss View file @ 911856e
  1 +/* packageA/pages/eatAddress/eatAddress.wxss */
littleApp_child/packageA/pages/preDocumented/preDocumented.js View file @ 911856e
... ... @@ -489,7 +489,7 @@
489 489 if (0===res.data.errorcode) {
490 490 wx.showModal({
491 491 title: '成功提交',
492   - content: "您已成功预约建档",
  492 + content: "您的建档信息已提交,请尽快前往我院建档中心进行档案审核,审核通过后请使用档案信息登录,为避免错过重要医疗信息,审核通过后请使用档案信息登录小程序并持续关注美生孕育公众号。",
493 493 showCancel: false,
494 494 submiting:false,
495 495 success: function (res){
... ... @@ -503,7 +503,7 @@
503 503 } else {
504 504 wx.showModal({
505 505 title: '提交失败',
506   - content: '错误信息:'+res.data.errormsg,
  506 + content: '错误信息:'+res.errormsg,
507 507 showCancel: false,
508 508 success: function (res) {
509 509 }
... ... @@ -512,7 +512,7 @@
512 512 }, function (res) {
513 513 wx.showModal({
514 514 title: '提交失败',
515   - content: '错误信息:'+res.data.errormsg,
  515 + content: '错误信息:'+res.errormsg,
516 516 showCancel: false,
517 517 success: function (res) {
518 518 }
littleApp_child/pages/feedback/feedback.js View file @ 911856e
... ... @@ -74,23 +74,16 @@
74 74 },
75 75 submit: function () {
76 76 if (this.data.content.length==0){
77   - wx.showToast({
78   - title: '请填写意见或建议',
79   - })
  77 + networkUtil.showErrorToast('请填写意见或建议')
80 78 return
81 79 }
82 80 if (this.data.chooseOne == 0 && this.data.chooseTwo == 0 && this.data.chooseThree == 0 ){
83   - wx.showToast({
84   - title: '选择反馈类型',
85   - })
  81 + networkUtil.showErrorToast('选择反馈类型')
86 82 return
87 83 }
88 84 console.log(this.data.content)
89   - wx.showToast({
90   - title: '提交成功',
91   - })
  85 + networkUtil.showErrorToast('提交成功')
92 86 wx.navigateBack({
93   -
94 87 })
95 88 }
96 89 })
littleApp_child/pages/home/home.js View file @ 911856e
... ... @@ -83,7 +83,8 @@
83 83 riskGuide: false,
84 84 riskBase: false,
85 85 //是否开通疾病指导
86   - riskDise:false
  86 + riskDise:false,
  87 + yc:0
87 88 },
88 89 /*---------生命周期--------*/
89 90 onLoad: function(options) {
... ... @@ -302,6 +303,7 @@
302 303 this.setUserInfo(babyCache[index])
303 304 this.setArtInfo(artCache[index])
304 305 this.getUserArchives();
  306 + this.getUserInfo()
305 307 } else {
306 308 this.getUserInfo()
307 309 }
littleApp_child/pages/home/home.wxml View file @ 911856e
... ... @@ -105,7 +105,7 @@
105 105 <image src="../../source/icon_consult@2x.png" style="{{item_small}}" class="foundation_item_small_image"></image>
106 106 <view class="foundation_item_small_text">专家咨询</view>
107 107 </navigator>
108   - <navigator class="foundation_item_small" bind:tap="goGraph">
  108 + <navigator class="foundation_item_small" bind:tap="goGraph" wx:if="{{yc==1}}">
109 109 <image src="../../source/graph.jpg" style="{{item_small}}" class="foundation_item_small_image"></image>
110 110 <view class="foundation_item_small_text">身高体重曲线</view>
111 111 </navigator>
112 112  
... ... @@ -113,14 +113,14 @@
113 113 <image src="../../source/jianchajilu.png" style="{{item_small}}" class="foundation_item_small_image"></image>
114 114 <view class="foundation_item_small_text">补填户籍地址</view>
115 115 </navigator>
116   - <navigator class="foundation_item_small" bind:tap="goArticle">
  116 + <navigator class="foundation_item_small" bind:tap="goArticle" wx:if="{{yc==1}}">
117 117 <image src="../../source/jianchajilu.png" style="{{item_small}}" class="foundation_item_small_image"></image>
118 118 <view class="foundation_item_small_text">中医指导文章</view>
119 119 </navigator>
120 120 <navigator class="foundation_item_small" bind:tap="goServiceNotice">
121 121 <image src="../../source/jianchajilu.png" style="{{item_small}}" class="foundation_item_small_image"></image>
122 122 <view class="foundation_item_small_text">服务名目通知</view>
123   - </navigator>
  123 + </navigator>
124 124 </view>
125 125  
126 126 <!--文章列表-->
littleApp_child/utils/WebIMConfig.js View file @ 911856e
... ... @@ -27,8 +27,8 @@
27 27 /*
28 28 * Application AppKey
29 29 */
30   - // appkey: '1123170414115195#mommybaby',//测试版
31   - appkey: '1123170414115195#mommybabyfinalversion',//正式版
  30 + appkey: '1123170414115195#mommybaby',//测试版
  31 + // appkey: '1123170414115195#mommybabyfinalversion',//正式版
32 32 // appkey: "easemob-demo#chatdemoui",
33 33 /*
34 34 * Whether to use HTTPS '1177161227178308#xcx'
littleApp_child/utils/network_util.js View file @ 911856e
... ... @@ -4,7 +4,7 @@
4 4 // 18382670036 多层次
5 5 // 18328537371 陈云 666666
6 6 // 0测试环境 1正式环境 2演示环境 3衡水
7   -var Builing_Release_AppStore = 1;
  7 +var Builing_Release_AppStore = 0;
8 8 // 获取服务器地址
9 9 function kServerBaseUrl() {
10 10 switch (Builing_Release_AppStore) {