luoye / littleApp_child

Download as
Browse Code »

Commit 3647e847669771b4f67512f439744e60f6457760

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

修改膳食

Showing 4 changed files with 393 additions and 22 deletions

littleApp_child/packageA/pages/editAddress/editAddress.js View file @ 3647e84
... ... @@ -85,14 +85,12 @@
85 85 babyAddress:res.data.object.babyAddress
86 86 })
87 87 }
88   - console.log('str',str);
89 88 hhh.addEntry=arr
90 89 hhh.details=str
91 90 self.setData({
92 91 currentAddress: hhh
93 92 })
94 93 }
95   - console.log('res',res);
96 94 }
97 95 }, function(res) {
98 96 networkUtil.showErrorToast(res.errormsg)
... ... @@ -152,8 +150,6 @@
152 150 data.babyStreetId = this.data.currentAddress.addEntry[3].id;
153 151 }
154 152 data.babyAddress = this.data.babyAddress;
155   - console.log('data',data);
156   - console.log('data1',this.data.currentAddress);
157 153 networkUtil._get(api.editAddress,data, function(res) {
158 154 if(0 == res.data.errorcode){
159 155 wx.showModal({
littleApp_child/pages/diet/measuret.js View file @ 3647e84
... ... @@ -186,7 +186,218 @@
186 186 foodList1:[],
187 187 foodList2:[],
188 188 foodList3:[],
189   - foodList4:[],
  189 + foodList4:[
  190 + {
  191 + type: "3",
  192 + id: "22",
  193 + add: 0,
  194 + love: 0,
  195 + },
  196 + {
  197 + type: "1",
  198 + id: "23",
  199 + add: 0,
  200 + love: 0,
  201 + },
  202 + {
  203 + type: "8",
  204 + id: "24",
  205 + add: 0,
  206 + love: 0,
  207 + },
  208 + {
  209 + type: "2",
  210 + id: "25",
  211 + add: 0,
  212 + love: 0,
  213 + },
  214 + {
  215 + type: "5",
  216 + id: "26",
  217 + add: 0,
  218 + love: 0,
  219 + },
  220 + {
  221 + type: "5",
  222 + id: "27",
  223 + add: 0,
  224 + love: 0,
  225 + },
  226 + {
  227 + type: "6",
  228 + id: "28",
  229 + add: 0,
  230 + love: 0,
  231 + }
  232 + ],
  233 + foodList5:[
  234 + {
  235 + type: "3",
  236 + id: "29",
  237 + add: 0,
  238 + love: 0,
  239 + },
  240 + {
  241 + type: "3",
  242 + id: "30",
  243 + add: 0,
  244 + love: 0,
  245 + },
  246 + {
  247 + type: "3",
  248 + id: "31",
  249 + add: 0,
  250 + love: 0,
  251 + },
  252 + {
  253 + type: "1",
  254 + id: "32",
  255 + add: 0,
  256 + love: 0,
  257 + },
  258 + {
  259 + type: "8",
  260 + id: "33",
  261 + add: 0,
  262 + love: 0,
  263 + },
  264 + {
  265 + type: "2",
  266 + id: "34",
  267 + add: 0,
  268 + love: 0,
  269 + },
  270 + {
  271 + type: "5",
  272 + id: "35",
  273 + add: 0,
  274 + love: 0,
  275 + },
  276 + {
  277 + type: "4",
  278 + id: "36",
  279 + add: 0,
  280 + love: 0,
  281 + },
  282 + {
  283 + type: "6",
  284 + id: "37",
  285 + add: 0,
  286 + love: 0,
  287 + }
  288 + ],
  289 + foodList6:[
  290 + {
  291 + type: "3",
  292 + id: "38",
  293 + add: 0,
  294 + love: 0,
  295 + },
  296 + {
  297 + type: "3",
  298 + id: "39",
  299 + add: 0,
  300 + love: 0,
  301 + },
  302 + {
  303 + type: "3",
  304 + id: "40",
  305 + add: 0,
  306 + love: 0,
  307 + },
  308 + {
  309 + type: "1",
  310 + id: "41",
  311 + add: 0,
  312 + love: 0,
  313 + },
  314 + {
  315 + type: "8",
  316 + id: "42",
  317 + add: 0,
  318 + love: 0,
  319 + },
  320 + {
  321 + type: "2",
  322 + id: "43",
  323 + add: 0,
  324 + love: 0,
  325 + },
  326 + {
  327 + type: "5",
  328 + id: "44",
  329 + add: 0,
  330 + love: 0,
  331 + },
  332 + {
  333 + type: "4",
  334 + id: "45",
  335 + add: 0,
  336 + love: 0,
  337 + },
  338 + {
  339 + type: "6",
  340 + id: "46",
  341 + add: 0,
  342 + love: 0,
  343 + }
  344 + ],
  345 + foodList7:[
  346 + {
  347 + type: "3",
  348 + id: "47",
  349 + add: 0,
  350 + love: 0,
  351 + },
  352 + {
  353 + type: "3",
  354 + id: "48",
  355 + add: 0,
  356 + love: 0,
  357 + },
  358 + {
  359 + type: "3",
  360 + id: "49",
  361 + add: 0,
  362 + love: 0,
  363 + },
  364 + {
  365 + type: "1",
  366 + id: "50",
  367 + add: 0,
  368 + love: 0,
  369 + },
  370 + {
  371 + type: "8",
  372 + id: "51",
  373 + add: 0,
  374 + love: 0,
  375 + },
  376 + {
  377 + type: "2",
  378 + id: "52",
  379 + add: 0,
  380 + love: 0,
  381 + },
  382 + {
  383 + type: "5",
  384 + id: "53",
  385 + add: 0,
  386 + love: 0,
  387 + },
  388 + {
  389 + type: "4",
  390 + id: "54",
  391 + add: 0,
  392 + love: 0,
  393 + },
  394 + {
  395 + type: "6",
  396 + id: "55",
  397 + add: 0,
  398 + love: 0,
  399 + }
  400 + ],
190 401 foodListNames1:[
191 402 "铁强化米粉",
192 403 "蔬菜泥",
193 404  
194 405  
... ... @@ -215,10 +426,33 @@
215 426 "豆腐"
216 427 ],
217 428 foodListNames4:[
  429 + "稠粥、烂面条", "蔬菜碎", "水果碎", "蛋黄碎", "肉碎", "肝泥", "豆腐"
  430 + ],
  431 + foodListNames5:[
218 432 "稠粥、烂面条",
219   - "蔬菜碎",
220   - "水果碎"
  433 + "软馒头片",
  434 + "粗粮薯类",
  435 + "蔬菜丁",
  436 + "水果粒",
  437 + "全蛋",
  438 + "肉丁",
  439 + "鱼虾类",
  440 + "豆制品"
221 441 ],
  442 + foodListNames6:[
  443 + "稠粥、烂面条",
  444 + "软馒头片",
  445 + "粗粮薯类",
  446 + "蔬菜丁",
  447 + "水果粒",
  448 + "全蛋",
  449 + "肉丁",
  450 + "鱼虾类",
  451 + "豆制品"
  452 + ],
  453 + foodListNames7:[
  454 + "软米饭", "面食", "粗粮薯类", "蔬菜", "水果", "全蛋", "肉类", "鱼虾类", "豆制品"
  455 + ],
222 456 hospitalId: "",
223 457 toDay:"",
224 458 pid:"",
... ... @@ -231,7 +465,7 @@
231 465 const Names = this.data.foodListNames;
232 466 const items = this.data.foodList;
233 467 const values = e.detail.value;
234   - // console.log('哈哈哈',values);
  468 + //
235 469 for (let i = 0, lenI = items.length; i < lenI; ++i) {
236 470 items[i].add = 0;
237 471 items[i].love = 0;
... ... @@ -260,7 +494,6 @@
260 494 const Names = this.data.foodListNames1;
261 495 const items = this.data.foodList1;
262 496 const values = e.detail.value;
263   - console.log('哈哈哈',values);
264 497 for (let i = 0, lenI = items.length; i < lenI; ++i) {
265 498 items[i].add = 0;
266 499 items[i].love = 0;
... ... @@ -284,7 +517,7 @@
284 517 const Names = this.data.foodListNames2;
285 518 const items = this.data.foodList2;
286 519 const values = e.detail.value;
287   - console.log('哈哈哈',values);
  520 +
288 521 for (let i = 0, lenI = items.length; i < lenI; ++i) {
289 522 items[i].add = 0;
290 523 items[i].love = 0;
... ... @@ -308,7 +541,7 @@
308 541 const Names = this.data.foodListNames3;
309 542 const items = this.data.foodList3;
310 543 const values = e.detail.value;
311   - console.log('哈哈哈',values);
  544 +
312 545 for (let i = 0, lenI = items.length; i < lenI; ++i) {
313 546 items[i].add = 0;
314 547 items[i].love = 0;
... ... @@ -332,7 +565,7 @@
332 565 const Names = this.data.foodListNames4;
333 566 const items = this.data.foodList4;
334 567 const values = e.detail.value;
335   - console.log('哈哈哈',values);
  568 +
336 569 for (let i = 0, lenI = items.length; i < lenI; ++i) {
337 570 items[i].add = 0;
338 571 items[i].love = 0;
339 572  
340 573  
341 574  
... ... @@ -352,18 +585,94 @@
352 585 foodList4:items
353 586 })
354 587 },
  588 + foodClick7(e) {
  589 + const Names = this.data.foodListNames7;
  590 + const items = this.data.foodList7;
  591 + const values = e.detail.value;
  592 +
  593 + for (let i = 0, lenI = items.length; i < lenI; ++i) {
  594 + items[i].add = 0;
  595 + items[i].love = 0;
  596 +
  597 + for (let j = 0, lenJ = values.length; j < lenJ; ++j) {
  598 + if (Names[i]+'1' === values[j]) {
  599 + items[i].add = 1;
  600 + }else if (Names[i]+'2' === values[j]) {
  601 + items[i].love = 1;
  602 + }
  603 + }
  604 + if(items[i].add === 0){
  605 + items[i].love = 0;
  606 + }
  607 + }
  608 + this.setData({
  609 + foodList7:items
  610 + })
  611 + },
  612 + foodClick5(e) {
  613 + const Names = this.data.foodListNames5;
  614 + const items = this.data.foodList5;
  615 + const values = e.detail.value;
  616 +
  617 + for (let i = 0, lenI = items.length; i < lenI; ++i) {
  618 + items[i].add = 0;
  619 + items[i].love = 0;
  620 +
  621 + for (let j = 0, lenJ = values.length; j < lenJ; ++j) {
  622 + if (Names[i]+'1' === values[j]) {
  623 + items[i].add = 1;
  624 + }else if (Names[i]+'2' === values[j]) {
  625 + items[i].love = 1;
  626 + }
  627 + }
  628 + if(items[i].add === 0){
  629 + items[i].love = 0;
  630 + }
  631 + }
  632 + this.setData({
  633 + foodList5:items
  634 + })
  635 + },
  636 + foodClick6(e) {
  637 + const Names = this.data.foodListNames6;
  638 + const items = this.data.foodList6;
  639 + const values = e.detail.value;
  640 +
  641 + for (let i = 0, lenI = items.length; i < lenI; ++i) {
  642 + items[i].add = 0;
  643 + items[i].love = 0;
  644 +
  645 + for (let j = 0, lenJ = values.length; j < lenJ; ++j) {
  646 + if (Names[i]+'1' === values[j]) {
  647 + items[i].add = 1;
  648 + }else if (Names[i]+'2' === values[j]) {
  649 + items[i].love = 1;
  650 + }
  651 + }
  652 + if(items[i].add === 0){
  653 + items[i].love = 0;
  654 + }
  655 + }
  656 + this.setData({
  657 + foodList6:items
  658 + })
  659 + },
355 660 saveFoodlist(){
356 661 var that = this;
357 662 let listss=that.data.foodList
358   - if(that.data.hospitalId==666668&&(that.data.yl<5||that.data.yl>23)){
  663 + if(that.data.hospitalId==666668&&that.data.yl<6){
359 664 networkUtil.showErrorToast('孩子目前还未到六月龄')
360 665 return
361 666 }
  667 + if(that.data.hospitalId==666668&&that.data.yl>12){
  668 + networkUtil.showErrorToast('孩子已超过十二月龄')
  669 + return
  670 + }
362 671 this.setData({
363 672 show : true
364 673 })
365 674 if(that.data.hospitalId==666668){
366   - listss=[...that.data.foodList1,...that.data.foodList2,...that.data.foodList3,...that.data.foodList4]
  675 + listss=[...that.data.foodList1,...that.data.foodList2,...that.data.foodList3,...that.data.foodList4,...that.data.foodList5,...that.data.foodList6,...that.data.foodList7]
367 676 }
368 677 networkUtil._post(api.setFootList,{
369 678 hospitalId:this.data.hospitalId,
... ... @@ -408,7 +717,6 @@
408 717 data.forEach(item => {
409 718 item.createTime = exchgeDate.getYearMD(item.createTime )
410 719 });
411   - console.log(data)
412 720 let ss=[]
413 721 if(res.data.data.length>0){
414 722 ss=res.data.data
415 723  
... ... @@ -416,10 +724,12 @@
416 724 item.diets1=item.diets.slice(0,6)
417 725 item.diets2=item.diets.slice(6,14)
418 726 item.diets3=item.diets.slice(14,21)
419   - item.diets4=item.diets.slice(21,24)
  727 + item.diets4=item.diets.slice(21,28)
  728 + item.diets5=item.diets.slice(28,37)
  729 + item.diets6=item.diets.slice(37,46)
  730 + item.diets7=item.diets.slice(46)
420 731 })
421 732 }
422   - console.log('sss',ss);
423 733 this.setData({
424 734 array: res.data.data
425 735 })
426 736  
427 737  
... ... @@ -451,17 +761,14 @@
451 761 var list1=this.data.foodList.slice(0,6)
452 762 var list2=this.data.foodList.slice(6,14)
453 763 var list3=this.data.foodList.slice(14,21)
454   - var list4=this.data.foodList.slice(21,24)
455 764 this.setData({
456 765 foodList1:list1,
457 766 foodList2:list2,
458   - foodList3:list3,
459   - foodList4:list4
  767 + foodList3:list3
460 768 })
461 769 if(app.globalData.userInfo.hospitalId==666668){
462 770 if(app.globalData.userInfo.monthage.includes("月")){
463 771 let yl=this.getLeadingNumbers(app.globalData.userInfo.monthage)
464   - console.log('月龄',yl);
465 772 this.setData({
466 773 yl:yl
467 774 })
littleApp_child/pages/diet/measuret.wxml View file @ 3647e84
... ... @@ -67,6 +67,39 @@
67 67 <view class="section__title">{{foodListNames4[$index]}}</view>
68 68 </view>
69 69 </checkbox-group>
  70 + <view style="color: #fff;">1</view>
  71 + <view style="font-size: 26rpx;">十月龄膳食调查</view>
  72 + <checkbox-group bindchange="foodClick5">
  73 + <view class="section section_gap" wx:for="{{foodList5}}" wx:for-index="$index" wx:for-item="item">
  74 + <view class="body-view">
  75 + <checkbox type="checkbox" value="{{foodListNames5[$index]}}1" checked="{{item.add}}" color="#68bcfa" />
  76 + <checkbox type="checkbox" value="{{foodListNames5[$index]}}2" disabled = "{{item.add == 0}}" checked="{{item.love}}" color="#ed7d31" />
  77 + </view>
  78 + <view class="section__title">{{foodListNames5[$index]}}</view>
  79 + </view>
  80 + </checkbox-group>
  81 + <view style="color: #fff;">1</view>
  82 + <view style="font-size: 26rpx;">十一月龄膳食调查</view>
  83 + <checkbox-group bindchange="foodClick6">
  84 + <view class="section section_gap" wx:for="{{foodList6}}" wx:for-index="$index" wx:for-item="item">
  85 + <view class="body-view">
  86 + <checkbox type="checkbox" value="{{foodListNames6[$index]}}1" checked="{{item.add}}" color="#68bcfa" />
  87 + <checkbox type="checkbox" value="{{foodListNames6[$index]}}2" disabled = "{{item.add == 0}}" checked="{{item.love}}" color="#ed7d31" />
  88 + </view>
  89 + <view class="section__title">{{foodListNames6[$index]}}</view>
  90 + </view>
  91 + </checkbox-group>
  92 + <view style="color: #fff;">1</view>
  93 + <view style="font-size: 26rpx;">十二月龄膳食调查</view>
  94 + <checkbox-group bindchange="foodClick7">
  95 + <view class="section section_gap" wx:for="{{foodList7}}" wx:for-index="$index" wx:for-item="item">
  96 + <view class="body-view">
  97 + <checkbox type="checkbox" value="{{foodListNames7[$index]}}1" checked="{{item.add}}" color="#68bcfa" />
  98 + <checkbox type="checkbox" value="{{foodListNames7[$index]}}2" disabled = "{{item.add == 0}}" checked="{{item.love}}" color="#ed7d31" />
  99 + </view>
  100 + <view class="section__title">{{foodListNames7[$index]}}</view>
  101 + </view>
  102 + </checkbox-group>
70 103 </view>
71 104 </view>
72 105 <view style="clear:both"></view>
... ... @@ -113,6 +146,33 @@
113 146 <checkbox type="checkbox" checked="{{item.love}}" color="#ed7d31" />
114 147 </view>
115 148 <view class="section__title">{{foodListNames4[$index]}}</view>
  149 + </view>
  150 + <view style="color: #fff;"> 1</view>
  151 + <view style="font-size: 26rpx;">十月龄膳食调查</view>
  152 + <view class="section section_gap" wx:for="{{item.diets5}}" wx:for-index="$index" wx:for-item="item">
  153 + <view class="body-view">
  154 + <checkbox type="checkbox" checked="{{item.add}}" color="#68bcfa" />
  155 + <checkbox type="checkbox" checked="{{item.love}}" color="#ed7d31" />
  156 + </view>
  157 + <view class="section__title">{{foodListNames5[$index]}}</view>
  158 + </view>
  159 + <view style="color: #fff;"> 1</view>
  160 + <view style="font-size: 26rpx;">十一月龄膳食调查</view>
  161 + <view class="section section_gap" wx:for="{{item.diets6}}" wx:for-index="$index" wx:for-item="item">
  162 + <view class="body-view">
  163 + <checkbox type="checkbox" checked="{{item.add}}" color="#68bcfa" />
  164 + <checkbox type="checkbox" checked="{{item.love}}" color="#ed7d31" />
  165 + </view>
  166 + <view class="section__title">{{foodListNames6[$index]}}</view>
  167 + </view>
  168 + <view style="color: #fff;"> 1</view>
  169 + <view style="font-size: 26rpx;">十二月龄膳食调查</view>
  170 + <view class="section section_gap" wx:for="{{item.diets7}}" wx:for-index="$index" wx:for-item="item">
  171 + <view class="body-view">
  172 + <checkbox type="checkbox" checked="{{item.add}}" color="#68bcfa" />
  173 + <checkbox type="checkbox" checked="{{item.love}}" color="#ed7d31" />
  174 + </view>
  175 + <view class="section__title">{{foodListNames7[$index]}}</view>
116 176 </view>
117 177 </view>
118 178 <view style="clear:both"></view>
littleApp_child/pages/feedback/feedback.js View file @ 3647e84
... ... @@ -104,7 +104,15 @@
104 104 }
105 105 networkUtil._post(api.addfeedback, params, function (res) {
106 106 if(res.data.errorcode==0){
107   - networkUtil.showErrorToast('提交成功')
  107 + wx.showModal({
  108 + title: '提示',
  109 + content: '提交成功',
  110 + showCancel: false,
  111 + success: function (res) {
  112 + wx.navigateBack()
  113 + }
  114 + })
  115 +
108 116 // console.log('res',res);
109 117 }
110 118 }, function (res) {