miniprogram / yunchanproject · 提交

转到一个项目

作者 lihongjuan
提交 5113773de1b3a3a6f178f73e917ba165e96b003f 1 个父辈 40518978

1

内嵌 并排对比
正在显示 20 个修改的文件 包含 501 行增加 和 145 行删除
@@ -84,26 +84,25 @@ App({ @@ -84,26 +84,25 @@ App({
84 // showCancel: false 84 // showCancel: false
85 // }) 85 // })
86 } else if (res.data.code == '0') { 86 } else if (res.data.code == '0') {
  87 + console.log(res)
87 console.log(888) 88 console.log(888)
88 - // wx.showModal({  
89 - // title: '提示',  
90 - // content: res.data.msg,  
91 - // showCancel: false  
92 - // })  
93 - // reject(res.data) 89 + if (res.data.msg =='缺少必要参数：TOKEN'){
94 wx.showToast({ 90 wx.showToast({
95 title: '请重新登陆', 91 title: '请重新登陆',
96 icon: 'none' 92 icon: 'none'
97 }) 93 })
98 wx.setStorageSync("token", '') 94 wx.setStorageSync("token", '')
  95 +
99 setTimeout(function(){ 96 setTimeout(function(){
100 - console.log(8483489) 97 + wx.navigateTo({
  98 + url: '/pages/index/index',
  99 + })
101 },1500) 100 },1500)
102 - // setTimeout(function(){  
103 - // wx.navigateTo({  
104 - // url: '/pages/index/index',  
105 - // })  
106 - // },1500) 101 + }
  102 +
  103 +
  104 +
  105 + reject(res)
107 106
108 107
109 } else { 108 } else {
1 { 1 {
2 "pages": [ 2 "pages": [
3 "pages/homepage/homepage", 3 "pages/homepage/homepage",
  4 + "pages/home/stageofpregnancy/stageofpregnancy",
  5 +
4 "pages/index/index", 6 "pages/index/index",
5 7
6 8
7 - "pages/home/stageofpregnancy/stageofpregnancy", 9 +
8 10
9 11
10 12
@@ -89,14 +91,14 @@ @@ -89,14 +91,14 @@
89 }, 91 },
90 { 92 {
91 "pagePath": "pages/partner/partner", 93 "pagePath": "pages/partner/partner",
92 - "text": "微商城", 94 + "text": "严选商城",
93 "selectedColor": "#FC7E65", 95 "selectedColor": "#FC7E65",
94 "iconPath": "img/nav03@2x.png", 96 "iconPath": "img/nav03@2x.png",
95 "selectedIconPath": "img/nav04@2x.png" 97 "selectedIconPath": "img/nav04@2x.png"
96 }, 98 },
97 { 99 {
98 "pagePath": "pages/knowledge/knowledge", 100 "pagePath": "pages/knowledge/knowledge",
99 - "text": "知识库", 101 + "text": "专家问答",
100 "selectedColor": "#FC7E65", 102 "selectedColor": "#FC7E65",
101 "iconPath": "img/nav05@2x.png", 103 "iconPath": "img/nav05@2x.png",
102 "selectedIconPath": "img/nav06@2x.png" 104 "selectedIconPath": "img/nav06@2x.png"
@@ -90,3 +90,13 @@ @@ -90,3 +90,13 @@
90 right:0; 90 right:0;
91 margin:0 auto 91 margin:0 auto
92 } 92 }
  93 +.register {
  94 + width: 100%;
  95 + height: 100%;
  96 + background-color: rgba(0, 0, 0, 0.6);
  97 + position: fixed;
  98 + top: 0;
  99 + left: 0;
  100 + right: 0;
  101 + z-index: 5;
  102 +}
@@ -8,7 +8,8 @@ Page({ @@ -8,7 +8,8 @@ Page({
8 */ 8 */
9 data: { 9 data: {
10 maternityid: '', 10 maternityid: '',
11 - detailCon: '' 11 + detailCon: '',
  12 + explain_pic:''
12 }, 13 },
13 /** 14 /**
14 * 生命周期函数--监听页面加载 15 * 生命周期函数--监听页面加载
@@ -31,7 +32,8 @@ Page({ @@ -31,7 +32,8 @@ Page({
31 app.post(url, params).then((res) => { 32 app.post(url, params).then((res) => {
32 console.log(res) 33 console.log(res)
33 that.setData({ 34 that.setData({
34 - detailCon: res.list 35 + detailCon: res.list,
  36 + explain_pic: res.list.content_imgs
35 }) 37 })
36 }).catch((errMsg) => {}) 38 }).catch((errMsg) => {})
37 }, 39 },
@@ -42,6 +44,25 @@ Page({ @@ -42,6 +44,25 @@ Page({
42 }) 44 })
43 }, 45 },
44 46
  47 + seepic(e) {
  48 + console.log(e)
  49 + let that = this;
  50 + let url = e.currentTarget.dataset.url;
  51 + let index = e.currentTarget.dataset.index
  52 + wx.previewImage({
  53 + current: that.data.explain_pic[index],
  54 + urls: that.data.explain_pic,
  55 + success: function (res) { },
  56 + fail: function (res) { },
  57 + complete: function (res) { },
  58 + })
  59 + // console.log(url)
  60 + // this.setData({
  61 + // bigpic:url,
  62 + // showpic:true
  63 + // })
  64 + },
  65 +
45 /** 66 /**
46 * 生命周期函数--监听页面初次渲染完成 67 * 生命周期函数--监听页面初次渲染完成
47 */ 68 */
@@ -37,3 +37,15 @@ @@ -37,3 +37,15 @@
37 <text>可预约时段</text> 37 <text>可预约时段</text>
38 </view> 38 </view>
39 <view class='detail_date'>{{detailCon.free_time}}</view> 39 <view class='detail_date'>{{detailCon.free_time}}</view>
  40 +
  41 + <view wx:if='{{explain_pic!=null}}'>
  42 + <view class="use useessays">
  43 + <view class="doctor_name">个人相册</view>
  44 + </view>
  45 + <!-- 建档流程图-->
  46 + <view class="dangimg">
  47 + <view class="dangimgitem" wx:for="{{explain_pic}}" wx:key="" bindtap="seepic" data-url="{{item}}" data-index="{{index}}">
  48 + <image src="{{item}}"></image>
  49 + </view>
  50 + </view>
  51 + </view>
1 /* pages/cityWide/matronDetail/matronDetail.wxss */ 1 /* pages/cityWide/matronDetail/matronDetail.wxss */
  2 +@import '../../home/hometail/hometail.wxss';
2 .detail_head{ 3 .detail_head{
3 padding-top: 60rpx; 4 padding-top: 60rpx;
4 padding-bottom: 32rpx; 5 padding-bottom: 32rpx;
@@ -18,28 +18,28 @@ Page({ @@ -18,28 +18,28 @@ Page({
18 duration: 1000, 18 duration: 1000,
19 currentSwiper: 0, 19 currentSwiper: 0,
20 //图文编辑大图片和小图片 20 //图文编辑大图片和小图片
21 - edit_img:[ 21 + edit_img: [
22 'http://pi4orwnti.bkt.clouddn.com/editbig@2x.png', 22 'http://pi4orwnti.bkt.clouddn.com/editbig@2x.png',
23 'http://pi4orwnti.bkt.clouddn.com/editbig@2x.png', 23 'http://pi4orwnti.bkt.clouddn.com/editbig@2x.png',
24 'http://pi4orwnti.bkt.clouddn.com/editbig@2x.png', 24 'http://pi4orwnti.bkt.clouddn.com/editbig@2x.png',
25 ], 25 ],
26 - status:1,  
27 - page:1,  
28 - num:5,  
29 - buildlist:[], 26 + status: 1,
  27 + page: 1,
  28 + num: 5,
  29 + buildlist: [],
30 30
31 - keyword:'',  
32 - archives_id:'', 31 + keyword: '',
  32 + archives_id: '',
33 //是否收藏 33 //是否收藏
34 - if_collect:'', 34 + if_collect: '',
35 //是否点赞 35 //是否点赞
36 - if_touch:'',  
37 - isfirst:true,  
38 - hospital_address_id:'', 36 + if_touch: '',
  37 + isfirst: true,
  38 + hospital_address_id: '',
39 }, 39 },
40 - onLoad: function (options) { 40 + onLoad: function(options) {
41 console.log(options) 41 console.log(options)
42 - let that=this; 42 + let that = this;
43 that.getbanner(); 43 that.getbanner();
44 44
45 that.setData({ 45 that.setData({
@@ -57,17 +57,17 @@ Page({ @@ -57,17 +57,17 @@ Page({
57 }, 57 },
58 58
59 viewImg(e) { 59 viewImg(e) {
60 - let that=this; 60 + let that = this;
61 console.log(e) 61 console.log(e)
62 let index = e.currentTarget.dataset.index; 62 let index = e.currentTarget.dataset.index;
63 let archives_id = that.data.archives_id; 63 let archives_id = that.data.archives_id;
64 let paridx = e.currentTarget.dataset.paridx 64 let paridx = e.currentTarget.dataset.paridx
65 console.log(paridx) 65 console.log(paridx)
66 console.log(that.data.buildlist) 66 console.log(that.data.buildlist)
67 - let img=[];  
68 - for (var i=0;i<that.data.buildlist.length;i++){ 67 + let img = [];
  68 + for (var i = 0; i < that.data.buildlist.length; i++) {
69 69
70 - if (i==paridx){ 70 + if (i == paridx) {
71 console.log(9090) 71 console.log(9090)
72 img = that.data.buildlist[i].content_imgs; 72 img = that.data.buildlist[i].content_imgs;
73 73
@@ -78,15 +78,15 @@ Page({ @@ -78,15 +78,15 @@ Page({
78 wx.previewImage({ 78 wx.previewImage({
79 current: img[index], 79 current: img[index],
80 urls: img, 80 urls: img,
81 - success: function (res) { },  
82 - fail: function (res) { },  
83 - complete: function (res) { }, 81 + success: function(res) {},
  82 + fail: function(res) {},
  83 + complete: function(res) {},
84 }) 84 })
85 }, 85 },
86 86
87 - enter(e){  
88 - let that=this;  
89 - let url=e.currentTarget.dataset.url; 87 + enter(e) {
  88 + let that = this;
  89 + let url = e.currentTarget.dataset.url;
90 console.log(e.currentTarget.dataset.id); 90 console.log(e.currentTarget.dataset.id);
91 91
92 wx.navigateTo({ 92 wx.navigateTo({
@@ -101,20 +101,20 @@ Page({ @@ -101,20 +101,20 @@ Page({
101 101
102 }, 102 },
103 103
104 - enterurl(){ 104 + enterurl() {
105 wx.navigateTo({ 105 wx.navigateTo({
106 url: '../../processQuery/processQuery', 106 url: '../../processQuery/processQuery',
107 }) 107 })
108 }, 108 },
109 - swiperChange: function (e) { 109 + swiperChange: function(e) {
110 this.setData({ 110 this.setData({
111 currentSwiper: e.detail.current 111 currentSwiper: e.detail.current
112 }) 112 })
113 }, 113 },
114 114
115 //获取banner图 115 //获取banner图
116 - getbanner:function(){  
117 - let that=this; 116 + getbanner: function() {
  117 + let that = this;
118 var url = '/api/portal/archives/getBanner'; 118 var url = '/api/portal/archives/getBanner';
119 var params = { 119 var params = {
120 120
@@ -124,7 +124,7 @@ Page({ @@ -124,7 +124,7 @@ Page({
124 124
125 125
126 that.setData({ 126 that.setData({
127 - imgUrls:res[0].items 127 + imgUrls: res[0].items
128 }) 128 })
129 129
130 }).catch((err) => { 130 }).catch((err) => {
@@ -132,22 +132,24 @@ Page({ @@ -132,22 +132,24 @@ Page({
132 }) 132 })
133 }, 133 },
134 //搜索 134 //搜索
135 - search:function(e){  
136 - let that=this; 135 + search: function(e) {
  136 + let that = this;
137 that.setData({ 137 that.setData({
138 - keyword:e.detail.value 138 + keyword: e.detail.value
139 }) 139 })
140 140
141 - if(e.detail.value==""||e.detail.value==null){ 141 + if (e.detail.value == "" || e.detail.value == null) {
142 that.searchlist() 142 that.searchlist()
143 } 143 }
144 }, 144 },
145 - searchlist:function(){  
146 - var that=this; 145 +
  146 +
  147 + searchlist: function() {
  148 + var that = this;
147 // that.getlist() 149 // that.getlist()
148 that.setData({ 150 that.setData({
149 - page:1,  
150 - buildlist:[] 151 + page: 1,
  152 + buildlist: []
151 }) 153 })
152 154
153 155
@@ -221,55 +223,136 @@ Page({ @@ -221,55 +223,136 @@ Page({
221 }).catch((err) => { 223 }).catch((err) => {
222 224
223 }) 225 })
224 -}, 226 + },
  227 +
  228 + finish(e) {
  229 + var that = this;
  230 + // that.getlist()
  231 + that.setData({
  232 + page: 1,
  233 + buildlist: []
  234 + })
  235 +
  236 +
  237 +
  238 + var url = '/api/portal/archives/archivesList';
  239 + var params = {
  240 + token: wx.getStorageSync('token'),
  241 + page: that.data.page,
  242 + num: that.data.num,
  243 + status: that.data.status,
  244 + keyword: that.data.keyword,
  245 + hospital_address_id: that.data.hospital_address_id
  246 + }
  247 + app.post(url, params).then((res) => {
  248 +
  249 + console.log(res)
  250 + console.log(that.data.buildlist)
  251 + if (res == "") {
  252 + that.setData({
  253 +
  254 + buildlist: []
  255 +
  256 +
  257 + })
  258 + } else {
  259 + that.setData({
  260 +
  261 + buildlist: res
  262 +
  263 +
  264 + })
  265 + }
  266 +
  267 +
  268 + let newbuildlist = that.data.buildlist;
  269 +
  270 +
  271 +
  272 + for (var i = 0; i < newbuildlist.length; i++) {
  273 +
  274 + newbuildlist[i].showword = true
  275 +
  276 + if (newbuildlist[i].content_text.length > 80) {
  277 + console.log(1)
  278 + newbuildlist[i].openword = true
  279 + newbuildlist[i].content_text = newbuildlist[i].content_text.substring(0, 80);
  280 + } else {
  281 + console.log(2)
  282 + newbuildlist[i].openword = false
  283 + }
  284 +
  285 + if (newbuildlist[i].content_imgs == null) {
  286 + console.log(3)
  287 + newbuildlist[i].content_imgs = []
  288 + } else {
  289 + newbuildlist[i].content_imgs = newbuildlist[i].content_imgs.slice(0, 3);
  290 + }
  291 +
  292 + }
  293 +
  294 +
  295 +
  296 + that.setData({
  297 + buildlist: that.data.buildlist.concat(newbuildlist)
  298 + })
  299 + console.log(that.data.buildlist)
  300 +
  301 +
  302 +
  303 +
  304 + }).catch((err) => {
  305 +
  306 + })
  307 + },
225 //最新 最热 308 //最新 最热
226 - new:function(){ 309 + new: function() {
227 this.setData({ 310 this.setData({
228 - page:1, 311 + page: 1,
229 status: 1, 312 status: 1,
230 - buildlist:[] 313 + buildlist: []
231 }) 314 })
232 this.getlist() 315 this.getlist()
233 }, 316 },
234 - hot:function(){ 317 + hot: function() {
235 this.setData({ 318 this.setData({
236 page: 1, 319 page: 1,
237 status: 2, 320 status: 2,
238 - buildlist:[] 321 + buildlist: []
239 }) 322 })
240 this.getlist() 323 this.getlist()
241 }, 324 },
242 //获取列表 325 //获取列表
243 - getlist(){  
244 - let that=this; 326 + getlist() {
  327 + let that = this;
245 328
246 329
247 var url = '/api/portal/archives/archivesList'; 330 var url = '/api/portal/archives/archivesList';
248 var params = { 331 var params = {
249 token: wx.getStorageSync('token'), 332 token: wx.getStorageSync('token'),
250 - page:that.data.page,  
251 - num:that.data.num,  
252 - status:that.data.status,  
253 - keyword:that.data.keyword, 333 + page: that.data.page,
  334 + num: that.data.num,
  335 + status: that.data.status,
  336 + keyword: that.data.keyword,
254 hospital_address_id: that.data.hospital_address_id 337 hospital_address_id: that.data.hospital_address_id
255 } 338 }
256 app.post(url, params).then((res) => { 339 app.post(url, params).then((res) => {
257 340
258 console.log(res) 341 console.log(res)
259 console.log(that.data.buildlist) 342 console.log(that.data.buildlist)
260 - if(res==""){ 343 + if (res == "") {
261 that.setData({ 344 that.setData({
262 345
263 buildlist: that.data.buildlist 346 buildlist: that.data.buildlist
264 347
265 348
266 }) 349 })
267 - }else{ 350 + } else {
268 351
269 let newbuildlist = res; 352 let newbuildlist = res;
270 console.log(newbuildlist) 353 console.log(newbuildlist)
271 354
272 - for (var i = 0; i <newbuildlist.length; i++) { 355 + for (var i = 0; i < newbuildlist.length; i++) {
273 356
274 newbuildlist[i].showword = true 357 newbuildlist[i].showword = true
275 358
@@ -277,15 +360,15 @@ Page({ @@ -277,15 +360,15 @@ Page({
277 console.log(1) 360 console.log(1)
278 newbuildlist[i].openword = true 361 newbuildlist[i].openword = true
279 newbuildlist[i].content_text = newbuildlist[i].content_text.substring(0, 80); 362 newbuildlist[i].content_text = newbuildlist[i].content_text.substring(0, 80);
280 - }else{ 363 + } else {
281 console.log(2) 364 console.log(2)
282 newbuildlist[i].openword = false 365 newbuildlist[i].openword = false
283 } 366 }
284 367
285 - if (newbuildlist[i].content_imgs==null){ 368 + if (newbuildlist[i].content_imgs == null) {
286 console.log(3) 369 console.log(3)
287 newbuildlist[i].content_imgs = [] 370 newbuildlist[i].content_imgs = []
288 - } else{ 371 + } else {
289 newbuildlist[i].content_imgs = newbuildlist[i].content_imgs.slice(0, 3); 372 newbuildlist[i].content_imgs = newbuildlist[i].content_imgs.slice(0, 3);
290 } 373 }
291 374
@@ -321,34 +404,34 @@ Page({ @@ -321,34 +404,34 @@ Page({
321 404
322 405
323 //收藏 406 //收藏
324 - collect:function(e){  
325 - let that=this; 407 + collect: function(e) {
  408 + let that = this;
326 that.setData({ 409 that.setData({
327 archives_id: e.currentTarget.dataset.id 410 archives_id: e.currentTarget.dataset.id
328 }) 411 })
329 - var collect_id=that.data.archives_id; 412 + var collect_id = that.data.archives_id;
330 413
331 - var list=that.data.buildlist;  
332 - for(var i=0;i<list.length; i++){  
333 - if(collect_id==list[i].archives_id){  
334 - var collect=list[i].if_collect;  
335 - if(collect==0){  
336 - list[i].if_collect=1;  
337 - }else if(collect==1){  
338 - list[i].if_collect=0 414 + var list = that.data.buildlist;
  415 + for (var i = 0; i < list.length; i++) {
  416 + if (collect_id == list[i].archives_id) {
  417 + var collect = list[i].if_collect;
  418 + if (collect == 0) {
  419 + list[i].if_collect = 1;
  420 + } else if (collect == 1) {
  421 + list[i].if_collect = 0
339 } 422 }
340 } 423 }
341 424
342 } 425 }
343 that.setData({ 426 that.setData({
344 - buildlist:list 427 + buildlist: list
345 }) 428 })
346 429
347 //调取收藏的接口 430 //调取收藏的接口
348 var url = '/api/portal/archives/doCollect'; 431 var url = '/api/portal/archives/doCollect';
349 var params = { 432 var params = {
350 token: wx.getStorageSync('token'), 433 token: wx.getStorageSync('token'),
351 - archives_id:that.data.archives_id 434 + archives_id: that.data.archives_id
352 } 435 }
353 app.post(url, params).then((res) => { 436 app.post(url, params).then((res) => {
354 console.log(res); 437 console.log(res);
@@ -360,36 +443,36 @@ Page({ @@ -360,36 +443,36 @@ Page({
360 443
361 }, 444 },
362 //点赞 445 //点赞
363 - touchstar:function(e){  
364 - let that=this; 446 + touchstar: function(e) {
  447 + let that = this;
365 that.setData({ 448 that.setData({
366 archives_id: e.currentTarget.dataset.id 449 archives_id: e.currentTarget.dataset.id
367 }) 450 })
368 - var collect_id=that.data.archives_id; 451 + var collect_id = that.data.archives_id;
369 452
370 - var list=that.data.buildlist;  
371 - for(var i=0;i<list.length; i++){  
372 - if(collect_id==list[i].archives_id){  
373 - var touchstar=list[i].if_touch;  
374 - if(touchstar==0){  
375 - list[i].if_touch=1;  
376 - list[i].touch_num = list[i].touch_num+1  
377 - }else if(touchstar==1){  
378 - list[i].if_touch=0;  
379 - list[i].touch_num = list[i].touch_num-1; 453 + var list = that.data.buildlist;
  454 + for (var i = 0; i < list.length; i++) {
  455 + if (collect_id == list[i].archives_id) {
  456 + var touchstar = list[i].if_touch;
  457 + if (touchstar == 0) {
  458 + list[i].if_touch = 1;
  459 + list[i].touch_num = list[i].touch_num + 1
  460 + } else if (touchstar == 1) {
  461 + list[i].if_touch = 0;
  462 + list[i].touch_num = list[i].touch_num - 1;
380 } 463 }
381 } 464 }
382 465
383 } 466 }
384 that.setData({ 467 that.setData({
385 - buildlist:list 468 + buildlist: list
386 }) 469 })
387 470
388 //调取点赞的接口 471 //调取点赞的接口
389 var url = '/api/portal/archives/doTouch'; 472 var url = '/api/portal/archives/doTouch';
390 var params = { 473 var params = {
391 token: wx.getStorageSync('token'), 474 token: wx.getStorageSync('token'),
392 - archives_id:that.data.archives_id 475 + archives_id: that.data.archives_id
393 } 476 }
394 app.post(url, params).then((res) => { 477 app.post(url, params).then((res) => {
395 console.log(res); 478 console.log(res);
@@ -413,18 +496,18 @@ Page({ @@ -413,18 +496,18 @@ Page({
413 496
414 497
415 //展开收起 498 //展开收起
416 - operaword(e){ 499 + operaword(e) {
417 let that = this; 500 let that = this;
418 501
419 let archives_id = e.currentTarget.dataset.archives_id; 502 let archives_id = e.currentTarget.dataset.archives_id;
420 console.log(archives_id) 503 console.log(archives_id)
421 - let showword=e.currentTarget.dataset.showword; 504 + let showword = e.currentTarget.dataset.showword;
422 console.log(showword) 505 console.log(showword)
423 - if(showword==true){ 506 + if (showword == true) {
424 console.log(9090) 507 console.log(9090)
425 that.setData({ 508 that.setData({
426 - page:1,  
427 - num:50 509 + page: 1,
  510 + num: 50
428 }) 511 })
429 512
430 var url = '/api/portal/archives/archivesList'; 513 var url = '/api/portal/archives/archivesList';
@@ -445,7 +528,7 @@ Page({ @@ -445,7 +528,7 @@ Page({
445 528
446 for (var obj of newbuildlist) { 529 for (var obj of newbuildlist) {
447 console.log(obj.archives_id); 530 console.log(obj.archives_id);
448 - obj.showword =true; 531 + obj.showword = true;
449 532
450 if (obj.content_text.length > 80) { 533 if (obj.content_text.length > 80) {
451 obj.openword = true 534 obj.openword = true
@@ -462,9 +545,9 @@ Page({ @@ -462,9 +545,9 @@ Page({
462 console.log(obj.showword) 545 console.log(obj.showword)
463 obj.showword = false; 546 obj.showword = false;
464 obj.ccontent_text = obj.ccontent_text; 547 obj.ccontent_text = obj.ccontent_text;
465 - if (obj.content_imgs==null){  
466 - obj.content_imgs=[]  
467 - } else if (obj.content_imgs.length>3){ 548 + if (obj.content_imgs == null) {
  549 + obj.content_imgs = []
  550 + } else if (obj.content_imgs.length > 3) {
468 obj.content_imgs = obj.content_imgs.slice(0, 3); 551 obj.content_imgs = obj.content_imgs.slice(0, 3);
469 } 552 }
470 553
@@ -477,7 +560,7 @@ Page({ @@ -477,7 +560,7 @@ Page({
477 // } 560 // }
478 561
479 562
480 - }else{ 563 + } else {
481 obj.content_text = obj.content_text.substring(0, 80); 564 obj.content_text = obj.content_text.substring(0, 80);
482 565
483 if (obj.content_imgs == null) { 566 if (obj.content_imgs == null) {
@@ -510,7 +593,7 @@ Page({ @@ -510,7 +593,7 @@ Page({
510 }).catch((err) => { 593 }).catch((err) => {
511 594
512 }) 595 })
513 - }else{ 596 + } else {
514 597
515 let newbuildlist = that.data.buildlist; 598 let newbuildlist = that.data.buildlist;
516 console.log(newbuildlist) 599 console.log(newbuildlist)
@@ -557,14 +640,14 @@ Page({ @@ -557,14 +640,14 @@ Page({
557 /** 640 /**
558 * 生命周期函数--监听页面初次渲染完成 641 * 生命周期函数--监听页面初次渲染完成
559 */ 642 */
560 - onReady: function () { 643 + onReady: function() {
561 644
562 }, 645 },
563 646
564 /** 647 /**
565 * 生命周期函数--监听页面显示 648 * 生命周期函数--监听页面显示
566 */ 649 */
567 - onShow: function () { 650 + onShow: function() {
568 // this.setData({ 651 // this.setData({
569 // buildlist:[], 652 // buildlist:[],
570 // page:1 653 // page:1
@@ -575,30 +658,30 @@ Page({ @@ -575,30 +658,30 @@ Page({
575 /** 658 /**
576 * 生命周期函数--监听页面隐藏 659 * 生命周期函数--监听页面隐藏
577 */ 660 */
578 - onHide: function () { 661 + onHide: function() {
579 662
580 }, 663 },
581 664
582 /** 665 /**
583 * 生命周期函数--监听页面卸载 666 * 生命周期函数--监听页面卸载
584 */ 667 */
585 - onUnload: function () { 668 + onUnload: function() {
586 669
587 }, 670 },
588 671
589 /** 672 /**
590 * 页面相关事件处理函数--监听用户下拉动作 673 * 页面相关事件处理函数--监听用户下拉动作
591 */ 674 */
592 - onPullDownRefresh: function () { 675 + onPullDownRefresh: function() {
593 676
594 }, 677 },
595 678
596 /** 679 /**
597 * 页面上拉触底事件的处理函数 680 * 页面上拉触底事件的处理函数
598 */ 681 */
599 - onReachBottom: function () { 682 + onReachBottom: function() {
600 console.log(6666) 683 console.log(6666)
601 - let that=this; 684 + let that = this;
602 that.data.page++; 685 that.data.page++;
603 that.getlist(); 686 that.getlist();
604 console.log(that.data.buildlist) 687 console.log(that.data.buildlist)
@@ -608,20 +691,20 @@ Page({ @@ -608,20 +691,20 @@ Page({
608 /** 691 /**
609 * 用户点击右上角分享 692 * 用户点击右上角分享
610 */ 693 */
611 - onShareAppMessage: function () { 694 + onShareAppMessage: function() {
612 695
613 }, 696 },
614 //建档成功，我要分享 697 //建档成功，我要分享
615 - attentionpublic:function(){ 698 + attentionpublic: function() {
616 wx.navigateTo({ 699 wx.navigateTo({
617 url: '../meshare/meshare?hospital_address_id=' + this.data.hospital_address_id, 700 url: '../meshare/meshare?hospital_address_id=' + this.data.hospital_address_id,
618 }) 701 })
619 -}, 702 + },
620 //建档笔记详情 703 //建档笔记详情
621 - buildtextdetail:function(e){  
622 - let that=this; 704 + buildtextdetail: function(e) {
  705 + let that = this;
623 console.log(e) 706 console.log(e)
624 - var buildtetid=e.currentTarget.dataset.id; 707 + var buildtetid = e.currentTarget.dataset.id;
625 wx.setStorageSync('buildtetid', buildtetid) 708 wx.setStorageSync('buildtetid', buildtetid)
626 that.setData({ 709 that.setData({
627 archives_id: e.currentTarget.dataset.id 710 archives_id: e.currentTarget.dataset.id
@@ -629,16 +712,16 @@ Page({ @@ -629,16 +712,16 @@ Page({
629 wx.navigateTo({ 712 wx.navigateTo({
630 url: '../buildtextdetail/buildtextdetail?buildid=' + buildtetid, 713 url: '../buildtextdetail/buildtextdetail?buildid=' + buildtetid,
631 }) 714 })
632 -}, 715 + },
633 716
634 -//医院详情  
635 - enterhostail(e){ 717 + //医院详情
  718 + enterhostail(e) {
636 wx.setStorageSync('hospitalid', e.currentTarget.dataset.hosid); 719 wx.setStorageSync('hospitalid', e.currentTarget.dataset.hosid);
637 wx.navigateTo({ 720 wx.navigateTo({
638 url: '../hometail/hometail', 721 url: '../hometail/hometail',
639 }) 722 })
640 }, 723 },
641 - attention:function(){ 724 + attention: function() {
642 wx.navigateTo({ 725 wx.navigateTo({
643 url: '../attentionpublic/attentionpublic', 726 url: '../attentionpublic/attentionpublic',
644 }) 727 })
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <view class="searchbuildtext"> 5 <view class="searchbuildtext">
6 <view class="search"> 6 <view class="search">
7 <view class="search_hospital"> 7 <view class="search_hospital">
8 - <input placeholder="搜索医院" class="enterword" bindinput="search" /> 8 + <input placeholder="搜索医院" class="enterword" bindinput="search" confirm-type="done" bindconfirm="finish"/>
9 </view> 9 </view>
10 <view class="searchimg" bindtap="searchlist"> 10 <view class="searchimg" bindtap="searchlist">
11 <image src="http://bronet.ibaby88.cn/aicon02@2x.png"></image> 11 <image src="http://bronet.ibaby88.cn/aicon02@2x.png"></image>
@@ -75,6 +75,7 @@ Page({ @@ -75,6 +75,7 @@ Page({
75 this.searchlist() 75 this.searchlist()
76 } 76 }
77 }, 77 },
  78 +
78 searchlist:function(){ 79 searchlist:function(){
79 let that=this; 80 let that=this;
80 that.setData({ 81 that.setData({
@@ -175,6 +176,107 @@ Page({ @@ -175,6 +176,107 @@ Page({
175 176
176 }) 177 })
177 }, 178 },
  179 +
  180 + finish(e) {
  181 + let that = this;
  182 + that.setData({
  183 + page: 1,
  184 + buildlist: []
  185 + })
  186 + // this.getchildinfo();
  187 +
  188 + var url = '/api/portal/childbirth/childbirthList';
  189 + var params = {
  190 + token: wx.getStorageSync('token'),
  191 + page: that.data.page,
  192 + num: that.data.num,
  193 + status: that.data.status,
  194 + keyword: that.data.keyword,
  195 + hospital_address_id: that.data.hospital_address_id
  196 + }
  197 + app.post(url, params).then((res) => {
  198 + console.log(res)
  199 + if (res == '') {
  200 + that.setData({
  201 + buildlist: []
  202 + })
  203 + } else {
  204 + // that.setData({
  205 + // buildlist: res
  206 + // })
  207 +
  208 + let newbuildlist = res;
  209 +
  210 +
  211 +
  212 + for (var i = 0; i < newbuildlist.length; i++) {
  213 + newbuildlist[i].showword = true
  214 + console.log(newbuildlist[i].content_imgs)
  215 + if (newbuildlist[i].content_text.length > 80) {
  216 + newbuildlist[i].openword = true
  217 + newbuildlist[i].content_text = newbuildlist[i].content_text.substring(0, 80);
  218 + } else {
  219 + newbuildlist[i].openword = false
  220 + }
  221 +
  222 +
  223 + if (newbuildlist[i].content_imgs == null) {
  224 + newbuildlist[i].content_imgs = []
  225 + } else if (newbuildlist[i].content_imgs.length > 3) {
  226 + newbuildlist[i].content_imgs = newbuildlist[i].content_imgs.slice(0, 3);
  227 + }
  228 +
  229 + if (newbuildlist[i].production_type == 1) {
  230 + newbuildlist[i].production_type = '顺'
  231 + } else if (newbuildlist[i].production_type == 2) {
  232 + newbuildlist[i].production_type = '剖'
  233 + }
  234 +
  235 + if (newbuildlist[i].sex == 1) {
  236 + newbuildlist[i].sex = '男宝'
  237 + } else if (newbuildlist[i].sex == 2) {
  238 + newbuildlist[i].sex = '女宝'
  239 + }
  240 +
  241 +
  242 + }
  243 + that.setData({
  244 + buildlist: that.data.buildlist.concat(newbuildlist)
  245 + })
  246 +
  247 + console.log('090909789', that.data.buildlist)
  248 + }
  249 +
  250 +
  251 + // let newbuildlist = that.data.buildlist;
  252 +
  253 + // for (var i = 0; i < newbuildlist.length; i++) {
  254 + // newbuildlist[i].content_text = newbuildlist[i].content_text.substring(0, 80);
  255 + // newbuildlist[i].content_imgs = newbuildlist[i].content_imgs.slice(0, 3);
  256 + // if (newbuildlist[i].production_type == 1) {
  257 + // newbuildlist[i].production_type = '顺'
  258 + // } else if (newbuildlist[i].production_type == 2) {
  259 + // newbuildlist[i].production_type = '剖'
  260 + // }
  261 +
  262 + // if (newbuildlist[i].sex == 1) {
  263 + // newbuildlist[i].sex = '男宝'
  264 + // } else if (newbuildlist[i].sex == 2) {
  265 + // newbuildlist[i].sex = '女宝'
  266 + // }
  267 +
  268 + // }
  269 +
  270 + // that.setData({
  271 + // buildlist: newbuildlist
  272 + // })
  273 +
  274 + // console.log(that.data.buildlist)
  275 +
  276 + }).catch((err) => {
  277 +
  278 + })
  279 + },
178 //最新 最热 280 //最新 最热
179 new:function(){ 281 new:function(){
180 this.setData({ 282 this.setData({
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <view class="new_left"> 17 <view class="new_left">
18 <view class="search"> 18 <view class="search">
19 <view class="search_hospital"> 19 <view class="search_hospital">
20 - <input placeholder="搜索医院" class="enterword" bindinput="search" /> 20 + <input placeholder="搜索医院" class="enterword" bindinput="search" confirm-type="done" bindconfirm="finish"/>
21 </view> 21 </view>
22 <view class="searchimg" bindtap="searchlist"> 22 <view class="searchimg" bindtap="searchlist">
23 <image src="http://bronet.ibaby88.cn/aicon02@2x.png"></image> 23 <image src="http://bronet.ibaby88.cn/aicon02@2x.png"></image>
@@ -299,7 +299,8 @@ box-sizing:border-box; @@ -299,7 +299,8 @@ box-sizing:border-box;
299 width: 642rpx; 299 width: 642rpx;
300 position: absolute; 300 position: absolute;
301 top: 69rpx; 301 top: 69rpx;
302 - left: 0; 302 + left: 44rpx;
  303 +
303 right: 0; 304 right: 0;
304 margin: 0 auto; 305 margin: 0 auto;
305 } 306 }
@@ -262,7 +262,7 @@ Page({ @@ -262,7 +262,7 @@ Page({
262 let goodtail_id = that.data.goodtail_id; 262 let goodtail_id = that.data.goodtail_id;
263 263
264 return { 264 return {
265 - title: '活动详情分享', // 转发后 所显示的title 265 + title: '转卖' + that.data.goodetail.title, // 转发后 所显示的title
266 // path: '/pages/home/buildtextdetail/buildtextdetail?buildid='+buildid+'&gettoken='+newtoken, // 相对的路径 266 // path: '/pages/home/buildtextdetail/buildtextdetail?buildid='+buildid+'&gettoken='+newtoken, // 相对的路径
267 path: '/pages/index/index?goodtail_id=' + goodtail_id + '&status=' + 6,//分娩笔记分享2 267 path: '/pages/index/index?goodtail_id=' + goodtail_id + '&status=' + 6,//分娩笔记分享2
268 //path: '/pages/index/index?childrenid', 268 //path: '/pages/index/index?childrenid',
@@ -38,6 +38,8 @@ @@ -38,6 +38,8 @@
38 <view class="good_address"> 38 <view class="good_address">
39 <view class="address_sign"> 39 <view class="address_sign">
40 <image src="http://bronet.ibaby88.cn/dicon10@2x.png"></image> 40 <image src="http://bronet.ibaby88.cn/dicon10@2x.png"></image>
  41 +
  42 +
41 </view> 43 </view>
42 <view class="price_address city_address">{{goodetail.province}}</view> 44 <view class="price_address city_address">{{goodetail.province}}</view>
43 <view class="price_address detail_address">{{goodetail.city}}</view> 45 <view class="price_address detail_address">{{goodetail.city}}</view>
@@ -46,6 +48,8 @@ @@ -46,6 +48,8 @@
46 <view class="good_address" bindtap="paste" data-word="{{goodetail.mobile}}"> 48 <view class="good_address" bindtap="paste" data-word="{{goodetail.mobile}}">
47 <view class="address_sign"> 49 <view class="address_sign">
48 <div class="iconfont icon-weixin" ></div> 50 <div class="iconfont icon-weixin" ></div>
  51 +
  52 + <view class="fuzhi">点击可复制</view>
49 </view> 53 </view>
50 <view class="price_address detail_address">{{goodetail.mobile}}</view> 54 <view class="price_address detail_address">{{goodetail.mobile}}</view>
51 </view> 55 </view>
@@ -44,6 +44,22 @@ @@ -44,6 +44,22 @@
44 height: 32rpx; 44 height: 32rpx;
45 font-size: 0; 45 font-size: 0;
46 margin-right: 10rpx; 46 margin-right: 10rpx;
  47 + position: relative
  48 +}
  49 +.fuzhi{
  50 + position: absolute;
  51 + top:-40rpx;
  52 + right:-121rpx;
  53 + width:135rpx;
  54 + height:40rpx;
  55 + border:1rpx solid #f5f5f5;
  56 + font-size: 22rpx;
  57 + line-height: 40rpx;
  58 + text-align: center;
  59 + background-color: rgba(0, 0, 0, 0.4);
  60 + color:#fff;
  61 + border-radius: 10rpx;
  62 +
47 } 63 }
48 .address_sign image { 64 .address_sign image {
49 width: 100%; 65 width: 100%;
@@ -114,7 +114,9 @@ Page({ @@ -114,7 +114,9 @@ Page({
114 star2:'', 114 star2:'',
115 star3:'', 115 star3:'',
116 star4:'', 116 star4:'',
117 - explain_pic:[] 117 + explain_pic:[],
  118 + bigpic:'',
  119 + showpic:false
118 120
119 121
120 122
@@ -137,6 +139,34 @@ Page({ @@ -137,6 +139,34 @@ Page({
137 // }) 139 // })
138 }, 140 },
139 141
  142 + seepic(e){
  143 + console.log(e)
  144 + let that=this;
  145 + let url = e.currentTarget.dataset.url;
  146 + let index=e.currentTarget.dataset.index
  147 + wx.previewImage({
  148 + current: that.data.explain_pic[index],
  149 + urls: that.data.explain_pic,
  150 + success: function (res) { },
  151 + fail: function (res) { },
  152 + complete: function (res) { },
  153 + })
  154 + // console.log(url)
  155 + // this.setData({
  156 + // bigpic:url,
  157 + // showpic:true
  158 + // })
  159 + },
  160 + // hidpic(){
  161 + // this.setData({
  162 + // showpic:false
  163 + // })
  164 + // },
  165 + // no(){
  166 +
  167 + // },
  168 +
  169 +
140 /** 170 /**
141 * 生命周期函数--监听页面加载 171 * 生命周期函数--监听页面加载
142 */ 172 */
@@ -1072,11 +1102,20 @@ Page({ @@ -1072,11 +1102,20 @@ Page({
1072 } 1102 }
1073 app.post(url, params).then((res) => { 1103 app.post(url, params).then((res) => {
1074 console.log('医院详情',res) 1104 console.log('医院详情',res)
  1105 + var len='';
  1106 + if(res.cname!=null){
  1107 + len = res.cname.length;
  1108 + }
  1109 + len=len-1
  1110 + console.log(len)
  1111 +
  1112 + // console.log(len)
  1113 + // console.log(res.cname[len])
1075 1114
1076 1115
1077 that.setData({ 1116 that.setData({
1078 guide_title: res.guide_title, 1117 guide_title: res.guide_title,
1079 - hostitle:res.title, 1118 + hostitle: res.cname != null ? res.cname[len] : res.title,
1080 info: res, 1119 info: res,
1081 1120
1082 condition: res.condition, 1121 condition: res.condition,
@@ -432,12 +432,18 @@ @@ -432,12 +432,18 @@
432 432
433 </view> 433 </view>
434 434
  435 + <view wx:if='{{explain_pic.length!=null}}'>
  436 + <view class="use useessays">
  437 + <view class="doctor_name">攻略图库</view>
  438 + </view>
435 <!-- 建档流程图--> 439 <!-- 建档流程图-->
436 <view class="dangimg"> 440 <view class="dangimg">
437 - <view class="dangimgitem" wx:for="{{explain_pic}}" wx:key=""> 441 + <view class="dangimgitem" wx:for="{{explain_pic}}" wx:key="" bindtap="seepic" data-url="{{item}}" data-index="{{index}}">
438 <image src="{{item}}"></image> 442 <image src="{{item}}"></image>
439 </view> 443 </view>
440 </view> 444 </view>
  445 + </view>
  446 +
441 <!-- 建档随笔 --> 447 <!-- 建档随笔 -->
442 448
443 <view class="note"> 449 <view class="note">
@@ -1323,3 +1329,9 @@ @@ -1323,3 +1329,9 @@
1323 </view> 1329 </view>
1324 1330
1325 </view> 1331 </view>
  1332 +
  1333 +<view class="register" wx:if="{{showpic}}" catchtouchmove='true' bindtap="hidpic">
  1334 + <view class="bigpic" catchtap="no">
  1335 + <image src="{{bigpic}}" mode="aspectFit"></image>
  1336 + </view>
  1337 +</view>
@@ -861,9 +861,30 @@ font-size:28rpx; @@ -861,9 +861,30 @@ font-size:28rpx;
861 .doctorcontentlist{ 861 .doctorcontentlist{
862 padding-bottom:100rpx; 862 padding-bottom:100rpx;
863 } 863 }
  864 +.dangimg{
  865 + display:flex;
  866 + flex-wrap: wrap;
  867 + align-items: center;
  868 + padding: 31rpx 33rpx;
  869 + box-sizing: border-box
  870 +}
864 .dangimgitem{ 871 .dangimgitem{
865 - width:686rpx;  
866 - height:500rpx; 872 + width:150rpx;
  873 + height:150rpx;
867 font-size: 0; 874 font-size: 0;
868 - margin:10rpx auto 0; 875 + margin-right:20rpx;
  876 +
  877 +}
  878 +.dangimgitem image{
  879 + width:100%;
  880 + height:100%;
  881 +}
  882 +.bigpic{
  883 + width:600rpx;
  884 + height:600rpx;
  885 + font-size: 0;
  886 + position: absolute;
  887 + top:50%;
  888 + left:50%;
  889 + transform: translate(-50%,-50%)
869 } 890 }
1 <!-- 文字部分 --> 1 <!-- 文字部分 -->
2 <view class="word"> 2 <view class="word">
3 <view class="said">和小秘书说说您的情况吧</view> 3 <view class="said">和小秘书说说您的情况吧</view>
4 - <view class="provid">我们会根据您的阶段，给您提供更多</view>  
5 - <view class="provid">贴心的帮助哦~</view> 4 + <view class="provid"> 我们会根据您的阶段，找到专属的小秘书，拉你进群</view>
  5 + <!-- <view class="provid">贴心的帮助哦~</view> -->
6 </view> 6 </view>
7 7
8 <!-- 轮播图 --> 8 <!-- 轮播图 -->
@@ -84,17 +84,17 @@ Page({ @@ -84,17 +84,17 @@ Page({
84 num: 10, 84 num: 10,
85 hostipallist: [], 85 hostipallist: [],
86 muitiple: [{ 86 muitiple: [{
87 - mulid: '',  
88 - name: '人气排序'  
89 - }, {  
90 mulid: 1, 87 mulid: 1,
91 name: '距离排序' 88 name: '距离排序'
92 }, { 89 }, {
  90 + mulid: '',
  91 + name: '人气排序'
  92 + }, {
93 mulid: 2, 93 mulid: 2,
94 name: '口碑排序' 94 name: '口碑排序'
95 }], 95 }],
96 multiple_index: 0, 96 multiple_index: 0,
97 - status: '', 97 + status: 1,
98 hospitaltypearray: [], 98 hospitaltypearray: [],
99 hostipaltype_index: 0, 99 hostipaltype_index: 0,
100 search_hospital_id: '' 100 search_hospital_id: ''
@@ -523,6 +523,38 @@ Page({ @@ -523,6 +523,38 @@ Page({
523 }) 523 })
524 524
525 }).catch((err) => { 525 }).catch((err) => {
  526 + console.log(err)
  527 +
  528 + })
  529 +
  530 + },
  531 +
  532 + finish() {
  533 + let that = this;
  534 + that.setData({
  535 + page: 1,
  536 + num: 3,
  537 + hostipallist: [],
  538 + })
  539 + var url = '/api/portal/hospital/getHospitalList';
  540 + var params = {
  541 + lng: that.data.jd,
  542 + lat: that.data.wd,
  543 + page: that.data.page,
  544 + num: that.data.num,
  545 + hospital_name: that.data.hospital_name,
  546 + service_id: that.data.service_id,
  547 + status: that.data.status,
  548 + hospital_address_id: that.data.hospital_address_id
  549 + }
  550 + app.post(url, params).then((res) => {
  551 + console.log(res)
  552 + that.setData({
  553 + hostipallist: res
  554 + })
  555 +
  556 + }).catch((err) => {
  557 + console.log(err)
526 558
527 }) 559 })
528 560
@@ -590,7 +622,7 @@ Page({ @@ -590,7 +622,7 @@ Page({
590 title: '请先登录', 622 title: '请先登录',
591 icon: 'none' 623 icon: 'none'
592 }) 624 })
593 - setTimeout(function () { 625 + setTimeout(function() {
594 wx.navigateTo({ 626 wx.navigateTo({
595 url: '/pages/index/index', 627 url: '/pages/index/index',
596 }) 628 })
@@ -605,6 +637,7 @@ Page({ @@ -605,6 +637,7 @@ Page({
605 637
606 638
607 639
  640 +
608 }, 641 },
609 642
610 //建档攻略 643 //建档攻略
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 </view> 12 </view>
13 <view class="search"> 13 <view class="search">
14 <view class="search_hospital"> 14 <view class="search_hospital">
15 - <input placeholder="搜索医院" class="enterword" bindinput="searchhospital" /> 15 + <input placeholder="搜索医院" class="enterword" bindinput="searchhospital" confirm-type="done" bindconfirm="finish"/>
16 </view> 16 </view>
17 <view class="searchimg" bindtap="search"> 17 <view class="searchimg" bindtap="search">
18 <image src="http://bronet.ibaby88.cn/aicon02@2x.png"></image> 18 <image src="http://bronet.ibaby88.cn/aicon02@2x.png"></image>